Updated to TiCo 2.6.3

Added Zweihander
Partially added Sheathe
Partially added Crest Mount
Partially added materials

44 files changed, 5622 insertions, 6244 deletions

diff --git a/src/main/java/lance5057/tDefense/armor/ArmorCore.java b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
index 1c63062..3291523 100644
--- a/src/main/java/lance5057/tDefense/armor/ArmorCore.java
+++ b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
@@ -1,69 +1,54 @@
 package lance5057.tDefense.armor;
 
-import lance5057.tDefense.TDIntegration;
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.parts.ClothMaterial;
-import lance5057.tDefense.armor.renderers.ArmorRenderer;
-import lance5057.tDefense.core.tools.modifiers.Modifiers;
 import net.minecraft.client.model.ModelBiped;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
+import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.DamageSource;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
 import net.minecraftforge.common.ISpecialArmor;
-
-import org.lwjgl.opengl.GL11;
-
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.tools.AbilityHelper;
-import tconstruct.library.tools.CustomMaterial;
-import tconstruct.library.tools.ToolCore;
-import thaumcraft.api.IRunicArmor;
-import vazkii.botania.api.item.IPixieSpawner;
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IRunicArmor", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.item.IPixieSpawner", striprefs = true)})
-public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRunicArmor, IPixieSpawner
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.tools.ToolCore;
+
+//@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IRunicArmor", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.item.IPixieSpawner", striprefs = true)})
+public abstract class ArmorCore extends ToolCore implements ISpecialArmor// ,
+																			// IRunicArmor,
+																			// IPixieSpawner
 {
-	int				slot;
-	public float	reductionPercent	= 0f;
-	protected int	maxReduction		= 100;
+	public final EntityEquipmentSlot armorType;
+	public float reductionPercent = 0f;
+	protected int maxReduction = 100;
 
-	//public String[]	renderParts;
+	// public String[] renderParts;
 
-	//Thaumcraft
-	boolean			Charge				= false;
+	// Thaumcraft
+	boolean Charge = false;
 
-	public ArmorCore(int baseProtection, int slot)
-	{
-		super(baseProtection);
-
-		this.slot = slot;
+	public ArmorCore(EntityEquipmentSlot slot, PartMaterialType... requiredComponents) {
+		super(requiredComponents);
+		armorType = slot;
 
 		//MinecraftForge.EVENT_BUS.register(this);
 	}
 
+	@SideOnly(Side.CLIENT)
+	public EntityEquipmentSlot getEquipmentSlot() {
+		return this.armorType;
+	}
+
 	@Override
-	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot)
-	{
+	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
+			int slot) {
 		ArmorProperties armorp;
-		if(!source.isUnblockable())
-		{
+		if (!source.isUnblockable()) {
 			armorp = new ArmorProperties(0, reductionPercent, maxReduction); // 0.04
 			// per
 			// half
 			// shirt
-		}
-		else
-		{
+		} else {
 			armorp = new ArmorProperties(0, 0, 0);
 		}
 
@@ -71,239 +56,223 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRuni
 	}
 
 	@Override
-	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
-	{
+	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
 		return (int) ((int) reductionPercent / 0.04);
 	}
 
-	public int getSlot()
-	{
-		return slot;
-	}
-
 	@SideOnly(Side.CLIENT)
-	public ModelBiped getModel(String[] color, NBTTagCompound tags)
-	{
+	public ModelBiped getModel(String[] color, NBTTagCompound tags) {
 		return null;
 	}
 
-	@Override
-	public boolean isValidArmor(ItemStack stack, int armorType, Entity entity)
-	{
-		return armorType == slot;
-	}
-
-	@Override
-	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot)
-	{
-		AbilityHelper.damageTool(stack, damage, entity, false);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot)
-	{
-		if(itemStack.getItem() instanceof ToolCore)
-		{
-			final String[] color = new String[10];
-			final ToolCore tool = (ToolCore) itemStack.getItem();
-
-			for(int j = 0; j < 10; j++)
-			{
-				color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
-
-				switch(j)
-				{
-					case 0:
-						if(tool.getHandleItem() == TinkersDefense.partCloth)
-						{
-							final int ID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderHandle");
-
-							final CustomMaterial newColor = TConstructRegistry.getCustomMaterial(ID, ClothMaterial.class);
-							color[j] = Integer.toHexString(newColor.color);
-						}
-						break;
-
-					case 1:
-						if(tool.getHeadItem() == TinkersDefense.partCloth)
-						{
-							final int ID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderHead");
-
-							final CustomMaterial newColor = TConstructRegistry.getCustomMaterial(ID, ClothMaterial.class);
-							color[j] = Integer.toHexString(newColor.color);
-						}
-						break;
-
-					case 2:
-						if(tool.getAccessoryItem() != null && tool.getAccessoryItem() == TinkersDefense.partCloth)
-						{
-							final int ID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderAccessory");
-
-							final CustomMaterial newColor = TConstructRegistry.getCustomMaterial(ID, ClothMaterial.class);
-							color[j] = Integer.toHexString(newColor.color);
-						}
-						break;
-
-					case 3:
-						if(tool.getExtraItem() != null && tool.getExtraItem() == TinkersDefense.partCloth)
-						{
-							final int ID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderExtra");
-
-							final CustomMaterial newColor = TConstructRegistry.getCustomMaterial(ID, ClothMaterial.class);
-							color[j] = Integer.toHexString(newColor.color);
-						}
-						break;
-				}
-			}
-
-			final ArmorRenderer model = getRenderer();
-			model.SetColors(color, getDefaultFolder(), itemStack);
-			return model;
-		}
-		return null;
-	}
-
-	@SideOnly(Side.CLIENT)
-	public abstract ArmorRenderer getRenderer();
-
-	@Override
-	public Item getAccessoryItem()
-	{
-		return null;
-	}
-
-	@Override
-	public String getDefaultFolder()
-	{
-		return null;
-	}
-
-	@Override
-	public String getEffectSuffix()
-	{
-		return null;
-	}
-
-	@Override
-	public Item getHeadItem()
-	{
-		return null;
-	}
-
-	@Override
-	public String getIconSuffix(int arg0)
-	{
-		return null;
-	}
-
-	@Override
-	public String[] getTraits()
-	{
-		return new String[] {"armor"};
-	}
-
-	@Override
-	public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack)
-	{
-
-		Modifiers.AMod.UpdateAll((ToolCore) itemStack.getItem(), itemStack, world, player, itemStack.getTagCompound().getCompoundTag("InfiTool"));
-	}
-
-	@Override
-	public int getRunicCharge(ItemStack itemstack)
-	{
-		return 0;
-	}
-
-	@Override
-	public void onUpdate(ItemStack stack, World world, Entity ent, int p_77663_4_, boolean p_77663_5_)
-	{
-		//Check if runic shielding level has changed
-		if(TDIntegration.thaumcraft)
-		{
-			final NBTTagCompound tcTag = stack.getTagCompound();
-			final NBTTagCompound ticoTag = stack.getTagCompound().getCompoundTag("InfiTool");
-
-			final byte rs = tcTag.getByte("RS.HARDEN");
-			if(!Charge && rs > 0)
-			{
-				if(ticoTag.getInteger("Modifiers") > 0)
-				{
-					ticoTag.setInteger("Modifiers", ticoTag.getInteger("Modifiers") - 1);
-					Charge = true;
-				}
-				else
-				{
-					tcTag.removeTag("RS.HARDEN");
-				}
-			}
-		}
-	}
-
-	@SideOnly(Side.CLIENT)
-	public void renderArmor(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, String[] colors, ItemStack stack, int pass)
-	{
-
-		final ResourceLocation rc = new ResourceLocation(
-				"tinkersdefense:textures/" + getDefaultFolder() + "/" + getTexture(pass, stack) + ".png");
-		FMLClientHandler.instance().getClient().renderEngine.bindTexture(rc);
-
-		final float size = 1.6f;
-		GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
-		GL11.glTranslatef(0.0F, -0.01F, 0.0F);
-
-		final int[] intColors = TinkersDefense.hexToRGB(colors[pass]);
-		GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
-
-	}
-
-	@SideOnly(Side.CLIENT)
-	public String getTexture(int pass, ItemStack stack)
-	{
-		final NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
-		String renderReturn = "";
-		switch(pass)
-		{
-			case 0:
-				renderReturn = handleStrings.get(tags.getInteger("RenderHandle"));
-				break;
-			case 1:
-				renderReturn = headStrings.get(tags.getInteger("RenderHead"));
-				break;
-			case 2:
-				renderReturn = accessoryStrings.get(tags.getInteger("RenderAccessory"));
-				break;
-			case 3:
-				renderReturn = extraStrings.get(tags.getInteger("RenderExtra"));
-				break;
-				//
-				//			default:
-				//				if(tags != null && tags.hasKey("Effect" + (pass - getPartAmount())))
-				//				{
-				//					final String effect = effectStrings.get(tags.getInteger("Effect" + (pass - getPartAmount())));
-				//					if(effect != null)
-				//						return effect.substring(effect.lastIndexOf("/") + 1);
-				//					else
-				//						return "";
-				//
-				//				}
-		}
-		if(renderReturn != null && renderReturn != "")
-		{
-			renderReturn = renderReturn.substring(renderReturn.indexOf("_"));
-		}
-		else
-		{
-			renderReturn = "";
-		}
-
-		return renderReturn;
-	}
-
-	@Override
-	public float getPixieChance(ItemStack stack)
-	{
-		final float chance = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("ElementiumCore") * 5 / 100f;
-		return chance;
-	}
+//	@Override
+//	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
+//		AbilityHelper.damageTool(stack, damage, entity, false);
+//	}
+
+//	@Override
+//	@SideOnly(Side.CLIENT)
+//	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) {
+//		if (itemStack.getItem() instanceof ToolCore) {
+//			final String[] color = new String[10];
+//			final ToolCore tool = (ToolCore) itemStack.getItem();
+//
+//			for (int j = 0; j < 10; j++) {
+//				color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j));
+//
+//				switch (j) {
+//				case 0:
+//					if (tool.getHandleItem() == TinkersDefense.partCloth) {
+//						final int ID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderHandle");
+//
+//						final CustomMaterial newColor = TConstructRegistry.getCustomMaterial(ID, ClothMaterial.class);
+//						color[j] = Integer.toHexString(newColor.color);
+//					}
+//					break;
+//
+//				case 1:
+//					if (tool.getHeadItem() == TinkersDefense.partCloth) {
+//						final int ID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderHead");
+//
+//						final CustomMaterial newColor = TConstructRegistry.getCustomMaterial(ID, ClothMaterial.class);
+//						color[j] = Integer.toHexString(newColor.color);
+//					}
+//					break;
+//
+//				case 2:
+//					if (tool.getAccessoryItem() != null && tool.getAccessoryItem() == TinkersDefense.partCloth) {
+//						final int ID = itemStack.getTagCompound().getCompoundTag("InfiTool")
+//								.getInteger("RenderAccessory");
+//
+//						final CustomMaterial newColor = TConstructRegistry.getCustomMaterial(ID, ClothMaterial.class);
+//						color[j] = Integer.toHexString(newColor.color);
+//					}
+//					break;
+//
+//				case 3:
+//					if (tool.getExtraItem() != null && tool.getExtraItem() == TinkersDefense.partCloth) {
+//						final int ID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderExtra");
+//
+//						final CustomMaterial newColor = TConstructRegistry.getCustomMaterial(ID, ClothMaterial.class);
+//						color[j] = Integer.toHexString(newColor.color);
+//					}
+//					break;
+//				}
+//			}
+//
+//			final ArmorRenderer model = getRenderer();
+//			model.SetColors(color, getDefaultFolder(), itemStack);
+//			return model;
+//		}
+//		return null;
+//	}
+
+//	@SideOnly(Side.CLIENT)
+//	public abstract ArmorRenderer getRenderer();
+
+//	@Override
+//	public Item getAccessoryItem() {
+//		return null;
+//	}
+//
+//	@Override
+//	public String getDefaultFolder() {
+//		return null;
+//	}
+//
+//	@Override
+//	public String getEffectSuffix() {
+//		return null;
+//	}
+//
+//	@Override
+//	public Item getHeadItem() {
+//		return null;
+//	}
+//
+//	@Override
+//	public String getIconSuffix(int arg0) {
+//		return null;
+//	}
+//
+//	@Override
+//	public String[] getTraits() {
+//		return new String[] { "armor" };
+//	}
+
+//	@Override
+//	public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
+//
+//		Modifiers.AMod.UpdateAll((ToolCore) itemStack.getItem(), itemStack, world, player,
+//				itemStack.getTagCompound().getCompoundTag("InfiTool"));
+//	}
+//
+//	@Override
+//	public int getRunicCharge(ItemStack itemstack) {
+//		return 0;
+//	}
+
+//	@Override
+//	public void onUpdate(ItemStack stack, World world, Entity ent, int p_77663_4_, boolean p_77663_5_) {
+//		// Check if runic shielding level has changed
+//		if (TDIntegration.thaumcraft) {
+//			final NBTTagCompound tcTag = stack.getTagCompound();
+//			final NBTTagCompound ticoTag = stack.getTagCompound().getCompoundTag("InfiTool");
+//
+//			final byte rs = tcTag.getByte("RS.HARDEN");
+//			if (!Charge && rs > 0) {
+//				if (ticoTag.getInteger("Modifiers") > 0) {
+//					ticoTag.setInteger("Modifiers", ticoTag.getInteger("Modifiers") - 1);
+//					Charge = true;
+//				} else {
+//					tcTag.removeTag("RS.HARDEN");
+//				}
+//			}
+//		}
+//	}
+
+//	public void renderArmor(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, String[] colors,
+//			ItemStack stack, int pass) {
+//
+//		final ResourceLocation rc = new ResourceLocation(
+//				"tinkersdefense:textures/" + getDefaultFolder() + "/" + getTexture(pass, stack) + ".png");
+//		FMLClientHandler.instance().getClient().renderEngine.bindTexture(rc);
+//
+//		final float size = 1.6f;
+//		GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size);
+//		GL11.glTranslatef(0.0F, -0.01F, 0.0F);
+//
+//		final int[] intColors = TinkersDefense.hexToRGB(colors[pass]);
+//		GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255);
+//
+//	}
+//
+//	public String getTexture(int pass, ItemStack stack) {
+//		final NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
+//		String renderReturn = "";
+//		switch (pass) {
+//		case 0:
+//			renderReturn = handleStrings.get(tags.getInteger("RenderHandle"));
+//			break;
+//		case 1:
+//			renderReturn = headStrings.get(tags.getInteger("RenderHead"));
+//			break;
+//		case 2:
+//			renderReturn = accessoryStrings.get(tags.getInteger("RenderAccessory"));
+//			break;
+//		case 3:
+//			renderReturn = extraStrings.get(tags.getInteger("RenderExtra"));
+//			break;
+//		//
+//		// default:
+//		// if(tags != null && tags.hasKey("Effect" + (pass - getPartAmount())))
+//		// {
+//		// final String effect = effectStrings.get(tags.getInteger("Effect" +
+//		// (pass - getPartAmount())));
+//		// if(effect != null)
+//		// return effect.substring(effect.lastIndexOf("/") + 1);
+//		// else
+//		// return "";
+//		//
+//		// }
+//		}
+//		if (renderReturn != null && renderReturn != "") {
+//			renderReturn = renderReturn.substring(renderReturn.indexOf("_"));
+//		} else {
+//			renderReturn = "";
+//		}
+//
+//		return renderReturn;
+//	}
+//
+//	@Override
+//	public float getPixieChance(ItemStack stack) {
+//		final float chance = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("ElementiumCore") * 5 / 100f;
+//		return chance;
+//	}
+//
+//	@SubscribeEvent
+//	public void ToolCraftedEvent(NormalTool event) {
+//		if (event.tool instanceof ArmorCore) {
+//			final ArmorCore armor = (ArmorCore) event.tool;
+//			final ArmorRenderer render = armor.getRenderer();
+//			final NBTTagCompound tooltags = event.toolTag;
+//			final NBTTagCompound tags = render.defaultTags;// stack.setTagCompound();
+//
+//			// for(int i = 0; i < render.defaultTags.; i++)
+//			// {
+//			// final String rendertag = ((ModelRenderer)
+//			// render.boxList.get(i)).boxName;
+//			// if(rendertag != null)
+//			// {
+//			// tags.setBoolean(rendertag, ((ModelRenderer)
+//			// render.boxList.get(i)).isHidden);
+//			// }
+//			// }
+//
+//			if (!tags.hasNoTags()) {
+//				tooltags.setTag("ArmorRenderer", tags);
+//			}
+//		}
+//	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java b/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
index 98223ce..4ad8e64 100644
--- a/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
+++ b/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
@@ -1,198 +1,187 @@
-package lance5057.tDefense.armor;
-
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.blocks.GlowstoneCrumbs;
-import lance5057.tDefense.armor.blocks.UnstableBlock;
-import lance5057.tDefense.armor.blocks.UnstableItemBlock;
-import lance5057.tDefense.armor.events.ArmorModEvents;
-import lance5057.tDefense.armor.events.ArmorRenderEvent;
-import lance5057.tDefense.armor.items.Sheath;
-import lance5057.tDefense.armor.items.TinkersGauntlets;
-import lance5057.tDefense.armor.items.cloth.TinkersHood;
-import lance5057.tDefense.armor.items.cloth.TinkersRobe;
-import lance5057.tDefense.armor.items.cloth.TinkersShawl;
-import lance5057.tDefense.armor.items.cloth.TinkersShoes;
-import lance5057.tDefense.armor.items.heavy.TinkersBreastplate;
-import lance5057.tDefense.armor.items.heavy.TinkersGrieves;
-import lance5057.tDefense.armor.items.heavy.TinkersHelm;
-import lance5057.tDefense.armor.items.heavy.TinkersSabatons;
-import lance5057.tDefense.armor.items.light.TinkersBoots;
-import lance5057.tDefense.armor.items.light.TinkersChausses;
-import lance5057.tDefense.armor.items.light.TinkersCoif;
-import lance5057.tDefense.armor.items.light.TinkersHauberk;
-import net.minecraft.block.Block;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.client.MinecraftForgeClient;
-import net.minecraftforge.common.MinecraftForge;
-import tconstruct.client.FlexibleToolRenderer;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.crafting.ToolBuilder;
-import tconstruct.library.tools.ToolCore;
-import tconstruct.tools.TinkerTools;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-
-public class TDArmorAddon
-{
-	public static CreativeTabs	tabName;
-
-	public static ToolCore		armor_TinkerHood;
-	public static ToolCore		armor_TinkerShawl;
-	public static ToolCore		armor_TinkerRobe;
-	public static ToolCore		armor_TinkerShoes;
-
-	public static ToolCore		armor_TinkerCoif;
-	public static ToolCore		armor_TinkerHauberk;
-	public static ToolCore		armor_TinkerChausses;
-	public static ToolCore		armor_TinkerBoots;
-
-	public static ToolCore		armor_TinkerHelm;
-	public static ToolCore		armor_TinkerBreastplate;
-	public static ToolCore		armor_TinkerGrieves;
-	public static ToolCore		armor_TinkerSabatons;
-	public static ToolCore		armor_TinkerGauntlets;
-
-	public static ToolCore		accessory_sheath;
-
-	public static Block			block_Unstable;
-	public static Block			block_GlowCrumbs;
-
-	public void preInit(FMLPreInitializationEvent e)
-	{
-		tabName = new CreativeTabs("TabArmor")
-		{
-
-			@Override
-			public Item getTabIconItem()
-			{
-				return ToolBuilder.instance.buildTool(new ItemStack(
-						TinkerTools.largePlate, 1, 2), new ItemStack(
-						TinkerTools.toughRod, 1, 2), new ItemStack(
-						TinkersDefense.partArmorplate, 1, 2), new ItemStack(
-						TinkersDefense.partChainmaille, 1, 2), "ArmorTab").getItem();
-			}
-
-		};
-
-		if(e.getSide() == Side.CLIENT)
-		{
-			MinecraftForge.EVENT_BUS.register(new ArmorRenderEvent());
-		}
-
-		MinecraftForge.EVENT_BUS.register(new ArmorModEvents());
-
-		armor_TinkerHelm = new TinkersHelm();
-		armor_TinkerBreastplate = new TinkersBreastplate();
-		armor_TinkerGrieves = new TinkersGrieves();
-		armor_TinkerSabatons = new TinkersSabatons();
-		armor_TinkerGauntlets = new TinkersGauntlets();
-
-		armor_TinkerRobe = new TinkersRobe();
-		armor_TinkerShawl = new TinkersShawl();
-		armor_TinkerHood = new TinkersHood();
-		armor_TinkerShoes = new TinkersShoes();
-
-		armor_TinkerCoif = new TinkersCoif();
-		armor_TinkerHauberk = new TinkersHauberk();
-		armor_TinkerChausses = new TinkersChausses();
-		armor_TinkerBoots = new TinkersBoots();
-
-		accessory_sheath = new Sheath();
-
-		block_Unstable = new UnstableBlock();
-		block_GlowCrumbs = new GlowstoneCrumbs();
-
-		GameRegistry.registerItem(armor_TinkerHelm, "tinkerhelm");
-		GameRegistry.registerItem(armor_TinkerBreastplate, "tinkerbreastplate");
-		GameRegistry.registerItem(armor_TinkerGrieves, "tinkergrieves");
-		GameRegistry.registerItem(armor_TinkerSabatons, "tinkersabatons");
-		GameRegistry.registerItem(armor_TinkerGauntlets, "tinkergauntlets");
-
-		GameRegistry.registerItem(armor_TinkerCoif, "tinkercoif");
-		GameRegistry.registerItem(armor_TinkerHauberk, "tinkerhauberk");
-		GameRegistry.registerItem(armor_TinkerChausses, "tinkerchausses");
-		GameRegistry.registerItem(armor_TinkerBoots, "tinkerboots");
-
-		GameRegistry.registerItem(armor_TinkerRobe, "tinkerrobe");
-		GameRegistry.registerItem(armor_TinkerShawl, "tinkershawl");
-		GameRegistry.registerItem(armor_TinkerHood, "tinkerhood");
-		GameRegistry.registerItem(armor_TinkerShoes, "tinkershoes");
-
-		GameRegistry.registerItem(accessory_sheath, "Sheath");
-
-		GameRegistry.registerBlock(block_Unstable, UnstableItemBlock.class, "Unstable");
-		GameRegistry.registerBlock(block_GlowCrumbs, "Block_GlowCrumbs");
-
-		TConstructRegistry.addItemToDirectory("tinkerhelm", armor_TinkerHelm);
-		TConstructRegistry.addItemToDirectory("tinkerbreastplate", armor_TinkerBreastplate);
-		TConstructRegistry.addItemToDirectory("tinkergrieves", armor_TinkerGrieves);
-		TConstructRegistry.addItemToDirectory("tinkersabatons", armor_TinkerSabatons);
-		TConstructRegistry.addItemToDirectory("tinkergauntlets", armor_TinkerGauntlets);
-
-		TConstructRegistry.addItemToDirectory("tinkercoif", armor_TinkerCoif);
-		TConstructRegistry.addItemToDirectory("tinkerhauberk", armor_TinkerHauberk);
-		TConstructRegistry.addItemToDirectory("tinkerchausses", armor_TinkerChausses);
-		TConstructRegistry.addItemToDirectory("tinkerboots", armor_TinkerBoots);
-
-		TConstructRegistry.addItemToDirectory("tinkerrobe", armor_TinkerRobe);
-		TConstructRegistry.addItemToDirectory("tinkershawl", armor_TinkerShawl);
-		TConstructRegistry.addItemToDirectory("tinkerhood", armor_TinkerHood);
-		TConstructRegistry.addItemToDirectory("tinkershoes", armor_TinkerShoes);
-
-		TConstructRegistry.addItemToDirectory("Sheath", accessory_sheath);
-	}
-
-	public void init(FMLInitializationEvent e)
-	{
-
-		TConstructRegistry.addToolRecipe(armor_TinkerHelm, TinkerTools.frypanHead, TinkerTools.toughRod, TinkersDefense.partArmorplate, TinkersDefense.partChainmaille);
-		TConstructRegistry.addToolRecipe(armor_TinkerBreastplate, TinkerTools.largePlate, TinkerTools.toughRod, TinkersDefense.partArmorplate, TinkersDefense.partChainmaille);
-		TConstructRegistry.addToolRecipe(armor_TinkerGrieves, TinkersDefense.partArmorplate, TinkerTools.toughRod, TinkersDefense.partChainmaille, TinkersDefense.partCloth);
-		TConstructRegistry.addToolRecipe(armor_TinkerSabatons, TinkersDefense.partArmorplate, TinkerTools.toughRod, TinkersDefense.partArmorplate, TinkersDefense.partCloth);
-		TConstructRegistry.addToolRecipe(armor_TinkerGauntlets, TinkersDefense.partArmorplate, TinkerTools.toughRod, TinkersDefense.partRivet);
-
-		TConstructRegistry.addToolRecipe(armor_TinkerRobe, TinkersDefense.partCloth, TinkersDefense.partClasp, TinkersDefense.partCloth);
-		TConstructRegistry.addToolRecipe(armor_TinkerShawl, TinkersDefense.partCloth, TinkersDefense.partArmorplate, TinkersDefense.partCloth);
-		TConstructRegistry.addToolRecipe(armor_TinkerHood, TinkersDefense.partCloth, TinkerTools.toolRod, TinkersDefense.partCloth);
-		TConstructRegistry.addToolRecipe(armor_TinkerShoes, TinkersDefense.partCloth, TinkersDefense.partRivet, TinkersDefense.partCloth);
-
-		TConstructRegistry.addToolRecipe(armor_TinkerCoif, TinkersDefense.partChainmaille, TinkerTools.toughRod, TinkersDefense.partCloth);
-		TConstructRegistry.addToolRecipe(armor_TinkerHauberk, TinkersDefense.partChainmaille, TinkerTools.largePlate, TinkersDefense.partCloth);
-		TConstructRegistry.addToolRecipe(armor_TinkerChausses, TinkersDefense.partChainmaille, TinkersDefense.partArmorplate, TinkersDefense.partCloth);
-		TConstructRegistry.addToolRecipe(armor_TinkerBoots, TinkersDefense.partChainmaille, TinkersDefense.partCloth, TinkersDefense.partRivet);
-
-		TConstructRegistry.addToolRecipe(accessory_sheath, TinkersDefense.partCloth, TinkersDefense.partCloth, TinkersDefense.partCloth);
-
-	}
-
-	public void postInit(FMLPostInitializationEvent e)
-	{
-
-	}
-
-	public static void clientProxy(FlexibleToolRenderer renderer)
-	{
-		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.accessory_sheath, renderer);
-
-		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerHelm, renderer);
-		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerBreastplate, renderer);
-		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerGrieves, renderer);
-		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerSabatons, renderer);
-		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerGauntlets, renderer);
-
-		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerRobe, renderer);
-		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerShawl, renderer);
-		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerHood, renderer);
-		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerShoes, renderer);
-
-		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerCoif, renderer);
-		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerHauberk, renderer);
-		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerChausses, renderer);
-		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerBoots, renderer);
-	}
-}
+//package lance5057.tDefense.armor;
+//
+//import lance5057.tDefense.TinkersDefense;
+//import lance5057.tDefense.armor.blocks.GlowstoneCrumbs;
+//import lance5057.tDefense.armor.blocks.UnstableBlock;
+//import lance5057.tDefense.armor.blocks.UnstableItemBlock;
+//import lance5057.tDefense.armor.items.Sheath;
+//import lance5057.tDefense.armor.items.TinkersGauntlets;
+//import lance5057.tDefense.armor.items.cloth.TinkersHood;
+//import lance5057.tDefense.armor.items.cloth.TinkersRobe;
+//import lance5057.tDefense.armor.items.cloth.TinkersShawl;
+//import lance5057.tDefense.armor.items.cloth.TinkersShoes;
+//import lance5057.tDefense.armor.items.heavy.TinkersBreastplate;
+//import lance5057.tDefense.armor.items.heavy.TinkersGrieves;
+//import lance5057.tDefense.armor.items.heavy.TinkersHelm;
+//import lance5057.tDefense.armor.items.heavy.TinkersSabatons;
+//import lance5057.tDefense.armor.items.light.TinkersBoots;
+//import lance5057.tDefense.armor.items.light.TinkersChausses;
+//import lance5057.tDefense.armor.items.light.TinkersCoif;
+//import lance5057.tDefense.armor.items.light.TinkersHauberk;
+//import net.minecraft.block.Block;
+//import net.minecraft.creativetab.CreativeTabs;
+//import net.minecraft.item.Item;
+//import net.minecraft.item.ItemStack;
+//import net.minecraftforge.client.MinecraftForgeClient;
+//import tconstruct.client.FlexibleToolRenderer;
+//import tconstruct.library.TConstructRegistry;
+//import tconstruct.library.crafting.ToolBuilder;
+//import tconstruct.library.tools.ToolCore;
+//import tconstruct.tools.TinkerTools;
+//import cpw.mods.fml.common.event.FMLInitializationEvent;
+//import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+//import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+//import cpw.mods.fml.common.registry.GameRegistry;
+//
+//public class TDArmorAddon
+//{
+//	public static CreativeTabs	tabName;
+//
+//	public static ToolCore		armor_TinkerHood;
+//	public static ToolCore		armor_TinkerShawl;
+//	public static ToolCore		armor_TinkerRobe;
+//	public static ToolCore		armor_TinkerShoes;
+//
+//	public static ToolCore		armor_TinkerCoif;
+//	public static ToolCore		armor_TinkerHauberk;
+//	public static ToolCore		armor_TinkerChausses;
+//	public static ToolCore		armor_TinkerBoots;
+//
+//	public static ToolCore		armor_TinkerHelm;
+//	public static ToolCore		armor_TinkerBreastplate;
+//	public static ToolCore		armor_TinkerGrieves;
+//	public static ToolCore		armor_TinkerSabatons;
+//	public static ToolCore		armor_TinkerGauntlets;
+//
+//	public static ToolCore		accessory_sheath;
+//
+//	public static Block			block_Unstable;
+//	public static Block			block_GlowCrumbs;
+//
+//	public void preInit(FMLPreInitializationEvent e)
+//	{
+//		tabName = new CreativeTabs("TabArmor")
+//		{
+//
+//			@Override
+//			public Item getTabIconItem()
+//			{
+//				return ToolBuilder.instance.buildTool(new ItemStack(
+//						TinkerTools.largePlate, 1, 2), new ItemStack(
+//						TinkerTools.toughRod, 1, 2), new ItemStack(
+//						TinkersDefense.partArmorplate, 1, 2), new ItemStack(
+//						TinkersDefense.partChainmaille, 1, 2), "ArmorTab").getItem();
+//			}
+//
+//		};
+//
+//		armor_TinkerHelm = new TinkersHelm();
+//		armor_TinkerBreastplate = new TinkersBreastplate();
+//		armor_TinkerGrieves = new TinkersGrieves();
+//		armor_TinkerSabatons = new TinkersSabatons();
+//		armor_TinkerGauntlets = new TinkersGauntlets();
+//
+//		armor_TinkerRobe = new TinkersRobe();
+//		armor_TinkerShawl = new TinkersShawl();
+//		armor_TinkerHood = new TinkersHood();
+//		armor_TinkerShoes = new TinkersShoes();
+//
+//		armor_TinkerCoif = new TinkersCoif();
+//		armor_TinkerHauberk = new TinkersHauberk();
+//		armor_TinkerChausses = new TinkersChausses();
+//		armor_TinkerBoots = new TinkersBoots();
+//
+//		accessory_sheath = new Sheath();
+//
+//		block_Unstable = new UnstableBlock();
+//		block_GlowCrumbs = new GlowstoneCrumbs();
+//
+//		GameRegistry.registerItem(armor_TinkerHelm, "tinkerhelm");
+//		GameRegistry.registerItem(armor_TinkerBreastplate, "tinkerbreastplate");
+//		GameRegistry.registerItem(armor_TinkerGrieves, "tinkergrieves");
+//		GameRegistry.registerItem(armor_TinkerSabatons, "tinkersabatons");
+//		GameRegistry.registerItem(armor_TinkerGauntlets, "tinkergauntlets");
+//
+//		GameRegistry.registerItem(armor_TinkerCoif, "tinkercoif");
+//		GameRegistry.registerItem(armor_TinkerHauberk, "tinkerhauberk");
+//		GameRegistry.registerItem(armor_TinkerChausses, "tinkerchausses");
+//		GameRegistry.registerItem(armor_TinkerBoots, "tinkerboots");
+//
+//		GameRegistry.registerItem(armor_TinkerRobe, "tinkerrobe");
+//		GameRegistry.registerItem(armor_TinkerShawl, "tinkershawl");
+//		GameRegistry.registerItem(armor_TinkerHood, "tinkerhood");
+//		GameRegistry.registerItem(armor_TinkerShoes, "tinkershoes");
+//
+//		GameRegistry.registerItem(accessory_sheath, "Sheath");
+//
+//		GameRegistry.registerBlock(block_Unstable, UnstableItemBlock.class, "Unstable");
+//		GameRegistry.registerBlock(block_GlowCrumbs, "Block_GlowCrumbs");
+//
+//		TConstructRegistry.addItemToDirectory("tinkerhelm", armor_TinkerHelm);
+//		TConstructRegistry.addItemToDirectory("tinkerbreastplate", armor_TinkerBreastplate);
+//		TConstructRegistry.addItemToDirectory("tinkergrieves", armor_TinkerGrieves);
+//		TConstructRegistry.addItemToDirectory("tinkersabatons", armor_TinkerSabatons);
+//		TConstructRegistry.addItemToDirectory("tinkergauntlets", armor_TinkerGauntlets);
+//
+//		TConstructRegistry.addItemToDirectory("tinkercoif", armor_TinkerCoif);
+//		TConstructRegistry.addItemToDirectory("tinkerhauberk", armor_TinkerHauberk);
+//		TConstructRegistry.addItemToDirectory("tinkerchausses", armor_TinkerChausses);
+//		TConstructRegistry.addItemToDirectory("tinkerboots", armor_TinkerBoots);
+//
+//		TConstructRegistry.addItemToDirectory("tinkerrobe", armor_TinkerRobe);
+//		TConstructRegistry.addItemToDirectory("tinkershawl", armor_TinkerShawl);
+//		TConstructRegistry.addItemToDirectory("tinkerhood", armor_TinkerHood);
+//		TConstructRegistry.addItemToDirectory("tinkershoes", armor_TinkerShoes);
+//
+//		TConstructRegistry.addItemToDirectory("Sheath", accessory_sheath);
+//	}
+//
+//	public void init(FMLInitializationEvent e)
+//	{
+//
+//		TConstructRegistry.addToolRecipe(armor_TinkerHelm, TinkerTools.frypanHead, TinkerTools.toughRod, TinkersDefense.partArmorplate, TinkersDefense.partChainmaille);
+//		TConstructRegistry.addToolRecipe(armor_TinkerBreastplate, TinkerTools.largePlate, TinkerTools.toughRod, TinkersDefense.partArmorplate, TinkersDefense.partChainmaille);
+//		TConstructRegistry.addToolRecipe(armor_TinkerGrieves, TinkersDefense.partArmorplate, TinkerTools.toughRod, TinkersDefense.partChainmaille, TinkersDefense.partCloth);
+//		TConstructRegistry.addToolRecipe(armor_TinkerSabatons, TinkersDefense.partArmorplate, TinkerTools.toughRod, TinkersDefense.partArmorplate, TinkersDefense.partCloth);
+//		TConstructRegistry.addToolRecipe(armor_TinkerGauntlets, TinkersDefense.partArmorplate, TinkerTools.toughRod, TinkersDefense.partRivet);
+//
+//		TConstructRegistry.addToolRecipe(armor_TinkerRobe, TinkersDefense.partCloth, TinkersDefense.partClasp, TinkersDefense.partCloth);
+//		TConstructRegistry.addToolRecipe(armor_TinkerShawl, TinkersDefense.partCloth, TinkersDefense.partArmorplate, TinkersDefense.partCloth);
+//		TConstructRegistry.addToolRecipe(armor_TinkerHood, TinkersDefense.partCloth, TinkerTools.toolRod, TinkersDefense.partCloth);
+//		TConstructRegistry.addToolRecipe(armor_TinkerShoes, TinkersDefense.partCloth, TinkersDefense.partRivet, TinkersDefense.partCloth);
+//
+//		TConstructRegistry.addToolRecipe(armor_TinkerCoif, TinkersDefense.partChainmaille, TinkerTools.toughRod, TinkersDefense.partCloth);
+//		TConstructRegistry.addToolRecipe(armor_TinkerHauberk, TinkersDefense.partChainmaille, TinkerTools.largePlate, TinkersDefense.partCloth);
+//		TConstructRegistry.addToolRecipe(armor_TinkerChausses, TinkersDefense.partChainmaille, TinkersDefense.partArmorplate, TinkersDefense.partCloth);
+//		TConstructRegistry.addToolRecipe(armor_TinkerBoots, TinkersDefense.partChainmaille, TinkersDefense.partCloth, TinkersDefense.partRivet);
+//
+//		TConstructRegistry.addToolRecipe(accessory_sheath, TinkersDefense.partCloth, TinkersDefense.partCloth, TinkersDefense.partCloth);
+//
+//	}
+//
+//	public void postInit(FMLPostInitializationEvent e)
+//	{
+//
+//	}
+//
+//	public static void clientProxy(FlexibleToolRenderer renderer)
+//	{
+//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.accessory_sheath, renderer);
+//
+//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerHelm, renderer);
+//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerBreastplate, renderer);
+//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerGrieves, renderer);
+//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerSabatons, renderer);
+//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerGauntlets, renderer);
+//
+//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerRobe, renderer);
+//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerShawl, renderer);
+//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerHood, renderer);
+//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerShoes, renderer);
+//
+//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerCoif, renderer);
+//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerHauberk, renderer);
+//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerChausses, renderer);
+//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerBoots, renderer);
+//	}
+//}
diff --git a/src/main/java/lance5057/tDefense/armor/blocks/GlowstoneCrumbs.java b/src/main/java/lance5057/tDefense/armor/blocks/GlowstoneCrumbs.java
deleted file mode 100644
index 13648c2..0000000
--- a/src/main/java/lance5057/tDefense/armor/blocks/GlowstoneCrumbs.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package lance5057.tDefense.armor.blocks;
-
-import java.util.Random;
-
-import lance5057.tDefense.Reference;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.item.Item;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.world.World;
-
-public class GlowstoneCrumbs extends Block
-{
-	public GlowstoneCrumbs()
-	{
-		super(Material.ground);
-		setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F);
-		setBlockName("glowstonecrumbs");
-		setBlockTextureName(Reference.MOD_ID + ":glowstonecrumbs");
-		setLightLevel(1f);
-	}
-
-	/**
-	 * Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been
-	 * cleared to be reused)
-	 */
-	@Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_)
-	{
-		return null;
-	}
-
-	/**
-	 * Is this block (a) opaque and (b) a full 1m cube?  This determines whether or not to render the shared face of two
-	 * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
-	 */
-	@Override
-	public boolean isOpaqueCube()
-	{
-		return false;
-	}
-
-	/**
-	 * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc)
-	 */
-	@Override
-	public boolean renderAsNormalBlock()
-	{
-		return false;
-	}
-
-	/**
-	 * The type of render function that is called for this block
-	 */
-	@Override
-	public int getRenderType()
-	{
-		return 23;
-	}
-
-	@Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
-	{
-		return null;
-	}
-
-	/**
-	 * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z
-	 */
-	@Override
-	public boolean canPlaceBlockAt(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
-	{
-		return super.canPlaceBlockAt(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && canBlockStay(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_);
-	}
-
-	/**
-	 * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are
-	 * their own) Args: x, y, z, neighbor Block
-	 */
-	@Override
-	public void onNeighborBlockChange(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_)
-	{
-		super.onNeighborBlockChange(p_149695_1_, p_149695_2_, p_149695_3_, p_149695_4_, p_149695_5_);
-		checkAndDropBlock(p_149695_1_, p_149695_2_, p_149695_3_, p_149695_4_);
-	}
-
-	/**
-	 * Ticks the block if it's been scheduled
-	 */
-	@Override
-	public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_)
-	{
-		checkAndDropBlock(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_);
-	}
-
-	/**
-	 * checks if the block can stay, if not drop as item
-	 */
-	protected void checkAndDropBlock(World p_149855_1_, int p_149855_2_, int p_149855_3_, int p_149855_4_)
-	{
-		if(!canBlockStay(p_149855_1_, p_149855_2_, p_149855_3_, p_149855_4_))
-		{
-			p_149855_1_.setBlock(p_149855_2_, p_149855_3_, p_149855_4_, getBlockById(0), 0, 2);
-		}
-	}
-
-	/**
-	 * Can this block stay at this position.  Similar to canPlaceBlockAt except gets checked often with plants.
-	 */
-	@Override
-	public boolean canBlockStay(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_)
-	{
-		return p_149718_1_.getBlock(p_149718_2_, p_149718_3_ - 1, p_149718_4_).isNormalCube(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_) && !p_149718_1_.getBlock(p_149718_2_, p_149718_3_ - 1, p_149718_4_).isAir(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_);
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java b/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java
deleted file mode 100644
index adf0c44..0000000
--- a/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package lance5057.tDefense.armor.blocks;
-
-import java.util.List;
-import java.util.Random;
-
-import lance5057.tDefense.Reference;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class UnstableBlock extends Block
-{
-	public static final String[]	types			= {"ice", "obsidian"};
-	public int						timer;
-
-	public static final String[]	field_150096_a	= new String[] {"ice", "obsidian"};
-	@SideOnly(Side.CLIENT)
-	private IIcon[]					field_150095_b;
-
-	public UnstableBlock()
-	{
-		super(Material.rock);
-		setBlockName("unstable");
-		setBlockTextureName("unstable");
-		setTickRandomly(true);
-	}
-
-	/**
-	 * Gets the block's texture. Args: side, meta
-	 */
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int p_149691_1_, int p_149691_2_)
-	{
-		if(p_149691_2_ < 0 || p_149691_2_ >= field_150095_b.length)
-		{
-			p_149691_2_ = 0;
-		}
-
-		return field_150095_b[p_149691_2_];
-	}
-
-	/**
-	 * Determines the damage on the item the block drops. Used in cloth and
-	 * wood.
-	 */
-	@Override
-	public int damageDropped(int p_149692_1_)
-	{
-		return p_149692_1_;
-	}
-
-	/**
-	 * returns a list of blocks with the same ID, but different meta (eg: wood
-	 * returns 4 blocks)
-	 */
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_)
-	{
-		p_149666_3_.add(new ItemStack(p_149666_1_, 1, 0));
-		p_149666_3_.add(new ItemStack(p_149666_1_, 1, 1));
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister p_149651_1_)
-	{
-		field_150095_b = new IIcon[field_150096_a.length];
-
-		for(int i = 0; i < field_150095_b.length; ++i)
-		{
-			field_150095_b[i] = p_149651_1_.registerIcon(Reference.MOD_ID + ":" + getTextureName() + field_150096_a[i]);
-		}
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getRenderBlockPass()
-	{
-		return 1;
-	}
-
-	@Override
-	public void breakBlock(World par1World, int par2, int par3, int par4, Block p_149749_5_, int meta)
-	{
-		//int meta = par1World.getBlockMetadata(par2, par3, par4);
-
-		if(meta == 0)
-		{
-			par1World.setBlock(par2, par3, par4, Blocks.water, 0, 3);
-		}
-		if(meta == 1)
-		{
-			par1World.setBlock(par2, par3, par4, Blocks.lava, 0, 3);
-		}
-		par1World.notifyBlockOfNeighborChange(par2, par3, par4, par1World.getBlock(par2, par3, par4));
-	}
-
-	@Override
-	public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random)
-	{
-		final int meta = par1World.getBlockMetadata(par2, par3, par4);
-
-		if(meta == 0)
-		{
-			par1World.setBlock(par2, par3, par4, Blocks.water, 0, 3);
-		}
-		if(meta == 1)
-		{
-			par1World.setBlock(par2, par3, par4, Blocks.lava, 0, 3);
-		}
-		par1World.notifyBlockOfNeighborChange(par2, par3, par4, par1World.getBlock(par2, par3, par4));
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/armor/blocks/UnstableItemBlock.java b/src/main/java/lance5057/tDefense/armor/blocks/UnstableItemBlock.java
deleted file mode 100644
index 2461704..0000000
--- a/src/main/java/lance5057/tDefense/armor/blocks/UnstableItemBlock.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package lance5057.tDefense.armor.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemBlockWithMetadata;
-import net.minecraft.item.ItemStack;
-
-public class UnstableItemBlock extends ItemBlockWithMetadata
-{
-
-	public UnstableItemBlock(Block block)
-	{
-		super(block, block);
-	}
-
-	@Override
-	public String getUnlocalizedName(ItemStack stack)
-	{
-		return this.getUnlocalizedName() + "_" + UnstableBlock.types[stack.getItemDamage()];
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java b/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java
index c2ee519..7ee9eb5 100644
--- a/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java
+++ b/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java
@@ -1,116 +1,85 @@
-package lance5057.tDefense.armor.events;
-
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.ArmorCore;
-import lance5057.tDefense.armor.renderers.ArmorRenderer;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.MathHelper;
-import net.minecraftforge.event.entity.living.LivingHurtEvent;
-import tconstruct.library.event.ToolCraftEvent.NormalTool;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class ArmorModEvents
-{
-	@SideOnly(Side.CLIENT)
-	@SubscribeEvent
-	public void ToolCraftedEvent(NormalTool event)
-	{
-		if(event.tool instanceof ArmorCore)
-		{
-			final ArmorCore armor = (ArmorCore) event.tool;
-			final ArmorRenderer render = armor.getRenderer();
-			final NBTTagCompound tooltags = event.toolTag;
-			final NBTTagCompound tags = armor.getRenderer().defaultTags;//stack.setTagCompound();
-
-			//			for(int i = 0; i < render.defaultTags.; i++)
-			//			{
-			//				final String rendertag = ((ModelRenderer) render.boxList.get(i)).boxName;
-			//				if(rendertag != null)
-			//				{
-			//					tags.setBoolean(rendertag, ((ModelRenderer) render.boxList.get(i)).isHidden);
-			//				}
-			//			}
-
-			if(!tags.hasNoTags())
-			{
-				tooltags.setTag("ArmorRenderer", tags);
-			}
-		}
-	}
-
-	@SubscribeEvent
-	public void AddProtections(LivingHurtEvent event)
-	{
-		int epf = 0;
-
-		if(TinkersDefense.config.debug && event.entityLiving instanceof EntityPlayer)
-		{
-			((EntityPlayer) event.entityLiving).addChatComponentMessage(new ChatComponentText(
-					event.source.getDamageType() + " - Max: " + Double.toString(event.ammount)));
-		}
-
-		for(int i = 0; i < 4; i++)
-		{
-			final ItemStack armor = event.entityLiving.getEquipmentInSlot(i + 1);
-			if(armor != null && armor.getItem() instanceof ArmorCore)
-			{
-				final NBTTagCompound tags = armor.getTagCompound().getCompoundTag("InfiTool");
-
-				if(!event.source.isUnblockable())
-				{
-					if(tags.hasKey("Protection"))
-					{
-						epf += (calcModifierDamage(tags.getInteger("Protection"), 1f, event.source));
-					}
-					else if(tags.hasKey("Fire Protection") && event.source.isFireDamage())
-					{
-						epf += (calcModifierDamage(tags.getInteger("Fire Protection"), 2f, event.source));
-					}
-					else if(tags.hasKey("Blast Protection") && event.source.isExplosion())
-					{
-						epf += (calcModifierDamage(tags.getInteger("Blast Protection"), 2f, event.source));
-					}
-					else if(tags.hasKey("Projectile Protection") && event.source.isProjectile())
-					{
-						epf += (calcModifierDamage(tags.getInteger("Projectile Protection"), 2f, event.source));
-					}
-				}
-				else if(tags.hasKey("Featherfall") && event.source.getDamageType() == DamageSource.fall.getDamageType())
-				{
-					epf += (calcModifierDamage(tags.getInteger("Featherfall"), 3f, event.source));
-				}
-			}
-		}
-
-		if(epf > 20)
-		{
-			epf = 20;
-		}
-
-		final float adjustedPerc = (float) (1f - (epf * 0.04));
-		event.ammount = adjustedPerc * event.ammount;
-
-		if(TinkersDefense.config.debug && event.entityLiving instanceof EntityPlayer)
-		{
-			((EntityPlayer) event.entityLiving).addChatComponentMessage(new ChatComponentText(
-					event.source.getDamageType() + " - Adjusted: " + Double.toString(event.ammount)));
-		}
-	}
-
-	public int calcModifierDamage(int level, float typeMod, DamageSource source)
-	{
-		if(source.canHarmInCreative())
-			return 0;
-		else
-		{
-			final float f = (6 + level * level) / 3.0F;
-			return MathHelper.floor_float(f * typeMod);
-		}
-	}
-}
+//package lance5057.tDefense.armor.events;
+//
+//import lance5057.tDefense.TinkersDefense;
+//import lance5057.tDefense.armor.ArmorCore;
+//import net.minecraft.entity.player.EntityPlayer;
+//import net.minecraft.item.ItemStack;
+//import net.minecraft.nbt.NBTTagCompound;
+//import net.minecraft.util.ChatComponentText;
+//import net.minecraft.util.DamageSource;
+//import net.minecraft.util.MathHelper;
+//import net.minecraftforge.event.entity.living.LivingHurtEvent;
+//import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+//
+//public class ArmorModEvents
+//{
+//	@SubscribeEvent
+//	public void AddProtections(LivingHurtEvent event)
+//	{
+//		int epf = 0;
+//
+//		if(TinkersDefense.config.debug && event.entityLiving instanceof EntityPlayer)
+//		{
+//			((EntityPlayer) event.entityLiving).addChatComponentMessage(new ChatComponentText(
+//					event.source.getDamageType() + " - Max: " + Double.toString(event.ammount)));
+//		}
+//
+//		for(int i = 0; i < 4; i++)
+//		{
+//			final ItemStack armor = event.entityLiving.getEquipmentInSlot(i + 1);
+//			if(armor != null && armor.getItem() instanceof ArmorCore)
+//			{
+//				final NBTTagCompound tags = armor.getTagCompound().getCompoundTag("InfiTool");
+//
+//				if(!event.source.isUnblockable())
+//				{
+//					if(tags.hasKey("Protection"))
+//					{
+//						epf += (calcModifierDamage(tags.getInteger("Protection"), 1f, event.source));
+//					}
+//					else if(tags.hasKey("Fire Protection") && event.source.isFireDamage())
+//					{
+//						epf += (calcModifierDamage(tags.getInteger("Fire Protection"), 2f, event.source));
+//					}
+//					else if(tags.hasKey("Blast Protection") && event.source.isExplosion())
+//					{
+//						epf += (calcModifierDamage(tags.getInteger("Blast Protection"), 2f, event.source));
+//					}
+//					else if(tags.hasKey("Projectile Protection") && event.source.isProjectile())
+//					{
+//						epf += (calcModifierDamage(tags.getInteger("Projectile Protection"), 2f, event.source));
+//					}
+//				}
+//				else if(tags.hasKey("Featherfall") && event.source.getDamageType() == DamageSource.fall.getDamageType())
+//				{
+//					epf += (calcModifierDamage(tags.getInteger("Featherfall"), 3f, event.source));
+//				}
+//			}
+//		}
+//
+//		if(epf > 20)
+//		{
+//			epf = 20;
+//		}
+//
+//		final float adjustedPerc = (float) (1f - (epf * 0.04));
+//		event.ammount = adjustedPerc * event.ammount;
+//
+//		if(TinkersDefense.config.debug && event.entityLiving instanceof EntityPlayer)
+//		{
+//			((EntityPlayer) event.entityLiving).addChatComponentMessage(new ChatComponentText(
+//					event.source.getDamageType() + " - Adjusted: " + Double.toString(event.ammount)));
+//		}
+//	}
+//
+//	public int calcModifierDamage(int level, float typeMod, DamageSource source)
+//	{
+//		if(source.canHarmInCreative())
+//			return 0;
+//		else
+//		{
+//			final float f = (6 + level * level) / 3.0F;
+//			return MathHelper.floor_float(f * typeMod);
+//		}
+//	}
+//}
diff --git a/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java b/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java
index 535dc35..a4e44b2 100644
--- a/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java
+++ b/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java
@@ -1,94 +1,94 @@
-package lance5057.tDefense.armor.events;
-
-import lance5057.tDefense.armor.ArmorCore;
-import net.minecraft.client.model.ModelBiped;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.EnumAction;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.client.event.RenderPlayerEvent;
-import tconstruct.armor.ArmorProxyClient;
-import tconstruct.armor.player.ArmorExtended;
-import tconstruct.library.tools.ToolCore;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class ArmorRenderEvent
-{
-
-	@SideOnly(Side.CLIENT)
-	@SubscribeEvent
-	public void renderArmorEvent(RenderPlayerEvent.SetArmorModel event)
-	{
-		if(event.entityPlayer != null)
-		{
-			final ArmorExtended armorEx = ArmorProxyClient.armorExtended;
-
-			final ItemStack Armor = event.entityPlayer.inventory.armorItemInSlot(event.slot);
-
-			if(Armor != null && Armor.getItem() instanceof ArmorCore)
-			{
-				final ModelBiped armorModel = Armor.getItem().getArmorModel(event.entityLiving, Armor, event.slot);
-
-				TrimArmor(armorModel, event);
-			}
-
-			final ItemStack Accessory = armorEx.getStackInSlot(event.slot);
-
-			if(Accessory != null && Accessory.getItem() instanceof ToolCore)
-			{
-				final ModelBiped accessoryModel = Accessory.getItem().getArmorModel(event.entityLiving, Accessory, event.slot);
-
-				TrimArmor(accessoryModel, event);
-			}
-
-		}
-	}
-
-	private void TrimArmor(ModelBiped armorModel, RenderPlayerEvent.SetArmorModel event)
-	{
-		if(armorModel != null)
-		{
-			armorModel.isSneak = event.entityPlayer.isSneaking();
-			armorModel.isRiding = event.entityPlayer.isRiding();
-			armorModel.isChild = event.entityPlayer.isChild();
-
-			armorModel.onGround = event.entityPlayer.getSwingProgress(event.partialRenderTick);
-
-			if(event.entityPlayer instanceof EntityPlayer)
-			{
-				final ItemStack itemstack = event.entityPlayer.inventory.getCurrentItem();
-				armorModel.heldItemRight = 0;
-				armorModel.aimedBow = false;
-				if(itemstack != null)
-				{
-					if(event.entityPlayer.getItemInUseCount() > 0)
-					{
-						final EnumAction enumaction = itemstack.getItemUseAction();
-
-						if(enumaction == EnumAction.block)
-						{
-							armorModel.heldItemRight = 3;
-						}
-						else if(enumaction == EnumAction.bow)
-						{
-							armorModel.aimedBow = true;
-						}
-					}
-					else
-					{
-						armorModel.heldItemRight = event.entityPlayer.getHeldItem() != null ? 1 : 0;
-					}
-				}
-			}
-
-			final float yaw = event.entityPlayer.prevRotationYawHead + (event.entityPlayer.rotationYawHead - event.entityPlayer.prevRotationYawHead) * event.partialRenderTick;
-			final float yawOffset = event.entityPlayer.prevRenderYawOffset + (event.entityPlayer.renderYawOffset - event.entityPlayer.prevRenderYawOffset) * event.partialRenderTick;
-			final float limbs = event.entityPlayer.prevLimbSwingAmount + (event.entityPlayer.limbSwingAmount - event.entityPlayer.prevLimbSwingAmount) * event.partialRenderTick;
-			final float limbSwing = event.entityPlayer.limbSwing - event.entityPlayer.limbSwingAmount * (1.0F - event.partialRenderTick);
-
-			armorModel.setRotationAngles(limbSwing, limbs, event.entityPlayer.ticksExisted, yaw - yawOffset, event.entityPlayer.rotationPitch, 0.1f, event.entityPlayer);
-			armorModel.render(event.entityPlayer, limbSwing, limbs, event.entityPlayer.ticksExisted, yaw - yawOffset, event.entityPlayer.rotationPitch, 0.1f);
-		}
-	}
-}
+//package lance5057.tDefense.armor.events;
+//
+//import lance5057.tDefense.armor.ArmorCore;
+//import net.minecraft.client.model.ModelBiped;
+//import net.minecraft.entity.player.EntityPlayer;
+//import net.minecraft.item.EnumAction;
+//import net.minecraft.item.ItemStack;
+//import net.minecraftforge.client.event.RenderPlayerEvent;
+//import tconstruct.armor.ArmorProxyClient;
+//import tconstruct.armor.player.ArmorExtended;
+//import tconstruct.library.tools.ToolCore;
+//import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+//import cpw.mods.fml.relauncher.Side;
+//import cpw.mods.fml.relauncher.SideOnly;
+//
+//public class ArmorRenderEvent
+//{
+//
+//	@SideOnly(Side.CLIENT)
+//	@SubscribeEvent
+//	public void renderArmorEvent(RenderPlayerEvent.SetArmorModel event)
+//	{
+//		if(event.entityPlayer != null)
+//		{
+//			final ArmorExtended armorEx = ArmorProxyClient.armorExtended;
+//
+//			final ItemStack Armor = event.entityPlayer.inventory.armorItemInSlot(event.slot);
+//
+//			if(Armor != null && Armor.getItem() instanceof ArmorCore)
+//			{
+//				final ModelBiped armorModel = Armor.getItem().getArmorModel(event.entityLiving, Armor, event.slot);
+//
+//				TrimArmor(armorModel, event);
+//			}
+//
+//			final ItemStack Accessory = armorEx.getStackInSlot(event.slot);
+//
+//			if(Accessory != null && Accessory.getItem() instanceof ToolCore)
+//			{
+//				final ModelBiped accessoryModel = Accessory.getItem().getArmorModel(event.entityLiving, Accessory, event.slot);
+//
+//				TrimArmor(accessoryModel, event);
+//			}
+//
+//		}
+//	}
+//
+//	private void TrimArmor(ModelBiped armorModel, RenderPlayerEvent.SetArmorModel event)
+//	{
+//		if(armorModel != null)
+//		{
+//			armorModel.isSneak = event.entityPlayer.isSneaking();
+//			armorModel.isRiding = event.entityPlayer.isRiding();
+//			armorModel.isChild = event.entityPlayer.isChild();
+//
+//			armorModel.onGround = event.entityPlayer.getSwingProgress(event.partialRenderTick);
+//
+//			if(event.entityPlayer instanceof EntityPlayer)
+//			{
+//				final ItemStack itemstack = event.entityPlayer.inventory.getCurrentItem();
+//				armorModel.heldItemRight = 0;
+//				armorModel.aimedBow = false;
+//				if(itemstack != null)
+//				{
+//					if(event.entityPlayer.getItemInUseCount() > 0)
+//					{
+//						final EnumAction enumaction = itemstack.getItemUseAction();
+//
+//						if(enumaction == EnumAction.block)
+//						{
+//							armorModel.heldItemRight = 3;
+//						}
+//						else if(enumaction == EnumAction.bow)
+//						{
+//							armorModel.aimedBow = true;
+//						}
+//					}
+//					else
+//					{
+//						armorModel.heldItemRight = event.entityPlayer.getHeldItem() != null ? 1 : 0;
+//					}
+//				}
+//			}
+//
+//			final float yaw = event.entityPlayer.prevRotationYawHead + (event.entityPlayer.rotationYawHead - event.entityPlayer.prevRotationYawHead) * event.partialRenderTick;
+//			final float yawOffset = event.entityPlayer.prevRenderYawOffset + (event.entityPlayer.renderYawOffset - event.entityPlayer.prevRenderYawOffset) * event.partialRenderTick;
+//			final float limbs = event.entityPlayer.prevLimbSwingAmount + (event.entityPlayer.limbSwingAmount - event.entityPlayer.prevLimbSwingAmount) * event.partialRenderTick;
+//			final float limbSwing = event.entityPlayer.limbSwing - event.entityPlayer.limbSwingAmount * (1.0F - event.partialRenderTick);
+//
+//			armorModel.setRotationAngles(limbSwing, limbs, event.entityPlayer.ticksExisted, yaw - yawOffset, event.entityPlayer.rotationPitch, 0.1f, event.entityPlayer);
+//			armorModel.render(event.entityPlayer, limbSwing, limbs, event.entityPlayer.ticksExisted, yaw - yawOffset, event.entityPlayer.rotationPitch, 0.1f);
+//		}
+//	}
+//}
diff --git a/src/main/java/lance5057/tDefense/armor/items/Sheath.java b/src/main/java/lance5057/tDefense/armor/items/Sheath.java
deleted file mode 100644
index 165c187..0000000
--- a/src/main/java/lance5057/tDefense/armor/items/Sheath.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package lance5057.tDefense.armor.items;
-
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.ArmorCore;
-import lance5057.tDefense.armor.renderers.ArmorRenderer;
-import lance5057.tDefense.proxy.ClientProxy;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import tconstruct.library.accessory.IAccessory;
-import tconstruct.tools.TinkerTools;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class Sheath extends ArmorCore implements IAccessory
-{
-
-	public Sheath()
-	{
-		super(0, -1);
-	}
-
-	@Override
-	public boolean canEquipAccessory(ItemStack item, int slot)
-	{
-		return slot == 3;
-	}
-
-	@Override
-	public Item getHeadItem()
-	{
-		return TinkersDefense.partArmorplate;
-	}
-
-	@Override
-	public Item getHandleItem()
-	{
-		return TinkerTools.toolRod;
-	}
-
-	@Override
-	public Item getAccessoryItem()
-	{
-		return TinkersDefense.partCloth;
-	}
-
-	//	@Override
-	//	public Item getExtraItem()
-	//	{
-	//		return TinkersDefense.partCloth;
-	//	}
-
-	@Override
-	public String getDefaultFolder()
-	{
-		// TODO Auto-generated method stub
-		return "Armor/Sheath";
-	}
-
-	@Override
-	public String getEffectSuffix()
-	{
-		return "_sheath_effect";
-	}
-
-	@SideOnly(Side.CLIENT)
-	@Override
-	public int getPartAmount()
-	{
-		return 3;
-	}
-
-	@Override
-	public String getIconSuffix(int partType)
-	{
-		switch(partType)
-		{
-			case 0:
-				return "_tabard_cloth";
-			case 1:
-				return "_shield_base_broken"; //useless
-			case 2:
-				return "_tabard_trim";
-			case 3:
-				return "_tabard_filigree";
-				//			case 4:
-				//				return "_sheath_clasp";
-			default:
-				return "";
-		}
-	}
-
-	@Override
-	public String[] getTraits()
-	{
-		return new String[] {"sheath", "cosmetic"};
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public ArmorRenderer getRenderer()
-	{
-		// TODO Auto-generated method stub
-		return ClientProxy.sheath;
-	}
-
-}
diff --git a/src/main/java/lance5057/tDefense/armor/items/TinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/items/TinkersGauntlets.java
index f516225..b5d9f6e 100644
--- a/src/main/java/lance5057/tDefense/armor/items/TinkersGauntlets.java
+++ b/src/main/java/lance5057/tDefense/armor/items/TinkersGauntlets.java
@@ -1,134 +1,130 @@
-package lance5057.tDefense.armor.items;
-
-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.library.accessory.IAccessory;
-import tconstruct.tools.TinkerTools;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class TinkersGauntlets extends ArmorCore implements IAccessory
-{
-	public TinkersGauntlets()
-	{
-		super(0, -1);
-		setUnlocalizedName("tinkersgauntlets");
-	}
-
-	@Override
-	public boolean canEquipAccessory(ItemStack item, int slot)
-	{
-		return slot == 1;
-	}
-
-	@Override
-	public Item getHeadItem()
-	{
-		return TinkersDefense.partArmorplate;
-	}
-
-	@Override
-	public Item getHandleItem()
-	{
-		return TinkerTools.toughRod;
-	}
-
-	@Override
-	public Item getAccessoryItem()
-	{
-		return TinkersDefense.partRivet;
-	}
-
-	@Override
-	public int durabilityTypeAccessory()
-	{
-		return 2;
-	}
-
-	@Override
-	public float getRepairCost()
-	{
-		return 1.0f;
-	}
-
-	@Override
-	public float getDurabilityModifier()
-	{
-		return 2.5f;
-	}
-
-	@Override
-	public float getDamageModifier()
-	{
-		return 0f;
-	}
-
-	@Override
-	public int getPartAmount()
-	{
-		return 3;
-	}
-
-	@Override
-	public String getIconSuffix(int partType)
-	{
-		switch(partType)
-		{
-			case 0:
-				return "_gauntlet_plate";
-			case 1:
-				return "_gauntlet_plate_broken";
-			case 2:
-				return "_gauntlet_trim";
-			case 3:
-				return "_gauntlet_rivet";
-			default:
-				return "";
-		}
-	}
-
-	@Override
-	public String getEffectSuffix()
-	{
-		return "_gauntlet_effect";
-	}
-
-	@Override
-	public String getDefaultFolder()
-	{
-		return "armor/gauntlets";
-	}
-
-	// @Override
-	// public void onUpdate(ItemStack stack, World world, Entity entity, int
-	// par4,
-	// boolean par5) {
-	// super.onUpdate(stack, world, entity, par4, par5);
-	//
-	// }
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
-	{
-		return "tinkersdefense:textures/armor/Tinkersgauntlet.png";
-	}
-
-	@Override
-	public String[] getTraits()
-	{
-		return new String[] {"hands", "gauntlet"};
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public ArmorRenderer getRenderer()
-	{
-		return ClientProxy.gauntlets;
-	}
-}
+//package lance5057.tDefense.armor.items;
+//
+//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.library.accessory.IAccessory;
+//import tconstruct.tools.TinkerTools;
+//
+//public class TinkersGauntlets extends ArmorCore implements IAccessory
+//{
+//	public TinkersGauntlets()
+//	{
+//		super(0, -1);
+//		setUnlocalizedName("tinkersgauntlets");
+//	}
+//
+//	@Override
+//	public boolean canEquipAccessory(ItemStack item, int slot)
+//	{
+//		return slot == 1;
+//	}
+//
+//	@Override
+//	public Item getHeadItem()
+//	{
+//		return TinkersDefense.partArmorplate;
+//	}
+//
+//	@Override
+//	public Item getHandleItem()
+//	{
+//		return TinkerTools.toughRod;
+//	}
+//
+//	@Override
+//	public Item getAccessoryItem()
+//	{
+//		return TinkersDefense.partRivet;
+//	}
+//
+//	@Override
+//	public int durabilityTypeAccessory()
+//	{
+//		return 2;
+//	}
+//
+//	@Override
+//	public float getRepairCost()
+//	{
+//		return 1.0f;
+//	}
+//
+//	@Override
+//	public float getDurabilityModifier()
+//	{
+//		return 2.5f;
+//	}
+//
+//	@Override
+//	public float getDamageModifier()
+//	{
+//		return 0f;
+//	}
+//
+//	@Override
+//	public int getPartAmount()
+//	{
+//		return 3;
+//	}
+//
+//	@Override
+//	public String getIconSuffix(int partType)
+//	{
+//		switch(partType)
+//		{
+//			case 0:
+//				return "_gauntlet_plate";
+//			case 1:
+//				return "_gauntlet_plate_broken";
+//			case 2:
+//				return "_gauntlet_trim";
+//			case 3:
+//				return "_gauntlet_rivet";
+//			default:
+//				return "";
+//		}
+//	}
+//
+//	@Override
+//	public String getEffectSuffix()
+//	{
+//		return "_gauntlet_effect";
+//	}
+//
+//	@Override
+//	public String getDefaultFolder()
+//	{
+//		return "armor/gauntlets";
+//	}
+//
+//	// @Override
+//	// public void onUpdate(ItemStack stack, World world, Entity entity, int
+//	// par4,
+//	// boolean par5) {
+//	// super.onUpdate(stack, world, entity, par4, par5);
+//	//
+//	// }
+//
+//	@Override
+//	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
+//	{
+//		return "tinkersdefense:textures/armor/Tinkersgauntlet.png";
+//	}
+//
+//	@Override
+//	public String[] getTraits()
+//	{
+//		return new String[] {"hands", "gauntlet"};
+//	}
+//
+//	@Override
+//	public ArmorRenderer getRenderer()
+//	{
+//		return ClientProxy.gauntlets;
+//	}
+//}
diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
index 756237d..1ebc963 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
@@ -1,186 +1,182 @@
-package lance5057.tDefense.armor.items.cloth;
-
-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.IVisDiscountGear;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.nodes.IRevealer;
-import vazkii.botania.api.mana.IManaDiscountArmor;
-import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
-import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge;
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@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), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)})
-public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles, IVisDiscountGear, IManaDiscountArmor
-{
-	public TinkersHood()
-	{
-		super(0, 0);
-		setUnlocalizedName("tinkershood");
-	}
-
-	@Override
-	public Item getHeadItem()
-	{
-		return TinkersDefense.partCloth;
-	}
-
-	@Override
-	public Item getHandleItem()
-	{
-		return TinkerTools.toolRod;
-	}
-
-	@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 "_hood_cloth";
-			case 1:
-				return "_hood_cloth_broken";
-			case 2:
-				return "_hood_metal";
-			case 3:
-				return "_hood_trim";
-			default:
-				return "";
-		}
-	}
-
-	@Override
-	public String getEffectSuffix()
-	{
-		return "_hood_effect";
-	}
-
-	@Override
-	public String getDefaultFolder()
-	{
-		return "armor/hood";
-	}
-
-	//	@Override
-	//	public void onUpdate(ItemStack stack, World world, Entity entity, int par4,
-	//			boolean par5) {
-	//		super.onUpdate(stack, world, entity, par4, par5);
-	//
-	//	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
-	{
-		return "tinkersdefense:textures/armor/TinkersHood.png";
-	}
-
-	@Override
-	public String[] getTraits()
-	{
-		return new String[] {"armor", "head", "hood", "cloth"};
-	}
-
-	@Override
-	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
-	{
-		return 0;
-	}
-
-	@Override
-	@Optional.Method(modid = "Thaumcraft")
-	public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect)
-	{
-		return stack.getTagCompound().getCompoundTag("InfiTool").getInteger("VisEmbroidery");
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public ArmorRenderer getRenderer()
-	{
-		return ClientProxy.hood;
-	}
-
-	@Override
-	public float getDiscount(ItemStack stack, int arg1, EntityPlayer arg2)
-	{
-		final float i = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("ManaEmbroidery") / 100f;
-		return i;
-	}
-
-	@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");
-	}
-}
+//package lance5057.tDefense.armor.items.cloth;
+//
+//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.IVisDiscountGear;
+//import thaumcraft.api.aspects.Aspect;
+//import thaumcraft.api.nodes.IRevealer;
+//import vazkii.botania.api.mana.IManaDiscountArmor;
+//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), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)})
+//public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles, IVisDiscountGear, IManaDiscountArmor
+//{
+//	public TinkersHood()
+//	{
+//		super(0, 0);
+//		setUnlocalizedName("tinkershood");
+//	}
+//
+//	@Override
+//	public Item getHeadItem()
+//	{
+//		return TinkersDefense.partCloth;
+//	}
+//
+//	@Override
+//	public Item getHandleItem()
+//	{
+//		return TinkerTools.toolRod;
+//	}
+//
+//	@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 "_hood_cloth";
+//			case 1:
+//				return "_hood_cloth_broken";
+//			case 2:
+//				return "_hood_metal";
+//			case 3:
+//				return "_hood_trim";
+//			default:
+//				return "";
+//		}
+//	}
+//
+//	@Override
+//	public String getEffectSuffix()
+//	{
+//		return "_hood_effect";
+//	}
+//
+//	@Override
+//	public String getDefaultFolder()
+//	{
+//		return "armor/hood";
+//	}
+//
+//	//	@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/TinkersHood.png";
+//	}
+//
+//	@Override
+//	public String[] getTraits()
+//	{
+//		return new String[] {"armor", "head", "hood", "cloth"};
+//	}
+//
+//	@Override
+//	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
+//	{
+//		return 0;
+//	}
+//
+//	@Override
+//	@Optional.Method(modid = "Thaumcraft")
+//	public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect)
+//	{
+//		return stack.getTagCompound().getCompoundTag("InfiTool").getInteger("VisEmbroidery");
+//	}
+//
+//	@Override
+//	public ArmorRenderer getRenderer()
+//	{
+//		return ClientProxy.hood;
+//	}
+//
+//	@Override
+//	public float getDiscount(ItemStack stack, int arg1, EntityPlayer arg2)
+//	{
+//		final float i = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("ManaEmbroidery") / 100f;
+//		return i;
+//	}
+//
+//	@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/cloth/TinkersRobe.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java
index bad02bd..c0c0df4 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java
@@ -1,152 +1,148 @@
-package lance5057.tDefense.armor.items.cloth;
-
-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 thaumcraft.api.IVisDiscountGear;
-import thaumcraft.api.aspects.Aspect;
-import vazkii.botania.api.mana.IManaDiscountArmor;
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)})
-public class TinkersRobe extends ArmorCore implements IVisDiscountGear, IManaDiscountArmor
-{
-	public TinkersRobe()
-	{
-		super(0, 2);
-		setUnlocalizedName("tinkerrobe");
-	}
-
-	@Override
-	public Item getHeadItem()
-	{
-		return TinkersDefense.partCloth;
-	}
-
-	@Override
-	public Item getHandleItem()
-	{
-		return TinkersDefense.partClasp;
-	}
-
-	@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 "_robe_cloth";
-			case 1:
-				return "_robe_cloth_broken";
-			case 2:
-				return "_robe_metal";
-			case 3:
-				return "_robe_trim";
-			default:
-				return "";
-		}
-	}
-
-	@Override
-	public String getEffectSuffix()
-	{
-		return "_robe_effect";
-	}
-
-	@Override
-	public String getDefaultFolder()
-	{
-		return "armor/robe";
-	}
-
-	//	@Override
-	//	public void onUpdate(ItemStack stack, World world, Entity entity, int par4,
-	//			boolean par5) {
-	//		super.onUpdate(stack, world, entity, par4, par5);
-	//
-	//	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
-	{
-		return "tinkersdefense:textures/armor/TinkersRobe.png";
-	}
-
-	@Override
-	public String[] getTraits()
-	{
-		return new String[] {"armor", "pants", "robe", "cloth"};
-	}
-
-	@Override
-	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
-	{
-		return 0;
-	}
-
-	@Override
-	@Optional.Method(modid = "Thaumcraft")
-	public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect)
-	{
-		final int vis = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("VisEmbroidery");
-		return vis;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public ArmorRenderer getRenderer()
-	{
-		return ClientProxy.robe;
-	}
-
-	@Override
-	public float getDiscount(ItemStack stack, int arg1, EntityPlayer arg2)
-	{
-		final float i = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("ManaEmbroidery") / 100f;
-		return i;
-	}
-}
+//package lance5057.tDefense.armor.items.cloth;
+//
+//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 thaumcraft.api.IVisDiscountGear;
+//import thaumcraft.api.aspects.Aspect;
+//import vazkii.botania.api.mana.IManaDiscountArmor;
+//import cpw.mods.fml.common.Optional;
+//
+//@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)})
+//public class TinkersRobe extends ArmorCore implements IVisDiscountGear, IManaDiscountArmor
+//{
+//	public TinkersRobe()
+//	{
+//		super(0, 2);
+//		setUnlocalizedName("tinkerrobe");
+//	}
+//
+//	@Override
+//	public Item getHeadItem()
+//	{
+//		return TinkersDefense.partCloth;
+//	}
+//
+//	@Override
+//	public Item getHandleItem()
+//	{
+//		return TinkersDefense.partClasp;
+//	}
+//
+//	@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 "_robe_cloth";
+//			case 1:
+//				return "_robe_cloth_broken";
+//			case 2:
+//				return "_robe_metal";
+//			case 3:
+//				return "_robe_trim";
+//			default:
+//				return "";
+//		}
+//	}
+//
+//	@Override
+//	public String getEffectSuffix()
+//	{
+//		return "_robe_effect";
+//	}
+//
+//	@Override
+//	public String getDefaultFolder()
+//	{
+//		return "armor/robe";
+//	}
+//
+//	//	@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/TinkersRobe.png";
+//	}
+//
+//	@Override
+//	public String[] getTraits()
+//	{
+//		return new String[] {"armor", "pants", "robe", "cloth"};
+//	}
+//
+//	@Override
+//	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
+//	{
+//		return 0;
+//	}
+//
+//	@Override
+//	@Optional.Method(modid = "Thaumcraft")
+//	public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect)
+//	{
+//		final int vis = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("VisEmbroidery");
+//		return vis;
+//	}
+//
+//	@Override
+//	public ArmorRenderer getRenderer()
+//	{
+//		return ClientProxy.robe;
+//	}
+//
+//	@Override
+//	public float getDiscount(ItemStack stack, int arg1, EntityPlayer arg2)
+//	{
+//		final float i = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("ManaEmbroidery") / 100f;
+//		return i;
+//	}
+//}
diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java
index 17b84a2..bb913a2 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java
@@ -1,154 +1,150 @@
-package lance5057.tDefense.armor.items.cloth;
-
-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 thaumcraft.api.IVisDiscountGear;
-import thaumcraft.api.aspects.Aspect;
-import vazkii.botania.api.mana.IManaDiscountArmor;
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)})
-public class TinkersShawl extends ArmorCore implements IVisDiscountGear, IManaDiscountArmor
-{
-	public TinkersShawl()
-	{
-		super(0, 1);
-		setUnlocalizedName("tinkersshawl");
-	}
-
-	@Override
-	public Item getHeadItem()
-	{
-		return TinkersDefense.partCloth;
-	}
-
-	@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 1f;
-	}
-
-	@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 "_shawl_cloth";
-			case 1:
-				return "_shawl_cloth_broken";
-			case 2:
-				return "_shawl_metal";
-			case 3:
-				return "_shawl_trim";
-			default:
-				return "";
-		}
-	}
-
-	@Override
-	public String getEffectSuffix()
-	{
-		return "_shawl_effect";
-	}
-
-	@Override
-	public String getDefaultFolder()
-	{
-		return "armor/shawl";
-	}
-
-	//	@Override
-	//	public void onUpdate(ItemStack stack, World world, Entity entity, int par4,
-	//			boolean par5) {
-	//		super.onUpdate(stack, world, entity, par4, par5);
-	//
-	//	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
-	{
-		return "tinkersdefense:textures/armor/TinkersShawl.png";
-	}
-
-	@Override
-	public String[] getTraits()
-	{
-		return new String[] {"armor", "chest", "shawl", "cloth"};
-	}
-
-	@Override
-	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
-	{
-		return 0;
-	}
-
-	@Override
-	@Optional.Method(modid = "Thaumcraft")
-	public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect)
-	{
-		final int test = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("VisEmbroidery");
-		return test;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public ArmorRenderer getRenderer()
-	{
-		// TODO Auto-generated method stub
-		return ClientProxy.shawl;
-	}
-
-	@Override
-	public float getDiscount(ItemStack stack, int arg1, EntityPlayer arg2)
-	{
-		final float i = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("ManaEmbroidery") / 100f;
-		return i;
-	}
-}
+//package lance5057.tDefense.armor.items.cloth;
+//
+//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 thaumcraft.api.IVisDiscountGear;
+//import thaumcraft.api.aspects.Aspect;
+//import vazkii.botania.api.mana.IManaDiscountArmor;
+//import cpw.mods.fml.common.Optional;
+//
+//@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)})
+//public class TinkersShawl extends ArmorCore implements IVisDiscountGear, IManaDiscountArmor
+//{
+//	public TinkersShawl()
+//	{
+//		super(0, 1);
+//		setUnlocalizedName("tinkersshawl");
+//	}
+//
+//	@Override
+//	public Item getHeadItem()
+//	{
+//		return TinkersDefense.partCloth;
+//	}
+//
+//	@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 1f;
+//	}
+//
+//	@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 "_shawl_cloth";
+//			case 1:
+//				return "_shawl_cloth_broken";
+//			case 2:
+//				return "_shawl_metal";
+//			case 3:
+//				return "_shawl_trim";
+//			default:
+//				return "";
+//		}
+//	}
+//
+//	@Override
+//	public String getEffectSuffix()
+//	{
+//		return "_shawl_effect";
+//	}
+//
+//	@Override
+//	public String getDefaultFolder()
+//	{
+//		return "armor/shawl";
+//	}
+//
+//	//	@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/TinkersShawl.png";
+//	}
+//
+//	@Override
+//	public String[] getTraits()
+//	{
+//		return new String[] {"armor", "chest", "shawl", "cloth"};
+//	}
+//
+//	@Override
+//	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
+//	{
+//		return 0;
+//	}
+//
+//	@Override
+//	@Optional.Method(modid = "Thaumcraft")
+//	public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect)
+//	{
+//		final int test = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("VisEmbroidery");
+//		return test;
+//	}
+//
+//	@Override
+//	public ArmorRenderer getRenderer()
+//	{
+//		// TODO Auto-generated method stub
+//		return ClientProxy.shawl;
+//	}
+//
+//	@Override
+//	public float getDiscount(ItemStack stack, int arg1, EntityPlayer arg2)
+//	{
+//		final float i = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("ManaEmbroidery") / 100f;
+//		return i;
+//	}
+//}
diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java
index a0c77ff..742af0e 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java
@@ -1,151 +1,147 @@
-package lance5057.tDefense.armor.items.cloth;
-
-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 thaumcraft.api.IVisDiscountGear;
-import thaumcraft.api.aspects.Aspect;
-import vazkii.botania.api.mana.IManaDiscountArmor;
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)})
-public class TinkersShoes extends ArmorCore implements IVisDiscountGear, IManaDiscountArmor
-{
-	public TinkersShoes()
-	{
-		super(0, 3);
-		setUnlocalizedName("tinkersshoes");
-	}
-
-	@Override
-	public Item getHeadItem()
-	{
-		return TinkersDefense.partCloth;
-	}
-
-	@Override
-	public Item getHandleItem()
-	{
-		return TinkersDefense.partRivet;
-	}
-
-	@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 "_shoes_cloth";
-			case 1:
-				return "_shoes_cloth_broken";
-			case 2:
-				return "_shoes_metal";
-			case 3:
-				return "_shoes_sole";
-			default:
-				return "";
-		}
-	}
-
-	@Override
-	public String getEffectSuffix()
-	{
-		return "_shoes_effect";
-	}
-
-	@Override
-	public String getDefaultFolder()
-	{
-		return "armor/shoes";
-	}
-
-	//	@Override
-	//	public void onUpdate(ItemStack stack, World world, Entity entity, int par4,
-	//			boolean par5) {
-	//		super.onUpdate(stack, world, entity, par4, par5);
-	//
-	//	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
-	{
-		return "tinkersdefense:textures/armor/TinkersShoes.png";
-	}
-
-	@Override
-	public String[] getTraits()
-	{
-		return new String[] {"armor", "feet", "shoes", "cloth"};
-	}
-
-	@Override
-	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
-	{
-		return 0;
-	}
-
-	@Override
-	@Optional.Method(modid = "Thaumcraft")
-	public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect)
-	{
-		return stack.getTagCompound().getCompoundTag("InfiTool").getInteger("VisEmbroidery");
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public ArmorRenderer getRenderer()
-	{
-		return ClientProxy.shoes;
-	}
-
-	@Override
-	public float getDiscount(ItemStack stack, int arg1, EntityPlayer arg2)
-	{
-		final float i = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("ManaEmbroidery") / 100f;
-		return i;
-	}
-}
+//package lance5057.tDefense.armor.items.cloth;
+//
+//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 thaumcraft.api.IVisDiscountGear;
+//import thaumcraft.api.aspects.Aspect;
+//import vazkii.botania.api.mana.IManaDiscountArmor;
+//import cpw.mods.fml.common.Optional;
+//
+//@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)})
+//public class TinkersShoes extends ArmorCore implements IVisDiscountGear, IManaDiscountArmor
+//{
+//	public TinkersShoes()
+//	{
+//		super(0, 3);
+//		setUnlocalizedName("tinkersshoes");
+//	}
+//
+//	@Override
+//	public Item getHeadItem()
+//	{
+//		return TinkersDefense.partCloth;
+//	}
+//
+//	@Override
+//	public Item getHandleItem()
+//	{
+//		return TinkersDefense.partRivet;
+//	}
+//
+//	@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 "_shoes_cloth";
+//			case 1:
+//				return "_shoes_cloth_broken";
+//			case 2:
+//				return "_shoes_metal";
+//			case 3:
+//				return "_shoes_sole";
+//			default:
+//				return "";
+//		}
+//	}
+//
+//	@Override
+//	public String getEffectSuffix()
+//	{
+//		return "_shoes_effect";
+//	}
+//
+//	@Override
+//	public String getDefaultFolder()
+//	{
+//		return "armor/shoes";
+//	}
+//
+//	//	@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/TinkersShoes.png";
+//	}
+//
+//	@Override
+//	public String[] getTraits()
+//	{
+//		return new String[] {"armor", "feet", "shoes", "cloth"};
+//	}
+//
+//	@Override
+//	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
+//	{
+//		return 0;
+//	}
+//
+//	@Override
+//	@Optional.Method(modid = "Thaumcraft")
+//	public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect)
+//	{
+//		return stack.getTagCompound().getCompoundTag("InfiTool").getInteger("VisEmbroidery");
+//	}
+//
+//	@Override
+//	public ArmorRenderer getRenderer()
+//	{
+//		return ClientProxy.shoes;
+//	}
+//
+//	@Override
+//	public float getDiscount(ItemStack stack, int arg1, EntityPlayer arg2)
+//	{
+//		final float i = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("ManaEmbroidery") / 100f;
+//		return i;
+//	}
+//}
diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersBreastplate.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersBreastplate.java
index af6ccfb..07905a4 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersBreastplate.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersBreastplate.java
@@ -1,129 +1,64 @@
 package lance5057.tDefense.armor.items.heavy;
 
