Fixed Shields, Did Armor things

61 files changed, 461 insertions, 917 deletions

diff --git a/src/main/java/lance5057/tDefense/Reference.java b/src/main/java/lance5057/tDefense/Reference.java
index eea5c79..0600126 100644
--- a/src/main/java/lance5057/tDefense/Reference.java
+++ b/src/main/java/lance5057/tDefense/Reference.java
@@ -4,7 +4,7 @@ public class Reference
 {
 
 	public static final String	MOD_ID		= "tinkersdefense";
-	public static final String	VERSION		= "1.4.2.4a";
+	public static final String	VERSION		= "1.4.2.6a";
 	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 78b09c5..0a95930 100644
--- a/src/main/java/lance5057/tDefense/TinkersDefense.java
+++ b/src/main/java/lance5057/tDefense/TinkersDefense.java
@@ -98,6 +98,7 @@ public class TinkersDefense {
 		mats.postInit(e);
 		parts.postInit(e);
 		tools.postInit(e);
+		proxy.postInit();
 	}
 	
 	
diff --git a/src/main/java/lance5057/tDefense/armor/materials/MaterialArmor.java b/src/main/java/lance5057/tDefense/armor/materials/MaterialArmor.java
deleted file mode 100644
index ab27838..0000000
--- a/src/main/java/lance5057/tDefense/armor/materials/MaterialArmor.java
+++ /dev/null
@@ -1,79 +0,0 @@
-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
deleted file mode 100644
index 7918b0d..0000000
--- a/src/main/java/lance5057/tDefense/armor/materials/MaterialCloth.java
+++ /dev/null
@@ -1,77 +0,0 @@
-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/core/materials/ClothMaterialStats.java b/src/main/java/lance5057/tDefense/core/materials/ClothMaterialStats.java
new file mode 100644
index 0000000..f3f953d
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/materials/ClothMaterialStats.java
@@ -0,0 +1,77 @@
+package lance5057.tDefense.core.materials;
+
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+import net.minecraft.util.text.TextFormatting;
+import slimeknights.tconstruct.library.Util;
+import slimeknights.tconstruct.library.client.CustomFontColor;
+import slimeknights.tconstruct.library.materials.AbstractMaterialStats;
+
+public class ClothMaterialStats extends AbstractMaterialStats
+{
+	public final static String TYPE = "chest";
+
+	public final static String	LOC_Durability		= "stat.cloth.durability.name";
+	public final static String	LOC_MagicPotency	= "stat.cloth.potency.name";
+
+	public final static String	LOC_DurabilityDesc		= "stat.cloth.durability.desc";
+	public final static String	LOC_MagicPotencyDesc		= "stat.cloth.potency.desc";
+
+	public final static String	COLOR_Durability		= CustomFontColor.valueToColorCode(1f);
+	public final static String	COLOR_MagicPotency		= CustomFontColor.encodeColor(215, 100, 100);
+
+	public final int	durability;	// usually between 1 and 1000
+	public final float	potency;		// 1 - 100
+
+	public ClothMaterialStats(int durability, float potency)
+	{
+		super(TYPE);
+		this.durability = durability;
+		this.potency = potency;
+	}
+
+	@Override
+	public List<String> getLocalizedInfo()
+	{
+		List<String> info = Lists.newArrayList();
+
+		info.add(formatDurability(durability));
+		info.add(formatMagicPotency(potency));
+
+		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 formatMagicPotency(float potency2)
+	{
+		return formatNumber(LOC_MagicPotency, COLOR_MagicPotency, potency2);
+	}
+
+	@Override
+	public List<String> getLocalizedDesc()
+	{
+		List<String> info = Lists.newArrayList();
+
+		info.add(Util.translate(LOC_DurabilityDesc));
+		info.add(Util.translate(LOC_MagicPotencyDesc));
+
+		return info;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java b/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java
index 9126163..5cc5987 100644
--- a/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java
+++ b/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java
@@ -14,7 +14,6 @@ import gnu.trove.map.hash.THashMap;
 import gnu.trove.set.hash.THashSet;
 import lance5057.tDefense.Reference;
 import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.materials.MaterialCloth;
 import lance5057.tDefense.core.items.TDOreDictItem;
 import lance5057.tDefense.util.TDMatHelper;
 import net.minecraft.block.Block;
@@ -61,12 +60,12 @@ public class TDMaterials
 
 	// public static final List<Material> materials = Lists.newArrayList();
 
-	String SHIELD = ShieldMaterialStats.TYPE;
-	String HELM = HelmMaterialStats.TYPE;
-	String CHEST = ChestMaterialStats.TYPE;
-	String LEGS = LegsMaterialStats.TYPE;
-	String BOOTS = BootsMaterialStats.TYPE;
-	String BAUBLE = BaubleMaterialStats.TYPE;
+	String	SHIELD	= ShieldMaterialStats.TYPE;
+	String	HELM	= HelmMaterialStats.TYPE;
+	String	CHEST	= ChestMaterialStats.TYPE;
+	String	LEGS	= LegsMaterialStats.TYPE;
+	String	BOOTS	= BootsMaterialStats.TYPE;
+	String	BAUBLE	= BaubleMaterialStats.TYPE;
 
 	public static final Map<String, Material>				materials				= new THashMap<>();
 	public static final Map<String, MaterialIntegration>	materialIntegrations	= new THashMap<>();
@@ -349,20 +348,38 @@ public class TDMaterials
 		gem = new TDOreDictItem("gem", getMatNames(gemMaster), getMatColors(gemMaster));
 		ingot = new TDOreDictItem("ingot", getMatNames(ingotMaster), getMatColors(ingotMaster));
 
+		registerClothMaterials();
+
 		Material.UNKNOWN.addStats(new ShieldMaterialStats(35, 33));
 		Material.UNKNOWN.addStats(new HelmMaterialStats(35, 1, 0));
 		Material.UNKNOWN.addStats(new ChestMaterialStats(35, 1, 0));
 		Material.UNKNOWN.addStats(new LegsMaterialStats(35, 1, 0));
 		Material.UNKNOWN.addStats(new BootsMaterialStats(35, 1, 0));
+		Material.UNKNOWN.addStats(new ClothMaterialStats(35, 0));
 		Material.UNKNOWN.addStats(new BaubleMaterialStats(35));
 
-		// TinkerRegistry.addMaterialStats(Material.UNKNOWN,
-		// new ShieldMaterialStats(35, 33));
+		TinkerRegistry.addMaterialStats(this.white, new ClothMaterialStats(100, 10));
+		TinkerRegistry.addMaterialStats(this.black, new ClothMaterialStats(100, 10));
+		TinkerRegistry.addMaterialStats(this.blue, new ClothMaterialStats(100, 10));
+		TinkerRegistry.addMaterialStats(this.brown, new ClothMaterialStats(100, 10));
+		TinkerRegistry.addMaterialStats(this.cyan, new ClothMaterialStats(100, 10));
+		TinkerRegistry.addMaterialStats(this.gray, new ClothMaterialStats(100, 10));
+		TinkerRegistry.addMaterialStats(this.green, new ClothMaterialStats(100, 10));
+		TinkerRegistry.addMaterialStats(this.lightblue, new ClothMaterialStats(100, 10));
+		TinkerRegistry.addMaterialStats(this.lightgray, new ClothMaterialStats(100, 10));
+		TinkerRegistry.addMaterialStats(this.lime, new ClothMaterialStats(100, 10));
+		TinkerRegistry.addMaterialStats(this.magenta, new ClothMaterialStats(100, 10));
+		TinkerRegistry.addMaterialStats(this.orange, new ClothMaterialStats(100, 10));
+		TinkerRegistry.addMaterialStats(this.pink, new ClothMaterialStats(100, 10));
+		TinkerRegistry.addMaterialStats(this.purple, new ClothMaterialStats(100, 10));
+		TinkerRegistry.addMaterialStats(this.red, new ClothMaterialStats(100, 10));
+		TinkerRegistry.addMaterialStats(this.yellow, new ClothMaterialStats(100, 10));
 
-		// TinkerRegistry.addMaterialStats(Material.UNKNOWN,
-		// new ShieldMaterialStats(35, 33));
 		TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new ShieldMaterialStats(35, 33));
 		TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new HelmMaterialStats(35, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new ChestMaterialStats(35, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new LegsMaterialStats(35, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new BootsMaterialStats(35, 0, 0));
 		// TinkerMaterials.wood.addTrait(axelover, SHIELD);
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.stone, new ShieldMaterialStats(120, 33));
@@ -429,7 +446,7 @@ public class TDMaterials
 		for (TDMatHelper m : materials_master)
 		{
 			Material test = TinkerRegistry.getMaterial(m.name);
-			if (m.createMat &&  test.getIdentifier() == "unknown" && !TinkersDefense.config.materials.isBlacklisted(m.name))
+			if (m.createMat && test.getIdentifier() == "unknown" && !TinkersDefense.config.materials.isBlacklisted(m.name))
 				createMaterial(m);
 		}
 
@@ -447,7 +464,6 @@ public class TDMaterials
 			}
 		}
 
-		registerClothMaterials();
 	}
 
 	void createMaterial(TDMatHelper tdmat)
@@ -644,7 +660,7 @@ public class TDMaterials
 	@Subscribe
 	public void postInit(FMLPostInitializationEvent event)
 	{
-		
+
 	}
 
 	@SideOnly(Side.CLIENT)
@@ -722,74 +738,108 @@ public class TDMaterials
 		orange = new Material("orangeCloth", 0xDB7D3E);
 		white = new Material("whiteCloth", 0xDDDDDD);
 
-		Material.UNKNOWN.addStats(new MaterialCloth(100));
-		black.addItem(new ItemStack(Blocks.WOOL, 15), 1, Material.VALUE_Ingot);
-		red.addItem(new ItemStack(Blocks.WOOL, 14), 1, Material.VALUE_Ingot);
-		green.addItem(new ItemStack(Blocks.WOOL, 13), 1, Material.VALUE_Ingot);
-		brown.addItem(new ItemStack(Blocks.WOOL, 12), 1, Material.VALUE_Ingot);
-		blue.addItem(new ItemStack(Blocks.WOOL, 11), 1, Material.VALUE_Ingot);
-		purple.addItem(new ItemStack(Blocks.WOOL, 10), 1, Material.VALUE_Ingot);
-		cyan.addItem(new ItemStack(Blocks.WOOL, 9), 1, Material.VALUE_Ingot);
-		lightgray.addItem(new ItemStack(Blocks.WOOL, 8), 1, Material.VALUE_Ingot);
-		gray.addItem(new ItemStack(Blocks.WOOL, 7), 1, Material.VALUE_Ingot);
-		pink.addItem(new ItemStack(Blocks.WOOL, 6), 1, Material.VALUE_Ingot);
-		lime.addItem(new ItemStack(Blocks.WOOL, 5), 1, Material.VALUE_Ingot);
-		yellow.addItem(new ItemStack(Blocks.WOOL, 4), 1, Material.VALUE_Ingot);
-		lightblue.addItem(new ItemStack(Blocks.WOOL, 3), 1, Material.VALUE_Ingot);
-		magenta.addItem(new ItemStack(Blocks.WOOL, 2), 1, Material.VALUE_Ingot);
-		orange.addItem(new ItemStack(Blocks.WOOL, 1), 1, Material.VALUE_Ingot);
-		white.addItem(new ItemStack(Blocks.WOOL, 0), 1, Material.VALUE_Ingot);
-
-		black.setRepresentativeItem(new ItemStack(Blocks.WOOL, 15));
-		red.setRepresentativeItem(new ItemStack(Blocks.WOOL, 14));
-		green.setRepresentativeItem(new ItemStack(Blocks.WOOL, 13));
-		brown.setRepresentativeItem(new ItemStack(Blocks.WOOL, 12));
-		blue.setRepresentativeItem(new ItemStack(Blocks.WOOL, 11));
-		purple.setRepresentativeItem(new ItemStack(Blocks.WOOL, 10));
-		cyan.setRepresentativeItem(new ItemStack(Blocks.WOOL, 9));
-		lightgray.setRepresentativeItem(new ItemStack(Blocks.WOOL, 8));
-		gray.setRepresentativeItem(new ItemStack(Blocks.WOOL, 7));
-		pink.setRepresentativeItem(new ItemStack(Blocks.WOOL, 6));
-		lime.setRepresentativeItem(new ItemStack(Blocks.WOOL, 5));
-		yellow.setRepresentativeItem(new ItemStack(Blocks.WOOL, 4));
-		lightblue.setRepresentativeItem(new ItemStack(Blocks.WOOL, 3));
-		magenta.setRepresentativeItem(new ItemStack(Blocks.WOOL, 2));
-		orange.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1));
-		white.setRepresentativeItem(new ItemStack(Blocks.WOOL, 0));
-
-		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));
+		//Material.UNKNOWN.addStats(new MaterialCloth(100));
+		black.addItem(new ItemStack(Blocks.WOOL, 1, 15), 1, Material.VALUE_Ingot);
+		red.addItem(new ItemStack(Blocks.WOOL, 1, 14), 1, Material.VALUE_Ingot);
+		green.addItem(new ItemStack(Blocks.WOOL, 1, 13), 1, Material.VALUE_Ingot);
+		brown.addItem(new ItemStack(Blocks.WOOL, 1, 12), 1, Material.VALUE_Ingot);
+		blue.addItem(new ItemStack(Blocks.WOOL, 1, 11), 1, Material.VALUE_Ingot);
+		purple.addItem(new ItemStack(Blocks.WOOL, 1, 10), 1, Material.VALUE_Ingot);
+		cyan.addItem(new ItemStack(Blocks.WOOL, 1, 9), 1, Material.VALUE_Ingot);
+		lightgray.addItem(new ItemStack(Blocks.WOOL, 1, 8), 1, Material.VALUE_Ingot);
+		gray.addItem(new ItemStack(Blocks.WOOL, 1, 7), 1, Material.VALUE_Ingot);
+		pink.addItem(new ItemStack(Blocks.WOOL, 1, 6), 1, Material.VALUE_Ingot);
+		lime.addItem(new ItemStack(Blocks.WOOL, 1, 5), 1, Material.VALUE_Ingot);
+		yellow.addItem(new ItemStack(Blocks.WOOL, 1, 4), 1, Material.VALUE_Ingot);
+		lightblue.addItem(new ItemStack(Blocks.WOOL, 1, 3), 1, Material.VALUE_Ingot);
+		magenta.addItem(new ItemStack(Blocks.WOOL, 1, 2), 1, Material.VALUE_Ingot);
+		orange.addItem(new ItemStack(Blocks.WOOL, 1, 1), 1, Material.VALUE_Ingot);
+		white.addItem(new ItemStack(Blocks.WOOL, 1, 0), 1, Material.VALUE_Ingot);
+
+		black.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 15));
+		red.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 14));
+		green.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 13));
+		brown.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 12));
+		blue.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 11));
+		purple.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 10));
+		cyan.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 9));
+		lightgray.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 8));
+		gray.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 7));
+		pink.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 6));
+		lime.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 5));
+		yellow.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 4));
+		lightblue.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 3));
+		magenta.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 2));
+		orange.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 1));
+		white.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 0));
+
+//		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);
+		
+		materials.put("white", white);
+		materials.put("orange", orange);
+		materials.put("magenta", magenta);
+		materials.put("lightblue", lightblue);
+		materials.put("yellow", yellow);
+		materials.put("lime", lime);
+		materials.put("pink", pink);
+		materials.put("gray", gray);
+		materials.put("lightgray", lightgray);
+		materials.put("cyan", cyan);
+		materials.put("purple", purple);
+		materials.put("blue", blue);
+		materials.put("brown", brown);
+		materials.put("green", green);
+		materials.put("red", red);
+		materials.put("black", black);
+		
+		TinkerRegistry.integrate(new MaterialIntegration(white).toolforge()).preInit();
+		TinkerRegistry.integrate(new MaterialIntegration(orange).toolforge()).preInit();
+		TinkerRegistry.integrate(new MaterialIntegration(magenta).toolforge()).preInit();
+		TinkerRegistry.integrate(new MaterialIntegration(lightblue).toolforge()).preInit();
+		TinkerRegistry.integrate(new MaterialIntegration(yellow).toolforge()).preInit();
+		TinkerRegistry.integrate(new MaterialIntegration(lime).toolforge()).preInit();
+		TinkerRegistry.integrate(new MaterialIntegration(pink).toolforge()).preInit();
+		TinkerRegistry.integrate(new MaterialIntegration(gray).toolforge()).preInit();
+		TinkerRegistry.integrate(new MaterialIntegration(lightgray).toolforge()).preInit();
+		TinkerRegistry.integrate(new MaterialIntegration(cyan).toolforge()).preInit();
+		TinkerRegistry.integrate(new MaterialIntegration(purple).toolforge()).preInit();
+		TinkerRegistry.integrate(new MaterialIntegration(blue).toolforge()).preInit();
+		TinkerRegistry.integrate(new MaterialIntegration(brown).toolforge()).preInit();
+		TinkerRegistry.integrate(new MaterialIntegration(green).toolforge()).preInit();
+		TinkerRegistry.integrate(new MaterialIntegration(red).toolforge()).preInit();
+		TinkerRegistry.integrate(new MaterialIntegration(black).toolforge()).preInit();
+		
+//		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));
 	}
 
 	// PlusTIC to the rescue
