Launch update

Only a week behind...

25 files changed, 473 insertions, 274 deletions

diff --git a/src/main/java/lance5057/tDefense/armor/ArmorCore.java b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
index 56645ac..87188f5 100644
--- a/src/main/java/lance5057/tDefense/armor/ArmorCore.java
+++ b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
@@ -4,6 +4,7 @@ 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;
@@ -32,14 +33,14 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 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.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 String[]	renderParts;
+	//public String[]	renderParts;
 
 	//Thaumcraft
 	boolean			Charge				= false;
@@ -208,7 +209,7 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRuni
 	public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack)
 	{
 
-		TinkersDefense.mods.AMod.UpdateAll((ToolCore) itemStack.getItem(), itemStack, world, player, itemStack.getTagCompound().getCompoundTag("InfiTool"));
+		Modifiers.AMod.UpdateAll((ToolCore) itemStack.getItem(), itemStack, world, player, itemStack.getTagCompound().getCompoundTag("InfiTool"));
 	}
 
 	@Override
@@ -276,17 +277,17 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRuni
 			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 "";
-
-				}
+				//
+				//			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 != "")
 		{
diff --git a/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java b/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
index a877515..2aca64c 100644
--- a/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
+++ b/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
@@ -68,9 +68,9 @@ public class TDArmorAddon
 			{
 				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();
+						TinkerTools.toughRod, 1, 2), new ItemStack(
+						TinkersDefense.partArmorplate, 1, 2), new ItemStack(
+						TinkersDefense.partChainmaille, 1, 2), "ArmorTab").getItem();
 			}
 
 		};
@@ -139,7 +139,7 @@ public class TDArmorAddon
 	public void init(FMLInitializationEvent e)
 	{
 
-		TConstructRegistry.addToolRecipe(armor_TinkerHelm, TinkerTools.frypanHead, TinkersDefense.partChainmaille, TinkersDefense.partArmorplate, TinkerTools.toughRod);
+		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);
@@ -150,7 +150,7 @@ public class TDArmorAddon
 		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, TinkersDefense.partCloth, TinkerTools.toughRod);