-import lance5057.tDefense.TinkersDefense;
+import java.util.List;
+
 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.entity.EntityLivingBase;
+import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
-import tconstruct.tools.TinkerTools;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+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(2, 1);
+		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 Item getHeadItem()
-	{
-		return TinkerTools.largePlate;
-	}
-
-	@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;
+	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
+		// TODO Auto-generated method stub
+		
 	}
 
 	@Override
-	public float getDamageModifier()
-	{
-		return 1.4f;
+	public float damagePotential() {
+		// TODO Auto-generated method stub
+		return 0;
 	}
 
 	@Override
-	public int getPartAmount()
-	{
-		return 4;
-	}
-
-	@Override
-	public String getIconSuffix(int partType)
-	{
-		switch(partType)
-		{
-			case 0:
-				return "_breastplate_plate";
-			case 1:
-				return "_breastplate_plate_broken";
-			case 2:
-				return "_breastplate_trim";
-			case 3:
-				return "_breastplate_smallplate";
-			case 4:
-				return "_breastplate_chain";
-			default:
-				return "";
-		}
+	public double attackSpeed() {
+		// TODO Auto-generated method stub
+		return 0;
 	}
 
 	@Override
-	public String getEffectSuffix()
-	{
-		return "_breastplate_effect";
-	}
-
-	@Override
-	public String getDefaultFolder()
-	{
-		return "armor/breastplate";
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
-	{
-		return "tinkersdefense:textures/armor/Tinkersbreastplate.png";
-	}
-
-	@Override
-	public String[] getTraits()
-	{
-		return new String[] {"armor", "chest", "breastplate", "heavyarmor"};
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public ArmorRenderer getRenderer()
-	{
-		return ClientProxy.breastplate;
-	}
+	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
index 3a019c8..e763ff8 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java
@@ -1,136 +1,132 @@
-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;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-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
-	@SideOnly(Side.CLIENT)
-	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
-	@SideOnly(Side.CLIENT)
-	public ArmorRenderer getRenderer()
-	{
-		return ClientProxy.grieves;
-	}
-}
+//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
index 02754bf..8e47805 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
@@ -1,173 +1,169 @@
-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;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@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
-	@SideOnly(Side.CLIENT)
-	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
-	@SideOnly(Side.CLIENT)
-	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");
-	}
-}
+//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
index c7f83d0..47bcc77 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java
@@ -1,136 +1,132 @@
-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;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-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
-	@SideOnly(Side.CLIENT)
-	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
-	@SideOnly(Side.CLIENT)
-	public ArmorRenderer getRenderer()
-	{
-		return ClientProxy.sabatons;
-	}
-}
+//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
index 4043a06..9bc9a4f 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java
@@ -1,134 +1,130 @@
-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 cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-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
-	@SideOnly(Side.CLIENT)
-	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
-	@SideOnly(Side.CLIENT)
-	public ArmorRenderer getRenderer()
-	{
-		return ClientProxy.boots;
-	}
-}
+//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
index 3786d7f..41b189c 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java
@@ -1,144 +1,140 @@
-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 cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-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
-	@SideOnly(Side.CLIENT)
-	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
-	@SideOnly(Side.CLIENT)
-	public ArmorRenderer getRenderer()
-	{
-		return ClientProxy.chausses;
-	}
-}
+//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
index 4489fdf..26c6581 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
@@ -1,181 +1,177 @@
-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;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@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
-	@SideOnly(Side.CLIENT)
-	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
-	@SideOnly(Side.CLIENT)
-	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");
-	}
-}
+//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
index 94c2b5f..b6ca11c 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java
@@ -1,135 +1,131 @@
-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;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-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
-	@SideOnly(Side.CLIENT)
-	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
-	@SideOnly(Side.CLIENT)
-	public ArmorRenderer getRenderer()
-	{
-		return ClientProxy.hauberk;
-	}
-}
+//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/modifiers/ArmorMods.java b/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java
index 208031f..e15f44c 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java
@@ -1,560 +1,560 @@
-package lance5057.tDefense.armor.modifiers;
-
-import lance5057.tDefense.TDIntegration;
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.ArmorCore;
-import lance5057.tDefense.armor.TDArmorAddon;
-import lance5057.tDefense.armor.items.cloth.TinkersRobe;
-import lance5057.tDefense.armor.items.heavy.TinkersGrieves;
-import lance5057.tDefense.armor.items.light.TinkersChausses;
-import lance5057.tDefense.armor.modifiers.BloodMagic.BloodArmorMods;
-import lance5057.tDefense.armor.modifiers.Botania.BotaniaArmorMods;
-import lance5057.tDefense.armor.modifiers.Thaumcraft.ThaumArmorMods;
-import lance5057.tDefense.core.tools.modifiers.ModifierBoolExclusive;
-import lance5057.tDefense.core.tools.modifiers.ModifierIntExclusive;
-import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockLiquid;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.client.TConstructClientRegistry;
-import tconstruct.library.crafting.ModifyBuilder;
-import tconstruct.library.tools.ToolCore;
-import tconstruct.tools.TinkerTools;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-public class ArmorMods extends ModifiersBase
-{
-	ThaumArmorMods		tcmods;
-	BotaniaArmorMods	botmods;
-	BloodArmorMods		bloodmods;
-
-	//	Item			item_Canister;
-	//	Item			item_Emptycanister;
-	//	Item			item_Rebreather;
-	//	Item			item_NightvisionGoggles;
-	//
-	//	Item			item_Glowsole;
-	//	Item			item_Firesole;
-	//	Item			item_Icesole;
-	//	Item			item_Feathersole;
-	//	Item			item_Flippers;
-
-	public ArmorMods()
-	{
-		super(new String[] {"Canister", "EmptyCanister", "Rebreather", "NightvisionGoggles", "Glowstep", "Firewalker", "Frostwalker", "FeatherFall", "Flippers"}, "modItemsArmor");
-		FMLCommonHandler.instance().bus().register(this);
-
-		if(TDIntegration.thaumcraft)
-		{
-			tcmods = new ThaumArmorMods();
-		}
-		if(TDIntegration.botania)
-		{
-			botmods = new BotaniaArmorMods();
-		}
-		if(TDIntegration.bloodMagic)
-		{
-			bloodmods = new BloodArmorMods();
-		}
-	}
-
-	@Override
-	public void RegisterRecipes()
-	{
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 0), new Object[] {"-c-", "ses", "-s-", 'c', new ItemStack(
-				Items.coal, 1, 1), 's', new ItemStack(Blocks.sapling, 1), 'e', new ItemStack(
-						modItems, 1, 1)});
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 1), new Object[] {"gsg", "lil", "gig", 'g', new ItemStack(
-				Items.gold_nugget, 1, 0), 's', new ItemStack(Items.slime_ball,
-						1, 0), 'l', new ItemStack(Items.dye, 1, 4), 'i', new ItemStack(
-								Items.iron_ingot, 1, 0)});
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 2), new Object[] {"-s-", "eie", "-d-", 's', new ItemStack(
-				Items.slime_ball, 1, 0), 'e', new ItemStack(modItems, 1, 1), 'i', new ItemStack(
-						TinkersDefense.partArmorplate, 1, 2), 'd', new ItemStack(
-								Items.dye, 1, 4)});
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 3), new Object[] {"-s-", "eie", "-d-", 's', new ItemStack(
-				Items.potionitem, 1, 8262), 'e', new ItemStack(
-						Blocks.glass_pane, 1, 0), 'i', new ItemStack(Items.iron_ingot,
-								1, 0), 'd', new ItemStack(Items.dye, 1, 2)});
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 4), new Object[] {"ggg", "ala", "ggg", 'g', new ItemStack(
-				Blocks.glowstone, 1, 0), 'a', new ItemStack(
-						Items.glowstone_dust, 1, 0), 'l', TConstructRegistry.getItemStack("lavaCrystal")});
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 5), new Object[] {"lol", "oao", "lol", 'o', new ItemStack(
-				Blocks.obsidian, 1, 0), 'a', TConstructRegistry.getItemStack("ingotArdite"), 'l', TConstructRegistry.getItemStack("lavaCrystal")});
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 7), new Object[] {"fgf", 'g', new ItemStack(
-				Items.gold_nugget, 1, 0), 'f', new ItemStack(Items.feather, 1,
-						0)});
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 6), new Object[] {"ili", "lcl", "ili", 'l', new ItemStack(
-				Blocks.lapis_block, 1, 0), 'i', new ItemStack(Blocks.ice, 1, 0), 'c', TConstructRegistry.getItemStack("ingotCobalt")});
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 8), new Object[] {"-b-", "rlr", "-s-", 'b', new ItemStack(
-				Items.leather_boots, 1, 0), 'l', new ItemStack(Items.leather,
-						1, 0), 'r', new ItemStack(TinkerTools.toolRod, 1, 2), 's', new ItemStack(
-								Items.slime_ball, 1, 0)});
-
-		if(TDIntegration.thaumcraft)
-		{
-			tcmods.RegisterRecipes();
-		}
-		if(TDIntegration.botania)
-		{
-			botmods.RegisterRecipes();
-		}
-		if(TDIntegration.bloodMagic)
-		{
-			bloodmods.RegisterRecipes();
-		}
-	}
-
-	@Override
-	public void RegisterModifiers()
-	{
-		//Head only
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 2)},
-				TinkersDefense.config.ArmorRebreatherID, "Rebreather",
-				EnumChatFormatting.GOLD.toString(), "Rebreather",
-				new String[] {"head"}, 1, null));
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 3)},
-				TinkersDefense.config.ArmorNightvisionID, "Nightvision",
-				EnumChatFormatting.GREEN.toString(), "Nightvision",
-				new String[] {"head"}, 1, null));
-		ModifyBuilder.registerModifier(new ModifierIntExclusive(
-				new ItemStack[] {new ItemStack(Items.ghast_tear, 1, 0)},
-				TinkersDefense.config.ArmorAntiBlindnessID, "AntiBlindness", 1,
-				EnumChatFormatting.AQUA.toString(), "AntiBlindness",
-				new String[] {"head"}, 1, null));
-		//ModifyBuilder.registerModifier(new modifierBoolExclusive(new ItemStack[] {new ItemStack(Blocks.pumpkin, 1, 0)}, TinkersDefense.config.ArmorPumpkinID, "Pumpkin", EnumChatFormatting.GOLD.toString(), "Pumpkin", new String[] {"head"}, 1, null));
-
-		//Legs only
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {new ItemStack(Blocks.sticky_piston, 1, 0)},
-				TinkersDefense.config.ArmorHighstepID, "Highstep",
-				EnumChatFormatting.LIGHT_PURPLE.toString(), "Highstep",
-				new String[] {"pants"}, 1, null));
-		ModifyBuilder.registerModifier(new ModifierIntExclusive(
-				new ItemStack[] {new ItemStack(Blocks.redstone_block, 1, 0)},
-				TinkersDefense.config.ArmorSpeedID, "Speed", 1,
-				EnumChatFormatting.DARK_RED.toString(), "Haste",
-				new String[] {"pants"}, 1, null));
-		ModifyBuilder.registerModifier(new ModifierIntExclusive(
-				new ItemStack[] {new ItemStack(Blocks.piston, 1, 0)},
-				TinkersDefense.config.ArmorJumpboostID, "Jump", 1,
-				EnumChatFormatting.WHITE.toString(), "Jump Boost",
-				new String[] {"pants"}, 1, null));
-
-		//Excluding Cloth
-		ModifyBuilder.registerModifier(new modifierProtection(
-				new ItemStack[] {new ItemStack(TinkersDefense.partArmorplate,
-						1, 2)}, TinkersDefense.config.ArmorProtectionID, 1,
-						EnumChatFormatting.DARK_GRAY.toString(), "Protection"));
-		ModifyBuilder.registerModifier(new modifierProtection(
-				new ItemStack[] {new ItemStack(Items.magma_cream, 1)},
-				TinkersDefense.config.ArmorFireProtectionID, 1,
-				EnumChatFormatting.RED.toString(), "Fire Protection"));
-		ModifyBuilder.registerModifier(new modifierProtection(
-				new ItemStack[] {new ItemStack(Blocks.wool, 1)},
-				TinkersDefense.config.ArmorBlastProtectionID, 1,
-				EnumChatFormatting.DARK_GREEN.toString(), "Blast Protection"));
-		ModifyBuilder.registerModifier(new modifierProtection(
-				new ItemStack[] {new ItemStack(TinkersDefense.partRivet, 1, 2)},
-				TinkersDefense.config.ArmorProjectileProtectionID, 1,
-				EnumChatFormatting.GRAY.toString(), "Projectile Protection"));
-		ModifyBuilder.registerModifier(new modifierProtection(
-				new ItemStack[] {new ItemStack(modItems, 1, 7)},
-				TinkersDefense.config.ArmorFeatherfallID, 1,
-				EnumChatFormatting.WHITE.toString(), "Featherfall"));
-		ModifyBuilder.registerModifier(new ModifierIntExclusive(
-				new ItemStack[] {TConstructRegistry.getItemStack("canisterRedHeart")},
-				TinkersDefense.config.ArmorAbsorptionID, "HealthBoost", 1,
-				EnumChatFormatting.DARK_RED.toString(), "HealthBoost",
-				new String[] {"heavy", "light"}, 1, null));
-
-		//Feet only
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 4)},
-				TinkersDefense.config.ArmorGlowstepID, "GlowStep",
-				EnumChatFormatting.YELLOW.toString(), "GlowStep",
-				new String[] {"feet"}, 1, null));
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 5)},
-				TinkersDefense.config.ArmorFirewalkerID, "Firewalker",
-				EnumChatFormatting.RED.toString(), "Firewalker",
-				new String[] {"feet"}, 1, new String[] {"Frostwalker"}));
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 6)},
-				TinkersDefense.config.ArmorFrostwalkerID, "Frostwalker",
-				EnumChatFormatting.BLUE.toString(), "Frostwalker",
-				new String[] {"feet"}, 1, new String[] {"Firewalker"}));
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 8)},
-				TinkersDefense.config.ArmorDepthstriderID, "Depthstrider",
-				EnumChatFormatting.DARK_BLUE.toString(), "Depthstrider",
-				new String[] {"feet"}, 1,
-				new String[] {"Frostwalker", "Firewalker"}));
-
-		for(final ToolCore tool : TConstructRegistry.getToolMapping())
-		{
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorRebreatherID, "tinker", "rebreather", true);
-
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorProtectionID, "tinker", "protection", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorFireProtectionID, "tinker", "fireprotection", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorBlastProtectionID, "tinker", "blastprotection", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorProjectileProtectionID, "tinker", "projprotection", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorFeatherfallID, "tinker", "featherfall", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorAbsorptionID, "tinker", "healthboost", true);
-
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorGlowstepID, "tinker", "glowstep", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorFirewalkerID, "tinker", "firewalk", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorFrostwalkerID, "tinker", "frostwalk", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorDepthstriderID, "tinker", "depthstrider", true);
-
-		}
-
-		if(TDIntegration.thaumcraft)
-		{
-			tcmods.RegisterModifiers();
-		}
-		if(TDIntegration.botania)
-		{
-			botmods.RegisterModifiers();
-		}
-		if(TDIntegration.bloodMagic)
-		{
-			bloodmods.RegisterModifiers();
-		}
-	}
-
-	@Override
-	public void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-		if(!world.isRemote)
-		{
-			if(tags.hasKey("Frostwalker"))
-			{
-				UpdateWalker(tool, stack, world, entity, Material.water, TDArmorAddon.block_Unstable, 0);
-			}
-			if(tags.hasKey("Firewalker"))
-			{
-				UpdateWalker(tool, stack, world, entity, Material.lava, TDArmorAddon.block_Unstable, 1);
-			}
-			if(tags.hasKey("GlowStep"))
-			{
-				UpdateGlowstep(tool, stack, world, entity);
-			}
-			if(tags.hasKey("Rebreather"))
-			{
-				UpdateRebreather(tool, stack, world, entity);
-			}
-			if(tags.hasKey("Nightvision"))
-			{
-				UpdateNightvision(tool, stack, world, entity);
-			}
-			if(tags.hasKey("AntiBlindness"))
-			{
-				UpdateAntiBlind(tool, stack, world, entity);
-			}
-			if(tags.hasKey("HealthBoost"))
-			{
-				UpdateHealthBoost(tool, stack, world, entity, tags);
-				//UpdateHighstep(tool, stack, world, entity);
-			}
-
-		}
-		else
-		{
-			if(tags.hasKey("Depthstrider"))
-			{
-				UpdateFlippers(tool, stack, world, entity);
-			}
-			if(tags.hasKey("Speed"))
-			{
-				UpdateSpeed(tool, stack, world, entity, tags);
-				//			if(tags.hasKey("Jump"))
-				//				UpdateJump(tool, stack, world, entity, tags);
-			}
-		}
-
-		if(TDIntegration.thaumcraft)
-		{
-			tcmods.UpdateAll(tool, stack, world, entity, tags);
-		}
-		if(TDIntegration.botania)
-		{
-			botmods.UpdateAll(tool, stack, world, entity, tags);
-		}
-		if(TDIntegration.bloodMagic)
-		{
-			bloodmods.UpdateAll(tool, stack, world, entity, tags);
-		}
-	}
-
-	public void UpdateWalker(ToolCore tool, ItemStack stack, World world, Entity entity, Material mat, Block replacement, int meta)
-	{
-		final int x = (int) Math.floor(entity.posX);
-		final int y = (int) (entity.posY - entity.getYOffset());
-		final int z = (int) Math.floor(entity.posZ);
-
-		Block block;
-
-		for(int i = 0; i < 5; i++)
-		{
-			for(int j = 0; j < 5; j++)
-			{
-				block = world.getBlock(x + (i - 2), y - 1, z + (j - 2));
-				if(block instanceof BlockLiquid)
-				{
-					if(((BlockLiquid) block).getMaterial() == mat && world.getBlockMetadata(x + (i - 2), y - 1, z + (j - 2)) == 0)
-					{
-						world.setBlock(x + (i - 2), y - 1, z + (j - 2), replacement, meta, 3);
-						world.notifyBlocksOfNeighborChange(x + (i - 2), y - 1, z + (j - 2), world.getBlock(x + (i - 2), y - 1, z + (j - 2)));
-					}
-				}
-			}
-		}
-	}
-
-	int	glowTimer	= 8;
-	int	prevX		= 0;
-	int	prevZ		= 0;
-
-	public void UpdateGlowstep(ToolCore tool, ItemStack stack, World world, Entity entity)
-	{
-		final int x = (int) Math.floor(entity.posX);
-		final int y = (int) (entity.posY - entity.getYOffset());
-		final int z = (int) Math.floor(entity.posZ);
-
-		if(glowTimer == 0)
-		{
-			if(world.getBlock(x, y, z) == Blocks.air && world.getBlock(x, y - 1, z).isNormalCube())
-			{
-				world.setBlock(x, y, z, TDArmorAddon.block_GlowCrumbs, 0, 3);
-				//world.notifyBlocksOfNeighborChange(x + (i - 2), y - 1, z + (j - 2), world.getBlock(x + (i - 2), y - 1, z + (j - 2)));
-			}
-			glowTimer = 8;
-		}
-		else if(Math.abs(x - prevX) >= 1 || Math.abs(z - prevZ) >= 1)
-		{
-			glowTimer--;
-		}
-
-		prevX = x;
-		prevZ = z;
-	}
-
-	public void UpdateFlippers(ToolCore tool, ItemStack stack, World world, Entity entity)
-	{
-		if(entity.isInWater())
-		{
-			entity.motionX *= 1.2;
-			entity.motionY *= 1.2;
-			entity.motionZ *= 1.2;
-		}
-	}
-
-	public void UpdateRebreather(ToolCore tool, ItemStack stack, World world, Entity entity)
-	{
-		final EntityPlayer player = (EntityPlayer) entity;
-		if(player.getAir() <= 0)
-		{
-			ItemStack canStack;
-			int i;
-			int used = 0;
-
-			for(i = 0; i < player.inventory.getSizeInventory(); i++)
-			{
-				if(player.inventory.getStackInSlot(i) != null && player.inventory.getStackInSlot(i).getItem() == modItems && player.inventory.getStackInSlot(i).getItemDamage() == 0)
-				{
-					canStack = player.inventory.getStackInSlot(i);
-					if(used < 2 && canStack.stackSize == 1)
-					{
-						player.inventory.decrStackSize(i, 1);
-						player.inventory.addItemStackToInventory(new ItemStack(
-								modItems, 1, 1));
-						player.setAir(150);
-						used++;
-					}
-					if(used == 0 && canStack.stackSize >= 2)
-					{
-						player.inventory.decrStackSize(i, 2);
-						player.inventory.addItemStackToInventory(new ItemStack(
-								modItems, 2, 1));
-						player.setAir(300);
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	public void UpdateNightvision(ToolCore tool, ItemStack stack, World world, Entity entity)
-	{
-		if(!((EntityPlayer) entity).isPotionActive(Potion.nightVision) || ((EntityPlayer) entity).getActivePotionEffect(Potion.nightVision).getDuration() < 1000)
-		{
-			((EntityPlayer) entity).addPotionEffect(new PotionEffect(
-					Potion.nightVision.id, 1000, 1, true));
-		}
-	}
-
-	boolean	isBlind	= false;
-
-	public void UpdateAntiBlind(ToolCore tool, ItemStack stack, World world, Entity entity)
-	{
-		final NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
-		if(((EntityPlayer) entity).isPotionActive(Potion.blindness) && !isBlind)
-		{
-			final int roll = world.rand.nextInt(100);
-			final int antiLevel = tags.getInteger("AntiBlindness");
-			if(roll < antiLevel * 10)
-			{
-				((EntityPlayer) entity).removePotionEffect(Potion.blindness.id);
-			}
-			else
-			{
-				isBlind = true;
-			}
-		}
-		if(!((EntityPlayer) entity).isPotionActive(Potion.blindness) && isBlind)
-		{
-			isBlind = false;
-		}
-	}
-
-	public void UpdateSpeed(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-		final EntityPlayer ent = (EntityPlayer) entity;
-		if(!entity.isInWater() && !ent.isSneaking() && ent.moveForward > 0.0)
-		{
-			final float speed = (float) (tags.getInteger("Speed") * 0.05);
-			if(entity.onGround)
-			{
-				ent.moveFlying(0.0f, 1.0f, speed);
-			}
-			else
-			{
-				ent.jumpMovementFactor = speed;
-			}
-		}
-	}
-
-	PotionEffect	hb;
-
-	public void UpdateHealthBoost(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-		if(!((EntityPlayer) entity).isPotionActive(21))
-		{
-			((EntityPlayer) entity).addPotionEffect(new PotionEffect(21, 100,
-					tags.getInteger("HealthBoost") - 1, true));
-		}
-		else if(((EntityPlayer) entity).getActivePotionEffect(Potion.potionTypes[21]).getDuration() < 10)
-		{
-			((EntityPlayer) entity).getActivePotionEffect(Potion.potionTypes[21]).combine(new PotionEffect(
-					21, 100, tags.getInteger("HealthBoost") - 1, true));
-		}
-	}
-
-	//	public void UpdateJump(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	//	{
-	//		EntityPlayer ent = (EntityPlayer) entity;
-	//		if(!entity.isInWater() && !ent.isSneaking() && ent.motionY > 0.0)
-	//		{
-	//			float speed = (float) (tags.getInteger("Jump") * 0.15);
-	//
-	//			ent.jumpMovementFactor = speed;
-	//
-	//		}
-	//	}
-
-	@SubscribeEvent
-	public void Jump(LivingJumpEvent event)
-	{
-		if(event.entityLiving instanceof EntityPlayer)
-		{
-			final EntityPlayer player = (EntityPlayer) event.entityLiving;
-			if(player.getCurrentArmor(1) != null && player.getCurrentArmor(1).getItem() instanceof ArmorCore)
-			{
-				final ItemStack legs = player.getCurrentArmor(1);
-				final Item armor = legs.getItem();
-				final NBTTagCompound tags = legs.getTagCompound().getCompoundTag("InfiTool");
-
-				if((armor instanceof TinkersRobe || armor instanceof TinkersChausses || armor instanceof TinkersGrieves) && tags.hasKey("Jump"))
-				{
-					final double speed = tags.getInteger("Jump") * 0.1;
-					player.setVelocity(0, 0.4 + speed, 0);
-					player.velocityChanged = true;
-				}
-			}
-		}
-	}
-
-	@SubscribeEvent
-	public void Highstep(TickEvent.PlayerTickEvent event)
-	{
-		event.player.stepHeight = 0.5f;
-		if(event.player.getCurrentArmor(1) != null && event.player.getCurrentArmor(1).getItem() instanceof ArmorCore)
-		{
-			final ItemStack legs = event.player.getCurrentArmor(1);
-			final Item armor = legs.getItem();
-			final NBTTagCompound tags = legs.getTagCompound().getCompoundTag("InfiTool");
-
-			if((armor instanceof TinkersRobe || armor instanceof TinkersChausses || armor instanceof TinkersGrieves) && tags.hasKey("Highstep") && !event.player.isSneaking())
-			{
-				event.player.stepHeight = 1.0f;
-			}
-		}
-	}
-	//	public void UpdateHighstep(ToolCore tool, ItemStack stack, World world, Entity entity)
-	//	{
-	//		NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
-	//		EntityPlayer ent = (EntityPlayer) entity;
-	//
-	//		if(tool instanceof TinkersRobe || tool instanceof TinkersChausses || tool instanceof TinkersGrieves)
-	//		{
-	//			ent.stepHeight = 0.5f;
-	//			if(tags.hasKey("Highstep"))
-	//			{
-	//				if(!ent.isSneaking())
-	//				{
-	//					ent.stepHeight = 1f;
-	//				}
-	//			}
-	//		}
-	//
-	//	}
-
-	//	@SubscribeEvent
-	//	public void CalmEndermen(LivingSetAttackTargetEvent event)
-	//	{
-	//		NBTTagCompound tags;
-	//
-	//		if(event.target instanceof EntityPlayer)
-	//		{
-	//			if(((EntityPlayer) event.target).getCurrentArmor(3).hasTagCompound() && ((EntityPlayer) event.target).getCurrentArmor(3).getTagCompound().hasKey("InfiTool"))
-	//			{
-	//				tags = ((EntityPlayer) event.target).getCurrentArmor(3).getTagCompound().getCompoundTag("InfiTool");
-	//
-	//				if(event.entityLiving instanceof EntityEnderman && tags.hasKey("Pumpkin"))
-	//				{
-	//					event.entityLiving.setRevengeTarget(null);
-	//				}
-	//			}
-	//		}
-	//	}
-}
+//package lance5057.tDefense.armor.modifiers;
+//
+//import lance5057.tDefense.TDIntegration;
+//import lance5057.tDefense.TinkersDefense;
+//import lance5057.tDefense.armor.ArmorCore;
+//import lance5057.tDefense.armor.TDArmorAddon;
+//import lance5057.tDefense.armor.items.cloth.TinkersRobe;
+//import lance5057.tDefense.armor.items.heavy.TinkersGrieves;
+//import lance5057.tDefense.armor.items.light.TinkersChausses;
+//import lance5057.tDefense.armor.modifiers.BloodMagic.BloodArmorMods;
+//import lance5057.tDefense.armor.modifiers.Botania.BotaniaArmorMods;
+//import lance5057.tDefense.armor.modifiers.Thaumcraft.ThaumArmorMods;
+//import lance5057.tDefense.core.tools.modifiers.ModifierBoolExclusive;
+//import lance5057.tDefense.core.tools.modifiers.ModifierIntExclusive;
+//import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
+//import net.minecraft.block.Block;
+//import net.minecraft.block.BlockLiquid;
+//import net.minecraft.block.material.Material;
+//import net.minecraft.entity.Entity;
+//import net.minecraft.entity.player.EntityPlayer;
+//import net.minecraft.init.Blocks;
+//import net.minecraft.init.Items;
+//import net.minecraft.item.Item;
+//import net.minecraft.item.ItemStack;
+//import net.minecraft.nbt.NBTTagCompound;
+//import net.minecraft.potion.Potion;
+//import net.minecraft.potion.PotionEffect;
+//import net.minecraft.util.EnumChatFormatting;
+//import net.minecraft.world.World;
+//import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent;
+//import tconstruct.library.TConstructRegistry;
+//import tconstruct.library.client.TConstructClientRegistry;
+//import tconstruct.library.crafting.ModifyBuilder;
+//import tconstruct.library.tools.ToolCore;
+//import tconstruct.tools.TinkerTools;
+//import cpw.mods.fml.common.FMLCommonHandler;
+//import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+//import cpw.mods.fml.common.gameevent.TickEvent;
+//import cpw.mods.fml.common.registry.GameRegistry;
+//
+//public class ArmorMods extends ModifiersBase
+//{
+//	ThaumArmorMods		tcmods;
+//	BotaniaArmorMods	botmods;
+//	BloodArmorMods		bloodmods;
+//
+//	//	Item			item_Canister;
+//	//	Item			item_Emptycanister;
+//	//	Item			item_Rebreather;
+//	//	Item			item_NightvisionGoggles;
+//	//
+//	//	Item			item_Glowsole;
+//	//	Item			item_Firesole;
+//	//	Item			item_Icesole;
+//	//	Item			item_Feathersole;
+//	//	Item			item_Flippers;
+//
+//	public ArmorMods()
+//	{
+//		super(new String[] {"Canister", "EmptyCanister", "Rebreather", "NightvisionGoggles", "Glowstep", "Firewalker", "Frostwalker", "FeatherFall", "Flippers"}, "modItemsArmor");
+//		FMLCommonHandler.instance().bus().register(this);
+//
+//		if(TDIntegration.thaumcraft)
+//		{
+//			tcmods = new ThaumArmorMods();
+//		}
+//		if(TDIntegration.botania)
+//		{
+//			botmods = new BotaniaArmorMods();
+//		}
+//		if(TDIntegration.bloodMagic)
+//		{
+//			bloodmods = new BloodArmorMods();
+//		}
+//	}
+//
+//	@Override
+//	public void RegisterRecipes()
+//	{
+//		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 0), new Object[] {"-c-", "ses", "-s-", 'c', new ItemStack(
+//				Items.coal, 1, 1), 's', new ItemStack(Blocks.sapling, 1), 'e', new ItemStack(
+//						modItems, 1, 1)});
+//		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 1), new Object[] {"gsg", "lil", "gig", 'g', new ItemStack(
+//				Items.gold_nugget, 1, 0), 's', new ItemStack(Items.slime_ball,
+//						1, 0), 'l', new ItemStack(Items.dye, 1, 4), 'i', new ItemStack(
+//								Items.iron_ingot, 1, 0)});
+//		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 2), new Object[] {"-s-", "eie", "-d-", 's', new ItemStack(
+//				Items.slime_ball, 1, 0), 'e', new ItemStack(modItems, 1, 1), 'i', new ItemStack(
+//						TinkersDefense.partArmorplate, 1, 2), 'd', new ItemStack(
+//								Items.dye, 1, 4)});
+//		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 3), new Object[] {"-s-", "eie", "-d-", 's', new ItemStack(
+//				Items.potionitem, 1, 8262), 'e', new ItemStack(
+//						Blocks.glass_pane, 1, 0), 'i', new ItemStack(Items.iron_ingot,
+//								1, 0), 'd', new ItemStack(Items.dye, 1, 2)});
+//
+//		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 4), new Object[] {"ggg", "ala", "ggg", 'g', new ItemStack(
+//				Blocks.glowstone, 1, 0), 'a', new ItemStack(
+//						Items.glowstone_dust, 1, 0), 'l', TConstructRegistry.getItemStack("lavaCrystal")});
+//		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 5), new Object[] {"lol", "oao", "lol", 'o', new ItemStack(
+//				Blocks.obsidian, 1, 0), 'a', TConstructRegistry.getItemStack("ingotArdite"), 'l', TConstructRegistry.getItemStack("lavaCrystal")});
+//		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 7), new Object[] {"fgf", 'g', new ItemStack(
+//				Items.gold_nugget, 1, 0), 'f', new ItemStack(Items.feather, 1,
+//						0)});
+//		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 6), new Object[] {"ili", "lcl", "ili", 'l', new ItemStack(
+//				Blocks.lapis_block, 1, 0), 'i', new ItemStack(Blocks.ice, 1, 0), 'c', TConstructRegistry.getItemStack("ingotCobalt")});
+//		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 8), new Object[] {"-b-", "rlr", "-s-", 'b', new ItemStack(
+//				Items.leather_boots, 1, 0), 'l', new ItemStack(Items.leather,
+//						1, 0), 'r', new ItemStack(TinkerTools.toolRod, 1, 2), 's', new ItemStack(
+//								Items.slime_ball, 1, 0)});
+//
+//		if(TDIntegration.thaumcraft)
+//		{
+//			tcmods.RegisterRecipes();
+//		}
+//		if(TDIntegration.botania)
+//		{
+//			botmods.RegisterRecipes();
+//		}
+//		if(TDIntegration.bloodMagic)
+//		{
+//			bloodmods.RegisterRecipes();
+//		}
+//	}
+//
+//	@Override
+//	public void RegisterModifiers()
+//	{
+//		//Head only
+//		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
+//				new ItemStack[] {new ItemStack(modItems, 1, 2)},
+//				TinkersDefense.config.ArmorRebreatherID, "Rebreather",
+//				EnumChatFormatting.GOLD.toString(), "Rebreather",
+//				new String[] {"head"}, 1, null));
+//		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
+//				new ItemStack[] {new ItemStack(modItems, 1, 3)},
+//				TinkersDefense.config.ArmorNightvisionID, "Nightvision",
+//				EnumChatFormatting.GREEN.toString(), "Nightvision",
+//				new String[] {"head"}, 1, null));
+//		ModifyBuilder.registerModifier(new ModifierIntExclusive(
+//				new ItemStack[] {new ItemStack(Items.ghast_tear, 1, 0)},
+//				TinkersDefense.config.ArmorAntiBlindnessID, "AntiBlindness", 1,
+//				EnumChatFormatting.AQUA.toString(), "AntiBlindness",
+//				new String[] {"head"}, 1, null));
+//		//ModifyBuilder.registerModifier(new modifierBoolExclusive(new ItemStack[] {new ItemStack(Blocks.pumpkin, 1, 0)}, TinkersDefense.config.ArmorPumpkinID, "Pumpkin", EnumChatFormatting.GOLD.toString(), "Pumpkin", new String[] {"head"}, 1, null));
+//
+//		//Legs only
+//		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
+//				new ItemStack[] {new ItemStack(Blocks.sticky_piston, 1, 0)},
+//				TinkersDefense.config.ArmorHighstepID, "Highstep",
+//				EnumChatFormatting.LIGHT_PURPLE.toString(), "Highstep",
+//				new String[] {"pants"}, 1, null));
+//		ModifyBuilder.registerModifier(new ModifierIntExclusive(
+//				new ItemStack[] {new ItemStack(Blocks.redstone_block, 1, 0)},
+//				TinkersDefense.config.ArmorSpeedID, "Speed", 1,
+//				EnumChatFormatting.DARK_RED.toString(), "Haste",
+//				new String[] {"pants"}, 1, null));
+//		ModifyBuilder.registerModifier(new ModifierIntExclusive(
+//				new ItemStack[] {new ItemStack(Blocks.piston, 1, 0)},
+//				TinkersDefense.config.ArmorJumpboostID, "Jump", 1,
+//				EnumChatFormatting.WHITE.toString(), "Jump Boost",
+//				new String[] {"pants"}, 1, null));
+//
+//		//Excluding Cloth
+//		ModifyBuilder.registerModifier(new modifierProtection(
+//				new ItemStack[] {new ItemStack(TinkersDefense.partArmorplate,
+//						1, 2)}, TinkersDefense.config.ArmorProtectionID, 1,
+//						EnumChatFormatting.DARK_GRAY.toString(), "Protection"));
+//		ModifyBuilder.registerModifier(new modifierProtection(
+//				new ItemStack[] {new ItemStack(Items.magma_cream, 1)},
+//				TinkersDefense.config.ArmorFireProtectionID, 1,
+//				EnumChatFormatting.RED.toString(), "Fire Protection"));
+//		ModifyBuilder.registerModifier(new modifierProtection(
+//				new ItemStack[] {new ItemStack(Blocks.wool, 1)},
+//				TinkersDefense.config.ArmorBlastProtectionID, 1,
+//				EnumChatFormatting.DARK_GREEN.toString(), "Blast Protection"));
+//		ModifyBuilder.registerModifier(new modifierProtection(
+//				new ItemStack[] {new ItemStack(TinkersDefense.partRivet, 1, 2)},
+//				TinkersDefense.config.ArmorProjectileProtectionID, 1,
+//				EnumChatFormatting.GRAY.toString(), "Projectile Protection"));
+//		ModifyBuilder.registerModifier(new modifierProtection(
+//				new ItemStack[] {new ItemStack(modItems, 1, 7)},
+//				TinkersDefense.config.ArmorFeatherfallID, 1,
+//				EnumChatFormatting.WHITE.toString(), "Featherfall"));
+//		ModifyBuilder.registerModifier(new ModifierIntExclusive(
+//				new ItemStack[] {TConstructRegistry.getItemStack("canisterRedHeart")},
+//				TinkersDefense.config.ArmorAbsorptionID, "HealthBoost", 1,
+//				EnumChatFormatting.DARK_RED.toString(), "HealthBoost",
+//				new String[] {"heavy", "light"}, 1, null));
+//
+//		//Feet only
+//		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
+//				new ItemStack[] {new ItemStack(modItems, 1, 4)},
+//				TinkersDefense.config.ArmorGlowstepID, "GlowStep",
+//				EnumChatFormatting.YELLOW.toString(), "GlowStep",
+//				new String[] {"feet"}, 1, null));
+//		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
+//				new ItemStack[] {new ItemStack(modItems, 1, 5)},
+//				TinkersDefense.config.ArmorFirewalkerID, "Firewalker",
+//				EnumChatFormatting.RED.toString(), "Firewalker",
+//				new String[] {"feet"}, 1, new String[] {"Frostwalker"}));
+//		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
+//				new ItemStack[] {new ItemStack(modItems, 1, 6)},
+//				TinkersDefense.config.ArmorFrostwalkerID, "Frostwalker",
+//				EnumChatFormatting.BLUE.toString(), "Frostwalker",
+//				new String[] {"feet"}, 1, new String[] {"Firewalker"}));
+//		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
+//				new ItemStack[] {new ItemStack(modItems, 1, 8)},
+//				TinkersDefense.config.ArmorDepthstriderID, "Depthstrider",
+//				EnumChatFormatting.DARK_BLUE.toString(), "Depthstrider",
+//				new String[] {"feet"}, 1,
+//				new String[] {"Frostwalker", "Firewalker"}));
+//
+//		for(final ToolCore tool : TConstructRegistry.getToolMapping())
+//		{
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorRebreatherID, "tinker", "rebreather", true);
+//
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorProtectionID, "tinker", "protection", true);
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorFireProtectionID, "tinker", "fireprotection", true);
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorBlastProtectionID, "tinker", "blastprotection", true);
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorProjectileProtectionID, "tinker", "projprotection", true);
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorFeatherfallID, "tinker", "featherfall", true);
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorAbsorptionID, "tinker", "healthboost", true);
+//
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorGlowstepID, "tinker", "glowstep", true);
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorFirewalkerID, "tinker", "firewalk", true);
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorFrostwalkerID, "tinker", "frostwalk", true);
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorDepthstriderID, "tinker", "depthstrider", true);
+//
+//		}
+//
+//		if(TDIntegration.thaumcraft)
+//		{
+//			tcmods.RegisterModifiers();
+//		}
+//		if(TDIntegration.botania)
+//		{
+//			botmods.RegisterModifiers();
+//		}
+//		if(TDIntegration.bloodMagic)
+//		{
+//			bloodmods.RegisterModifiers();
+//		}
+//	}
+//
+//	@Override
+//	public void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
+//	{
+//		if(!world.isRemote)
+//		{
+//			if(tags.hasKey("Frostwalker"))
+//			{
+//				UpdateWalker(tool, stack, world, entity, Material.water, TDArmorAddon.block_Unstable, 0);
+//			}
+//			if(tags.hasKey("Firewalker"))
+//			{
+//				UpdateWalker(tool, stack, world, entity, Material.lava, TDArmorAddon.block_Unstable, 1);
+//			}
+//			if(tags.hasKey("GlowStep"))
+//			{
+//				UpdateGlowstep(tool, stack, world, entity);
+//			}
+//			if(tags.hasKey("Rebreather"))
+//			{
+//				UpdateRebreather(tool, stack, world, entity);
+//			}
+//			if(tags.hasKey("Nightvision"))
+//			{
+//				UpdateNightvision(tool, stack, world, entity);
+//			}
+//			if(tags.hasKey("AntiBlindness"))
+//			{
+//				UpdateAntiBlind(tool, stack, world, entity);
+//			}
+//			if(tags.hasKey("HealthBoost"))
+//			{
+//				UpdateHealthBoost(tool, stack, world, entity, tags);
+//				//UpdateHighstep(tool, stack, world, entity);
+//			}
+//
+//		}
+//		else
+//		{
+//			if(tags.hasKey("Depthstrider"))
+//			{
+//				UpdateFlippers(tool, stack, world, entity);
+//			}
+//			if(tags.hasKey("Speed"))
+//			{
+//				UpdateSpeed(tool, stack, world, entity, tags);
+//				//			if(tags.hasKey("Jump"))
+//				//				UpdateJump(tool, stack, world, entity, tags);
+//			}
+//		}
+//
+//		if(TDIntegration.thaumcraft)
+//		{
+//			tcmods.UpdateAll(tool, stack, world, entity, tags);
+//		}
+//		if(TDIntegration.botania)
+//		{
+//			botmods.UpdateAll(tool, stack, world, entity, tags);
+//		}
+//		if(TDIntegration.bloodMagic)
+//		{
+//			bloodmods.UpdateAll(tool, stack, world, entity, tags);
+//		}
+//	}
+//
+//	public void UpdateWalker(ToolCore tool, ItemStack stack, World world, Entity entity, Material mat, Block replacement, int meta)
+//	{
+//		final int x = (int) Math.floor(entity.posX);
+//		final int y = (int) (entity.posY - entity.getYOffset());
+//		final int z = (int) Math.floor(entity.posZ);
+//
+//		Block block;
+//
+//		for(int i = 0; i < 5; i++)
+//		{
+//			for(int j = 0; j < 5; j++)
+//			{
+//				block = world.getBlock(x + (i - 2), y - 1, z + (j - 2));
+//				if(block instanceof BlockLiquid)
+//				{
+//					if(((BlockLiquid) block).getMaterial() == mat && world.getBlockMetadata(x + (i - 2), y - 1, z + (j - 2)) == 0)
+//					{
+//						world.setBlock(x + (i - 2), y - 1, z + (j - 2), replacement, meta, 3);
+//						world.notifyBlocksOfNeighborChange(x + (i - 2), y - 1, z + (j - 2), world.getBlock(x + (i - 2), y - 1, z + (j - 2)));
+//					}
+//				}
+//			}
+//		}
+//	}
+//
+//	int	glowTimer	= 8;
+//	int	prevX		= 0;
+//	int	prevZ		= 0;
+//
+//	public void UpdateGlowstep(ToolCore tool, ItemStack stack, World world, Entity entity)
+//	{
+//		final int x = (int) Math.floor(entity.posX);
+//		final int y = (int) (entity.posY - entity.getYOffset());
+//		final int z = (int) Math.floor(entity.posZ);
+//
+//		if(glowTimer == 0)
+//		{
+//			if(world.getBlock(x, y, z) == Blocks.air && world.getBlock(x, y - 1, z).isNormalCube())
+//			{
+//				world.setBlock(x, y, z, TDArmorAddon.block_GlowCrumbs, 0, 3);
+//				//world.notifyBlocksOfNeighborChange(x + (i - 2), y - 1, z + (j - 2), world.getBlock(x + (i - 2), y - 1, z + (j - 2)));
+//			}
+//			glowTimer = 8;
+//		}
+//		else if(Math.abs(x - prevX) >= 1 || Math.abs(z - prevZ) >= 1)
+//		{
+//			glowTimer--;
+//		}
+//
+//		prevX = x;
+//		prevZ = z;
+//	}
+//
+//	public void UpdateFlippers(ToolCore tool, ItemStack stack, World world, Entity entity)
+//	{
+//		if(entity.isInWater())
+//		{
+//			entity.motionX *= 1.2;
+//			entity.motionY *= 1.2;
+//			entity.motionZ *= 1.2;
+//		}
+//	}
+//
+//	public void UpdateRebreather(ToolCore tool, ItemStack stack, World world, Entity entity)
+//	{
+//		final EntityPlayer player = (EntityPlayer) entity;
+//		if(player.getAir() <= 0)
+//		{
+//			ItemStack canStack;
+//			int i;
+//			int used = 0;
+//
+//			for(i = 0; i < player.inventory.getSizeInventory(); i++)
+//			{
+//				if(player.inventory.getStackInSlot(i) != null && player.inventory.getStackInSlot(i).getItem() == modItems && player.inventory.getStackInSlot(i).getItemDamage() == 0)
+//				{
+//					canStack = player.inventory.getStackInSlot(i);
+//					if(used < 2 && canStack.stackSize == 1)
+//					{
+//						player.inventory.decrStackSize(i, 1);
+//						player.inventory.addItemStackToInventory(new ItemStack(
+//								modItems, 1, 1));
+//						player.setAir(150);
+//						used++;
+//					}
+//					if(used == 0 && canStack.stackSize >= 2)
+//					{
+//						player.inventory.decrStackSize(i, 2);
+//						player.inventory.addItemStackToInventory(new ItemStack(
+//								modItems, 2, 1));
+//						player.setAir(300);
+//						break;
+//					}
+//				}
+//			}
+//		}
+//	}
+//
+//	public void UpdateNightvision(ToolCore tool, ItemStack stack, World world, Entity entity)
+//	{
+//		if(!((EntityPlayer) entity).isPotionActive(Potion.nightVision) || ((EntityPlayer) entity).getActivePotionEffect(Potion.nightVision).getDuration() < 1000)
+//		{
+//			((EntityPlayer) entity).addPotionEffect(new PotionEffect(
+//					Potion.nightVision.id, 1000, 1, true));
+//		}
+//	}
+//
+//	boolean	isBlind	= false;
+//
+//	public void UpdateAntiBlind(ToolCore tool, ItemStack stack, World world, Entity entity)
+//	{
+//		final NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
+//		if(((EntityPlayer) entity).isPotionActive(Potion.blindness) && !isBlind)
+//		{
+//			final int roll = world.rand.nextInt(100);
+//			final int antiLevel = tags.getInteger("AntiBlindness");
+//			if(roll < antiLevel * 10)
+//			{
+//				((EntityPlayer) entity).removePotionEffect(Potion.blindness.id);
+//			}
+//			else
+//			{
+//				isBlind = true;
+//			}
+//		}
+//		if(!((EntityPlayer) entity).isPotionActive(Potion.blindness) && isBlind)
+//		{
+//			isBlind = false;
+//		}
+//	}
+//
+//	public void UpdateSpeed(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
+//	{
+//		final EntityPlayer ent = (EntityPlayer) entity;
+//		if(!entity.isInWater() && !ent.isSneaking() && ent.moveForward > 0.0)
+//		{
+//			final float speed = (float) (tags.getInteger("Speed") * 0.05);
+//			if(entity.onGround)
+//			{
+//				ent.moveFlying(0.0f, 1.0f, speed);
+//			}
+//			else
+//			{
+//				ent.jumpMovementFactor = speed;
+//			}
+//		}
+//	}
+//
+//	PotionEffect	hb;
+//
+//	public void UpdateHealthBoost(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
+//	{
+//		if(!((EntityPlayer) entity).isPotionActive(21))
+//		{
+//			((EntityPlayer) entity).addPotionEffect(new PotionEffect(21, 100,
+//					tags.getInteger("HealthBoost") - 1, true));
+//		}
+//		else if(((EntityPlayer) entity).getActivePotionEffect(Potion.potionTypes[21]).getDuration() < 10)
+//		{
+//			((EntityPlayer) entity).getActivePotionEffect(Potion.potionTypes[21]).combine(new PotionEffect(
+//					21, 100, tags.getInteger("HealthBoost") - 1, true));
+//		}
+//	}
+//
+//	//	public void UpdateJump(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
+//	//	{
+//	//		EntityPlayer ent = (EntityPlayer) entity;
+//	//		if(!entity.isInWater() && !ent.isSneaking() && ent.motionY > 0.0)
+//	//		{
+//	//			float speed = (float) (tags.getInteger("Jump") * 0.15);
+//	//
+//	//			ent.jumpMovementFactor = speed;
+//	//
+//	//		}
+//	//	}
+//
+//	@SubscribeEvent
+//	public void Jump(LivingJumpEvent event)
+//	{
+//		if(event.entityLiving instanceof EntityPlayer)
+//		{
+//			final EntityPlayer player = (EntityPlayer) event.entityLiving;
+//			if(player.getCurrentArmor(1) != null && player.getCurrentArmor(1).getItem() instanceof ArmorCore)
+//			{
+//				final ItemStack legs = player.getCurrentArmor(1);
+//				final Item armor = legs.getItem();
+//				final NBTTagCompound tags = legs.getTagCompound().getCompoundTag("InfiTool");
+//
+//				if((armor instanceof TinkersRobe || armor instanceof TinkersChausses || armor instanceof TinkersGrieves) && tags.hasKey("Jump"))
+//				{
+//					final double speed = tags.getInteger("Jump") * 0.1;
+//					player.setVelocity(0, 0.4 + speed, 0);
+//					player.velocityChanged = true;
+//				}
+//			}
+//		}
+//	}
+//
+//	@SubscribeEvent
+//	public void Highstep(TickEvent.PlayerTickEvent event)
+//	{
+//		event.player.stepHeight = 0.5f;
+//		if(event.player.getCurrentArmor(1) != null && event.player.getCurrentArmor(1).getItem() instanceof ArmorCore)
+//		{
+//			final ItemStack legs = event.player.getCurrentArmor(1);
+//			final Item armor = legs.getItem();
+//			final NBTTagCompound tags = legs.getTagCompound().getCompoundTag("InfiTool");
+//
+//			if((armor instanceof TinkersRobe || armor instanceof TinkersChausses || armor instanceof TinkersGrieves) && tags.hasKey("Highstep") && !event.player.isSneaking())
+//			{
+//				event.player.stepHeight = 1.0f;
+//			}
+//		}
+//	}
+//	//	public void UpdateHighstep(ToolCore tool, ItemStack stack, World world, Entity entity)
+//	//	{
+//	//		NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
+//	//		EntityPlayer ent = (EntityPlayer) entity;
+//	//
+//	//		if(tool instanceof TinkersRobe || tool instanceof TinkersChausses || tool instanceof TinkersGrieves)
+//	//		{
+//	//			ent.stepHeight = 0.5f;
+//	//			if(tags.hasKey("Highstep"))
+//	//			{
+//	//				if(!ent.isSneaking())
+//	//				{
+//	//					ent.stepHeight = 1f;
+//	//				}
+//	//			}
+//	//		}
+//	//
+//	//	}
+//
+//	//	@SubscribeEvent
+//	//	public void CalmEndermen(LivingSetAttackTargetEvent event)
+//	//	{
+//	//		NBTTagCompound tags;
+//	//
+//	//		if(event.target instanceof EntityPlayer)
+//	//		{
+//	//			if(((EntityPlayer) event.target).getCurrentArmor(3).hasTagCompound() && ((EntityPlayer) event.target).getCurrentArmor(3).getTagCompound().hasKey("InfiTool"))
+//	//			{
+//	//				tags = ((EntityPlayer) event.target).getCurrentArmor(3).getTagCompound().getCompoundTag("InfiTool");
+//	//
+//	//				if(event.entityLiving instanceof EntityEnderman && tags.hasKey("Pumpkin"))
+//	//				{
+//	//					event.entityLiving.setRevengeTarget(null);
+//	//				}
+//	//			}
+//	//		}
+//	//	}
+//}
diff --git a/src/main/java/lance5057/tDefense/armor/modifiers/BloodMagic/BloodArmorMods.java b/src/main/java/lance5057/tDefense/armor/modifiers/BloodMagic/BloodArmorMods.java
index fca26a0..0010a66 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/BloodMagic/BloodArmorMods.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/BloodMagic/BloodArmorMods.java
@@ -1,56 +1,56 @@
-package lance5057.tDefense.armor.modifiers.BloodMagic;
-
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.core.tools.modifiers.ModifierBoolExclusive;
-import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.client.TConstructClientRegistry;
-import tconstruct.library.crafting.ModifyBuilder;
-import tconstruct.library.tools.ToolCore;
-import WayofTime.alchemicalWizardry.ModItems;
-
-public class BloodArmorMods extends ModifiersBase
-{
-	public BloodArmorMods()
-	{
-		super(new String[] {}, "modItemsBloodArmor");
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void LoadItems()
-	{
-	}
-
-	@Override
-	public void RegisterRecipes()
-	{
-	}
-
-	@Override
-	public void RegisterModifiers()
-	{
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {new ItemStack(ModItems.divinationSigil, 1, 0)},
-				TinkersDefense.config.DivinationModID, "Divination",
-				EnumChatFormatting.DARK_RED.toString(), "Divination",
-				new String[] {"head"}, 0, new String[] {}));
-
-		for(final ToolCore tool : TConstructRegistry.getToolMapping())
-		{
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.DivinationModID, "tinker", "divination", true);
-			//TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.VisDiscountModID, "tinker", "visembroidery", true);
-
-		}
-	}
-
-	@Override
-	public void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-	}
-}
+//package lance5057.tDefense.armor.modifiers.BloodMagic;
+//
+//import lance5057.tDefense.TinkersDefense;
+//import lance5057.tDefense.core.tools.modifiers.ModifierBoolExclusive;
+//import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
+//import net.minecraft.entity.Entity;
+//import net.minecraft.item.ItemStack;
+//import net.minecraft.nbt.NBTTagCompound;
+//import net.minecraft.util.EnumChatFormatting;
+//import net.minecraft.world.World;
+//import tconstruct.library.TConstructRegistry;
+//import tconstruct.library.client.TConstructClientRegistry;
+//import tconstruct.library.crafting.ModifyBuilder;
+//import tconstruct.library.tools.ToolCore;
+//import WayofTime.alchemicalWizardry.ModItems;
+//
+//public class BloodArmorMods extends ModifiersBase
+//{
+//	public BloodArmorMods()
+//	{
+//		super(new String[] {}, "modItemsBloodArmor");
+//		// TODO Auto-generated constructor stub
+//	}
+//
+//	@Override
+//	public void LoadItems()
+//	{
+//	}
+//
+//	@Override
+//	public void RegisterRecipes()
+//	{
+//	}
+//
+//	@Override
+//	public void RegisterModifiers()
+//	{
+//		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
+//				new ItemStack[] {new ItemStack(ModItems.divinationSigil, 1, 0)},
+//				TinkersDefense.config.DivinationModID, "Divination",
+//				EnumChatFormatting.DARK_RED.toString(), "Divination",
+//				new String[] {"head"}, 0, new String[] {}));
+//
+//		for(final ToolCore tool : TConstructRegistry.getToolMapping())
+//		{
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.DivinationModID, "tinker", "divination", true);
+//			//TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.VisDiscountModID, "tinker", "visembroidery", true);
+//
+//		}
+//	}
+//
+//	@Override
+//	public void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
+//	{
+//	}
+//}
diff --git a/src/main/java/lance5057/tDefense/armor/modifiers/Botania/BotaniaArmorMods.java b/src/main/java/lance5057/tDefense/armor/modifiers/Botania/BotaniaArmorMods.java
index a2f9235..d399bf1 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/Botania/BotaniaArmorMods.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/Botania/BotaniaArmorMods.java
@@ -1,66 +1,66 @@
-package lance5057.tDefense.armor.modifiers.Botania;
-
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.core.tools.modifiers.ModifierIntExclusive;
-import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.client.TConstructClientRegistry;
-import tconstruct.library.crafting.ModifyBuilder;
-import tconstruct.library.tools.ToolCore;
-import vazkii.botania.common.item.ModItems;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-public class BotaniaArmorMods extends ModifiersBase
-{
-	public BotaniaArmorMods()
-	{
-		super(new String[] {"elementiumcore"}, "modItemsBotaniaArmor");
-	}
-
-	@Override
-	public void RegisterRecipes()
-	{
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 0), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
-				ModItems.manaResource, 1, 7), 's', new ItemStack(
-				ModItems.manaResource, 1, 12), 'd', new ItemStack(
-				ModItems.manaResource, 1, 2)});
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 0), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
-				ModItems.manaResource, 1, 7), 's', new ItemStack(
-				ModItems.manaResource, 1, 12), 'd', new ItemStack(
-				ModItems.manaResource, 1, 1)});
-	}
-
-	@Override
-	public void RegisterModifiers()
-	{
-		ModifyBuilder.registerModifier(new ModifierIntExclusive(
-				new ItemStack[] {new ItemStack(ModItems.manaResource, 1, 22)},
-				TinkersDefense.config.ArmorManaDiscountModID, "ManaEmbroidery",
-				1, EnumChatFormatting.AQUA.toString(), "Mana Embroidery",
-				new String[] {"cloth"}, 1, new String[] {}));
-
-		ModifyBuilder.registerModifier(new ModifierIntExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 4)},
-				TinkersDefense.config.ArmorPixieCoreModID, "ElementiumCore", 1,
-				EnumChatFormatting.LIGHT_PURPLE.toString(), "Elementium Core",
-				new String[] {"armor"}, 1, new String[] {}));
-
-		for(final ToolCore tool : TConstructRegistry.getToolMapping())
-		{
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorManaDiscountModID, "tinker", "manaembroidery", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorPixieCoreModID, "tinker", "elementiumcore", true);
-
-		}
-	}
-
-	@Override
-	public void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-	}
-}
+//package lance5057.tDefense.armor.modifiers.Botania;
+//
+//import lance5057.tDefense.TinkersDefense;
+//import lance5057.tDefense.core.tools.modifiers.ModifierIntExclusive;
+//import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
+//import net.minecraft.entity.Entity;
+//import net.minecraft.item.ItemStack;
+//import net.minecraft.nbt.NBTTagCompound;
+//import net.minecraft.util.EnumChatFormatting;
+//import net.minecraft.world.World;
+//import tconstruct.library.TConstructRegistry;
+//import tconstruct.library.client.TConstructClientRegistry;
+//import tconstruct.library.crafting.ModifyBuilder;
+//import tconstruct.library.tools.ToolCore;
+//import vazkii.botania.common.item.ModItems;
+//import cpw.mods.fml.common.registry.GameRegistry;
+//
+//public class BotaniaArmorMods extends ModifiersBase
+//{
+//	public BotaniaArmorMods()
+//	{
+//		super(new String[] {"elementiumcore"}, "modItemsBotaniaArmor");
+//	}
+//
+//	@Override
+//	public void RegisterRecipes()
+//	{
+//		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 0), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
+//				ModItems.manaResource, 1, 7), 's', new ItemStack(
+//				ModItems.manaResource, 1, 12), 'd', new ItemStack(
+//				ModItems.manaResource, 1, 2)});
+//
+//		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 0), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
+//				ModItems.manaResource, 1, 7), 's', new ItemStack(
+//				ModItems.manaResource, 1, 12), 'd', new ItemStack(
+//				ModItems.manaResource, 1, 1)});
+//	}
+//
+//	@Override
+//	public void RegisterModifiers()
+//	{
+//		ModifyBuilder.registerModifier(new ModifierIntExclusive(
+//				new ItemStack[] {new ItemStack(ModItems.manaResource, 1, 22)},
+//				TinkersDefense.config.ArmorManaDiscountModID, "ManaEmbroidery",
+//				1, EnumChatFormatting.AQUA.toString(), "Mana Embroidery",
+//				new String[] {"cloth"}, 1, new String[] {}));
+//
+//		ModifyBuilder.registerModifier(new ModifierIntExclusive(
+//				new ItemStack[] {new ItemStack(modItems, 1, 4)},
+//				TinkersDefense.config.ArmorPixieCoreModID, "ElementiumCore", 1,
+//				EnumChatFormatting.LIGHT_PURPLE.toString(), "Elementium Core",
+//				new String[] {"armor"}, 1, new String[] {}));
+//
+//		for(final ToolCore tool : TConstructRegistry.getToolMapping())
+//		{
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorManaDiscountModID, "tinker", "manaembroidery", true);
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorPixieCoreModID, "tinker", "elementiumcore", true);
+//
+//		}
+//	}
+//
+//	@Override
+//	public void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
+//	{
+//	}
+//}
diff --git a/src/main/java/lance5057/tDefense/armor/modifiers/Thaumcraft/ThaumArmorMods.java b/src/main/java/lance5057/tDefense/armor/modifiers/Thaumcraft/ThaumArmorMods.java
index 9b91556..c8839cf 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/Thaumcraft/ThaumArmorMods.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/Thaumcraft/ThaumArmorMods.java
@@ -1,59 +1,59 @@
-package lance5057.tDefense.armor.modifiers.Thaumcraft;
-
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.core.tools.modifiers.ModifierBoolExclusive;
-import lance5057.tDefense.core.tools.modifiers.ModifierIntExclusive;
-import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.client.TConstructClientRegistry;
-import tconstruct.library.crafting.ModifyBuilder;
-import tconstruct.library.tools.ToolCore;
-import thaumcraft.api.ItemApi;
-
-public class ThaumArmorMods extends ModifiersBase
-{
-
-	//Runic Shielding is handled in ArmorCore.java
-
-	public ThaumArmorMods()
-	{
-		super(new String[] {}, "modItemsThaumArmor");
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void RegisterRecipes()
-	{
-	}
-
-	@Override
-	public void RegisterModifiers()
-	{
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {ItemApi.getItem("itemGoggles", 0)},
-				TinkersDefense.config.RevealingModID, "Revealing", "\u00A75",
-				"Revealing", new String[] {"head"}, 0, null));
-
-		ModifyBuilder.registerModifier(new ModifierIntExclusive(
-				new ItemStack[] {ItemApi.getItem("itemResource", 7)},
-				TinkersDefense.config.VisDiscountModID, "VisEmbroidery", 1,
-				"\u00A79", "Vis Embroidery", new String[] {"cloth"}, 1,
-				new String[] {}));
-
-		for(final ToolCore tool : TConstructRegistry.getToolMapping())
-		{
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.RevealingModID, "tinker", "revealing", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.VisDiscountModID, "tinker", "visembroidery", true);
-
-		}
-	}
-
-	@Override
-	public void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-	}
-}
+//package lance5057.tDefense.armor.modifiers.Thaumcraft;
+//
+//import lance5057.tDefense.TinkersDefense;
+//import lance5057.tDefense.core.tools.modifiers.ModifierBoolExclusive;
+//import lance5057.tDefense.core.tools.modifiers.ModifierIntExclusive;
+//import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
+//import net.minecraft.entity.Entity;
+//import net.minecraft.item.ItemStack;
+//import net.minecraft.nbt.NBTTagCompound;
+//import net.minecraft.world.World;
+//import tconstruct.library.TConstructRegistry;
+//import tconstruct.library.client.TConstructClientRegistry;
+//import tconstruct.library.crafting.ModifyBuilder;
+//import tconstruct.library.tools.ToolCore;
+//import thaumcraft.api.ItemApi;
+//
+//public class ThaumArmorMods extends ModifiersBase
+//{
+//
+//	//Runic Shielding is handled in ArmorCore.java
+//
+//	public ThaumArmorMods()
+//	{
+//		super(new String[] {}, "modItemsThaumArmor");
+//		// TODO Auto-generated constructor stub
+//	}
+//
+//	@Override
+//	public void RegisterRecipes()
+//	{
+//	}
+//
+//	@Override
+//	public void RegisterModifiers()
+//	{
+//		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
+//				new ItemStack[] {ItemApi.getItem("itemGoggles", 0)},
+//				TinkersDefense.config.RevealingModID, "Revealing", "\u00A75",
+//				"Revealing", new String[] {"head"}, 0, null));
+//
+//		ModifyBuilder.registerModifier(new ModifierIntExclusive(
+//				new ItemStack[] {ItemApi.getItem("itemResource", 7)},
+//				TinkersDefense.config.VisDiscountModID, "VisEmbroidery", 1,
+//				"\u00A79", "Vis Embroidery", new String[] {"cloth"}, 1,
+//				new String[] {}));
+//
+//		for(final ToolCore tool : TConstructRegistry.getToolMapping())
+//		{
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.RevealingModID, "tinker", "revealing", true);
+//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.VisDiscountModID, "tinker", "visembroidery", true);
+//
+//		}
+//	}
+//
+//	@Override
+//	public void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
+//	{
+//	}
+//}
diff --git a/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java b/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java
index 145764f..2e23b79 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java
@@ -1,95 +1,95 @@
-package lance5057.tDefense.armor.modifiers;
-
-import java.util.Arrays;
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import tconstruct.library.tools.ToolCore;
-import tconstruct.modifiers.tools.ModInteger;
-
-public class modifierProtection extends ModInteger
-{
-	String		color;
-	String		type;
-	String		tooltipName	= "";
-	int			initialIncrease;
-	int			secondaryIncrease;
-	String[]	types		= {"Protection", "Fire Protection", "Blast Protection", "Projectile Protection", "Featherfall"};
-
-	public modifierProtection(ItemStack[] items, int effect, int increase, String c, String t)
-	{
-		super(items, effect, t, increase, c, t);
-		color = c;
-		type = t;
-		initialIncrease = secondaryIncrease = increase;
-	}
-
-	@Override
-	protected boolean canModify(ItemStack tool, ItemStack[] input)
-	{
-		if(tool.getItem() instanceof ToolCore)
-		{
-			final List list = Arrays.asList(((ToolCore) tool.getItem()).getTraits());
-			final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
-
-			if(list.contains("heavyarmor") || list.contains("lightarmor"))
-			{
-				if(type != types[4])
-				{
-					for(int i = 0; i < 4; i++)
-					{
-						if(tags.hasKey(types[i]))
-						{
-							if(types[i] != type)
-							{
-								return false;
-							}
-							if(types[i] == type && tags.getInteger(types[i]) > 5)
-							{
-								return false;
-							}
-						}
-					}
-					return true;
-				}
-				else if(type == types[4] && tags.getInteger(types[4]) < 5)
-				{
-					if(list.contains("feet"))
-					{
-						return true;
-					}
-					return false;
-				}
-			}
-
-		}
-		return false;
-	}
-
-	@Override
-	public void modify(ItemStack[] input, ItemStack tool)
-	{
-		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
-		if(tags.hasKey(key))
-		{
-			int increase = tags.getInteger(key);
-			increase += secondaryIncrease;
-			tags.setInteger(key, increase);
-		}
-		else
-		{
-			tags.setInteger(key, initialIncrease);
-		}
-
-		int modifiers = tags.getInteger("Modifiers");
-		modifiers -= 1;
-		tags.setInteger("Modifiers", modifiers);
-
-		int prot = tags.getInteger(type);
-		prot += 1;
-		tags.setInteger(type, prot);
-
-		addToolTip(tool, color + tooltipName, color + key);
-	}
-}
+//package lance5057.tDefense.armor.modifiers;
+//
+//import java.util.Arrays;
+//import java.util.List;
+//
+//import net.minecraft.item.ItemStack;
+//import net.minecraft.nbt.NBTTagCompound;
+//import tconstruct.library.tools.ToolCore;
+//import tconstruct.modifiers.tools.ModInteger;
+//
+//public class modifierProtection extends ModInteger
+//{
+//	String		color;
+//	String		type;
+//	String		tooltipName	= "";
+//	int			initialIncrease;
+//	int			secondaryIncrease;
+//	String[]	types		= {"Protection", "Fire Protection", "Blast Protection", "Projectile Protection", "Featherfall"};
+//
+//	public modifierProtection(ItemStack[] items, int effect, int increase, String c, String t)
+//	{
+//		super(items, effect, t, increase, c, t);
+//		color = c;
+//		type = t;
+//		initialIncrease = secondaryIncrease = increase;
+//	}
+//
+//	@Override
+//	protected boolean canModify(ItemStack tool, ItemStack[] input)
+//	{
+//		if(tool.getItem() instanceof ToolCore)
+//		{
+//			final List list = Arrays.asList(((ToolCore) tool.getItem()).getTraits());
+//			final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+//
+//			if(list.contains("heavyarmor") || list.contains("lightarmor"))
+//			{
+//				if(type != types[4])
+//				{
+//					for(int i = 0; i < 4; i++)
+//					{
+//						if(tags.hasKey(types[i]))
+//						{
+//							if(types[i] != type)
+//							{
+//								return false;
+//							}
+//							if(types[i] == type && tags.getInteger(types[i]) > 5)
+//							{
+//								return false;
+//							}
+//						}
+//					}
+//					return true;
+//				}
+//				else if(type == types[4] && tags.getInteger(types[4]) < 5)
+//				{
+//					if(list.contains("feet"))
+//					{
+//						return true;
+//					}
+//					return false;
+//				}
+//			}
+//
+//		}
+//		return false;
+//	}
+//
+//	@Override
+//	public void modify(ItemStack[] input, ItemStack tool)
+//	{
+//		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+//		if(tags.hasKey(key))
+//		{
+//			int increase = tags.getInteger(key);
+//			increase += secondaryIncrease;
+//			tags.setInteger(key, increase);
+//		}
+//		else
+//		{
+//			tags.setInteger(key, initialIncrease);
+//		}
+//
+//		int modifiers = tags.getInteger("Modifiers");
+//		modifiers -= 1;
+//		tags.setInteger("Modifiers", modifiers);
+//
+//		int prot = tags.getInteger(type);
+//		prot += 1;
+//		tags.setInteger(type, prot);
+//
+//		addToolTip(tool, color + tooltipName, color + key);
+//	}
+//}
diff --git a/src/main/java/lance5057/tDefense/armor/parts/Cloth.java b/src/main/java/lance5057/tDefense/armor/parts/Cloth.java
index 480c153..2bce85a 100644
--- a/src/main/java/lance5057/tDefense/armor/parts/Cloth.java
+++ b/src/main/java/lance5057/tDefense/armor/parts/Cloth.java
@@ -1,46 +1,46 @@
-package lance5057.tDefense.armor.parts;
-
-import mantle.items.abstracts.CraftingItem;
-import net.minecraft.item.ItemStack;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.util.IToolPart;
-
-public class Cloth extends CraftingItem implements IToolPart
-{
-	public Cloth()
-	{
-		super(toolMaterialNames, buildTextureNames("_cloth"), "parts/", "tinker", TConstructRegistry.materialTab);
-		setHasSubtypes(true);
-		setMaxDamage(0);
-	}
-
-	private static String[] buildTextureNames(String textureType)
-	{
-		final String[] names = new String[toolMaterialNames.length];
-		for(int i = 0; i < toolMaterialNames.length; i++)
-		{
-			if(toolTextureNames[i].equals(""))
-			{
-				names[i] = "";
-			}
-			else
-			{
-				names[i] = toolTextureNames[i] + textureType;
-			}
-		}
-		return names;
-	}
-
-	public static final String[]	toolMaterialNames	= new String[] {"white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", "gray", "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black"};
-	public static final String[]	toolTextureNames	= new String[] {"white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", "gray", "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black"};
-
-	@Override
-	public int getMaterialID(ItemStack stack)
-	{
-		if(stack.getItemDamage() >= toolMaterialNames.length)
-		{
-			return -1;
-		}
-		return stack.getItemDamage();
-	}
-}
+//package lance5057.tDefense.armor.parts;
+//
+//import mantle.items.abstracts.CraftingItem;
+//import net.minecraft.item.ItemStack;
+//import tconstruct.library.TConstructRegistry;
+//import tconstruct.library.util.IToolPart;
+//
+//public class Cloth extends CraftingItem implements IToolPart
+//{
+//	public Cloth()
+//	{
+//		super(toolMaterialNames, buildTextureNames("_cloth"), "parts/", "tinker", TConstructRegistry.materialTab);
+//		setHasSubtypes(true);
+//		setMaxDamage(0);
+//	}
+//
+//	private static String[] buildTextureNames(String textureType)
+//	{
+//		final String[] names = new String[toolMaterialNames.length];
+//		for(int i = 0; i < toolMaterialNames.length; i++)
+//		{
+//			if(toolTextureNames[i].equals(""))
+//			{
+//				names[i] = "";
+//			}
+//			else
+//			{
+//				names[i] = toolTextureNames[i] + textureType;
+//			}
+//		}
+//		return names;
+//	}
+//
+//	public static final String[]	toolMaterialNames	= new String[] {"white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", "gray", "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black"};
+//	public static final String[]	toolTextureNames	= new String[] {"white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", "gray", "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black"};
+//
+//	@Override
+//	public int getMaterialID(ItemStack stack)
+//	{
+//		if(stack.getItemDamage() >= toolMaterialNames.length)
+//		{
+//			return -1;
+//		}
+//		return stack.getItemDamage();
+//	}
+//}
diff --git a/src/main/java/lance5057/tDefense/armor/parts/ClothMaterial.java b/src/main/java/lance5057/tDefense/armor/parts/ClothMaterial.java
index 4b1733d..8368a61 100644
--- a/src/main/java/lance5057/tDefense/armor/parts/ClothMaterial.java
+++ b/src/main/java/lance5057/tDefense/armor/parts/ClothMaterial.java
@@ -1,14 +1,14 @@
-package lance5057.tDefense.armor.parts;
-
-import net.minecraft.item.ItemStack;
-import tconstruct.library.tools.CustomMaterial;
-
-public class ClothMaterial extends CustomMaterial
-{
-
-	public ClothMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, int color)
-	{
-		super(materialID, value, input, craftingItem, color);
-	}
-
-}
+//package lance5057.tDefense.armor.parts;
+//
+//import net.minecraft.item.ItemStack;
+//import tconstruct.library.tools.CustomMaterial;
+//
+//public class ClothMaterial extends CustomMaterial
+//{
+//
+//	public ClothMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem, int color)
+//	{
+//		super(materialID, value, input, craftingItem, color);
+//	}
+//
+//}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ArmorRenderer.java b/src/main/java/lance5057/tDefense/armor/renderers/ArmorRenderer.java
index 2cace5c..36226ed 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/ArmorRenderer.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/ArmorRenderer.java
@@ -13,7 +13,7 @@ import net.minecraft.nbt.NBTTagCompound;
 
 import org.lwjgl.opengl.GL11;
 