diff --git a/src/main/java/lance5057/tDefense/core/parts/TDParts.java b/src/main/java/lance5057/tDefense/core/parts/TDParts.java
index 9aa05dc..07eca75 100644
--- a/src/main/java/lance5057/tDefense/core/parts/TDParts.java
+++ b/src/main/java/lance5057/tDefense/core/parts/TDParts.java
@@ -4,28 +4,20 @@ import java.util.ArrayList;
 
 import lance5057.tDefense.Reference;
 import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.materials.MaterialArmor;
-import lance5057.tDefense.armor.materials.MaterialCloth;
-import lance5057.tDefense.core.materials.ShieldMaterialStats;
 import lance5057.tDefense.util.ModuleBase;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.event.RegistryEvent;
-import net.minecraftforge.event.RegistryEvent.Register;
 import net.minecraftforge.fml.common.Mod;
 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.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.registries.IForgeRegistry;
 import slimeknights.tconstruct.library.TinkerRegistry;
 import slimeknights.tconstruct.library.materials.Material;
-import slimeknights.tconstruct.library.materials.MaterialTypes;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
 import slimeknights.tconstruct.library.tools.Pattern;
 import slimeknights.tconstruct.library.tools.ToolPart;
-import slimeknights.tconstruct.tools.TinkerMaterials;
 import slimeknights.tconstruct.tools.TinkerTools;
 
 @Mod.EventBusSubscriber(modid = Reference.MOD_ID)
