Did some armor stuff.

12 files changed, 589 insertions, 374 deletions

diff --git a/src/main/java/lance5057/tDefense/TinkersDefense.java b/src/main/java/lance5057/tDefense/TinkersDefense.java
index e75fdf2..515223c 100644
--- a/src/main/java/lance5057/tDefense/TinkersDefense.java
+++ b/src/main/java/lance5057/tDefense/TinkersDefense.java
@@ -3,6 +3,7 @@ package lance5057.tDefense;
 import java.util.Iterator;
 import java.util.List;
 
+import lance5057.tDefense.armor.ArmorBase;
 import lance5057.tDefense.baubles.BaublesBase;
 import lance5057.tDefense.core.CoreBase;
 import lance5057.tDefense.core.materials.TDMaterials;
@@ -41,6 +42,7 @@ public class TinkersDefense {
 	HolidayBase holiday;
 	ModuleBase core;
 	ModuleBase baubles;
+	ModuleBase armor;
 
 	// public static TDEventHandler TDevents;
 
@@ -122,6 +124,7 @@ public class TinkersDefense {
 		core = new CoreBase();
 		holiday = new HolidayBase();
 		baubles = new BaublesBase();
+		armor = new ArmorBase();
 		
 		mats = new TDMaterials();
 		tools = new TDTools();
@@ -322,6 +325,7 @@ public class TinkersDefense {
 		// proxy.registerRenderers();
 
 		core.preInit(e);
+		armor.preInit(e);
 		holiday.preInit(e);
 		tools.preInit(e);
 		baubles.preInit(e);
@@ -340,6 +344,7 @@ public class TinkersDefense {
 		}
 
 		core.init(e);
+		armor.init(e);
 		holiday.init(e);
 		mats.setupMaterials(e);
 		tools.init(e);
@@ -356,6 +361,7 @@ public class TinkersDefense {
 		// {
 		// ArmorAddon.postInit(e);
 		// }
+		armor.postInit(e);
 		tools.postInit(e);
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/ArmorBase.java b/src/main/java/lance5057/tDefense/armor/ArmorBase.java
new file mode 100644
index 0000000..7c64347
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/armor/ArmorBase.java
@@ -0,0 +1,295 @@
+package lance5057.tDefense.armor;
+
+import java.util.List;
+import java.util.Locale;
+
+import com.google.common.collect.Lists;
+import org.apache.commons.lang3.tuple.Pair;
+
+import lance5057.tDefense.Reference;
+import lance5057.tDefense.armor.items.cloth.TinkersHood;
+import lance5057.tDefense.armor.materials.MaterialArmor;
+import lance5057.tDefense.armor.materials.MaterialCloth;
+import lance5057.tDefense.core.materials.ShieldMaterialStats;
+import lance5057.tDefense.util.Color16Util;
+import lance5057.tDefense.util.ModuleBase;
+import net.minecraft.block.Block;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import slimeknights.tconstruct.library.TinkerRegistry;
+import slimeknights.tconstruct.library.materials.Material;
+import slimeknights.tconstruct.library.modifiers.IModifier;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.tools.IPattern;
+import slimeknights.tconstruct.library.tools.Pattern;
+import slimeknights.tconstruct.library.tools.ToolCore;
+import slimeknights.tconstruct.library.tools.ToolPart;
+import slimeknights.tconstruct.tools.TinkerMaterials;
+import slimeknights.tconstruct.tools.TinkerTools;
+
+public class ArmorBase extends ModuleBase {
+	public static CreativeTabs tabName;
+
+	private static List<ToolCore> tools = Lists.newLinkedList();
+	private static List<ToolPart> toolParts = Lists.newLinkedList();
+	private static List<IModifier> modifiers = Lists.newLinkedList();
+	private static List<Pair<Item, ToolPart>> toolPartPatterns = Lists.newLinkedList();
+
+	public static ToolPart armorPlate;
+	public static ToolPart chainmail;
+	public static ToolPart cloth;
+	public static ToolPart rivets;
+	public static ToolPart clasp;
+
+	public static Material black;
+	public static Material red;
+	public static Material green;
+	public static Material brown;
+	public static Material blue;
+	public static Material purple;
+	public static Material cyan;
+	public static Material lightgray;
+	public static Material gray;
+	public static Material pink;
+	public static Material lime;
+	public static Material yellow;
+	public static Material lightblue;
+	public static Material magenta;
+	public static Material orange;
+	public static Material white;
+
+	public static ToolCore armor_TinkerHood;
+	public static ToolCore armor_TinkerShawl;
+	public static ToolCore armor_TinkerRobe;
+	public static ToolCore armor_TinkerShoes;
+
+	public static ToolCore armor_TinkerCoif;
+	public static ToolCore armor_TinkerHauberk;
+	public static ToolCore armor_TinkerChausses;
+	public static ToolCore armor_TinkerBoots;
+
+	public static ToolCore armor_TinkerHelm;
+	public static ToolCore armor_TinkerBreastplate;
+	public static ToolCore armor_TinkerGrieves;
+	public static ToolCore armor_TinkerSabatons;
+
+	public static Block block_Unstable;
+	public static Block block_GlowCrumbs;
+
+	// private static Material mat(String name, int color) {
+	// Material mat = new Material(name, color);
+	// materials.add(mat);
+	// return mat;
+	// }
+
+	@Override
+	public void preInit(FMLPreInitializationEvent e) {
+		armorPlate = registerToolPart(new ToolPart(Material.VALUE_Ingot * 4), "armor_plate");
+		chainmail = registerToolPart(new ToolPart(Material.VALUE_Ingot * 3), "chainmail");
+		cloth = registerToolPart(new ToolPart(Material.VALUE_Ingot * 3), "cloth");
+		rivets = registerToolPart(new ToolPart(Material.VALUE_Ingot * 1), "rivets");
+		clasp = registerToolPart(new ToolPart(Material.VALUE_Ingot * 1), "clasp");
+
+		registerMaterials();
+		registerClothMaterials();
+
+		for (Pair<Item, ToolPart> toolPartPattern : toolPartPatterns) {
+			registerStencil(toolPartPattern.getLeft(), toolPartPattern.getRight());
+		}
+
+		
+		registerTools();
+	}
+
+	@Override
+	public void init(FMLInitializationEvent e) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void postInit(FMLPostInitializationEvent e) {
+		// TODO Auto-generated method stub
+
+	}
+
+	private void regTool(ToolCore tool, String name) {
+		tool.setRegistryName(new ResourceLocation("tinkersdefense:" + name));
+		TinkerRegistry.registerTool(tool);
+		GameRegistry.register(tool);
+	}
+
+	private void registerMaterials() {
+		Material.UNKNOWN.addStats(new MaterialArmor(35, 1F));
+
+		TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new MaterialArmor(35, 0.5f));
+		// TinkerMaterials.wood.addTrait(axelover, SHIELD);
+
+		TinkerRegistry.addMaterialStats(TinkerMaterials.stone, new MaterialArmor(120, 0.6F));
+		// TinkerRegistry.addMaterialTrait(TinkerMaterials.stone, dulling,
+		// SHIELD);
+		// TinkerMaterials.stone.addTrait(dulling, SHIELD);
+
+		TinkerRegistry.addMaterialStats(TinkerMaterials.flint, new MaterialArmor(150, 0.5F));
+		// TinkerRegistry.addMaterialTrait(TinkerMaterials.flint, firestarter,
+		// SHIELD);
+
+		TinkerRegistry.addMaterialStats(TinkerMaterials.cactus, new MaterialArmor(210, 0.3F));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.bone, new MaterialArmor(200, 0.75F));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.obsidian, new MaterialArmor(139, 0.6F));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.prismarine, new MaterialArmor(430, 0.6F));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.endstone, new MaterialArmor(420, 0.8F));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.paper, new MaterialArmor(12, 0.1F));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.sponge, new MaterialArmor(550, 0.2F));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.firewood, new MaterialArmor(550, 1F));
+
+		// Slime
+		TinkerRegistry.addMaterialStats(TinkerMaterials.slime, new MaterialArmor(1000, 0.9F));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.blueslime, new MaterialArmor(780, 0.9F));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.knightslime, new MaterialArmor(850, 1.1F));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.magmaslime, new MaterialArmor(600, 0.9F));
+
+		// Nether
+		TinkerRegistry.addMaterialStats(TinkerMaterials.netherrack, new MaterialArmor(270, 0.5F));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.cobalt, new MaterialArmor(780, 1.4F));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.ardite, new MaterialArmor(990, 1.3F));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.manyullyn, new MaterialArmor(820, 1.5F));
+
+		// Metals
+		TinkerRegistry.addMaterialStats(TinkerMaterials.iron, new MaterialArmor(204, 1F));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.pigiron, new MaterialArmor(380, 1.1F));
+
+		// Mod Integration
+		TinkerRegistry.addMaterialStats(TinkerMaterials.copper, new MaterialArmor(210, 0.9F));
+
+		TinkerRegistry.addMaterialStats(TinkerMaterials.bronze, new MaterialArmor(430, 1F));
+
+		TinkerRegistry.addMaterialStats(TinkerMaterials.lead, new MaterialArmor(334, 1F));
+
+		TinkerRegistry.addMaterialStats(TinkerMaterials.silver, new MaterialArmor(250, 0.8F));
+
+		TinkerRegistry.addMaterialStats(TinkerMaterials.electrum, new MaterialArmor(50, 0.8F));
+
+		TinkerRegistry.addMaterialStats(TinkerMaterials.steel, new MaterialArmor(540, 1.3F));
+	}
+
+	private void registerClothMaterials() {
+		black = new Material("blackCloth", 0xDDDDDD);
+		red = new Material("redCloth", 0xDB7D3E);
+		green = new Material("greeCloth", 0xB350BC);
+		brown = new Material("brownCloth", 0x6B8AC9);
+		blue = new Material("blueCloth", 0xB1A627);
+		purple = new Material("purpleCloth", 0x41AE38);
+		cyan = new Material("cyanCloth", 0xD08499);
+		lightgray = new Material("lightgrayCloth", 0x404040);
+		gray = new Material("grayCloth", 0x9AA1A1);
+		pink = new Material("pinkCloth", 0x2E6E89);
+		lime = new Material("limeCloth", 0x7E3DB5);
+		yellow = new Material("yellowCloth", 0x2E388D);
+		lightblue = new Material("lightblueCloth", 0x4F321F);
+		magenta = new Material("magentaCloth", 0x35461B);
+		orange = new Material("orangeCloth", 0x963430);
+		white = new Material("whiteCloth", 0x191616);
+		
+		Material.UNKNOWN.addStats(new MaterialCloth(100));
+		
+		TinkerRegistry.addMaterial(black);
+		TinkerRegistry.addMaterial(red);
+		TinkerRegistry.addMaterial(green);
+		TinkerRegistry.addMaterial(brown);
+		TinkerRegistry.addMaterial(blue);
+		TinkerRegistry.addMaterial(purple);
+		TinkerRegistry.addMaterial(cyan);
+		TinkerRegistry.addMaterial(lightgray);
+		TinkerRegistry.addMaterial(gray);
+		TinkerRegistry.addMaterial(pink);
+		TinkerRegistry.addMaterial(lime);
+		TinkerRegistry.addMaterial(yellow);
+		TinkerRegistry.addMaterial(lightblue);
+		TinkerRegistry.addMaterial(magenta);
+		TinkerRegistry.addMaterial(orange);
+		TinkerRegistry.addMaterial(white);
+		
+		TinkerRegistry.addMaterialStats(black, new MaterialCloth(100));
+		TinkerRegistry.addMaterialStats(red, new MaterialCloth(100));
+		TinkerRegistry.addMaterialStats(green, new MaterialCloth(100));
+		TinkerRegistry.addMaterialStats(brown, new MaterialCloth(100));
+		TinkerRegistry.addMaterialStats(blue, new MaterialCloth(100));
+		TinkerRegistry.addMaterialStats(purple, new MaterialCloth(100));
+		TinkerRegistry.addMaterialStats(cyan, new MaterialCloth(100));
+		TinkerRegistry.addMaterialStats(lightgray, new MaterialCloth(100));
+		TinkerRegistry.addMaterialStats(gray, new MaterialCloth(100));
+		TinkerRegistry.addMaterialStats(pink, new MaterialCloth(100));
+		TinkerRegistry.addMaterialStats(lime, new MaterialCloth(100));
+		TinkerRegistry.addMaterialStats(yellow, new MaterialCloth(100));
+		TinkerRegistry.addMaterialStats(lightblue, new MaterialCloth(100));
+		TinkerRegistry.addMaterialStats(magenta, new MaterialCloth(100));
+		TinkerRegistry.addMaterialStats(orange, new MaterialCloth(100));
+		TinkerRegistry.addMaterialStats(white, new MaterialCloth(100));
+	}
+
+	private void registerTools()
+	{
+		armor_TinkerHood = new TinkersHood();
+		regTool(armor_TinkerHood, "tinkerhood");
+		TinkerRegistry.registerToolCrafting(armor_TinkerHood);
+	}
+	
+	private static <T extends ToolCore> T registerTool(T item, String name) {
+		tools.add(item);
+		return registerItem(item, name);
+	}
+
+	private static ToolPart registerToolPart(ToolPart part, String name) {
+		return registerToolPart(part, name, TinkerTools.pattern);
+	}
+
+	private static <T extends Item & IPattern> ToolPart registerToolPart(ToolPart part, String name, T pattern) {
+		ToolPart ret = registerItem(part, name);
+
+		if (pattern != null) {
+			toolPartPatterns.add(Pair.of(pattern, ret));
+		}
+
+		toolParts.add(ret);
+
+		return ret;
+	}
+
+	private static void registerStencil(Item pattern, ToolPart toolPart) {
+		for (ToolCore toolCore : TinkerRegistry.getTools()) {
+			for (PartMaterialType partMaterialType : toolCore.getRequiredComponents()) {
+				if (partMaterialType.getPossibleParts().contains(toolPart)) {
+					ItemStack stencil = new ItemStack(pattern);
+					Pattern.setTagForPart(stencil, toolPart);
+					TinkerRegistry.registerStencilTableCrafting(stencil);
+					return;
+				}
+			}
+		}
+	}
+
+	private static <T extends Item> T registerItem(T item, String name) {
+		if (!name.equals(name.toLowerCase(Locale.US))) {
+			throw new IllegalArgumentException(
+					String.format("Unlocalized names need to be all lowercase! Item: %s", name));
+		}
+
+		item.setUnlocalizedName(name);
+		item.setRegistryName(new ResourceLocation(Reference.MOD_ID, name));
+		GameRegistry.register(item);
+		return item;
+	}
+
+	private static <T extends IModifier> T registerModifier(T modifier) {
+		TinkerRegistry.registerModifier(modifier);
+		modifiers.add(modifier);
+		return modifier;
+	}
+}
diff --git a/src/main/java/lance5057/tDefense/armor/ArmorCore.java b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
index 3291523..8eefb29 100644
--- a/src/main/java/lance5057/tDefense/armor/ArmorCore.java
+++ b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
@@ -1,5 +1,9 @@
 package lance5057.tDefense.armor;
 
