Fixed bugs in the issue tracker.

Server issue
Thaumium issue
Vis Modifier issues

24 files changed, 199 insertions, 113 deletions

diff --git a/build.gradle b/build.gradle
index 05437e7..6835cb5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.3.6"
+version = "1.3.7"
 group= "gmail.lance5057.com" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "tinkersdefense"
 
diff --git a/src/main/java/lance5057/tDefense/Reference.java b/src/main/java/lance5057/tDefense/Reference.java
index 585e944..4d27074 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.3.6";
+	public static final String	VERSION		= "1.3.7";
 	public static final String	MOD_NAME	= "Tinkers' Defense";
 
 }
diff --git a/src/main/java/lance5057/tDefense/TinkersDefense.java b/src/main/java/lance5057/tDefense/TinkersDefense.java
index 5a79ef1..e610a2b 100644
--- a/src/main/java/lance5057/tDefense/TinkersDefense.java
+++ b/src/main/java/lance5057/tDefense/TinkersDefense.java
@@ -8,8 +8,6 @@ import java.util.Iterator;
 import java.util.List;
 
 import lance5057.tDefense.armor.TDArmorAddon;
-import lance5057.tDefense.armor.events.ArmorModEvents;
-import lance5057.tDefense.armor.events.ArmorRenderEvent;
 import lance5057.tDefense.armor.parts.Cloth;
 import lance5057.tDefense.armor.parts.ClothMaterial;
 import lance5057.tDefense.baubles.blocks.JewelersBench;
@@ -195,9 +193,6 @@ public class TinkersDefense
 
 		PacketHandler.init();
 
-		MinecraftForge.EVENT_BUS.register(new ArmorRenderEvent());
-		MinecraftForge.EVENT_BUS.register(new ArmorModEvents());
-
 		NetworkRegistry.INSTANCE.registerGuiHandler(TinkersDefense.instance, new CommonProxy());
 		MinecraftForge.EVENT_BUS.register(this);
 
@@ -395,11 +390,17 @@ public class TinkersDefense
 			}
 		}
 
-		StencilBuilder.registerStencil(50, woodPattern, 0); // rivets
-		StencilBuilder.registerStencil(51, woodPattern, 1); // clasp
-		StencilBuilder.registerStencil(52, woodPattern, 2); // armorplate
-		StencilBuilder.registerStencil(53, woodPattern, 3); // cloth
-		StencilBuilder.registerStencil(54, woodPattern, 4); // chainmaille
+		final int[] stencils = new int[5];
+		for(int i = 0; i < 5; i++)
+		{
+			stencils[i] = StencilBuilder.getStencilCount() + i;
+		}
+
+		StencilBuilder.registerStencil(stencils[0], woodPattern, 0); // rivets
+		StencilBuilder.registerStencil(stencils[1], woodPattern, 1); // clasp
+		StencilBuilder.registerStencil(stencils[2], woodPattern, 2); // armorplate
+		StencilBuilder.registerStencil(stencils[3], woodPattern, 3); // cloth
+		StencilBuilder.registerStencil(stencils[4], woodPattern, 4); // chainmaille
 
 		PatternBuilder.instance.addToolPattern(woodPattern);
 
@@ -421,6 +422,22 @@ public class TinkersDefense
 		//buildParts(partCloth, 3);
 		buildParts(partChainmaille, 4);
 
+		TConstructClientRegistry.stencilButtons2.add(new StencilGuiElement(0,
+				0, stencils[0],
+				"tinkersdefense", "textures/gui/icons.png"));
+		TConstructClientRegistry.stencilButtons2.add(new StencilGuiElement(0,
+				0, stencils[1],
+				"tinkersdefense", "textures/gui/icons.png"));
+		TConstructClientRegistry.stencilButtons2.add(new StencilGuiElement(0,
+				0, stencils[2],
+				"tinkersdefense", "textures/gui/icons.png"));
+		TConstructClientRegistry.stencilButtons2.add(new StencilGuiElement(0,
+				0, stencils[3],
+				"tinkersdefense", "textures/gui/icons.png"));
+		TConstructClientRegistry.stencilButtons2.add(new StencilGuiElement(0,
+				0, stencils[4],
+				"tinkersdefense", "textures/gui/icons.png"));
+
 		final PatternBuilder pb = PatternBuilder.instance;
 
 		//Shields