@@ -89,13 +81,13 @@ public class TDParts extends ModuleBase {
 		wire = regToolPart(Material.VALUE_Ingot * 1, "wire", event);
 		filigree = regToolPart(Material.VALUE_Ingot * 1, "filigree", event);
 		
-		ShieldMat = new PartMaterialType(TDParts.armorPlate, ShieldMaterialStats.TYPE);
+		//ShieldMat = new PartMaterialType(TDParts.armorPlate, ShieldMaterialStats.TYPE);
 
-		ArmorplateMat = new PartMaterialType(armorPlate, MaterialArmor.TYPE);
-		ChainmailMat = new PartMaterialType(chainmail, MaterialArmor.TYPE);
-		RivetMat = new PartMaterialType(rivets, MaterialTypes.EXTRA);
-		ClaspMat = new PartMaterialType(clasp, MaterialTypes.EXTRA);
-		ClothMat = new PartMaterialType(cloth, MaterialCloth.TYPE);
+//		ArmorplateMat = new PartMaterialType(armorPlate, MaterialArmor.TYPE);
+//		ChainmailMat = new PartMaterialType(chainmail, MaterialArmor.TYPE);
+//		RivetMat = new PartMaterialType(rivets, MaterialTypes.EXTRA);
+//		ClaspMat = new PartMaterialType(clasp, MaterialTypes.EXTRA);
+//		ClothMat = new PartMaterialType(cloth, MaterialCloth.TYPE);
 
 		//registry.registerAll((Item[]) itemList.toArray());
 	}
diff --git a/src/main/java/lance5057/tDefense/core/tools/TDTools.java b/src/main/java/lance5057/tDefense/core/tools/TDTools.java
index 7d546fb..2d72189 100644
--- a/src/main/java/lance5057/tDefense/core/tools/TDTools.java
+++ b/src/main/java/lance5057/tDefense/core/tools/TDTools.java
@@ -10,6 +10,8 @@ import lance5057.tDefense.core.tools.armor.cloth.TinkersHood;
 import lance5057.tDefense.core.tools.armor.cloth.TinkersRobe;
 import lance5057.tDefense.core.tools.armor.cloth.TinkersShawl;
 import lance5057.tDefense.core.tools.armor.cloth.TinkersShoes;
+import lance5057.tDefense.core.tools.armor.heavy.TinkersBreastplate;
+import lance5057.tDefense.core.tools.armor.heavy.TinkersHelm;
 import lance5057.tDefense.core.tools.armor.straps.ItemStraps;
 import lance5057.tDefense.core.tools.basic.FishingRod;
 import lance5057.tDefense.core.tools.basic.HeaterShield;