+import java.util.List;
+
+import lance5057.tDefense.armor.materials.MaterialArmor;
+import lance5057.tDefense.armor.materials.MaterialCloth;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -12,6 +16,7 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
 import slimeknights.tconstruct.library.tools.ToolCore;
+import slimeknights.tconstruct.library.tools.ToolNBT;
 
 //@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// ,
@@ -21,6 +26,13 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor// ,
 	public final EntityEquipmentSlot armorType;
 	public float reductionPercent = 0f;
 	protected int maxReduction = 100;
+	
+	protected static PartMaterialType ArmorplateMat = new PartMaterialType(ArmorBase.armorPlate, MaterialArmor.TYPE);
+	protected static PartMaterialType ChainmailMat = new PartMaterialType(ArmorBase.chainmail, MaterialArmor.TYPE);
+	protected static PartMaterialType RivetMat = new PartMaterialType(ArmorBase.rivets, MaterialArmor.TYPE);
+	protected static PartMaterialType ClaspMat = new PartMaterialType(ArmorBase.clasp, MaterialArmor.TYPE);
+	
+	protected static PartMaterialType ClothMat = new PartMaterialType(ArmorBase.cloth, MaterialCloth.TYPE);
 
 	// public String[] renderParts;
 
@@ -64,6 +76,13 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor// ,
 	public ModelBiped getModel(String[] color, NBTTagCompound tags) {
 		return null;
 	}