+		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);
diff --git a/src/main/java/lance5057/tDefense/armor/TDHelmet.java b/src/main/java/lance5057/tDefense/armor/TDHelmet.java
deleted file mode 100644
index 89bfb44..0000000
--- a/src/main/java/lance5057/tDefense/armor/TDHelmet.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package lance5057.tDefense.armor;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-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 = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.wand.IWandHUD", 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 abstract class TDHelmet extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles
-{
-
-	public TDHelmet(int baseProtection, int slot)
-	{
-		super(baseProtection, slot);
-	}
-
-	@Override
-	@Optional.Method(modid = "Thaumcraft")
-	public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
-	{
-		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
-	}
-
-	@Override
-	@Optional.Method(modid = "Thaumcraft")
-	public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
-	{
-		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
-	}
-
-	@Override
-	@Optional.Method(modid = "AWWayofTime")
-	public boolean canSeeLPBar(ItemStack stack)
-	{
-		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
-	}
-
-	@Override
-	@Optional.Method(modid = "AWWayofTime")
-	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/blocks/GlowstoneCrumbs.java b/src/main/java/lance5057/tDefense/armor/blocks/GlowstoneCrumbs.java
index 3bbe32e..13648c2 100644
--- a/src/main/java/lance5057/tDefense/armor/blocks/GlowstoneCrumbs.java
+++ b/src/main/java/lance5057/tDefense/armor/blocks/GlowstoneCrumbs.java
@@ -1,43 +1,30 @@
 package lance5057.tDefense.armor.blocks;
 
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.Random;
-import java.util.Set;
 
 import lance5057.tDefense.Reference;
-import lance5057.tDefense.TinkersDefense;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.Direction;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.ChunkPosition;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 public class GlowstoneCrumbs extends Block
 {
 	public GlowstoneCrumbs()
 	{
 		super(Material.ground);
-		this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F);
-		this.setBlockName("glowstonecrumbs");
-		this.setBlockTextureName(Reference.MOD_ID + ":glowstonecrumbs");
-		this.setLightLevel(1f);
+		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;
@@ -47,6 +34,7 @@ public class GlowstoneCrumbs extends Block
 	 * 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;
@@ -55,6 +43,7 @@ public class GlowstoneCrumbs extends Block
 	/**
 	 * 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;
@@ -63,11 +52,13 @@ public class GlowstoneCrumbs extends Block
 	/**
 	 * 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;
@@ -76,27 +67,30 @@ public class GlowstoneCrumbs extends Block
 	/**
 	 * 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_) && this.canBlockStay(p_149742_1_, p_149742_2_, p_149742_3_, 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_);
-		this.checkAndDropBlock(p_149695_1_, p_149695_2_, p_149695_3_, p_149695_4_);
+		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_)
 	{
-		this.checkAndDropBlock(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_);
+		checkAndDropBlock(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_);
 	}
 
 	/**
@@ -104,7 +98,7 @@ public class GlowstoneCrumbs extends Block
 	 */
 	protected void checkAndDropBlock(World p_149855_1_, int p_149855_2_, int p_149855_3_, int p_149855_4_)
 	{
-		if(!this.canBlockStay(p_149855_1_, p_149855_2_, p_149855_3_, 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);
 		}
@@ -113,6 +107,7 @@ public class GlowstoneCrumbs extends Block
 	/**
 	 * 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
index f6ca02c..adf0c44 100644
--- a/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java
+++ b/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java
@@ -6,7 +6,6 @@ import java.util.Random;
 import lance5057.tDefense.Reference;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Blocks;
@@ -29,29 +28,31 @@ public class UnstableBlock extends Block
 	public UnstableBlock()
 	{
 		super(Material.rock);
-		this.setBlockName("unstable");
-		this.setBlockTextureName("unstable");
-		this.setTickRandomly(true);
+		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_ >= this.field_150095_b.length)
+		if(p_149691_2_ < 0 || p_149691_2_ >= field_150095_b.length)
 		{
 			p_149691_2_ = 0;
 		}
 
-		return this.field_150095_b[p_149691_2_];
+		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_;
@@ -61,6 +62,7 @@ public class UnstableBlock extends Block
 	 * 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_)
 	{
@@ -68,22 +70,25 @@ public class UnstableBlock extends Block
 		p_149666_3_.add(new ItemStack(p_149666_1_, 1, 1));
 	}
 
+	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister p_149651_1_)
 	{
-		this.field_150095_b = new IIcon[field_150096_a.length];
+		field_150095_b = new IIcon[field_150096_a.length];
 
-		for(int i = 0; i < this.field_150095_b.length; ++i)
+		for(int i = 0; i < field_150095_b.length; ++i)
 		{
-			this.field_150095_b[i] = p_149651_1_.registerIcon(Reference.MOD_ID + ":" + this.getTextureName() + field_150096_a[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)
 	{
@@ -103,7 +108,7 @@ public class UnstableBlock extends Block
 	@Override
 	public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random)
 	{
-		int meta = par1World.getBlockMetadata(par2, par3, par4);
+		final int meta = par1World.getBlockMetadata(par2, par3, par4);
 
 		if(meta == 0)
 		{
diff --git a/src/main/java/lance5057/tDefense/armor/blocks/UnstableItemBlock.java b/src/main/java/lance5057/tDefense/armor/blocks/UnstableItemBlock.java
index 04770c4..2461704 100644
--- a/src/main/java/lance5057/tDefense/armor/blocks/UnstableItemBlock.java
+++ b/src/main/java/lance5057/tDefense/armor/blocks/UnstableItemBlock.java
@@ -1,6 +1,5 @@
 package lance5057.tDefense.armor.blocks;
 
-import lance5057.tDefense.armor.TDArmorAddon;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlockWithMetadata;
 import net.minecraft.item.ItemStack;
@@ -16,6 +15,6 @@ public class UnstableItemBlock extends ItemBlockWithMetadata
 	@Override
 	public String getUnlocalizedName(ItemStack stack)
 	{
-		return this.getUnlocalizedName() + "_" + ((UnstableBlock) TDArmorAddon.block_Unstable).types[stack.getItemDamage()];
+		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 a548922..fd15b98 100644
--- a/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java
+++ b/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java
@@ -2,23 +2,14 @@ package lance5057.tDefense.armor.events;
 
 import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.armor.ArmorCore;
-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.ArmorMods;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 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.minecraft.world.World;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
-import tconstruct.library.tools.ToolCore;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
-import cpw.mods.fml.common.registry.EntityRegistry;
 
 public class ArmorModEvents
 {
@@ -27,55 +18,67 @@ public class ArmorModEvents
 	{
 		int epf = 0;
 
-		if(event.entityLiving instanceof EntityPlayer)
+		if(TinkersDefense.config.debug && event.entityLiving instanceof EntityPlayer)
 		{
-			((EntityPlayer) event.entityLiving).addChatComponentMessage(new ChatComponentText(event.source.getDamageType() + " - Max: " + Double.toString(event.ammount)));
+			((EntityPlayer) event.entityLiving).addChatComponentMessage(new ChatComponentText(
+					event.source.getDamageType() + " - Max: " + Double.toString(event.ammount)));
 		}
 
 		for(int i = 0; i < 4; i++)
 		{
-			ItemStack armor = event.entityLiving.getEquipmentInSlot(i + 1);
+			final ItemStack armor = event.entityLiving.getEquipmentInSlot(i + 1);
 			if(armor != null && armor.getItem() instanceof ArmorCore)
 			{
-				NBTTagCompound tags = armor.getTagCompound().getCompoundTag("InfiTool");
+				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() == event.source.fall.getDamageType())
+				else if(tags.hasKey("Featherfall") && event.source.getDamageType() == DamageSource.fall.getDamageType())
+				{
 					epf += (calcModifierDamage(tags.getInteger("Featherfall"), 3f, event.source));
+				}
 			}
 		}
 
 		if(epf > 20)
+		{
 			epf = 20;
+		}
 
-		float adjustedPerc = (float) (1f - (epf * 0.04));
+		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)));
+			((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
 		{
-			float f = (float) (6 + level * level) / 3.0F;
+			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 adaf76a..535dc35 100644
--- a/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java
+++ b/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java
@@ -1,15 +1,14 @@
 package lance5057.tDefense.armor.events;
 
-import tconstruct.armor.ArmorProxyClient;
-import tconstruct.armor.player.ArmorExtended;
-import tconstruct.library.tools.ToolCore;
 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.minecraft.nbt.NBTTagCompound;
 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;
@@ -23,22 +22,22 @@ public class ArmorRenderEvent
 	{
 		if(event.entityPlayer != null)
 		{
-			ArmorExtended armorEx = ArmorProxyClient.armorExtended;
+			final ArmorExtended armorEx = ArmorProxyClient.armorExtended;
 
-			ItemStack Armor = event.entityPlayer.inventory.armorItemInSlot(event.slot);
+			final ItemStack Armor = event.entityPlayer.inventory.armorItemInSlot(event.slot);
 
 			if(Armor != null && Armor.getItem() instanceof ArmorCore)
 			{
-				ModelBiped armorModel = Armor.getItem().getArmorModel(event.entityLiving, Armor, event.slot);
+				final ModelBiped armorModel = Armor.getItem().getArmorModel(event.entityLiving, Armor, event.slot);
 
 				TrimArmor(armorModel, event);
 			}
 
-			ItemStack Accessory = armorEx.getStackInSlot(event.slot);
+			final ItemStack Accessory = armorEx.getStackInSlot(event.slot);
 
 			if(Accessory != null && Accessory.getItem() instanceof ToolCore)
 			{
-				ModelBiped accessoryModel = Accessory.getItem().getArmorModel(event.entityLiving, Accessory, event.slot);
+				final ModelBiped accessoryModel = Accessory.getItem().getArmorModel(event.entityLiving, Accessory, event.slot);
 
 				TrimArmor(accessoryModel, event);
 			}
@@ -58,14 +57,14 @@ public class ArmorRenderEvent
 
 			if(event.entityPlayer instanceof EntityPlayer)
 			{
-				ItemStack itemstack = event.entityPlayer.inventory.getCurrentItem();
+				final ItemStack itemstack = event.entityPlayer.inventory.getCurrentItem();
 				armorModel.heldItemRight = 0;
 				armorModel.aimedBow = false;
 				if(itemstack != null)
 				{
 					if(event.entityPlayer.getItemInUseCount() > 0)
 					{
-						EnumAction enumaction = itemstack.getItemUseAction();
+						final EnumAction enumaction = itemstack.getItemUseAction();
 
 						if(enumaction == EnumAction.block)
 						{
@@ -83,10 +82,10 @@ public class ArmorRenderEvent
 				}
 			}
 
-			float yaw = event.entityPlayer.prevRotationYawHead + (event.entityPlayer.rotationYawHead - event.entityPlayer.prevRotationYawHead) * event.partialRenderTick;
-			float yawOffset = event.entityPlayer.prevRenderYawOffset + (event.entityPlayer.renderYawOffset - event.entityPlayer.prevRenderYawOffset) * event.partialRenderTick;
-			float limbs = event.entityPlayer.prevLimbSwingAmount + (event.entityPlayer.limbSwingAmount - event.entityPlayer.prevLimbSwingAmount) * event.partialRenderTick;
-			float limbSwing = event.entityPlayer.limbSwing - event.entityPlayer.limbSwingAmount * (1.0F - event.partialRenderTick);
+			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/cloth/TinkersHood.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
index ec775a2..7259d48 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
@@ -1,21 +1,27 @@
 package lance5057.tDefense.armor.items.cloth;
 
 import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.TDHelmet;
+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.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)})
-public class TinkersHood extends TDHelmet implements IVisDiscountGear, IManaDiscountArmor
+@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()
 	{
@@ -145,4 +151,32 @@ public class TinkersHood extends TDHelmet implements IVisDiscountGear, IManaDisc
 		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/heavy/TinkersHelm.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
index 143cab0..12fed96 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
@@ -1,15 +1,24 @@
 package lance5057.tDefense.armor.items.heavy;
 
 import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.TDHelmet;
+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;
-
-public class TinkersHelm extends TDHelmet
+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()
 	{
@@ -28,7 +37,7 @@ public class TinkersHelm extends TDHelmet
 	@Override
 	public Item getHandleItem()
 	{
-		return TinkersDefense.partChainmaille;
+		return TinkerTools.toughRod;
 	}
 
 	@Override
@@ -40,7 +49,7 @@ public class TinkersHelm extends TDHelmet
 	@Override
 	public Item getExtraItem()
 	{
-		return TinkerTools.toughRod;
+		return TinkersDefense.partChainmaille;
 	}
 
 	@Override
@@ -129,4 +138,32 @@ public class TinkersHelm extends TDHelmet
 	{
 		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/light/TinkersCoif.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
index 71b0199..5014bf9 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
@@ -1,7 +1,7 @@
 package lance5057.tDefense.armor.items.light;
 
 import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.TDHelmet;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.entity.Entity;
@@ -10,9 +10,16 @@ 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;
-
-public class TinkersCoif extends TDHelmet
+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()
 	{
@@ -31,13 +38,13 @@ public class TinkersCoif extends TDHelmet
 	@Override
 	public Item getHandleItem()
 	{
-		return TinkersDefense.partCloth;
+		return TinkerTools.toughRod;
 	}
 
 	@Override
 	public Item getAccessoryItem()
 	{
-		return TinkerTools.toughRod;
+		return TinkersDefense.partCloth;
 	}
 
 	@Override
@@ -80,9 +87,9 @@ public class TinkersCoif extends TDHelmet
 			case 1:
 				return "_coif_chain_broken";
 			case 2:
-				return "_coif_cloth";
-			case 3:
 				return "_coif_circlet";
+			case 3:
+				return "_coif_cloth";
 			default:
 				return "";
 		}
@@ -139,4 +146,32 @@ public class TinkersCoif extends TDHelmet
 		// 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/modifiers/ArmorMods.java b/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java
index bbd6ad3..208031f 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java
@@ -79,34 +79,34 @@ public class ArmorMods extends ModifiersBase
 	{
 		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)});
+						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)});
+						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)});
+						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)});
+						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")});
+						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)});
+						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)});
+						1, 0), 'r', new ItemStack(TinkerTools.toolRod, 1, 2), 's', new ItemStack(
+								Items.slime_ball, 1, 0)});
 
 		if(TDIntegration.thaumcraft)
 		{
@@ -164,7 +164,7 @@ public class ArmorMods extends ModifiersBase
 		ModifyBuilder.registerModifier(new modifierProtection(
 				new ItemStack[] {new ItemStack(TinkersDefense.partArmorplate,
 						1, 2)}, TinkersDefense.config.ArmorProtectionID, 1,
-				EnumChatFormatting.DARK_GRAY.toString(), "Protection"));
+						EnumChatFormatting.DARK_GRAY.toString(), "Protection"));
 		ModifyBuilder.registerModifier(new modifierProtection(
 				new ItemStack[] {new ItemStack(Items.magma_cream, 1)},
 				TinkersDefense.config.ArmorFireProtectionID, 1,
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 d81d05f..a2f9235 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/Botania/BotaniaArmorMods.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/Botania/BotaniaArmorMods.java
@@ -13,18 +13,27 @@ 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(null, "modItemsBotaniaArmor");
+		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
@@ -36,9 +45,16 @@ public class BotaniaArmorMods extends ModifiersBase
 				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);
 
 		}
 	}
diff --git a/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java b/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java
index 986c03e..145764f 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java
@@ -5,9 +5,6 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import tconstruct.library.crafting.PatternBuilder;
-import tconstruct.library.modifier.ItemModifier;
-import tconstruct.library.tools.AbilityHelper;
 import tconstruct.library.tools.ToolCore;
 import tconstruct.modifiers.tools.ModInteger;
 
@@ -33,8 +30,8 @@ public class modifierProtection extends ModInteger
 	{
 		if(tool.getItem() instanceof ToolCore)
 		{
-			List list = Arrays.asList(((ToolCore) tool.getItem()).getTraits());
-			NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+			final List list = Arrays.asList(((ToolCore) tool.getItem()).getTraits());
+			final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 
 			if(list.contains("heavyarmor") || list.contains("lightarmor"))
 			{
@@ -45,9 +42,13 @@ public class modifierProtection extends ModInteger
 						if(tags.hasKey(types[i]))
 						{
 							if(types[i] != type)
+							{
 								return false;
+							}
 							if(types[i] == type && tags.getInteger(types[i]) > 5)
+							{
 								return false;
+							}
 						}
 					}
 					return true;
@@ -69,7 +70,7 @@ public class modifierProtection extends ModInteger
 	@Override
 	public void modify(ItemStack[] input, ItemStack tool)
 	{
-		NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 		if(tags.hasKey(key))
 		{
 			int increase = tags.getInteger(key);
diff --git a/src/main/java/lance5057/tDefense/armor/parts/Cloth.java b/src/main/java/lance5057/tDefense/armor/parts/Cloth.java
index 021a607..480c153 100644
--- a/src/main/java/lance5057/tDefense/armor/parts/Cloth.java
+++ b/src/main/java/lance5057/tDefense/armor/parts/Cloth.java
@@ -10,19 +10,23 @@ public class Cloth extends CraftingItem implements IToolPart
 	public Cloth()
 	{
 		super(toolMaterialNames, buildTextureNames("_cloth"), "parts/", "tinker", TConstructRegistry.materialTab);
-		this.setHasSubtypes(true);
-		this.setMaxDamage(0);
+		setHasSubtypes(true);
+		setMaxDamage(0);
 	}
 
 	private static String[] buildTextureNames(String textureType)
 	{
-		String[] names = new String[toolMaterialNames.length];
+		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;
 	}
@@ -34,7 +38,9 @@ public class Cloth extends CraftingItem implements IToolPart
 	public int getMaterialID(ItemStack stack)
 	{
 		if(stack.getItemDamage() >= toolMaterialNames.length)
+		{
 			return -1;
+		}
 		return stack.getItemDamage();
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
index 9841c80..3a35160 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
@@ -1,16 +1,11 @@
 package lance5057.tDefense.armor.renderers;
 
-import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.armor.ArmorCore;
-import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.client.FMLClientHandler;
-
 /**
  * ModelBiped - Either Mojang or a mod author
  * Created using Tabula 4.1.1
@@ -27,20 +22,20 @@ public class ModelSheath extends ArmorRenderer
 	{
 		super(0.5f, 0, 64, 64);
 
-		this.textureWidth = 64;
-		this.textureHeight = 64;
+		textureWidth = 64;
+		textureHeight = 64;
 
-		this.belt = new ModelRenderer(this, 16, 32);
-		this.belt.setRotationPoint(-4.5F, 0.0F, 0.5F);
-		this.belt.addBox(0.0F, 0.0F, -3.0F, 1, 12, 5, 0.0F);
-		this.setRotateAngle(belt, 0.0F, 0.0F, -0.7853981633974483F);
-		this.bipedBody.addChild(belt);
+		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);
 
-		this.sheath = new ModelRenderer(this, 0, 32);
-		this.sheath.setRotationPoint(0f, 0f, 0f);
-		this.sheath.addBox(-5.0F, 0.0F, 2.0F, 5, 16, 2, -0.4F);
-		this.setRotateAngle(sheath, 0.0F, 0.0F, -0.45F);
-		this.bipedBody.addChild(sheath);
+		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
@@ -50,13 +45,13 @@ public class ModelSheath extends ArmorRenderer
 
 		for(int i = 0; i < 10; i++)
 		{
-			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			final String texture = ((ArmorCore) stack.getItem()).getTexture(i, stack);
 			if(texture != "")
 			{
 
 				GL11.glPushMatrix();
 
-				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				((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();
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java
index d40b416..b64c0d9 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java
@@ -40,147 +40,172 @@ public class ModelTinkersGauntlets extends ArmorRenderer
 		textureWidth = 64;
 		textureHeight = 64;
 
-		KnuckleSpikesL = new ModelRenderer(this, 56, 40);
+		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, 56, 40);
+		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, 0, 41);
+		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, 56, 32);
+		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, 14, 40);
+		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, 16, 32);
+		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, 56, 40);
+		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, 0, 32);
+		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, 16, 32);
+		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, 0, 41);
+		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, 56, 40);
+		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, 54, 48);
+		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, 56, 32);
+		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, 56, 32);
+		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, 0, 56);
+		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, 0, 48);
+		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, 14, 40);
+		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, 12, 49);
+		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, 0, 32);
+		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, 0, 48);
+		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, 0, 56);
+		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, 54, 48);
+		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, 12, 49);
+		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, 56, 32);
+		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);
@@ -200,6 +225,8 @@ public class ModelTinkersGauntlets extends ArmorRenderer
 		KnuckleSpikesR.isHidden = true;
 		SettingL.isHidden = true;
 		SettingR.isHidden = true;
+
+		init();
 	}
 
 	/**
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java
index fe92f2b..2bce53e 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java
@@ -1,58 +1,56 @@
 package lance5057.tDefense.armor.renderers;
 
 import lance5057.tDefense.armor.ArmorCore;
-
-import org.lwjgl.opengl.GL11;
-
-import net.minecraft.client.model.ModelBase;
 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 class ModelTinkersTabard extends ArmorRenderer
 {
-    public ModelRenderer Tabard;
-    public ModelRenderer TabardBottomF;
-    public ModelRenderer TabardBottomB;
+	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;
 
-    public ModelTinkersTabard() 
-    {
-    	super(0.5f, 0, 64, 64);
-    	
-        this.textureWidth = 64;
-        this.textureHeight = 64;
-        
-        this.Tabard = new ModelRenderer(this, 0, 32);
-        this.Tabard.setRotationPoint(0.0F, 0.0F, 0.0F);
-        this.Tabard.addBox(-4.0F, 0.0F, -2.5F, 8, 12, 5, 0.1F);
-        
-        this.TabardBottomF = new ModelRenderer(this, 26, 32);
-        this.TabardBottomF.setRotationPoint(0.0F, 12.0F, 0.0F);
-        this.TabardBottomF.addBox(-4.0F, 0.2F, -2.5F, 8, 8, 1, 0.1F);
-        this.TabardBottomB = new ModelRenderer(this, 26, 32);
-        this.TabardBottomB.mirror = true;
-        
-        this.TabardBottomB.setRotationPoint(0.0F, 12.0F, 0.0F);
-        this.TabardBottomB.addBox(-4.0F, 0.2F, 1.5F, 8, 8, 1, 0.1F);
-    }
+		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) 
-    { 
+	@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++)
 		{
-			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			final String texture = ((ArmorCore) stack.getItem()).getTexture(i, stack);
 			if(texture != "")
 			{
 
 				GL11.glPushMatrix();
 
-				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				((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();
@@ -60,14 +58,15 @@ public class ModelTinkersTabard  extends ArmorRenderer
 		}
 
 		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;
-    }
+	/**
+	 * 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 0fd14bd..f97f7ba 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
@@ -23,17 +23,19 @@ public class ModelTinkersHood extends ArmorRenderer
 	public ModelRenderer	Tip_2;
 	public ModelRenderer	ScarfExtra;
 	public ModelRenderer	ScarfExtra_1;
+	public ModelRenderer	BandExtra;
+	public ModelRenderer	BandExtra_1;
 
 	public ModelTinkersHood()
 	{
-		super(0.1f, 0, 128, 64);
+		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.1f + 0.5F);
+		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");
@@ -90,7 +92,7 @@ public class ModelTinkersHood extends ArmorRenderer
 		bipedHead.addChild(HatTopTall);
 
 		Rim = new ModelRenderer(this, "Rim");
-		Rim.setTextureOffset(64, 20);
+		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);
@@ -105,9 +107,23 @@ public class ModelTinkersHood extends ArmorRenderer
 		Band = new ModelRenderer(this, "Band");
 		Band.setTextureOffset(64, 9);
 		Band.setRotationPoint(0.0F, 0.0F, 0.0F);
-		Band.addBox(-4.5F, -6.7F, -4.5F, 9, 2, 9, 0.2F);
+		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);
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 534f917..9eccca3 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
@@ -188,6 +188,17 @@ public class ModelTinkersGrieves extends ArmorRenderer
 		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();
 	}
 
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 8e35b7c..0238b75 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java
@@ -204,6 +204,22 @@ public class ModelTinkersHelm extends ArmorRenderer
 		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();
 	}
 
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 3294e83..f700e93 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
@@ -25,10 +25,21 @@ public class ModelTinkersBoots extends ArmorRenderer
 		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.0F);
+		FootR.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.1F);
 		bipedRightLeg.addChild(FootR);
 
 		BootTopR = new ModelRenderer(this, "BootTopR");
@@ -61,7 +72,7 @@ public class ModelTinkersBoots extends ArmorRenderer
 		FootL.setTextureOffset(0, 41);
 		FootL.mirror = true;
 		FootL.setRotationPoint(0f, 0f, 0f);
-		FootL.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.0F);
+		FootL.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.1F);
 		bipedLeftLeg.addChild(FootL);
 
 		LegGuardL = new ModelRenderer(this, "LegGuardL");
@@ -82,6 +93,8 @@ public class ModelTinkersBoots extends ArmorRenderer
 		BootTopR.isHidden = true;
 		FootTipL.isHidden = true;
 		FootTipR.isHidden = true;
+		LegGuardL.isHidden = true;
+		LegGuardR.isHidden = true;
 
 		init();
 	}
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 b667ef2..f2eb795 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
@@ -40,7 +40,7 @@ public class ModelTinkersChausses extends ArmorRenderer
 		bipedLeftLeg.setRotationPoint(1.9F, 12.0F + 0, 0.0F);
 
 		HipGuardR = new ModelRenderer(this, "Hip Guard Right");
-		HipGuardR.setTextureOffset(0, 49);
+		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);
@@ -55,19 +55,19 @@ public class ModelTinkersChausses extends ArmorRenderer
 		FrontR = new ModelRenderer(this, "Front Right");
 		FrontR.setTextureOffset(0, 40);
 		FrontR.setRotationPoint(1.9f, 0f, -0.1f);
-		FrontR.addBox(-2.0F, 0.0F, -2.4F, 4, 7, 1, 0.0F);
+		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.4F, 4, 7, 1, 0.0F);
+		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(10, 37);
+		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);
@@ -90,7 +90,7 @@ public class ModelTinkersChausses extends ArmorRenderer
 		bipedLeftLeg.addChild(BeltL);
 
 		HipGuardR_1 = new ModelRenderer(this, "Hip Guard Right 2");
-		HipGuardR_1.setTextureOffset(10, 37);
+		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);
@@ -99,24 +99,31 @@ public class ModelTinkersChausses extends ArmorRenderer
 		BackR = new ModelRenderer(this, "Back Right");
 		BackR.setTextureOffset(0, 40);
 		BackR.setRotationPoint(1.9f, 0f, 0f);
-		BackR.addBox(-2.0F, 0.0F, 1.2F, 4, 7, 1, 0.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.2F, 4, 7, 1, 0.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(0, 48);
+		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();
 	}
 
 	/**
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 44a64d7..7496f00 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
@@ -75,9 +75,16 @@ public class ModelTinkersCoif extends ArmorRenderer
 		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.5F);
+		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();
 	}
 
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 d68c816..68e92aa 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java
@@ -34,6 +34,22 @@ public class ModelTinkersHauberk extends ArmorRenderer
 		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);
@@ -157,6 +173,16 @@ public class ModelTinkersHauberk extends ArmorRenderer
 		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();
 	}