@@ -577,17 +594,6 @@ public class TinkersDefense
 				StatCollector.translateToLocal("gui.toolstation.shears.desc"),
 				"tinkersdefense", "textures/gui/icons.png"));
 
-		TConstructClientRegistry.stencilButtons2.add(new StencilGuiElement(0,
-				0, 50, "tinkersdefense", "textures/gui/icons.png"));
-		TConstructClientRegistry.stencilButtons2.add(new StencilGuiElement(0,
-				0, 51, "tinkersdefense", "textures/gui/icons.png"));
-		TConstructClientRegistry.stencilButtons2.add(new StencilGuiElement(0,
-				0, 52, "tinkersdefense", "textures/gui/icons.png"));
-		TConstructClientRegistry.stencilButtons2.add(new StencilGuiElement(0,
-				0, 53, "tinkersdefense", "textures/gui/icons.png"));
-		TConstructClientRegistry.stencilButtons2.add(new StencilGuiElement(0,
-				0, 54, "tinkersdefense", "textures/gui/icons.png"));
-
 		// aeonsteel
 		pb.registerMaterialSet("aeonsteel", new ItemStack(
 				TinkerTools.toolShard, 1, 10), new ItemStack(
@@ -941,7 +947,7 @@ public class TinkersDefense
 						metalPattern, 1, 1), 50);
 		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				partChainmaille, 1, ID), new FluidStack(fluid,
-						(int) (144 * 4.0D)), new ItemStack(metalPattern, 1, 3), 50);
+						(int) (144 * 4.0D)), new ItemStack(metalPattern, 1, 4), 50);
 	}
 
 	public void buildParts(Item item, int meta)
@@ -949,7 +955,7 @@ public class TinkersDefense
 		final int[] nonMetals = {0, 1, 3, 4, 5, 6, 7, 8, 9, 17};
 		final int[] liquidDamage = new int[] {2, 13, 10, 11, 12, 14, 15, 6, 16, 18};
 
-		for(int mat = 0; mat < nonMetals.length; mat++)
+		for(int mat = 0; mat < nonMetals.length; mat++) //
 		{
 			TConstructRegistry.addPartMapping(woodPattern, meta, mat, new ItemStack(
 					item, 1, mat));
diff --git a/src/main/java/lance5057/tDefense/armor/ArmorCore.java b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
index 87188f5..1c63062 100644
--- a/src/main/java/lance5057/tDefense/armor/ArmorCore.java
+++ b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
@@ -16,12 +16,10 @@ import net.minecraft.util.DamageSource;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ISpecialArmor;
-import net.minecraftforge.common.MinecraftForge;
 
 import org.lwjgl.opengl.GL11;
 
 import tconstruct.library.TConstructRegistry;
-import tconstruct.library.event.ToolCraftEvent.NormalTool;
 import tconstruct.library.tools.AbilityHelper;
 import tconstruct.library.tools.CustomMaterial;
 import tconstruct.library.tools.ToolCore;
@@ -29,7 +27,6 @@ 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.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -51,7 +48,7 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRuni
 
 		this.slot = slot;
 
-		MinecraftForge.EVENT_BUS.register(this);
+		//MinecraftForge.EVENT_BUS.register(this);
 	}
 
 	@Override
@@ -243,6 +240,7 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRuni
 		}
 	}
 
+	@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)
 	{
 
@@ -259,6 +257,7 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRuni
 
 	}
 