@@ -90,11 +92,6 @@ public class TDTools {
 
 	private void regTools() {
 
-		
-
-		// TinkerRegistry.registerToolStationCrafting(roundshield);
-		// TinkerRegistry.registerToolForgeCrafting(heatershield);
-		// TinkerRegistry.registerToolForgeCrafting(zweihander);
 	}
 	
 	public void registerItems(final RegistryEvent.Register<Item> event)
@@ -111,6 +108,11 @@ public class TDTools {
 		robe = new TinkersRobe();
 		shoes = new TinkersShoes();
 		
+		helm = new TinkersHelm();
+		breastplate = new TinkersBreastplate();
+		grieves = new TinkersHelm();
+		sabatons = new TinkersBreastplate();
+		
 		sheathe = new Sheathe();
 		ring = new Ring();
 		amulet = new Amulet();
@@ -126,6 +128,11 @@ public class TDTools {
 		regTool(robe, "robe", event);
 		regTool(shoes, "shoes", event);
 		
+		regTool(helm, "helm", event);
+		regTool(breastplate, "breastplate", event);
+		regTool(grieves, "grieves", event);
+		regTool(sabatons, "sabatons", event);
+		
 		regTool(sheathe, "sheathe", event);
 		regTool(ring, "ring", event);
 		regTool(amulet, "amulet", event);
@@ -177,6 +184,11 @@ public class TDTools {
 		TinkerRegistry.registerToolCrafting(robe);
 		TinkerRegistry.registerToolCrafting(shoes);
 		
+		TinkerRegistry.registerToolCrafting(helm);
+		TinkerRegistry.registerToolCrafting(breastplate);
+		TinkerRegistry.registerToolCrafting(grieves);
+		TinkerRegistry.registerToolCrafting(sabatons);
+		
 		TinkerRegistry.registerToolCrafting(sheathe);
 		TinkerRegistry.registerToolCrafting(ring);
 		TinkerRegistry.registerToolCrafting(amulet);
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersHood.java b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersHood.java
index 61f3c88..6ab4561 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersHood.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersHood.java
@@ -1,10 +1,13 @@
 package lance5057.tDefense.core.tools.armor.cloth;
 
+import lance5057.tDefense.core.materials.ClothMaterialStats;
+import lance5057.tDefense.core.materials.HelmMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
 
 public class TinkersHood extends ArmorCore
 {
@@ -13,9 +16,9 @@ public class TinkersHood extends ArmorCore
 
 	public TinkersHood()
 	{
-	    super(TDParts.ClothMat,
-	    		TDParts.ClothMat,
-	    		TDParts.RivetMat);
+	    super(new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE),
+	    	new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE),
+	    	PartMaterialType.extra(TDParts.rivets));
 		setUnlocalizedName("tinkerhood");
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersRobe.java b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersRobe.java
index b2c43ff..b879e29 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersRobe.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersRobe.java
@@ -1,10 +1,13 @@
 package lance5057.tDefense.core.tools.armor.cloth;
 
+import lance5057.tDefense.core.materials.ClothMaterialStats;
+import lance5057.tDefense.core.materials.HelmMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
 
 public class TinkersRobe extends ArmorCore
 {
@@ -13,9 +16,9 @@ public class TinkersRobe extends ArmorCore
 
 	public TinkersRobe()
 	{
-	    super(TDParts.ClothMat,
-	    		TDParts.ClothMat,
-	    		TDParts.ClaspMat);
+	    super(new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE),
+	    	new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE),
+	    	PartMaterialType.extra(TDParts.clasp));
 		setUnlocalizedName("tinkerrobe");
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShawl.java b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShawl.java
index 4af7731..01d74ee 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShawl.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShawl.java
@@ -1,10 +1,13 @@
 package lance5057.tDefense.core.tools.armor.cloth;
 
+import lance5057.tDefense.core.materials.ClothMaterialStats;
+import lance5057.tDefense.core.materials.HelmMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
 
 public class TinkersShawl extends ArmorCore
 {
@@ -13,9 +16,9 @@ public class TinkersShawl extends ArmorCore
 
 	public TinkersShawl()
 	{
-	    super(TDParts.ClothMat,
-	    		TDParts.ClothMat,
-	    		TDParts.ArmorplateMat);
+	    super(new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE),
+	    	new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE),
+	    	PartMaterialType.extra(TDParts.armorPlate));
 		setUnlocalizedName("tinkershawl");
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShoes.java b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShoes.java
index 1f178cf..c78f8a4 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShoes.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShoes.java
@@ -1,10 +1,14 @@
 package lance5057.tDefense.core.tools.armor.cloth;
 
+import lance5057.tDefense.core.materials.ClothMaterialStats;
+import lance5057.tDefense.core.materials.HelmMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.tools.TinkerTools;
 
 public class TinkersShoes extends ArmorCore
 {
@@ -13,9 +17,9 @@ public class TinkersShoes extends ArmorCore
 
 	public TinkersShoes()
 	{
-	    super(TDParts.ClothMat,
-	    		TDParts.ArmorplateMat,
-	    		TDParts.ClaspMat);
+	    super(new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE),
+	    	PartMaterialType.extra(TDParts.rivets),
+	    	PartMaterialType.handle(TinkerTools.bowString));
 		setUnlocalizedName("tinkershoes");
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersBreastplate.java b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersBreastplate.java
index d738cac..2885d7d 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersBreastplate.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersBreastplate.java
@@ -1,64 +1,38 @@
-//package lance5057.tDefense.armor.items.heavy;
-//
-//import java.util.List;
-//
-//import lance5057.tDefense.armor.ArmorCore;
-//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 slimeknights.tconstruct.library.materials.Material;
-//import slimeknights.tconstruct.library.tinkering.PartMaterialType;
-//import slimeknights.tconstruct.tools.TinkerTools;
-//
-//public class TinkersBreastplate extends ArmorCore
-//{
-//	public TinkersBreastplate()
-//	{
-//		super(EntityEquipmentSlot.CHEST,
-//				PartMaterialType.head(TinkerTools.largePlate), 
-//				PartMaterialType.head(TinkerTools.largePlate), 
-//				PartMaterialType.handle(TinkerTools.toughToolRod),
-//				PartMaterialType.extra(TinkerTools.bowString));
-//		setUnlocalizedName("tinkersbreastplate");
-//		maxReduction = 100;
-//		reductionPercent = 8 * 0.04f;
-//	}
-//
+package lance5057.tDefense.core.tools.armor.heavy;
+
+import lance5057.tDefense.core.materials.ChestMaterialStats;
+import lance5057.tDefense.core.parts.TDParts;
+import lance5057.tDefense.core.tools.bases.ArmorCore;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.tools.TinkerTools;
+
+public class TinkersBreastplate extends ArmorCore
+{
+	public TinkersBreastplate()
+	{
+		super(new PartMaterialType(TinkerTools.largePlate, ChestMaterialStats.TYPE), 
+			new PartMaterialType(TDParts.armorPlate, ChestMaterialStats.TYPE), 
+				PartMaterialType.handle(TDParts.filigree),
+				PartMaterialType.extra(TDParts.chainmail));
+		setUnlocalizedName("tinkersbreastplate");
+	}
+
 //	@Override
 //	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
 //		// TODO Auto-generated method stub
 //		
 //	}
-//
-//	@Override
-//	public float damagePotential() {
-//		// TODO Auto-generated method stub
-//		return 0;
-//	}
-//
+
+
 //	@Override
-//	public double attackSpeed() {
-//		// TODO Auto-generated method stub
-//		return 0;
+//	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
+//	{
+//		return "tinkersdefense:textures/armor/Tinkersbreastplate.png";
 //	}
 //
 //	@Override
-//	public NBTTagCompound buildTag(List<Material> materials) {
-//		// TODO Auto-generated method stub
-//		return null;
+//	public ArmorRenderer getRenderer()
+//	{
+//		return ClientProxy.breastplate;
 //	}
-//
-////	@Override
-////	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
-////	{
-////		return "tinkersdefense:textures/armor/Tinkersbreastplate.png";
-////	}
-////
-////	@Override
-////	public ArmorRenderer getRenderer()
-////	{
-////		return ClientProxy.breastplate;
-////	}
-//}
+}
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersGrieves.java b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersGrieves.java
index e763ff8..478ec43 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersGrieves.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersGrieves.java
@@ -1,132 +1,19 @@
-//package lance5057.tDefense.armor.items.heavy;
-//
-//import lance5057.tDefense.TinkersDefense;
-//import lance5057.tDefense.armor.ArmorCore;
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import lance5057.tDefense.proxy.ClientProxy;
-//import net.minecraft.entity.Entity;
-//import net.minecraft.item.Item;
-//import net.minecraft.item.ItemStack;
-//import tconstruct.tools.TinkerTools;
-//
-//public class TinkersGrieves extends ArmorCore
-//{
-//	public TinkersGrieves()
-//	{
-//		super(2, 2);
-//		setUnlocalizedName("tinkergrieves");
-//		maxReduction = 100;
-//		reductionPercent = 6 * 0.04f;
-//	}
-//
-//	@Override
-//	public Item getHeadItem()
-//	{
-//		return TinkersDefense.partArmorplate;
-//	}
-//
-//	@Override
-//	public Item getHandleItem()
-//	{
-//		return TinkerTools.toughRod;
-//	}
-//
-//	@Override
-//	public Item getAccessoryItem()
-//	{
-//		return TinkersDefense.partChainmaille;
-//	}
-//
-//	@Override
-//	public Item getExtraItem()
-//	{
-//		return TinkersDefense.partCloth;
-//	}
-//
-//	@Override
-//	public int durabilityTypeAccessory()
-//	{
-//		return 2;
-//	}
-//
-//	@Override
-//	public float getRepairCost()
-//	{
-//		return 4.0f;
-//	}
-//
-//	@Override
-//	public float getDurabilityModifier()
-//	{
-//		return 2.5f;
-//	}
-//
-//	@Override
-//	public float getDamageModifier()
-//	{
-//		return 1.4f;
-//	}
-//
-//	@Override
-//	public int getPartAmount()
-//	{
-//		return 4;
-//	}
-//
-//	@Override
-//	public String getIconSuffix(int partType)
-//	{
-//		switch(partType)
-//		{
-//			case 0:
-//				return "_grieves_plate";
-//			case 1:
-//				return "_grieves_plate_broken";
-//			case 2:
-//				return "_grieves_trim";
-//			case 3:
-//				return "_grieves_chain";
-//			case 4:
-//				return "_grieves_cloth";
-//			default:
-//				return "";
-//		}
-//	}
-//
-//	@Override
-//	public String getEffectSuffix()
-//	{
-//		return "_grieves_effect";
-//	}
-//
-//	@Override
-//	public String getDefaultFolder()
-//	{
-//		return "armor/grieves";
-//	}
-//
-//	//	@Override
-//	//	public void onUpdate(ItemStack stack, World world, Entity entity, int par4,
-//	//			boolean par5) {
-//	//		super.onUpdate(stack, world, entity, par4, par5);
-//	//
-//	//	}
-//
-//	@Override
-//	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
-//	{
-//		return "tinkersdefense:textures/armor/TinkersGrieves.png";
-//	}
-//
-//	@Override
-//	public String[] getTraits()
-//	{
-//		return new String[] {"armor", "pants", "grieves", "heavyarmor"};
-//	}
-//
-//	@Override
-//	public ArmorRenderer getRenderer()
-//	{
-//		return ClientProxy.grieves;
-//	}
-//}
+package lance5057.tDefense.core.tools.armor.heavy;
+
+import lance5057.tDefense.core.materials.ClothMaterialStats;
+import lance5057.tDefense.core.materials.LegsMaterialStats;
+import lance5057.tDefense.core.parts.TDParts;
+import lance5057.tDefense.core.tools.bases.ArmorCore;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+
+public class TinkersGrieves extends ArmorCore
+{
+	public TinkersGrieves()
+	{
+		super(new PartMaterialType(TDParts.armorPlate, LegsMaterialStats.TYPE), 
+			new PartMaterialType(TDParts.filigree, LegsMaterialStats.TYPE),
+				PartMaterialType.handle(TDParts.filigree),
+				new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE));
+		setUnlocalizedName("tinkersgrieves");
+	}
+}
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersHelm.java b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersHelm.java
index 8e47805..3029a2d 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersHelm.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersHelm.java
@@ -1,169 +1,19 @@
-//package lance5057.tDefense.armor.items.heavy;
-//
-//import lance5057.tDefense.TinkersDefense;
-//import lance5057.tDefense.armor.ArmorCore;
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import lance5057.tDefense.proxy.ClientProxy;
-//import net.minecraft.entity.Entity;
-//import net.minecraft.entity.EntityLivingBase;
-//import net.minecraft.entity.player.EntityPlayer;
-//import net.minecraft.item.Item;
-//import net.minecraft.item.ItemStack;
-//import net.minecraft.world.World;
-//import tconstruct.tools.TinkerTools;
-//import thaumcraft.api.IGoggles;
-//import thaumcraft.api.nodes.IRevealer;
-//import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
-//import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge;
-//import cpw.mods.fml.common.Optional;
-//
-//@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles", striprefs = true)})
-//public class TinkersHelm extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles
-//{
-//	public TinkersHelm()
-//	{
-//		super(2, 0);
-//		setUnlocalizedName("tinkershelm");
-//		maxReduction = 100;
-//		reductionPercent = 3 * 0.04f;
-//	}
-//
-//	@Override
-//	public Item getHeadItem()
-//	{
-//		return TinkerTools.frypanHead;
-//	}
-//
-//	@Override
-//	public Item getHandleItem()
-//	{
-//		return TinkerTools.toughRod;
-//	}
-//
-//	@Override
-//	public Item getAccessoryItem()
-//	{
-//		return TinkersDefense.partArmorplate;
-//	}
-//
-//	@Override
-//	public Item getExtraItem()
-//	{
-//		return TinkersDefense.partChainmaille;
-//	}
-//
-//	@Override
-//	public int durabilityTypeAccessory()
-//	{
-//		return 2;
-//	}
-//
-//	@Override
-//	public float getRepairCost()
-//	{
-//		return 4.0f;
-//	}
-//
-//	@Override
-//	public float getDurabilityModifier()
-//	{
-//		return 2.5f;
-//	}
-//
-//	@Override
-//	public float getDamageModifier()
-//	{
-//		return 1.4f;
-//	}
-//
-//	@Override
-//	public int getPartAmount()
-//	{
-//		return 4;
-//	}
-//
-//	@Override
-//	public String getIconSuffix(int partType)
-//	{
-//		switch(partType)
-//		{
-//			case 0:
-//				return "_helm_top";
-//			case 1:
-//				return "_helm_top_broken";
-//			case 2:
-//				return "_helm_chain";
-//			case 3:
-//				return "_helm_plate";
-//			case 4:
-//				return "_helm_visor";
-//			default:
-//				return "";
-//		}
-//	}
-//
-//	@Override
-//	public String getEffectSuffix()
-//	{
-//		return "_helm_effect";
-//	}
-//
-//	@Override
-//	public String getDefaultFolder()
-//	{
-//		return "armor/helm";
-//	}
-//
-//	//	@Override
-//	//	public void onUpdate(ItemStack stack, World world, Entity entity, int par4,
-//	//			boolean par5) {
-//	//		super.onUpdate(stack, world, entity, par4, par5);
-//	//
-//	//	}
-//
-//	@Override
-//	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
-//	{
-//		return "tinkersdefense:textures/armor/TinkersHelm.png";
-//	}
-//
-//	@Override
-//	public String[] getTraits()
-//	{
-//		return new String[] {"armor", "head", "helm", "heavyarmor"};
-//	}
-//
-//	@Override
-//	public ArmorRenderer getRenderer()
-//	{
-//		return ClientProxy.helm;
-//	}
-//
-//	@Optional.Method(modid = "Thaumcraft")
-//	@Override
-//	public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
-//	{
-//		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
-//	}
-//
-//	@Optional.Method(modid = "Thaumcraft")
-//	@Override
-//	public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
-//	{
-//		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
-//	}
-//
-//	@Optional.Method(modid = "AWWayofTime")
-//	@Override
-//	public boolean canSeeLPBar(ItemStack stack)
-//	{
-//		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
-//	}
-//
-//	@Optional.Method(modid = "AWWayofTime")
-//	@Override
-//	public boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player)
-//	{
-//		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
-//	}
-//}
+package lance5057.tDefense.core.tools.armor.heavy;
+
+import lance5057.tDefense.core.materials.HelmMaterialStats;
+import lance5057.tDefense.core.parts.TDParts;
+import lance5057.tDefense.core.tools.bases.ArmorCore;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.tools.TinkerTools;
+
+public class TinkersHelm extends ArmorCore
+{
+	public TinkersHelm()
+	{
+		super(new PartMaterialType(TinkerTools.panHead, HelmMaterialStats.TYPE), 
+			new PartMaterialType(TDParts.armorPlate, HelmMaterialStats.TYPE), 
+				PartMaterialType.handle(TDParts.filigree),
+				PartMaterialType.extra(TDParts.chainmail));
+		setUnlocalizedName("tinkershelm");
+	}
+}
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersSabatons.java b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersSabatons.java
index 47bcc77..0bb34af 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersSabatons.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersSabatons.java
@@ -1,132 +1,19 @@
-//package lance5057.tDefense.armor.items.heavy;
-//
-//import lance5057.tDefense.TinkersDefense;
-//import lance5057.tDefense.armor.ArmorCore;
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import lance5057.tDefense.proxy.ClientProxy;
-//import net.minecraft.entity.Entity;
-//import net.minecraft.item.Item;
-//import net.minecraft.item.ItemStack;
-//import tconstruct.tools.TinkerTools;
-//
-//public class TinkersSabatons extends ArmorCore
-//{
-//	public TinkersSabatons()
-//	{
-//		super(2, 3);
-//		setUnlocalizedName("tinkersabatons");
-//		maxReduction = 100;
-//		reductionPercent = 3 * 0.04f;
-//	}
-//
-//	@Override
-//	public Item getHeadItem()
-//	{
-//		return TinkersDefense.partArmorplate;
-//	}
-//
-//	@Override
-//	public Item getHandleItem()
-//	{
-//		return TinkerTools.toughRod;
-//	}
-//
-//	@Override
-//	public Item getAccessoryItem()
-//	{
-//		return TinkersDefense.partArmorplate;
-//	}
-//
-//	@Override
-//	public Item getExtraItem()
-//	{
-//		return TinkersDefense.partCloth;
-//	}
-//
-//	@Override
-//	public int durabilityTypeAccessory()
-//	{
-//		return 2;
-//	}
-//
-//	@Override
-//	public float getRepairCost()
-//	{
-//		return 4.0f;
-//	}
-//
-//	@Override
-//	public float getDurabilityModifier()
-//	{
-//		return 2.5f;
-//	}
-//
-//	@Override
-//	public float getDamageModifier()
-//	{
-//		return 1.4f;
-//	}
-//
-//	@Override
-//	public int getPartAmount()
-//	{
-//		return 4;
-//	}
-//
-//	@Override
-//	public String getIconSuffix(int partType)
-//	{
-//		switch(partType)
-//		{
-//			case 0:
-//				return "_sabatons_plates";
-//			case 1:
-//				return "_sabatons_plate_broken";
-//			case 2:
-//				return "_sabatons_trim";
-//			case 3:
-//				return "_sabatons_caps";
-//			case 4:
-//				return "_sabatons_soles";
-//			default:
-//				return "";
-//		}
-//	}
-//
-//	@Override
-//	public String getEffectSuffix()
-//	{
-//		return "_sabatons_effect";
-//	}
-//
-//	@Override
-//	public String getDefaultFolder()
-//	{
-//		return "armor/sabatons";
-//	}
-//
-//	//	@Override
-//	//	public void onUpdate(ItemStack stack, World world, Entity entity, int par4,
-//	//			boolean par5) {
-//	//		super.onUpdate(stack, world, entity, par4, par5);
-//	//
-//	//	}
-//
-//	@Override
-//	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
-//	{
-//		return "tinkersdefense:textures/armor/TinkersSabatons.png";
-//	}
-//
-//	@Override
-//	public String[] getTraits()
-//	{
-//		return new String[] {"armor", "feet", "sabatons", "heavyarmor"};
-//	}
-//
-//	@Override
-//	public ArmorRenderer getRenderer()
-//	{
-//		return ClientProxy.sabatons;
-//	}
-//}
+package lance5057.tDefense.core.tools.armor.heavy;
+
+import lance5057.tDefense.core.materials.BootsMaterialStats;
+import lance5057.tDefense.core.materials.ClothMaterialStats;
+import lance5057.tDefense.core.parts.TDParts;
+import lance5057.tDefense.core.tools.bases.ArmorCore;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+
+public class TinkersSabatons extends ArmorCore
+{
+	public TinkersSabatons()
+	{
+		super(new PartMaterialType(TDParts.armorPlate, BootsMaterialStats.TYPE), 
+			new PartMaterialType(TDParts.armorPlate, BootsMaterialStats.TYPE),
+				PartMaterialType.handle(TDParts.filigree),
+				new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE));
+		setUnlocalizedName("tinkershelm");
+	}
+}
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/straps/ItemStraps.java b/src/main/java/lance5057/tDefense/core/tools/armor/straps/ItemStraps.java
index 5055f56..8adbddb 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/straps/ItemStraps.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/straps/ItemStraps.java
@@ -5,6 +5,7 @@ import javax.annotation.Nullable;
 
 import baubles.api.IBauble;
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.core.tools.bases.ArmorCore;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.EntityEquipmentSlot;
@@ -111,14 +112,17 @@ public class ItemStraps extends ItemArmor implements ISpecialArmor
 	@Override
 	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
 	{
-		// TODO Auto-generated method stub
+		ItemStack in = armor.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).getStackInSlot(0);
+		if(in.getItem() instanceof ArmorCore)
+		{
+			return ((ArmorCore)in.getItem()).getArmorDisplay();
+		}
 		return 0;
 	}
 
 	@Override
 	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot)
 	{
-		// TODO Auto-generated method stub
-
+		stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).getStackInSlot(0).damageItem(damage, entity);
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/core/tools/bases/ArmorCore.java b/src/main/java/lance5057/tDefense/core/tools/bases/ArmorCore.java
index 05d0b3d..7a9e71e 100644
--- a/src/main/java/lance5057/tDefense/core/tools/bases/ArmorCore.java
+++ b/src/main/java/lance5057/tDefense/core/tools/bases/ArmorCore.java
@@ -53,4 +53,9 @@ public class ArmorCore extends ToolCore
 		ToolNBT data = buildDefaultTag(materials);
 		return data.get();
 	}