+	
+	@Override
+	public NBTTagCompound buildTag(
+			List<slimeknights.tconstruct.library.materials.Material> materials) {
+		ToolNBT data = buildDefaultTag(materials);
+		return data.get();
+	}
 
 //	@Override
 //	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
diff --git a/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java b/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
deleted file mode 100644
index 4ad8e64..0000000
--- a/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
+++ /dev/null
@@ -1,187 +0,0 @@
-//package lance5057.tDefense.armor;
-//
-//import lance5057.tDefense.TinkersDefense;
-//import lance5057.tDefense.armor.blocks.GlowstoneCrumbs;
-//import lance5057.tDefense.armor.blocks.UnstableBlock;
-//import lance5057.tDefense.armor.blocks.UnstableItemBlock;
-//import lance5057.tDefense.armor.items.Sheath;
-//import lance5057.tDefense.armor.items.TinkersGauntlets;
-//import lance5057.tDefense.armor.items.cloth.TinkersHood;
-//import lance5057.tDefense.armor.items.cloth.TinkersRobe;
-//import lance5057.tDefense.armor.items.cloth.TinkersShawl;
-//import lance5057.tDefense.armor.items.cloth.TinkersShoes;
-//import lance5057.tDefense.armor.items.heavy.TinkersBreastplate;
-//import lance5057.tDefense.armor.items.heavy.TinkersGrieves;
-//import lance5057.tDefense.armor.items.heavy.TinkersHelm;
-//import lance5057.tDefense.armor.items.heavy.TinkersSabatons;
-//import lance5057.tDefense.armor.items.light.TinkersBoots;
-//import lance5057.tDefense.armor.items.light.TinkersChausses;
-//import lance5057.tDefense.armor.items.light.TinkersCoif;
-//import lance5057.tDefense.armor.items.light.TinkersHauberk;
-//import net.minecraft.block.Block;
-//import net.minecraft.creativetab.CreativeTabs;
-//import net.minecraft.item.Item;
-//import net.minecraft.item.ItemStack;
-//import net.minecraftforge.client.MinecraftForgeClient;
-//import tconstruct.client.FlexibleToolRenderer;
-//import tconstruct.library.TConstructRegistry;
-//import tconstruct.library.crafting.ToolBuilder;
-//import tconstruct.library.tools.ToolCore;
-//import tconstruct.tools.TinkerTools;
-//import cpw.mods.fml.common.event.FMLInitializationEvent;
-//import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-//import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-//import cpw.mods.fml.common.registry.GameRegistry;
-//
-//public class TDArmorAddon
-//{
-//	public static CreativeTabs	tabName;
-//
-//	public static ToolCore		armor_TinkerHood;
-//	public static ToolCore		armor_TinkerShawl;
-//	public static ToolCore		armor_TinkerRobe;
-//	public static ToolCore		armor_TinkerShoes;
-//
-//	public static ToolCore		armor_TinkerCoif;
-//	public static ToolCore		armor_TinkerHauberk;
-//	public static ToolCore		armor_TinkerChausses;
-//	public static ToolCore		armor_TinkerBoots;
-//
-//	public static ToolCore		armor_TinkerHelm;
-//	public static ToolCore		armor_TinkerBreastplate;
-//	public static ToolCore		armor_TinkerGrieves;
-//	public static ToolCore		armor_TinkerSabatons;
-//	public static ToolCore		armor_TinkerGauntlets;
-//
-//	public static ToolCore		accessory_sheath;
-//
-//	public static Block			block_Unstable;
-//	public static Block			block_GlowCrumbs;
-//
-//	public void preInit(FMLPreInitializationEvent e)
-//	{
-//		tabName = new CreativeTabs("TabArmor")
-//		{
-//
-//			@Override
-//			public Item getTabIconItem()
-//			{
-//				return ToolBuilder.instance.buildTool(new ItemStack(
-//						TinkerTools.largePlate, 1, 2), new ItemStack(
-//						TinkerTools.toughRod, 1, 2), new ItemStack(
-//						TinkersDefense.partArmorplate, 1, 2), new ItemStack(
-//						TinkersDefense.partChainmaille, 1, 2), "ArmorTab").getItem();
-//			}
-//
-//		};
-//
-//		armor_TinkerHelm = new TinkersHelm();
-//		armor_TinkerBreastplate = new TinkersBreastplate();
-//		armor_TinkerGrieves = new TinkersGrieves();
-//		armor_TinkerSabatons = new TinkersSabatons();
-//		armor_TinkerGauntlets = new TinkersGauntlets();
-//
-//		armor_TinkerRobe = new TinkersRobe();
-//		armor_TinkerShawl = new TinkersShawl();
-//		armor_TinkerHood = new TinkersHood();
-//		armor_TinkerShoes = new TinkersShoes();
-//
-//		armor_TinkerCoif = new TinkersCoif();
-//		armor_TinkerHauberk = new TinkersHauberk();
-//		armor_TinkerChausses = new TinkersChausses();
-//		armor_TinkerBoots = new TinkersBoots();
-//
-//		accessory_sheath = new Sheath();
-//
-//		block_Unstable = new UnstableBlock();
-//		block_GlowCrumbs = new GlowstoneCrumbs();
-//
-//		GameRegistry.registerItem(armor_TinkerHelm, "tinkerhelm");
-//		GameRegistry.registerItem(armor_TinkerBreastplate, "tinkerbreastplate");
-//		GameRegistry.registerItem(armor_TinkerGrieves, "tinkergrieves");
-//		GameRegistry.registerItem(armor_TinkerSabatons, "tinkersabatons");
-//		GameRegistry.registerItem(armor_TinkerGauntlets, "tinkergauntlets");
-//
-//		GameRegistry.registerItem(armor_TinkerCoif, "tinkercoif");
-//		GameRegistry.registerItem(armor_TinkerHauberk, "tinkerhauberk");
-//		GameRegistry.registerItem(armor_TinkerChausses, "tinkerchausses");
-//		GameRegistry.registerItem(armor_TinkerBoots, "tinkerboots");
-//
-//		GameRegistry.registerItem(armor_TinkerRobe, "tinkerrobe");
-//		GameRegistry.registerItem(armor_TinkerShawl, "tinkershawl");
-//		GameRegistry.registerItem(armor_TinkerHood, "tinkerhood");
-//		GameRegistry.registerItem(armor_TinkerShoes, "tinkershoes");
-//
-//		GameRegistry.registerItem(accessory_sheath, "Sheath");
-//
-//		GameRegistry.registerBlock(block_Unstable, UnstableItemBlock.class, "Unstable");
-//		GameRegistry.registerBlock(block_GlowCrumbs, "Block_GlowCrumbs");
-//
-//		TConstructRegistry.addItemToDirectory("tinkerhelm", armor_TinkerHelm);
-//		TConstructRegistry.addItemToDirectory("tinkerbreastplate", armor_TinkerBreastplate);
-//		TConstructRegistry.addItemToDirectory("tinkergrieves", armor_TinkerGrieves);
-//		TConstructRegistry.addItemToDirectory("tinkersabatons", armor_TinkerSabatons);
-//		TConstructRegistry.addItemToDirectory("tinkergauntlets", armor_TinkerGauntlets);
-//
-//		TConstructRegistry.addItemToDirectory("tinkercoif", armor_TinkerCoif);
-//		TConstructRegistry.addItemToDirectory("tinkerhauberk", armor_TinkerHauberk);
-//		TConstructRegistry.addItemToDirectory("tinkerchausses", armor_TinkerChausses);
-//		TConstructRegistry.addItemToDirectory("tinkerboots", armor_TinkerBoots);
-//
-//		TConstructRegistry.addItemToDirectory("tinkerrobe", armor_TinkerRobe);
-//		TConstructRegistry.addItemToDirectory("tinkershawl", armor_TinkerShawl);
-//		TConstructRegistry.addItemToDirectory("tinkerhood", armor_TinkerHood);
-//		TConstructRegistry.addItemToDirectory("tinkershoes", armor_TinkerShoes);
-//
-//		TConstructRegistry.addItemToDirectory("Sheath", accessory_sheath);
-//	}
-//
-//	public void init(FMLInitializationEvent e)
-//	{
-//
-//		TConstructRegistry.addToolRecipe(armor_TinkerHelm, TinkerTools.frypanHead, TinkerTools.toughRod, TinkersDefense.partArmorplate, TinkersDefense.partChainmaille);
-//		TConstructRegistry.addToolRecipe(armor_TinkerBreastplate, TinkerTools.largePlate, TinkerTools.toughRod, TinkersDefense.partArmorplate, TinkersDefense.partChainmaille);
-//		TConstructRegistry.addToolRecipe(armor_TinkerGrieves, TinkersDefense.partArmorplate, TinkerTools.toughRod, TinkersDefense.partChainmaille, TinkersDefense.partCloth);
-//		TConstructRegistry.addToolRecipe(armor_TinkerSabatons, TinkersDefense.partArmorplate, TinkerTools.toughRod, TinkersDefense.partArmorplate, TinkersDefense.partCloth);
-//		TConstructRegistry.addToolRecipe(armor_TinkerGauntlets, TinkersDefense.partArmorplate, TinkerTools.toughRod, TinkersDefense.partRivet);
-//
-//		TConstructRegistry.addToolRecipe(armor_TinkerRobe, TinkersDefense.partCloth, TinkersDefense.partClasp, TinkersDefense.partCloth);
-//		TConstructRegistry.addToolRecipe(armor_TinkerShawl, TinkersDefense.partCloth, TinkersDefense.partArmorplate, TinkersDefense.partCloth);
-//		TConstructRegistry.addToolRecipe(armor_TinkerHood, TinkersDefense.partCloth, TinkerTools.toolRod, TinkersDefense.partCloth);
-//		TConstructRegistry.addToolRecipe(armor_TinkerShoes, TinkersDefense.partCloth, TinkersDefense.partRivet, TinkersDefense.partCloth);
-//
-//		TConstructRegistry.addToolRecipe(armor_TinkerCoif, TinkersDefense.partChainmaille, TinkerTools.toughRod, TinkersDefense.partCloth);
-//		TConstructRegistry.addToolRecipe(armor_TinkerHauberk, TinkersDefense.partChainmaille, TinkerTools.largePlate, TinkersDefense.partCloth);
-//		TConstructRegistry.addToolRecipe(armor_TinkerChausses, TinkersDefense.partChainmaille, TinkersDefense.partArmorplate, TinkersDefense.partCloth);
-//		TConstructRegistry.addToolRecipe(armor_TinkerBoots, TinkersDefense.partChainmaille, TinkersDefense.partCloth, TinkersDefense.partRivet);
-//
-//		TConstructRegistry.addToolRecipe(accessory_sheath, TinkersDefense.partCloth, TinkersDefense.partCloth, TinkersDefense.partCloth);
-//
-//	}
-//
-//	public void postInit(FMLPostInitializationEvent e)
-//	{
-//
-//	}
-//
-//	public static void clientProxy(FlexibleToolRenderer renderer)
-//	{
-//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.accessory_sheath, renderer);
-//
-//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerHelm, renderer);
-//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerBreastplate, renderer);
-//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerGrieves, renderer);
-//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerSabatons, renderer);
-//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerGauntlets, renderer);
-//
-//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerRobe, renderer);
-//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerShawl, renderer);
-//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerHood, renderer);
-//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerShoes, renderer);
-//
-//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerCoif, renderer);
-//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerHauberk, renderer);
-//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerChausses, renderer);
-//		MinecraftForgeClient.registerItemRenderer(TDArmorAddon.armor_TinkerBoots, renderer);
-//	}
-//}
diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
index 1ebc963..61eb786 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
@@ -1,182 +1,57 @@
-//package lance5057.tDefense.armor.items.cloth;
-//
-//import lance5057.tDefense.TinkersDefense;
-//import lance5057.tDefense.armor.ArmorCore;
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import lance5057.tDefense.proxy.ClientProxy;
-//import net.minecraft.entity.Entity;
-//import net.minecraft.entity.EntityLivingBase;
-//import net.minecraft.entity.player.EntityPlayer;
-//import net.minecraft.item.Item;
-//import net.minecraft.item.ItemStack;
-//import net.minecraft.world.World;
-//import tconstruct.tools.TinkerTools;
-//import thaumcraft.api.IGoggles;
-//import thaumcraft.api.IVisDiscountGear;
-//import thaumcraft.api.aspects.Aspect;
-//import thaumcraft.api.nodes.IRevealer;
-//import vazkii.botania.api.mana.IManaDiscountArmor;
-//import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
-//import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge;
-//import cpw.mods.fml.common.Optional;
-//
-//@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)})
-//public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles, IVisDiscountGear, IManaDiscountArmor
-//{
-//	public TinkersHood()
-//	{
-//		super(0, 0);
-//		setUnlocalizedName("tinkershood");
-//	}
-//
-//	@Override
-//	public Item getHeadItem()
-//	{
-//		return TinkersDefense.partCloth;
-//	}
-//
-//	@Override
-//	public Item getHandleItem()
-//	{
-//		return TinkerTools.toolRod;
-//	}
-//
-//	@Override
-//	public Item getAccessoryItem()
-//	{
-//		return TinkersDefense.partCloth;
-//	}
-//
-//	@Override
-//	public int durabilityTypeAccessory()
-//	{
-//		return 1;
-//	}
-//
-//	@Override
-//	public float getRepairCost()
-//	{
-//		return 1.0f;
-//	}
-//
-//	@Override
-//	public float getDurabilityModifier()
-//	{
-//		return 1f;
-//	}
-//
-//	@Override
-//	public float getDamageModifier()
-//	{
-//		return 1f;
-//	}
-//
-//	@Override
-//	public int getPartAmount()
-//	{
-//		return 3;
-//	}
-//
-//	@Override
-//	public String getIconSuffix(int partType)
-//	{
-//		switch(partType)
-//		{
-//			case 0:
-//				return "_hood_cloth";
-//			case 1:
-//				return "_hood_cloth_broken";
-//			case 2:
-//				return "_hood_metal";
-//			case 3:
-//				return "_hood_trim";
-//			default:
-//				return "";
-//		}
-//	}
-//
-//	@Override
-//	public String getEffectSuffix()
-//	{
-//		return "_hood_effect";
-//	}
-//
-//	@Override
-//	public String getDefaultFolder()
-//	{
-//		return "armor/hood";
-//	}
-//
-//	//	@Override
-//	//	public void onUpdate(ItemStack stack, World world, Entity entity, int par4,
-//	//			boolean par5) {
-//	//		super.onUpdate(stack, world, entity, par4, par5);
-//	//
-//	//	}
-//
-//	@Override
-//	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
-//	{
-//		return "tinkersdefense:textures/armor/TinkersHood.png";
-//	}
-//
-//	@Override
-//	public String[] getTraits()
-//	{
-//		return new String[] {"armor", "head", "hood", "cloth"};
-//	}
-//
-//	@Override
-//	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
-//	{
-//		return 0;
-//	}
-//
-//	@Override
-//	@Optional.Method(modid = "Thaumcraft")
-//	public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect)
-//	{
-//		return stack.getTagCompound().getCompoundTag("InfiTool").getInteger("VisEmbroidery");
-//	}
-//
-//	@Override
-//	public ArmorRenderer getRenderer()
-//	{
-//		return ClientProxy.hood;
-//	}
-//
-//	@Override
-//	public float getDiscount(ItemStack stack, int arg1, EntityPlayer arg2)
-//	{
-//		final float i = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("ManaEmbroidery") / 100f;
-//		return i;
-//	}
-//
-//	@Optional.Method(modid = "Thaumcraft")
-//	@Override
-//	public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
-//	{
-//		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
-//	}
-//
-//	@Optional.Method(modid = "Thaumcraft")
-//	@Override
-//	public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
-//	{
-//		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
-//	}
-//
-//	@Optional.Method(modid = "AWWayofTime")
-//	@Override
-//	public boolean canSeeLPBar(ItemStack stack)
-//	{
-//		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
-//	}
-//
-//	@Optional.Method(modid = "AWWayofTime")
-//	@Override
-//	public boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player)
-//	{
-//		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
-//	}
-//}
+package lance5057.tDefense.armor.items.cloth;
+
+import java.util.List;
+
+import lance5057.tDefense.armor.ArmorBase;
+import lance5057.tDefense.armor.ArmorCore;
+import lance5057.tDefense.armor.materials.MaterialArmor;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.inventory.EntityEquipmentSlot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.World;
+import slimeknights.tconstruct.library.materials.Material;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.tools.TinkerTools;
+
+public class TinkersHood extends ArmorCore
+{
+	int	induceDamage	= 0;
+	
+
+	public TinkersHood()
+	{
+	    super(EntityEquipmentSlot.HEAD,
+	    		ClothMat,
+	    		ClothMat,
+	    		RivetMat);
+		setUnlocalizedName("tinkerhood");
+	}
+
+	@Override
+	public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5)
+	{
+		super.onUpdate(stack, world, entity, par4, par5);
+
+	}
+
+	@Override
+	public float damagePotential() { 
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public double attackSpeed() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
+		// TODO Auto-generated method stub
+		
+	}
+}
diff --git a/src/main/java/lance5057/tDefense/armor/materials/MaterialArmor.java b/src/main/java/lance5057/tDefense/armor/materials/MaterialArmor.java
new file mode 100644
index 0000000..ab27838
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/armor/materials/MaterialArmor.java
@@ -0,0 +1,79 @@
+package lance5057.tDefense.armor.materials;
+
+import java.util.List;
+
+import net.minecraft.util.text.TextFormatting;
+
+import com.google.common.collect.Lists;
+
+import slimeknights.tconstruct.library.TinkerRegistry;
+import slimeknights.tconstruct.library.Util;
+import slimeknights.tconstruct.library.client.CustomFontColor;
+import slimeknights.tconstruct.library.materials.AbstractMaterialStats;
+import slimeknights.tconstruct.library.materials.Material;
+import slimeknights.tconstruct.library.utils.HarvestLevels;
+
+public class MaterialArmor extends AbstractMaterialStats {
+
+	public final static String TYPE = "armor";
+
+	public final static String LOC_Durability = "stat.armor.durability.name";
+	public final static String LOC_DMGReduction = "stat.armor.dmgreduction.name"; //in half shirts
+
+	public final static String LOC_DurabilityDesc = "stat.armor.durability.desc";
+	public final static String LOC_DMGReductionDesc = "stat.armor.dmgreduction.desc";
+
+	public final static String COLOR_Durability = CustomFontColor.valueToColorCode(1f);
+	public final static String COLOR_DMGReduction = CustomFontColor.encodeColor(215, 100, 100);
+
+	public final int durability; // usually between 1 and 1000
+	public final float DMGReduction;
+	// Full 	Full 	Helmet 	Chest 	Legs 	Boots
+	// Leather 	7 		1 		3 		2 		1
+	// Golden 	11	 	2 		5 		3 		1
+	// Chain 	12 		2 		5 		4 		1
+	// Iron 	15 		2 		6 		5 		2
+	// Diamond 	20 		3 		8 		6 		3
+	//in half shirts
+
+	public MaterialArmor(int durability, float DMGReduction/*in half shirts*/) {
+		super(TYPE);
+		this.durability = durability;
+		this.DMGReduction = DMGReduction;
+
+	}
+
+	@Override
+	public List<String> getLocalizedInfo() {
+		List<String> info = Lists.newArrayList();
+
+		info.add(formatDurability(durability));
+		info.add(formatPercentBlocked(DMGReduction));
+
+		return info;
+	}
+
+	public static String formatDurability(int durability) {
+		return formatNumber(LOC_Durability, COLOR_Durability, durability);
+	}
+
+	public static String formatDurability(int durability, int ref) {
+		return String.format("%s: %s%s%s/%s%s", Util.translate(LOC_Durability),
+				CustomFontColor.valueToColorCode((float) durability / (float) ref), Util.df.format(durability),
+				TextFormatting.GRAY.toString(), COLOR_Durability, Util.df.format(ref)) + TextFormatting.RESET;
+	}
+
+	public static String formatPercentBlocked(float percent) {
+		return formatNumber(LOC_DMGReduction, COLOR_DMGReduction, percent*100) + "%";
+	}
+
+	@Override
+	public List<String> getLocalizedDesc() {
+		List<String> info = Lists.newArrayList();
+
+		info.add(Util.translate(LOC_DurabilityDesc));
+		info.add(Util.translate(LOC_DMGReductionDesc));
+
+		return info;
+	}
+}
diff --git a/src/main/java/lance5057/tDefense/armor/materials/MaterialCloth.java b/src/main/java/lance5057/tDefense/armor/materials/MaterialCloth.java
new file mode 100644
index 0000000..7918b0d
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/armor/materials/MaterialCloth.java
@@ -0,0 +1,77 @@
+package lance5057.tDefense.armor.materials;
+
+import java.util.List;
+
+import net.minecraft.util.text.TextFormatting;
+
+import com.google.common.collect.Lists;
+
+import slimeknights.tconstruct.library.TinkerRegistry;
+import slimeknights.tconstruct.library.Util;
+import slimeknights.tconstruct.library.client.CustomFontColor;
+import slimeknights.tconstruct.library.materials.AbstractMaterialStats;
+import slimeknights.tconstruct.library.materials.Material;
+import slimeknights.tconstruct.library.utils.HarvestLevels;
+
+public class MaterialCloth extends AbstractMaterialStats  {
+
+	public final static String TYPE = "cloth";
+
+	  public final static String LOC_Durability   = "stat.cloth.durability.name";
+	  //public final static String LOC_DMGReduction  = "stat.cloth.percentblocked.name";
+
+	  public final static String LOC_DurabilityDesc    = "stat.cloth.durability.desc";
+	  //public final static String LOC_DMGReductionDesc   = "stat.cloth.percentblocked.desc";
+
+	  public final static String COLOR_Durability = CustomFontColor.valueToColorCode(1f);
+	  //public final static String COLOR_DMGReduction    = CustomFontColor.encodeColor(215, 100, 100);
+	  
+	  public final int durability; // usually between 1 and 1000
+	 // public final int DMGReduction; // vanilla is 33%
+
+	  public MaterialCloth(int durability) {
+	    super(TYPE);
+	    this.durability = durability;
+	    //this.DMGReduction = percentBlocked;
+	    
+	  }
+
+	  @Override
+	  public List<String> getLocalizedInfo() {
+	    List<String> info = Lists.newArrayList();
+
+	    info.add(formatDurability(durability));
+	    //info.add(formatPercentBlocked(DMGReduction));
+
+	    return info;
+	  }
+
+	  public static String formatDurability(int durability) {
+	    return formatNumber(LOC_Durability, COLOR_Durability, durability);
+	  }
+
+	  public static String formatDurability(int durability, int ref) {
+	    return String.format("%s: %s%s%s/%s%s",
+	                         Util.translate(LOC_Durability),
+	                         CustomFontColor.valueToColorCode((float) durability / (float) ref),
+	                         Util.df.format(durability),
+	                         TextFormatting.GRAY.toString(),
+	                         COLOR_Durability,
+	                         Util.df.format(ref))
+	           + TextFormatting.RESET;
+	  }
+
+//	  public static String formatPercentBlocked(int percent) {
+//	    return formatNumber(LOC_DMGReduction, COLOR_DMGReduction, percent) + "%";
+//	  }
+//	  
+	  @Override
+	  public List<String> getLocalizedDesc() {
+	    List<String> info = Lists.newArrayList();
+
+	    info.add(Util.translate(LOC_DurabilityDesc));
+	    //info.add(Util.translate(LOC_DMGReductionDesc));
+
+	    return info;
+	  }
+}
diff --git a/src/main/java/lance5057/tDefense/armor/proxy/ArmorClientProxy.java b/src/main/java/lance5057/tDefense/armor/proxy/ArmorClientProxy.java
new file mode 100644
index 0000000..cf92bd6
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/armor/proxy/ArmorClientProxy.java
@@ -0,0 +1,46 @@
+package lance5057.tDefense.armor.proxy;
+
+import lance5057.tDefense.armor.ArmorBase;
+import slimeknights.tconstruct.common.ModelRegisterUtil;
+import slimeknights.tconstruct.library.TinkerRegistryClient;
+import slimeknights.tconstruct.library.client.ToolBuildGuiInfo;
+
+public class ArmorClientProxy {
+	
+	ToolBuildGuiInfo hoodGUI;
+	
+	public void preInit()
+	{
+		registerToolRenderers();
+	}
+	public void init()
+	{
+		createToolGuis();
+		setupToolGuis();
+		registerToolGuis();
+	}
+	public void postInit(){}
+	
+	public void createToolGuis()
+	{
+		hoodGUI = new ToolBuildGuiInfo(ArmorBase.armor_TinkerHood);
+	}
+	
+	public void registerToolRenderers()
+	{
+		ModelRegisterUtil.registerToolModel(ArmorBase.armor_TinkerHood);
+		
+	}
+	public void setupToolGuis()
+	{
+		hoodGUI.positions.clear();
+		hoodGUI.addSlotPosition(34, 15+8);
+		hoodGUI.addSlotPosition(34, 33+8);
+		hoodGUI.addSlotPosition(34, 51+8);
+	}
+	
+	public void registerToolGuis()
+	{
+		TinkerRegistryClient.addToolBuilding(hoodGUI);
+	}
+}
diff --git a/src/main/java/lance5057/tDefense/armor/items/TinkersGauntlets.java b/src/main/java/lance5057/tDefense/baubles/tools/TinkersGauntlets.java
index b5d9f6e..688aaa7 100644
--- a/src/main/java/lance5057/tDefense/armor/items/TinkersGauntlets.java
+++ b/src/main/java/lance5057/tDefense/baubles/tools/TinkersGauntlets.java
@@ -1,3 +1,4 @@
+package lance5057.tDefense.baubles.tools;
 //package lance5057.tDefense.armor.items;
 //
 //import lance5057.tDefense.TinkersDefense;