-public class ArmorRenderer extends ModelBiped
+public class ArmorRenderer extends ModelBiped 
 {
 	public String[]				colors;
 
@@ -23,6 +23,7 @@ public class ArmorRenderer extends ModelBiped
 	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)
@@ -74,16 +75,16 @@ public class ArmorRenderer extends ModelBiped
 
 		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();
-			}
+			//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)
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
deleted file mode 100644
index 3a35160..0000000
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
+++ /dev/null
@@ -1,73 +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 ModelSheath extends ArmorRenderer
-{
-	public ModelRenderer	sheath;
-	public ModelRenderer	belt;
-
-	String					Color[];
-	int						rgbColors[];
-
-	public ModelSheath()
-	{
-		super(0.5f, 0, 64, 64);
-
-		textureWidth = 64;
-		textureHeight = 64;
-
-		belt = new ModelRenderer(this, 16, 32);
-		belt.setRotationPoint(-4.5F, 0.0F, 0.5F);
-		belt.addBox(0.0F, 0.0F, -3.0F, 1, 12, 5, 0.0F);
-		setRotateAngle(belt, 0.0F, 0.0F, -0.7853981633974483F);
-		bipedBody.addChild(belt);
-
-		sheath = new ModelRenderer(this, 0, 32);
-		sheath.setRotationPoint(0f, 0f, 0f);
-		sheath.addBox(-5.0F, 0.0F, 2.0F, 5, 16, 2, -0.4F);
-		setRotateAngle(sheath, 0.0F, 0.0F, -0.45F);
-		bipedBody.addChild(sheath);
-	}
-
-	@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/ModelTinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java
index b64c0d9..5eac286 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java
@@ -1,241 +1,241 @@
-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;
-	}
-}
+//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
index 2bce53e..f061b78 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java
@@ -1,72 +1,72 @@
-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;
-	}
-}
+//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
index f97f7ba..ba5db86 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
@@ -1,169 +1,169 @@
-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;
-	}
-}
+//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
index aae1594..5494518 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java
@@ -1,379 +1,379 @@
-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;
-	}
-}
+//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
index 20a6317..888843e 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java
@@ -1,176 +1,176 @@
-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;
-	}
-}
+//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
index 8bd6dc9..d751ded 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShoes.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShoes.java
@@ -1,79 +1,79 @@
-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;
-	}
-}
+//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
index 24ba37a..3ef43ba 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersBreastplate.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersBreastplate.java
@@ -7,7 +7,7 @@ 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 class ModelTinkersBreastplate extends ArmorRenderer 
 {
 	public ModelRenderer	BackPlate;
 	public ModelRenderer	BreastPlate;
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
index 9eccca3..bc76312 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
@@ -1,214 +1,214 @@
-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;
-	}
-}
+//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
index 0238b75..5276f2e 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java
@@ -1,235 +1,235 @@
-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;
-	}
-}
+//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
index bb88643..702e7d1 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java
@@ -1,188 +1,188 @@
-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;
-	}
-}
+//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
index f700e93..bc5dae3 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
@@ -1,111 +1,111 @@
-package lance5057.tDefense.armor.renderers.light;
-
-import lance5057.tDefense.armor.renderers.ArmorRenderer;
-import net.minecraft.client.model.ModelRenderer;
-
-/**
- * ModelTinkersBoots - Either Mojang or a mod author
- * Created using Tabula 4.1.1
- */
-public class ModelTinkersBoots extends ArmorRenderer
-{
-	public ModelRenderer	BootTopR;
-	public ModelRenderer	BootTopL;
-	public ModelRenderer	FootL;
-	public ModelRenderer	FootR;
-	public ModelRenderer	LegGuardL;
-	public ModelRenderer	LegGuardR;
-	public ModelRenderer	FootTipL;
-	public ModelRenderer	FootTipR;
-
-	public ModelTinkersBoots()
-	{
-		super(0.1f, 0, 64, 64);
-
-		textureWidth = 64;
-		textureHeight = 64;
-
-		bipedRightLeg = new ModelRenderer(this, "Right Leg");
-		bipedRightLeg.setTextureOffset(0, 16);
-		bipedRightLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.05f);
-		bipedRightLeg.setRotationPoint(-1.9F, 12.0F + 0, 0.0F);
-
-		bipedLeftLeg = new ModelRenderer(this, "Left Leg");
-		bipedLeftLeg.setTextureOffset(0, 16);
-		bipedLeftLeg.mirror = true;
-		bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.05f);
-		bipedLeftLeg.setRotationPoint(1.9F, 12.0F + 0, 0.0F);
-
-		FootR = new ModelRenderer(this, "FootR");
-		FootR.setTextureOffset(0, 41);
-		FootR.setRotationPoint(0f, 0f, 0f);
-		FootR.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.1F);
-		bipedRightLeg.addChild(FootR);
-
-		BootTopR = new ModelRenderer(this, "BootTopR");
-		BootTopR.setTextureOffset(0, 32);
-		BootTopR.setRotationPoint(0f, 0f, 0f);
-		BootTopR.addBox(-2.5F, 3.5F, -2.5F, 5, 4, 5, -0.2F);
-		bipedRightLeg.addChild(BootTopR);
-
-		BootTopL = new ModelRenderer(this, "BootTopL");
-		BootTopL.setTextureOffset(0, 32);
-		BootTopL.setRotationPoint(0f, 0f, 0f);
-		BootTopL.addBox(-2.5F, 3.5F, -2.5F, 5, 4, 5, -0.2F);
-		bipedLeftLeg.addChild(BootTopL);
-
-		LegGuardR = new ModelRenderer(this, "LegGuardR");
-		LegGuardR.setTextureOffset(0, 44);
-		LegGuardR.setRotationPoint(0f, 0f, 0f);
-		LegGuardR.addBox(-2.0F, 5.5F, -3.8F, 4, 4, 2, 0.2F);
-		setRotateAngle(LegGuardR, 0.17453292519943295F, 0.0F, 0.0F);
-		bipedRightLeg.addChild(LegGuardR);
-
-		FootTipR = new ModelRenderer(this, "FootTipR");
-		FootTipR.setTextureOffset(10, 41);
-		FootTipR.setRotationPoint(0f, 0f, 0f);
-		FootTipR.addBox(-1.5F, 9.5F, -5.6F, 3, 2, 2, -0.2F);
-		setRotateAngle(FootTipR, 0.17453292519943295F, 0.0F, 0.0F);
-		bipedRightLeg.addChild(FootTipR);
-
-		FootL = new ModelRenderer(this, "FootL");
-		FootL.setTextureOffset(0, 41);
-		FootL.mirror = true;
-		FootL.setRotationPoint(0f, 0f, 0f);
-		FootL.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.1F);
-		bipedLeftLeg.addChild(FootL);
-
-		LegGuardL = new ModelRenderer(this, "LegGuardL");
-		LegGuardL.setTextureOffset(0, 44);
-		LegGuardL.setRotationPoint(0f, 0f, 0f);
-		LegGuardL.addBox(-2.0F, 5.5F, -3.8F, 4, 4, 2, 0.2F);
-		setRotateAngle(LegGuardL, 0.17453292519943295F, 0.0F, 0.0F);
-		bipedLeftLeg.addChild(LegGuardL);
-
-		FootTipL = new ModelRenderer(this, "FootTipL");
-		FootTipL.setTextureOffset(10, 41);
-		FootTipL.setRotationPoint(0f, 0f, 0f);
-		FootTipL.addBox(-1.5F, 9.5F, -5.6F, 3, 2, 2, -0.2F);
-		setRotateAngle(FootTipL, 0.17453292519943295F, 0.0F, 0.0F);
-		bipedLeftLeg.addChild(FootTipL);
-
-		BootTopL.isHidden = true;
-		BootTopR.isHidden = true;
-		FootTipL.isHidden = true;
-		FootTipR.isHidden = true;
-		LegGuardL.isHidden = true;
-		LegGuardR.isHidden = true;
-
-		init();
-	}
-
-	/**
-	 * This is a helper function from Tabula to set the rotation of model parts
-	 */
-	public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z)
-	{
-		modelRenderer.rotateAngleX = x;
-		modelRenderer.rotateAngleY = y;
-		modelRenderer.rotateAngleZ = z;
-	}
-}
+//package lance5057.tDefense.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
index f2eb795..7381d4e 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
@@ -1,138 +1,138 @@
-package lance5057.tDefense.armor.renderers.light;
-
-import lance5057.tDefense.armor.renderers.ArmorRenderer;
-import net.minecraft.client.model.ModelRenderer;
-
-/**
- * ModelTinkersChausses - Either Mojang or a mod author
- * Created using Tabula 4.1.1
- */
-public class ModelTinkersChausses extends ArmorRenderer
-{
-	public ModelRenderer	FrontL;
-	public ModelRenderer	FrontR;
-	public ModelRenderer	HipGuardL;
-	public ModelRenderer	HipGuardR;
-	public ModelRenderer	BackL;
-	public ModelRenderer	BackR;
-	public ModelRenderer	HipGuardL_1;
-	public ModelRenderer	HipGuardR_1;
-	public ModelRenderer	Belt;
-	public ModelRenderer	BeltR;
-	public ModelRenderer	BeltL;
-
-	public ModelTinkersChausses()
-	{
-		super(0.1f, 0, 64, 64);
-
-		textureWidth = 64;
-		textureHeight = 64;
-
-		bipedRightLeg = new ModelRenderer(this, "Right Leg");
-		bipedRightLeg.setTextureOffset(0, 16);
-		bipedRightLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.1f);
-		bipedRightLeg.setRotationPoint(-1.9F, 12.0F + 0, 0.0F);
-
-		bipedLeftLeg = new ModelRenderer(this, "Left Leg");
-		bipedLeftLeg.setTextureOffset(0, 16);
-		bipedLeftLeg.mirror = true;
-		bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.1f);
-		bipedLeftLeg.setRotationPoint(1.9F, 12.0F + 0, 0.0F);
-
-		HipGuardR = new ModelRenderer(this, "Hip Guard Right");
-		HipGuardR.setTextureOffset(10, 37);
-		HipGuardR.setRotationPoint(0f, 0f, 0f);
-		HipGuardR.addBox(-2.5F, 0.0F, -2.6F, 4, 6, 5, 0.1F);
-		setRotateAngle(HipGuardR, 0.0F, 0.0F, 0.17453292519943295F);
-		bipedRightLeg.addChild(HipGuardR);
-
-		Belt = new ModelRenderer(this, "Belt");
-		Belt.setTextureOffset(18, 48);
-		Belt.setRotationPoint(0.0F, 0.0F, 0.0F);
-		Belt.addBox(-5.0F, 10.5F, -3.0F, 10, 2, 6, -0.19F);
-		bipedBody.addChild(Belt);
-
-		FrontR = new ModelRenderer(this, "Front Right");
-		FrontR.setTextureOffset(0, 40);
-		FrontR.setRotationPoint(1.9f, 0f, -0.1f);
-		FrontR.addBox(-2.0F, 0.0F, -2.6F, 4, 7, 1, 0.0F);
-		setRotateAngle(FrontR, -0.1F, 0.0F, 0.0f);
-		bipedRightLeg.addChild(FrontR);
-
-		FrontL = new ModelRenderer(this, "Front Left");
-		FrontL.setTextureOffset(0, 40);
-		FrontL.setRotationPoint(-1.9f, 0f, -0.1f);
-		FrontL.addBox(-2.0F, 0.0F, -2.6F, 4, 7, 1, 0.0F);
-		setRotateAngle(FrontL, -0.1F, 0.0F, 0.0f);
-		bipedLeftLeg.addChild(FrontL);
-
-		HipGuardL_1 = new ModelRenderer(this, "Hip Guard Left 2");
-		HipGuardL_1.setTextureOffset(0, 49);
-		HipGuardL_1.mirror = true;
-		HipGuardL_1.setRotationPoint(0f, 0f, 0f);
-		HipGuardL_1.addBox(-1.5F, 0.0F, -2.6F, 4, 10, 5, 0.0F);
-		setRotateAngle(HipGuardL_1, 0.0F, 0.0F, -0.08726646259971647F);
-		bipedLeftLeg.addChild(HipGuardL_1);
-
-		BeltR = new ModelRenderer(this, "Belt Right");
-		BeltR.setTextureOffset(18, 56);
-		BeltR.mirror = true;
-		BeltR.setRotationPoint(0.0F, 0.0F, 0.0F);
-		BeltR.addBox(-6F, 1.0F, -3.1F, 12, 2, 6, -0.2F);
-		setRotateAngle(BeltR, 0.0F, 0.0F, -0.4363323129985824F);
-		bipedRightLeg.addChild(BeltR);
-
-		BeltL = new ModelRenderer(this, "Belt Left");
-		BeltL.setTextureOffset(18, 56);
-		BeltL.setRotationPoint(0.0F, 0.0F, 0.0F);
-		BeltL.addBox(-6F, 1.0F, -3.1F, 12, 2, 6, -0.21F);
-		setRotateAngle(BeltL, 0.0F, 0.0F, 0.4363323129985824F);
-		bipedLeftLeg.addChild(BeltL);
-
-		HipGuardR_1 = new ModelRenderer(this, "Hip Guard Right 2");
-		HipGuardR_1.setTextureOffset(0, 49);
-		HipGuardR_1.setRotationPoint(0f, 0f, 0f);
-		HipGuardR_1.addBox(-2.5F, 0.0F, -2.6F, 4, 10, 5, 0.0F);
-		setRotateAngle(HipGuardR_1, 0.0F, 0.0F, 0.08726646259971647F);
-		bipedRightLeg.addChild(HipGuardR_1);
-
-		BackR = new ModelRenderer(this, "Back Right");
-		BackR.setTextureOffset(0, 40);
-		BackR.setRotationPoint(1.9f, 0f, 0f);
-		BackR.addBox(-2.0F, 0.0F, 1.5F, 4, 7, 1, 0.0F);
-		setRotateAngle(BackR, 0.1F, 0.0F, 0.0f);
-		bipedRightLeg.addChild(BackR);
-
-		BackL = new ModelRenderer(this, "Back Light");
-		BackL.setTextureOffset(0, 40);
-		BackL.setRotationPoint(-1.9f, 0f, 0f);
-		BackL.addBox(-2.0F, 0.0F, 1.5F, 4, 7, 1, 0.0F);
-		setRotateAngle(BackL, 0.1F, 0.0F, 0.0f);
-		bipedLeftLeg.addChild(BackL);
-
-		HipGuardL = new ModelRenderer(this, "Hip Guard Left");
-		HipGuardL.setTextureOffset(10, 37);
-		HipGuardL.mirror = true;
-		HipGuardL.setRotationPoint(0f, 0f, 0f);
-		HipGuardL.addBox(-1.5F, 0.0F, -2.6F, 4, 6, 5, 0.1F);
-		setRotateAngle(HipGuardL, 0.0F, 0.0F, -0.17453292519943295F);
-		bipedLeftLeg.addChild(HipGuardL);
-
-		BeltL.isHidden = true;
-		BeltR.isHidden = true;
-		HipGuardL_1.isHidden = true;
-		HipGuardR_1.isHidden = true;
-
-		init();
-	}
-
-	/**
-	 * This is a helper function from Tabula to set the rotation of model parts
-	 */
-	public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z)
-	{
-		modelRenderer.rotateAngleX = x;
-		modelRenderer.rotateAngleY = y;
-		modelRenderer.rotateAngleZ = z;
-	}
-}
+//package lance5057.tDefense.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
index 7496f00..d0af22d 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
@@ -1,100 +1,100 @@
-package lance5057.tDefense.armor.renderers.light;
-
-import lance5057.tDefense.armor.renderers.ArmorRenderer;
-import net.minecraft.client.model.ModelRenderer;
-
-/**
- * ModelBiped - Either Mojang or a mod author
- * Created using Tabula 4.1.1
- */
-public class ModelTinkersCoif extends ArmorRenderer
-{
-	public ModelRenderer	Coif;
-	public ModelRenderer	WingR;
-	public ModelRenderer	Mask;
-	public ModelRenderer	Overlay;
-	public ModelRenderer	WingL;
-	public ModelRenderer	Mohawk;
-	public ModelRenderer	MohawkR;
-	public ModelRenderer	MohawkL;
-
-	public ModelTinkersCoif()
-	{
-		super(0.1f, 0, 128, 64);
-
-		textureWidth = 128;
-		textureHeight = 64;
-
-		Overlay = new ModelRenderer(this, "Overlay");
-		Overlay.setTextureOffset(32, 32);
-		Overlay.setRotationPoint(0.0F, 0.0F, 0.0F);
-		Overlay.addBox(-4.0F, -10.0F, -4.0F, 8, 10, 8, 0.7F);
-		bipedHead.addChild(Overlay);
-
-		WingL = new ModelRenderer(this, "WingL");
-		WingL.setTextureOffset(64, 0);
-		WingL.setRotationPoint(-0.7F, 0.0F, 0.0F);
-		WingL.addBox(2.3F, -13.5F, -6.6F, 8, 18, 0, 0.0F);
-		setRotateAngle(WingL, 0.0F, -0.5235987755982988F, 0.0F);
-		bipedHead.addChild(WingL);
-
-		MohawkR = new ModelRenderer(this, "MohawkR");
-		MohawkR.setTextureOffset(80, -14);
-		MohawkR.setRotationPoint(0.0F, 0.0F, 0.0F);
-		MohawkR.addBox(-3.0F, -14.0F, -3.6F, 0, 18, 14, 0.0F);
-		setRotateAngle(MohawkR, 0.0F, -0.4363323129985824F, 0.0F);
-		bipedHead.addChild(MohawkR);
-
-		Mohawk = new ModelRenderer(this, "Mohawk");
-		Mohawk.setTextureOffset(64, 4);
-		Mohawk.setRotationPoint(0.0F, 0.0F, 0.0F);
-		Mohawk.addBox(0.0F, -14.0F, -4.6F, 0, 18, 14, 0.0F);
-		bipedHead.addChild(Mohawk);
-
-		Mask = new ModelRenderer(this, "Mask");
-		Mask.setTextureOffset(0, 43);
-		Mask.setRotationPoint(0.0F, 0.0F, 0.0F);
-		Mask.addBox(-4.5F, -8.0F, -5.0F, 9, 10, 4, 0.11F);
-		bipedHead.addChild(Mask);
-
-		WingR = new ModelRenderer(this, "WingR");
-		WingR.setTextureOffset(64, 0);
-		WingR.mirror = true;
-		WingR.setRotationPoint(-0.5F, 0.0F, 0.0F);
-		WingR.addBox(-9.2F, -13.5F, -6.0F, 8, 18, 0, 0.0F);
-		setRotateAngle(WingR, 0.0F, 0.5235987755982988F, 0.0F);
-		bipedHead.addChild(WingR);
-
-		MohawkL = new ModelRenderer(this, "MohawkL");
-		MohawkL.setTextureOffset(80, -14);
-		MohawkL.setRotationPoint(0.0F, 0.0F, 0.0F);
-		MohawkL.addBox(3.0F, -14.0F, -3.6F, 0, 18, 14, 0.0F);
-		setRotateAngle(MohawkL, 0.0F, 0.4363323129985824F, 0.0F);
-		bipedHead.addChild(MohawkL);
-
-		Coif = new ModelRenderer(this, "Coif");
-		Coif.setTextureOffset(0, 32);
-		Coif.setRotationPoint(0.0F, 0.0F, 0.0F);
-		Coif.addBox(-4.0F, 1.0F, -4.0F, 8, 3, 8, 0.6F);
-		bipedHead.addChild(Coif);
-
-		Mask.isHidden = true;
-		Mohawk.isHidden = true;
-		MohawkL.isHidden = true;
-		MohawkR.isHidden = true;
-		WingL.isHidden = true;
-		WingR.isHidden = true;
-
-		init();
-	}
-
-	/**
-	 * This is a helper function from Tabula to set the rotation of model parts
-	 */
-	public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z)
-	{
-		modelRenderer.rotateAngleX = x;
-		modelRenderer.rotateAngleY = y;
-		modelRenderer.rotateAngleZ = z;
-	}
-}
+//package lance5057.tDefense.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
index 68e92aa..d30b478 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java
@@ -1,198 +1,198 @@
-package lance5057.tDefense.armor.renderers.light;
-
-import lance5057.tDefense.armor.renderers.ArmorRenderer;
-import net.minecraft.client.model.ModelRenderer;
-
-/**
- * ModelTinkersHauberk - Either Mojang or a mod author
- * Created using Tabula 4.1.1
- */
-public class ModelTinkersHauberk extends ArmorRenderer
-{
-	public ModelRenderer	ChestBeltR;
-	public ModelRenderer	ChestBelt;
-	public ModelRenderer	ChestBeltR_1;
-	public ModelRenderer	ChestBelt_1;
-	public ModelRenderer	ChestBeltL;
-	public ModelRenderer	ChestBeltL_1;
-	public ModelRenderer	ChestBelt_2;
-	public ModelRenderer	Pauldron1;
-	public ModelRenderer	Pauldron2;
-	public ModelRenderer	PauldronStudR;
-	public ModelRenderer	Pauldron3R;
-	public ModelRenderer	PauldronFlairR;
-	public ModelRenderer	Pauldron1L;
-	public ModelRenderer	Pauldron2L;
-	public ModelRenderer	PauldronStudL;
-	public ModelRenderer	Pauldron3L;
-	public ModelRenderer	PauldronFlairL;
-
-	public ModelTinkersHauberk()
-	{
-		super(0.1f, 0, 64, 64);
-
-		textureWidth = 64;
-		textureHeight = 64;
-
-		bipedBody = new ModelRenderer(this, "Body");
-		bipedBody.setTextureOffset(16, 16);
-		bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, 0.05f);
-		bipedBody.setRotationPoint(0.0F, 0.0F + 0, 0.0F);
-
-		bipedRightArm = new ModelRenderer(this, "Right Arm");
-		bipedRightArm.setTextureOffset(40, 16);
-		bipedRightArm.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, 0.05f);
-		bipedRightArm.setRotationPoint(-5.0F, 2.0F + 0, 0.0F);
-
-		bipedLeftArm = new ModelRenderer(this, "Left Arm");
-		bipedLeftArm.setTextureOffset(40, 16);
-		bipedLeftArm.mirror = true;
-		bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, 0.05f);
-		bipedLeftArm.setRotationPoint(5.0F, 2.0F + 0, 0.0F);
-
-		ChestBelt_1 = new ModelRenderer(this, "ChestBelt_1");
-		ChestBelt_1.setTextureOffset(0, 57);
-		ChestBelt_1.setRotationPoint(0.0F, 0.0F, 0.0F);
-		ChestBelt_1.addBox(-4.5F, 9.0F, -2.5F, 9, 2, 5, -0.19F);
-		bipedBody.addChild(ChestBelt_1);
-
-		ChestBelt_2 = new ModelRenderer(this, "ChestBelt_2");
-		ChestBelt_2.setTextureOffset(28, 32);
-		ChestBelt_2.setRotationPoint(0.0F, 0.0F, 0.0F);
-		ChestBelt_2.addBox(-4.5F, 5.0F, -2.5F, 9, 2, 5, -0.19F);
-		bipedBody.addChild(ChestBelt_2);
-
-		Pauldron3R = new ModelRenderer(this, "Pauldron3R");
-		Pauldron3R.setTextureOffset(0, 32);
-		Pauldron3R.setRotationPoint(-0.0F, 0.0F, 0.0F);
-		Pauldron3R.addBox(-3.2F, -0.5F, -2.0F, 3, 4, 4, 0.1F);
-		setRotateAngle(Pauldron3R, 0.0F, 0.0F, 0.08726646259971647F);
-		bipedRightArm.addChild(Pauldron3R);
-
-		Pauldron2L = new ModelRenderer(this, "Pauldron2L");
-		Pauldron2L.setTextureOffset(0, 49);
-		Pauldron2L.mirror = true;
-		Pauldron2L.setRotationPoint(0.0F, 0.0F, 0.0F);
-		Pauldron2L.addBox(-1.0F, -3.0F, -2.0F, 3, 3, 4, 0.1F);
-		setRotateAngle(Pauldron2L, 0.0F, 0.0F, 0.2617993877991494F);
-		bipedLeftArm.addChild(Pauldron2L);
-
-		Pauldron3L = new ModelRenderer(this, "Pauldron3L");
-		Pauldron3L.setTextureOffset(0, 32);
-		Pauldron3L.mirror = true;
-		Pauldron3L.setRotationPoint(0.0F, 0.0F, 0.0F);
-		Pauldron3L.addBox(0.2F, -0.5F, -2.0F, 3, 4, 4, 0.1F);
-		setRotateAngle(Pauldron3L, 0.0F, 0.0F, -0.08726646259971647F);
-		bipedLeftArm.addChild(Pauldron3L);
-
-		ChestBeltR = new ModelRenderer(this, "ChestBeltR");
-		ChestBeltR.setTextureOffset(0, 57);
-		ChestBeltR.setRotationPoint(0.0F, 0.0F, 0.0F);
-		ChestBeltR.addBox(-1.7F, 5.7F, -2.5F, 11, 2, 5, -0.2F);
-		setRotateAngle(ChestBeltR, 0.0F, 0.0F, 0.5235987755982988F);
-		bipedBody.addChild(ChestBeltR);
-
-		ChestBeltL = new ModelRenderer(this, "ChestBeltL");
-		ChestBeltL.setTextureOffset(0, 57);
-		ChestBeltL.mirror = true;
-		ChestBeltL.setRotationPoint(0.0F, 0.0F, 0.0F);
-		ChestBeltL.addBox(-7.5F, 2.3F, -2.5F, 11, 2, 5, -0.2F);
-		setRotateAngle(ChestBeltL, 0.0F, 0.0F, -0.5235987755982988F);
-		bipedBody.addChild(ChestBeltL);
-
-		ChestBeltL_1 = new ModelRenderer(this, "ChestBeltL_1");
-		ChestBeltL_1.setTextureOffset(0, 57);
-		ChestBeltL_1.mirror = true;
-		ChestBeltL_1.setRotationPoint(0.0F, 0.0F, 0.0F);
-		ChestBeltL_1.addBox(-9.3F, 5.7F, -2.5F, 11, 2, 5, -0.21F);
-		setRotateAngle(ChestBeltL_1, 0.0F, 0.0F, -0.5235987755982988F);
-		bipedBody.addChild(ChestBeltL_1);
-
-		PauldronStudR = new ModelRenderer(this, "PauldronStudR");
-		PauldronStudR.setTextureOffset(14, 32);
-		PauldronStudR.setRotationPoint(-0.0F, 0.0F, 0.0F);
-		PauldronStudR.addBox(-1.0F, -1.5F, -2.5F, 2, 2, 5, 0.1F);
-		setRotateAngle(PauldronStudR, 0.0F, 0.0F, -0.2617993877991494F);
-		bipedRightArm.addChild(PauldronStudR);
-
-		Pauldron1 = new ModelRenderer(this, "Pauldron1");
-		Pauldron1.setTextureOffset(0, 40);
-		Pauldron1.setRotationPoint(-0.0F, 0.0F, 0.0F);
-		Pauldron1.addBox(-3.5F, -1.9F, -2.5F, 4, 4, 5, 0.0F);
-		setRotateAngle(Pauldron1, 0.0F, 0.0F, 0.2617993877991494F);
-		bipedRightArm.addChild(Pauldron1);
-
-		ChestBeltR_1 = new ModelRenderer(this, "ChestBeltR_1");
-		ChestBeltR_1.setTextureOffset(0, 57);
-		ChestBeltR_1.setRotationPoint(0.0F, 0.0F, 0.0F);
-		ChestBeltR_1.addBox(-3.5F, 2.3F, -2.5F, 11, 2, 5, -0.21F);
-		setRotateAngle(ChestBeltR_1, 0.0F, 0.0F, 0.5235987755982988F);
-		bipedBody.addChild(ChestBeltR_1);
-
-		PauldronFlairR = new ModelRenderer(this, "PauldronFlairR");
-		PauldronFlairR.setTextureOffset(18, 39);
-		PauldronFlairR.mirror = true;
-		PauldronFlairR.setRotationPoint(-0.0F, 0.0F, 0.0F);
-		PauldronFlairR.addBox(-8.5F, -4.5F, 0.0F, 7, 9, 0, 0.0F);
-		setRotateAngle(PauldronFlairR, 0.0F, 0.0F, 0.2617993877991494F);
-		bipedRightArm.addChild(PauldronFlairR);
-
-		PauldronFlairL = new ModelRenderer(this, "PauldronFlairL");
-		PauldronFlairL.setTextureOffset(18, 39);
-		PauldronFlairL.setRotationPoint(0.0F, 0.0F, 0.0F);
-		PauldronFlairL.addBox(1.5F, -4.5F, 0.0F, 7, 9, 0, 0.0F);
-		setRotateAngle(PauldronFlairL, 0.0F, 0.0F, -0.2617993877991494F);
-		bipedLeftArm.addChild(PauldronFlairL);
-
-		Pauldron2 = new ModelRenderer(this, "Pauldron2");
-		Pauldron2.setTextureOffset(0, 49);
-		Pauldron2.setRotationPoint(-0.0F, 0.0F, 0.0F);
-		Pauldron2.addBox(-2.0F, -3.0F, -2.0F, 3, 3, 4, 0.1F);
-		setRotateAngle(Pauldron2, 0.0F, 0.0F, -0.2617993877991494F);
-		bipedRightArm.addChild(Pauldron2);
-
-		PauldronStudL = new ModelRenderer(this, "PauldronStudL");
-		PauldronStudL.setTextureOffset(14, 32);
-		PauldronStudL.mirror = true;
-		PauldronStudL.setRotationPoint(0.0F, 0.0F, 0.0F);
-		PauldronStudL.addBox(-1.0F, -1.5F, -2.5F, 2, 2, 5, 0.1F);
-		setRotateAngle(PauldronStudL, 0.0F, 0.0F, 0.2617993877991494F);
-		bipedLeftArm.addChild(PauldronStudL);
-
-		Pauldron1L = new ModelRenderer(this, "Pauldron1L");
-		Pauldron1L.setTextureOffset(0, 40);
-		Pauldron1L.mirror = true;
-		Pauldron1L.setRotationPoint(0.0F, 0.0F, 0.0F);
-		Pauldron1L.addBox(-0.5F, -1.9F, -2.5F, 4, 4, 5, 0.0F);
-		setRotateAngle(Pauldron1L, 0.0F, 0.0F, -0.2617993877991494F);
-		bipedLeftArm.addChild(Pauldron1L);
-
-		ChestBelt = new ModelRenderer(this, "ChestBelt");
-		ChestBelt.setTextureOffset(28, 32);
-		ChestBelt.setRotationPoint(0.0F, 0.0F, 0.0F);
-		ChestBelt.addBox(-4.5F, 3.0F, -2.5F, 9, 2, 5, -0.19F);
-		bipedBody.addChild(ChestBelt);
-
-		//ChestBelt.isHidden = true;
-		ChestBelt_1.isHidden = true;
-		ChestBelt_2.isHidden = true;
-		ChestBeltL.isHidden = true;
-		ChestBeltL_1.isHidden = true;
-		ChestBeltR.isHidden = true;
-		ChestBeltR_1.isHidden = true;
-		PauldronFlairL.isHidden = true;
-		PauldronFlairR.isHidden = true;
-
-		init();
-	}
-
-	/**
-	 * This is a helper function from Tabula to set the rotation of model parts
-	 */
-	public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z)
-	{
-		modelRenderer.rotateAngleX = x;
-		modelRenderer.rotateAngleY = y;
-		modelRenderer.rotateAngleZ = z;
-	}
-}
+//package lance5057.tDefense.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;
+//	}
+//}