+	
+	public int getArmorDisplay()
+	{
+		return 0;
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/tools/bases/Shield.java b/src/main/java/lance5057/tDefense/core/tools/bases/Shield.java
index 0779d0e..5daae67 100644
--- a/src/main/java/lance5057/tDefense/core/tools/bases/Shield.java
+++ b/src/main/java/lance5057/tDefense/core/tools/bases/Shield.java
@@ -6,12 +6,14 @@ import javax.annotation.Nullable;
 
 import lance5057.tDefense.core.materials.ShieldMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
+import net.minecraft.block.BlockDispenser;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.IItemPropertyGetter;
+import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ActionResult;
@@ -42,6 +44,7 @@ public class Shield extends ToolCore //implements IShield, ISheathed, IArrowCatc
                 return i;
             }
         });
+		BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(this, ItemArmor.DISPENSER_BEHAVIOR);
 	}
 	
 	/**
@@ -54,15 +57,18 @@ public class Shield extends ToolCore //implements IShield, ISheathed, IArrowCatc
 		return EnumAction.BLOCK;
 	}
 	
-	public ActionResult<ItemStack> onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand)
+	@Override
+	public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn)
     {
-        playerIn.setActiveHand(hand);
-        return new ActionResult(EnumActionResult.SUCCESS, itemStackIn);
+		ItemStack itemstack = playerIn.getHeldItem(handIn);
+        playerIn.setActiveHand(handIn);
+        return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, itemstack);
     }
 	
-	public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ)
+	@Override
+	public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ)
     {
-        return super.onItemUse(playerIn, worldIn, pos, hand, facing, hitX, hitY, hitZ);
+        return super.onItemUse(player, worldIn, pos, hand, facing, hitX, hitY, hitZ);
     }
 
 	/**
diff --git a/src/main/java/lance5057/tDefense/core/tools/basic/HeaterShield.java b/src/main/java/lance5057/tDefense/core/tools/basic/HeaterShield.java
index 8893616..610b817 100644
--- a/src/main/java/lance5057/tDefense/core/tools/basic/HeaterShield.java
+++ b/src/main/java/lance5057/tDefense/core/tools/basic/HeaterShield.java
@@ -1,8 +1,10 @@
 package lance5057.tDefense.core.tools.basic;
 
+import lance5057.tDefense.core.materials.ShieldMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.bases.Shield;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.tools.IToolPart;
 import slimeknights.tconstruct.tools.TinkerTools;
 
 public class HeaterShield extends Shield
@@ -12,131 +14,9 @@ public class HeaterShield extends Shield
 	public HeaterShield()
 	{
 		super(PartMaterialType.handle(TinkerTools.toughToolRod),
-				TDParts.ShieldMat,
-	            TDParts.ShieldMat,
-	            TDParts.RivetMat);
+			new PartMaterialType(TDParts.armorPlate, ShieldMaterialStats.TYPE),
+			new PartMaterialType(TDParts.armorPlate, ShieldMaterialStats.TYPE),
+			PartMaterialType.extra(TDParts.rivets));
 		setUnlocalizedName("heatershield");
 	}
-
-//	@Override
-//	public Item getHeadItem()
-//	{
-//		return TinkersDefense.partArmorplate;
-//	}
-//
-//	@Override
-//	public Item getHandleItem()
-//	{
-//		return TinkerTools.toughRod;
-//	}
-//
-//	@Override
-//	public Item getAccessoryItem()
-//	{
-//		return TinkersDefense.partArmorplate;
-//	}
-//
-//	@Override
-//	public Item getExtraItem()
-//	{
-//		return TinkersDefense.partRivet;
-//	}
-//
-//	@Override
-//	public int durabilityTypeAccessory()
-//	{
-//		return 2;
-//	}
-//
-//	@Override
-//	public float getRepairCost()
-//	{
-//		return 4.0f;
-//	}
-//
-//	@Override
-//	public float getDurabilityModifier()
-//	{
-//		return 2.5f;
-//	}
-//
-//	@Override
-//	public float breakSpeedModifier()
-//	{
-//		return 0.4f;
-//	}
-//
-//	@Override
-//	public float getDamageModifier()
-//	{
-//		return 1.4f;
-//	}
-//
-//	@Override
-//	public int getPartAmount()
-//	{
-//		return 4;
-//	}
-//
-//	@Override
-//	public String getIconSuffix(int partType)
-//	{
-//		switch(partType)
-//		{
-//			case 0:
-//				return "_shield_plate";
-//			case 1:
-//				return "_shield_plate_broken";
-//			case 2:
-//				return "_shield_edge";
-//			case 3:
-//				return "_shield_face";
-//			case 4:
-//				return "_shield_binding";
-//			default:
-//				return "";
-//		}
-//	}
-//
-//	@Override
-//	public String getEffectSuffix()
-//	{
-//		return "_shield_effect";
-//	}
-//
-//	@Override
-//	public String getDefaultFolder()
-//	{
-//		return "heatershield";
-//	}
-//
-//	// /* tool_TinkerShield specific */
-//	// @Override
-//	// public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player,
-//	// Entity entity) {
-//	// if (AbilityHelper.onLeftClickEntity(stack, player, entity, this)) {
-//	// entity.hurtResistantTime += 7;
-//	// /*
-//	// * if (entity instanceof EntityLiving) { EntityLiving living =
-//	// * (EntityLiving) entity; if (living.getHealth() <= 0) {
-//	// *
-//	// * } }
-//	// */
-//	// // if (entity.getHealth() <= 0)
-//	// }
-//	// return true;
-//	// }
-//
-//	@Override
-//	public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5)
-//	{
-//		super.onUpdate(stack, world, entity, par4, par5);
-//
-//	}
-//
-//	@Override
-//	protected String getHarvestType()
-//	{
-//		return "shield";
-//	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/tools/basic/RoundShield.java b/src/main/java/lance5057/tDefense/core/tools/basic/RoundShield.java
index 544eb02..f7103eb 100644
--- a/src/main/java/lance5057/tDefense/core/tools/basic/RoundShield.java
+++ b/src/main/java/lance5057/tDefense/core/tools/basic/RoundShield.java
@@ -1,6 +1,7 @@
 package lance5057.tDefense.core.tools.basic;
 
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.core.materials.ShieldMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.bases.Shield;
 import net.minecraft.entity.Entity;