diff --git a/src/main/java/lance5057/tDefense/core/tools/RoundShield.java b/src/main/java/lance5057/tDefense/core/tools/RoundShield.java
index b4e64f6..bf0c2e6 100644
--- a/src/main/java/lance5057/tDefense/core/tools/RoundShield.java
+++ b/src/main/java/lance5057/tDefense/core/tools/RoundShield.java
@@ -17,7 +17,7 @@ public class RoundShield extends Shield
 	    super(PartMaterialType.handle(TinkerTools.toolRod),
 	    		ShieldMat,
 	            PartMaterialType.head(TinkerTools.panHead));
-		setUnlocalizedName("shield");
+		setUnlocalizedName("roundshield");
 	}
 
 	@Override
diff --git a/src/main/java/lance5057/tDefense/core/tools/TDTools.java b/src/main/java/lance5057/tDefense/core/tools/TDTools.java
index bd3c879..ead016c 100644
--- a/src/main/java/lance5057/tDefense/core/tools/TDTools.java
+++ b/src/main/java/lance5057/tDefense/core/tools/TDTools.java
@@ -61,9 +61,9 @@ public class TDTools
 	  regTool(heatershield, "heatershield");
 	  regTool(zweihander, "zweihander");
 	  
-	  TinkerRegistry.registerToolStationCrafting(roundshield);
-	  TinkerRegistry.registerToolForgeCrafting(heatershield);
-	  TinkerRegistry.registerToolForgeCrafting(zweihander);
+//	  TinkerRegistry.registerToolStationCrafting(roundshield);
+//	  TinkerRegistry.registerToolForgeCrafting(heatershield);
+//	  TinkerRegistry.registerToolForgeCrafting(zweihander);
   }
   
   private void regTool(ToolCore tool, String name)
