Updated to TiCo 2.6.3

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

174 files changed, 7129 insertions, 13206 deletions

diff --git a/src/main/java/lance5057/tDefense/PacketHandler.java b/src/main/java/lance5057/tDefense/PacketHandler.java
new file mode 100644
index 0000000..f48202c
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/PacketHandler.java
@@ -0,0 +1,18 @@
+
+package lance5057.tDefense;
+
+import lance5057.tDefense.core.blocks.crestMount.Handler_CrestMount;
+import lance5057.tDefense.core.blocks.crestMount.Message_CrestMount;
+import net.minecraftforge.fml.relauncher.Side;
+
+public class PacketHandler
+{
+	private static int	id	= 0;
+
+	public static void init()
+	{
+		TinkersDefense.INSTANCE.registerMessage(Handler_CrestMount.class, Message_CrestMount.class, id++, Side.SERVER);
+		//TinkersDefense.INSTANCE.registerMessage(Handler_FinishingAnvil.class, Message_FinishingAnvil.class, id++, Side.SERVER);
+
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/Reference.java b/src/main/java/lance5057/tDefense/Reference.java
index ad316d1..61a1aec 100644
--- a/src/main/java/lance5057/tDefense/Reference.java
+++ b/src/main/java/lance5057/tDefense/Reference.java
@@ -4,7 +4,7 @@ public class Reference
 {
 
 	public static final String	MOD_ID		= "tinkersdefense";
-	public static final String	VERSION		= "1.4.0.4a";
+	public static final String	VERSION		= "1.4.0.8a";
 	public static final String	MOD_NAME	= "Tinkers' Defense";
 
 }
diff --git a/src/main/java/lance5057/tDefense/TDIntegration.java b/src/main/java/lance5057/tDefense/TDIntegration.java
deleted file mode 100644
index 6ce662d..0000000
--- a/src/main/java/lance5057/tDefense/TDIntegration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package lance5057.tDefense;
-
-import cpw.mods.fml.common.Loader;
-
-public final class TDIntegration
-{
-	public static boolean	mineAndBlade	= false;
-	public static boolean	thaumcraft		= false;
-	public static boolean	botania			= false;
-	public static boolean	bloodMagic		= false;
-
-	public static void Integrate()
-	{
-		if(Loader.isModLoaded("battlegear2") && TinkersDefense.config.MineAndBladeAddon)
-		{
-			mineAndBlade = true;
-		}
-		if(Loader.isModLoaded("Thaumcraft") && TinkersDefense.config.ThaumcraftAddon)
-		{
-			thaumcraft = true;
-		}
-		if(Loader.isModLoaded("Botania") && TinkersDefense.config.BotaniaAddon)
-		{
-			botania = true;
-		}
-		if(Loader.isModLoaded("AWWayofTime") && TinkersDefense.config.BloodMagicAddon)
-		{
-			bloodMagic = true;
-		}
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/TD_Commands.java b/src/main/java/lance5057/tDefense/TD_Commands.java
index 66e40c4..e97f303 100644
--- a/src/main/java/lance5057/tDefense/TD_Commands.java
+++ b/src/main/java/lance5057/tDefense/TD_Commands.java
@@ -44,22 +44,22 @@ public class TD_Commands extends CommandBase implements ICommand
 //	}
 
 	@Override
-	public String getCommandName()
+	public String getName()
 	{
 		return "TinkersDefense";
 	}
 
 	@Override
-	public String getCommandUsage(ICommandSender p_71518_1_)
+	public String getUsage(ICommandSender p_71518_1_)
 	{
 		return "TinkersDefense <text>";
 	}
 
-	@Override
-	public List getCommandAliases()
-	{
-		return aliases;
-	}
+//	@Override
+//	public List getCommandAliases()
+//	{
+//		return aliases;
+//	}
 
 	@Override
 	public void execute(MinecraftServer server, ICommandSender p_71515_1_, String[] p_71515_2_)
@@ -93,12 +93,12 @@ public class TD_Commands extends CommandBase implements ICommand
 				TinkersDefense.config.debug = !TinkersDefense.config.debug;
 				if(TinkersDefense.config.debug)
 				{
-					p_71515_1_.addChatMessage(new TextComponentString(
+					p_71515_1_.sendMessage(new TextComponentString(
 							"§9[TDefense]§f - Debug Mode on."));
 				}
 				else
 				{
-					p_71515_1_.addChatMessage(new TextComponentString(
+					p_71515_1_.sendMessage(new TextComponentString(
 							"§9[TDefense]§f - Debug Mode off."));
 				}
 
@@ -109,7 +109,7 @@ public class TD_Commands extends CommandBase implements ICommand
 			}
 			else
 			{
-				p_71515_1_.addChatMessage(new TextComponentString(
+				p_71515_1_.sendMessage(new TextComponentString(
 						"§c[TDefense]§f - Invalid Command"));
 			}
 		}
@@ -133,6 +133,7 @@ public class TD_Commands extends CommandBase implements ICommand
 		return false;
 	}
 
+
 //	public void reloadModels()
 //	{
 //		TinkersDefense.proxy.registerRenderers();
diff --git a/src/main/java/lance5057/tDefense/TinkersDefense.java b/src/main/java/lance5057/tDefense/TinkersDefense.java
index bf58ba3..e75fdf2 100644
--- a/src/main/java/lance5057/tDefense/TinkersDefense.java
+++ b/src/main/java/lance5057/tDefense/TinkersDefense.java
@@ -3,6 +3,7 @@ package lance5057.tDefense;
 import java.util.Iterator;
 import java.util.List;
 
+import lance5057.tDefense.baubles.BaublesBase;
 import lance5057.tDefense.core.CoreBase;
 import lance5057.tDefense.core.materials.TDMaterials;
 import lance5057.tDefense.core.tools.TDTools;
@@ -29,14 +30,17 @@ public class TinkersDefense {
 
 	private static int modGuiIndex = 0;
 	public static final int GUI_CREST_INV = modGuiIndex++;
-	public static final int GUI_ANVIL_INV = modGuiIndex++;
-	public static final int GUI_GUIDEBOOK = modGuiIndex++;
+	//public static final int GUI_ANVIL_INV = modGuiIndex++;
+	//public static final int GUI_GUIDEBOOK = modGuiIndex++;
 
 	@Instance(Reference.MOD_ID)
 	public static TinkersDefense instance = new TinkersDefense();
+	
+	PacketHandler phandler = new PacketHandler();
 
 	HolidayBase holiday;
 	ModuleBase core;
+	ModuleBase baubles;
 
 	// public static TDEventHandler TDevents;
 
@@ -117,6 +121,8 @@ public class TinkersDefense {
 	public void preInit(FMLPreInitializationEvent e) {
 		core = new CoreBase();
 		holiday = new HolidayBase();
+		baubles = new BaublesBase();
+		
 		mats = new TDMaterials();
 		tools = new TDTools();
 		config = new TD_Config(e);
@@ -315,9 +321,10 @@ public class TinkersDefense {
 		// mods.preInit();
 		// proxy.registerRenderers();
 
-		core.preInit();
-		holiday.preInit();
+		core.preInit(e);
+		holiday.preInit(e);
 		tools.preInit(e);
+		baubles.preInit(e);
 		proxy.preInit();
 	}
 
@@ -326,16 +333,20 @@ public class TinkersDefense {
 
 		// I reject your moss and substitute my own!
 		if (config.mossEnabled || config.mossHard) {
-		}
+		
 		final List<IRecipe> recipes = CraftingManager.getInstance()
 				.getRecipeList();
 		final Iterator<IRecipe> recipe = recipes.iterator();
+		}
 
-		core.init();
-		holiday.init();
+		core.init(e);
+		holiday.init(e);
 		mats.setupMaterials(e);
 		tools.init(e);
-		proxy.Init();
+		baubles.init(e);
+		proxy.init();
+		
+		phandler.init();
 	}
 
 	@EventHandler
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;
+//	}
+//}
diff --git a/src/main/java/lance5057/tDefense/baubles/BaublesBase.java b/src/main/java/lance5057/tDefense/baubles/BaublesBase.java
index 7152104..b2af546 100644
--- a/src/main/java/lance5057/tDefense/baubles/BaublesBase.java
+++ b/src/main/java/lance5057/tDefense/baubles/BaublesBase.java
@@ -1,8 +1,40 @@
 package lance5057.tDefense.baubles;
 
+import lance5057.tDefense.baubles.tools.TDBaubles;
 import lance5057.tDefense.util.ModuleBase;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
 public class BaublesBase extends ModuleBase
 {
+	public static BaublesBase instance = new BaublesBase();
 	
+	
+	public static BaublesItems items;
+	public static TDBaubles tools;
+	
+	@Override
+	public void preInit(FMLPreInitializationEvent e)
+	{
+		items = new BaublesItems();
+		tools = new TDBaubles();
+		
+		items.preInit(e);
+		tools.preInit(e);
+	}
+
+	@Override
+	public void init(FMLInitializationEvent e) {
+		// TODO Auto-generated method stub
+		items.init(e);
+		tools.init(e);
+	}
+
+	@Override
+	public void postInit(FMLPostInitializationEvent e) {
+		// TODO Auto-generated method stub
+		items.postInit(e);
+		tools.postInit(e);
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/baubles/BaublesClientProxy.java b/src/main/java/lance5057/tDefense/baubles/BaublesClientProxy.java
new file mode 100644
index 0000000..d5603ff
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/baubles/BaublesClientProxy.java
@@ -0,0 +1,91 @@
+package lance5057.tDefense.baubles;
+
+import java.util.Map;
+
+import lance5057.tDefense.Reference;
+import lance5057.tDefense.baubles.renderers.BaubleRenderer;
+import lance5057.tDefense.baubles.renderers.SheatheModel;
+import lance5057.tDefense.baubles.tools.TDBaubles;
+import lance5057.tDefense.core.tools.TDTools;
+import lance5057.tDefense.util.ModuleBase;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.entity.RenderPlayer;
+import net.minecraft.item.Item;
+import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import slimeknights.tconstruct.common.ModelRegisterUtil;
+import slimeknights.tconstruct.library.TinkerRegistryClient;
+import slimeknights.tconstruct.library.client.ToolBuildGuiInfo;
+
+public class BaublesClientProxy {
+	
+	public SheatheModel sheathe;
+	
+	ToolBuildGuiInfo sheatheGUI;
+
+	public void preInit() {
+		// TODO Auto-generated method stub
+		
+		reloadRenderers();
+	}
+
+	public void init() {
+		// TODO Auto-generated method stub
+		Map<String, RenderPlayer> skinMap = Minecraft.getMinecraft().getRenderManager().getSkinMap();
+		RenderPlayer render;
+		render = skinMap.get("default");
+		render.addLayer(new BaubleRenderer());
+		
+		render = skinMap.get("slim");
+		render.addLayer(new BaubleRenderer());
+		
+		createToolGuis();
+		setupToolGuis();
+		registerToolGuis();
+	}
+	
+	public void postInit() 
+	{
+	}
+	
+	public void registerToolRenderers()
+	{
+		ModelRegisterUtil.registerToolModel(TDBaubles.sheathe);
+	}
+	
+	public void createToolGuis()
+	{
+		sheatheGUI = new ToolBuildGuiInfo(TDBaubles.sheathe);
+	}
+	
+	public void setupToolGuis()
+	{
+		sheatheGUI.addSlotPosition(34, 15+8);
+		sheatheGUI.addSlotPosition(34, 33+8);
+		sheatheGUI.addSlotPosition(34, 51+8);
+	}
+	
+	public void registerToolGuis()
+	{
+		TinkerRegistryClient.addToolBuilding(sheatheGUI);
+	}
+	
+	public void reloadRenderers()
+	{
+		sheathe = new SheatheModel();
+		registerToolRenderers();
+	}
+	
+	public void setToolGuis()
+	{
+		sheatheGUI.positions.clear();
+		sheatheGUI.addSlotPosition(34, 15);
+		sheatheGUI.addSlotPosition(34, 33);
+		sheatheGUI.addSlotPosition(34, 51);
+	}
+	
+}
diff --git a/src/main/java/lance5057/tDefense/baubles/BaublesItems.java b/src/main/java/lance5057/tDefense/baubles/BaublesItems.java
index 729654a..69323bb 100644
--- a/src/main/java/lance5057/tDefense/baubles/BaublesItems.java
+++ b/src/main/java/lance5057/tDefense/baubles/BaublesItems.java
@@ -1,5 +1,28 @@
 package lance5057.tDefense.baubles;
 
-public class BaublesItems {
+import lance5057.tDefense.util.ItemsBase;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
+public class BaublesItems extends ItemsBase
+{
+
+	@Override
+	public void preInit(FMLPreInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void init(FMLInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void postInit(FMLPostInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/baubles/blocks/JewelersBench.java b/src/main/java/lance5057/tDefense/baubles/blocks/JewelersBench.java
deleted file mode 100644
index e7f54fb..0000000
--- a/src/main/java/lance5057/tDefense/baubles/blocks/JewelersBench.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package lance5057.tDefense.baubles.blocks;
-
-import lance5057.tDefense.baubles.tileentities.TileEntity_JewelersBench;
-import net.minecraft.block.Block;
-import net.minecraft.block.ITileEntityProvider;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class JewelersBench extends Block implements ITileEntityProvider
-{
-
-	public JewelersBench()
-	{
-		super(Material.iron);
-	}
-
-	//You don't want the normal render type, or it wont render properly.
-	@Override
-	public int getRenderType()
-	{
-		return -1;
-	}
-
-	//It's not an opaque cube, so you need this.
-	@Override
-	public boolean isOpaqueCube()
-	{
-		return false;
-	}
-
-	//It's not a normal block, so you need this too.
-	@Override
-	public boolean renderAsNormalBlock()
-	{
-		return false;
-	}
-
-	//This is the icon to use for showing the block in your hand.
-	@SideOnly(Side.CLIENT)
-	@Override
-	public void registerBlockIcons(IIconRegister icon)
-	{
-		blockIcon = icon.registerIcon("tinkersdefense:WIP");
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World w, int md)
-	{
-		final TileEntity_JewelersBench te = new TileEntity_JewelersBench();
-		return te;
-	}
-
-}
diff --git a/src/main/java/lance5057/tDefense/baubles/models/ModelJewelersBench.java b/src/main/java/lance5057/tDefense/baubles/models/ModelJewelersBench.java
deleted file mode 100644
index 164c522..0000000
--- a/src/main/java/lance5057/tDefense/baubles/models/ModelJewelersBench.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package lance5057.tDefense.baubles.models;
-
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.entity.Entity;
-
-/**
- * JewelersBench - lance5057
- * Created using Tabula 4.1.1
- */
-public class ModelJewelersBench extends ModelBase
-{
-	public ModelRenderer	TableSide2;
-	public ModelRenderer	SawBlock1;
-	public ModelRenderer	SawBlock2;
-	public ModelRenderer	SawBlock3;
-	public ModelRenderer	SawBlockClamp;
-	public ModelRenderer	Leg1;
-	public ModelRenderer	Leg2;
-	public ModelRenderer	Leg3;
-	public ModelRenderer	Leg4;
-	public ModelRenderer	TableTop;
-	public ModelRenderer	TableBack;
-	public ModelRenderer	TableSide1;
-	public ModelRenderer	Drawer;
-	public ModelRenderer	Handle;
-
-	public ModelJewelersBench()
-	{
-		textureWidth = 64;
-		textureHeight = 64;
-		SawBlock1 = new ModelRenderer(this, 0, 0);
-		SawBlock1.setRotationPoint(2.0F, 8.2F, -12.0F);
-		SawBlock1.addBox(0.0F, 0.0F, 0.0F, 1, 1, 4, 0.0F);
-		Leg4 = new ModelRenderer(this, 0, 0);
-		Leg4.setRotationPoint(6.0F, 10.0F, 6.0F);
-		Leg4.addBox(0.0F, 0.0F, 0.0F, 2, 14, 2, 0.0F);
-		Drawer = new ModelRenderer(this, 0, 46);
-		Drawer.setRotationPoint(-6.0F, 11.5F, -8.0F);
-		Drawer.addBox(0.0F, 0.0F, 0.0F, 12, 2, 16, 0.0F);
-		TableSide2 = new ModelRenderer(this, 0, 0);
-		TableSide2.setRotationPoint(-8.0F, 7.0F, -7.0F);
-		TableSide2.addBox(0.0F, 0.0F, 0.0F, 1, 1, 14, 0.0F);
-		Leg2 = new ModelRenderer(this, 0, 0);
-		Leg2.setRotationPoint(6.0F, 10.0F, -8.0F);
-		Leg2.addBox(0.0F, 0.0F, 0.0F, 2, 14, 2, 0.0F);
-		TableSide1 = new ModelRenderer(this, 0, 0);
-		TableSide1.setRotationPoint(7.0F, 7.0F, -7.0F);
-		TableSide1.addBox(0.0F, 0.0F, 0.0F, 1, 1, 14, 0.0F);
-		SawBlock3 = new ModelRenderer(this, 0, 0);
-		SawBlock3.setRotationPoint(3.0F, 8.2F, -11.0F);
-		SawBlock3.addBox(0.0F, 0.0F, 0.0F, 1, 1, 3, 0.0F);
-		Handle = new ModelRenderer(this, 55, 0);
-		Handle.setRotationPoint(-2.0F, 12.0F, -9.0F);
-		Handle.addBox(0.0F, 0.0F, 0.0F, 4, 1, 1, 0.0F);
-		Leg1 = new ModelRenderer(this, 0, 0);
-		Leg1.setRotationPoint(-8.0F, 10.0F, -8.0F);
-		Leg1.addBox(0.0F, 0.0F, 0.0F, 2, 14, 2, 0.0F);
-		TableTop = new ModelRenderer(this, 0, 28);
-		TableTop.setRotationPoint(-8.0F, 8.0F, -8.0F);
-		TableTop.addBox(0.0F, 0.0F, 0.0F, 16, 2, 16, 0.0F);
-		TableBack = new ModelRenderer(this, 0, 0);
-		TableBack.setRotationPoint(-8.0F, 7.0F, 7.0F);
-		TableBack.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F);
-		SawBlockClamp = new ModelRenderer(this, 54, 0);
-		SawBlockClamp.setRotationPoint(1.5F, 8.0F, -9.0F);
-		SawBlockClamp.addBox(0.0F, 0.0F, 0.0F, 4, 2, 1, 0.0F);
-		Leg3 = new ModelRenderer(this, 0, 0);
-		Leg3.setRotationPoint(-8.0F, 10.0F, 6.0F);
-		Leg3.addBox(0.0F, 0.0F, 0.0F, 2, 14, 2, 0.0F);
-		SawBlock2 = new ModelRenderer(this, 0, 0);
-		SawBlock2.setRotationPoint(4.0F, 8.2F, -12.0F);
-		SawBlock2.addBox(0.0F, 0.0F, 0.0F, 1, 1, 4, 0.0F);
-	}
-
-	@Override
-	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
-	{
-		SawBlock1.render(f5);
-		Leg4.render(f5);
-		Drawer.render(f5);
-		TableSide2.render(f5);
-		Leg2.render(f5);
-		TableSide1.render(f5);
-		SawBlock3.render(f5);
-		Handle.render(f5);
-		Leg1.render(f5);
-		TableTop.render(f5);
-		TableBack.render(f5);
-		SawBlockClamp.render(f5);
-		Leg3.render(f5);
-		SawBlock2.render(f5);
-	}
-
-	/**
-	 * This is a helper function from Tabula to set the rotation of model parts
-	 */
-	public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z)
-	{
-		modelRenderer.rotateAngleX = x;
-		modelRenderer.rotateAngleY = y;
-		modelRenderer.rotateAngleZ = z;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/baubles/models/Renderer_JewelersBench.java b/src/main/java/lance5057/tDefense/baubles/models/Renderer_JewelersBench.java
deleted file mode 100644
index 8f5608c..0000000
--- a/src/main/java/lance5057/tDefense/baubles/models/Renderer_JewelersBench.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package lance5057.tDefense.baubles.models;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.entity.Entity;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ResourceLocation;
-
-import org.lwjgl.opengl.GL11;
-
-public class Renderer_JewelersBench extends TileEntitySpecialRenderer
-{
-	private final ModelJewelersBench	model;
-
-	public Renderer_JewelersBench()
-	{
-		model = new ModelJewelersBench();
-	}
-
-	@Override
-	public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale)
-	{
-		GL11.glPushMatrix();
-		GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
-
-		final ResourceLocation textures = (new ResourceLocation(
-				"tinkersdefense:textures/blocks/jewelersbench.png"));
-
-		Minecraft.getMinecraft().renderEngine.bindTexture(textures);
-
-		GL11.glPushMatrix();
-
-		te.getBlockMetadata();
-
-		GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
-
-		model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
-		GL11.glPopMatrix();
-		GL11.glPopMatrix();
-
-	}
-
-}
diff --git a/src/main/java/lance5057/tDefense/baubles/renderers/BaubleRenderer.java b/src/main/java/lance5057/tDefense/baubles/renderers/BaubleRenderer.java
new file mode 100644
index 0000000..8c6aec3
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/baubles/renderers/BaubleRenderer.java
@@ -0,0 +1,108 @@
+package lance5057.tDefense.baubles.renderers;
+
+import lance5057.tDefense.core.tools.Shield;
+import lance5057.tDefense.core.tools.Zweihander;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
+import net.minecraft.client.renderer.entity.layers.LayerRenderer;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.EntityEquipmentSlot;
+import net.minecraft.item.ItemShield;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemSword;
+import net.minecraft.util.EnumHand;
+import slimeknights.tconstruct.library.tools.ToolCore;
+import slimeknights.tconstruct.tools.melee.item.Cleaver;
+
+public class BaubleRenderer implements LayerRenderer<EntityPlayer> {
+
+	@Override
+	public void doRenderLayer(EntityPlayer entitylivingbaseIn, float limbSwing, float limbSwingAmount,
+			float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
+
+//		ItemStack stack = entitylivingbaseIn.inventory.getStackInSlot(0);
+//		ItemStack stackShield = entitylivingbaseIn.inventory.getStackInSlot(1);
+//		
+//		ItemStack stackTest = entitylivingbaseIn.getHeldItem(EnumHand.MAIN_HAND);
+//		
+//		if (stack != null 
+//				&& (stack.getItem() instanceof ToolCore || stack.getItem() instanceof ItemSword) 
+//				&& !(stack.getItem() instanceof Shield)
+//				&& stack != stackTest) {
+//			GlStateManager.pushMatrix();
+//			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
+////			Helper.rotateIfSneaking(player);
+////			boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.LEGS).isEmpty();
+//			//GlStateManager.rotate(90, 0, 1, 0);
+//			GlStateManager.rotate(20, 0, 0, 1);
+//			GlStateManager.translate(-0.125, 0.1, 0.25);
+//			//GlStateManager.scale(0.55, 0.55, 0.55);
+//
+////			if (renderedOne)
+////				GlStateManager.translate(0F, 0F, armor ? 0.55F : 0.5F);
+////			else
+////				GlStateManager.translate(0F, 0F, armor ? -0.55F : -0.5F);
+//
+//			if(stack.getItem() instanceof Zweihander || stack.getItem() instanceof Cleaver)
+//			{
+//				GlStateManager.scale(1.5F, 1.5F, 0.75F);
+//				GlStateManager.translate(0.1, 0.1, 0);
+//			}
+//			else
+//				GlStateManager.scale(0.75F, 0.75F, 0.75F);
+//
+//			GlStateManager.color(1F, 1F, 1F);
+//			int light = 15728880;
+//			int lightmapX = light % 65536;
+//			int lightmapY = light / 65536;
+//			OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
+//			Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE);
+//			GlStateManager.popMatrix();
+//		}
+//		
+//		//Shield
+//		if (stackShield != null 
+//				&& (stackShield.getItem() instanceof Shield || stackShield.getItem() instanceof ItemShield) 
+//				&& stackShield != stackTest) {
+//			GlStateManager.pushMatrix();
+//			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
+////			Helper.rotateIfSneaking(player);
+////			boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.LEGS).isEmpty();
+//			//GlStateManager.rotate(90, 0, 1, 0);
+//			GlStateManager.rotate(160, 0, 0, 1);
+//			GlStateManager.translate(0.125, -0.3, 0.3);
+//			//GlStateManager.scale(0.55, 0.55, 0.55);
+//
+////			if (renderedOne)
+////				GlStateManager.translate(0F, 0F, armor ? 0.55F : 0.5F);
+////			else
+////				GlStateManager.translate(0F, 0F, armor ? -0.55F : -0.5F);
+//
+//			if(stackShield.getItem() instanceof ItemShield)
+//			{
+//				//GlStateManager.scale(1.5F, 1.5F, 0.75F);
+//				GlStateManager.translate(0.5, 0.5, 0.5);
+//			}
+////			else
+//			//GlStateManager.scale(0.75F, 0.75F, 0.75F);
+//
+//			GlStateManager.color(1F, 1F, 1F);
+//			int light = 15728880;
+//			int lightmapX = light % 65536;
+//			int lightmapY = light / 65536;
+//			OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
+//			Minecraft.getMinecraft().getRenderItem().renderItem(stackShield, ItemCameraTransforms.TransformType.NONE);
+//			GlStateManager.popMatrix();
+//		}
+	}
+
+	@Override
+	public boolean shouldCombineTextures() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+}
diff --git a/src/main/java/lance5057/tDefense/baubles/renderers/SheatheModel.java b/src/main/java/lance5057/tDefense/baubles/renderers/SheatheModel.java
new file mode 100644
index 0000000..88177ef
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/baubles/renderers/SheatheModel.java
@@ -0,0 +1,128 @@
+package lance5057.tDefense.baubles.renderers;
+
+import lance5057.tDefense.core.tools.Shield;
+import lance5057.tDefense.core.tools.Zweihander;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.item.ItemShield;
+import net.minecraft.item.ItemStack;
+import slimeknights.tconstruct.tools.melee.item.Cleaver;
+
+/**
+ * Sheathe - Lance5057 Created using Tabula 4.1.1
+ */
+public class SheatheModel extends ModelBiped {
+	public ModelRenderer Sheathe;
+	public ModelRenderer FrontCap;
+	public ModelRenderer WaistBelt;
+	public ModelRenderer BackCap;
+	public ModelRenderer ShoulderBelt;
+
+	public SheatheModel() {
+
+		// rSword = new RenderItem(Minecraft.getMinecraft().getTextureManager(),
+		// null, null);
+
+		this.textureWidth = 64;
+		this.textureHeight = 64;
+
+		this.WaistBelt = new ModelRenderer(this, 0, 32);
+		this.WaistBelt.setRotationPoint(0.0F, 0.0F, 0.0F);
+		this.WaistBelt.addBox(-4.5F, 4.5F, -2.5F, 9, 2, 5, -0.3F);
+		// this.bipedBody.addChild(WaistBelt);
+
+		this.ShoulderBelt = new ModelRenderer(this, 0, 32);
+		this.ShoulderBelt.setRotationPoint(0.0F, 0.0F, 0.0F);
+		this.ShoulderBelt.addBox(-3.0F, 1.0F, -2.5F, 9, 2, 5, -0.3F);
+		this.setRotateAngle(ShoulderBelt, 0.0F, 0.0F, 0.7853981633974483F);
+		// this.bipedBody.addChild(ShoulderBelt);
+
+		this.BackCap = new ModelRenderer(this, 0, 39);
+		this.BackCap.setRotationPoint(0.0F, 0.0F, 0.0F);
+		this.BackCap.addBox(-2.2F, 3.6F, -2.8F, 3, 3, 2, -0.4F);
+		this.setRotateAngle(BackCap, 0.0F, 0.0F, -0.4363323129985824F);
+		// this.bipedBody.addChild(BackCap);
+
+		this.FrontCap = new ModelRenderer(this, 0, 39);
+		this.FrontCap.setRotationPoint(0.0F, 0.0F, 0.0F);
+		this.FrontCap.addBox(-2.2F, 3.6F, 0.7F, 3, 3, 2, -0.4F);
+		this.setRotateAngle(FrontCap, 0.0F, 0.0F, -0.4363323129985824F);
+		// this.bipedBody.addChild(FrontCap);
+
+		this.Sheathe = new ModelRenderer(this, 28, 32);
+		this.Sheathe.setRotationPoint(0.0F, 0.0F, 0.0F);
+		this.Sheathe.addBox(-1.1F, 1.0F, 3.5F, 11, 3, 1, 0.2F);
+		this.setRotateAngle(Sheathe, 0.0F, 0.0F, 1.1344640137963142F);
+		// this.bipedBody.addChild(Sheathe);
+	}
+
+	public void render(float f5, ItemStack weapon, ItemStack shield, ItemStack active, ItemStack offhand) {
+
+		WaistBelt.render(f5);
+		ShoulderBelt.render(f5);
+		BackCap.render(f5);
+		FrontCap.render(f5);
+		Sheathe.render(f5);
+
+		
+		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
+
+		if (weapon != null && active != weapon) {
+			GlStateManager.pushMatrix();
+			
+			GlStateManager.rotate(20, 0, 0, 1);
+			float s = 13f;
+			GlStateManager.scale(s, s, s);
+			GlStateManager.translate(-0.1F, 0.175f, 0.3f);
+			
+			if(weapon.getItem() instanceof Zweihander || weapon.getItem() instanceof Cleaver)
+			{
+				GlStateManager.scale(2f, 2f, 1f);
+			}
+
+			Minecraft.getMinecraft().getRenderItem().renderItem(weapon, ItemCameraTransforms.TransformType.NONE);
+			
+			GlStateManager.popMatrix();
+		}
+
+		if (shield != null && shield != active
+				&& (shield.getItem() instanceof ItemShield || shield.getItem() instanceof Shield)) {
+			GlStateManager.pushMatrix();
+			
+			GlStateManager.rotate(20, 0, 0, 1);
+			float s = 13f;
+			GlStateManager.scale(s, s, s);
+			GlStateManager.translate(-0.1F, 0.175f, 0.3f);
+			
+			if (shield.getItem() instanceof Shield) {
+				
+				GlStateManager.rotate(180 - 45, 0, 0, 1);
+				GlStateManager.translate(-0.0F, -0.3f, 0.1f);
+				GlStateManager.scale(1.35, 1.35, 1.35);
+			} else {
+				GlStateManager.rotate(180 - 45, 0, 0, 1);
+				GlStateManager.translate(0.7F, 0.2f, 0.7f);
+				GlStateManager.scale(1.35, 1.35, 1.35);
+			}
+
+			Minecraft.getMinecraft().getRenderItem().renderItem(shield, ItemCameraTransforms.TransformType.NONE);
+			
+			GlStateManager.popMatrix();
+		}
+
+		
+	}
+
+	/**
+	 * 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/baubles/tools/BaubleTool.java b/src/main/java/lance5057/tDefense/baubles/tools/BaubleTool.java
new file mode 100644
index 0000000..b393100
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/baubles/tools/BaubleTool.java
@@ -0,0 +1,152 @@
+package lance5057.tDefense.baubles.tools;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import baubles.api.BaubleType;
+import baubles.api.IBauble;
+import baubles.api.render.IRenderBauble;
+import lance5057.tDefense.core.materials.ShieldMaterialStats;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.IProjectile;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.IItemPropertyGetter;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.common.Optional;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import slimeknights.tconstruct.library.client.model.ToolModelLoader;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.tools.ToolCore;
+import slimeknights.tconstruct.library.tools.ToolNBT;
+import slimeknights.tconstruct.tools.TinkerTools;
+
+//@Optional.InterfaceList({@Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.ISheathed"), @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.shield.IArrowCatcher"), @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.shield.IArrowDisplay"), @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.shield.IShield")})
+public abstract class BaubleTool extends ToolCore implements IBauble, IRenderBauble
+{
+	//protected static PartMaterialType ShieldMat = new PartMaterialType(TinkerTools.largePlate, ShieldMaterialStats.TYPE);
+	
+	public BaubleTool(PartMaterialType... requiredComponents)
+	{
+		super(requiredComponents);
+		
+//		this.addPropertyOverride(new ResourceLocation("block"), new IItemPropertyGetter()
+//        {
+//            @SideOnly(Side.CLIENT)
+//            public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn)
+//            {
+//            	float i = entityIn != null && entityIn.isHandActive() && entityIn.getActiveItemStack() == stack ? 1.0F : 0.0F;
+//                return i;
+//            }
+//        });
+	}
+
+	protected float baseSpeed()
+	{
+		return 1.5f;
+	}
+
+	protected float effectiveSpeed()
+	{
+		return 15f;
+	}
+
+	public float breakSpeedModifier()
+	{
+		return 1.0f;
+	}
+
+//	@Override
+//	public float getDigSpeed(ItemStack stack, Block block, int meta)
+//	{
+//		return 0.0f;
+//	}
+
+	/**
+	 * returns the action that specifies what animation to play when the items
+	 * is being used
+	 */
+//	@Override
+//	public EnumAction getItemUseAction(ItemStack par1ItemStack)
+//	{
+//		return EnumAction.BLOCK;
+//	}
+	
+//	public ActionResult<ItemStack> onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand)
+//    {
+//        playerIn.setActiveHand(hand);
+//        return new ActionResult(EnumActionResult.SUCCESS, itemStackIn);
+//    }
+//	
+//	public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ)
+//    {
+//        return super.onItemUse(stack, playerIn, worldIn, pos, hand, facing, hitX, hitY, hitZ);
+//    }
+
+	/**
+	 * How long it takes to use or consume an item
+	 */
+	@Override
+	public int getMaxItemUseDuration(ItemStack par1ItemStack)
+	{
+		return 72000;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5)
+	{
+//		super.onUpdate(stack, world, entity, par4, par5);
+//		if(entity instanceof EntityPlayerSP)
+//		{
+//			final EntityPlayerSP player = (EntityPlayerSP) entity;
+//			final ItemStack usingItem = player.getActiveItemStack();
+//			if(usingItem != null && usingItem.getItem() == this)
+//			{
+//				player.movementInput.moveForward *= 2.5F;
+//				player.movementInput.moveStrafe *= 2.5F;
+//			}
+//		}
+	}
+
+	protected String getHarvestType()
+	{
+		return null;
+	}
+
+	@Override
+	public float damagePotential() {
+		// TODO Auto-generated method stub
+		return 0.1f;
+	}
+
+	@Override
+	public double attackSpeed() {
+		// TODO Auto-generated method stub
+		return 4;
+	}
+
+	@Override
+	public NBTTagCompound buildTag(
+			List<slimeknights.tconstruct.library.materials.Material> materials) {
+		ToolNBT data = buildDefaultTag(materials);
+		return data.get();
+	}
+}
diff --git a/src/main/java/lance5057/tDefense/baubles/tools/Sheathe.java b/src/main/java/lance5057/tDefense/baubles/tools/Sheathe.java
new file mode 100644
index 0000000..f9c62cc
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/baubles/tools/Sheathe.java
@@ -0,0 +1,48 @@
+package lance5057.tDefense.baubles.tools;
+
+import baubles.api.BaubleType;
+import lance5057.tDefense.Reference;
+import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.baubles.BaublesBase;
+import lance5057.tDefense.proxy.ClientProxy;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.tools.TinkerTools;
+
+public class Sheathe extends BaubleTool {
+	private static final ResourceLocation texture = new ResourceLocation(Reference.MOD_ID, "textures/model/sheathe.png");
+
+	public Sheathe(PartMaterialType... requiredComponents) {
+		super(PartMaterialType.head(TinkerTools.largePlate), PartMaterialType.handle(TinkerTools.toolRod),
+				PartMaterialType.extra(TinkerTools.bowString));
+
+	}
+
+	@Override
+	public BaubleType getBaubleType(ItemStack itemstack) { 
+		// TODO Auto-generated method stub
+		return BaubleType.BODY;
+	}
+
+	@Override
+	public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) {
+		// TODO Auto-generated method stub
+
+		if (type == RenderType.BODY) {
+			float s = 1F / 16F;
+			GlStateManager.scale(s, s, s);
+
+			GlStateManager.enableLighting();
+			GlStateManager.enableRescaleNormal();
+
+			Minecraft.getMinecraft().renderEngine.bindTexture(texture);
+
+			ClientProxy.baubles.sheathe.render(1f, player.inventory.getStackInSlot(0), player.inventory.getStackInSlot(1), player.getHeldItemMainhand(), player.getHeldItemOffhand());
+		}
+	}
+
+}
diff --git a/src/main/java/lance5057/tDefense/baubles/tools/TDBaubles.java b/src/main/java/lance5057/tDefense/baubles/tools/TDBaubles.java
new file mode 100644
index 0000000..f06a217
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/baubles/tools/TDBaubles.java
@@ -0,0 +1,99 @@
+package lance5057.tDefense.baubles.tools;
+
+import com.google.common.eventbus.Subscribe;
+
+import lance5057.tDefense.core.tools.HeaterShield;
+import lance5057.tDefense.core.tools.RoundShield;
+import lance5057.tDefense.core.tools.TDToolEvents;
+import lance5057.tDefense.core.tools.Zweihander;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import slimeknights.tconstruct.library.TinkerRegistry;
+import slimeknights.tconstruct.library.tools.ToolCore;
+
+public class TDBaubles
+{
+
+	TDToolEvents events = new TDToolEvents();
+
+  // Tools
+	public static ToolCore sheathe = new Sheathe();
+	
+  // Tool Parts
+
+  // Modifiers
+
+  // Helper stuff
+//  static List<ToolCore> tools = Lists.newLinkedList();      // contains all tools registered in this pulse
+//  static List<ToolPart> toolparts = Lists.newLinkedList();  // ^ all toolparts
+//  static List<IModifier> modifiers = Lists.newLinkedList(); // ^ all modifiers
+
+  // PRE-INITIALIZATION
+  @Subscribe
+  public void preInit(FMLPreInitializationEvent event) {
+    // register items
+	  MinecraftForge.EVENT_BUS.register(events);
+
+    regToolParts();
+    regTools();
+    registerModifiers();
+
+    // register blocks
+
+    // register entities
+    
+    //proxy.preInit();
+  }
+
+  private void regToolParts() {
+    // The order the items are registered in represents the order in the stencil table GUI too
+	  
+  }
+
+  private void regTools() {
+	  
+	  regTool(sheathe, "sheathe");
+	  
+	  TinkerRegistry.registerToolStationCrafting(sheathe);
+  }
+  
+  private void regTool(ToolCore tool, String name)
+  {
+	  tool.setRegistryName(new ResourceLocation("tinkersdefense:" + name));
+	  TinkerRegistry.registerTool(tool);
+	  GameRegistry.register(tool);
+  }
+
+  private void registerModifiers() {
+
+  }
+
+  // INITIALIZATION
+  @Subscribe
+  public void init(FMLInitializationEvent event) {
+    regToolBuilding();
+    regRecipies();
+
+    //proxy.init();
+  }
+
+  private void regToolBuilding() {
+    TinkerRegistry.registerToolCrafting(sheathe);
+  }
+
+  private void regRecipies() {
+
+  }
+  
+  // POST-INITIALIZATION
+  @Subscribe
+  public void postInit(FMLPostInitializationEvent event) {
+    //proxy.postInit();
+  }
+  
+  
+}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/core/CoreBase.java b/src/main/java/lance5057/tDefense/core/CoreBase.java
index 480aebd..d04c248 100644
--- a/src/main/java/lance5057/tDefense/core/CoreBase.java
+++ b/src/main/java/lance5057/tDefense/core/CoreBase.java
@@ -1,11 +1,49 @@
 package lance5057.tDefense.core;
 
+import lance5057.tDefense.util.BlocksBase;
+import lance5057.tDefense.util.ItemsBase;
 import lance5057.tDefense.util.ModuleBase;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import slimeknights.mantle.client.CreativeTab;
 
 public class CoreBase extends ModuleBase
 {
+	public static CreativeTabs tab;
+	
+	public ItemsBase items;
+	public BlocksBase blocks;
+	
 	public CoreBase()
 	{
 		items = new CoreItems();
+		blocks = new CoreBlocks();
+	}
+
+	@Override
+	public void preInit(FMLPreInitializationEvent e) {
+		tab = new CreativeTab("TDefense_Core", new ItemStack(Items.SHIELD));
+		
+		// TODO Auto-generated method stub
+		items.preInit(e);
+		blocks.preInit(e);
+	}
+
+	@Override
+	public void init(FMLInitializationEvent e) {
+		// TODO Auto-generated method stub
+		items.init(e);
+		blocks.init(e);
+	}
+
+	@Override
+	public void postInit(FMLPostInitializationEvent e) {
+		// TODO Auto-generated method stub
+		items.postInit(e);
+		blocks.postInit(e);
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/CoreBlocks.java b/src/main/java/lance5057/tDefense/core/CoreBlocks.java
new file mode 100644
index 0000000..58d4ed0
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/CoreBlocks.java
@@ -0,0 +1,68 @@
+package lance5057.tDefense.core;
+
+import lance5057.tDefense.core.blocks.crestMount.CrestMount;
+import lance5057.tDefense.util.BlocksBase;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+
+public class CoreBlocks extends BlocksBase
+{
+
+	public static Block aeonsteelBlock;
+	public static Block dogbeariumBlock;
+	public static Block queensgoldBlock;
+	public static Block greencandyBlock;
+	public static Block redcandyBlock;
+	
+	public static ItemBlock aeonsteelItemBlock;
+	public static ItemBlock dogbeariumItemBlock;
+	public static ItemBlock queensgoldItemBlock;
+	public static ItemBlock greencandyItemBlock;
+	public static ItemBlock redcandyItemBlock;
+	
+	public static CrestMount crestMount;
+	
+	@Override
+	public void preInit(FMLPreInitializationEvent e) {
+		aeonsteelBlock = register("aeonsteelblock", CoreBase.tab, 5);
+		dogbeariumBlock = register("dogbeariumblock", CoreBase.tab, 5);
+		queensgoldBlock = register("queensgoldblock", CoreBase.tab, 5);
+		greencandyBlock = register("greencandyblock", CoreBase.tab, 5);
+		redcandyBlock = register("redcandyblock", CoreBase.tab, 5);
+
+		crestMount = new CrestMount();
+		crestMount.setCreativeTab(CoreBase.tab);
+		
+		aeonsteelItemBlock = register("aeonsteelblock", 64, CoreBase.tab, aeonsteelBlock);
+		dogbeariumItemBlock = register("dogbeariumblock", 64, CoreBase.tab, dogbeariumBlock);
+		queensgoldItemBlock = register("queensgoldblock", 64, CoreBase.tab, queensgoldBlock);
+		greencandyItemBlock = register("greencandyblock", 64, CoreBase.tab, greencandyBlock);
+		redcandyItemBlock = register("redcandyblock", 64, CoreBase.tab, redcandyBlock);
+		
+//		GameRegistry.register(aeonsteelBlock);
+//		GameRegistry.register(dogbeariumBlock);
+//		GameRegistry.register(queensgoldBlock);
+//		GameRegistry.register(greencandyBlock);
+//		GameRegistry.register(redcandyBlock);
+	}
+
+	@Override
+	public void init(FMLInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void postInit(FMLPostInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+}
diff --git a/src/main/java/lance5057/tDefense/core/CoreClientProxy.java b/src/main/java/lance5057/tDefense/core/CoreClientProxy.java
new file mode 100644
index 0000000..04c5b0c
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/CoreClientProxy.java
@@ -0,0 +1,25 @@
+package lance5057.tDefense.core;
+
+import lance5057.tDefense.util.ModuleBase;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+
+public class CoreClientProxy
+{
+	
+	public void preInit() {
+		CoreBlocks.crestMount.initModel();
+	}
+
+	public void init() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public void postInit() {
+		// TODO Auto-generated method stub
+		
+	}
+
+}
diff --git a/src/main/java/lance5057/tDefense/core/CoreCommonProxy.java b/src/main/java/lance5057/tDefense/core/CoreCommonProxy.java
new file mode 100644
index 0000000..bdbc5a9
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/CoreCommonProxy.java
@@ -0,0 +1,5 @@
+package lance5057.tDefense.core;
+
+public class CoreCommonProxy {
+
+}
diff --git a/src/main/java/lance5057/tDefense/core/CoreItems.java b/src/main/java/lance5057/tDefense/core/CoreItems.java
index c4a5fa6..85da32d 100644
--- a/src/main/java/lance5057/tDefense/core/CoreItems.java
+++ b/src/main/java/lance5057/tDefense/core/CoreItems.java
@@ -1,12 +1,12 @@
 package lance5057.tDefense.core;
 
-import lance5057.tDefense.Reference;
-import lance5057.tDefense.proxy.ClientProxy;
 import lance5057.tDefense.util.ItemsBase;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
 public class CoreItems extends ItemsBase
 {
@@ -21,18 +21,23 @@ public class CoreItems extends ItemsBase
 		
 	}
 	
-	public void preInit()
+	@Override
+	public void preInit(FMLPreInitializationEvent e)
 	{
-		this.setTab("TDefense_Items", new ItemStack(Items.SHIELD));
 	}
 	
-	public void init() 
+	@Override
+	public void init(FMLInitializationEvent e) 
 	{
-		item_aeonsteelIngot = register("aeonsteelingot", 64);
-		item_queensgoldIngot = register("queensgoldingot", 64);
-		item_dogbeariumIngot = register("dogbeariumingot", 64);
+		item_aeonsteelIngot = register("aeonsteelingot", 64, CoreBase.tab);
+		item_queensgoldIngot = register("queensgoldingot", 64, CoreBase.tab);
+		item_dogbeariumIngot = register("dogbeariumingot", 64, CoreBase.tab);
+	}
 
-		this.tabName.setDisplayIcon(new ItemStack(item_aeonsteelIngot));
+	@Override
+	public void postInit(FMLPostInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
 	}
 
 }
diff --git a/src/main/java/lance5057/tDefense/core/TD_Patterns.java b/src/main/java/lance5057/tDefense/core/TD_Patterns.java
deleted file mode 100644
index 0f31dc2..0000000
--- a/src/main/java/lance5057/tDefense/core/TD_Patterns.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package lance5057.tDefense.core;
-
-import java.util.List;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import tconstruct.tools.items.Pattern;
-import tconstruct.util.Reference;
-
-public class TD_Patterns extends Pattern
-{
-	private static final String[]	patternName	= new String[] {"rivets", "clasp", "armorplate", "cloth", "chainmaille"};
-
-	public TD_Patterns(String patternType, String name)
-	{
-		super(patternName, getPatternNames(patternName, patternType), "patterns/");
-
-		setUnlocalizedName(Reference.prefix(name));
-	}
-
-	public static String[] getPatternNames(String[] patternName, String partType)
-	{
-		final String[] names = new String[patternName.length];
-		for(int i = 0; i < patternName.length; i++)
-		{
-			names[i] = partType + patternName[i];
-		}
-		return names;
-	}
-
-	@Override
-	public void getSubItems(Item b, CreativeTabs tab, List list)
-	{
-		for(int i = 0; i < patternName.length; i++)
-		{
-			// if (i != 23)
-			list.add(new ItemStack(b, 1, i));
-		}
-	}
-
-	@Override
-	public int getPatternCost(ItemStack pattern)
-	{
-		switch(pattern.getItemDamage())
-		{
-			case 0:
-				return 1; //rivets
-			case 1:
-				return 2; //clasp
-			case 2:
-				return 8; //armorplate
-			case 3:
-				return 6; //cloth
-			case 4:
-				return 6; //chainmaille
-		}
-		return 0;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/blocks/AeonSteelBlock.java b/src/main/java/lance5057/tDefense/core/blocks/AeonSteelBlock.java
deleted file mode 100644
index d4c59e5..0000000
--- a/src/main/java/lance5057/tDefense/core/blocks/AeonSteelBlock.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package lance5057.tDefense.core.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-
-public class AeonSteelBlock extends Block
-{
-
-	public AeonSteelBlock(Material material)
-	{
-		super(material);
-		setHarvestLevel("pickaxe", 2);
-	}
-
-}
diff --git a/src/main/java/lance5057/tDefense/core/blocks/DogbeariumBlock.java b/src/main/java/lance5057/tDefense/core/blocks/DogbeariumBlock.java
deleted file mode 100644
index 2285b72..0000000
--- a/src/main/java/lance5057/tDefense/core/blocks/DogbeariumBlock.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package lance5057.tDefense.core.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-
-public class DogbeariumBlock extends Block
-{
-
-	public DogbeariumBlock(Material material)
-	{
-		super(material);
-		setHarvestLevel("pickaxe", 2);
-	}
-
-}
diff --git a/src/main/java/lance5057/tDefense/core/blocks/GreenMintBlock.java b/src/main/java/lance5057/tDefense/core/blocks/GreenMintBlock.java
deleted file mode 100644
index 2e8ff7a..0000000
--- a/src/main/java/lance5057/tDefense/core/blocks/GreenMintBlock.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package lance5057.tDefense.core.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-
-public class GreenMintBlock extends Block
-{
-
-	public GreenMintBlock(Material material)
-	{
-		super(material);
-		setHarvestLevel("pickaxe", 2);
-	}
-
-}
diff --git a/src/main/java/lance5057/tDefense/core/blocks/QueensGoldBlock.java b/src/main/java/lance5057/tDefense/core/blocks/QueensGoldBlock.java
deleted file mode 100644
index 0d9e3d0..0000000
--- a/src/main/java/lance5057/tDefense/core/blocks/QueensGoldBlock.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package lance5057.tDefense.core.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-
-public class QueensGoldBlock extends Block
-{
-
-	public QueensGoldBlock(Material material)
-	{
-		super(material);
-		setHarvestLevel("pickaxe", 2);
-	}
-
-}
diff --git a/src/main/java/lance5057/tDefense/core/blocks/RedMintBlock.java b/src/main/java/lance5057/tDefense/core/blocks/RedMintBlock.java
deleted file mode 100644
index ca80865..0000000
--- a/src/main/java/lance5057/tDefense/core/blocks/RedMintBlock.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package lance5057.tDefense.core.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-
-public class RedMintBlock extends Block
-{
-
-	public RedMintBlock(Material material)
-	{
-		super(material);
-		setHarvestLevel("pickaxe", 2);
-	}
-
-}
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/CrestMount.java
index 507bef4..b41f9c0 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/CrestMount.java
@@ -1,85 +1,192 @@
 package lance5057.tDefense.core.blocks.crestMount;
 
-import static net.minecraftforge.common.util.ForgeDirection.EAST;
-import static net.minecraftforge.common.util.ForgeDirection.NORTH;
-import static net.minecraftforge.common.util.ForgeDirection.SOUTH;
-import static net.minecraftforge.common.util.ForgeDirection.WEST;
-
 import java.util.Random;
 
+import javax.annotation.Nullable;
+
+import lance5057.tDefense.Reference;
 import lance5057.tDefense.TinkersDefense;
-import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
+import net.minecraft.block.BlockHorizontal;
+import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyDirection;
+import net.minecraft.block.state.BlockStateContainer;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumBlockRenderType;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class CrestMount extends BlockContainer
-{
-	public CrestMount()
-	{
-		super(Material.iron);
-		setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+import net.minecraftforge.fml.client.registry.ClientRegistry;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+public class CrestMount extends BlockContainer implements ITileEntityProvider {
+
+	public static final PropertyDirection FACING = BlockHorizontal.FACING;
+	protected static final AxisAlignedBB EAST_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.1875D, 1.0D, 1.0D);
+	protected static final AxisAlignedBB WEST_AABB = new AxisAlignedBB(0.8125D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
+	protected static final AxisAlignedBB SOUTH_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.1875D);
+	protected static final AxisAlignedBB NORTH_AABB = new AxisAlignedBB(0.0D, 0.0D, 0.8125D, 1.0D, 1.0D, 1.0D);
+
+	public CrestMount() {
+		super(Material.IRON);
+		this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH));
+		
+		this.setRegistryName("crestmount");
+		this.setUnlocalizedName("crestmount");
+		
+		GameRegistry.register(this);
+		GameRegistry.register(new ItemBlock(this), getRegistryName());
+		GameRegistry.registerTileEntity(TileEntity_CrestMount.class, Reference.MOD_ID + "_crestmount");
+	}
+
+	@Override
+	protected BlockStateContainer createBlockState() {
+		return new BlockStateContainer(this, new IProperty[] { FACING });
+	}
+	
+	@Override
+    public IBlockState getStateFromMeta(int meta)
+    {
+        EnumFacing enumfacing = EnumFacing.getFront(meta);
+
+        if (enumfacing.getAxis() == EnumFacing.Axis.Y)
+        {
+            enumfacing = EnumFacing.NORTH;
+        }
+
+        return this.getDefaultState().withProperty(FACING, enumfacing);
+    }
+	
+	@Override
+    public int getMetaFromState(IBlockState state)
+    {
+        return ((EnumFacing)state.getValue(FACING)).getIndex();
+    }
+
+
+	@Override
+	public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
+		switch ((EnumFacing) state.getValue(FACING)) {
+		case NORTH:
+			return NORTH_AABB;
+		case SOUTH:
+			return SOUTH_AABB;
+		case WEST:
+			return WEST_AABB;
+		case EAST:
+		default:
+			return EAST_AABB;
+		}
+	}
+
+	@SideOnly(Side.CLIENT)
+	public void initModel() {
+		ClientRegistry.bindTileEntitySpecialRenderer(TileEntity_CrestMount.class, new Renderer_CrestMount());
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos,
+			EnumFacing side) {
+		return false;
+	}
+
+	@Override
+	public boolean isBlockNormalCube(IBlockState blockState) {
+		return false;
+	}
+
+	@Override
+	public boolean isOpaqueCube(IBlockState blockState) {
+		return false;
+	}
+
+	@Override
+	public EnumBlockRenderType getRenderType(IBlockState state) {
+		return EnumBlockRenderType.INVISIBLE;
+	}
+
+	@Override
+	public boolean canPlaceBlockAt(World worldIn, BlockPos pos) {
+		return worldIn.getBlockState(pos.west()).isSideSolid(worldIn, pos.west(), EnumFacing.EAST)
+				|| worldIn.getBlockState(pos.east()).isSideSolid(worldIn, pos.east(), EnumFacing.WEST)
+				|| worldIn.getBlockState(pos.north()).isSideSolid(worldIn, pos.north(), EnumFacing.SOUTH)
+				|| worldIn.getBlockState(pos.south()).isSideSolid(worldIn, pos.south(), EnumFacing.NORTH);
 	}
 
 	@Override
-	public void onBlockAdded(World world, int i, int j, int k)
-	{
-		super.onBlockAdded(world, i, j, k);
-		world.markBlockForUpdate(i, j, k);
+	public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY,
+			float hitZ, int meta, EntityLivingBase placer) {
+		if (facing.getAxis().isHorizontal() && this.canBlockStay(worldIn, pos, facing)) {
+			return this.getDefaultState().withProperty(FACING, facing);
+		} else {
+			for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL) {
+				if (this.canBlockStay(worldIn, pos, enumfacing)) {
+					return this.getDefaultState().withProperty(FACING, enumfacing);
+				}
+			}
+
+			return this.getDefaultState();
+		}
+	}
+
+	protected boolean canBlockStay(World worldIn, BlockPos pos, EnumFacing facing) {
+		return worldIn.getBlockState(pos.offset(facing.getOpposite())).isSideSolid(worldIn,
+				pos.offset(facing.getOpposite()), facing);
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int metadata, float what, float these, float are)
-	{
-		final TileEntity tileEntity = world.getTileEntity(x, y, z);
-		if(tileEntity == null || player.isSneaking())
+	public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn,
+			EnumHand hand, @Nullable ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) {
+		final TileEntity tileEntity = worldIn.getTileEntity(pos);
+		if (tileEntity == null || playerIn.isSneaking())
 			return false;
-		//code to open gui explained later
-		player.openGui(TinkersDefense.instance, TinkersDefense.GUI_CREST_INV, player.worldObj, x, y, z);
+		// code to open gui explained later
+		playerIn.openGui(TinkersDefense.instance, TinkersDefense.GUI_CREST_INV, worldIn, 0, 0, 0);
 		return true;
 	}
 
 	@Override
-	public void breakBlock(World world, int x, int y, int z, Block par5, int par6)
-	{
-		dropItems(world, x, y, z);
-		super.breakBlock(world, x, y, z, par5, par6);
+	public void breakBlock(World worldIn, BlockPos pos, IBlockState state) {
+		dropItems(worldIn, pos);
+		super.breakBlock(worldIn, pos, state);
 	}
 
-	private void dropItems(World world, int x, int y, int z)
-	{
+	private void dropItems(World world, BlockPos pos) {
 		final Random rand = new Random();
 
-		final TileEntity tileEntity = world.getTileEntity(x, y, z);
-		if(!(tileEntity instanceof IInventory))
+		final TileEntity tileEntity = world.getTileEntity(pos);
+		if (!(tileEntity instanceof IInventory))
 			return;
 		final IInventory inventory = (IInventory) tileEntity;
 
-		for(int i = 0; i < inventory.getSizeInventory(); i++)
-		{
+		for (int i = 0; i < inventory.getSizeInventory(); i++) {
 			final ItemStack item = inventory.getStackInSlot(i);
 
-			if(item != null && item.stackSize > 0)
-			{
+			if (item != null && item.stackSize > 0) {
 				final float rx = rand.nextFloat() * 0.8F + 0.1F;
 				final float ry = rand.nextFloat() * 0.8F + 0.1F;
 				final float rz = rand.nextFloat() * 0.8F + 0.1F;
 
-				final EntityItem entityItem = new EntityItem(world, x + rx,
-						y + ry, z + rz, new ItemStack(item.getItem(),
-								item.stackSize, item.getItemDamage()));
+				final EntityItem entityItem = new EntityItem(world, pos.getX() + rx, pos.getY() + ry, pos.getZ() + rz,
+						new ItemStack(item.getItem(), item.stackSize, item.getItemDamage()));
 
-				if(item.hasTagCompound())
-				{
+				if (item.hasTagCompound()) {
 					entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy());
 				}
 
@@ -87,73 +194,49 @@ public class CrestMount extends BlockContainer
 				entityItem.motionX = rand.nextGaussian() * factor;
 				entityItem.motionY = rand.nextGaussian() * factor + 0.2F;
 				entityItem.motionZ = rand.nextGaussian() * factor;
-				world.spawnEntityInWorld(entityItem);
+				world.spawnEntity(entityItem);
 				item.stackSize = 0;
 			}
 		}
 	}
 
-	//You don't want the normal render type, or it wont render properly.
 	@Override
-	public int getRenderType()
-	{
-		return -1;
-	}
-
-	//It's not an opaque cube, so you need this.
-	@Override
-	public boolean isOpaqueCube()
-	{
-		return false;
-	}
-
-	//It's not a normal block, so you need this too.
-	@Override
-	public boolean renderAsNormalBlock()
-	{
-		return false;
-	}
-
-	//This is the icon to use for showing the block in your hand.
-	@SideOnly(Side.CLIENT)
-	@Override
-	public void registerBlockIcons(IIconRegister icon)
-	{
-		blockIcon = icon.registerIcon("tinkersdefense:item_crestmount");
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World w, int md)
-	{
+	public TileEntity createNewTileEntity(World w, int md) {
 		final TileEntity_CrestMount te = new TileEntity_CrestMount();
 		return te;
 	}
 
-	@Override
-	public int onBlockPlaced(World p_149660_1_, int p_149660_2_, int p_149660_3_, int p_149660_4_, int p_149660_5_, float p_149660_6_, float p_149660_7_, float p_149660_8_, int p_149660_9_)
-	{
-		int j1 = p_149660_9_;
-
-		if((p_149660_9_ == 0 || p_149660_5_ == 2) && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ + 1, NORTH))
-		{
-			j1 = 1;
-		}
-
-		if((j1 == 0 || p_149660_5_ == 3) && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ - 1, SOUTH))
-		{
-			j1 = 2;
-		}
-
-		if((j1 == 0 || p_149660_5_ == 4) && p_149660_1_.isSideSolid(p_149660_2_ + 1, p_149660_3_, p_149660_4_, WEST))
-		{
-			j1 = 3;
-		}
-
-		if((j1 == 0 || p_149660_5_ == 5) && p_149660_1_.isSideSolid(p_149660_2_ - 1, p_149660_3_, p_149660_4_, EAST))
-		{
-			j1 = 4;
-		}
-
-		return j1;
-	}
+	// @Override
+	// public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState
+	// state, EntityLivingBase placer, ItemStack stack)
+	// {
+	// int j1 = p_149660_9_;
+	//
+	// if((p_149660_9_ == 0 || p_149660_5_ == 2) &&
+	// p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ + 1,
+	// NORTH))
+	// {
+	// j1 = 1;
+	// }
+	//
+	// if((j1 == 0 || p_149660_5_ == 3) && p_149660_1_.isSideSolid(p_149660_2_,
+	// p_149660_3_, p_149660_4_ - 1, SOUTH))
+	// {
+	// j1 = 2;
+	// }
+	//
+	// if((j1 == 0 || p_149660_5_ == 4) && p_149660_1_.isSideSolid(p_149660_2_ +
+	// 1, p_149660_3_, p_149660_4_, WEST))
+	// {
+	// j1 = 3;
+	// }
+	//
+	// if((j1 == 0 || p_149660_5_ == 5) && p_149660_1_.isSideSolid(p_149660_2_ -
+	// 1, p_149660_3_, p_149660_4_, EAST))
+	// {
+	// j1 = 4;
+	// }
+	//
+	// return j1;
+	// }
 }
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Gui_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Gui_CrestMount.java
index 1cb2a2f..d1c0713 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Gui_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Gui_CrestMount.java
@@ -1,14 +1,13 @@
 package lance5057.tDefense.core.blocks.crestMount;
 
+import org.lwjgl.opengl.GL11;
+
 import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.core.network.Message_CrestMount;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
 
-import org.lwjgl.opengl.GL11;
-
 public class Gui_CrestMount extends GuiContainer
 {
 	private static final ResourceLocation	iconLocation	= new ResourceLocation(
@@ -56,7 +55,7 @@ public class Gui_CrestMount extends GuiContainer
 				}
 
 				TinkersDefense.INSTANCE.sendToServer(new Message_CrestMount(
-						inventory.xCoord, inventory.yCoord, inventory.zCoord,
+						inventory.getPos(),
 						inventory.flip));
 			}
 		}
diff --git a/src/main/java/lance5057/tDefense/core/network/Handler_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Handler_CrestMount.java
index ac4e5a2..f238121 100644
--- a/src/main/java/lance5057/tDefense/core/network/Handler_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Handler_CrestMount.java
@@ -1,21 +1,20 @@
-package lance5057.tDefense.core.network;
+package lance5057.tDefense.core.blocks.crestMount;
 
-import lance5057.tDefense.core.blocks.crestMount.TileEntity_CrestMount;
 import net.minecraft.tileentity.TileEntity;
-import cpw.mods.fml.common.network.simpleimpl.IMessage;
-import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
-import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 
 public class Handler_CrestMount implements IMessageHandler<Message_CrestMount, IMessage>
 {
 	@Override
 	public IMessage onMessage(Message_CrestMount message, MessageContext ctx)
 	{
-		final TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z);
+		final TileEntity te = ctx.getServerHandler().playerEntity.world.getTileEntity(message.pos);
 		if(te instanceof TileEntity_CrestMount)
 		{
 			((TileEntity_CrestMount) te).flip = message.flip;
 		}
 		return null;
 	}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/core/network/Message_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Message_CrestMount.java
index 390e638..12a1706 100644
--- a/src/main/java/lance5057/tDefense/core/network/Message_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Message_CrestMount.java
@@ -1,11 +1,12 @@
-package lance5057.tDefense.core.network;
+package lance5057.tDefense.core.blocks.crestMount;
 
 import io.netty.buffer.ByteBuf;
-import cpw.mods.fml.common.network.simpleimpl.IMessage;
+import net.minecraft.util.math.BlockPos;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 
 public class Message_CrestMount implements IMessage
 {
-	public int			x, y, z;
+	public BlockPos			pos;
 	public boolean[]	flip	= new boolean[4];
 
 	public Message_CrestMount()
@@ -13,11 +14,9 @@ public class Message_CrestMount implements IMessage
 
 	}
 
-	public Message_CrestMount(int x, int y, int z, boolean[] flip)
+	public Message_CrestMount(BlockPos			pos, boolean[] flip)
 	{
-		this.x = x;
-		this.y = y;
-		this.z = z;
+		this.pos = pos;
 		this.flip = flip;
 		//System.arraycopy(flip, 0, this.flip, 0, flip.length);
 
@@ -26,9 +25,8 @@ public class Message_CrestMount implements IMessage
 	@Override
 	public void fromBytes(ByteBuf buf)
 	{
-		x = buf.readInt();
-		y = buf.readInt();
-		z = buf.readInt();
+		pos = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
+
 		for(int i = 0; i < flip.length; i++)
 		{
 			flip[i] = buf.readBoolean();
@@ -38,13 +36,13 @@ public class Message_CrestMount implements IMessage
 	@Override
 	public void toBytes(ByteBuf buf)
 	{
-		buf.writeInt(x);
-		buf.writeInt(y);
-		buf.writeInt(z);
+		buf.writeInt(pos.getX());
+		buf.writeInt(pos.getY());
+		buf.writeInt(pos.getZ());
 		for(final boolean element : flip)
 		{
 			buf.writeBoolean(element);
 		}
 	}
 
-}
+}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Renderer_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Renderer_CrestMount.java
index 67bbcda..d64fac3 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Renderer_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Renderer_CrestMount.java
@@ -1,17 +1,20 @@
 package lance5057.tDefense.core.blocks.crestMount;
 
+import org.lwjgl.opengl.GL11;
+
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.RenderItem;
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
-
-import org.lwjgl.opengl.GL11;
-
-import tconstruct.library.tools.ToolCore;
+import slimeknights.tconstruct.library.tools.ToolCore;
 
 public class Renderer_CrestMount extends TileEntitySpecialRenderer
 {
@@ -28,7 +31,7 @@ public class Renderer_CrestMount extends TileEntitySpecialRenderer
 	}
 
 	@Override
-	public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale)
+	public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTicks, int destroyStage)
 	{
 		final TileEntity_CrestMount tileEntity = (TileEntity_CrestMount) te;
 
@@ -64,16 +67,16 @@ public class Renderer_CrestMount extends TileEntitySpecialRenderer
 		switch(meta)
 		{
 			case 1:
-				rotation = 0;
+				rotation = 180;
 				break;
 			case 2:
-				rotation = 180;
+				rotation = 0;
 				break;
 			case 3:
-				rotation = 90;
+				rotation = -90;
 				break;
 			case 4:
-				rotation = -90;
+				rotation = 90;
 				break;
 		}
 		GL11.glRotatef(rotation, 0.0F, 1.0F, 0.0F);
@@ -88,143 +91,48 @@ public class Renderer_CrestMount extends TileEntitySpecialRenderer
 		//Render Inventory            
 
 		//right slot
-		int slot = 1;
-		if(tileEntity.getStackInSlot(slot) != null)
-		{
-			if((entItem == null) || entItem.getEntityItem().getItem() != tileEntity.getStackInSlot(slot).getItem())
-			{
-				entItem = new EntityItem(tileEntity.getWorldObj(), 0, 0, 0,
-						tileEntity.getStackInSlot(slot));
-			}
-			GL11.glPushMatrix();
-			entItem.hoverStart = 0.0F;
-			RenderItem.renderInFrame = true;
-			GL11.glScalef(2f, 2f, 2f);
-			GL11.glRotatef(90, 0, 0, -1);
-			GL11.glRotatef(rotation, -1.0F, 0.0F, 0.0F);
-			//GL11.glTranslatef(0.4f/*up - down*/, -0.3f/*left - right*/, 0.22f);
-			if(tileEntity.flip[1] == true)
-			{
-				GL11.glRotatef(180, 0, 0, 1);
-				GL11.glTranslatef(-0.8f, 0.2f, 0);
-			}
-
-			if(tileEntity.getStackInSlot(1).getItem() instanceof ToolCore)
-			{
-				GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F);
-				GL11.glTranslatef(-0.505f, -0.32f, 0);
-			}
-
-			RenderManager.instance.renderEntityWithPosYaw(entItem, 0.4f/*up - down*/, -0.3f/*left - right*/, 0.23f, 0, 0);
-			RenderItem.renderInFrame = false;
-			GL11.glPopMatrix();
-		}
+		renderSlot(tileEntity, x, y, z, 1, rotation, tileEntity.flip[1]);
 
 		//left slot
-		slot = 0;
-		if(tileEntity.getStackInSlot(slot) != null)
-		{
-			if((entItem2 == null) || entItem2.getEntityItem().getItem() != tileEntity.getStackInSlot(slot).getItem())
-			{
-				entItem2 = new EntityItem(tileEntity.getWorldObj(), x, y, z,
-						tileEntity.getStackInSlot(slot));
-			}
-			GL11.glPushMatrix();
-			entItem2.hoverStart = 0.0F;
-			RenderItem.renderInFrame = true;
-			//GL11.glTranslatef((float)te.xCoord + 0.5F, (float)te.yCoord + 1.02F, (float)te.zCoord + 0.3F);
-			GL11.glScalef(2f, 2f, 2f);
-			GL11.glRotatef(180, 0, 0, 1);
-			GL11.glRotatef(rotation, 0.0F, -1.0F, 0.0F);
-			if(tileEntity.flip[0] == true)
-			{
-				GL11.glRotatef(180, 0, 0, 1);
-				GL11.glTranslatef(0.2f, -0.8f, 0);
-			}
-
-			if(tileEntity.getStackInSlot(0).getItem() instanceof ToolCore)
-			{
-				GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F);
-				GL11.glTranslatef(0.5f, -0.325f, 0);
-			}
-
-			RenderManager.instance.renderEntityWithPosYaw(entItem2, -0.1, 0.2, 0.23, 0, 0);
-			RenderItem.renderInFrame = false;
-			GL11.glPopMatrix();
-		}
+		renderSlot(tileEntity, x, y, z, 0, rotation, tileEntity.flip[0]);
 
 		//middle slot
-		slot = 2;
-		if(tileEntity.getStackInSlot(slot) != null)
-		{
-			if((entItem3 == null) || entItem3.getEntityItem().getItem() != tileEntity.getStackInSlot(slot).getItem())
-			{
-				entItem3 = new EntityItem(tileEntity.getWorldObj(), x, y, z,
-						tileEntity.getStackInSlot(slot));
-			}
-			GL11.glPushMatrix();
-			entItem3.hoverStart = 0.0F;
-			RenderItem.renderInFrame = true;
-			GL11.glScalef(2f, 2f, 2f);
-			if(rotation == 90)
-			{
-				GL11.glTranslatef(0.3f, 0, 0.0f);
-			}
-			if(rotation == -90)
-			{
-				GL11.glTranslatef(-0.3f, 0, 0.0f);
-			}
-			GL11.glRotatef(225, 0, 0, 1);
-			GL11.glRotatef(rotation, 1F, 1F, 0F);
-			if(tileEntity.flip[2] == true)
-			{
-				GL11.glRotatef(180, 0, 0, 1);
-				GL11.glTranslatef(-0.5f, -0.5f, 0);
-			}
+		renderSlot(tileEntity, x, y, z, 2, rotation, tileEntity.flip[2]);
 
-			if(tileEntity.getStackInSlot(2).getItem() instanceof ToolCore)
-			{
-				GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F);
-				GL11.glTranslatef(-0.1125f, -0.5125f, 0);
-			}
+		//shield slot
+		renderSlot(tileEntity, x, y, z, 3, rotation, tileEntity.flip[3]);
 
-			RenderManager.instance.renderEntityWithPosYaw(entItem3, 0.3, 0.1, 0.16, 0, 0);
-			RenderItem.renderInFrame = false;
-			GL11.glPopMatrix();
-		}
+		GL11.glPopMatrix();
 
-		//shield slot
-		slot = 3;
-		if(tileEntity.getStackInSlot(slot) != null)
+		entItem = null;
+		entItem2 = null;
+		entItem3 = null;
+		entItem4 = null;
+	}
+	
+	private void renderSlot(TileEntity_CrestMount te, double x, double y, double z, int slot, float rotation, boolean flip)
+	{
+		if(te.getStackInSlot(slot) != null)
 		{
-			if((entItem4 == null) || entItem4.getEntityItem().getItem() != tileEntity.getStackInSlot(slot).getItem())
-			{
-				entItem4 = new EntityItem(tileEntity.getWorldObj(), x, y, z,
-						tileEntity.getStackInSlot(slot));
-			}
 			GL11.glPushMatrix();
-			entItem4.hoverStart = 0.0F;
-			RenderItem.renderInFrame = true;
+			
+			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
+
 			GL11.glScalef(2f, 2f, 2f);
 			GL11.glRotatef(180, 0.0F, 1.0F, 0.0F);
 			GL11.glRotatef(rotation, 0.0F, 1.0F, 0.0F);
-			if(tileEntity.flip[3] == true)
+			
+			if(te.flip[3] == true)
 			{
 				GL11.glRotatef(180, 0, 0, 1);
 				GL11.glTranslatef(0.0f, 1.0f, 0);
 			}
 
-			RenderManager.instance.renderEntityWithPosYaw(entItem4, 0, -0.7, -0.01, 0, 0);
-			RenderItem.renderInFrame = false;
+			Minecraft.getMinecraft().getRenderItem().renderItem(te.getStackInSlot(slot),
+					ItemCameraTransforms.TransformType.NONE);
+			
 			GL11.glPopMatrix();
 		}
-
-		GL11.glPopMatrix();
-
-		entItem = null;
-		entItem2 = null;
-		entItem3 = null;
-		entItem4 = null;
 	}
 
 }
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/TileEntity_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/TileEntity_CrestMount.java
index 33a293d..6f63a66 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/TileEntity_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/TileEntity_CrestMount.java
@@ -6,8 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.network.Packet;
-import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
+import net.minecraft.network.play.server.SPacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.Constants;
 
@@ -27,30 +26,17 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 	}
 
 	@Override
-	public void updateEntity()
-	{
-		super.updateEntity();
-		//		if (!worldObj.isRemote)
-		//		{
-
-		//			 getWorldObj().markBlockForUpdate(xCoord, yCoord, zCoord);
-		//			 markDirty();
-		//			
-		//		}
-	}
-
-	@Override
-	public Packet getDescriptionPacket()
+	public SPacketUpdateTileEntity getUpdatePacket()
 	{
 		final NBTTagCompound tag = new NBTTagCompound();
 		writeToNBT(tag);
-		return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 0, tag);
+		return new SPacketUpdateTileEntity(getPos(), 1, tag);
 	}
 
 	@Override
-	public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt)
+	public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet)
 	{
-		readFromNBT(pkt.func_148857_g());
+		readFromNBT(packet.getNbtCompound());
 	}
 
 	@Override
@@ -88,19 +74,20 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 			markDirty();
 		}
 		return stack;
+		
 	}
 
-	@Override
-	public ItemStack getStackInSlotOnClosing(int slot)
-	{
-		final ItemStack stack = getStackInSlot(slot);
-
-		if(stack != null)
-		{
-			setInventorySlotContents(slot, stack);
-		}
-		return stack;
-	}
+//	@Override
+//	public ItemStack getStackInSlotOnClosing(int slot)
+//	{
+//		final ItemStack stack = getStackInSlot(slot);
+//
+//		if(stack != null)
+//		{
+//			setInventorySlotContents(slot, stack);
+//		}
+//		return stack;
+//	}
 
 	@Override
 	public void setInventorySlotContents(int slot, ItemStack itemstack)
@@ -116,13 +103,13 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 	}
 
 	@Override
-	public String getInventoryName()
+	public String getName()
 	{
 		return name;
 	}
 
 	@Override
-	public boolean hasCustomInventoryName()
+	public boolean hasCustomName()
 	{
 		return name.length() > 0;
 	}
@@ -134,19 +121,19 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 	}
 
 	@Override
-	public boolean isUseableByPlayer(EntityPlayer p_70300_1_)
+	public boolean isUsableByPlayer(EntityPlayer player)
 	{
 		return true;
 	}
 
 	@Override
-	public void openInventory()
+	public void openInventory(EntityPlayer player)
 	{
 
 	}
 
 	@Override
-	public void closeInventory()
+	public void closeInventory(EntityPlayer player)
 	{
 
 	}
@@ -158,7 +145,7 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 	}
 
 	@Override
-	public void writeToNBT(NBTTagCompound compound)
+	public NBTTagCompound writeToNBT(NBTTagCompound compound)
 	{
 		super.writeToNBT(compound);
 		if(flip != null)
@@ -170,6 +157,7 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 		}
 
 		writeInventoryToNBT(compound);
+		return compound;
 	}
 
 	@Override
@@ -215,4 +203,34 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 
 		tags.setTag("Items", nbttaglist);
 	}
+
+	@Override
+	public ItemStack removeStackFromSlot(int index) {
+		// TODO Auto-generated method stub
+		return this.getStackInSlot(index);
+	}
+
+	@Override
+	public int getField(int id) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void setField(int id, int value) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public int getFieldCount() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void clear() {
+		// TODO Auto-generated method stub
+		
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/blocks/ore/TD_Ore.java b/src/main/java/lance5057/tDefense/core/blocks/ore/TD_Ore.java
deleted file mode 100644
index 0778857..0000000
--- a/src/main/java/lance5057/tDefense/core/blocks/ore/TD_Ore.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package lance5057.tDefense.core.blocks.ore;
-
-import java.util.Random;
-
-import lance5057.tDefense.Reference;
-import lance5057.tDefense.TinkersDefense;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.item.Item;
-
-public class TD_Ore extends Block
-{
-	Item	drops;
-
-	public TD_Ore(Material mat, String name, Item drop)
-	{
-		super(mat);
-		setBlockName(name + "ore");
-		setBlockTextureName(Reference.MOD_ID + ":" + name + "ore");
-		setCreativeTab(TinkersDefense.tabName);
-		setStepSound(soundTypeStone);
-		setHardness(10.0f);
-		setResistance(20.0f);
-		setHarvestLevel("pickaxe", 2);
-
-		drops = drop;
-	}
-
-	@Override
-	public Item getItemDropped(int metadata, Random random, int fortune)
-	{
-		return drops;
-	}
-
-	@Override
-	public int quantityDropped(int meta, int fortune, Random random)
-	{
-		final int rand = random.nextInt(fortune + 1) + 1;
-		return rand;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/entity/EntityHookshotHook.java b/src/main/java/lance5057/tDefense/core/entity/EntityHookshotHook.java
deleted file mode 100644
index 3c24863..0000000
--- a/src/main/java/lance5057/tDefense/core/entity/EntityHookshotHook.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package lance5057.tDefense.core.entity;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityThrowable;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.util.MovingObjectPosition.MovingObjectType;
-import net.minecraft.world.World;
-import tconstruct.library.tools.ToolCore;
-
-public class EntityHookshotHook extends EntityThrowable
-{
-	public int				maxChain;
-
-	public static final int	DATA_PLAYER		= 22;
-	public static final int	DATA_TARGET		= 23;
-	public static final int	DATA_ARRIVED	= 24;
-	public static final int	DATA_HOOK		= 25;
-	public static final int	HIT_POS_X		= 26, HIT_POS_Y = 27,
-			HIT_POS_Z = 28;
-	public static final int	DATA_ITEM		= 29;
-
-	boolean					playerTouching	= false;
-
-	public EntityHookshotHook(World world)
-	{
-		super(world);
-	}
-
-	public EntityHookshotHook(World world, EntityLivingBase entity)
-	{
-		super(world, entity);
-	}
-
-	public EntityHookshotHook(World world, double x, double y, double z)
-	{
-		super(world, x, y, z);
-	}
-
-	@Override
-	protected void entityInit()
-	{
-		super.entityInit();
-		setSize(0.25F, 0.25F);
-		dataWatcher.addObject(DATA_PLAYER, "");
-		dataWatcher.addObject(DATA_TARGET, -1);
-		dataWatcher.addObject(DATA_ARRIVED, (byte) 0);
-		dataWatcher.addObject(DATA_HOOK, "");
-		dataWatcher.addObject(HIT_POS_X, 0.0F);
-		dataWatcher.addObject(HIT_POS_Y, 0.0F);
-		dataWatcher.addObject(HIT_POS_Z, 0.0F);
-		dataWatcher.addObject(DATA_ITEM, new ItemStack(Blocks.air, 1, 0));
-	}
-
-	@Override
-	protected void onImpact(MovingObjectPosition Op)
-	{
-		motionX = motionY = motionZ = 0.0D;
-		if(Op.typeOfHit == MovingObjectType.BLOCK)
-		{
-			final Block block = worldObj.getBlock(Op.blockX, Op.blockY, Op.blockZ);
-
-			if(!block.getMaterial().blocksMovement())
-			{
-				return;
-			}
-			if(ticksExisted < getChainLength())
-			{
-				dataWatcher.updateObject(DATA_ARRIVED, (byte) 1);
-				posX = Op.blockX + 0.5D;
-				posY = Op.blockY + 0.5D;
-				posZ = Op.blockZ + 0.5D;
-			}
-		}
-	}
-
-	@Override
-	public void onUpdate()
-	{
-		super.onUpdate();
-		if(ticksExisted > 0)// getChainLength())
-		{
-			if(worldObj.isRemote && getThrower() instanceof EntityPlayer && ticksExisted % 4 == 0 && dataWatcher.getWatchableObjectByte(DATA_ARRIVED) == (byte) 1)
-			{
-				((EntityPlayer) getThrower()).playSound("tinkersdefense:hookshotChain", 1.0F, 1.0F);
-			}
-		}
-		else
-		{
-			setDead();
-		}
-	}
-
-	@Override
-	public EntityLivingBase getThrower()
-	{
-		final String name = dataWatcher.getWatchableObjectString(DATA_PLAYER);
-		if(name == "")
-		{
-			return null;
-		}
-		return worldObj.getPlayerEntityByName(name);
-	}
-
-	@Override
-	protected float func_70182_d()
-	{
-		return 1.25F;
-	}
-
-	@Override
-	protected float getGravityVelocity()
-	{
-		return 0.0F;
-	}
-
-	public void setHook(String type)
-	{
-		dataWatcher.updateObject(DATA_HOOK, type);
-	}
-
-	public String getHook()
-	{
-		return dataWatcher.getWatchableObjectString(DATA_HOOK);
-	}
-
-	public void setHookshot(ItemStack hookshot)
-	{
-		dataWatcher.updateObject(DATA_ITEM, hookshot);
-	}
-
-	public ItemStack getHookshot()
-	{
-		return dataWatcher.getWatchableObjectItemStack(DATA_ITEM);
-	}
-
-	public String getPlayer()
-	{
-		return dataWatcher.getWatchableObjectString(DATA_PLAYER);
-	}
-
-	public void setPlayer(EntityPlayer player)
-	{
-		dataWatcher.updateObject(DATA_PLAYER, player.getDisplayName());
-	}
-
-	public int getChainLength()
-	{
-		final ItemStack tool = dataWatcher.getWatchableObjectItemStack(DATA_ITEM);
-		if(tool != null && tool.getItem() instanceof ToolCore)
-		{
-			final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
-
-			return tags.getInteger("ChainLength");
-		}
-		return 0;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/events/TDEventHandler.java b/src/main/java/lance5057/tDefense/core/events/TDEventHandler.java
deleted file mode 100644
index fd4875c..0000000
--- a/src/main/java/lance5057/tDefense/core/events/TDEventHandler.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package lance5057.tDefense.core.events;
-
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.parts.ClothMaterial;
-import lance5057.tDefense.core.tools.RoundShield;
-import mods.battlegear2.api.PlayerEventChild.ShieldBlockEvent;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.item.ItemStack;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
-import net.minecraftforge.common.MinecraftForge;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.event.PartBuilderEvent;
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-
-@Optional.InterfaceList({@Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.PlayerEventChild.ShieldBlockEvent"),})
-public class TDEventHandler
-{
-
-	public TDEventHandler()
-	{
-		MinecraftForge.EVENT_BUS.register(this);
-	}
-
-	@SubscribeEvent
-	public void craftTDPart(PartBuilderEvent.NormalPart event)
-	{
-		// Cloth
-		if(event.pattern.getItem() == TinkersDefense.woodPattern && event.pattern.getItemDamage() == 3)
-		{
-			ItemStack result = null;
-
-			final ClothMaterial mat = (ClothMaterial) TConstructRegistry.getCustomMaterial(event.material, ClothMaterial.class);
-			if(mat != null && event.material.stackSize >= 3)
-			{
-				result = mat.craftingItem.copy();
-			}
-
-			if(result != null)
-			{
-				event.overrideResult(new ItemStack[] {result, null});
-			}
-		}
-	}
-
-	@SubscribeEvent
-	@Optional.Method(modid = "battlegear2")
-	public void TD_ShieldBlock(ShieldBlockEvent event)
-	{
-		if(event.shield.getItem() instanceof RoundShield)
-		{
-			final EntityLiving entity = (EntityLiving) event.source.getEntity();
-			entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 5,
-					10));
-		}
-	}
-	//	public void TD_LivingHurt(LivingHurtEvent event)
-	//	{
-	//		if(event.entityLiving instanceof EntityPlayer)
-	//		event.entityLiving
-	//	}
-
-	//	@SubscribeEvent
-	//	public void dropEasterEggs(LivingDropsEvent event)
-	//	{
-	//		if(!event.entityLiving.worldObj.isRemote)
-	//		{
-	//			if(event.entityLiving.getHeldItem() != null)
-	//					if(event.entityLiving.getHeldItem().getItem() == TinkersDefense.item_RedMintcane)
-	//							event.drops.add(new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, new ItemStack(TinkersDefense.item_RedMintcane,1,0)));
-	//					if(event.entityLiving.getHeldItem().getItem() == TinkersDefense.item_GreenMintcane)
-	//							event.drops.add(new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, new ItemStack(TinkersDefense.item_GreenMintcane,1,0)));
-	//
-	//		}
-	//	}
-
-	//	@SubscribeEvent
-	//	public void giveCandyToUndead(LivingSpawnEvent event)
-	//	{
-	//		//if(!Minecraft.getMinecraft().theWorld.isRemote)
-	//		if(TinkersDefense.month == 12)
-	//		{
-	//			if(event.entityLiving.isEntityUndead())
-	//			{
-	//				Integer chance = Minecraft.getMinecraft().theWorld.rand.nextInt(100);
-	//				Boolean candy = Minecraft.getMinecraft().theWorld.rand.nextBoolean();
-	//				if(chance < 25)
-	//				{
-	//					if(candy == true)
-	//						event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(TinkersDefense.item_RedMintcane, 1, 0));
-	//					else
-	//						event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(TinkersDefense.item_GreenMintcane, 1, 0));
-	//				}
-	//			}
-	//		}
-	//	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/gui/GuiTDGuideBook.java b/src/main/java/lance5057/tDefense/core/gui/GuiTDGuideBook.java
deleted file mode 100644
index 638bebf..0000000
--- a/src/main/java/lance5057/tDefense/core/gui/GuiTDGuideBook.java
+++ /dev/null
@@ -1,590 +0,0 @@
-package lance5057.tDefense.core.gui;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import lance5057.tDefense.TinkersDefense;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.entity.RenderItem;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.ShapedRecipes;
-import net.minecraft.item.crafting.ShapelessRecipes;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
-import net.minecraftforge.oredict.ShapedOreRecipe;
-import net.minecraftforge.oredict.ShapelessOreRecipe;
-
-import org.lwjgl.opengl.GL11;
-
-import tconstruct.library.crafting.ToolBuilder;
-import tconstruct.library.tools.DynamicToolPart;
-import tconstruct.tools.TinkerTools;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class GuiTDGuideBook extends GuiScreen
-{
-	static RenderItem						itemRender		= new RenderItem();
-	List<Chapter>							chapters		= new ArrayList<Chapter>();
-
-	private int								chapter			= 0;
-	private int								page			= 0;
-
-	private static final ResourceLocation	guiLocation		= new ResourceLocation(
-			"tinkersdefense",
-			"textures/gui/guide.png");
-
-	private static final ResourceLocation	guiLocation2	= new ResourceLocation(
-			"tinkersdefense",
-			"textures/gui/guide2.png");
-
-	public GuiTDGuideBook()
-	{
-
-	}
-
-	@Override
-	public void initGui()
-	{
-		final List<Page> pages = new ArrayList<Page>();
-		Page page;
-		chapters.add(new Chapter(0, 1));
-
-		page = new Page(1, 0);
-		pages.add(page);
-
-		page = new Page(1, 1, (DynamicToolPart) TinkersDefense.partArmorplate,
-				(DynamicToolPart) TinkerTools.toughRod,
-				(DynamicToolPart) TinkersDefense.partArmorplate,
-				(DynamicToolPart) TinkersDefense.partRivet);
-		pages.add(page);
-
-		page = new Page(1, 2, (DynamicToolPart) TinkersDefense.partArmorplate,
-				(DynamicToolPart) TinkerTools.toolRod,
-				(DynamicToolPart) TinkerTools.frypanHead, null);
-		pages.add(page);
-
-		chapters.add(new Chapter(1, pages));
-
-		buttonList.clear();
-
-		buttonList.add(new BookButton(0, ((width - 256) / 2) + 3, 240, false,
-				80, 0, 18, 12));
-		buttonList.add(new BookButton(1, ((width + 256) / 2) - 3 - 18, 240,
-				true, 80, 0, 18, 12));
-		buttonList.add(new BookButton(2, ((width - 14) / 2), 238, true, 120, 0,
-				14, 13));
-
-		for(int i = 0; i < chapters.size(); i++)
-		{
-			buttonList.add(chapters.get(i).getButton(3 + i, width, height));
-		}
-
-		//		this.buttonList.add(new BookButton(3, ((this.width + 256) / 2) - 8, 15 + 64, true, 71, 180, 35, 21));
-		//		this.buttonList.add(new BookButton(4, ((this.width + 256) / 2) - 8, 35 + 64, true, 71, 200, 35, 21));
-		//		this.buttonList.add(new BookButton(5, ((this.width + 256) / 2) - 8, 55 + 64, true, 71, 220, 35, 21));
-		//		this.buttonList.add(new BookButton(6, ((this.width + 256) / 2) - 8, 75 + 64, true, 144, 180, 35, 21));
-		//		this.buttonList.add(new BookButton(7, ((this.width + 256) / 2) - 8, 95 + 64, true, 144, 200, 35, 21));
-		//		
-		//		
-		((GuiButton) buttonList.get(chapter + 3)).enabled = false;
-	}
-
-	@Override
-	public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)
-	{
-		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-		mc.getTextureManager().bindTexture(guiLocation);
-
-		drawTexturedModalRect((width - 256) / 2, (height - 224) / 2, 0, 0, 256, 179);
-
-		//chapters.get(chapter - 1).pages.get(page - 1).drawText(fontRendererObj, this.width, this.height);
-		if(chapters.size() > 0 && chapters.get(chapter).pages.size() > 0)
-		{
-			chapters.get(chapter).pages.get(page).draw(this, fontRendererObj, width, height, itemRender);
-		}
-
-		mc.getTextureManager().bindTexture(guiLocation2);
-
-		super.drawScreen(p_73863_1_, p_73863_2_, p_73863_3_);
-	}
-
-	@Override
-	protected void actionPerformed(GuiButton button)
-	{
-		switch(button.id)
-		{
-			case 0:
-				if(page > 0)
-				{
-					page--;
-				}
-				else if(chapter > 0)
-				{
-					((GuiButton) buttonList.get(chapter + 3)).enabled = true;
-					chapter--;
-					page = 0;
-					((GuiButton) buttonList.get(chapter + 3)).enabled = false;
-				}
-				break;
-			case 1:
-				if(page + 1 < chapters.get(chapter).pages.size())
-				{
-					page++;
-				}
-				else if(chapter + 1 <= chapters.size() - 1)
-				{
-					((GuiButton) buttonList.get(chapter + 3)).enabled = true;
-					chapter++;
-					page = 0;
-					((GuiButton) buttonList.get(chapter + 3)).enabled = false;
-				}
-				break;
-			case 2:
-				((GuiButton) buttonList.get(chapter + 3)).enabled = true;
-				chapter = 0;
-				page = 0;
-				((GuiButton) buttonList.get(chapter + 3)).enabled = false;
-				break;
-			default:
-				((GuiButton) buttonList.get(chapter + 3)).enabled = true;
-				chapter = button.id - 3;
-				page = 0;
-				((GuiButton) buttonList.get(chapter + 3)).enabled = false;
-				break;
-		}
-	}
-
-	@SideOnly(Side.CLIENT)
-	static class BookButton extends GuiButton
-	{
-		private final boolean	mirror;
-
-		int						iconX, iconY, iconW, iconH;
-
-		public BookButton(int id, int x, int y, boolean mirror, int iconX, int iconY, int iconW, int iconH)
-		{
-			super(id, x, y, iconW, iconH, "");
-			this.mirror = mirror;
-			this.iconX = iconX;
-			this.iconY = iconY;
-			this.iconW = iconW;
-			this.iconH = iconH;
-		}
-
-		/**
-		 * Draws this button to the screen.
-		 */
-		@Override
-		public void drawButton(Minecraft p_146112_1_, int p_146112_2_, int p_146112_3_)
-		{
-			if(visible)
-			{
-				final boolean flag = (p_146112_2_ >= xPosition && p_146112_3_ >= yPosition && p_146112_2_ < xPosition + width && p_146112_3_ < yPosition + height) || !enabled;
-				GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-				//p_146112_1_.getTextureManager().bindTexture(guiLocation2);
-				int k = iconX;
-				int l = iconY;
-
-				if(flag)
-				{
-					k += iconW;
-				}
-
-				if(!mirror)
-				{
-					l += iconH;
-				}
-
-				drawTexturedModalRect(xPosition, yPosition, k, l, iconW, iconH);
-			}
-		}
-
-	}
-
-	@SideOnly(Side.CLIENT)
-	static class Chapter
-	{
-		List<Page>	pages;
-		int			buttonU, buttonV;
-		int			number;
-
-		public Chapter(int number, int pages2)
-		{
-			this.number = number;
-
-			pages = new ArrayList<Page>();
-
-			for(int i = 0; i < pages2; i++)
-			{
-				pages.add(new Page(number, i));
-			}
-		}
-
-		public Chapter(int number, List<Page> pages)
-		{
-			this.number = number;
-			this.pages = pages;
-		}
-
-		public BookButton getButton(int id, int w, int h)
-		{
-			return new BookButton(id, ((w + 256) / 2) - 8,
-					64 + 15 + (id - 3) * 22, true, 0, (id - 3) * 22, 35, 22);
-		}
-	}
-
-	@SideOnly(Side.CLIENT)
-	static class Page
-	{
-		/*		enum TYPES {TEXT, CRAFTING1, CRAFTING2, FORGE1, FORGE2, FORGE3, ALLOY};
-				0 = TEXT
-				1 = CRAFTING1
-				2 = CRAFTING2
-				3 = FORGE1
-				4 = FORGE2
-				5 = FORGE3
-				6 = ALLOY
-
-				because apparently java overcomplicated enums to all hell
-		 */
-
-		int						type;
-		int						chapter;
-		int						page;
-
-		List<DynamicToolPart>	TCRecipe;
-		int						TCCycleTimer	= 0;
-		List<Integer>			TCItemCycle		= new ArrayList<Integer>();
-
-		ItemStack				result1, result2, result3;
-
-		//Text
-		public Page(int chapter, int number)
-		{
-			type = 0;
-			this.chapter = chapter;
-			page = number;
-		}
-
-		/*Crafting 1 recipe
-		 * recipe - up to 9 stacks
-		 * 
-		 * list to grid looks like
-		 * 1 2 3
-		 * 4 5 6
-		 * 7 8 9
-		 */
-		public Page(int chapter, int number, ItemStack result)
-		{
-			type = 1;
-			this.chapter = chapter;
-			page = number;
-			result1 = result;
-		}
-
-		/*Crafting 2 recipe
-		 * recipe1 - up to 9 stacks
-		 * recipe2 - up to 9 stacks
-		 * 
-		 * list to grid looks like
-		 * 1 2 3
-		 * 4 5 6
-		 * 7 8 9
-		 */
-		public Page(int chapter, int number, ItemStack result1, ItemStack result2)
-		{
-			type = 2;
-			this.chapter = chapter;
-			page = number;
-
-			this.result1 = result1;
-			this.result2 = result2;
-		}
-
-		public Page(int chapter, int number, DynamicToolPart item1, DynamicToolPart item2, DynamicToolPart item3, DynamicToolPart item4)
-		{
-			type = 3;
-			this.chapter = chapter;
-			page = number;
-
-			TCRecipe = new ArrayList<DynamicToolPart>();
-			TCRecipe.add(item1);
-			TCRecipe.add(item2);
-			if(item3 != null)
-			{
-				TCRecipe.add(item3);
-			}
-			if(item4 != null)
-			{
-				TCRecipe.add(item4);
-			}
-		}
-
-		public void draw(GuiScreen gui, FontRenderer fontRendererObj, int w, int h, RenderItem itemRender)
-		{
-			drawText(fontRendererObj, w, h);
-			switch(type)
-			{
-				case 0:
-					drawTextRight(fontRendererObj, w, h);
-					break;
-				case 1:
-					drawCraftPage(gui, 1, w, h, fontRendererObj, itemRender);
-					break;
-				case 2:
-					drawCraftPage(gui, 2, w, h, fontRendererObj, itemRender);
-					break;
-				case 3:
-					drawForgePage(gui, 2, w, h, fontRendererObj, itemRender);
-					break;
-			}
-		}
-
-		public void drawText(FontRenderer fontRendererObj, int w, int h)
-		{
-			final int titleSize = fontRendererObj.getStringWidth(StatCollector.translateToLocal("book.chapter" + chapter + ".page" + page + ".titleL"));
-			fontRendererObj.drawString(StatCollector.translateToLocal("book.chapter" + chapter + ".page" + page + ".titleL"), ((w - 256) / 2) + 64 - titleSize, 64 + 14, 0);
-
-			drawCenteredSplit(((w - 256) / 2) + 68, 84, StatCollector.translateToLocal("book.chapter" + chapter + ".page" + page + ".ContentL"), fontRendererObj);
-		}
-
-		public void drawTextRight(FontRenderer fontRendererObj, int w, int h)
-		{
-			final int titleSize = fontRendererObj.getStringWidth(StatCollector.translateToLocal("book.chapter" + chapter + ".page" + page + ".titleR"));
-			fontRendererObj.drawString(StatCollector.translateToLocal("book.chapter" + chapter + ".page" + page + ".titleR"), ((w + 256) / 2) - 72 - titleSize, 64 + 14, 0);
-
-			drawCenteredSplit(((w + 256) / 2) - 72, 84, StatCollector.translateToLocal("book.chapter" + chapter + ".page" + page + ".ContentR"), fontRendererObj);
-		}
-
-		private void drawCraftPage(GuiScreen gui, int numOfCrafts, int w, int h, FontRenderer fontRendererObj, RenderItem itemRender)
-		{
-			GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-			gui.mc.getTextureManager().bindTexture(guiLocation2);
-			final IRecipe recipe;
-			switch(numOfCrafts)
-			{
-				case 1:
-					gui.drawTexturedModalRect(w / 2 + 7, h / 2 - 49, 157, 0, 99, 56);
-					recipe = lookUpRecipe(result1);
-
-					DrawRecipe(fontRendererObj, gui.mc.getTextureManager(), recipe, 10, -46, w, h);
-					break;
-				case 2:
-					gui.drawTexturedModalRect((w - 256) / 2 + 7, 64 + 33, 157, 0, 99, 56);
-
-					recipe = lookUpRecipe(result1);
-
-					DrawRecipe(fontRendererObj, gui.mc.getTextureManager(), recipe, 7, 60, w, h);
-
-					gui.drawTexturedModalRect((w - 256) / 2 + 7, 64 + 94, 157, 0, 99, 56);
-					break;
-				default:
-					break;
-			}
-			GL11.glEnable(GL11.GL_BLEND);
-		}
-
-		private void drawForgePage(GuiScreen gui, int numOfCrafts, int w, int h, FontRenderer fontRendererObj, RenderItem itemRender)
-		{
-			if(TCCycleTimer == 0)
-			{
-				TCItemCycle.clear();
-				for(int i = 0; i < 4; i++)
-				{
-					TCItemCycle.add(gui.mc.theWorld.rand.nextInt(18));
-				}
-				TCCycleTimer = 100;
-			}
-			else
-			{
-				TCCycleTimer--;
-			}
-
-			GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-			RenderHelper.enableGUIStandardItemLighting();
-			gui.mc.getTextureManager().bindTexture(guiLocation2);
-			gui.drawTexturedModalRect(w / 2 + 7, h / 2 - 48, 157, 57, 99, 40);
-
-			itemRender.renderItemAndEffectIntoGUI(fontRendererObj, gui.mc.getTextureManager(), new ItemStack(
-					TCRecipe.get(0), 1, TCItemCycle.get(0)), w / 2 + 45, h / 2 - 37);
-			itemRender.renderItemAndEffectIntoGUI(fontRendererObj, gui.mc.getTextureManager(), new ItemStack(
-					TCRecipe.get(1), 1, TCItemCycle.get(1)), w / 2 + 27, h / 2 - 45);
-			itemRender.renderItemAndEffectIntoGUI(fontRendererObj, gui.mc.getTextureManager(), new ItemStack(
-					TCRecipe.get(2), 1, TCItemCycle.get(2)), w / 2 + 28, h / 2 - 27);
-
-			if(TCRecipe.size() <= 3)
-			{
-				itemRender.renderItemAndEffectIntoGUI(fontRendererObj, gui.mc.getTextureManager(), ToolBuilder.instance.buildTool(new ItemStack(
-						TCRecipe.get(0), 1, TCItemCycle.get(0)), new ItemStack(
-								TCRecipe.get(1), 1, TCItemCycle.get(1)), new ItemStack(
-										TCRecipe.get(2), 1, TCItemCycle.get(2)), "Result"), w / 2 + 87, h / 2 - 37);
-			}
-			else
-			{
-
-				itemRender.renderItemAndEffectIntoGUI(fontRendererObj, gui.mc.getTextureManager(), new ItemStack(
-						TCRecipe.get(3), 1, TCItemCycle.get(3)), w / 2 + 11, h / 2 - 37);
-				itemRender.renderItemAndEffectIntoGUI(fontRendererObj, gui.mc.getTextureManager(), ToolBuilder.instance.buildTool(new ItemStack(
-						TCRecipe.get(0), 1, TCItemCycle.get(0)), new ItemStack(
-								TCRecipe.get(1), 1, TCItemCycle.get(1)), new ItemStack(
-										TCRecipe.get(2), 1, TCItemCycle.get(2)), new ItemStack(
-												TCRecipe.get(3), 1, TCItemCycle.get(3)), "Result"), w / 2 + 87, h / 2 - 37);
-			}
-
-			GL11.glEnable(GL11.GL_BLEND);
-		}
-	}
-
-	static void drawCenteredSplit(int x, int y, String str, FontRenderer fontRendererObj)
-	{
-		int index = 0;
-		int h = 0;
-		int endIndex = 0;
-		int spaceIndex = 0;
-		while(str.length() > index)
-		{
-			endIndex = index + 20;
-			if(index + 20 > str.length())
-			{
-				endIndex = str.length();
-			}
-
-			String sub = "";
-			spaceIndex = endIndex;
-
-			for(int i = index; i < endIndex; i++)
-			{
-				final char test = str.toCharArray()[i];
-				if(test == ' ')
-				{
-					spaceIndex = i;
-				}
-				if(i == endIndex - 1)
-				{
-					if(test != ' ' && i != str.length() - 1)
-					{
-						sub = str.substring(index, spaceIndex);
-						index = spaceIndex;
-					}
-					else
-					{
-						sub = str.substring(index, endIndex);
-						index = endIndex;
-					}
-				}
-			}
-
-			h += fontRendererObj.FONT_HEIGHT;
-			fontRendererObj.drawString(sub, x - fontRendererObj.getStringWidth(sub) / 2, h + y, 0);
-		}
-	}
-
-	static IRecipe lookUpRecipe(ItemStack stack)
-	{
-		final List<IRecipe> recipes = CraftingManager.getInstance().getRecipeList();
-		final Iterator<IRecipe> recipe = recipes.iterator();
-
-		while(recipe.hasNext())
-		{
-			final ItemStack next = recipe.next().getRecipeOutput();
-			if(next != null)
-			{
-				if(next.getItem() == stack.getItem())
-					return recipe.next();
-			}
-		}
-		return null;
-	}
-
-	static void DrawRecipe(FontRenderer font, TextureManager tex, IRecipe recipe, int x, int y, int w, int h)
-	{
-		if(recipe instanceof ShapelessRecipes)
-		{
-			final ShapelessRecipes SRecipe = (ShapelessRecipes) recipe;
-			for(int i = 0; i < 9; i++)
-			{
-				if(SRecipe.recipeItems.get(i) != null)
-				{
-					if(((ItemStack) SRecipe.recipeItems.get(i)).getItem() instanceof ItemBlock)
-					{
-						RenderHelper.enableStandardItemLighting();
-					}
-					else
-					{
-						RenderHelper.enableGUIStandardItemLighting();
-					}
-					itemRender.renderItemAndEffectIntoGUI(font, tex, (ItemStack) SRecipe.recipeItems.get(i), w / 2 + x + ((i % 3) * 17), h / 2 + y + (i / 3 * 17));
-				}
-			}
-		}
-		else if(recipe instanceof ShapedOreRecipe)
-		{
-			//			final ShapedOreRecipe SRecipe = (ShapedOreRecipe) recipe;
-			//			for(int i = 0; i < 9; i++)
-			//			{
-			//				if(SRecipe.getInput() != null && OreDictionary. SRecipe.getInput()[i] instanceof ItemStack)
-			//				{
-			//					if(((ItemStack) SRecipe.getInput()[i]).getItem() instanceof ItemBlock)
-			//					{
-			//						RenderHelper.enableStandardItemLighting();
-			//					}
-			//					else
-			//					{
-			//						RenderHelper.enableGUIStandardItemLighting();
-			//					}
-			//					itemRender.renderItemAndEffectIntoGUI(font, tex, (ItemStack) SRecipe.getInput()[i], w / 2 + x + ((i % 3) * 17), h / 2 + y + (i / 3 * 17));
-			//				}
-			//			}
-		}
-		else if(recipe instanceof ShapelessOreRecipe)
-		{
-			//			final ShapelessOreRecipe SRecipe = (ShapelessOreRecipe) recipe;
-			//			for(int i = 0; i < 9; i++)
-			//			{
-			//				if(SRecipe.getInput() != null && SRecipe.getInput().get(i) instanceof ItemStack)
-			//				{
-			//					if(((ItemStack) SRecipe.getInput().get(i)).getItem() instanceof ItemBlock)
-			//					{
-			//						RenderHelper.enableStandardItemLighting();
-			//					}
-			//					else
-			//					{
-			//						RenderHelper.enableGUIStandardItemLighting();
-			//					}
-			//					itemRender.renderItemAndEffectIntoGUI(font, tex, (ItemStack) SRecipe.getInput().get(i), w / 2 + x + ((i % 3) * 17), h / 2 + y + (i / 3 * 17));
-			//				}
-			//			}
-		}
-		else
-		{
-			final ShapedRecipes SRecipe = (ShapedRecipes) recipe;
-			for(int i = 0; i < 9; i++)
-			{
-				if(SRecipe.recipeItems[i] != null)
-				{
-					if(SRecipe.recipeItems[i].getItem() instanceof ItemBlock)
-					{
-						RenderHelper.enableStandardItemLighting();
-					}
-					else
-					{
-						RenderHelper.enableGUIStandardItemLighting();
-					}
-					itemRender.renderItemAndEffectIntoGUI(font, tex, SRecipe.recipeItems[i], w / 2 + x + ((i % 3) * 17), h / 2 + y + (i / 3 * 17));
-				}
-			}
-		}
-		itemRender.renderItemAndEffectIntoGUI(font, tex, recipe.getRecipeOutput(), w / 2 + 87, 64 + 83);
-
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/items/GuideBook.java b/src/main/java/lance5057/tDefense/core/items/GuideBook.java
deleted file mode 100644
index ec591c6..0000000
--- a/src/main/java/lance5057/tDefense/core/items/GuideBook.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package lance5057.tDefense.core.items;
-
-import lance5057.tDefense.Reference;
-import lance5057.tDefense.TinkersDefense;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-public class GuideBook extends Item
-{
-	public GuideBook()
-	{
-		setCreativeTab(TinkersDefense.tabName);
-		setMaxStackSize(1);
-		setUnlocalizedName("guidebook");
-		setTextureName(Reference.MOD_ID + ":tdbook");
-	}
-
-	@Override
-	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
-	{
-		player.openGui(TinkersDefense.instance, TinkersDefense.GUI_GUIDEBOOK, player.worldObj, (int) player.posX, (int) player.posY, (int) player.posZ);
-		return stack;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/items/MetaModifierItem.java b/src/main/java/lance5057/tDefense/core/items/MetaModifierItem.java
deleted file mode 100644
index 7f11e02..0000000
--- a/src/main/java/lance5057/tDefense/core/items/MetaModifierItem.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package lance5057.tDefense.core.items;
-
-import java.util.List;
-
-import lance5057.tDefense.Reference;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-public class MetaModifierItem extends Item
-{
-	public IIcon[]	icons;
-	public String[]	names;
-	int				metaAmount;
-
-	public MetaModifierItem(String unlocalizedName, int metaAmount, String[] names)
-	{
-		super();
-		setHasSubtypes(true);
-		setUnlocalizedName(unlocalizedName);
-		setCreativeTab(CreativeTabs.tabMaterials);
-		this.metaAmount = metaAmount;
-		this.names = names;
-		icons = new IIcon[metaAmount];
-	}
-
-	@Override
-	public void registerIcons(IIconRegister reg)
-	{
-		for(int i = 0; i < metaAmount; i++)
-		{
-			icons[i] = reg.registerIcon(Reference.MOD_ID + ":item_" + names[i].toLowerCase());
-		}
-	}
-
-	@Override
-	public IIcon getIconFromDamage(int meta)
-	{
-		if(meta > metaAmount - 1)
-		{
-			meta = 0;
-		}
-
-		return icons[meta];
-	}
-
-	@Override
-	public void getSubItems(Item item, CreativeTabs tab, List list)
-	{
-		for(int i = 0; i < metaAmount; i++)
-		{
-			list.add(new ItemStack(item, 1, i));
-		}
-	}
-
-	@Override
-	public String getUnlocalizedName(ItemStack stack)
-	{
-		return this.getUnlocalizedName() + "_" + names[stack.getItemDamage()];
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/items/RawGem.java b/src/main/java/lance5057/tDefense/core/items/RawGem.java
deleted file mode 100644
index 41565aa..0000000
--- a/src/main/java/lance5057/tDefense/core/items/RawGem.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package lance5057.tDefense.core.items;
-
-import lance5057.tDefense.Reference;
-import lance5057.tDefense.TinkersDefense;
-import net.minecraft.item.Item;
-
-public class RawGem extends Item
-{
-	public RawGem(String name)
-	{
-		setCreativeTab(TinkersDefense.tabName);
-		setMaxStackSize(64);
-		setUnlocalizedName("raw" + name);
-		setTextureName(Reference.MOD_ID + ":raw" + name);
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/liquids/MoltenFluid.java b/src/main/java/lance5057/tDefense/core/liquids/MoltenFluid.java
deleted file mode 100644
index 48ab09f..0000000
--- a/src/main/java/lance5057/tDefense/core/liquids/MoltenFluid.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package lance5057.tDefense.core.liquids;
-
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.util.IIcon;
-import net.minecraftforge.fluids.BlockFluidClassic;
-import net.minecraftforge.fluids.Fluid;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class MoltenFluid extends BlockFluidClassic
-{
-	private IIcon	stillIcon;
-	private IIcon	flowingIcon;
-	private final String	stillIconTexture;
-	private final String	flowIconTexture;
-
-	public MoltenFluid(Fluid fluid, String name)
-	{
-		super(fluid, Material.lava);
-		setLightLevel(100.0F);
-		setHardness(1.0F);
-		setBlockName("Molten" + name);
-
-		stillIconTexture = "tinkersdefense:molten_" + name;
-		flowIconTexture = "tinkersdefense:molten_" + name + "_flow";
-	}
-
-	@SideOnly(Side.CLIENT)
-	public void func_149651_a(IIconRegister icon)
-	{
-		stillIcon = icon.registerIcon(stillIconTexture);
-		flowingIcon = icon.registerIcon(flowIconTexture);
-
-		getFluid().setIcons(stillIcon, flowingIcon);
-	}
-
-	public IIcon getStillIcon()
-	{
-		return stillIcon;
-	}
-
-	public IIcon getFlowingIcon()
-	{
-		return flowingIcon;
-	}
-
-	@SideOnly(Side.CLIENT)
-	public IIcon func_149691_a(int side, int meta)
-	{
-		if(side <= 1)
-		{
-			return stillIcon;
-		}
-		return flowingIcon;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/materials/traits/TraitAxeLover.java b/src/main/java/lance5057/tDefense/core/materials/traits/TraitAxeLover.java
index 0b12566..f262aea 100644
--- a/src/main/java/lance5057/tDefense/core/materials/traits/TraitAxeLover.java
+++ b/src/main/java/lance5057/tDefense/core/materials/traits/TraitAxeLover.java
@@ -36,7 +36,7 @@ public class TraitAxeLover extends AbstractTrait {
 						|| held.getItem() instanceof ItemAxe
 						|| held.getItem() instanceof Hatchet
 						|| held.getItem() instanceof Mattock) {
-					if (player.worldObj.rand.nextInt(100) < 5) {
+					if (player.world.rand.nextInt(100) < 5) {
 						liv.entityDropItem(liv.getHeldItemMainhand(), 0f);
 						liv.setHeldItem(EnumHand.MAIN_HAND, null);
 					}
diff --git a/src/main/java/lance5057/tDefense/core/materials/traits/TraitFirestarter.java b/src/main/java/lance5057/tDefense/core/materials/traits/TraitFirestarter.java
index 138c410..16b1c2b 100644
--- a/src/main/java/lance5057/tDefense/core/materials/traits/TraitFirestarter.java
+++ b/src/main/java/lance5057/tDefense/core/materials/traits/TraitFirestarter.java
@@ -37,7 +37,7 @@ public class TraitFirestarter extends AbstractTrait {
 					{
 						Vec3d vec = player.getLookVec();
 						BlockPos block = player.getPosition().add(vec.xCoord,-1,vec.zCoord);
-						player.worldObj.setBlockState(block, Blocks.FIRE.getDefaultState());
+						player.world.setBlockState(block, Blocks.FIRE.getDefaultState());
 					}
 				}
 			}
diff --git a/src/main/java/lance5057/tDefense/core/network/Handler_FinishingAnvil.java b/src/main/java/lance5057/tDefense/core/network/Handler_FinishingAnvil.java
deleted file mode 100644
index 561f326..0000000
--- a/src/main/java/lance5057/tDefense/core/network/Handler_FinishingAnvil.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package lance5057.tDefense.core.network;
-
-import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.TileEntity_FinishingAnvil;
-import net.minecraft.tileentity.TileEntity;
-import cpw.mods.fml.common.network.simpleimpl.IMessage;
-import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
-import cpw.mods.fml.common.network.simpleimpl.MessageContext;
-
-public class Handler_FinishingAnvil implements IMessageHandler<Message_FinishingAnvil, IMessage>
-{
-	@Override
-	public IMessage onMessage(Message_FinishingAnvil message, MessageContext ctx)
-	{
-		final TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z);
-		if(te instanceof TileEntity_FinishingAnvil)
-		{
-			//((TileEntity_FinishingAnvil) te).flip = message.flip;
-			((TileEntity_FinishingAnvil) te).inventory[0] = message.item;
-		}
-		return null;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/network/Message_FinishingAnvil.java b/src/main/java/lance5057/tDefense/core/network/Message_FinishingAnvil.java
deleted file mode 100644
index c9a6124..0000000
--- a/src/main/java/lance5057/tDefense/core/network/Message_FinishingAnvil.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package lance5057.tDefense.core.network;
-
-import io.netty.buffer.ByteBuf;
-import net.minecraft.item.ItemStack;
-import cpw.mods.fml.common.network.ByteBufUtils;
-import cpw.mods.fml.common.network.simpleimpl.IMessage;
-
-public class Message_FinishingAnvil implements IMessage
-{
-	ByteBufUtils		bbu	= new ByteBufUtils();
-
-	public int			x, y, z;
-	public ItemStack	item;
-
-	public Message_FinishingAnvil()
-	{
-
-	}
-
-	public Message_FinishingAnvil(int x, int y, int z, ItemStack item)
-	{
-		this.x = x;
-		this.y = y;
-		this.z = z;
-
-		this.item = item;
-	}
-
-	@Override
-	public void fromBytes(ByteBuf buf)
-	{
-		x = buf.readInt();
-		y = buf.readInt();
-		z = buf.readInt();
-
-		item = ByteBufUtils.readItemStack(buf);
-	}
-
-	@Override
-	public void toBytes(ByteBuf buf)
-	{
-		buf.writeInt(x);
-		buf.writeInt(y);
-		buf.writeInt(z);
-
-		ByteBufUtils.writeItemStack(buf, item);
-	}
-
-}
diff --git a/src/main/java/lance5057/tDefense/core/network/PacketHandler.java b/src/main/java/lance5057/tDefense/core/network/PacketHandler.java
deleted file mode 100644
index f1b1778..0000000
--- a/src/main/java/lance5057/tDefense/core/network/PacketHandler.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package lance5057.tDefense.core.network;
-
-import lance5057.tDefense.TinkersDefense;
-import cpw.mods.fml.relauncher.Side;
-
-public class PacketHandler
-{
-	private static int	id	= 0;
-
-	public static void init()
-	{
-		TinkersDefense.INSTANCE.registerMessage(Handler_CrestMount.class, Message_CrestMount.class, id++, Side.SERVER);
-		TinkersDefense.INSTANCE.registerMessage(Handler_FinishingAnvil.class, Message_FinishingAnvil.class, id++, Side.SERVER);
-
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/renderer/HookRenderer.java b/src/main/java/lance5057/tDefense/core/renderer/HookRenderer.java
deleted file mode 100644
index bb25c76..0000000
--- a/src/main/java/lance5057/tDefense/core/renderer/HookRenderer.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package lance5057.tDefense.core.renderer;
-
-import lance5057.tDefense.core.entity.EntityHookshotHook;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.ResourceLocation;
-
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
-public class HookRenderer extends Render
-{
-	ResourceLocation	head	= new ResourceLocation(
-			"tinkersdefense:textures/entity/swordhead.png");
-	ResourceLocation	chain	= new ResourceLocation(
-			"tinkersdefense:textures/entity/chain.png");
-
-	public HookRenderer()
-	{
-
-	}
-
-	@Override
-	public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
-	{
-		drawHook(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
-		drawChain(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
-	}
-
-	void drawHook(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
-	{
-		bindEntityTexture(p_76986_1_);
-		GL11.glPushMatrix();
-		GL11.glTranslatef((float) p_76986_2_, (float) p_76986_4_, (float) p_76986_6_);
-		GL11.glRotatef(p_76986_1_.prevRotationYaw + (p_76986_1_.rotationYaw - p_76986_1_.prevRotationYaw) * p_76986_9_ - 90.0F, 0.0F, 1.0F, 0.0F);
-		GL11.glRotatef(p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_, 0.0F, 0.0F, 1.0F);
-		final Tessellator tessellator = Tessellator.instance;
-		final float f2 = 0.0F;
-		final float f3 = 1.0F;
-		final float f10 = 0.5F;
-		GL11.glEnable(GL12.GL_RESCALE_NORMAL);
-
-		GL11.glRotatef(45.0F, 1.0F, 0.0F, 0.0F);
-		GL11.glScalef(f10, f10, f10);
-		for(int i = 0; i < 4; ++i)
-		{
-			GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F);
-			GL11.glNormal3f(0.0F, 0.0F, f10);
-			tessellator.startDrawingQuads();
-			tessellator.addVertexWithUV(-1.0D, -1.0D, 0.0D, f2, f2);
-			tessellator.addVertexWithUV(1.0D, -1.0D, 0.0D, f2, f3);
-			tessellator.addVertexWithUV(1.0D, 1.0D, 0.0D, f3, f3);
-			tessellator.addVertexWithUV(-1.0D, 1.0D, 0.0D, f3, f2);
-			tessellator.draw();
-		}
-
-		GL11.glDisable(GL12.GL_RESCALE_NORMAL);
-		GL11.glPopMatrix();
-	}
-
-	void drawChain(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_)
-	{
-		final EntityHookshotHook hook = (EntityHookshotHook) p_76986_1_;
-		final EntityPlayer player = hook.worldObj.getPlayerEntityByName(hook.getPlayer());
-
-		final float f2 = 0;
-		float f3 = MathHelper.sin(f2 * 0.2F) / 2.0F + 0.5F;
-		f3 = (f3 * f3 + f3) * 0.2F;
-		final float f4 = (float) (player.posX - p_76986_1_.posX - (p_76986_1_.prevPosX - p_76986_1_.posX) * (1.0F - p_76986_9_));
-		final float f5 = (float) (f3 + player.posY - 1.0D - p_76986_1_.posY - (p_76986_1_.prevPosY - p_76986_1_.posY) * (1.0F - p_76986_9_));
-		final float f6 = (float) (player.posZ - p_76986_1_.posZ - (p_76986_1_.prevPosZ - p_76986_1_.posZ) * (1.0F - p_76986_9_));
-		final float f7 = MathHelper.sqrt_float(f4 * f4 + f6 * f6);
-		final float f8 = MathHelper.sqrt_float(f4 * f4 + f5 * f5 + f6 * f6);
-		GL11.glPushMatrix();
-		GL11.glTranslatef((float) p_76986_2_, (float) p_76986_4_, (float) p_76986_6_);
-		GL11.glRotatef((float) (-Math.atan2(f6, f4)) * 180.0F / (float) Math.PI - 90.0F, 0.0F, 1.0F, 0.0F);
-		GL11.glRotatef((float) (-Math.atan2(f7, f5)) * 180.0F / (float) Math.PI - 90.0F, 1.0F, 0.0F, 0.0F);
-		final Tessellator tessellator = Tessellator.instance;
-		RenderHelper.disableStandardItemLighting();
-		GL11.glDisable(GL11.GL_CULL_FACE);
-		bindTexture(chain);
-		GL11.glShadeModel(GL11.GL_SMOOTH);
-		final float f9 = 0.0F - (f8) * 0.1F;
-		MathHelper.sqrt_float(f4 * f4 + f5 * f5 + f6 * f6);
-
-		GL11.glScalef(0.5f, 0.5f, 1);
-		for(int j = 0; j < 2; j++)
-		{
-			tessellator.startDrawing(5);
-			final byte b0 = 2;
-			GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F);
-			for(int i = 0; i < b0; ++i)
-			{
-
-				final float f11 = MathHelper.sin(i % b0 * (float) Math.PI * 2.0F / b0) * 0.75F;
-				final float f12 = MathHelper.cos(i % b0 * (float) Math.PI * 2.0F / b0) * 0.75F;
-				tessellator.addVertexWithUV(f11, f12, 0.0D, 0, 0);
-				tessellator.addVertexWithUV(f11, f12, f8, 0, f9);
-				tessellator.addVertexWithUV(f11, f12, 0.0D, 1, 0);
-				tessellator.addVertexWithUV(f11, f12, f8, 1, f9);
-			}
-			tessellator.draw();
-		}
-
-		GL11.glEnable(GL11.GL_CULL_FACE);
-		GL11.glShadeModel(GL11.GL_FLAT);
-		RenderHelper.enableStandardItemLighting();
-		GL11.glPopMatrix();
-	}
-
-	@Override
-	protected ResourceLocation getEntityTexture(Entity p_110775_1_)
-	{
-		// TODO Auto-generated method stub
-		return head;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/renderer/MoreFlexibleToolRenderer.java b/src/main/java/lance5057/tDefense/core/renderer/MoreFlexibleToolRenderer.java
deleted file mode 100644
index 0412731..0000000
--- a/src/main/java/lance5057/tDefense/core/renderer/MoreFlexibleToolRenderer.java
+++ /dev/null
@@ -1,359 +0,0 @@
-package lance5057.tDefense.core.renderer;
-
-//Owned by Tinkers Construct with small edit
-
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
-import tconstruct.TConstruct;
-import tconstruct.client.FlexibleToolRenderer;
-import tconstruct.library.tools.ToolCore;
-
-public class MoreFlexibleToolRenderer extends FlexibleToolRenderer
-{
-	private float		scale	= 1f;
-	private final float	x, y, z;
-	public float		depth	= 1 / 32f;
-
-	public MoreFlexibleToolRenderer(float size, float x, float y, float z)
-	{
-		scale = size;
-		this.x = x;
-		this.y = y;
-		this.z = z;
-	}
-
-	@Override
-	public void setDepth(float d)
-	{
-		depth = d;
-	}
-
-	@Override
-	public boolean handleRenderType(ItemStack item, ItemRenderType type)
-	{
-		if(!item.hasTagCompound())
-		{
-			return false;
-		}
-
-		switch(type)
-		{
-			case ENTITY:
-				//GL11.glTranslatef(-0.0625F, -0.0625F, 0F);
-				return true;
-			case EQUIPPED:
-				//GL11.glTranslatef(0.03f, 0F, -0.09375F);
-			case EQUIPPED_FIRST_PERSON:
-				return true;
-			case INVENTORY:
-				return true;
-			default:
-				TConstruct.logger.warn("[TCon] Unhandled render case!");
-			case FIRST_PERSON_MAP:
-				return false;
-		}
-	}
-
-	@Override
-	public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper)
-	{
-		return handleRenderType(item, type) & helper.ordinal() < ItemRendererHelper.EQUIPPED_BLOCK.ordinal();
-	}
-
-	private static final int	toolIcons	= 10;
-
-	@Override
-	protected void specialAnimation(ItemRenderType type, ItemStack item)
-	{
-	}
-
-	@Override
-	public void renderItem(ItemRenderType type, ItemStack item, Object... data)
-	{
-		if(item == null || item.getItem() == null || !(item.getItem() instanceof ToolCore))
-		{
-			return;
-		}
-
-		Entity ent = null;
-		if(data.length > 1)
-		{
-			ent = (Entity) data[1];
-		}
-
-		final IIcon[] parts = new IIcon[toolIcons];
-		final int iconParts = getIcons(item, type, ent, parts);
-
-		// drawing the inventory is a simple procedure
-		if(type == ItemRenderType.INVENTORY)
-		{
-			renderInventory(iconParts, parts, item);
-			return;
-		}
-
-		final Tessellator tess = Tessellator.instance;
-		final float[] xMax = new float[iconParts];
-		final float[] yMin = new float[iconParts];
-		final float[] xMin = new float[iconParts];
-		final float[] yMax = new float[iconParts];
-
-		final float[] width = new float[iconParts];
-		final float[] height = new float[iconParts];
-		final float[] xDiff = new float[iconParts];
-		final float[] yDiff = new float[iconParts];
-		final float[] xSub = new float[iconParts];
-		final float[] ySub = new float[iconParts];
-		for(int i = 0; i < iconParts; ++i)
-		{
-			final IIcon icon = parts[i];
-			xMin[i] = icon.getMinU();
-			xMax[i] = icon.getMaxU();
-			yMin[i] = icon.getMinV();
-			yMax[i] = icon.getMaxV();
-			width[i] = icon.getIconWidth();
-			height[i] = icon.getIconHeight();
-			xDiff[i] = xMin[i] - xMax[i];
-			yDiff[i] = yMin[i] - yMax[i];
-			xSub[i] = 0.5f * (xMax[i] - xMin[i]) / width[i];
-			ySub[i] = 0.5f * (yMax[i] - yMin[i]) / height[i];
-		}
-
-		GL11.glPushMatrix();
-		GL11.glEnable(GL12.GL_RESCALE_NORMAL);
-		//edit
-		//GL11.glScalef(scale, scale, scale);
-		GL11.glScalef(scale, scale, scale);
-		GL11.glTranslatef(x, y, z);
-
-		if(type != ItemRenderType.ENTITY)
-		{
-			specialAnimation(type, item);
-		}
-		else
-		{
-			GL11.glTranslatef(-0.5f, -0.25f, 0); // why? because.. minecraft.
-		}
-
-		// prepare colors
-		final int[] color = new int[iconParts];
-		for(int i = 0; i < iconParts; i++)
-		{
-			color[i] = item.getItem().getColorFromItemStack(item, i);
-		}
-
-		// one side
-		tess.startDrawingQuads();
-		tess.setNormal(0, 0, 1);
-		for(int i = 0; i < iconParts; ++i)
-		{
-			tess.setColorOpaque_I(color[i]);
-			tess.addVertexWithUV(0, 0, +depth, xMax[i], yMax[i]);
-			tess.addVertexWithUV(1, 0, +depth, xMin[i], yMax[i]);
-			tess.addVertexWithUV(1, 1, +depth, xMin[i], yMin[i]);
-			tess.addVertexWithUV(0, 1, +depth, xMax[i], yMin[i]);
-		}
-		tess.draw();
-
-		// other side
-		tess.startDrawingQuads();
-		tess.setNormal(0, 0, -1);
-		for(int i = 0; i < iconParts; ++i)
-		{
-			tess.setColorOpaque_I(color[i]);
-			tess.addVertexWithUV(0, 1, -depth, xMax[i], yMin[i]);
-			tess.addVertexWithUV(1, 1, -depth, xMin[i], yMin[i]);
-			tess.addVertexWithUV(1, 0, -depth, xMin[i], yMax[i]);
-			tess.addVertexWithUV(0, 0, -depth, xMax[i], yMax[i]);
-		}
-		tess.draw();
-
-		// make it have "depth"
-		tess.startDrawingQuads();
-		tess.setNormal(-1, 0, 0);
-		float pos;
-		float iconPos;
-
-		for(int i = 0; i < iconParts; ++i)
-		{
-			tess.setColorOpaque_I(color[i]);
-			final float w = width[i], m = xMax[i], d = xDiff[i], s = xSub[i];
-			for(int k = 0, e = (int) w; k < e; ++k)
-			{
-				pos = k / w;
-				iconPos = m + d * pos - s;
-				tess.addVertexWithUV(pos, 0, -depth, iconPos, yMax[i]);
-				tess.addVertexWithUV(pos, 0, +depth, iconPos, yMax[i]);
-				tess.addVertexWithUV(pos, 1, +depth, iconPos, yMin[i]);
-				tess.addVertexWithUV(pos, 1, -depth, iconPos, yMin[i]);
-			}
-		}
-
-		tess.draw();
-		tess.startDrawingQuads();
-		tess.setNormal(1, 0, 0);
-		float posEnd;
-
-		for(int i = 0; i < iconParts; ++i)
-		{
-			tess.setColorOpaque_I(color[i]);
-			final float w = width[i], m = xMax[i], d = xDiff[i], s = xSub[i];
-			final float d2 = 1f / w;
-			for(int k = 0, e = (int) w; k < e; ++k)
-			{
-				pos = k / w;
-				iconPos = m + d * pos - s;
-				posEnd = pos + d2;
-				tess.addVertexWithUV(posEnd, 1, -depth, iconPos, yMin[i]);
-				tess.addVertexWithUV(posEnd, 1, +depth, iconPos, yMin[i]);
-				tess.addVertexWithUV(posEnd, 0, +depth, iconPos, yMax[i]);
-				tess.addVertexWithUV(posEnd, 0, -depth, iconPos, yMax[i]);
-			}
-		}
-
-		tess.draw();
-		tess.startDrawingQuads();
-		tess.setNormal(0, 1, 0);
-
-		for(int i = 0; i < iconParts; ++i)
-		{
-			tess.setColorOpaque_I(color[i]);
-			final float h = height[i], m = yMax[i], d = yDiff[i], s = ySub[i];
-			final float d2 = 1f / h;
-			for(int k = 0, e = (int) h; k < e; ++k)
-			{
-				pos = k / h;
-				iconPos = m + d * pos - s;
-				posEnd = pos + d2;
-				tess.addVertexWithUV(0, posEnd, +depth, xMax[i], iconPos);
-				tess.addVertexWithUV(1, posEnd, +depth, xMin[i], iconPos);
-				tess.addVertexWithUV(1, posEnd, -depth, xMin[i], iconPos);
-				tess.addVertexWithUV(0, posEnd, -depth, xMax[i], iconPos);
-			}
-		}
-
-		tess.draw();
-		tess.startDrawingQuads();
-		tess.setNormal(0, -1, 0);
-
-		for(int i = 0; i < iconParts; ++i)
-		{
-			tess.setColorOpaque_I(color[i]);
-			final float h = height[i], m = yMax[i], d = yDiff[i], s = ySub[i];
-			for(int k = 0, e = (int) h; k < e; ++k)
-			{
-				pos = k / h;
-				iconPos = m + d * pos - s;
-				tess.addVertexWithUV(1, pos, +depth, xMin[i], iconPos);
-				tess.addVertexWithUV(0, pos, +depth, xMax[i], iconPos);
-				tess.addVertexWithUV(0, pos, -depth, xMax[i], iconPos);
-				tess.addVertexWithUV(1, pos, -depth, xMin[i], iconPos);
-			}
-		}
-
-		tess.draw();
-		GL11.glDisable(GL12.GL_RESCALE_NORMAL);
-
-		GL11.glPopMatrix();
-	}
-
-	@Override
-	public void renderInventory(int count, IIcon[] icons, ItemStack item)
-	{
-		final Tessellator tess = Tessellator.instance;
-		GL11.glPushMatrix();
-
-		GL11.glDisable(GL11.GL_LIGHTING);
-		GL11.glEnable(GL11.GL_ALPHA_TEST);
-		GL11.glAlphaFunc(GL11.GL_GREATER, 0.5F);
-		//GL11.glDisable(GL11.GL_BLEND);
-
-		tess.startDrawingQuads();
-
-		// draw a simple rectangle for the inventory icon
-		for(int i = 0; i < count; ++i)
-		{
-			tess.setColorOpaque_I(item.getItem().getColorFromItemStack(item, i));
-
-			final IIcon icon = icons[i];
-			final float xmin = icon.getMinU();
-			final float xmax = icon.getMaxU();
-			final float ymin = icon.getMinV();
-			final float ymax = icon.getMaxV();
-			tess.addVertexWithUV(0, 16, 0, xmin, ymax);
-			tess.addVertexWithUV(16, 16, 0, xmax, ymax);
-			tess.addVertexWithUV(16, 0, 0, xmax, ymin);
-			tess.addVertexWithUV(0, 0, 0, xmin, ymin);
-		}
-		tess.draw();
-
-		//GL11.glEnable(GL11.GL_BLEND);
-		GL11.glDisable(GL11.GL_ALPHA_TEST);
-		GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
-		GL11.glEnable(GL11.GL_LIGHTING);
-		GL11.glPopMatrix();
-	}
-
-	@Override
-	public int getIcons(ItemStack item, ItemRenderType type, Entity ent, IIcon[] parts)
-	{
-		int iconParts = toolIcons;//tool.getRenderPasses(item.getItemDamage());
-		// TODO: have the tools define how many render passes they have
-		// (requires more logic rewrite than it sounds like)
-
-		final boolean isInventory = type == ItemRenderType.INVENTORY;
-		final ToolCore tool = (ToolCore) item.getItem();
-
-		final IIcon[] tempParts = new IIcon[iconParts];
-		label:
-		{
-			if(!isInventory && ent instanceof EntityPlayer)
-			{
-				final EntityPlayer player = (EntityPlayer) ent;
-				final ItemStack itemInUse = player.getItemInUse();
-				if(itemInUse != null)
-				{
-					final int useCount = player.getItemInUseCount();
-					for(int i = iconParts; i-- > 0;)
-					{
-						tempParts[i] = tool.getIcon(item, i, player, itemInUse, useCount);
-					}
-					break label;
-				}
-			}
-			for(int i = iconParts; i-- > 0;)
-			{
-				tempParts[i] = tool.getIcon(item, i);
-			}
-		}
-
-		int count = 0;
-		for(int i = 0; i < iconParts; ++i)
-		{
-			final IIcon part = tempParts[i];
-			if(part == null || part == ToolCore.blankSprite || part == ToolCore.emptyIcon)
-			{
-				++count;
-			}
-			else
-			{
-				parts[i - count] = part;
-			}
-		}
-		iconParts -= count;
-
-		if(iconParts <= 0)
-		{
-			iconParts = 1;
-			parts[0] = ToolCore.blankSprite;
-		}
-
-		return iconParts;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/renderer/TestSkinChanger.java b/src/main/java/lance5057/tDefense/core/renderer/TestSkinChanger.java
deleted file mode 100644
index 047b305..0000000
--- a/src/main/java/lance5057/tDefense/core/renderer/TestSkinChanger.java
+++ /dev/null
@@ -1,58 +0,0 @@
-//package lance5057.tDefense.core.renderer;
-//
-//import java.util.Map;
-//
-//import com.google.common.collect.Maps;
-//
-//import net.minecraft.client.Minecraft;
-//import net.minecraft.client.model.ModelHorse;
-//import net.minecraft.client.renderer.entity.RenderHorse;
-//import net.minecraft.client.renderer.texture.ITextureObject;
-//import net.minecraft.client.renderer.texture.LayeredTexture;
-//import net.minecraft.entity.Entity;
-//import net.minecraft.entity.passive.EntityHorse;
-//import net.minecraft.util.ResourceLocation;
-//
-//public class TestSkinChanger extends RenderHorse
-//{
-//	private static final Map	textures	= Maps.newHashMap();
-//    private static final String[] horseArmorTextures = new String[] {null, "textures/entity/horse/armor/horse_armor_iron.png", "textures/entity/horse/armor/horse_armor_gold.png", "textures/entity/horse/armor/horse_armor_diamond.png"};
-//    private String[] combinedHorseTextures = new String[3];
-//
-//	public TestSkinChanger()
-//	{
-//		super(new ModelHorse(), 1);
-//	}
-//
-//	@Override
-//	protected ResourceLocation getEntityTexture(Entity ent)
-//	{
-//		if(ent instanceof EntityHorse)
-//		{
-//			EntityHorse entHorse = (EntityHorse) ent;
-//
-//			String rc = "tinkersdefense:textures/skin/horse/horse_witherskeleton.png";
-//
-//			return renderHorse(entHorse, rc);
-//		}
-//		return null;
-//	}
-//
-//	private ResourceLocation renderHorse(EntityHorse ent, String rc)
-//	{
-//		String s = ent.getHorseTexture();
-//        ResourceLocation resourcelocation = (ResourceLocation)textures.get(s);
-//
-//        if (resourcelocation == null)
-//        {
-//            resourcelocation = new ResourceLocation(s);
-//            String[] str = ent.getVariantTexturePaths();
-//            str[0] = rc;
-//            str[1] = null;
-//            Minecraft.getMinecraft().getTextureManager().loadTexture(resourcelocation, new LayeredTexture(str));
-//            textures.put(s, resourcelocation);
-//        }
-//
-//        return resourcelocation;
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/core/tools/ModifierSoul.java b/src/main/java/lance5057/tDefense/core/tools/ModifierSoul.java
deleted file mode 100644
index e561c44..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/ModifierSoul.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package lance5057.tDefense.core.tools;
-
-import lance5057.tDefense.core.tools.modifiers.ModifierBoolExclusive;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-public class ModifierSoul extends ModifierBoolExclusive
-{
-	String	name;
-
-	public ModifierSoul(ItemStack[] items, int effect, String tag, String c, String tip, String[] exclusive, int modsNeeded, String[] excludeMods, String name)
-	{
-		super(items, effect, tag, c, tip, exclusive, modsNeeded, excludeMods);
-		this.name = name;
-	}
-
-	@Override
-	public void modify(ItemStack[] input, ItemStack tool)
-	{
-		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
-
-		tags.setBoolean(key, true);
-		tags.setString("Soul", name);
-
-		int modifiers = tags.getInteger("Modifiers");
-		modifiers -= modsNeeded;
-		tags.setInteger("Modifiers", modifiers);
-
-		addToolTip(tool, color + tooltipName, color + key);
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/Shears.java b/src/main/java/lance5057/tDefense/core/tools/Shears.java
deleted file mode 100644
index 9bf9e36..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/Shears.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package lance5057.tDefense.core.tools;
-
-import java.util.ArrayList;
-import java.util.Random;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.stats.StatList;
-import net.minecraft.world.World;
-import net.minecraftforge.common.IShearable;
-import tconstruct.library.tools.ToolCore;
-import tconstruct.tools.TinkerTools;
-
-public class Shears extends ToolCore
-{
-
-	public Shears()
-	{
-		super(0);
-	}
-
-	@Override
-	public String getDefaultFolder()
-	{
-		return "shears";
-	}
-
-	@Override
-	public String getEffectSuffix()
-	{
-		return "_shears_effect";
-	}
-
-	@Override
-	public int getPartAmount()
-	{
-		return 3;
-	}
-
-	@Override
-	public Item getHeadItem()
-	{
-		return TinkerTools.knifeBlade;
-	}
-
-	@Override
-	public Item getAccessoryItem()
-	{
-		return TinkerTools.knifeBlade;
-	}
-
-	@Override
-	public Item getHandleItem()
-	{
-		return TinkerTools.binding;
-	}
-
-	@Override
-	public String getIconSuffix(int partType)
-	{
-		switch(partType)
-		{
-			case 0:
-				return "_shears_top";
-			case 1:
-				return "_shears_top_broken";
-			case 2:
-				return "_shears_binding";
-			case 3:
-				return "_shears_bottom";
-			default:
-				return "";
-		}
-	}
-
-	@Override
-	public String[] getTraits()
-	{
-		return new String[] {"shears"};
-	}
-
-	@Override
-	public boolean onBlockDestroyed(ItemStack p_150894_1_, World p_150894_2_, Block p_150894_3_, int p_150894_4_, int p_150894_5_, int p_150894_6_, EntityLivingBase p_150894_7_)
-	{
-		if(p_150894_3_.getMaterial() != Material.leaves && p_150894_3_ != Blocks.web && p_150894_3_ != Blocks.tallgrass && p_150894_3_ != Blocks.vine && p_150894_3_ != Blocks.tripwire && !(p_150894_3_ instanceof IShearable))
-		{
-			return super.onBlockDestroyed(p_150894_1_, p_150894_2_, p_150894_3_, p_150894_4_, p_150894_5_, p_150894_6_, p_150894_7_);
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	@Override
-	public boolean func_150897_b(Block p_150897_1_)
-	{
-		return p_150897_1_ == Blocks.web || p_150897_1_ == Blocks.redstone_wire || p_150897_1_ == Blocks.tripwire;
-	}
-
-	@Override
-	public float func_150893_a(ItemStack p_150893_1_, Block p_150893_2_)
-	{
-		return p_150893_2_ != Blocks.web && p_150893_2_.getMaterial() != Material.leaves ? (p_150893_2_ == Blocks.wool ? 5.0F : super.func_150893_a(p_150893_1_, p_150893_2_)) : 15.0F;
-	}
-
-	/**
-	 * Returns true if the item can be used on the given entity, e.g. shears on sheep.
-	 */
-	@Override
-	public boolean itemInteractionForEntity(ItemStack itemstack, EntityPlayer player, EntityLivingBase entity)
-	{
-		if(entity.worldObj.isRemote)
-		{
-			return false;
-		}
-		if(entity instanceof IShearable)
-		{
-			final IShearable target = (IShearable) entity;
-			if(target.isShearable(itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ))
-			{
-				final int enchant = EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, itemstack);
-				final ArrayList<ItemStack> drops = target.onSheared(itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ, enchant);
-
-				if(itemstack.getTagCompound().getCompoundTag("InfiTool").hasKey("Rainbow"))
-				{
-					for(int i = 0; i < drops.size(); i++)
-					{
-						if(drops.get(i).getItem() == Blocks.wool.getItem(entity.worldObj, 0, 0, 0))
-						{
-							drops.get(i).setItemDamage(entity.worldObj.rand.nextInt(16));
-						}
-					}
-				}
-
-				final Random rand = new Random();
-				for(final ItemStack stack : drops)
-				{
-					final EntityItem ent = entity.entityDropItem(stack, 1.0F);
-					ent.motionY += rand.nextFloat() * 0.05F;
-					ent.motionX += (rand.nextFloat() - rand.nextFloat()) * 0.1F;
-					ent.motionZ += (rand.nextFloat() - rand.nextFloat()) * 0.1F;
-				}
-				itemstack.damageItem(1, entity);
-			}
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public boolean onBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player)
-	{
-		if(player.worldObj.isRemote)
-		{
-			return false;
-		}
-		final Block block = player.worldObj.getBlock(x, y, z);
-		if(block instanceof IShearable)
-		{
-			final IShearable target = (IShearable) block;
-			if(target.isShearable(itemstack, player.worldObj, x, y, z))
-			{
-				final ArrayList<ItemStack> drops = target.onSheared(itemstack, player.worldObj, x, y, z, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, itemstack));
-				final Random rand = new Random();
-
-				for(final ItemStack stack : drops)
-				{
-					final float f = 0.7F;
-					final double d = rand.nextFloat() * f + (1.0F - f) * 0.5D;
-					final double d1 = rand.nextFloat() * f + (1.0F - f) * 0.5D;
-					final double d2 = rand.nextFloat() * f + (1.0F - f) * 0.5D;
-					final EntityItem entityitem = new EntityItem(
-							player.worldObj, x + d, y + d1, z + d2, stack);
-					entityitem.delayBeforeCanPickup = 10;
-					player.worldObj.spawnEntityInWorld(entityitem);
-				}
-
-				itemstack.damageItem(1, player);
-				player.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(block)], 1);
-			}
-		}
-		return false;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/TDToolEvents.java b/src/main/java/lance5057/tDefense/core/tools/TDToolEvents.java
index 4688b3e..69f5c04 100644
--- a/src/main/java/lance5057/tDefense/core/tools/TDToolEvents.java
+++ b/src/main/java/lance5057/tDefense/core/tools/TDToolEvents.java
@@ -27,7 +27,8 @@ public class TDToolEvents {
 			EntityPlayer player = (EntityPlayer) event.getEntityLiving();
 			if (player.getActiveItemStack() != null
 					&& player.getActiveItemStack().getItem() != null
-					&& player.getActiveItemStack().getItem() instanceof Shield) {
+					&& player.getActiveItemStack().getItem() instanceof Shield
+					&& !ToolHelper.isBroken(player.getActiveItemStack())) {
 				ItemStack shield = player.getActiveItemStack();
 
 				int damage = event.getAmount() < 2f ? 1 : Math.round(event
diff --git a/src/main/java/lance5057/tDefense/core/tools/TDTools.java b/src/main/java/lance5057/tDefense/core/tools/TDTools.java
index 10e25ca..bd3c879 100644
--- a/src/main/java/lance5057/tDefense/core/tools/TDTools.java
+++ b/src/main/java/lance5057/tDefense/core/tools/TDTools.java
@@ -22,6 +22,7 @@ public class TDTools
   // Tools
 	public static ToolCore roundshield = new RoundShield();
 	public static ToolCore heatershield = new HeaterShield();
+	public static ToolCore zweihander = new Zweihander();
 	
   // Tool Parts
 
@@ -58,9 +59,11 @@ public class TDTools
 	  
 	  regTool(roundshield, "roundshield");
 	  regTool(heatershield, "heatershield");
+	  regTool(zweihander, "zweihander");
 	  
 	  TinkerRegistry.registerToolStationCrafting(roundshield);
 	  TinkerRegistry.registerToolForgeCrafting(heatershield);
+	  TinkerRegistry.registerToolForgeCrafting(zweihander);
   }
   
   private void regTool(ToolCore tool, String name)
@@ -86,6 +89,7 @@ public class TDTools
   private void regToolBuilding() {
     TinkerRegistry.registerToolCrafting(roundshield);
     TinkerRegistry.registerToolForgeCrafting(heatershield);
+    TinkerRegistry.registerToolForgeCrafting(zweihander);
   }
 
   private void regRecipies() {
diff --git a/src/main/java/lance5057/tDefense/core/tools/TinkerWrench.java b/src/main/java/lance5057/tDefense/core/tools/TinkerWrench.java
deleted file mode 100644
index 9fb8589..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/TinkerWrench.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package lance5057.tDefense.core.tools;
-
-import ic2.api.tile.IWrenchable;
-
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import tconstruct.library.tools.AbilityHelper;
-import tconstruct.library.tools.ToolCore;
-import tconstruct.tools.TinkerTools;
-import buildcraft.api.tools.IToolWrench;
-import cofh.api.block.IDismantleable;
-import cofh.api.item.IToolHammer;
-import cpw.mods.fml.common.Optional;
-
-@Optional.InterfaceList({@Optional.Interface(modid = "buildcraft", iface = "buildcraft.api.tools.IToolWrench"), @Optional.Interface(modid = "cofh", iface = "cofh.api.item.IToolHammer")})
-public class TinkerWrench extends ToolCore implements IToolWrench, IToolHammer
-{
-	int	induceDamage	= 0;
-
-	public TinkerWrench()
-	{
-		super(0);
-		setUnlocalizedName("tinkerwrench");
-	}
-
-	@Override
-	public Item getHeadItem()
-	{
-		return TinkerTools.handGuard;
-	}
-
-	@Override
-	public Item getHandleItem()
-	{
-		return TinkerTools.toolRod;
-	}
-
-	@Override
-	public Item getAccessoryItem()
-	{
-		return TinkerTools.binding;
-	}
-
-	@Override
-	public int durabilityTypeAccessory()
-	{
-		return 2;
-	}
-
-	@Override
-	public float getRepairCost()
-	{
-		return 1.0f;
-	}
-
-	@Override
-	public float getDurabilityModifier()
-	{
-		return 0.1f;
-	}
-
-	@Override
-	public float getDamageModifier()
-	{
-		return 0.4f;
-	}
-
-	@Override
-	public int getPartAmount()
-	{
-		return 3;
-	}
-
-	@Override
-	public String getIconSuffix(int partType)
-	{
-		switch(partType)
-		{
-			case 0:
-				return "_wrench_head";
-			case 1:
-				return "_wrench_head_broken";
-			case 2:
-				return "_wrench_handle";
-			case 3:
-				return "_wrench_binding";
-			default:
-				return "";
-		}
-	}
-
-	@Override
-	public String getEffectSuffix()
-	{
-		return "_wrench_effect";
-	}
-
-	@Override
-	public String getDefaultFolder()
-	{
-		return "wrench";
-	}
-
-	@Override
-	@Optional.Method(modid = "buildcraft")
-	public boolean canWrench(EntityPlayer player, int x, int y, int z)
-	{
-		final NBTTagCompound tags = player.inventory.getCurrentItem().getTagCompound().getCompoundTag("InfiTool");
-
-		if(!tags.getBoolean("Broken"))
-		{
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	@Optional.Method(modid = "buildcraft")
-	public void wrenchUsed(EntityPlayer player, int x, int y, int z)
-	{
-
-		player.swingItem();
-		AbilityHelper.damageTool(player.inventory.getCurrentItem(), 1, player, false);
-
-	}
-
-	@Override
-	@Optional.Method(modid = "cofh")
-	public boolean isUsable(ItemStack item, EntityLivingBase user, int x, int y, int z)
-	{
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	@Override
-	@Optional.Method(modid = "cofh")
-	public void toolUsed(ItemStack item, EntityLivingBase user, int x, int y, int z)
-	{
-		// TODO Auto-generated method stub
-
-	}
-
-	//	//Skin Changer
-	//	@Override
-	//	public boolean itemInteractionForEntity(ItemStack itemstack, EntityPlayer player, EntityLivingBase entity)
-	//	{
-	//		if(entity.worldObj.isRemote)
-	//		{
-	//			return false;
-	//		}
-	//		if(entity instanceof EntityAnimal)
-	//		{
-	//			EntityAnimal target = (EntityAnimal) entity;
-	//			player.openGui(TinkersDefense.instance, TinkersDefense.GUI_ANVIL_INV, player.worldObj, (int)player.posX, (int)player.posY, (int)player.posZ);
-	//			return true;
-	//		}
-	//		return false;
-	//	}
-
-	@Override
-	public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
-	{
-		final Block block = world.getBlock(x, y, z);
-		final TileEntity te = world.getTileEntity(x, y, z);
-		final int metaData = world.getBlockMetadata(x, y, z);
-
-		if(te != null && te instanceof IWrenchable)
-		{
-			final IWrenchable wte = (IWrenchable) te;
-
-			if(!player.isSneaking())
-			{
-				//				for(int step = 1; step < 6; step++)
-				//				{
-				//side = (wte.getFacing() + 6 - step) % 6;
-				if(!world.isRemote)
-				{
-					//side = side % -3;//(wte.getFacing() + step) % 6;
-					//
-					if(wte.wrenchCanSetFacing(player, side))
-					{
-						wte.setFacing((short) side);
-						return true;
-					}
-				}
-				//				}
-			}
-			else
-			{
-				if(!world.isRemote)
-				{
-					final List<ItemStack> drops = block.getDrops(world, x, y, z, metaData, 0);
-					if(world.rand.nextFloat() <= wte.getWrenchDropRate())
-					{
-						final ItemStack drop = wte.getWrenchDrop(player);
-						if(drop != null)
-						{
-							if(drops.isEmpty())
-							{
-								drops.add(drop);
-							}
-							else
-							{
-								drops.set(0, drop);
-							}
-						}
-					}
-					for(final ItemStack itemStack : drops)
-					{
-						final EntityItem ei = new EntityItem(world, x, y, z,
-								itemStack.copy());
-						world.spawnEntityInWorld(ei);
-					}
-					world.removeTileEntity(x, y, z);
-					world.setBlockToAir(x, y, z);
-					return true;
-				}
-			}
-			return false;
-		}
-		if(world.blockExists(x, y, z))
-		{
-			if(block != null)
-			{
-				if(player.isSneaking() && block instanceof IDismantleable && ((IDismantleable) block).canDismantle(player, world, x, y, z))
-				{
-					if(!world.isRemote)
-					{
-						((IDismantleable) block).dismantleBlock(player, world, x, y, z, false);
-						player.swingItem();
-						return true;
-					}
-				}
-
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public String[] getTraits()
-	{
-		return new String[] {"wrench"};
-	}
-
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/TinkerZweihander.java b/src/main/java/lance5057/tDefense/core/tools/TinkerZweihander.java
deleted file mode 100644
index b7f68bc..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/TinkerZweihander.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package lance5057.tDefense.core.tools;
-
-import java.util.List;
-
-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.potion.Potion;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.world.World;
-import tconstruct.library.tools.AbilityHelper;
-import tconstruct.library.tools.Weapon;
-import tconstruct.tools.TinkerTools;
-import cpw.mods.fml.common.Optional;
-
-@Optional.InterfaceList({@Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon"),})
-public class TinkerZweihander extends Weapon
-{
-
-	public TinkerZweihander(int baseDamage)
-	{
-		super(3);
-		setUnlocalizedName("zweihander");
-	}
-
-	@Override
-	public Item getHeadItem()
-	{
-		return TinkerTools.largeSwordBlade;
-	}
-
-	@Override
-	public Item getHandleItem()
-	{
-		return TinkerTools.toughRod;
-	}
-
-	@Override
-	public Item getAccessoryItem()
-	{
-		return TinkerTools.wideGuard;
-	}
-
-	@Override
-	public Item getExtraItem()
-	{
-		return TinkerTools.swordBlade;
-	}
-
-	@Override
-	public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity)
-	{
-		if(AbilityHelper.onLeftClickEntity(stack, player, entity, this))
-		{
-			if(entity.riddenByEntity != null || entity.ridingEntity != null)
-			{
-				player.attackTargetEntityWithCurrentItem(entity);
-			}
-		}
-		return true;
-	}
-
-	@Override
-	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
-	{
-		if(!player.isPotionActive(Potion.moveSlowdown))
-		{
-			final List entities = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, AxisAlignedBB.getBoundingBox(player.posX - 2, player.posY - 2, player.posZ - 2, player.posX + 2, player.posY + 2, player.posZ + 2));
-
-			for(int i = 0; i < entities.size(); i++)
-			{
-				if(((Entity) entities.get(i)) instanceof EntityLivingBase)
-				{
-					player.attackTargetEntityWithCurrentItem((Entity) entities.get(i));
-					player.worldObj.spawnParticle("largeexplode", ((Entity) entities.get(i)).posX, ((Entity) entities.get(i)).posY + (((Entity) entities.get(i)).height / 2), ((Entity) entities.get(i)).posZ, 0, 0, 0);
-					player.worldObj.playSoundAtEntity((Entity) entities.get(i), "mob.zombie.metal", 15f, 1f);
-				}
-			}
-			player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 20,
-					3));
-			player.addPotionEffect(new PotionEffect(Potion.weakness.id, 200, 1));
-		}
-
-		return stack;
-	}
-
-	@Override
-	public float getRepairCost()
-	{
-		return 4.0f;
-	}
-
-	@Override
-	public float getDurabilityModifier()
-	{
-		return 2.5f;
-	}
-
-	@Override
-	public int getPartAmount()
-	{
-		return 4;
-	}
-
-	@Override
-	public String getIconSuffix(int partType)
-	{
-		switch(partType)
-		{
-			case 0:
-				return "_zweihander_blade";
-			case 1:
-				return "_zweihander_blade_broken";
-			case 2:
-				return "_zweihander_handle";
-			case 3:
-				return "_zweihander_guard";
-			case 4:
-				return "_zweihander_core";
-			default:
-				return "";
-		}
-	}
-
-	@Override
-	public String getEffectSuffix()
-	{
-		return "_zweihander_effect";
-	}
-
-	@Override
-	public String getDefaultFolder()
-	{
-		return "zweihander";
-	}
-
-	//	@Override
-	//	@SideOnly(Side.CLIENT)
-	//	public void onUpdate(ItemStack stack, World world, Entity entity, int par4,
-	//			boolean par5) {
-	//		super.onUpdate(stack, world, entity, par4, par5);
-	//		if (entity instanceof EntityPlayerSP) {
-	//			EntityPlayerSP player = (EntityPlayerSP) entity;
-	//			ItemStack usingItem = player.inventory.getCurrentItem();
-	//			if (usingItem != null && usingItem.getItem() == this) {
-	//				player.addPotionEffect(new PotionEffect(Potion.resistance.getId(),2,1));
-	//				
-	//			}
-	//		}
-	//	}
-
-	@Override
-	@Optional.Method(modid = "battlegear2")
-	public boolean allowOffhand(ItemStack mainhand, ItemStack offhand)
-	{
-		if(offhand == null)
-			return true;
-		else
-			return false;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/TinkersHookshot.java b/src/main/java/lance5057/tDefense/core/tools/TinkersHookshot.java
deleted file mode 100644
index 061aa51..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/TinkersHookshot.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package lance5057.tDefense.core.tools;
-
-import java.util.List;
-
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.core.entity.EntityHookshotHook;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import tconstruct.library.crafting.ToolBuilder;
-import tconstruct.library.tools.ToolCore;
-import tconstruct.tools.TinkerTools;
-
-public class TinkersHookshot extends ToolCore
-{
-
-	public TinkersHookshot()
-	{
-		super(0);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public String getDefaultFolder()
-	{
-		return "hookshot";
-	}
-
-	@Override
-	public String getEffectSuffix()
-	{
-		return "_hookshot_effect";
-	}
-
-	@Override
-	public int getPartAmount()
-	{
-		return 3;
-	}
-
-	@Override
-	public Item getHeadItem()
-	{
-		return TinkersDefense.partArmorplate;
-	}
-
-	@Override
-	public Item getAccessoryItem()
-	{
-		return TinkersDefense.partChainmaille;
-	}
-
-	@Override
-	public Item getHandleItem()
-	{
-		return TinkerTools.toughRod;
-	}
-
-	@Override
-	public String getIconSuffix(int partType)
-	{
-		switch(partType)
-		{
-			case 0:
-				return "_hookshot_chamber";
-			case 1:
-				return "_hookshot_chamber_broken";
-			case 2:
-				return "_hookshot_handle";
-			case 3:
-				return "_hookshot_chain";
-			default:
-				return "";
-		}
-	}
-
-	@Override
-	public String[] getTraits()
-	{
-		return new String[] {"hookshot"};
-	}
-
-	@Override
-	public void buildTool(int id, String name, List list)
-	{
-		final Item accessory = getAccessoryItem();
-		final ItemStack accessoryStack = accessory != null ? new ItemStack(
-				getAccessoryItem(), 1, id) : null;
-				final Item extra = getExtraItem();
-				final ItemStack extraStack = extra != null ? new ItemStack(extra, 1, id) : null;
-				final ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(
-						getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name);
-				if(tool != null)
-				{
-					tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);
-					tool.getTagCompound().getCompoundTag("InfiTool").setInteger("ChainLength", 10);
-					list.add(tool);
-				}
-	}
-
-	@Override
-	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
-	{
-		world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
-
-		player.setItemInUse(stack, getMaxItemUseDuration(stack));
-		final EntityHookshotHook hook = new EntityHookshotHook(player.worldObj,
-				player);
-		hook.setPlayer(player);
-		hook.setHook("test");
-		hook.setHookshot(stack);
-		if(!player.worldObj.isRemote)
-		{
-			player.worldObj.spawnEntityInWorld(hook);
-		}
-		return stack;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/Zweihander.java b/src/main/java/lance5057/tDefense/core/tools/Zweihander.java
new file mode 100644
index 0000000..9446bac
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/tools/Zweihander.java
@@ -0,0 +1,90 @@
+package lance5057.tDefense.core.tools;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.MobEffects;
+import net.minecraft.init.SoundEvents;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.MathHelper;
+
+import java.util.List;
+
+import slimeknights.tconstruct.library.materials.Material;
+import slimeknights.tconstruct.library.tinkering.Category;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.tools.SwordCore;
+import slimeknights.tconstruct.library.tools.ToolNBT;
+import slimeknights.tconstruct.library.utils.ToolHelper;
+import slimeknights.tconstruct.tools.TinkerTools;
+
+public class Zweihander extends SwordCore {
+
+  public static final float DURABILITY_MODIFIER = 1.1f;
+
+  public Zweihander() {
+    super(PartMaterialType.head(TinkerTools.largeSwordBlade),
+         PartMaterialType.head(TinkerTools.swordBlade),
+         PartMaterialType.handle(TinkerTools.toughToolRod),
+         PartMaterialType.extra(TinkerTools.toughBinding));
+
+    addCategory(Category.WEAPON);
+  }
+
+  @Override
+  public float damagePotential() {
+    return 1.0f;
+  }
+
+  @Override
+  public double attackSpeed() {
+    return 1.0d;
+  }
+
+//  // sword sweep attack
+//  @Override
+//  public boolean dealDamage(ItemStack stack, EntityLivingBase player, Entity entity, float damage) {
+//    // deal damage first
+//    boolean hit = super.dealDamage(stack, player, entity, damage);
+//    // and then sweep
+//    if(hit && !ToolHelper.isBroken(stack)) {
+//      // sweep code from EntityPlayer#attackTargetEntityWithCurrentItem()
+//      // basically: no crit, no sprinting and has to stand on the ground for sweep. Also has to move regularly slowly
+//      double d0 = (double) (player.field_70140_Q - player.field_70141_P);
+//      boolean flag = true;
+//      if(player instanceof EntityPlayer) {
+//        flag = ((EntityPlayer) player).func_184825_o(0.5F) > 0.9f;
+//      }
+//      boolean flag2 = player.field_70143_R > 0.0F && !player.field_70122_E && !player.func_70617_f_() && !player.func_70090_H() && !player.func_70644_a(MobEffects.field_76440_q) && !player.func_184218_aH();
+//      if(flag && !player.func_70051_ag() && !flag2 && player.field_70122_E && d0 < (double) player.func_70689_ay()) {
+//        for(EntityLivingBase entitylivingbase : player.func_130014_f_().func_72872_a(EntityLivingBase.class, entity.func_174813_aQ().func_72314_b(1.0D, 0.25D, 1.0D))) {
+//          if(entitylivingbase != player && entitylivingbase != entity && !player.func_184191_r(entitylivingbase) && player.func_70068_e(entitylivingbase) < 9.0D) {
+//            entitylivingbase.func_70653_a(player, 0.4F, (double) MathHelper.func_76126_a(player.field_70177_z * 0.017453292F), (double) (-MathHelper.func_76134_b(player.field_70177_z * 0.017453292F)));
+//            super.dealDamage(stack, player, entitylivingbase, 1f);
+//          }
+//        }
+//
+//        player.func_130014_f_().func_184148_a(null, player.field_70165_t, player.field_70163_u, player.field_70161_v, SoundEvents.field_187730_dW, player.func_184176_by(), 1.0F, 1.0F);
+//        if(player instanceof EntityPlayer) {
+//          ((EntityPlayer) player).func_184810_cG();
+//        }
+//      }
+//    }
+//
+//    return hit;
+//  }
+
+  @Override
+  public float getRepairModifierForPart(int index) {
+    return DURABILITY_MODIFIER;
+  }
+
+  @Override
+  public ToolNBT buildTagData(List<Material> materials) {
+    ToolNBT data = buildDefaultTag(materials);
+    // 2 base damage, like vanilla swords
+    data.attack += 1f;
+    data.durability *= DURABILITY_MODIFIER;
+    return data;
+  }
+}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/ActiveToolMods/TDefenseActiveToolMod.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/ActiveToolMods/TDefenseActiveToolMod.java
deleted file mode 100644
index 52663ce..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/ActiveToolMods/TDefenseActiveToolMod.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package lance5057.tDefense.core.tools.modifiers.ActiveToolMods;
-
-import lance5057.tDefense.core.tools.modifiers.Modifiers;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-import tconstruct.library.ActiveToolMod;
-import tconstruct.library.tools.ToolCore;
-
-public class TDefenseActiveToolMod extends ActiveToolMod
-{
-	Modifiers	mods	= new Modifiers();
-
-	// BotaniaToolMods FlowerMods = new BotaniaToolMods();
-
-	@Override
-	public void updateTool(ToolCore tool, ItemStack stack, World world, Entity entity)
-	{
-		if(stack.hasTagCompound() && stack.getTagCompound().hasKey("InfiTool"))
-		{
-			final NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
-
-			if(!tags.getBoolean("Broken"))
-			{
-				// TDefense
-				mods.UpdateAll(tool, stack, world, entity, tags);
-			}
-		}
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/BloodMagic/BloodMagicMods.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/BloodMagic/BloodMagicMods.java
deleted file mode 100644
index 25bc332..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/BloodMagic/BloodMagicMods.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package lance5057.tDefense.core.tools.modifiers.BloodMagic;
-
-import lance5057.tDefense.TDIntegration;
-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.entity.player.EntityPlayer;
-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.LivingAttackEvent;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.client.TConstructClientRegistry;
-import tconstruct.library.crafting.ModifyBuilder;
-import tconstruct.library.tools.ToolCore;
-import WayofTime.alchemicalWizardry.ModItems;
-import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
-import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe;
-import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
-import WayofTime.alchemicalWizardry.common.items.EnergyItems;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-public class BloodMagicMods extends ModifiersBase
-{
-
-	public BloodMagicMods()
-	{
-		super(new String[] {"bindingwrap", "bloodybandages"}, "modItemsBloodMagic");
-	}
-
-	@Override
-	public void RegisterRecipes()
-	{
-		GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(modItems,
-				1, 0), new Object[] {"sts", "cbc", "sos", 's', new ItemStack(
-						ModItems.weakBloodShard, 1, 0), 't', new ItemStack(
-								TinkersDefense.partChainmaille, 1, 2), 'c', new ItemStack(
-										ModItems.standardBindingAgent, 1, 0), 'b', new ItemStack(
-												ModItems.energySword, 1, 0), 'o', new ItemStack(
-														ModItems.magicianBloodOrb, 1, 0)}));
-
-		AltarRecipeRegistry.registerAltarRecipe(new ItemStack(modItems, 1, 1), new ItemStack(
-				TinkersDefense.partCloth, 1, -1), 2, 12000, 10, 10, false);
-
-	}
-
-	@Override
-	public void RegisterModifiers()
-	{
-		// TODO Auto-generated method stub
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 0)},
-				TinkersDefense.config.BloodOathModID, "BloodOath",
-				EnumChatFormatting.RED.toString(), "Blood Oath",
-				new String[] {"weapon"}, 1, null));
-
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 1)},
-				TinkersDefense.config.ScabbingModID, "Scabbing",
-				EnumChatFormatting.DARK_RED.toString(), "Scabbing",
-				new String[] {}, 1, new String[] {"Supping"}));
-
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {new ItemStack(ModItems.apprenticeBloodOrb, 1), new ItemStack(
-						ModItems.sacrificialDagger, 1)},
-						TinkersDefense.config.SuppingModID, "Supping",
-						EnumChatFormatting.DARK_RED.toString(), "Supping",
-						new String[] {"weapon"}, 1, new String[] {"Scabbing"}));
-
-		for(final ToolCore tool : TConstructRegistry.getToolMapping())
-		{
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.BloodOathModID, "tinker", "bloodoath", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ScabbingModID, "tinker", "scabbing", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.SuppingModID, "tinker", "supping", true);
-		}
-	}
-
-	@Override
-	public void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-		if(!world.isRemote)
-		{
-			if(tags.hasKey("Scabbing"))
-			{
-				SoulNetworkHandler.checkAndSetItemOwner(stack, (EntityPlayer) entity);
-				UpdateScabbing(tool, stack, world, entity, tags);
-			}
-		}
-	}
-
-	public void UpdateScabbing(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-		if(tags.getInteger("Damage") > 0 && EnergyItems.syphonBatteries(stack, (EntityPlayer) entity, 50))
-		{
-			tags.setInteger("Damage", tags.getInteger("Damage") - 1);
-		}
-	}
-
-	@SubscribeEvent
-	public void BloodOathInteractEvent(LivingAttackEvent event)
-	{
-		if(TDIntegration.bloodMagic && !event.entity.worldObj.isRemote)
-		{
-			if(event.source.getEntity() instanceof EntityPlayer)
-			{
-				final EntityPlayer player = (EntityPlayer) event.source.getEntity();
-				final ItemStack heldItem = player.getHeldItem();
-
-				if(heldItem != null && heldItem.getItem() != null && heldItem.getItem() instanceof ToolCore)
-				{
-					SoulNetworkHandler.checkAndSetItemOwner(heldItem, player);
-					final NBTTagCompound tags = heldItem.getTagCompound().getCompoundTag("InfiTool");
-
-					if(tags.hasKey("BloodOath") && EnergyItems.syphonBatteries(heldItem, player, 50))
-					{
-						event.entityLiving.addPotionEffect(new PotionEffect(
-								Potion.weakness.id, 30, 2));
-					}
-
-					if(tags.hasKey("Supping"))
-					{
-						SoulNetworkHandler.addCurrentEssenceToMaximum(SoulNetworkHandler.getOwnerName(heldItem), 10, SoulNetworkHandler.getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(SoulNetworkHandler.getOwnerName(heldItem))));
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/Botania/BotaniaMods.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/Botania/BotaniaMods.java
deleted file mode 100644
index c0f1bfc..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/Botania/BotaniaMods.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package lance5057.tDefense.core.tools.modifiers.Botania;
-
-import lance5057.tDefense.TDIntegration;
-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.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
-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.LivingAttackEvent;
-import net.minecraftforge.oredict.ShapedOreRecipe;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.client.TConstructClientRegistry;
-import tconstruct.library.crafting.ModifyBuilder;
-import tconstruct.library.tools.AbilityHelper;
-import tconstruct.library.tools.ToolCore;
-import tconstruct.tools.TinkerTools;
-import vazkii.botania.api.BotaniaAPI;
-import vazkii.botania.api.mana.ManaItemHandler;
-import vazkii.botania.common.entity.EntityManaBurst;
-import vazkii.botania.common.item.ModItems;
-import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
-import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraSword;
-import vazkii.botania.common.lib.LibBlockNames;
-import vazkii.botania.common.lib.LibOreDict;
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-@Optional.InterfaceList({@Optional.Interface(modid = "botania", iface = "vazkii.botania.common.entity.EntityManaBurst"), @Optional.Interface(modid = "botania", iface = "vazkii.botania.common.item.ModItems"), @Optional.Interface(modid = "botania", iface = "vazkii.botania.common.item.equipment.tool.ToolCommons"), @Optional.Interface(modid = "botania", iface = "vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraSword"),})
-public class BotaniaMods extends ModifiersBase
-{
-	public BotaniaMods()
-	{
-		super(new String[] {"corpseIvyGraft", "corpseIvy", "terraCore", "manaCore"}, "modItemsBotania");
-	}
-
-	@Override
-	public void RegisterRecipes()
-	{
-		CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(
-				new ItemStack(modItems, 1, 0),
-				new Object[] {"fsf", "oio", "fgf", 'f', ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN), 'i', new ItemStack(
-						ModItems.keepIvy, 1, 0), 's', LibOreDict.MANA_STRING, 'g', new ItemStack(
-						TinkerTools.craftedSoil, 1, 3), 'o', new ItemStack(
-						ModItems.fertilizer, 1, 1)}));
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 2), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
-				ModItems.manaResource, 1, 4), 's', new ItemStack(
-				ModItems.manaResource, 1, 12), 'd', new ItemStack(
-				ModItems.manaResource, 1, 2)});
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 2), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
-				ModItems.manaResource, 1, 4), 's', new ItemStack(
-				ModItems.manaResource, 1, 12), 'd', new ItemStack(
-				ModItems.manaResource, 1, 1)});
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 3), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
-				ModItems.manaResource, 1, 0), 's', new ItemStack(
-				ModItems.manaResource, 1, 12), 'd', new ItemStack(
-				ModItems.manaTablet)});
-
-		BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(modItems, 1, 1), new ItemStack(
-				modItems, 1, 0), 100000);
-
-	}
-
-	@Override
-	public void RegisterModifiers()
-	{
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 1)},
-				TinkersDefense.config.CorpseIvyModID, "CorpseIvy",
-				EnumChatFormatting.DARK_GREEN.toString(), "Corpse Ivy",
-				new String[] {"weapon"}, 1, new String[] {"ManaCore"}));
-
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 2)},
-				TinkersDefense.config.TerraCoreModID, "TerraCore",
-				EnumChatFormatting.GREEN.toString(), "TerraCore",
-				new String[] {"weapon"}, 1, null));
-
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 3)},
-				TinkersDefense.config.ManaRepairModID, "ManaCore",
-				EnumChatFormatting.AQUA.toString(), "ManaCore",
-				new String[] {}, 1, new String[] {"CorpseIvy"}));
-
-		for(final ToolCore tool : TConstructRegistry.getToolMapping())
-		{
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CorpseIvyModID, "tinker", "corpseivy", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.TerraCoreModID, "tinker", "terracore", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ManaRepairModID, "tinker", "manacore", true);
-
-		}
-	}
-
-	@Override
-	public void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-		if(!world.isRemote)
-		{
-			if(tags.hasKey("TerraCore"))
-			{
-				UpdateTerraCore(tool, stack, world, entity, tags);
-			}
-			//			if(tags.hasKey("CorpseIvy"))
-			//			{
-			//				UpdateCorpseIvy(tool, stack, world, entity, tags);
-			//			}
-			if(tags.hasKey("ManaCore"))
-			{
-				UpdateManaRepair(tool, stack, world, entity, tags);
-			}
-		}
-	}
-
-	public void UpdateTerraCore(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-		if(entity instanceof EntityPlayer)
-		{
-			final EntityPlayer player = (EntityPlayer) entity;
-			final PotionEffect haste = player.getActivePotionEffect(Potion.digSpeed);
-			final float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F;
-
-			if(player.getCurrentEquippedItem() == stack && player.swingProgress == check && !world.isRemote && world.rand.nextInt(2) == 0)
-			{
-				final int color = TConstructRegistry.getMaterial(tags.getInteger("Head")).primaryColor();
-				final EntityManaBurst burst = ((ItemTerraSword) ModItems.terraSword).getBurst(player, new ItemStack(
-						ModItems.terraSword));
-				burst.setColor(color);
-				world.spawnEntityInWorld(burst);
-				//ToolCommonSoundAtEntity(player, "botania:terraBlade", 0.4F, 1.4F);
-				AbilityHelper.damageTool(stack, 1, player, false);
-			}
-		}
-	}
-
-	//	public void UpdateCorpseIvy(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	//	{
-	//		if(entity instanceof EntityPlayer)
-	//		{
-	//			final int mana = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("CorpseIvyMana");
-	//			final int returned = ManaItemHandler.dispatchMana(stack, (EntityPlayer) entity, mana, true);
-	//			stack.getTagCompound().getCompoundTag("InfiTool").setInteger("CorpseIvyMana", mana - returned);
-	//		}
-	//	}
-
-	@SubscribeEvent
-	public void BotaniaAttackEvent(LivingAttackEvent event)
-	{
-		if(TDIntegration.botania)
-		{
-			if(event.source.getEntity() instanceof EntityPlayer)
-			{
-				final EntityPlayer player = (EntityPlayer) event.source.getEntity();
-				final ItemStack heldItem = player.getHeldItem();
-
-				if(heldItem != null && heldItem.getItem() != null && heldItem.getItem() instanceof ToolCore)
-				{
-					final NBTTagCompound tags = heldItem.getTagCompound().getCompoundTag("InfiTool");
-
-					if(tags.hasKey("CorpseIvy"))
-					{
-						ManaItemHandler.dispatchMana(heldItem, player, 100, true);
-					}
-				}
-			}
-		}
-	}
-
-	public void UpdateManaRepair(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-		if(entity instanceof EntityPlayer)
-		{
-			if(tags.getInteger("Damage") > 0)
-			{
-
-				if(ManaItemHandler.requestManaExact(stack, (EntityPlayer) entity, 100, true))
-				{
-					tags.setInteger("Damage", tags.getInteger("Damage") - 1);
-				}
-
-			}
-		}
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierBoolExclusive.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierBoolExclusive.java
deleted file mode 100644
index 62a63ce..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierBoolExclusive.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package lance5057.tDefense.core.tools.modifiers;
-
-import java.util.Arrays;
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import tconstruct.library.tools.ToolCore;
-import tconstruct.modifiers.tools.ModBoolean;
-
-public class ModifierBoolExclusive extends ModBoolean
-{
-	String[]			exclusive;
-	protected int		modsNeeded	= 0;
-	protected String	color;
-	protected String	tooltipName;
-	String[]			modExclusions;
-
-	/*
-	 * excludeMods: If these modifier keys are present this modifier wont take.
-	 */
-	public ModifierBoolExclusive(ItemStack[] items, int effect, String tag, String c, String tip, String[] exclusive, int modsNeeded, String[] excludeMods)
-	{
-		super(items, effect, tag, c, tip);
-		this.exclusive = exclusive;
-		this.modsNeeded = modsNeeded;
-		color = c;
-		tooltipName = tip;
-		modExclusions = excludeMods;
-	}
-
-	@Override
-	protected boolean canModify(ItemStack tool, ItemStack[] input)
-	{
-		final List list = Arrays.asList(((ToolCore) tool.getItem()).getTraits());
-		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
-
-		boolean isExclusive = false;
-		boolean hasModRejection = false;
-
-		if(exclusive.length > 0)
-		{
-			for(final String element : exclusive)
-			{
-				if(list.contains(element))
-				{
-					isExclusive = true;
-				}
-			}
-		}
-		else
-		{
-			isExclusive = true;
-		}
-
-		if(modExclusions != null)
-		{
-			for(final String modExclusion : modExclusions)
-			{
-				if(tags.hasKey(modExclusion))
-				{
-					hasModRejection = true;
-				}
-			}
-		}
-
-		return isExclusive && !hasModRejection && !tags.hasKey(key);
-	}
-
-	@Override
-	public void modify(ItemStack[] input, ItemStack tool)
-	{
-		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
-
-		tags.setBoolean(key, true);
-
-		int modifiers = tags.getInteger("Modifiers");
-		modifiers -= modsNeeded;
-		tags.setInteger("Modifiers", modifiers);
-
-		addToolTip(tool, color + tooltipName, color + key);
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierIntExclusive.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierIntExclusive.java
deleted file mode 100644
index 4b9b9a3..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierIntExclusive.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package lance5057.tDefense.core.tools.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 ModifierIntExclusive extends ModInteger
-{
-	String[]	exclusive;
-	int			modsNeeded	= 0;
-	String		color;
-	String		tooltipName;
-	int			initialIncrease;
-	int			secondaryIncrease;
-	int			max			= 5;
-	String[]	modExclusions;
-
-	public ModifierIntExclusive(ItemStack[] items, int effect, String dataKey, int increase, String c, String tip, String[] exclusive, int modsNeeded, String[] excludeMods)
-	{
-		super(items, effect, dataKey, increase, c, tip);
-		this.exclusive = exclusive;
-		this.modsNeeded = modsNeeded;
-		initialIncrease = secondaryIncrease = increase;
-		color = c;
-		tooltipName = tip;
-		modExclusions = excludeMods;
-	}
-
-	public ModifierIntExclusive(ItemStack[] items, int effect, String dataKey, int increase, String c, String tip, String[] exclusive, int modsNeeded, int max)
-	{
-		super(items, effect, dataKey, increase, c, tip);
-		this.exclusive = exclusive;
-		this.modsNeeded = modsNeeded;
-		initialIncrease = secondaryIncrease = increase;
-		color = c;
-		tooltipName = tip;
-		this.max = max;
-	}
-
-	@Override
-	protected boolean canModify(ItemStack tool, ItemStack[] input)
-	{
-		final List list = Arrays.asList(((ToolCore) tool.getItem()).getTraits());
-		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
-
-		for(final String element : exclusive)
-		{
-			if(list.contains(element))
-			{
-			}
-		}
-
-		if(modExclusions != null)
-		{
-			for(final String modExclusion : modExclusions)
-			{
-				if(tags.hasKey(modExclusion))
-				{
-				}
-			}
-		}
-
-		return tags.getInteger(tooltipName) < max;
-	}
-
-	@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 -= modsNeeded;
-		tags.setInteger("Modifiers", modifiers);
-
-		addToolTip(tool, color + tooltipName, color + key);
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierSoulHandler.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierSoulHandler.java
deleted file mode 100644
index eda54f1..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierSoulHandler.java
+++ /dev/null
@@ -1,393 +0,0 @@
-package lance5057.tDefense.core.tools.modifiers;
-
-import java.util.List;
-
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.ArmorCore;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.WorldClient;
-import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.EntityFlying;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.monster.EntitySlime;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.StatCollector;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.living.LivingHurtEvent;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.event.ModifyEvent;
-import tconstruct.library.tools.ToolCore;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-
-public class ModifierSoulHandler
-{
-	String	name;
-	int		time			= 160;
-	boolean	broken			= false;
-	boolean	newlymade		= false;
-	boolean	newlymodified	= false;
-	boolean	onFire			= false;
-	boolean	playerharmed	= false;
-	boolean	playerattacked	= false;
-	float	dmg				= 0;
-	//boolean	playerdead		= false;
-	boolean	storymode		= false;
-	int		story			= 0;
-	int		storyline		= 0;
-	int		numofstories	= 0;
-
-	public ModifierSoulHandler(int stories, String name)
-	{
-		MinecraftForge.EVENT_BUS.register(this);
-		numofstories = stories;
-		this.name = name;
-	}
-
-	public void Update(ItemStack tool)
-	{
-		final WorldClient world = Minecraft.getMinecraft().theWorld;
-		final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
-
-		String output = "";
-
-		if(time <= 0)
-		{
-			if(!tags.getBoolean("Broken"))
-			{
-				//player.addChatMessage(new ChatComponentText("Test"));
-				final List entities = world.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox(player.posX - 20, player.posY - 20, player.posZ - 20, player.posX + 20, player.posY + 20, player.posZ + 20));
-				int choice = world.rand.nextInt(3);
-				final float dmg = tags.getInteger("Damage");
-				final float dur = tags.getInteger("TotalDurability");
-				//				if(playerdead)
-				//				{
-				//					output += "§4(Player Death)§f ";
-				//					output += talk(output, world, (ToolCore) tool.getItem(), "death");
-				//					playerdead = false;
-				//				}
-
-				if(playerattacked)
-				{
-					output += "§7(Attacking)§f ";
-					output += talk(output, world, (ToolCore) tool.getItem(), "offense");
-					playerattacked = false;
-				}
-
-				else if(playerharmed)
-				{
-					output += "§4(Player Hurt)§f ";
-					output += talk(output, world, (ToolCore) tool.getItem(), "defense");
-					playerattacked = false;
-				}
-
-				else if(newlymade)
-				{
-					output += "§7(Greetings)§f ";
-					output += talk(output, world, (ToolCore) tool.getItem(), "creation");
-					newlymade = false;
-				}
-
-				else if(newlymodified)
-				{
-					output += "§7(Modified)§f ";
-					output += talk(output, world, (ToolCore) tool.getItem(), "modified");
-					newlymodified = false;
-				}
-
-				else if(onFire)
-				{
-					output += "§4(Player on Fire)§f ";
-					output += talk(output, world, (ToolCore) tool.getItem(), "onfire");
-				}
-
-				else if(player.getHealth() <= 6)
-				{
-					output += "§4(Player Low Health)§f ";
-					output += talk(output, world, (ToolCore) tool.getItem(), "lowhp");
-				}
-
-				else if(player.getFoodStats().getFoodLevel() <= 6)
-				{
-					output += "§4(Player Hungry)§f ";
-					output += talk(output, world, (ToolCore) tool.getItem(), "lowhunger");
-				}
-
-				else if((dur - dmg) / dur <= 0.1f)
-				{
-					output += "§4(Nearly Broken)§f ";
-					output += talk(output, world, (ToolCore) tool.getItem(), "lowdurability");
-				}
-
-				else if(broken)
-				{
-					output += "§7(Repaired)§f ";
-					output += talk(output, world, (ToolCore) tool.getItem(), "repaired");
-				}
-
-				//react entity
-				else if(choice == 0)
-				{
-					if(entities.size() > 0)
-					{
-						final EntityLiving ent = (EntityLiving) entities.get(world.rand.nextInt(entities.size()));
-
-						if(ent instanceof EntityCreature || ent instanceof EntityFlying || ent instanceof EntitySlime)
-						{
-							final boolean doGeneral = world.rand.nextBoolean();
-							final boolean doInsult = world.rand.nextBoolean();
-							if(!doInsult)
-							{
-								if(!doGeneral)
-								{
-									output += "§7(" + ent.getClass().getName().substring(ent.getClass().getName().lastIndexOf("Entity") + 6).toLowerCase() + " Nearby)§f ";
-									output += talk(output, world, (ToolCore) tool.getItem(), ent.getClass().getName().substring(ent.getClass().getName().lastIndexOf("Entity") + 6).toLowerCase() + "near");
-								}
-								else
-								{
-									output += "§7(Creature Nearby)§f ";
-									output += talk(output, world, (ToolCore) tool.getItem(), "creaturenear");
-								}
-							}
-							else
-							{
-								if(!doGeneral)
-								{
-									output += "§7(insult" + ent.getClass().getName().substring(ent.getClass().getName().lastIndexOf("Entity") + 6).toLowerCase() + ")§f ";
-									output += talk(output, world, (ToolCore) tool.getItem(), "insult" + ent.getClass().getName().substring(ent.getClass().getName().lastIndexOf("Entity") + 6).toLowerCase());
-								}
-								else
-								{
-									output += "§7(Generic Insult)§f ";
-									output += talk(output, world, (ToolCore) tool.getItem(), "insultother");
-								}
-							}
-						}
-
-						if(output.contains("~other~"))
-						{
-							output = output.replace("~other~", ent.getClass().getName().substring(ent.getClass().getName().lastIndexOf("Entity") + 6));
-						}
-					}
-				}
-				//Story
-				else if(choice == 1)
-				{
-					story = world.rand.nextInt(numofstories);
-					output += story(output, world);
-					storymode = true;
-				}
-				//General Chat
-				else
-				{
-					choice = world.rand.nextInt(4);
-					if(choice == 0)
-					{
-						if(tool.getItem() instanceof ArmorCore)
-						{
-							output += talk(output, world, (ToolCore) tool.getItem(), "armor");
-
-						}
-						else
-						{
-							output += talk(output, world, (ToolCore) tool.getItem(), "weapon");
-						}
-					}
-					else
-					{
-						output += talk(output, world, (ToolCore) tool.getItem(), "other");
-					}
-				}
-
-				if(storymode == true)
-				{
-					time = world.rand.nextInt(160) + 80;
-				}
-				else
-				{
-					time = world.rand.nextInt(1600) + 800;
-					if(TinkersDefense.config.debug)
-					{
-						time = world.rand.nextInt(160) + 80;
-					}
-				}
-
-			}
-			else
-			{
-				if(broken == false)
-				{
-					output += "§4(Broken)§f ";
-					output += talk(output, world, (ToolCore) tool.getItem(), "broken");
-					broken = true;
-				}
-			}
-
-			formatOutput(output, player, tool);
-		}
-		else
-		{
-			time--;
-		}
-
-	}
-
-	String story(String output, WorldClient world)
-	{
-		final String line = StatCollector.translateToLocal("soul." + name + ".story." + story + "." + storyline);
-		if(!line.equals("soul." + name + ".story." + story + "." + storyline))
-		{
-			storyline++;
-			return line;
-		}
-		else
-		{
-			storymode = false;
-			story = 0;
-			storyline = 0;
-			return "";
-		}
-
-	}
-
-	String talk(String output, WorldClient world, ToolCore tool, String type)
-	{
-		final int lines = getAmountOfLines("soul." + name + "." + type + ".");
-		if(lines > 0)
-		{
-			return StatCollector.translateToLocal("soul." + name + "." + type + "." + world.rand.nextInt(lines));
-		}
-		if(TinkersDefense.config.debug)
-		{
-			return "Error: No lines (" + type + " chat)";
-		}
-		return "";
-	}
-
-	int getAmountOfLines(String type)
-	{
-		String nextLine = "";
-		int i = -1;
-		do
-		{
-			i++;
-			nextLine = StatCollector.translateToLocal(type + i);
-		}
-		while(!nextLine.contains(type));
-		return i;
-	}
-
-	void formatOutput(String output, EntityPlayer player, ItemStack tool)
-	{
-		if(tool != null && output.contains("~tool~"))
-		{
-			output = output.replace("~tool~", ((ToolCore) tool.getItem()).getLocalizedToolName());
-		}
-		if(output.contains("~player~"))
-		{
-			output = output.replace("~player~", player.getDisplayName());
-		}
-		if(output.contains("~material~"))
-		{
-			output = output.replace("~material~", TConstructRegistry.toolMaterials.get(tool.getTagCompound().getCompoundTag("InfiTool").getInteger("Head")).localizedName());
-		}
-
-		if(output.contains("~damage~"))
-		{
-			output = output.replace("~damage~", Float.toString(dmg));
-		}
-
-		if(!output.isEmpty())
-		{
-			player.addChatMessage(new ChatComponentText(
-					"[" + name + " the " + ((ToolCore) tool.getItem()).getLocalizedToolName() + "] " + output));
-		}
-		else
-		{
-			if(TinkersDefense.config.debug)
-			{
-				player.addChatMessage(new ChatComponentText(
-						"Error: Soul missing line"));
-			}
-		}
-	}
-
-	@SubscribeEvent
-	public void ModifySoulEvent(ModifyEvent event)
-	{
-		if(event.modifier.stacks != null && !event.modifier.stacks.isEmpty() && event.modifier.stacks.get(0) != null && ItemStack.areItemStacksEqual((ItemStack) event.modifier.stacks.get(0), new ItemStack(
-				Modifiers.TMod.modItems, 1, 3)))
-		{
-			newlymade = true;
-
-		}
-		else if(event.itemStack.getTagCompound().getCompoundTag("InfiTool").hasKey("Ensouled"))
-		{
-			newlymodified = true;
-		}
-
-		time = 0;
-	}
-
-	@SubscribeEvent
-	public void HarmedEvent(LivingHurtEvent event)
-	{
-		if(event.entityLiving instanceof EntityPlayer)
-		{
-			final EntityPlayer player = (EntityPlayer) event.entityLiving;
-			if(player.getUniqueID() == Minecraft.getMinecraft().thePlayer.getUniqueID())
-			{
-				if(event.source.isFireDamage())
-				{
-					onFire = true;
-				}
-				else
-				{
-					playerharmed = true;
-					dmg = event.ammount;
-				}
-				time = 0;
-			}
-		}
-		else if(event.source.getEntity() instanceof EntityPlayer)
-		{
-			final EntityPlayer player = (EntityPlayer) event.source.getEntity();
-			final String p = player.getDisplayName();
-			final String s = Minecraft.getMinecraft().thePlayer.getDisplayName();
-			if(p == s)
-			{
-				playerattacked = true;
-				dmg = event.ammount;
-				time = 0;
-			}
-		}
-	}
-	//	@SubscribeEvent
-	//	public void PlayerDeathEvent(LivingDeathEvent event)
-	//	{
-	//		if(event.entityLiving.worldObj.isRemote)
-	//			if(event.entityLiving.isEntityEqual(Minecraft.getMinecraft().thePlayer))
-	//			{
-	//				String output = "";
-	//				final int lines = getAmountOfLines("soul." + name + "." + "death" + ".");
-	//				if(lines > 0)
-	//				{
-	//					output += StatCollector.translateToLocal("soul." + name + "." + "death" + "." + event.entityLiving.worldObj.rand.nextInt(lines));
-	//				}
-	//				else if(TinkersDefense.config.debug)
-	//				{
-	//					output += "Error: No lines (" + "death" + " chat)";
-	//				}
-	//				else
-	//				{
-	//					output += "";
-	//				}
-	//
-	//				formatOutput(output, (EntityPlayer) event.entityLiving, null);
-	//			}
-	//	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/Modifiers.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/Modifiers.java
deleted file mode 100644
index f10fa68..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/Modifiers.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package lance5057.tDefense.core.tools.modifiers;
-
-import lance5057.tDefense.TDIntegration;
-import lance5057.tDefense.armor.modifiers.ArmorMods;
-import lance5057.tDefense.core.tools.modifiers.BloodMagic.BloodMagicMods;
-import lance5057.tDefense.core.tools.modifiers.Botania.BotaniaMods;
-import lance5057.tDefense.core.tools.modifiers.TDefense.TDMods;
-import lance5057.tDefense.core.tools.modifiers.Thaumcraft.ThaumcraftMods;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-import tconstruct.library.tools.ToolCore;
-
-public class Modifiers
-{
-	public static TDMods			TMod;
-	public static ArmorMods			AMod;
-	public static BotaniaMods		BotMod;
-	public static ThaumcraftMods	ThaumMod;
-	public static BloodMagicMods	BloodMod;
-
-	public void preInit()
-	{
-		TMod = new TDMods();
-		AMod = new ArmorMods();
-
-		if(TDIntegration.botania)
-		{
-			BotMod = new BotaniaMods();
-		}
-
-		if(TDIntegration.thaumcraft)
-		{
-			ThaumMod = new ThaumcraftMods();
-		}
-		if(TDIntegration.bloodMagic)
-		{
-			BloodMod = new BloodMagicMods();
-		}
-	}
-
-	public void Init()
-	{
-		TMod.RegisterRecipes();
-		TMod.RegisterModifiers();
-
-		AMod.RegisterRecipes();
-		AMod.RegisterModifiers();
-
-		if(BotMod != null)
-		{
-			BotMod.RegisterRecipes();
-			BotMod.RegisterModifiers();
-		}
-
-		if(ThaumMod != null)
-		{
-			ThaumMod.RegisterRecipes();
-			ThaumMod.RegisterModifiers();
-		}
-		if(BloodMod != null)
-		{
-			BloodMod.RegisterRecipes();
-			BloodMod.RegisterModifiers();
-		}
-	}
-
-	public void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-		TMod.UpdateAll(tool, stack, world, entity, tags);
-		//AMod.UpdateAll(tool, stack, world, entity, tags);
-		if(BotMod != null)
-		{
-			BotMod.UpdateAll(tool, stack, world, entity, tags);
-		}
-		if(ThaumMod != null)
-		{
-			ThaumMod.UpdateAll(tool, stack, world, entity, tags);
-		}
-		if(BloodMod != null)
-		{
-			BloodMod.UpdateAll(tool, stack, world, entity, tags);
-		}
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifiersBase.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifiersBase.java
deleted file mode 100644
index 94f555d..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifiersBase.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package lance5057.tDefense.core.tools.modifiers;
-
-import lance5057.tDefense.core.items.MetaModifierItem;
-import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
-import tconstruct.library.tools.ToolCore;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-public abstract class ModifiersBase
-{
-	public MetaModifierItem	modItems;
-	public String[]			itemStrings;
-	public String			name;
-
-	public ModifiersBase(String[] strings, String name)
-	{
-		itemStrings = strings;
-		this.name = name;
-
-		MinecraftForge.EVENT_BUS.register(this);
-		LoadItems();
-	}
-
-	public void LoadItems()
-	{
-		if(itemStrings != null && name != null)
-		{
-			modItems = new MetaModifierItem(name, itemStrings.length,
-					itemStrings);
-			GameRegistry.registerItem(modItems, name);
-		}
-	}
-
-	public abstract void RegisterRecipes();
-
-	public abstract void RegisterModifiers();
-
-	public abstract void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags);
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/TDefense/TDMods.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/TDefense/TDMods.java
deleted file mode 100644
index eb23077..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/TDefense/TDMods.java
+++ /dev/null
@@ -1,470 +0,0 @@
-package lance5057.tDefense.core.tools.modifiers.TDefense;
-
-import java.util.ArrayList;
-import java.util.Random;
-
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.core.tools.ModifierSoul;
-import lance5057.tDefense.core.tools.Shield;
-import lance5057.tDefense.core.tools.modifiers.ModifierBoolExclusive;
-import lance5057.tDefense.core.tools.modifiers.ModifierIntExclusive;
-import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
-import lance5057.tDefense.core.tools.modifiers.modLapisShears;
-import lance5057.tDefense.core.tools.modifiers.ActiveToolMods.TDefenseActiveToolMod;
-import lance5057.tDefense.proxy.CommonProxy;
-import mods.battlegear2.api.PlayerEventChild.ShieldBlockEvent;
-import mods.battlegear2.api.core.IBattlePlayer;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.EnumCreatureAttribute;
-import net.minecraft.entity.item.EntityXPOrb;
-import net.minecraft.entity.monster.EntityMob;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityFireball;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.Vec3;
-import net.minecraft.util.WeightedRandomChestContent;
-import net.minecraft.world.World;
-import net.minecraftforge.common.ChestGenHooks;
-import net.minecraftforge.event.entity.living.LivingAttackEvent;
-import net.minecraftforge.event.entity.living.LivingDeathEvent;
-import net.minecraftforge.oredict.OreDictionary;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.client.TConstructClientRegistry;
-import tconstruct.library.crafting.ModifyBuilder;
-import tconstruct.library.tools.ToolCore;
-import tconstruct.tools.TinkerTools;
-import tconstruct.weaponry.TinkerWeaponry;
-import cpw.mods.fml.common.Optional;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-public class TDMods extends ModifiersBase
-{
-	public TDMods()
-	{
-		super(new String[] {"AncientRelic", "RainbowGem", "Textbook", "SoulStone", "CrestFeathers", "CrestMirrors", "CrestLegends", "CrestGluttony", "CrestThorns", "CrestSanguisuga", "CrestWinds", "CrestLight", "CrestPaper"}, "modItemsCore");
-	}
-
-	@Override
-	public void RegisterRecipes()
-	{
-		ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(
-				new ItemStack(modItems, 1, 0), 1, 1, 1));
-		ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(
-				new ItemStack(modItems, 1, 3), 1, 1, 1));
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 1), new Object[] {"111", "1d1", "111", 'd', new ItemStack(
-				Items.diamond, 1, 0), '1', new ItemStack(Items.dye, 1,
-				OreDictionary.WILDCARD_VALUE)});
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 2), new Object[] {"-1-", "1d1", "-1-", 'd', new ItemStack(
-				Items.enchanted_book, 1, OreDictionary.WILDCARD_VALUE), '1', new ItemStack(
-				Items.experience_bottle, 1, 0)});
-
-		GameRegistry.addShapelessRecipe(new ItemStack(modItems, 1, 12), new ItemStack(
-				Items.enchanted_book, 1, OreDictionary.WILDCARD_VALUE));
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 4), new Object[] {"fcf", "sps", "fcf", 'f', new ItemStack(
-				Items.feather, 1, -1), 'c', new ItemStack(
-				TinkersDefense.partCloth, 1, OreDictionary.WILDCARD_VALUE), 's', new ItemStack(
-				Items.string, 1, -1), 'p', new ItemStack(modItems, 1, 12)});
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 5), new Object[] {"gng", "spc", "gbg", 'g', new ItemStack(
-				Blocks.glass_pane, 1, -1), 'c', new ItemStack(
-				TinkersDefense.partCloth, 1, OreDictionary.WILDCARD_VALUE), 's', new ItemStack(
-				Blocks.sand, 1, OreDictionary.WILDCARD_VALUE), 'p', new ItemStack(
-				modItems, 1, 12), 'n', new ItemStack(Items.nether_star, 1, 0), 'b', new ItemStack(
-				Blocks.gold_block, 1, 12)});
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 6), new Object[] {"-r-", "-p-", "---", 'r', new ItemStack(
-				modItems, 1, 0), 'p', new ItemStack(modItems, 1, 12)});
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 7), new Object[] {"aaa", "ipi", "aaa", 'i', TConstructRegistry.getItemStack("ingotPigIron"), 'p', new ItemStack(
-				modItems, 1, 12), 'a', new ItemStack(TinkerWeaponry.arrowhead,
-				1, 5)});
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 8), new Object[] {"aia", "ipi", "aia", 'i', new ItemStack(
-				Items.iron_ingot, 1, 0), 'p', new ItemStack(modItems, 1, 12), 'a', new ItemStack(
-				TinkersDefense.partRivet, 1, 4)});
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 9), new Object[] {"brb", "apa", "ara", 'b', TConstructRegistry.getItemStack("necroticBone"), 'r', new ItemStack(
-				TinkerTools.toughRod, 1, 7), 'a', new ItemStack(
-				TinkerWeaponry.arrowhead, 1, 11), 'p', new ItemStack(modItems,
-				1, 12)});
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 10), new Object[] {"PfP", "tpt", "PfP", 'P', new ItemStack(
-				Blocks.piston, 1, 0), 'p', new ItemStack(modItems, 1, 12), 'f', new ItemStack(
-				Items.feather, 1, 0), 't', new ItemStack(Items.ghast_tear, 1, 0)});
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 11), new Object[] {"gbg", "tpt", "gbg", 'g', new ItemStack(
-				Blocks.glowstone, 1, 0), 'p', new ItemStack(modItems, 1, 12), 'b', new ItemStack(
-				Items.blaze_rod, 1, 0), 't', new ItemStack(Blocks.torch, 1, 0)});
-	}
-
-	@Override
-	public void RegisterModifiers()
-	{
-		//All 
-		ModifyBuilder.registerModifier(new ModifierSoul(
-				new ItemStack[] {new ItemStack(modItems, 1, 3)},
-				TinkersDefense.config.SoulSteveID, "Ensouled",
-				EnumChatFormatting.WHITE.toString(), "Ensouled (Steve)",
-				new String[] {}, 0, null, "Steve"));
-
-		//Weapons
-		//TO-DO
-		ModifyBuilder.registerModifier(new ModifierIntExclusive(
-				new ItemStack[] {new ItemStack(
-						Blocks.heavy_weighted_pressure_plate, 1, 0)},
-				TinkersDefense.config.DazeID, "Daze", 1,
-				EnumChatFormatting.GRAY.toString(), "Daze",
-				new String[] {"weapon"}, 1, null));
-		ModifyBuilder.registerModifier(new ModifierIntExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 2)},
-				TinkersDefense.config.XPBoostID, "XPBoost", 1,
-				EnumChatFormatting.GREEN.toString(), "XP Boost",
-				new String[] {"weapon"}, 1, null));
-
-		//Shears
-		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 1)},
-				TinkersDefense.config.RainbowID, "Rainbow",
-				EnumChatFormatting.WHITE.toString(), "Rainbow",
-				new String[] {"shears"}, 1, null));
-
-		ModifyBuilder.registerModifier(new modLapisShears(
-				TinkersDefense.config.ShearFortuneID,
-				new ItemStack[] {new ItemStack(Items.dye, 1, 4), new ItemStack(
-						Blocks.lapis_block, 1, 0)}, new int[] {1, 9}));
-
-		//Shields
-		RegisterCrestModifier(TinkersDefense.config.CrestFeathersID, "Feathers", 1, EnumChatFormatting.WHITE.toString(), new ItemStack(
-				modItems, 1, 4), 1);
-		RegisterCrestModifier(TinkersDefense.config.CrestMirrorsID, "Mirrors", EnumChatFormatting.DARK_AQUA.toString(), new ItemStack(
-				modItems, 1, 5), 1);
-		RegisterLegendModifier(TinkersDefense.config.CrestLegendsID, "Legends", EnumChatFormatting.GOLD.toString(), new ItemStack(
-				modItems, 1, 6), 1);
-		//		RegisterCrestModifier(TinkersDefense.config.CrestBladesID, "Blades", 1, EnumChatFormatting.GRAY.toString(), new ItemStack(
-		//				modItems, 1, 7), 1);
-		RegisterCrestModifier(TinkersDefense.config.CrestGluttonyID, "Gluttony", 1, EnumChatFormatting.DARK_GREEN.toString(), new ItemStack(
-				modItems, 1, 7), 1);
-		//		RegisterCrestModifier(TinkersDefense.config.CrestPitchID, "Pitch", 1, EnumChatFormatting.DARK_GRAY.toString(), new ItemStack(
-		//				modItems, 1, 8), 1);
-		RegisterCrestModifier(TinkersDefense.config.CrestThornsID, "Thorns", 1, EnumChatFormatting.GREEN.toString(), new ItemStack(
-				modItems, 1, 8), 1);
-		RegisterCrestModifier(TinkersDefense.config.CrestSanguisugaID, "Sanguisuga", 1, EnumChatFormatting.DARK_RED.toString(), new ItemStack(
-				modItems, 1, 9), 1);
-		RegisterCrestModifier(TinkersDefense.config.CrestWindsID, "Wind", 1, EnumChatFormatting.AQUA.toString(), new ItemStack(
-				modItems, 1, 10), 1);
-		//		RegisterCrestModifier(TinkersDefense.config.CrestRetributionID, "Retribution", 1, EnumChatFormatting.LIGHT_PURPLE.toString(), new ItemStack(
-		//				modItems, 1, 13), 1);
-		RegisterCrestModifier(TinkersDefense.config.CrestLightID, "Light", 1, EnumChatFormatting.YELLOW.toString(), new ItemStack(
-				modItems, 1, 11), 1);
-
-		//Jokes
-		//		ModifyBuilder.registerModifier(new ModifierBoolExclusive(new ItemStack[] {new ItemStack(Blocks.glass_pane)}, TinkersDefense.config.JokeInsultID, "Insulting", EnumChatFormatting.AQUA.toString(), "Joke: Insulting", null, 0, null));
-		//		ModifyBuilder.registerModifier(new ModifierBoolExclusive(new ItemStack[] {new ItemStack(Blocks.glass_pane)}, TinkersDefense.config.JokePyrotechID, "Pyrotech", EnumChatFormatting.AQUA.toString(), "Joke: Pyrotech", null, 0, null));
-		//ModifyBuilder.registerModifier(new modifierIntExclusive(new ItemStack[] {new ItemStack(Items.slime_ball)}, TinkersDefense.config.JokeCompensateID, "Compensate", 1, EnumChatFormatting.DARK_GRAY.toString(), "Joke: Compensating", new String[] {"shield"}, 1, null));
-
-		TConstructRegistry.registerActiveToolMod(new TDefenseActiveToolMod());
-
-		for(final ToolCore tool : TConstructRegistry.getToolMapping())
-		{
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.DazeID, "tinker", "daze", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ShearFortuneID, "tinker", "lapis", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.RainbowID, "rainbow", "daze", true);
-
-			//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestFeathersID, "tinker", "feathers", true);
-			//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestMirrorsID, "tinker", "mirrors", true);
-			//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestLegendsID, "tinker", "legends", true);
-			//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestBladesID, "tinker", "blades", true);
-			//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestGluttonyID, "tinker", "gluttony", true);
-			//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestPitchID, "tinker", "pitch", true);
-			//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestSanguisugaID, "tinker", "sanguisuga", true);
-			//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestWindsID, "tinker", "wind", true);
-			//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestRetributionID, "tinker", "retribution", true);
-			//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestLightID, "tinker", "light", true);
-
-			//TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.JokeInsultID, "tinker", "insult", true);
-			//TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.JokePyrotechID, "tinker", "pyrotech", true);
-			//TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.JokeCompensateID, "tinker", "compensate", true);
-
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.SoulBoundID, "tinker", "soulbound", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.RainbowID, "tinker", "rainbow", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.XPBoostID, "tinker", "textbook", true);
-
-		}
-	}
-
-	public void RegisterCrestModifier(int[] effect, String tag, int increase, String color, ItemStack item, int mods)
-	{
-		for(int i = 0; i < TinkersDefense.colors.length; i++)
-		{
-			final ItemStack[] items = {item, new ItemStack(Items.dye, 1, i)};
-			ModifyBuilder.registerModifier(new ModifierIntExclusive(items,
-					effect[i], tag.toLowerCase(), increase, color,
-					"Crest of " + tag, new String[] {"shield"}, mods, null));
-			for(final ToolCore tool : TConstructRegistry.getToolMapping())
-			{
-				TConstructClientRegistry.addEffectRenderMapping(tool, effect[i], "tinker", TinkersDefense.colors[i] + "_" + tag.toLowerCase(), true);
-			}
-		}
-	}
-
-	public void RegisterCrestModifier(int[] effect, String tag, String color, ItemStack item, int mods)
-	{
-
-		for(int i = 0; i < TinkersDefense.colors.length; i++)
-		{
-			final ItemStack[] items = {item, new ItemStack(Items.dye, 1, i)};
-			ModifyBuilder.registerModifier(new ModifierBoolExclusive(items,
-					effect[i], tag.toLowerCase(), color, "Crest of " + tag,
-					new String[] {"shield"}, mods, null));
-			for(final ToolCore tool : TConstructRegistry.getToolMapping())
-			{
-				TConstructClientRegistry.addEffectRenderMapping(tool, effect[i], "tinker", TinkersDefense.colors[i] + "_" + tag.toLowerCase(), true);
-			}
-		}
-	}
-
-	public void RegisterLegendModifier(int[] effect, String tag, String color, ItemStack item, int mods)
-	{
-
-		for(int i = 0; i < TinkersDefense.colors.length; i++)
-		{
-			final ItemStack[] items = {item, new ItemStack(Items.dye, 1, i)};
-			ModifyBuilder.registerModifier(new ModifierBoolExclusive(items,
-					effect[i], tag.toLowerCase(), color, "Crest of " + tag,
-					new String[] {"heatershield"}, mods, null));
-			for(final ToolCore tool : TConstructRegistry.getToolMapping())
-			{
-				TConstructClientRegistry.addEffectRenderMapping(tool, effect[i], "tinker", TinkersDefense.colors[i] + "_" + tag.toLowerCase(), true);
-			}
-		}
-	}
-
-	@Override
-	public void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-		if(tags.hasKey("mirrors"))
-		{
-			UpdateMirrors(tool, stack, world, entity);
-		}
-		if(tags.hasKey("gluttony"))
-		{
-			UpdateGluttony(tool, stack, world, entity, tags);
-		}
-		if(world.isRemote && tags.hasKey("Ensouled") && tags.hasKey("Soul"))
-		{
-			if(CommonProxy.SoulHandler != null)
-			{
-				CommonProxy.SoulHandler.Update(stack);
-			}
-		}
-	}
-
-	public void UpdateMirrors(ToolCore tool, ItemStack stack, World world, Entity entity)
-	{
-		if(((IBattlePlayer) entity).isBlockingWithShield())
-		{
-			final AxisAlignedBB boundingBox = AxisAlignedBB.getBoundingBox(((EntityLivingBase) entity).posX - 3, ((EntityLivingBase) entity).posY - 3, ((EntityLivingBase) entity).posZ - 3, ((EntityLivingBase) entity).posX + 3, ((EntityLivingBase) entity).posY + 3, ((EntityLivingBase) entity).posZ + 3);
-
-			final ArrayList<EntityFireball> fireballs = (ArrayList<EntityFireball>) world.getEntitiesWithinAABB(EntityFireball.class, boundingBox);
-			for(final EntityFireball fireball : fireballs)
-			{
-				if(fireball.getDistanceSqToEntity((entity)) <= 25)
-				{
-					final Vec3 playerlook = ((EntityLivingBase) entity).getLookVec();
-
-					fireball.motionX = playerlook.xCoord;
-					fireball.motionY = playerlook.yCoord;
-					fireball.motionZ = playerlook.zCoord;
-					fireball.accelerationX = fireball.motionX * 0.1D;
-					fireball.accelerationY = fireball.motionY * 0.1D;
-					fireball.accelerationZ = fireball.motionZ * 0.1D;
-
-					fireball.shootingEntity = ((EntityLivingBase) entity);
-
-					((EntityLivingBase) entity).worldObj.playSoundAtEntity((entity), "battlegear2:shield", 1, 1);
-				}
-			}
-		}
-	}
-
-	public void UpdateGluttony(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-		final Shield shield = (Shield) tool;
-
-		if(tags.getInteger("Damage") > 0 && shield.getArrowCount(stack) > 0)
-		{
-			tags.setInteger("Damage", tags.getInteger("Damage") - 2);
-			shield.setArrowCount(stack, shield.getArrowCount(stack) - 1);
-
-			if(world.isRemote)
-			{
-				world.playSoundEffect(entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ, "minecraft:random.eat", 1, 1);
-			}
-		}
-	}
-
-	//Events
-	@SubscribeEvent
-	public void XPBoost(LivingDeathEvent event)
-	{
-		if(!(event.entityLiving instanceof EntityPlayer) && event.source.getSourceOfDamage() instanceof EntityPlayer)
-		{
-			final EntityPlayer player = (EntityPlayer) event.source.getSourceOfDamage();
-			final ItemStack itemstack = player.getCurrentEquippedItem();
-			if(itemstack != null && itemstack.getItem() instanceof ToolCore)
-			{
-				final NBTTagCompound tags = itemstack.getTagCompound().getCompoundTag("InfiTool");
-
-				if(tags != null && tags.hasKey("XPBoost"))
-				{
-					player.worldObj.spawnEntityInWorld(new EntityXPOrb(
-							player.worldObj, event.entityLiving.posX,
-							event.entityLiving.posY, event.entityLiving.posZ,
-							(int) Math.pow(tags.getInteger("XPBoost"), 2)));
-
-				}
-			}
-		}
-	}
-
-	@SubscribeEvent
-	public void UpdateDaze(LivingAttackEvent event)
-	{
-		if(event.source.getEntity() instanceof EntityPlayer)
-		{
-			final EntityPlayer player = (EntityPlayer) event.source.getEntity();
-			final ItemStack heldItem = player.getHeldItem();
-			final EntityLivingBase attacked = event.entityLiving;
-
-			if(heldItem != null && heldItem.getItem() != null && heldItem.getItem() instanceof ToolCore)
-			{
-				final NBTTagCompound tags = heldItem.getTagCompound().getCompoundTag("InfiTool");
-
-				if(tags.hasKey("Daze"))
-				{
-					final int daze = tags.getInteger("Daze");
-					final int chance = daze * 5;
-
-					final Random roll = new Random();
-					final int num = roll.nextInt(100) + 1;
-
-					if(num <= chance)
-					{
-						attacked.addPotionEffect(new PotionEffect(2, 3 * 20,
-								100));
-						attacked.addPotionEffect(new PotionEffect(9, 3 * 20,
-								100));
-						attacked.addPotionEffect(new PotionEffect(15, 3 * 20,
-								100));
-						attacked.addPotionEffect(new PotionEffect(18, 3 * 20,
-								100));
-					}
-
-				}
-			}
-		}
-	}
-
-	@SubscribeEvent
-	@Optional.Method(modid = "battlegear2")
-	public void TD_ShieldBlock(ShieldBlockEvent event)
-	{
-		if(event.shield.getItem() instanceof ToolCore)
-		{
-			final NBTTagCompound tags = event.shield.getTagCompound().getCompoundTag("InfiTool");
-
-			if(!tags.getBoolean("Broken"))
-			{
-				if(tags.hasKey("mirrors"))
-				{
-					UpdateMirrors((ToolCore) event.shield.getItem(), event.shield, event.entityPlayer.worldObj, event.entityPlayer);
-				}
-
-				if(tags.hasKey("legends"))
-				{
-					event.getPlayer().addPotionEffect(new PotionEffect(
-							Potion.fireResistance.getId(), 200, 2));
-					event.getPlayer().addPotionEffect(new PotionEffect(
-							Potion.moveSpeed.getId(), 200, 2));
-					event.getPlayer().addPotionEffect(new PotionEffect(
-							Potion.resistance.getId(), 200, 2));
-				}
-
-				if(tags.hasKey("thorns"))
-				{
-					event.source.getEntity().attackEntityFrom(DamageSource.generic, tags.getInteger("thorns") * 2);
-				}
-
-				if(tags.hasKey("sanguisuga"))
-				{
-					event.source.getEntity().attackEntityFrom(DamageSource.generic, tags.getInteger("sanguisuga"));
-					event.entityPlayer.heal(tags.getInteger("sanguisuga"));
-				}
-
-				if(tags.hasKey("light"))
-				{
-					if(event.source.getEntity() instanceof EntityMob)
-					{
-						final EntityMob entity = (EntityMob) event.source.getEntity();
-						if(entity.getCreatureAttribute() == EnumCreatureAttribute.UNDEAD)
-						{
-							event.source.getEntity().setFire(tags.getInteger("light"));
-						}
-					}
-				}
-
-				//				if(tags.hasKey("pitch"))
-				//				{
-				//					if(!event.entityPlayer.worldObj.isRemote && event.source.getEntity() instanceof EntityPlayer)
-				//					{
-				//						final EntityPlayer entity = (EntityPlayer) event.source.getEntity();
-				//						if(entity.getEquipmentInSlot(0) != null)
-				//						{
-				//							entity.entityDropItem(entity.getEquipmentInSlot(0), 5);
-				//							entity.setCurrentItemOrArmor(0, null);
-				//							//entity.setCanPickUpLoot(true);
-				//						}
-				//					}
-				//				}
-
-				if(tags.hasKey("wind"))
-				{
-					if(!event.entityPlayer.worldObj.isRemote && event.source.getEntity() instanceof EntityLiving)
-					{
-						final EntityLiving entity = (EntityLiving) event.source.getEntity();
-
-						final double x = event.entityLiving.posX - entity.posX;
-						final double z = event.entityLiving.posZ - entity.posZ;
-						//entity.knockBack(entity, tags.getInteger("winds") * 10, x, z);
-
-						entity.isAirBorne = true;
-						final float f1 = MathHelper.sqrt_double(x * x + z * z);
-						final float f2 = 0.4F;
-						entity.motionX /= 2.0D;
-						entity.motionY /= 2.0D;
-						entity.motionZ /= 2.0D;
-						entity.motionX -= x / f1 * f2 * tags.getInteger("wind");
-						entity.motionY += f2;
-						entity.motionZ -= z / f1 * f2 * tags.getInteger("wind");
-
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/ThaumcraftMods.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/ThaumcraftMods.java
deleted file mode 100644
index 75b477c..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/ThaumcraftMods.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package lance5057.tDefense.core.tools.modifiers.Thaumcraft;
-
-import java.lang.reflect.Method;
-
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-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 thaumcraft.api.ItemApi;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
-import cpw.mods.fml.common.FMLLog;
-
-public class ThaumcraftMods extends ModifiersBase
-{
-
-	public ThaumcraftMods()
-	{
-		super(null, null);
-	}
-
-	@Override
-	public void LoadItems()
-	{
-
-	}
-
-	@Override
-	public void RegisterRecipes()
-	{
-	}
-
-	@Override
-	public void RegisterModifiers()
-	{
-		ModifyBuilder.registerModifier(new modifierRepairVis(
-				new ItemStack[] {ItemApi.getItem("itemWandCap", 0)},
-				TinkersDefense.config.CapsModID, "Caps",
-				EnumChatFormatting.GOLD.toString(), "Caps"));
-
-		for(final ToolCore tool : TConstructRegistry.getToolMapping())
-		{
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CapsModID, "tinker", "cap", true);
-		}
-	}
-
-	@Override
-	public void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-		if(!world.isRemote)
-		{
-			if(tags.hasKey("Caps"))
-			{
-				UpdateRepairVis(tool, stack, world, entity, tags);
-			}
-		}
-	}
-
-	static Method	consumeVisFromInventory;
-
-	public void UpdateRepairVis(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
-	{
-		if(tags.getInteger("Damage") > 0)
-		{
-			final AspectList cost = new AspectList();
-			cost.add(Aspect.AIR, (int) (10 * tags.getFloat("Caps")));
-			cost.add(Aspect.WATER, (int) (30 * tags.getFloat("Caps")));
-			cost.add(Aspect.FIRE, (int) (10 * tags.getFloat("Caps")));
-			cost.add(Aspect.ORDER, (int) (20 * tags.getFloat("Caps")));
-			cost.add(Aspect.ENTROPY, (int) (10 * tags.getFloat("Caps")));
-			cost.add(Aspect.EARTH, (int) (30 * tags.getFloat("Caps")));
-
-			boolean success = false;
-			try
-			{
-				if(consumeVisFromInventory == null)
-				{
-					consumeVisFromInventory = Class.forName("thaumcraft.common.items.wands.WandManager").getMethod("consumeVisFromInventory", EntityPlayer.class, AspectList.class);
-				}
-				success = (Boolean) consumeVisFromInventory.invoke(null, entity, cost);
-			}
-			catch(final Exception ex)
-			{
-				FMLLog.warning("Thaumcraft is missing, you shouldn't see this, please report");
-			}
-			finally
-			{
-				if(success)
-				{
-					if(tags.getInteger("Damage") >= 4)
-					{
-						tags.setInteger("Damage", tags.getInteger("Damage") - 4);
-					}
-					else
-					{
-						tags.setInteger("Damage", 0);
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java
deleted file mode 100644
index 2c20476..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package lance5057.tDefense.core.tools.modifiers.Thaumcraft;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import tconstruct.modifiers.tools.ModBoolean;
-import thaumcraft.api.wands.WandCap;
-
-public class modifierRepairVis extends ModBoolean
-{
-	WandCap	cap;
-	String	color;
-	String	tooltipName;
-
-	public modifierRepairVis(ItemStack[] items, int effect, String tag, String c, String tip)
-	{
-		super(items, effect, tag, c, tip);
-		color = c;
-		tooltipName = tip;
-	}
-
-	@Override
-	public boolean matches(ItemStack[] recipe, ItemStack input)
-	{
-		cap = null;
-		for(final ItemStack element : recipe)
-		{
-			if(element != null)
-			{
-				for(final WandCap cp : WandCap.caps.values())
-				{
-					final ItemStack test = cp.getItem();
-					if(test != null && element.getItem() == test.getItem() && element.getItemDamage() == test.getItemDamage())
-					{
-						cap = cp;
-						break;
-					}
-				}
-			}
-		}
-
-		if(!canModify(input, recipe))
-			return false;
-		if(cap == null)
-			return false;
-		return true;
-	}
-
-	@Override
-	protected boolean canModify(ItemStack tool, ItemStack[] input)
-	{
-		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
-		return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key) && cap != null; //Will fail if the modifier is false or the tag doesn't exist
-	}
-
-	@Override
-	public void modify(ItemStack[] input, ItemStack tool)
-	{
-		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
-
-		tags.setFloat(key, cap.getBaseCostModifier());
-
-		int modifiers = tags.getInteger("Modifiers");
-		modifiers -= 1;
-		tags.setInteger("Modifiers", modifiers);
-
-		final String mat = cap.getTag().substring(0, 1).toUpperCase() + cap.getTag().substring(1) + " ";
-		addToolTip(tool, color + mat + tooltipName, color + mat + tooltipName + " (" + (int) (cap.getBaseCostModifier() * 100) + "%)");
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/modLapisShears.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/modLapisShears.java
deleted file mode 100644
index 8261b4c..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/modLapisShears.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package lance5057.tDefense.core.tools.modifiers;
-
-import java.util.Arrays;
-import java.util.List;
-
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import tconstruct.library.tools.ToolCore;
-import tconstruct.modifiers.tools.ModLapis;
-
-public class modLapisShears extends ModLapis
-{
-
-	public modLapisShears(int effect, ItemStack[] items, int[] values)
-	{
-		super(effect, items, values);
-	}
-
-	@Override
-	public void modify(ItemStack[] input, ItemStack tool)
-	{
-		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
-		if(!tags.hasKey(key))
-		{
-			tags.setBoolean(key, true);
-
-			final String modName = "\u00a79Lapis (0/450)";
-			final int tooltipIndex = addToolTip(tool, "\u00a79Luck", modName);
-			final int[] keyPair = new int[] {0, tooltipIndex};
-			tags.setIntArray(key, keyPair);
-
-			int modifiers = tags.getInteger("Modifiers");
-			modifiers -= 1;
-			tags.setInteger("Modifiers", modifiers);
-		}
-
-		final int increase = matchingAmount(input);
-		final int keyPair[] = tags.getIntArray(key);
-		keyPair[0] += increase;
-		tags.setIntArray(key, keyPair);
-		final ToolCore toolcore = (ToolCore) tool.getItem();
-		final String[] types = toolcore.getTraits();
-		boolean harvest = false;
-		for(final String s : types)
-		{
-			if(s.equals("shears"))
-			{
-				harvest = true;
-			}
-		}
-		if(harvest)
-		{
-			if(keyPair[0] >= 450)
-			{
-				addEnchantment(tool, Enchantment.fortune, 3);
-			}
-			else if(keyPair[0] >= 300)
-			{
-				addEnchantment(tool, Enchantment.fortune, 2);
-			}
-			else if(keyPair[0] >= 100)
-			{
-				addEnchantment(tool, Enchantment.fortune, 1);
-			}
-		}
-
-		updateModTag2(tool, keyPair);
-	}
-
-	void updateModTag2(ItemStack tool, int[] keys)
-	{
-		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
-		final String tip = "ModifierTip" + keys[1];
-		final String modName = "\u00a79Lapis (" + keys[0] + "/" + "450" + ")";
-		tags.setString(tip, modName);
-	}
-
-	@Override
-	public boolean validType(ToolCore tool)
-	{
-		final List list = Arrays.asList(tool.getTraits());
-		return list.contains("shears");
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java
deleted file mode 100644
index c10f3b2..0000000
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-public class Container_FinishingAnvil extends Container
-{
-	public Container_FinishingAnvil(InventoryPlayer inventoryPlayer, TileEntity_FinishingAnvil te)
-	{
-		addSlotToContainer(new Slot(te, 0, 39, 32));
-
-		for(int x = 0; x < 9; x++)
-		{
-			addSlotToContainer(new Slot(inventoryPlayer, x, 8 + 18 * x, 142));
-		}
-
-		for(int y = 0; y < 3; y++)
-		{
-			for(int x = 0; x < 9; x++)
-			{
-				addSlotToContainer(new Slot(inventoryPlayer, x + y * 9 + 9,
-						8 + 18 * x, 84 + y * 18));
-			}
-		}
-	}
-
-	@Override
-	public boolean canInteractWith(EntityPlayer p_75145_1_)
-	{
-		return true;
-	}
-
-	@Override
-	public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2)
-	{
-		return null;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java
deleted file mode 100644
index c94648b..0000000
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil;
-
-import static net.minecraftforge.common.util.ForgeDirection.EAST;
-import static net.minecraftforge.common.util.ForgeDirection.NORTH;
-import static net.minecraftforge.common.util.ForgeDirection.SOUTH;
-import static net.minecraftforge.common.util.ForgeDirection.WEST;
-
-import java.util.Random;
-
-import lance5057.tDefense.TinkersDefense;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class FinishingAnvil extends BlockContainer
-{
-	public FinishingAnvil()
-	{
-		super(Material.iron);
-		setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
-	}
-
-	@Override
-	public void onBlockAdded(World world, int i, int j, int k)
-	{
-		super.onBlockAdded(world, i, j, k);
-		world.markBlockForUpdate(i, j, k);
-	}
-
-	@Override
-	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int metadata, float what, float these, float are)
-	{
-		final TileEntity tileEntity = world.getTileEntity(x, y, z);
-		if(tileEntity == null || player.isSneaking())
-			return false;
-		//code to open gui explained later
-		player.openGui(TinkersDefense.instance, TinkersDefense.GUI_ANVIL_INV, player.worldObj, x, y, z);
-		return true;
-	}
-
-	@Override
-	public void breakBlock(World world, int x, int y, int z, Block par5, int par6)
-	{
-		dropItems(world, x, y, z);
-		super.breakBlock(world, x, y, z, par5, par6);
-	}
-
-	private void dropItems(World world, int x, int y, int z)
-	{
-		final Random rand = new Random();
-
-		final TileEntity tileEntity = world.getTileEntity(x, y, z);
-		if(!(tileEntity instanceof IInventory))
-			return;
-		final IInventory inventory = (IInventory) tileEntity;
-
-		for(int i = 0; i < inventory.getSizeInventory(); i++)
-		{
-			final ItemStack item = inventory.getStackInSlot(i);
-
-			if(item != null && item.stackSize > 0)
-			{
-				final float rx = rand.nextFloat() * 0.8F + 0.1F;
-				final float ry = rand.nextFloat() * 0.8F + 0.1F;
-				final float rz = rand.nextFloat() * 0.8F + 0.1F;
-
-				final EntityItem entityItem = new EntityItem(world, x + rx,
-						y + ry, z + rz, new ItemStack(item.getItem(),
-								item.stackSize, item.getItemDamage()));
-
-				if(item.hasTagCompound())
-				{
-					entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy());
-				}
-
-				final float factor = 0.05F;
-				entityItem.motionX = rand.nextGaussian() * factor;
-				entityItem.motionY = rand.nextGaussian() * factor + 0.2F;
-				entityItem.motionZ = rand.nextGaussian() * factor;
-				world.spawnEntityInWorld(entityItem);
-				item.stackSize = 0;
-			}
-		}
-	}
-
-	//You don't want the normal render type, or it wont render properly.
-	@Override
-	public int getRenderType()
-	{
-		return -1;
-	}
-
-	//It's not an opaque cube, so you need this.
-	@Override
-	public boolean isOpaqueCube()
-	{
-		return false;
-	}
-
-	//It's not a normal block, so you need this too.
-	@Override
-	public boolean renderAsNormalBlock()
-	{
-		return false;
-	}
-
-	//This is the icon to use for showing the block in your hand.
-	@SideOnly(Side.CLIENT)
-	@Override
-	public void registerBlockIcons(IIconRegister icon)
-	{
-		blockIcon = icon.registerIcon("tinkersdefense:item_armoranvil");
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World w, int md)
-	{
-		final TileEntity_FinishingAnvil te = new TileEntity_FinishingAnvil();
-		return te;
-	}
-
-	@Override
-	public int onBlockPlaced(World p_149660_1_, int p_149660_2_, int p_149660_3_, int p_149660_4_, int p_149660_5_, float p_149660_6_, float p_149660_7_, float p_149660_8_, int p_149660_9_)
-	{
-		int j1 = p_149660_9_;
-
-		if((p_149660_9_ == 0 || p_149660_5_ == 2) && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ + 1, NORTH))
-		{
-			j1 = 1;
-		}
-
-		if((j1 == 0 || p_149660_5_ == 3) && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ - 1, SOUTH))
-		{
-			j1 = 2;
-		}
-
-		if((j1 == 0 || p_149660_5_ == 4) && p_149660_1_.isSideSolid(p_149660_2_ + 1, p_149660_3_, p_149660_4_, WEST))
-		{
-			j1 = 3;
-		}
-
-		if((j1 == 0 || p_149660_5_ == 5) && p_149660_1_.isSideSolid(p_149660_2_ - 1, p_149660_3_, p_149660_4_, EAST))
-		{
-			j1 = 4;
-		}
-
-		return j1;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java
deleted file mode 100644
index 3636b09..0000000
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java
+++ /dev/null
@@ -1,609 +0,0 @@
-package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.ArmorCore;
-import lance5057.tDefense.armor.renderers.ArmorRenderer;
-import lance5057.tDefense.core.network.Message_FinishingAnvil;
-import lance5057.tDefense.finishingAnvil.utilities.Injector;
-import lance5057.tDefense.finishingAnvil.utilities.ToolCoreTip;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.model.ModelBiped;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.entity.RenderItem;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ResourceLocation;
-
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-import org.lwjgl.util.glu.Project;
-
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.tools.ToolCore;
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.client.config.GuiButtonExt;
-
-public class Gui_FinishingAnvil extends GuiContainer
-{
-	private ItemStack						bigCopy;
-	NBTTagCompound							bigCopyTags;
-	private final RenderItem				bigRender		= new RenderItem_FinishingAnvil(
-																	this,
-																	3.5f,
-																	3.5f, 1.0f);
-
-	private ItemStack						rightCopy1, rightCopy2, rightCopy3;
-	NBTTagCompound							rightCopyTags1, rightCopyTags2,
-											rightCopyTags3;
-	private final RenderItem				normalRender	= new RenderItem_FinishingAnvil(
-																	this, 1.0f,
-																	1.0f, 1.0f);
-
-	//private Boolean							isNull			= true;
-	private ItemStack						editItem;
-
-	public final TileEntity_FinishingAnvil	inventory;
-	private ResourceLocation				forGui;
-
-	private int								leftButtonPosX	= 0;
-	private int								leftSelect		= 0;
-
-	private int								rightButtonPos	= 0;
-	private final int						rightSelect		= 0;
-
-	String[]								renders;
-
-	boolean									renderFlat		= true;
-	boolean									renderBiped		= true;
-	int										rotation		= 0;
-
-	InventoryPlayer							player;
-
-	private static final ResourceLocation	iconLocation	= new ResourceLocation(
-																	"tinkersdefense",
-																	"textures/gui/finishinganvil.png");
-
-	public Gui_FinishingAnvil(InventoryPlayer invPlayer, TileEntity_FinishingAnvil te)
-	{
-		super(new Container_FinishingAnvil(invPlayer, te));
-		inventory = te;
-
-		renders = new String[4];
-		renders[0] = "Head";
-		renders[1] = "Accessory";
-		renders[2] = "Handle";
-		renders[3] = "Extra";
-
-		player = invPlayer;
-	}
-
-	@Override
-	public void initGui()
-	{
-		super.initGui();
-		buttonList.add(new GuiButtonExt(1, guiLeft + 25, guiTop + 11, 10, 10,
-				""));
-		buttonList.add(new GuiButtonExt(2, guiLeft + 25, guiTop + 61, 10, 10,
-				""));
-		buttonList.add(new GuiButtonExt(3, guiLeft + 38, guiTop + 53, 18, 18,
-				""));
-
-		buttonList.add(new GuiButtonExt(4, guiLeft + 5, guiTop + 11, 20, 20, ""));
-		buttonList.add(new GuiButtonExt(5, guiLeft + 5, guiTop + 31, 20, 20, ""));
-		buttonList.add(new GuiButtonExt(6, guiLeft + 5, guiTop + 51, 20, 20, ""));
-
-		buttonList.add(new GuiButtonExt(7, guiLeft + 141, guiTop + 11, 10, 10,
-				""));
-		buttonList.add(new GuiButtonExt(8, guiLeft + 141, guiTop + 61, 10, 10,
-				""));
-
-		buttonList.add(new GuiButtonExt(9, guiLeft + 151, guiTop + 11, 20, 20,
-				""));
-		buttonList.add(new GuiButtonExt(10, guiLeft + 151, guiTop + 31, 20, 20,
-				""));
-		buttonList.add(new GuiButtonExt(11, guiLeft + 151, guiTop + 51, 20, 20,
-				""));
-
-		buttonList.add(new GuiButtonExt(12, guiLeft + 38, guiTop + 11, 18, 18,
-				""));
-		buttonList.add(new GuiButtonExt(13, guiLeft + 120, guiTop + 11, 18, 18,
-				"3D"));
-		buttonList.add(new GuiButtonExt(14, guiLeft + 120, guiTop + 53, 18, 18,
-				""));
-
-		buttonList.add(new GuiButtonExt(15, guiLeft + 59, guiTop + 60, 10, 10,
-				"<"));
-		buttonList.add(new GuiButtonExt(16, guiLeft + 107, guiTop + 60, 10, 10,
-				">"));
-	}
-
-	@Override
-	protected void actionPerformed(GuiButton button)
-	{
-		if(bigCopy != null && bigCopyTags != null)
-		{
-			switch(button.id)
-			{
-				case 1:
-					if(leftButtonPosX > 0)
-					{
-						leftButtonPosX--;
-					}
-					break;
-				case 2:
-					if(leftButtonPosX + 3 < ((ToolCore) bigCopy.getItem()).getPartAmount())
-					{
-						leftButtonPosX++;
-					}
-					break;
-
-				case 3:
-					TinkersDefense.INSTANCE.sendToServer(new Message_FinishingAnvil(
-							inventory.xCoord, inventory.yCoord,
-							inventory.zCoord, bigCopy));
-					break;
-
-				case 4:
-					leftSelect = 0 + leftButtonPosX;
-					rightButtonPos = 0;
-					setRenders();
-					break;
-				case 5:
-					leftSelect = 1 + leftButtonPosX;
-					rightButtonPos = 0;
-					setRenders();
-					break;
-				case 6:
-					leftSelect = 2 + leftButtonPosX;
-					rightButtonPos = 0;
-					setRenders();
-					break;
-
-				case 7:
-					if(rightButtonPos > 0)
-					{
-						rightButtonPos--;
-					}
-					setRenders();
-					break;
-
-				case 13:
-					renderFlat = !renderFlat;
-					break;
-
-				case 14:
-					renderBiped = !renderBiped;
-					break;
-
-				case 15:
-					if(rotation <= 0)
-					{
-						rotation += 360;
-					}
-					rotation -= 8;
-					break;
-
-				case 16:
-					if(rotation >= 360)
-					{
-						rotation -= 360;
-					}
-					rotation += 8;
-					break;
-
-				default:
-					if(bigCopy.getItem() instanceof ArmorCore)
-					{
-						doArmorEdit(button.id);
-					}
-					else
-					{
-						doToolEdit(button.id);
-					}
-			}
-		}
-	}
-
-	public void doToolEdit(int id)
-	{
-		switch(id)
-		{
-			case 9:
-				if(bigCopyTags.hasKey("Render" + renders[leftSelect]))
-				{
-					bigCopyTags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + (rightButtonPos * TinkersDefense.config.MaterialIndex));
-					if(rightButtonPos > 0)
-					{
-						bigCopyTags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
-					}
-					else
-					{
-						bigCopyTags.removeTag(renders[leftSelect] + "Color");
-					}
-				}
-				break;
-
-			case 10:
-				if(bigCopyTags.hasKey("Render" + renders[leftSelect]))
-				{
-					bigCopyTags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 1) * TinkersDefense.config.MaterialIndex));
-					bigCopyTags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
-				}
-				break;
-
-			case 11:
-				if(bigCopyTags.hasKey("Render" + renders[leftSelect]))
-				{
-					bigCopyTags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 2) * TinkersDefense.config.MaterialIndex));
-					bigCopyTags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
-				}
-				break;
-
-			case 12:
-				bigCopyTags.setInteger("RenderHead", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[0]));
-				bigCopyTags.setInteger("RenderAccessory", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[1]));
-				bigCopyTags.setInteger("RenderHandle", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[2]));
-				bigCopyTags.setInteger("RenderExtra", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[3]));
-
-				bigCopyTags.removeTag(renders[0] + "Color");
-				bigCopyTags.removeTag(renders[1] + "Color");
-				bigCopyTags.removeTag(renders[2] + "Color");
-				bigCopyTags.removeTag(renders[3] + "Color");
-
-				setRenders();
-				break;
-
-			case 8:
-				rightButtonPos++;
-				setRenders();
-				break;
-
-		}
-	}
-
-	public void doArmorEdit(int id)
-	{
-		NBTTagCompound aTags = bigCopy.getTagCompound().getCompoundTag("ArmorRenderer");
-		final ArmorCore armor = (ArmorCore) bigCopy.getItem();
-		final List<ModelRenderer> boxes = armor.getRenderer().boxList;
-
-		switch(id)
-		{
-			case 9:
-				aTags.setBoolean(boxes.get(rightButtonPos + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPos + 9).boxName));
-				break;
-
-			case 10:
-				aTags.setBoolean(boxes.get(rightButtonPos + 1 + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPos + 1 + 9).boxName));
-				break;
-
-			case 11:
-				aTags.setBoolean(boxes.get(rightButtonPos + 2 + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPos + 2 + 9).boxName));
-				break;
-
-			case 12:
-				aTags = armor.getRenderer().defaultTags;
-				break;
-
-			case 8:
-				if(rightButtonPos < boxes.size() - 12)
-				{
-					rightButtonPos++;
-				}
-				break;
-
-		}
-	}
-
-	@Override
-	public void drawScreen(int x, int y, float par3)
-	{
-
-		if(inventory.getStackInSlot(0) != null && inventory.getStackInSlot(0).getItem() instanceof ToolCore)
-		{
-			if(bigCopy == null)
-			{
-				rightButtonPos = 0;
-				leftButtonPosX = 0;
-				bigCopy = inventory.getStackInSlot(0).copy();
-				if(bigCopy.hasTagCompound() && bigCopy.getTagCompound().hasKey("InfiTool"))
-				{
-					bigCopyTags = bigCopy.getTagCompound().getCompoundTag("InfiTool");
-				}
-				setRenders();
-			}
-			else if(bigCopy != null && inventory.getStackInSlot(0).getItem() != bigCopy.getItem() || inventory.getStackInSlot(0).getItemDamage() != bigCopy.getItemDamage())
-			{
-				bigCopy = null;
-			}
-		}
-		else if(inventory.getStackInSlot(0) == null)
-		{
-			bigCopy = null;
-		}
-
-		super.drawScreen(x, y, par3);
-		drawTooltip(x, y);
-	}
-
-	@Override
-	protected void drawGuiContainerForegroundLayer(int par1, int par2)
-	{
-
-		mc.getTextureManager().bindTexture(iconLocation);
-
-		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-
-		drawTexturedModalRect(144, 14, 5, 167, 5, 3);
-		drawTexturedModalRect(144, 64, 0, 167, 5, 3);
-		drawTexturedModalRect(39, 54, 32, 176, 16, 16);
-		drawTexturedModalRect(39, 12, 48, 176, 16, 16);
-		drawTexturedModalRect(28, 14, 5, 167, 5, 3);
-		drawTexturedModalRect(28, 64, 0, 167, 5, 3);
-		drawTexturedModalRect(121, 54, 16, 176, 16, 16);
-
-		if(bigCopy != null)
-		{
-
-			if(!(bigCopy.getItem() instanceof ArmorCore))
-			{
-				if(renderFlat)
-				{
-					if(leftSelect > 2)
-					{
-						drawTexturedModalRect(7, 13, 16, 192, 16, 16);
-						drawTexturedModalRect(7, 33, 32, 192, 16, 16);
-						drawTexturedModalRect(7, 53, 48, 192, 16, 16);
-					}
-					else
-					{
-						drawTexturedModalRect(7, 13, 0, 192, 16, 16);
-						drawTexturedModalRect(7, 33, 16, 192, 16, 16);
-						drawTexturedModalRect(7, 53, 32, 192, 16, 16);
-					}
-
-					((GuiButtonExt) buttonList.get(14)).enabled = false;
-					((GuiButtonExt) buttonList.get(15)).enabled = false;
-					((GuiButtonExt) buttonList.get(12)).displayString = "3D";
-
-					normalRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), rightCopy1, 153, 13);
-					normalRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), rightCopy2, 153, 33);
-					normalRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), rightCopy3, 153, 53);
-
-				}
-			}
-			else
-			{
-				final NBTTagCompound aTags = bigCopy.getTagCompound().getCompoundTag("ArmorRenderer");
-				final ArmorCore armor = (ArmorCore) bigCopy.getItem();
-				final List<ModelRenderer> boxes = armor.getRenderer().boxList;
-
-				drawTexturedModalRect(7, 13, 0, 176, 16, 16);
-				drawTexturedModalRect(7, 33, 0, 176, 16, 16);
-				drawTexturedModalRect(7, 53, 0, 176, 16, 16);
-
-				//drawTexturedModalRect(153, 13, xRIcon_one + (rightButtonPos * 16), yRIcon_one + (rightButtonPosY * 16), 16, 16);
-
-				drawTexturedModalRect(153, 13, 64 + ((aTags.getBoolean(boxes.get(rightButtonPos + 9).boxName) ? 0 : 1) * 16), 176, 16, 16);
-				drawTexturedModalRect(153, 33, 64 + ((aTags.getBoolean(boxes.get(rightButtonPos + 1 + 9).boxName) ? 0 : 1) * 16), 176, 16, 16);
-				drawTexturedModalRect(153, 53, 64 + ((aTags.getBoolean(boxes.get(rightButtonPos + 2 + 9).boxName) ? 0 : 1) * 16), 176, 16, 16);
-
-			}
-
-			if(renderFlat)
-			{
-				bigRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), bigCopy, 17, 4);
-			}
-
-		}
-
-	}
-
-	@Override
-	protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
-	{
-		mc.getTextureManager().bindTexture(iconLocation);
-		final int k = ((width - xSize) / 2);
-		final int l = (height - ySize) / 2;
-		drawTexturedModalRect(k, l, 0, 0, xSize + 80, ySize);
-
-		if(!renderFlat)
-		{
-			if(bigCopy != null && bigCopy.getItem() instanceof ArmorCore)
-			{
-				((GuiButtonExt) buttonList.get(14)).enabled = true;
-				((GuiButtonExt) buttonList.get(15)).enabled = true;
-
-				((GuiButtonExt) buttonList.get(12)).displayString = "2D";
-
-				final ArmorCore armor = (ArmorCore) bigCopy.getItem();
-
-				final ArmorRenderer renderer = (ArmorRenderer) armor.getArmorModel(null, bigCopy, 0);
-				renderer.isChild = false;
-
-				final float limbs = player.player.prevLimbSwingAmount + (player.player.limbSwingAmount - player.player.prevLimbSwingAmount);
-				final float limbSwing = player.player.limbSwing - player.player.limbSwingAmount * (1.0F);
-
-				GL11.glPushMatrix();
-				GL11.glMatrixMode(GL11.GL_PROJECTION);
-				GL11.glPushMatrix();
-				GL11.glLoadIdentity();
-
-				final ScaledResolution scaledresolution = new ScaledResolution(
-						mc, mc.displayWidth, mc.displayHeight);
-				//GL11.glViewport(this.guiLeft, this.guiTop, this.width, this.height);
-				GL11.glViewport((scaledresolution.getScaledWidth() - 213) / 2 * scaledresolution.getScaleFactor(), (scaledresolution.getScaledHeight() - 240) / 2 * scaledresolution.getScaleFactor(), 320 * scaledresolution.getScaleFactor(), 240 * scaledresolution.getScaleFactor());
-				GL11.glTranslatef(-0.34F, 0.23F, -0.1F);
-				Project.gluPerspective(90.0F, 1.3333334F, 9.0F, 80.0F);
-				final float f1 = 1.0F;
-				GL11.glMatrixMode(GL11.GL_MODELVIEW);
-				GL11.glLoadIdentity();
-				GL11.glColor3d(1f, 1f, 1f);
-				RenderHelper.enableStandardItemLighting();
-				GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-				GL11.glTranslatef(0.0F, 3.3F, -16.0F);
-				GL11.glScalef(f1, f1, f1);
-				final float f2 = 3.0F;
-				GL11.glScalef(f2, f2, f2);
-				GL11.glRotatef(rotation, 0.0F, 1.0F, 0.0F);
-				GL11.glRotatef(180.0F, 1.0F, 0.0F, 0.0F);
-
-				GL11.glEnable(GL12.GL_RESCALE_NORMAL);
-				//renderer.setRotationAngles(limbSwing, limbs, player.player.ticksExisted, 0, player.player.rotationPitch, 0.0625f, player.player);
-				renderer.render(player.player, limbSwing, limbs, player.player.ticksExisted, 0, 0, 0.1f);
-
-				if(renderBiped)
-				{
-					final ModelBiped biped = new ModelBiped(0f);
-					//biped.bipedHeadwear.isHidden = true;
-					//biped.bipedHead.isHidden = true;
-					final ResourceLocation rc = new ResourceLocation(
-							Minecraft.getMinecraft().thePlayer.getLocationSkin().toString());
-
-					FMLClientHandler.instance().getClient().renderEngine.bindTexture(rc);
-					//					final ITextureObject tex = FMLClientHandler.instance().getClient().getTextureManager().getTexture(rc);
-					//					if(tex.getGlTextureId() == 1)
-					//					{
-					//						rc = new ResourceLocation(
-					//								"minecraft:textures/entity/steve.png");
-					//						FMLClientHandler.instance().getClient().renderEngine.bindTexture(rc);
-					//					}
-
-					biped.isChild = false;
-					biped.render(player.player, limbSwing, limbs, player.player.ticksExisted, 0, 0, 0.0625f);
-				}
-
-				GL11.glDisable(GL12.GL_RESCALE_NORMAL);
-				RenderHelper.disableStandardItemLighting();
-				GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-				GL11.glMatrixMode(GL11.GL_PROJECTION);
-				GL11.glViewport(0, 0, mc.displayWidth, mc.displayHeight);
-				GL11.glPopMatrix();
-				GL11.glMatrixMode(GL11.GL_MODELVIEW);
-				GL11.glPopMatrix();
-				//RenderHelper.disableStandardItemLighting();
-				GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-			}
-			else
-			{
-				renderFlat = true;
-			}
-		}
-
-	}
-
-	protected void drawTooltip(int x, int y)
-	{
-		final int buttons[] = {4, 5, 6, 9, 10, 11};
-
-		for(int i = 0; i < buttons.length; i++)
-		{
-			final GuiButtonExt button = ((GuiButtonExt) buttonList.get(buttons[i] - 1));
-			final boolean mousehover = x >= button.xPosition && y >= button.yPosition && x < button.xPosition + button.width && y < button.yPosition + button.height;
-			final int test = button.getHoverState(mousehover);
-			if(test == 2)
-			{
-				final List<String> list = new ArrayList();
-
-				if(bigCopy.getItem() instanceof ArmorCore)
-				{
-					bigCopy.getTagCompound().getCompoundTag("ArmorRenderer");
-					final ArmorCore armor = (ArmorCore) bigCopy.getItem();
-					final List<ModelRenderer> boxes = armor.getRenderer().boxList;
-
-					switch(i)
-					{
-						case 0:
-						case 1:
-						case 2:
-							break;
-
-						case 3:
-							list.add(boxes.get(rightButtonPos + 9).boxName);
-							break;
-						case 4:
-							list.add(boxes.get(rightButtonPos + 1 + 9).boxName);
-							break;
-						case 5:
-							list.add(boxes.get(rightButtonPos + 2 + 9).boxName);
-							break;
-					}
-					func_146283_a(list, x, y);
-				}
-				else if(bigCopy != null && bigCopy.getItem() instanceof ToolCore)
-				{
-					final ToolCore tool = (ToolCore) bigCopy.getItem();
-					final String toolName = tool.getUnlocalizedName().toLowerCase().substring(tool.getUnlocalizedName().lastIndexOf('.') + 1, tool.getUnlocalizedName().length());
-					final ToolCoreTip tt = ((Injector) TinkersDefense.tcInject).tools.get(toolName);
-
-					if(tt != null)
-					{
-						switch(i)
-						{
-							case 0:
-								list.add(tt.getPart(1 + leftButtonPosX));
-								break;
-							case 2:
-								list.add(tt.getPart(3 + leftButtonPosX));
-								break;
-							case 1:
-								list.add(tt.getPart(2 + leftButtonPosX));
-								break;
-
-							case 3:
-								list.add(tt.getPartName(leftSelect + 1, (rightButtonPos)));
-								break;
-							case 4:
-								list.add(tt.getPartName(leftSelect + 1, (rightButtonPos + 1)));
-								break;
-							case 5:
-								list.add(tt.getPartName(leftSelect + 1, (rightButtonPos + 2)));
-								break;
-						}
-
-						if(list.get(0).contains("m5"))
-						{
-							list.add(" -by Shadowclaimer");
-						}
-						func_146283_a(list, x, y);
-					}
-
-					else
-					{
-						list.add("Error - No name/desc!");
-						func_146283_a(list, x, y);
-					}
-				}
-			}
-		}
-	}
-
-	void setRenders()
-	{
-		rightCopy1 = bigCopy.copy();
-		rightCopyTags1 = (NBTTagCompound) bigCopyTags.copy();
-		rightCopyTags1.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos) * TinkersDefense.config.MaterialIndex));
-		rightCopyTags1.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
-		rightCopy1.getTagCompound().setTag("InfiTool", rightCopyTags1);
-
-		rightCopy2 = bigCopy.copy();
-		rightCopyTags2 = (NBTTagCompound) bigCopyTags.copy();
-		rightCopyTags2.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 1) * TinkersDefense.config.MaterialIndex));
-		rightCopyTags2.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
-		rightCopy2.getTagCompound().setTag("InfiTool", rightCopyTags2);
-
-		rightCopy3 = bigCopy.copy();
-		rightCopyTags3 = (NBTTagCompound) bigCopyTags.copy();
-		rightCopyTags3.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 2) * TinkersDefense.config.MaterialIndex));
-		rightCopyTags3.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
-		rightCopy3.getTagCompound().setTag("InfiTool", rightCopyTags3);
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java
deleted file mode 100644
index 843b6c9..0000000
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil;
-
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.entity.Entity;
-
-/**
- * Armor Anvil - lance5057
- * Created using Tabula 4.1.1
- */
-public class ModelFinishingAnvil extends ModelBase
-{
-	public ModelRenderer	Log;
-	public ModelRenderer	HammerHead;
-	public ModelRenderer	HammerHandle;
-	public ModelRenderer	AnvilBase;
-	public ModelRenderer	AnvilStem;
-	public ModelRenderer	AnvilTop;
-
-	public ModelFinishingAnvil()
-	{
-		textureWidth = 64;
-		textureHeight = 64;
-		AnvilTop = new ModelRenderer(this, 0, 22);
-		AnvilTop.setRotationPoint(-4.0F, 6.0F, -6.0F);
-		AnvilTop.addBox(0.0F, 0.0F, 0.0F, 8, 6, 12, 0.0F);
-		HammerHead = new ModelRenderer(this, 15, 21);
-		HammerHead.setRotationPoint(-1.3F, 4.0F, 0.0F);
-		HammerHead.addBox(0.0F, 0.0F, 0.0F, 3, 2, 2, 0.0F);
-		setRotateAngle(HammerHead, 0.091106186954104F, -0.5462880558742251F, 0.0F);
-		AnvilStem = new ModelRenderer(this, 10, 32);
-		AnvilStem.setRotationPoint(-2.0F, 12.0F, -3.0F);
-		AnvilStem.addBox(0.0F, 0.0F, 0.0F, 4, 2, 6, 0.0F);
-		HammerHandle = new ModelRenderer(this, 17, 47);
-		HammerHandle.setRotationPoint(1.0F, 0.5F, -6.0F);
-		HammerHandle.addBox(0.0F, 0.0F, 0.0F, 1, 1, 6, 0.0F);
-		AnvilBase = new ModelRenderer(this, 2, 28);
-		AnvilBase.setRotationPoint(-4.0F, 14.0F, -5.0F);
-		AnvilBase.addBox(0.0F, 0.0F, 0.0F, 8, 2, 10, 0.0F);
-		Log = new ModelRenderer(this, 0, 40);
-		Log.setRotationPoint(-8.0F, 16.0F, -8.0F);
-		Log.addBox(0.0F, 0.0F, 0.0F, 16, 8, 16, 0.0F);
-		HammerHead.addChild(HammerHandle);
-	}
-
-	@Override
-	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
-	{
-		AnvilTop.render(f5);
-		HammerHead.render(f5);
-		AnvilStem.render(f5);
-		AnvilBase.render(f5);
-		Log.render(f5);
-	}
-
-	/**
-	 * This is a helper function from Tabula to set the rotation of model parts
-	 */
-	public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z)
-	{
-		modelRenderer.rotateAngleX = x;
-		modelRenderer.rotateAngleY = y;
-		modelRenderer.rotateAngleZ = z;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java
deleted file mode 100644
index 834b583..0000000
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil;
-
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.entity.RenderItem;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-import org.lwjgl.opengl.GL11;
-
-public class RenderItem_FinishingAnvil extends RenderItem
-{
-	private final Gui_FinishingAnvil	anvilGui;
-	float								sx;
-	float								sy;
-	float								sz;
-
-	RenderItem_FinishingAnvil(Gui_FinishingAnvil gui, float sx, float sy, float sz)
-	{
-		super();
-		anvilGui = gui;
-		this.sx = sx;
-		this.sy = sy;
-		this.sz = sz;
-	}
-
-	@Override
-	public void renderItemAndEffectIntoGUI(FontRenderer fontRenderer, TextureManager textureManager, ItemStack itemStack, int x, int y)
-	{
-		if(itemStack == null)
-			return;
-
-		RenderHelper.enableGUIStandardItemLighting();
-
-		final Slot slot = anvilGui.inventorySlots.getSlotFromInventory(anvilGui.inventory, 0);
-
-		if(slot.getStack() != null)
-		{
-			GL11.glPushMatrix();
-
-			GL11.glScalef(sx, sy, sz);
-			super.renderItemAndEffectIntoGUI(fontRenderer, textureManager, itemStack, x, y);
-
-			GL11.glPopMatrix();
-		}
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java
deleted file mode 100644
index c3013e4..0000000
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.entity.Entity;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ResourceLocation;
-
-import org.lwjgl.opengl.GL11;
-
-public class Renderer_FinishingAnvil extends TileEntitySpecialRenderer
-{
-	private final ModelFinishingAnvil	model;
-
-	public Renderer_FinishingAnvil()
-	{
-		model = new ModelFinishingAnvil();
-	}
-
-	@Override
-	public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale)
-	{
-
-		GL11.glPushMatrix();
-
-		GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
-
-		final ResourceLocation textures = (new ResourceLocation(
-				"tinkersdefense:textures/blocks/armoranvil.png"));
-
-		Minecraft.getMinecraft().renderEngine.bindTexture(textures);
-
-		GL11.glPushMatrix();
-
-		te.getBlockMetadata();
-
-		GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
-
-		model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
-		GL11.glPopMatrix();
-		GL11.glPopMatrix();
-
-	}
-
-}
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java
deleted file mode 100644
index e0567bb..0000000
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.Packet;
-import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.Constants;
-
-public class TileEntity_FinishingAnvil extends TileEntity implements IInventory
-{
-	public static int		invSize	= 1;
-	public ItemStack[]		inventory;
-
-	private final String	name	= "Anvil Inventory";
-
-	public TileEntity_FinishingAnvil()
-	{
-		super();
-		inventory = new ItemStack[invSize];
-	}
-
-	@Override
-	public void updateEntity()
-	{
-		super.updateEntity();
-	}
-
-	@Override
-	public Packet getDescriptionPacket()
-	{
-		final NBTTagCompound tag = new NBTTagCompound();
-		writeToNBT(tag);
-		return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 0, tag);
-	}
-
-	@Override
-	public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt)
-	{
-		readFromNBT(pkt.func_148857_g());
-	}
-
-	@Override
-	public int getSizeInventory()
-	{
-		return invSize;
-	}
-
-	@Override
-	public ItemStack getStackInSlot(int slot)
-	{
-		return inventory[slot];
-	}
-
-	@Override
-	public ItemStack decrStackSize(int slot, int amount)
-	{
-		ItemStack stack = getStackInSlot(slot);
-		if(stack != null)
-		{
-			if(stack.stackSize > amount)
-			{
-				stack = stack.splitStack(amount);
-
-				if(stack.stackSize == 0)
-				{
-					setInventorySlotContents(slot, null);
-				}
-			}
-			else
-			{
-				setInventorySlotContents(slot, null);
-			}
-
-			markDirty();
-		}
-		return stack;
-	}
-
-	@Override
-	public ItemStack getStackInSlotOnClosing(int slot)
-	{
-		final ItemStack stack = getStackInSlot(slot);
-
-		if(stack != null)
-		{
-			setInventorySlotContents(slot, stack);
-		}
-		return stack;
-	}
-
-	@Override
-	public void setInventorySlotContents(int slot, ItemStack itemstack)
-	{
-		inventory[slot] = itemstack;
-
-		if(itemstack != null && itemstack.stackSize > getInventoryStackLimit())
-		{
-			itemstack.stackSize = getInventoryStackLimit();
-		}
-
-		markDirty();
-	}
-
-	@Override
-	public String getInventoryName()
-	{
-		return name;
-	}
-
-	@Override
-	public boolean hasCustomInventoryName()
-	{
-		return name.length() > 0;
-	}
-
-	@Override
-	public int getInventoryStackLimit()
-	{
-		return 1;
-	}
-
-	@Override
-	public boolean isUseableByPlayer(EntityPlayer p_70300_1_)
-	{
-		return true;
-	}
-
-	@Override
-	public void openInventory()
-	{
-
-	}
-
-	@Override
-	public void closeInventory()
-	{
-
-	}
-
-	@Override
-	public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_)
-	{
-		return true;
-	}
-
-	@Override
-	public void writeToNBT(NBTTagCompound compound)
-	{
-		super.writeToNBT(compound);
-		writeInventoryToNBT(compound);
-	}
-
-	@Override
-	public void readFromNBT(NBTTagCompound compound)
-	{
-		super.readFromNBT(compound);
-		readInventoryFromNBT(compound);
-	}
-
-	public void readInventoryFromNBT(NBTTagCompound tags)
-	{
-		final NBTTagList nbttaglist = tags.getTagList("Items", Constants.NBT.TAG_COMPOUND);
-		for(int iter = 0; iter < nbttaglist.tagCount(); iter++)
-		{
-			final NBTTagCompound tagList = nbttaglist.getCompoundTagAt(iter);
-			final byte slotID = tagList.getByte("Slot");
-			if(slotID >= 0 && slotID < inventory.length)
-			{
-				inventory[slotID] = ItemStack.loadItemStackFromNBT(tagList);
-			}
-		}
-	}
-
-	public void writeInventoryToNBT(NBTTagCompound tags)
-	{
-		final NBTTagList nbttaglist = new NBTTagList();
-		for(int iter = 0; iter < inventory.length; iter++)
-		{
-			if(inventory[iter] != null)
-			{
-				final NBTTagCompound tagList = new NBTTagCompound();
-				tagList.setByte("Slot", (byte) iter);
-				inventory[iter].writeToNBT(tagList);
-				nbttaglist.appendTag(tagList);
-			}
-		}
-
-		tags.setTag("Items", nbttaglist);
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/FileGetter.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/FileGetter.java
deleted file mode 100644
index 9221376..0000000
--- a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/FileGetter.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package lance5057.tDefense.finishingAnvil.utilities;
-
-import java.nio.file.FileVisitResult;
-import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
-import java.util.List;
-
-public class FileGetter extends SimpleFileVisitor<Path>
-{
-	final public List<String>	filenames	= new ArrayList<String>();
-
-	@Override
-	public FileVisitResult visitFile(Path file,
-			BasicFileAttributes attr)
-	{
-		filenames.add(file.getFileName().toString());
-		return FileVisitResult.CONTINUE;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
deleted file mode 100644
index 9b2138f..0000000
--- a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
+++ /dev/null
@@ -1,722 +0,0 @@
-package lance5057.tDefense.finishingAnvil.utilities;
-
-import java.io.IOException;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import lance5057.tDefense.Reference;
-import lance5057.tDefense.TinkersDefense;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.Item;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.ResourceLocation;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.crafting.PatternBuilder;
-import tconstruct.library.crafting.PatternBuilder.MaterialSet;
-import tconstruct.library.tools.ToolCore;
-
-public class Injector extends ToolCore
-{
-	List<String>						heads		= new ArrayList<String>();
-	List<String>						accessories	= new ArrayList<String>();
-	List<String>						handles		= new ArrayList<String>();
-	List<String>						extras		= new ArrayList<String>();
-
-	public HashMap<String, ToolCoreTip>	tools		= new HashMap<String, ToolCoreTip>();
-
-	public Injector(int baseDamage)
-	{
-		super(0);
-	}
-
-	protected void loadHeads(IIconRegister iconRegister)
-	{
-
-		//		final URL jarFile =
-		//				TinkersDefense.class.getResource("assets/tinkersdefense/textures/items/");
-
-		final int toolLength = TConstructRegistry.tools.size();
-		for(int i = 0; i < toolLength; i++)
-		{
-			final String toolName = TConstructRegistry.tools.get(i).getUnlocalizedName().toLowerCase().substring(TConstructRegistry.tools.get(i).getUnlocalizedName().lastIndexOf('.') + 1, TConstructRegistry.tools.get(i).getUnlocalizedName().length());
-			final String path = "/assets/tinkersdefense/textures/items/" + toolName + "/";
-
-			final ResourceLocation loc = new ResourceLocation(
-					"tinkersdefense:textures/items/");
-			//final InputStream in = Minecraft.getMinecraft().getResourceManager().getResource(loc).getInputStream();
-			//final List<String> filenames = new ArrayList<String>();
-			//final File files = new File(Minecraft.getMinecraft().mcDataDir.getPath() + "/mods/tinkersdefense-1.3.6.jar");
-
-			final Path zipfile = Paths.get(Minecraft.getMinecraft().mcDataDir.getPath() + "/mods/" + Reference.MOD_ID + "-" + Reference.VERSION + ".jar");
-			//			if(Files.exists(zipfile))
-			//			{
-			Path root = null;
-			FileSystem fs;
-			try
-			{
-				fs = FileSystems.newFileSystem(zipfile, Minecraft.class.getClassLoader());
-				root = fs.getPath(path);
-			}
-			catch(final IOException e)
-			{
-				// TODO Auto-generated catch block
-				//e.printStackTrace();
-				continue;
-			}
-
-			//final Iterable<FileStore> files = fs.getFileStores();
-			final FileGetter fileget = new FileGetter();
-
-			if(root != null)
-			{
-				try
-				{
-					Files.walkFileTree(root, fileget);
-				}
-				catch(final IOException e)
-				{
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-
-			//IDE
-			//final File files = new File(url.toURI());
-
-			if(TinkersDefense.config.debug)
-			{
-				for(final String file : fileget.filenames)
-				{
-					System.out.println(file);
-				}
-			}
-			setup(TConstructRegistry.tools.get(i), toolName, fileget.filenames, iconRegister);
-		}
-	}
-
-	//	}
-
-	//}
-	//}
-
-	private void setup(ToolCore tool, String name, List<String> filenames, IIconRegister iconRegister)
-	{
-		{
-			heads.clear();
-			accessories.clear();
-			handles.clear();
-			extras.clear();
-
-			headStrings.clear();
-			headIcons.clear();
-			accessoryStrings.clear();
-			accessoryIcons.clear();
-			handleStrings.clear();
-			handleIcons.clear();
-			extraStrings.clear();
-			extraIcons.clear();
-
-			final IIcon origHead = tool.headIcons.get(-1);
-			final IIcon origAccessory = tool.accessoryIcons.get(-1);
-			final IIcon origHandle = tool.handleIcons.get(-1);
-			final IIcon origExtra = tool.extraIcons.get(-1);
-
-			final ToolCoreTip tt = new ToolCoreTip();
-
-			tt.accessory = "Accessory";
-			tt.head = "Head";
-			tt.handle = "Handle";
-			tt.extra = "Extra";
-
-			tt.headTT.add("Standard");
-			tt.accessoryTT.add("Standard");
-			tt.handleTT.add("Standard");
-			tt.extraTT.add("Standard");
-
-			for(int i = 0; i < filenames.size(); i++)
-			{
-				final String filename = filenames.get(i);
-
-				if(filename.contains("head"))
-				{
-					String formatted = filename.substring(0, filename.indexOf(".png"));
-					heads.add(formatted);
-					formatted = formatted.substring(1, formatted.length());
-					formatted = formatted.replace('_', ' ');
-					tt.headTT.add(formatted);
-				}
-
-				if(filename.contains("accessory"))
-				{
-					String formatted = filename.substring(0, filename.indexOf(".png"));
-					accessories.add(formatted);
-					formatted = formatted.substring(1, formatted.length());
-					formatted.replace("_", " ");
-					tt.accessoryTT.add(formatted);
-				}
-
-				if(filename.contains("handle"))
-				{
-					String formatted = filename.substring(0, filename.indexOf(".png"));
-					handles.add(formatted);
-					formatted = formatted.substring(1, formatted.length());
-					formatted.replace("_", " ");
-					tt.handleTT.add(formatted);
-				}
-
-				if(filename.contains("extra"))
-				{
-					String formatted = filename.substring(0, filename.indexOf(".png"));
-					extras.add(formatted);
-					formatted = formatted.substring(1, formatted.length());
-					formatted.replace("_", " ");
-					tt.extraTT.add(formatted);
-				}
-			}
-			//			tt.headTT.add("Magic Backhead");
-			//			tt.headTT.add("Scythe Backhead");
-			//
-			//			extras.add("_magic_extra");
-			//			extras.add("_scythe_extra");
-			//			extras.add("_halbard_extra");
-			//			extras.add("_ornate_extra");
-			//
-			//			tt.extraTT.add("Halbard Head");
-			//			tt.extraTT.add("Magic Head");
-			//			tt.extraTT.add("Scythe Head");
-			//			tt.extraTT.add("Ornate Head");
-			//
-			//			accessories.add("_magic_accessory");
-			//			accessories.add("_halbard_accessory");
-			//			accessories.add("_knob_accessory");
-
-			//Metallurgy 5
-
-			tools.put(name, tt);
-
-			//			if(tool.getToolName().equals("Battleaxe"))
-			//			{
-			//				BattleAxe();
-			//			}
-			//			if(tool.getToolName().equals("Arrow"))
-			//			{
-			//				Arrow();
-			//			}
-			//			if(tool.getToolName().equals("Broadsword"))
-			//			{
-			//				Broadsword();
-			//			}
-			//			if(tool.getToolName().equals("Battlesign"))
-			//			{
-			//				Battlesign();
-			//			}
-			//			if(tool.getToolName().equals("Hatchet"))
-			//			{
-			//				Axe();
-			//			}
-			//			if(tool.getToolName().equals("Mattock"))
-			//			{
-			//				Mattock();
-			//			}
-			//			if(tool.getToolName().equals("Longbow"))
-			//			{
-			//				Longbow();
-			//			}
-			//			if(tool.getToolName().equals("HeaterShield"))
-			//			{
-			//				HeaterShield();
-			//			}
-			setupIcons(tool, iconRegister, heads, headStrings, headIcons);
-			setupIcons(tool, iconRegister, accessories, accessoryStrings, accessoryIcons);
-			setupIcons(tool, iconRegister, handles, handleStrings, handleIcons);
-			setupIcons(tool, iconRegister, extras, extraStrings, extraIcons);
-
-			tool.headStrings.putAll(headStrings);
-			tool.headIcons.putAll(headIcons);
-
-			tool.accessoryStrings.putAll(accessoryStrings);
-			tool.accessoryIcons.putAll(accessoryIcons);
-
-			tool.handleStrings.putAll(handleStrings);
-			tool.handleIcons.putAll(handleIcons);
-
-			tool.extraStrings.putAll(extraStrings);
-			tool.extraIcons.putAll(extraIcons);
-
-			tool.headIcons.put(-1, origHead);
-			tool.accessoryIcons.put(-1, origAccessory);
-			tool.handleIcons.put(-1, origHandle);
-			tool.extraIcons.put(-1, origExtra);
-		}
-	}
-
-	@Override
-	public void registerIcons(IIconRegister iconRegister)
-	{
-		loadHeads(iconRegister);
-	}
-
-	@Override
-	public String getDefaultTexturePath()
-	{
-		return "tinkersdefense:" + getDefaultFolder();
-	}
-
-	@Override
-	public Item getAccessoryItem()
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getDefaultFolder()
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getEffectSuffix()
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public Item getHeadItem()
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getIconSuffix(int arg0)
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String[] getTraits()
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void setupIcons(ToolCore tool, IIconRegister iconRegister, List<String> newList, HashMap<Integer, String> toolStrings, HashMap<Integer, IIcon> toolIcons)
-	{
-		for(int i = 0; i < newList.size(); i++)
-		{
-			final PatternBuilder pb = PatternBuilder.instance;
-			for(final Map.Entry<String, MaterialSet> entry : pb.materialSets.entrySet())
-			{
-				String icon = "tinkersdefense:";
-				icon += tool.getDefaultFolder() + "/" + newList.get(i);
-				//toolIcons[i] = icon;
-				toolStrings.put(entry.getValue().materialID + (TinkersDefense.config.MaterialIndex * (i + 1)), icon);
-			}
-		}
-
-		addIcons(toolStrings, toolIcons, iconRegister, null, false);
-	}
-
-	void BattleAxe()
-	{
-		final ToolCoreTip tt = new ToolCoreTip();
-
-		tt.accessory = "Front Head";
-		tt.head = "Back Head";
-		tt.handle = "Handle";
-		tt.extra = "Binding";
-
-		heads.add("_halbard_head");
-		heads.add("_magic_head");
-		heads.add("_scythe_head");
-
-		tt.headTT.add("Halbard Backhead");
-		tt.headTT.add("Magic Backhead");
-		tt.headTT.add("Scythe Backhead");
-
-		extras.add("_magic_extra");
-		extras.add("_scythe_extra");
-		extras.add("_halbard_extra");
-		extras.add("_ornate_extra");
-
-		tt.extraTT.add("Halbard Head");
-		tt.extraTT.add("Magic Head");
-		tt.extraTT.add("Scythe Head");
-		tt.extraTT.add("Ornate Head");
-
-		accessories.add("_magic_accessory");
-		accessories.add("_halbard_accessory");
-		accessories.add("_knob_accessory");
-
-		//Metallurgy 5
-
-		tools.put("Battleaxe", tt);
-	}
-
-	void Axe()
-	{
-		final ToolCoreTip tt = new ToolCoreTip();
-
-		tt.head = "Head";
-		tt.handle = "Handle";
-
-		heads.add("_thin_head");
-		tt.headTT.add("Thin Head");
-		heads.add("_minecraft_head");
-		tt.headTT.add("Vanilla Head");
-		heads.add("_m5zinc_head");
-		tt.headTT.add("Metallurgy 5 Zinc Head");
-		heads.add("_m5whitegold_head");
-		tt.headTT.add("Metallurgy 5 WhiteGold Head");
-		heads.add("_m5tin_head");
-		tt.headTT.add("Metallurgy 5 Tin Head");
-		heads.add("_m5silver_head");
-		tt.headTT.add("Metallurgy 5 Silver Head");
-		heads.add("_m5rosegold_head");
-		tt.headTT.add("Metallurgy 5 RoseGold Head");
-		heads.add("_m5platinum_head");
-		tt.headTT.add("Metallurgy 5 Platinum Head");
-		heads.add("_m5pewter_head");
-		tt.headTT.add("Metallurgy 5 Pewter Head");
-		heads.add("_m5nickelsteel_head");
-		tt.headTT.add("Metallurgy 5 NickelSteel Head");
-		heads.add("_m5nickel_head");
-		tt.headTT.add("Metallurgy 5 Nickel Head");
-		heads.add("_m5monel_head");
-		tt.headTT.add("Metallurgy 5 Monel Head");
-		heads.add("_m5molybdochalkos_head");
-		tt.headTT.add("Metallurgy 5 Molybdochalkos Head");
-		heads.add("_m5manganesesteel_head");
-		tt.headTT.add("Metallurgy 5 ManganeseSteel Head");
-		heads.add("_m5manganese_head");
-		tt.headTT.add("Metallurgy 5 Manganese Head");
-		heads.add("_m5lead_head");
-		tt.headTT.add("Metallurgy 5 Lead Head");
-		heads.add("_m5iron_head");
-		tt.headTT.add("Metallurgy 5 Iron Head");
-		heads.add("_m5ignatius_head");
-		tt.headTT.add("Metallurgy 5 Ignatius Head");
-		heads.add("_m5hepatizon_head");
-		tt.headTT.add("Metallurgy 5 Hepatizon Head");
-		heads.add("_m5heavysteel_head");
-		tt.headTT.add("Metallurgy 5 HeavySteel Head");
-		heads.add("_m5gold_head");
-		tt.headTT.add("Metallurgy 5 Gold Head");
-		heads.add("_m5fungalsteel_head");
-		tt.headTT.add("Metallurgy 5 FungalSteel Head");
-		heads.add("_m5electrum_head");
-		tt.headTT.add("Metallurgy 5 Electrum Head");
-		heads.add("_m5diamond_head");
-		tt.headTT.add("Metallurgy 5 Diamond Head");
-		heads.add("_m5damascussteel_head");
-		tt.headTT.add("Metallurgy 5 DamascusSteel Head");
-		heads.add("_m5cupronickel_head");
-		tt.headTT.add("Metallurgy 5 Cupronickel Head");
-		heads.add("_m5crowngold_head");
-		tt.headTT.add("Metallurgy 5 CrownGold Head");
-		heads.add("_m5copper_head");
-		tt.headTT.add("Metallurgy 5 Copper Head");
-		heads.add("_m5bronze_head");
-		tt.headTT.add("Metallurgy 5 Bronze Head");
-		heads.add("_m5brass_head");
-		tt.headTT.add("Metallurgy 5 Brass Head");
-		heads.add("_m5angmallen_head");
-		tt.headTT.add("Metallurgy 5 Angmallen Head");
-		heads.add("_broad_head");
-		tt.headTT.add("Broad Head");
-		heads.add("_bearded_head");
-		tt.headTT.add("Bearded Head");
-
-		handles.add("_long_handle");
-		tt.handleTT.add("Long Handle");
-		handles.add("_ornate_handle");
-		tt.handleTT.add("Ornate Handle");
-		handles.add("_longornate_handle");
-		tt.handleTT.add("Long Ornate Handle");
-		handles.add("_offset_handle");
-		tt.handleTT.add("Offset Handle");
-		handles.add("_offsetlong_handle");
-		tt.handleTT.add("Offset Long Handle");
-		handles.add("_offsetornate_handle");
-		tt.handleTT.add("Offset Ornate Handle");
-		handles.add("_offsetlongornate_handle");
-		tt.handleTT.add("Offset Long Ornate Handle");
-
-		tools.put("Hatchet", tt);
-	}
-
-	void Battlesign()
-	{
-		handles.add("_small_handle");
-		handles.add("_smalllong_handle");
-
-		heads.add("_arrow_head");
-		heads.add("_caution_head");
-		heads.add("_noentry_head");
-		heads.add("_railroad_head");
-		heads.add("_stop_head");
-		heads.add("_X_head");
-	}
-
-	void Arrow()
-	{
-		heads.add("_broad_head");
-		heads.add("_elven_head");
-		heads.add("_horned_head");
-		heads.add("_trident_head");
-		heads.add("_winged_head");
-
-		handles.add("_bulbous_handle");
-		handles.add("_natural_handle");
-
-		accessories.add("_matted_accessory");
-		accessories.add("_magic_accessory");
-		accessories.add("_pixie_accessory");
-		accessories.add("_small_accessory");
-	}
-
-	void Broadsword()
-	{
-		final ToolCoreTip tt = new ToolCoreTip();
-
-		tt.head = "Blade";
-		tt.accessory = "Guard";
-		tt.handle = "Handle";
-
-		tt.headTT.add("Standard Blade");
-		heads.add("_tapered_head");
-		tt.headTT.add("Tapered Blade");
-		heads.add("_dull_head");
-		tt.headTT.add("Dull Blade");
-		heads.add("_glass_head");
-		tt.headTT.add("Glass Blade");
-		heads.add("_plumed_head");
-		tt.headTT.add("Plumed Blade");
-		heads.add("_spiked_head");
-		tt.headTT.add("Spiked Blade");
-		heads.add("_widebase_head");
-		tt.headTT.add("Widebase Blade");
-		heads.add("_mace_head");
-		tt.headTT.add("Mace \"Blade\"");
-		heads.add("_elusive_head");
-		tt.headTT.add("Elusive Blade");
-		heads.add("_repulsive_head");
-		tt.headTT.add("Repulsive Blade");
-		heads.add("_falchion_head");
-		tt.headTT.add("Falchion Blade");
-		heads.add("_big_head");
-		tt.headTT.add("Big Blade");
-		heads.add("_nofuller_head");
-		tt.headTT.add("No Fuller Blade");
-		heads.add("_segmented_head");
-		tt.headTT.add("Segmented Blade");
-		heads.add("_hourglass_head");
-		tt.headTT.add("Hourglass Blade");
-		heads.add("_flat_head");
-		tt.headTT.add("Flat Tip Blade");
-
-		heads.add("_m5zinc_head");
-		tt.headTT.add("Metallurgy 5 Zinc Blade");
-		heads.add("_m5whitegold_head");
-		tt.headTT.add("Metallurgy 5 WhiteGold Blade");
-		heads.add("_m5tin_head");
-		tt.headTT.add("Metallurgy 5 Tin Blade");
-		heads.add("_m5silver_head");
-		tt.headTT.add("Metallurgy 5 Silver Blade");
-		heads.add("_m5rosegold_head");
-		tt.headTT.add("Metallurgy 5 RoseGold Blade");
-		heads.add("_m5platinum_head");
-		tt.headTT.add("Metallurgy 5 Platinum Blade");
-		heads.add("_m5pewter_head");
-		tt.headTT.add("Metallurgy 5 Pewter Blade");
-		heads.add("_m5nickelsteel_head");
-		tt.headTT.add("Metallurgy 5 NickelSteel Blade");
-		heads.add("_m5nickel_head");
-		tt.headTT.add("Metallurgy 5 Nickel Blade");
-		heads.add("_m5monel_head");
-		tt.headTT.add("Metallurgy 5 Monel Blade");
-		heads.add("_m5molybdochalkos_head");
-		tt.headTT.add("Metallurgy 5 Molybdochalkos Blade");
-		heads.add("_m5manganesesteel_head");
-		tt.headTT.add("Metallurgy 5 ManganeseSteel Blade");
-		heads.add("_m5manganese_head");
-		tt.headTT.add("Metallurgy 5 Manganese Blade");
-		heads.add("_m5lead_head");
-		tt.headTT.add("Metallurgy 5 Lead Blade");
-		heads.add("_m5iron_head");
-		tt.headTT.add("Metallurgy 5 Iron Blade");
-		heads.add("_m5ignatius_head");
-		tt.headTT.add("Metallurgy 5 Ignatius Blade");
-		heads.add("_m5hepatizon_head");
-		tt.headTT.add("Metallurgy 5 Hepatizon Blade");
-		heads.add("_m5heavysteel_head");
-		tt.headTT.add("Metallurgy 5 HeavySteel Blade");
-		heads.add("_m5gold_head");
-		tt.headTT.add("Metallurgy 5 Gold Blade");
-		heads.add("_m5fungalsteel_head");
-		tt.headTT.add("Metallurgy 5 FungalSteel Blade");
-		heads.add("_m5electrum_head");
-		tt.headTT.add("Metallurgy 5 Electrum Blade");
-		heads.add("_m5diamond_head");
-		tt.headTT.add("Metallurgy 5 Diamond Blade");
-		heads.add("_m5damascussteel_head");
-		tt.headTT.add("Metallurgy 5 DamascusSteel Blade");
-		heads.add("_m5cupronickel_head");
-		tt.headTT.add("Metallurgy 5 Cupronickel Blade");
-		heads.add("_m5crowngold_head");
-		tt.headTT.add("Metallurgy 5 CrownGold Blade");
-		heads.add("_m5copper_head");
-		tt.headTT.add("Metallurgy 5 Copper Blade");
-		heads.add("_m5bronze_head");
-		tt.headTT.add("Metallurgy 5 Bronze Blade");
-		heads.add("_m5brass_head");
-		tt.headTT.add("Metallurgy 5 Brass Blade");
-		heads.add("_m5angmallen_head");
-		tt.headTT.add("Metallurgy 5 Angmallen Blade");
-
-		accessories.add("_basket_accessory");
-		accessories.add("_curved_accessory");
-		accessories.add("_elusive_accessory");
-		accessories.add("_extended_accessory");
-		accessories.add("_legendary_accessory");
-		accessories.add("_no_accessory");
-		accessories.add("_basket_accessory");
-		accessories.add("_repulsive_accessory");
-		accessories.add("_square_accessory");
-		accessories.add("_straight_accessory");
-		accessories.add("_straight_accessory");
-		accessories.add("_bulbous_accessory");
-		accessories.add("_sun_accessory");
-		accessories.add("_lamenting_accessory");
-		accessories.add("_pixie_accessory");
-		accessories.add("_forked_accessory");
-
-		handles.add("_ornate_handle");
-		handles.add("_thick_handle");
-		handles.add("_short_handle");
-
-		tools.put("Broadsword", tt);
-	}
-
-	void Mattock()
-	{
-		heads.add("_head_bearded");
-		heads.add("_head_magic");
-		heads.add("_head_scythe");
-		heads.add("head_wide");
-
-		accessories.add("_back_straight");
-
-		heads.add("_m5copper_head");
-		accessories.add("_m5copper_accessory");
-	}
-
-	void Longbow()
-	{
-		heads.add("_m5copper_head");
-		accessories.add("_m5copper_accessory");
-		handles.add("_m5copper_handle");
-		extras.add("_m5copper_extra");
-	}
-
-	void HeaterShield()
-	{
-		final ToolCoreTip tt = new ToolCoreTip();
-
-		tt.head = "Plate";
-		tt.accessory = "Emblem";
-		tt.handle = "Edge";
-		tt.extra = "Binding";
-
-		tt.headTT.add("Standard Plate");
-		heads.add("_glass_plate");
-		tt.headTT.add("Glass Plate");
-
-		tt.accessoryTT.add("Standard Emblem");
-		accessories.add("_test_face");
-		tt.accessoryTT.add("Villager Emblem");
-		accessories.add("_skeleton_face");
-		tt.accessoryTT.add("Skeleton Emblem");
-		accessories.add("_ender_face");
-		tt.accessoryTT.add("Ender Emblem");
-		accessories.add("_creeper_face");
-		tt.accessoryTT.add("Creeper Emblem");
-		accessories.add("_square_face");
-		tt.accessoryTT.add("Block Emblem");
-		accessories.add("_angel_face");
-		tt.accessoryTT.add("Angel Emblem");
-		accessories.add("_fancy_face");
-		tt.accessoryTT.add("Fancy Emblem");
-		accessories.add("_cross_face");
-		tt.accessoryTT.add("Cross Emblem");
-		accessories.add("_stripe_face");
-		tt.accessoryTT.add("Vertical Stripe Emblem");
-		accessories.add("_bar_face");
-		tt.accessoryTT.add("Vertical Bars Emblem");
-		accessories.add("_horbar_face");
-		tt.accessoryTT.add("Horizontal Bars Emblem");
-		accessories.add("_horstripe_face");
-		tt.accessoryTT.add("Horizontal Stripe Emblem");
-		accessories.add("_triangle_face");
-		tt.accessoryTT.add("Triangles Emblem");
-		accessories.add("_arrow_face");
-		tt.accessoryTT.add("Arrow Emblem");
-		accessories.add("_checker_face");
-		tt.accessoryTT.add("Checkered Emblem");
-
-		tt.handleTT.add("Standard Edge");
-		handles.add("_demon_edge");
-		tt.handleTT.add("Demonic Edge");
-		handles.add("_squared_edge");
-		tt.handleTT.add("Squared Edge");
-		handles.add("_heart_edge");
-		tt.handleTT.add("Heart Edge");
-
-		tt.extraTT.add("Standard Binding");
-		extras.add("_spider_binding");
-		tt.extraTT.add("Spider Binding");
-		extras.add("_love_binding");
-		tt.extraTT.add("Heart Binding");
-		extras.add("_enforced_binding");
-		tt.extraTT.add("Enforced Binding");
-		extras.add("_slime_binding");
-		tt.extraTT.add("Slimey Binding");
-		extras.add("_small_binding");
-		tt.extraTT.add("Small Binding");
-		extras.add("_demon_binding");
-		tt.extraTT.add("Demon Binding");
-		extras.add("_pig_binding");
-		tt.extraTT.add("Pig Binding");
-		extras.add("_wolf_binding");
-		tt.extraTT.add("Wolf Binding");
-		extras.add("_wide_binding");
-		tt.extraTT.add("Wide Binding");
-		extras.add("_reinforced_binding");
-		tt.extraTT.add("Strong Binding");
-		extras.add("_skull_binding");
-		tt.extraTT.add("Skull Binding");
-		extras.add("_hell_binding");
-		tt.extraTT.add("Hell Binding");
-		extras.add("_queen_binding");
-		tt.extraTT.add("Queen's Binding");
-		extras.add("_tri_binding");
-		tt.extraTT.add("Tri Binding");
-		extras.add("_fancy_binding");
-		tt.extraTT.add("Fancy Binding");
-
-		tools.put("Heater Shield", tt);
-	}
-
-}
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/ToolCoreTip.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/ToolCoreTip.java
deleted file mode 100644
index e93a11d..0000000
--- a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/ToolCoreTip.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package lance5057.tDefense.finishingAnvil.utilities;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ToolCoreTip
-{
-	String			head		= "";
-	String			handle		= "";
-	String			accessory	= "";
-	String			extra		= "";
-
-	List<String>	headTT		= new ArrayList<String>();
-	List<String>	accessoryTT	= new ArrayList<String>();
-	List<String>	handleTT	= new ArrayList<String>();
-	List<String>	extraTT		= new ArrayList<String>();
-
-	public ToolCoreTip()
-	{
-	}
-
-	public String getPart(int id /*1-4*/)
-	{
-		switch(id)
-		{
-			case 1:
-				return head;
-			case 3:
-				return handle;
-			case 2:
-				return accessory;
-			case 4:
-				return extra;
-			default:
-				return "";
-		}
-	}
-
-	public String getPartName(int partId /*1-4*/, int id)
-	{
-		switch(partId)
-		{
-			case 1:
-				if(headTT.size() > 0 && headTT.size() - 1 >= id && headTT.get(id) != null)
-					return headTT.get(id);
-			case 3:
-				if(handleTT.size() > 0 && handleTT.size() - 1 >= id && handleTT.get(id) != null)
-					return handleTT.get(id);
-			case 2:
-				if(accessoryTT.size() > 0 && accessoryTT.size() - 1 >= id && accessoryTT.get(id) != null)
-					return accessoryTT.get(id);
-			case 4:
-				if(extraTT.size() > 0 && extraTT.size() - 1 >= id && extraTT.get(id) != null)
-					return extraTT.get(id);
-			default:
-				return "";
-		}
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/holiday/HolidayBase.java b/src/main/java/lance5057/tDefense/holiday/HolidayBase.java
index 2728689..45ff00e 100644
--- a/src/main/java/lance5057/tDefense/holiday/HolidayBase.java
+++ b/src/main/java/lance5057/tDefense/holiday/HolidayBase.java
@@ -2,23 +2,27 @@ package lance5057.tDefense.holiday;
 
 import lance5057.tDefense.holiday.xmas.XmasBase;
 import lance5057.tDefense.util.ModuleBase;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
-public class HolidayBase 
+public class HolidayBase extends ModuleBase
 {
-	ModuleBase xmas;
-	
-	public HolidayBase()
-	{
-		xmas = new XmasBase();
+	@Override
+	public void preInit(FMLPreInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
 	}
-	
-	public void preInit()
-	{
-		xmas.preInit();
+
+	@Override
+	public void init(FMLInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
 	}
-	
-	public void init()
-	{
-		xmas.init();
+
+	@Override
+	public void postInit(FMLPostInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/holiday/xmas/XmasBase.java b/src/main/java/lance5057/tDefense/holiday/xmas/XmasBase.java
index ea6f10e..2c83902 100644
--- a/src/main/java/lance5057/tDefense/holiday/xmas/XmasBase.java
+++ b/src/main/java/lance5057/tDefense/holiday/xmas/XmasBase.java
@@ -3,21 +3,39 @@ package lance5057.tDefense.holiday.xmas;
 import slimeknights.tconstruct.world.entity.EntityBlueSlime;
 import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.holiday.xmas.gumdropslime.GumDropSlime;
+import lance5057.tDefense.util.ItemsBase;
 import lance5057.tDefense.util.ModuleBase;
 import net.minecraft.world.storage.loot.LootTableList;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.registry.EntityRegistry;
 
 public class XmasBase extends ModuleBase {
+	
+	protected ItemsBase items;
+	
 	public XmasBase() {
 		items = new XmasItems();
 	}
 
 	@Override
-	public void preInit() {
-		
-		items.preInit();
+	public void preInit(FMLPreInitializationEvent e) {
+		// TODO Auto-generated method stub
+		items.preInit(e);
 		EntityRegistry.registerModEntity(GumDropSlime.class, "gumdropslime", 0,
 				TinkersDefense.instance, 64, 5, true, 0x963430, 0xDDDDDD);
 		//LootTableList.register(GumDropSlime.LOOT_TABLE);
 	}
-}
+
+	@Override
+	public void init(FMLInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void postInit(FMLPostInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
+	}}
diff --git a/src/main/java/lance5057/tDefense/holiday/xmas/XmasItems.java b/src/main/java/lance5057/tDefense/holiday/xmas/XmasItems.java
index ff51fa0..3ac3d58 100644
--- a/src/main/java/lance5057/tDefense/holiday/xmas/XmasItems.java
+++ b/src/main/java/lance5057/tDefense/holiday/xmas/XmasItems.java
@@ -3,11 +3,18 @@ package lance5057.tDefense.holiday.xmas;
 import lance5057.tDefense.util.Color16Util;
 import lance5057.tDefense.util.ItemsBase;
 import lance5057.tDefense.util.MetaItem;
+import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import slimeknights.mantle.client.CreativeTab;
 
 public class XmasItems extends ItemsBase {
+	CreativeTab xmas;
+	
 	public static Item item_redmintcane;
 	public static Item item_greenmintcane;
 	public static Item item_redmintIngot;
@@ -16,19 +23,25 @@ public class XmasItems extends ItemsBase {
 
 	public static MetaItem item_gumdrop;
 
-	public void preInit() {
-		setTab("TDefense_Xmas", new ItemStack(Items.SHIELD));
+	public void preInit(FMLPreInitializationEvent e) {
+		xmas = new CreativeTab("TDefense_Xmas", new ItemStack(Items.SHIELD));
 	}
 
-	public void init() {
-		item_redmintcane = register("redmintcane", 64);
-		item_redmintIngot = register("redmintIngot", 64);
-		item_greenmintcane = register("greenmintcane", 64);
-		item_greenmintIngot = register("greenmintIngot", 64);
-		item_gingerbread = register("gingerbread", 64);
+	public void init(FMLInitializationEvent e) {
+		item_redmintcane = register("redmintcane", 64, xmas);
+		item_redmintIngot = register("redmintIngot", 64, xmas);
+		item_greenmintcane = register("greenmintcane", 64, xmas);
+		item_greenmintIngot = register("greenmintIngot", 64, xmas);
+		item_gingerbread = register("gingerbread", 64, xmas);
 		
-		item_gumdrop = registerMeta("gumdrop", Color16Util.colors, 64);
+		item_gumdrop = registerMeta("gumdrop", Color16Util.colors, 64, xmas);
 
-		this.tabName.setDisplayIcon(new ItemStack(item_redmintcane));
+		xmas.setDisplayIcon(new ItemStack(item_redmintcane));
+	}
+
+	@Override
+	public void postInit(FMLPostInitializationEvent e) {
+		// TODO Auto-generated method stub
+		
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/holiday/xmas/gumdropslime/GumDropSlimeRenderer.java b/src/main/java/lance5057/tDefense/holiday/xmas/gumdropslime/GumDropSlimeRenderer.java
index e6384f6..e17f336 100644
--- a/src/main/java/lance5057/tDefense/holiday/xmas/gumdropslime/GumDropSlimeRenderer.java
+++ b/src/main/java/lance5057/tDefense/holiday/xmas/gumdropslime/GumDropSlimeRenderer.java
@@ -15,7 +15,7 @@ public class GumDropSlimeRenderer extends RenderTinkerSlime
 	public static final Factory FACTORY_GumDropSlime = new Factory();
 	
 	public GumDropSlimeRenderer(RenderManager renderManager) {
-		super(renderManager, Color16Util.colorsHex[Minecraft.getMinecraft().theWorld.rand.nextInt(16)],
+		super(renderManager, Color16Util.colorsHex[Minecraft.getMinecraft().world.rand.nextInt(16)],
 				new ResourceLocation(Reference.MOD_ID,"textures/entity/slime.png"));
 		// TODO Auto-generated constructor stub
 	}
diff --git a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
index 278bd83..800ba02 100644
--- a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
@@ -2,6 +2,8 @@ package lance5057.tDefense.proxy;
 
 import lance5057.tDefense.Reference;
 import lance5057.tDefense.TD_Commands;
+import lance5057.tDefense.baubles.BaublesClientProxy;
+import lance5057.tDefense.core.CoreClientProxy;
 import lance5057.tDefense.core.CoreItems;
 import lance5057.tDefense.core.tools.TDTools;
 import lance5057.tDefense.holiday.HolidayClientProxy;
@@ -39,10 +41,15 @@ public class ClientProxy extends CommonProxy
 //	public static ModelTinkersChausses		chausses;
 //	public static ModelTinkersBoots			boots;
 	
+	public static BaublesClientProxy baubles = new BaublesClientProxy();;
+	
 	ToolBuildGuiInfo roundshieldGUI;
 	ToolBuildGuiInfo heatershieldGUI;
 	
-	HolidayClientProxy holiProxy = new HolidayClientProxy();
+	ToolBuildGuiInfo zweihanderGUI;
+	
+	public static CoreClientProxy coreProxy = new CoreClientProxy();
+	public static HolidayClientProxy holiProxy = new HolidayClientProxy();
 	
 	@Override
 	public void preInit()
@@ -50,10 +57,12 @@ public class ClientProxy extends CommonProxy
 		ClientCommandHandler.instance.registerCommand(new TD_Commands());
 		registerToolRenderers();
 		
+		coreProxy.preInit();
+		baubles.preInit();
 	}
 	
 	@Override
-	public void Init()
+	public void init()
 	{
 //		Minecraft.getMinecraft().getRenderItem().getItemModelMesher()
 //	    .register(TDTools.heatershield, 0, new ModelResourceLocation("modid:itemname", "inventory"));
@@ -67,14 +76,16 @@ public class ClientProxy extends CommonProxy
 		registerItemRenderer(CoreItems.item_dogbeariumIngot, 0, CoreItems.item_dogbeariumIngot.getUnlocalizedName());
 		registerItemRenderer(CoreItems.item_queensgoldIngot, 0, CoreItems.item_queensgoldIngot.getUnlocalizedName());
 		
+		coreProxy.init();
 		holiProxy.Init();
+		baubles.init();
 	}
 	
 	public void registerToolRenderers()
 	{
 		ModelRegisterUtil.registerToolModel(TDTools.roundshield);
 		ModelRegisterUtil.registerToolModel(TDTools.heatershield);
-		
+		ModelRegisterUtil.registerToolModel(TDTools.zweihander);
 		
 	}
 	
@@ -82,6 +93,7 @@ public class ClientProxy extends CommonProxy
 	{
 		roundshieldGUI = new ToolBuildGuiInfo(TDTools.roundshield);
 		heatershieldGUI = new ToolBuildGuiInfo(TDTools.heatershield);
+		zweihanderGUI = new ToolBuildGuiInfo(TDTools.zweihander);
 	}
 	
 	public void setupToolGuis()
@@ -94,18 +106,26 @@ public class ClientProxy extends CommonProxy
 		heatershieldGUI.addSlotPosition(25, 33+8);
 		heatershieldGUI.addSlotPosition(43, 33+8);
 		heatershieldGUI.addSlotPosition(34, 51+8);
+		
+		zweihanderGUI.addSlotPosition(34, 15+8);
+		zweihanderGUI.addSlotPosition(25, 33+8);
+		zweihanderGUI.addSlotPosition(43, 33+8);
+		zweihanderGUI.addSlotPosition(34, 51+8);
 	}
 	
 	public void registerToolGuis()
 	{
 		TinkerRegistryClient.addToolBuilding(roundshieldGUI);
 		TinkerRegistryClient.addToolBuilding(heatershieldGUI);
+		TinkerRegistryClient.addToolBuilding(zweihanderGUI);
 	}
 	
 	@Override
 	public void reloadRenderers()
 	{
 		setToolGuis();
+		
+		baubles.reloadRenderers();
 	}
 	
 	public void setToolGuis()
@@ -120,6 +140,12 @@ public class ClientProxy extends CommonProxy
 		heatershieldGUI.addSlotPosition(25, 33);
 		heatershieldGUI.addSlotPosition(43, 33);
 		heatershieldGUI.addSlotPosition(34, 51);
+		
+		zweihanderGUI.positions.clear();
+		zweihanderGUI.addSlotPosition(34, 15);
+		zweihanderGUI.addSlotPosition(25, 33);
+		zweihanderGUI.addSlotPosition(43, 33);
+		zweihanderGUI.addSlotPosition(34, 51);
 	}
 	
 	 public static void registerItemRenderer(Item item, int meta, String id) {
diff --git a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
index a76da7b..8ae3d90 100644
--- a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
@@ -1,10 +1,17 @@
 package lance5057.tDefense.proxy;
 
-import lance5057.tDefense.TD_Commands;
-import net.minecraftforge.client.ClientCommandHandler;
+import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.core.blocks.crestMount.Container_CrestMount;
+import lance5057.tDefense.core.blocks.crestMount.Gui_CrestMount;
+import lance5057.tDefense.core.blocks.crestMount.TileEntity_CrestMount;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.common.network.IGuiHandler;
+import net.minecraftforge.fml.common.network.NetworkRegistry;
 
 
-public class CommonProxy// implements IGuiHandler
+public class CommonProxy implements IGuiHandler
 {
 	//public static ModifierSoulHandler	SoulHandler	= null;
 	
@@ -12,8 +19,9 @@ public class CommonProxy// implements IGuiHandler
 	{
 	}
 
-	public void Init()
+	public void init()
 	{
+		NetworkRegistry.INSTANCE.registerGuiHandler(TinkersDefense.instance, this);
 	}
 
 	public void registerTileEntitySpecialRenderer()
@@ -26,6 +34,11 @@ public class CommonProxy// implements IGuiHandler
 
 	}
 
+	public void postInit() {
+		// TODO Auto-generated method stub
+		
+	}
+
 //	public EntityPlayer getPlayerEntity(MessageContext ctx)
 //	{
 //		return ctx.getServerHandler().playerEntity;
@@ -41,28 +54,28 @@ public class CommonProxy// implements IGuiHandler
 //		return null;
 //	}
 //
-//	@Override
-//	public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
-//	{
-//		if(ID == TinkersDefense.GUI_CREST_INV)
-//			return new Container_CrestMount(player.inventory,
-//					(TileEntity_CrestMount) world.getTileEntity(x, y, z));
+	@Override
+	public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
+	{
+		if(ID == TinkersDefense.GUI_CREST_INV)
+			return new Container_CrestMount(player.inventory,
+					(TileEntity_CrestMount) world.getTileEntity(new BlockPos(x, y, z)));
 //		if(ID == TinkersDefense.GUI_ANVIL_INV)
 //			return new Container_FinishingAnvil(player.inventory,
 //					(TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
-//
-//		return null;
-//	}
-//
-//	@Override
-//	public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
-//	{
-//		if(ID == TinkersDefense.GUI_CREST_INV)
-//			return new Gui_CrestMount(player.inventory,
-//					(TileEntity_CrestMount) world.getTileEntity(x, y, z));
+
+		return null;
+	}
+
+	@Override
+	public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
+	{
+		if(ID == TinkersDefense.GUI_CREST_INV)
+			return new Gui_CrestMount(player.inventory,
+					(TileEntity_CrestMount) world.getTileEntity(new BlockPos(x, y, z)));
 //		if(ID == TinkersDefense.GUI_ANVIL_INV)
 //			return new Gui_FinishingAnvil(player.inventory,
 //					(TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
-//		return null;
-//	}
+		return null;
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/util/BlocksBase.java b/src/main/java/lance5057/tDefense/util/BlocksBase.java
new file mode 100644
index 0000000..5cd3ac6
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/util/BlocksBase.java
@@ -0,0 +1,49 @@
+package lance5057.tDefense.util;
+
+import lance5057.tDefense.Reference;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+
+public abstract class BlocksBase {
+	
+	public BlocksBase()
+	{
+		
+	}
+	
+	public abstract void preInit(FMLPreInitializationEvent e);
+	
+	public abstract void init(FMLInitializationEvent e);
+	
+	public abstract void postInit(FMLPostInitializationEvent e);
+	
+	protected Block register(String name, CreativeTabs tabName, float hardness) 
+	{
+		Block block = new Block(Material.IRON).setCreativeTab(tabName).setUnlocalizedName(name).setRegistryName(Reference.MOD_ID, name).setHardness(hardness);
+		GameRegistry.register(block);
+		return block;
+	}
+	
+	protected ItemBlock register(String name, int size, CreativeTabs tabName, Block block) 
+	{
+		ItemBlock item = new ItemBlock(block);
+		item.setCreativeTab(tabName).setMaxStackSize(size).setUnlocalizedName(name).setRegistryName(Reference.MOD_ID, name).setCreativeTab(tabName);
+		GameRegistry.register(item);
+		return item;
+	}
+}
+	
+//	protected MetaItem registerMeta(String name, String[] names,int size) 
+//	{
+//		Item item = new MetaItem(names).setCreativeTab(tabName).setMaxStackSize(size).setUnlocalizedName(name).setRegistryName(Reference.MOD_ID, name);
+//
+//		GameRegistry.register(item);
+//		return (MetaItem) item;
+//	}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/util/ItemsBase.java b/src/main/java/lance5057/tDefense/util/ItemsBase.java
index ddfa882..e146579 100644
--- a/src/main/java/lance5057/tDefense/util/ItemsBase.java
+++ b/src/main/java/lance5057/tDefense/util/ItemsBase.java
@@ -1,38 +1,35 @@
 package lance5057.tDefense.util;
 
 import lance5057.tDefense.Reference;
-import lance5057.tDefense.proxy.ClientProxy;
-import net.minecraft.init.Items;
+import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import slimeknights.mantle.client.CreativeTab;
 
 public abstract class ItemsBase {
-	public CreativeTab					tabName;
-	
 	public ItemsBase()
 	{
 		
 	}
 	
-	public abstract void preInit();
+	public abstract void preInit(FMLPreInitializationEvent e);
 	
-	public abstract void init();
+	public abstract void init(FMLInitializationEvent e);
 	
-	protected void setTab(String tab, ItemStack stack)
-	{
-		tabName = new CreativeTab(tab, stack);
-	}
+	public abstract void postInit(FMLPostInitializationEvent e);
 	
-	protected Item register(String name, int size) 
+	protected Item register(String name, int size, CreativeTabs tabName) 
 	{
 		Item item = new Item().setCreativeTab(tabName).setMaxStackSize(size).setUnlocalizedName(name).setRegistryName(Reference.MOD_ID, name);
 		GameRegistry.register(item);
 		return item;
 	}
 	
-	protected MetaItem registerMeta(String name, String[] names,int size) 
+	protected MetaItem registerMeta(String name, String[] names,int size, CreativeTabs tabName) 
 	{
 		Item item = new MetaItem(names).setCreativeTab(tabName).setMaxStackSize(size).setUnlocalizedName(name).setRegistryName(Reference.MOD_ID, name);
 
diff --git a/src/main/java/lance5057/tDefense/util/ModuleBase.java b/src/main/java/lance5057/tDefense/util/ModuleBase.java
index d8264ce..f03ef9c 100644
--- a/src/main/java/lance5057/tDefense/util/ModuleBase.java
+++ b/src/main/java/lance5057/tDefense/util/ModuleBase.java
@@ -2,18 +2,15 @@ package lance5057.tDefense.util;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
 public abstract class ModuleBase 
-{
-	protected ItemsBase items;
+{	
+	public abstract void preInit(FMLPreInitializationEvent e);
 	
-	public void preInit()
-	{
-		items.preInit();
-	}
+	public abstract void init(FMLInitializationEvent e);
 	
-	public void init()
-	{
-		items.init();
-	}
+	public abstract void postInit(FMLPostInitializationEvent e);
 }
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/zweihander.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/zweihander.tcon.json
new file mode 100644
index 0000000..32cec80
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/zweihander.tcon.json
@@ -0,0 +1,36 @@
+{
+    "textures": {
+        "layer0": "tinkersdefense:items/zweihander/blade",
+        "layer1": "tinkersdefense:items/zweihander/core",
+		"layer2": "tinkersdefense:items/zweihander/guard",
+		"layer3": "tinkersdefense:items/zweihander/handle",
+		"broken1": "tinkersdefense:items/zweihander/broken"
+    },
+    "display": {
+        "thirdperson_righthand": {
+            "rotation": [ 0, 90, 45 ],
+            "translation": [ 0, 8, 0 ],
+            "scale": [ 1.5, 1.5, 1 ]
+        },
+        "thirdperson_lefthand": {
+            "rotation": [ 0, 90, 45 ],
+            "translation": [ 0, 8, 0 ],
+            "scale": [ 1.5, 1.5, 1 ]
+        },
+        "firstperson_righthand": {
+            "rotation": [ 0, 90, 45 ],
+            "translation": [ 0, 8, 0 ],
+            "scale": [ 1.5, 1.5, 1 ]
+        },
+        "firstperson_lefthand": {
+            "rotation": [ 0, 90, 45 ],
+            "translation": [ 0, 8, 0 ],
+            "scale": [ 1.5, 1.5, 1 ]
+        },
+        "fixed": {
+            "rotation": [ 0, 180, 0 ],
+            "translation": [ -2, 4, -5],
+            "scale":[ 0.5, 0.5, 0.5]
+        }
+	}
+}
diff --git a/src/main/resources/assets/tinkersdefense/models/sheathe_1.png b/src/main/resources/assets/tinkersdefense/models/sheathe_1.png
new file mode 100644
index 0000000..87cf001
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/sheathe_1.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/beheading_zweihander_effect.png
index 64d883e..64d883e 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/beheading_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/blade.png
index 05ee7ad..05ee7ad 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/blade.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/blaze_zweihander_effect.png
index 8563571..8563571 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/blaze_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png
index f2d35ef..f2d35ef 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta
index 191c85a..191c85a 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/broken.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/broken.png
new file mode 100644
index 0000000..00b5fdc
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/broken.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/core.png
index 9106565..9106565 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/core.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/corpseivy_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/corpseivy_zweihander_effect.png
index e77311c..e77311c 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/corpseivy_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/corpseivy_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/diamond_zweihander_effect.png
index 795efe6..795efe6 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/diamond_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/emerald_zweihander_effect.png
index 8164a71..8164a71 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/emerald_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/flux_zweihander_effect.png
index 804447e..804447e 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/flux_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_blade.png
index 3e2ec7b..3e2ec7b 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_blade.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_blade.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_core.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_core.png
index 7ce220b..7ce220b 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_core.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_core.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_guard.png
index 6e1980f..6e1980f 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_guard.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_guard.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_handle.png
index ecbe5f3..ecbe5f3 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_handle.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_handle.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/guard.png
index 70bf386..70bf386 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/guard.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/handle.png
index edf805d..edf805d 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/handle.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect (1).png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect (1).png
index cfe6390..cfe6390 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect (1).png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect (1).png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect.png
index cfe6390..cfe6390 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect (1).png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect (1).png
index 454f57a..454f57a 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect (1).png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect (1).png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect.png
index 454f57a..454f57a 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/manacore_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/manacore_zweihander_effect.png
index e0e79c9..e0e79c9 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/manacore_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/manacore_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/moss_zweihander_effect.png
index 9cd743a..9cd743a 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/moss_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/necrotic_zweihander_effect.png
index 5f81bf4..5f81bf4 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/necrotic_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/piston_zweihander_effect.png
index dc9af5a..dc9af5a 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/piston_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/quartz_zweihander_effect.png
index 8cc7817..8cc7817 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/quartz_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_blade.png
index edc328a..edc328a 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_blade.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_blade.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_core.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_core.png
index 98b5f54..98b5f54 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_core.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_core.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_guard.png
index c0beeb3..c0beeb3 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_guard.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_guard.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_handle.png
index 5e999d8..5e999d8 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_handle.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_handle.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redstone_zweihander_effect.png
index 4a601eb..4a601eb 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redstone_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/reinforced_zweihander_effect.png
index bb66d4e..bb66d4e 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/reinforced_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/scabbing_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/scabbing_zweihander_effect.png
index 7e0551a..7e0551a 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/scabbing_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/scabbing_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/silk_zweihander_effect.png
index 92c910a..92c910a 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/silk_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/smite_zweihander_effect.png
index 830c2df..830c2df 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/smite_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/spider_zweihander_effect.png
index df3bf8e..df3bf8e 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/spider_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/terracore_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/terracore_zweihander_effect.png
index ebb74c2..ebb74c2 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/terracore_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/terracore_zweihander_effect.png
diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/textbook_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/textbook_zweihander_effect.png
index d65cae8..d65cae8 100644
--- a/src/main/resources/assets/tinker/textures/items/zweihander/textbook_zweihander_effect.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/textbook_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/model/sheathe.png b/src/main/resources/assets/tinkersdefense/textures/model/sheathe.png
new file mode 100644
index 0000000..9bb3952
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/model/sheathe.png
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 5fca141..6707487 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -7,8 +7,8 @@
  "mcversion": "1.10.2",
  "url": "",
  "authorList": ["Sir Lance"],
- "requiredMods": [ "Forge", "tconstruct"],
- "dependencies": ["tconstruct"],
+ "requiredMods": [ "Forge", "tconstruct","Baubles"],
+ "dependencies": ["tconstruct","Baubles"],
  "useDependencyInformation": "true"
 }
 ]