@@ -17,27 +18,8 @@ public class RoundShield extends Shield
 	public RoundShield()
 	{
 	    super(PartMaterialType.handle(TinkerTools.toolRod),
-	    		TDParts.ShieldMat,
+	    	new PartMaterialType(TDParts.armorPlate, ShieldMaterialStats.TYPE),
 	            PartMaterialType.head(TinkerTools.panHead));
 		setUnlocalizedName("roundshield");
 	}
-
-	@Override
-	public float breakSpeedModifier()
-	{
-		return 0.4f;
-	}
-
-	@Override
-	public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5)
-	{
-		super.onUpdate(stack, world, entity, par4, par5);
-
-	}
-
-	@Override
-	protected String getHarvestType()
-	{
-		return "shield";
-	}
 }
diff --git a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
index 45109c2..43e141c 100644
--- a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
@@ -155,6 +155,11 @@ public class ClientProxy extends CommonProxy {
 		shawlGUI = new ToolBuildGuiInfo(TDTools.shawl);
 		robeGUI = new ToolBuildGuiInfo(TDTools.robe);
 		shoesGUI = new ToolBuildGuiInfo(TDTools.shoes);
+		
+		helmGUI = new ToolBuildGuiInfo(TDTools.helm);
+		breastplateGUI = new ToolBuildGuiInfo(TDTools.breastplate);
+		grievesGUI = new ToolBuildGuiInfo(TDTools.grieves);
+		sabatonsGUI = new ToolBuildGuiInfo(TDTools.sabatons);
 
 		sheatheGUI = new ToolBuildGuiInfo(TDTools.sheathe);
 		ringGUI = new ToolBuildGuiInfo(TDTools.ring);
@@ -200,6 +205,16 @@ public class ClientProxy extends CommonProxy {
 		ringGUI.addSlotPosition(34, 15 + 8);
 		ringGUI.addSlotPosition(43, 33 + 8);
 		ringGUI.addSlotPosition(34, 51 + 8);
+		
+		breastplateGUI.addSlotPosition(34, 15 + 8);
+		breastplateGUI.addSlotPosition(43, 33 + 8);
+		breastplateGUI.addSlotPosition(34, 51 + 8);
+		breastplateGUI.addSlotPosition(43, 51 + 8);
+		
+		helmGUI.addSlotPosition(34, 15 + 8);
+		helmGUI.addSlotPosition(43, 33 + 8);
+		helmGUI.addSlotPosition(34, 51 + 8);
+		helmGUI.addSlotPosition(43, 51 + 8);
 	}
 
 	public void registerToolGuis() {
@@ -217,6 +232,11 @@ public class ClientProxy extends CommonProxy {
 		TinkerRegistryClient.addToolBuilding(sheatheGUI);
 		TinkerRegistryClient.addToolBuilding(ringGUI);
 		TinkerRegistryClient.addToolBuilding(amuletGUI);
+		
+		TinkerRegistryClient.addToolBuilding(helmGUI);
+		TinkerRegistryClient.addToolBuilding(breastplateGUI);
+		TinkerRegistryClient.addToolBuilding(grievesGUI);
+		TinkerRegistryClient.addToolBuilding(sabatonsGUI);
 	}
 
 	public void registerPartModels() {
@@ -273,7 +293,31 @@ public class ClientProxy extends CommonProxy {
 		shoesGUI.addSlotPosition(34, 15 + 8);
 		shoesGUI.addSlotPosition(43, 33 + 8);
 		shoesGUI.addSlotPosition(34, 51 + 8);
-
+		
+		breastplateGUI.positions.clear();
+		breastplateGUI.addSlotPosition(34, 15 + 8);
+		breastplateGUI.addSlotPosition(43, 33 + 8);
+		breastplateGUI.addSlotPosition(34, 51 + 8);
+		breastplateGUI.addSlotPosition(43, 51 + 8);
+		
+		helmGUI.positions.clear();
+		helmGUI.addSlotPosition(34, 15 + 8);
+		helmGUI.addSlotPosition(43, 33 + 8);
+		helmGUI.addSlotPosition(34, 51 + 8);
+		helmGUI.addSlotPosition(43, 51 + 8);
+
+		sabatonsGUI.positions.clear();
+		sabatonsGUI.addSlotPosition(34, 15 + 8);
+		sabatonsGUI.addSlotPosition(43, 33 + 8);
+		sabatonsGUI.addSlotPosition(34, 51 + 8);
+		sabatonsGUI.addSlotPosition(43, 51 + 8);
+		
+		grievesGUI.positions.clear();
+		grievesGUI.addSlotPosition(34, 15 + 8);
+		grievesGUI.addSlotPosition(43, 33 + 8);
+		grievesGUI.addSlotPosition(34, 51 + 8);
+		grievesGUI.addSlotPosition(43, 51 + 8);
+		
 		shearsGUI.positions.clear();
 		shearsGUI.addSlotPosition(34, 15 + 8);
 		shearsGUI.addSlotPosition(43, 33 + 8);
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/breastplate.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/breastplate.tcon.json
new file mode 100644
index 0000000..027bed7
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/breastplate.tcon.json
@@ -0,0 +1,9 @@
+{
+    "textures": {
+        "layer0": "tinkersdefense:items/armor/breastplate/_plate",
+        "layer1": "tinkersdefense:items/armor/breastplate/_smallplate",
+		"layer2": "tinkersdefense:items/armor/breastplate/_trim",
+		"layer3": "tinkersdefense:items/armor/breastplate/_chain",
+		"broken1": "tinkersdefense:items/armor/breastplate/_plate"
+    }
+}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/fishingrod.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/fishingrod.tcon.json
index 5f34dde..fe11a40 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/fishingrod.tcon.json
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/fishingrod.tcon.json
@@ -3,7 +3,7 @@
         "layer0": "tinkersdefense:items/fishingrod/_rod",
         "layer1": "tinkersdefense:items/fishingrod/_string",
 		"layer2": "tinkersdefense:items/fishingrod/_hook",
-		"broken1": "tinkersdefense:items/fishingrod/broken"
+		"broken1": "tinkersdefense:items/fishingrod/_rod"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/grieves.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/grieves.tcon.json
new file mode 100644
index 0000000..d89ec36
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/grieves.tcon.json
@@ -0,0 +1,9 @@
+{
+    "textures": {
+        "layer0": "tinkersdefense:items/armor/grieves/_plate",
+        "layer1": "tinkersdefense:items/armor/grieves/_trim",
+		"layer2": "tinkersdefense:items/armor/grieves/_chain",
+		"layer3": "tinkersdefense:items/armor/grieves/_cloth",
+		"broken1": "tinkersdefense:items/armor/grieves/_plate"
+    }
+}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/helm.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/helm.tcon.json
new file mode 100644
index 0000000..94fc15e
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/helm.tcon.json
@@ -0,0 +1,9 @@
+{
+    "textures": {
+        "layer0": "tinkersdefense:items/armor/helm/_top",
+        "layer1": "tinkersdefense:items/armor/helm/_plate",
+		"layer2": "tinkersdefense:items/armor/helm/_visor",
+		"layer3": "tinkersdefense:items/armor/helm/_chain",
+		"broken1": "tinkersdefense:items/armor/helm/_plate"
+    }
+}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/hood.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/hood.tcon.json
index e8f6988..3cec161 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/hood.tcon.json
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/hood.tcon.json
@@ -3,7 +3,7 @@
         "layer0": "tinkersdefense:items/armor/hood/_cloth",
         "layer1": "tinkersdefense:items/armor/hood/_trim",
 		"layer2": "tinkersdefense:items/armor/hood/_rivet",
-		"broken1": "tinkersdefense:items/armor/hood/_broken"
+		"broken1": "tinkersdefense:items/armor/hood/_cloth"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/robe.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/robe.tcon.json
index d2bf7e2..b8b24d6 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/robe.tcon.json
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/robe.tcon.json
@@ -3,7 +3,7 @@
         "layer0": "tinkersdefense:items/armor/robe/_cloth",
         "layer1": "tinkersdefense:items/armor/robe/_trim",
 		"layer2": "tinkersdefense:items/armor/robe/_plate",
-		"broken1": "tinkersdefense:items/armor/robe/_broken"
+		"broken1": "tinkersdefense:items/armor/robe/_cloth"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/sabatons.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/sabatons.tcon.json
new file mode 100644
index 0000000..8d9c486
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/sabatons.tcon.json
@@ -0,0 +1,9 @@
+{
+    "textures": {
+        "layer0": "tinkersdefense:items/armor/sabatons/_plates",
+        "layer1": "tinkersdefense:items/armor/sabatons/_trim",
+		"layer2": "tinkersdefense:items/armor/sabatons/_caps",
+		"layer3": "tinkersdefense:items/armor/sabatons/_soles",
+		"broken1": "tinkersdefense:items/armor/sabatons/_plates"
+    }
+}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/shawl.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/shawl.tcon.json
index 85a6162..e8b242e 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/shawl.tcon.json
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/shawl.tcon.json
@@ -3,7 +3,7 @@
         "layer0": "tinkersdefense:items/armor/shawl/_cloth",
         "layer1": "tinkersdefense:items/armor/shawl/_trim",
 		"layer2": "tinkersdefense:items/armor/shawl/_clasp",
-		"broken1": "tinkersdefense:items/armor/shawl/_broken"
+		"broken1": "tinkersdefense:items/armor/shawl/_cloth"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/shoes.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/shoes.tcon.json
index a69cf82..4a295de 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/shoes.tcon.json
+++ b/src/main/resources/assets/tinkersdefense/models/item/tools/shoes.tcon.json
@@ -3,7 +3,7 @@
         "layer0": "tinkersdefense:items/armor/shoes/_cloth",
         "layer1": "tinkersdefense:items/armor/shoes/_sole",
 		"layer2": "tinkersdefense:items/armor/shoes/_clasp",
-		"broken1": "tinkersdefense:items/armor/shoes/_broken"
+		"broken1": "tinkersdefense:items/armor/shoes/_cloth"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_chain.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_chain.png
index 5b242c1..5b242c1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_chain.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_plate.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_plate.png
index 624403e..624403e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_plate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_smallplate.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_smallplate.png
index 9d8aa6b..9d8aa6b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_smallplate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_smallplate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_trim.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_trim.png
index 5eea928..5eea928 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_breastplate_trim.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/ModelBiped-texturemap.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/ModelBiped-texturemap.png
deleted file mode 100644
index 361f889..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/ModelBiped-texturemap.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_chain.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_chain.png
deleted file mode 100644
index 0f84905..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_chain.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_plate.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_plate.png
deleted file mode 100644
index d021871..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_plate.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_smallplate.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_smallplate.png
deleted file mode 100644
index 345412e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_smallplate.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_trim.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_trim.png
deleted file mode 100644
index ec8eff9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_breastplate_trim.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_chain.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_chain.png
index 8f7789a..8f7789a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_chain.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_cloth.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_cloth.png
index 32985ad..32985ad 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_cloth.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_cod.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_cod.png
deleted file mode 100644
index a32b425..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_cod.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_plate.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_plate.png
index 2bc04d2..2bc04d2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_plate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_trim.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_trim.png
index f24bcf8..f24bcf8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_grieves_trim.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/blastprotection_breastplate_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/blastprotection_breastplate_effect.png
deleted file mode 100644
index 3ba28ec..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/blastprotection_breastplate_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/char.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/char.png
deleted file mode 100644
index e925635..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/char.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/fireprotection_breastplate_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/fireprotection_breastplate_effect.png
deleted file mode 100644
index 696957c..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/fireprotection_breastplate_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/healthboost_breastplate_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/healthboost_breastplate_effect.png
deleted file mode 100644
index 3e0b0f4..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/healthboost_breastplate_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/projprotection_breastplate_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/projprotection_breastplate_effect.png
deleted file mode 100644
index b031458..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/projprotection_breastplate_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/protection_breastplate_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/protection_breastplate_effect.png
deleted file mode 100644
index a29232f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/protection_breastplate_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/runicshielding_breastplate_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/runicshielding_breastplate_effect.png
deleted file mode 100644
index b13c9df..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/runicshielding_breastplate_effect.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_chain.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_chain.png
index 13b051f..13b051f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_chain.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_plate.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_plate.png
index a20421c..a20421c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_plate.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_top.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_top.png
index 061027c..061027c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_top.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_top.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_visor.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_visor.png
index 6b89cd0..6b89cd0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_helm_visor.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_visor.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_caps.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_caps.png
index 8225f2f..8225f2f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_caps.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_caps.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_plates.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_plates.png
index a841231..a841231 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_plates.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_plates.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_soles.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_soles.png
index 4bf2a87..4bf2a87 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_soles.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_soles.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_trim.png b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_trim.png
index 54ac3e9..54ac3e9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_sabatons_trim.png
+++ b/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_trim.png
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index c2b646f..17debc6 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
  "modid": "tinkersdefense",
  "name": "Tinkers' Defense",
  "description": "A defense related expansion for TConstruct",
- "version": "1.4.2.4a",
+ "version": "1.4.2.6a",
  "mcversion": "1.12.2",
  "url": "",
  "authorList": ["Sir Lance"],