diff --git a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
index 800ba02..7f6aef4 100644
--- a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
@@ -2,6 +2,7 @@ package lance5057.tDefense.proxy;
 
 import lance5057.tDefense.Reference;
 import lance5057.tDefense.TD_Commands;
+import lance5057.tDefense.armor.proxy.ArmorClientProxy;
 import lance5057.tDefense.baubles.BaublesClientProxy;
 import lance5057.tDefense.core.CoreClientProxy;
 import lance5057.tDefense.core.CoreItems;
@@ -41,7 +42,7 @@ public class ClientProxy extends CommonProxy
 //	public static ModelTinkersChausses		chausses;
 //	public static ModelTinkersBoots			boots;
 	
-	public static BaublesClientProxy baubles = new BaublesClientProxy();;
+	public static BaublesClientProxy baubles = new BaublesClientProxy();
 	
 	ToolBuildGuiInfo roundshieldGUI;
 	ToolBuildGuiInfo heatershieldGUI;
@@ -50,6 +51,7 @@ public class ClientProxy extends CommonProxy
 	
 	public static CoreClientProxy coreProxy = new CoreClientProxy();
 	public static HolidayClientProxy holiProxy = new HolidayClientProxy();
+	public static ArmorClientProxy armorProxy = new ArmorClientProxy();
 	
 	@Override
 	public void preInit()
@@ -58,6 +60,7 @@ public class ClientProxy extends CommonProxy
 		registerToolRenderers();
 		
 		coreProxy.preInit();
+		armorProxy.preInit();
 		baubles.preInit();
 	}
 	
@@ -77,6 +80,7 @@ public class ClientProxy extends CommonProxy
 		registerItemRenderer(CoreItems.item_queensgoldIngot, 0, CoreItems.item_queensgoldIngot.getUnlocalizedName());
 		
 		coreProxy.init();
+		armorProxy.init();
 		holiProxy.Init();
 		baubles.init();
 	}