+	@SideOnly(Side.CLIENT)
 	public String getTexture(int pass, ItemStack stack)
 	{
 		final NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
@@ -307,30 +306,4 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRuni
 		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 2aca64c..98223ce 100644
--- a/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
+++ b/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
@@ -4,6 +4,8 @@ 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;
@@ -23,6 +25,7 @@ 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;
@@ -32,6 +35,7 @@ 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
 {
@@ -75,6 +79,13 @@ public class TDArmorAddon
 
 		};
 
+		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();
diff --git a/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java b/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java
index fd15b98..c2ee519 100644
--- a/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java
+++ b/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java
@@ -2,6 +2,7 @@ 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;
@@ -9,10 +10,40 @@ 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)
 	{
diff --git a/src/main/java/lance5057/tDefense/armor/items/Sheath.java b/src/main/java/lance5057/tDefense/armor/items/Sheath.java
index ca4b44e..165c187 100644
--- a/src/main/java/lance5057/tDefense/armor/items/Sheath.java
+++ b/src/main/java/lance5057/tDefense/armor/items/Sheath.java
@@ -96,6 +96,7 @@ public class Sheath extends ArmorCore implements IAccessory
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public ArmorRenderer getRenderer()
 	{
 		// TODO Auto-generated method stub
diff --git a/src/main/java/lance5057/tDefense/armor/items/TinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/items/TinkersGauntlets.java
index 91f10f1..f516225 100644
--- a/src/main/java/lance5057/tDefense/armor/items/TinkersGauntlets.java
+++ b/src/main/java/lance5057/tDefense/armor/items/TinkersGauntlets.java
@@ -9,6 +9,8 @@ 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
 {
@@ -111,6 +113,7 @@ public class TinkersGauntlets extends ArmorCore implements IAccessory
 	// }
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
 	{
 		return "tinkersdefense:textures/armor/Tinkersgauntlet.png";
@@ -123,6 +126,7 @@ public class TinkersGauntlets extends ArmorCore implements IAccessory
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	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 7259d48..756237d 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
@@ -19,6 +19,8 @@ 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
@@ -115,6 +117,7 @@ public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, ILPGa
 	//	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
 	{
 		return "tinkersdefense:textures/armor/TinkersHood.png";
@@ -140,6 +143,7 @@ public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, ILPGa
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public ArmorRenderer getRenderer()
 	{
 		return ClientProxy.hood;
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 28027cd..bad02bd 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java
@@ -12,6 +12,8 @@ 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
@@ -108,6 +110,7 @@ public class TinkersRobe extends ArmorCore implements IVisDiscountGear, IManaDis
 	//	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
 	{
 		return "tinkersdefense:textures/armor/TinkersRobe.png";
@@ -134,6 +137,7 @@ public class TinkersRobe extends ArmorCore implements IVisDiscountGear, IManaDis
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public ArmorRenderer getRenderer()
 	{
 		return ClientProxy.robe;
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 8df9b42..17b84a2 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java
@@ -12,6 +12,8 @@ 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
@@ -109,6 +111,7 @@ public class TinkersShawl extends ArmorCore implements IVisDiscountGear, IManaDi
 	//	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
 	{
 		return "tinkersdefense:textures/armor/TinkersShawl.png";
@@ -135,6 +138,7 @@ public class TinkersShawl extends ArmorCore implements IVisDiscountGear, IManaDi
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public ArmorRenderer getRenderer()
 	{
 		// TODO Auto-generated method stub
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 8f4f795..a0c77ff 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java
@@ -12,6 +12,8 @@ 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
@@ -108,6 +110,7 @@ public class TinkersShoes extends ArmorCore implements IVisDiscountGear, IManaDi
 	//	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
 	{
 		return "tinkersdefense:textures/armor/TinkersShoes.png";
@@ -133,6 +136,7 @@ public class TinkersShoes extends ArmorCore implements IVisDiscountGear, IManaDi
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public ArmorRenderer getRenderer()
 	{
 		return ClientProxy.shoes;
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 fa1c2e5..af6ccfb 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersBreastplate.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersBreastplate.java
@@ -8,6 +8,8 @@ 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 TinkersBreastplate extends ArmorCore
 {
@@ -106,6 +108,7 @@ public class TinkersBreastplate extends ArmorCore
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
 	{
 		return "tinkersdefense:textures/armor/Tinkersbreastplate.png";
@@ -118,6 +121,7 @@ public class TinkersBreastplate extends ArmorCore
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	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 7bfa98c..3a019c8 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java
@@ -8,6 +8,8 @@ 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
 {
@@ -113,6 +115,7 @@ public class TinkersGrieves extends ArmorCore
 	//	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
 	{
 		return "tinkersdefense:textures/armor/TinkersGrieves.png";
@@ -125,6 +128,7 @@ public class TinkersGrieves extends ArmorCore
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	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 12fed96..02754bf 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
@@ -16,6 +16,8 @@ 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
@@ -122,6 +124,7 @@ public class TinkersHelm extends ArmorCore implements IRevealer, IGoggles, ILPGa
 	//	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
 	{
 		return "tinkersdefense:textures/armor/TinkersHelm.png";
@@ -134,6 +137,7 @@ public class TinkersHelm extends ArmorCore implements IRevealer, IGoggles, ILPGa
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public ArmorRenderer getRenderer()
 	{
 		return ClientProxy.helm;
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 35a3348..c7f83d0 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java
@@ -8,6 +8,8 @@ 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
 {
@@ -113,6 +115,7 @@ public class TinkersSabatons extends ArmorCore
 	//	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
 	{
 		return "tinkersdefense:textures/armor/TinkersSabatons.png";
@@ -125,6 +128,7 @@ public class TinkersSabatons extends ArmorCore
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	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 f84bc3e..4043a06 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java
@@ -8,6 +8,8 @@ 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
 {
@@ -105,6 +107,7 @@ public class TinkersBoots extends ArmorCore
 	//	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
 	{
 		return "tinkersdefense:textures/armor/TinkersBoots.png";
@@ -123,6 +126,7 @@ public class TinkersBoots extends ArmorCore
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	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 a088f54..3786d7f 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java
@@ -10,6 +10,8 @@ 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
 {
@@ -107,6 +109,7 @@ public class TinkersChausses extends ArmorCore
 	//	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
 	{
 		return "tinkersdefense:textures/armor/TinkersChausses.png";
@@ -133,6 +136,7 @@ public class TinkersChausses extends ArmorCore
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	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 5014bf9..4489fdf 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
@@ -17,6 +17,8 @@ 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
@@ -115,6 +117,7 @@ public class TinkersCoif extends ArmorCore implements IRevealer, IGoggles, ILPGa
 	//	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
 	{
 		return "tinkersdefense:textures/armor/TinkersCoif.png";
@@ -141,6 +144,7 @@ public class TinkersCoif extends ArmorCore implements IRevealer, IGoggles, ILPGa
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public ArmorRenderer getRenderer()
 	{
 		// TODO Auto-generated method stub
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 490e649..94c2b5f 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java
@@ -9,6 +9,8 @@ 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
 {
@@ -106,6 +108,7 @@ public class TinkersHauberk extends ArmorCore
 	//	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
 	{
 		return "tinkersdefense:textures/armor/TinkersHauberk.png";
@@ -124,6 +127,7 @@ public class TinkersHauberk extends ArmorCore
 	}
 
 	@Override
+	@SideOnly(Side.CLIENT)
 	public ArmorRenderer getRenderer()
 	{
 		return ClientProxy.hauberk;
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ArmorRenderer.java b/src/main/java/lance5057/tDefense/armor/renderers/ArmorRenderer.java
index 6ffce2f..2cace5c 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/ArmorRenderer.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/ArmorRenderer.java
@@ -23,7 +23,6 @@ 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)
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
index ddea547..2c20476 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java
@@ -29,7 +29,7 @@ public class modifierRepairVis extends ModBoolean
 				for(final WandCap cp : WandCap.caps.values())
 				{
 					final ItemStack test = cp.getItem();
-					if(element.getItem() == test.getItem() && element.getItemDamage() == test.getItemDamage())
+					if(test != null && element.getItem() == test.getItem() && element.getItemDamage() == test.getItemDamage())
 					{
 						cap = cp;
 						break;
@@ -39,13 +39,9 @@ public class modifierRepairVis extends ModBoolean
 		}
 
 		if(!canModify(input, recipe))
-		{
 			return false;
-		}
 		if(cap == null)
-		{
 			return false;
-		}
 		return true;
 	}
 
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
index ea56f5a..3636b09 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java
@@ -36,16 +36,16 @@ 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);
+																	this,
+																	3.5f,
+																	3.5f, 1.0f);
 
 	private ItemStack						rightCopy1, rightCopy2, rightCopy3;
 	NBTTagCompound							rightCopyTags1, rightCopyTags2,
-	rightCopyTags3;
+											rightCopyTags3;
 	private final RenderItem				normalRender	= new RenderItem_FinishingAnvil(
-			this, 1.0f,
-			1.0f, 1.0f);
+																	this, 1.0f,
+																	1.0f, 1.0f);
 
 	//private Boolean							isNull			= true;
 	private ItemStack						editItem;
@@ -68,8 +68,8 @@ public class Gui_FinishingAnvil extends GuiContainer
 	InventoryPlayer							player;
 
 	private static final ResourceLocation	iconLocation	= new ResourceLocation(
-			"tinkersdefense",
-			"textures/gui/finishinganvil.png");
+																	"tinkersdefense",
+																	"textures/gui/finishinganvil.png");
 
 	public Gui_FinishingAnvil(InventoryPlayer invPlayer, TileEntity_FinishingAnvil te)
 	{
@@ -511,12 +511,38 @@ public class Gui_FinishingAnvil extends GuiContainer
 			final int test = button.getHoverState(mousehover);
 			if(test == 2)
 			{
-				if(bigCopy != null && bigCopy.getItem() instanceof ToolCore)
+				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);
-					final List<String> list = new ArrayList();
 
 					if(tt != null)
 					{
@@ -549,31 +575,7 @@ public class Gui_FinishingAnvil extends GuiContainer
 						}
 						func_146283_a(list, x, y);
 					}
-					else 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
 					{
 						list.add("Error - No name/desc!");
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
index 2b754f0..9b2138f 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
@@ -1,7 +1,6 @@
 package lance5057.tDefense.finishingAnvil.utilities;
 
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
@@ -12,6 +11,7 @@ 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;
@@ -37,7 +37,7 @@ public class Injector extends ToolCore
 		super(0);
 	}
 
-	protected void loadHeads(IIconRegister iconRegister) throws IOException, URISyntaxException
+	protected void loadHeads(IIconRegister iconRegister)
 	{
 
 		//		final URL jarFile =
@@ -55,14 +55,38 @@ public class Injector extends ToolCore
 			//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/tinkersdefense-1.3.6.jar");
-			final FileSystem fs = FileSystems.newFileSystem(zipfile, Minecraft.class.getClassLoader());
+			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 Path root = fs.getPath(path);
 			//final Iterable<FileStore> files = fs.getFileStores();
 			final FileGetter fileget = new FileGetter();
 
-			Files.walkFileTree(root, fileget);
+			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());
@@ -78,6 +102,8 @@ public class Injector extends ToolCore
 		}
 	}
 
+	//	}
+
 	//}
 	//}
 
@@ -235,18 +261,7 @@ public class Injector extends ToolCore
 	@Override
 	public void registerIcons(IIconRegister iconRegister)
 	{
-		try
-		{
-			loadHeads(iconRegister);
-		}
-		catch(final IOException e)
-		{
-			System.out.print("No Finishing Anvil for you");
-		}
-		catch(final URISyntaxException e)
-		{
-			System.out.print("No Finishing Anvil for you");
-		}
+		loadHeads(iconRegister);
 	}
 
 	@Override