Refactor and Compartmentalize all the codes!

13 files changed, 0 insertions, 1130 deletions

diff --git a/src/main/java/gmail/Lance5057/items/AeonSteelIngot.java b/src/main/java/gmail/Lance5057/items/AeonSteelIngot.java
deleted file mode 100644
index 793507a..0000000
--- a/src/main/java/gmail/Lance5057/items/AeonSteelIngot.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package gmail.Lance5057.items;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-
-public class AeonSteelIngot extends Item
-{
-	public AeonSteelIngot()
-	{
-		
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/gmail/Lance5057/items/Crest_Feathers.java b/src/main/java/gmail/Lance5057/items/Crest_Feathers.java
deleted file mode 100644
index 29b2bbf..0000000
--- a/src/main/java/gmail/Lance5057/items/Crest_Feathers.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package gmail.Lance5057.items;
-
-public class Crest_Feathers {
-
-}
diff --git a/src/main/java/gmail/Lance5057/items/DogbeariumIngot.java b/src/main/java/gmail/Lance5057/items/DogbeariumIngot.java
deleted file mode 100644
index 539dd08..0000000
--- a/src/main/java/gmail/Lance5057/items/DogbeariumIngot.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package gmail.Lance5057.items;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-
-public class DogbeariumIngot extends Item
-{
-	public DogbeariumIngot()
-	{
-		
-	}
-}
diff --git a/src/main/java/gmail/Lance5057/items/Injector.java b/src/main/java/gmail/Lance5057/items/Injector.java
deleted file mode 100644
index c1e5eb9..0000000
--- a/src/main/java/gmail/Lance5057/items/Injector.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package gmail.Lance5057.items;
-
-import gmail.Lance5057.TinkersDefense;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import tconstruct.library.crafting.PatternBuilder;
-import tconstruct.library.crafting.PatternBuilder.MaterialSet;
-import tconstruct.library.tools.ToolCore;
-import tconstruct.tools.TinkerTools;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.Item;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.ResourceLocation;
-
-public class Injector extends ToolCore
-{
-
-	ToolCore tool;
-	
-	public Injector(int baseDamage, ToolCore tool) {
-		super(baseDamage);
-		this.tool = tool;
-	}
-
-	List<String> heads = new ArrayList<String>();
-	List<String> accessorys= new ArrayList<String>();
-	List<String> handles = new ArrayList<String>();
-	List<String> extras = new ArrayList<String>();
-	
-	protected void loadHeads(IIconRegister iconRegister)
-	{				
-		IIcon origHead = TinkerTools.broadsword.headIcons.get(-1);
-		IIcon origAccessory = TinkerTools.broadsword.accessoryIcons.get(-1);
-		IIcon origHandle = TinkerTools.broadsword.handleIcons.get(-1);
-		
-		//File[] icons = new File("tinkersdefense:items/" + tool.getDefaultFolder()).listFiles();
-		ResourceLocation icons = new ResourceLocation("tinkersdefense", tool.getDefaultFolder());
-		String test = icons.toString();
-		for(int i = 0; i<heads.size(); i++)
-		{
-			PatternBuilder pb = PatternBuilder.instance;
-			for(Map.Entry<String, MaterialSet> entry : pb.materialSets.entrySet())
-			{
-				String icon = "tinkersdefense:";
-		        icon += TinkerTools.broadsword.getDefaultFolder() + "/" + entry.getKey().toLowerCase() + "/" + heads.get(i);
-		        //toolIcons[i] = icon;
-		        headStrings.put(entry.getValue().materialID+(TinkersDefense.config.MaterialIndex*(i+1)), icon);
-			}
-			
-			addIcons(headStrings, headIcons, iconRegister, heads.get(i), false);
-			
-			for(int j = (i+1)*TinkersDefense.config.MaterialIndex; j<TinkersDefense.config.MaterialIndex + ((i+1)*TinkersDefense.config.MaterialIndex); j++)
-			{
-				if(!headIcons.containsKey(j))
-				{
-					headIcons.put(j, headIcons.get(-1));
-				}
-			}
-			
-			TinkerTools.broadsword.headStrings.putAll(headStrings);
-			TinkerTools.broadsword.headIcons.putAll(headIcons);
-		}
-		
-		for(int i = 0; i<accessorys.size(); i++)
-		{
-			PatternBuilder pb = PatternBuilder.instance;
-			for(Map.Entry<String, MaterialSet> entry : pb.materialSets.entrySet())
-			{
-				String icon = "tinkersdefense:";
-		        icon += TinkerTools.broadsword.getDefaultFolder() + "/" + entry.getKey().toLowerCase() + "/" + accessorys.get(i);
-		        //toolIcons[i] = icon;
-		        accessoryStrings.put(entry.getValue().materialID+(TinkersDefense.config.MaterialIndex*(i+1)), icon);
-			}
-			
-			addIcons(accessoryStrings, accessoryIcons, iconRegister, accessorys.get(i), false);
-			
-			for(int j = (i+1)*TinkersDefense.config.MaterialIndex; j<TinkersDefense.config.MaterialIndex + ((i+1)*TinkersDefense.config.MaterialIndex); j++)
-			{
-				if(!accessoryIcons.containsKey(j))
-				{
-					accessoryIcons.put(j, accessoryIcons.get(-1));
-				}
-			}
-			
-			TinkerTools.broadsword.accessoryStrings.putAll(accessoryStrings);
-			TinkerTools.broadsword.accessoryIcons.putAll(accessoryIcons);
-		}
-		
-		for(int i = 0; i<handles.size(); i++)
-		{
-			PatternBuilder pb = PatternBuilder.instance;
-			for(Map.Entry<String, MaterialSet> entry : pb.materialSets.entrySet())
-			{
-				String icon = "tinkersdefense:";
-		        icon += TinkerTools.broadsword.getDefaultFolder() + "/" + entry.getKey().toLowerCase() + "/" + handles.get(i);
-		        //toolIcons[i] = icon;
-		        handleStrings.put(entry.getValue().materialID+(TinkersDefense.config.MaterialIndex*(i+1)), icon);
-			}
-			
-			addIcons(handleStrings, handleIcons, iconRegister, handles.get(i), false);
-			
-			for(int j = (i+1)*TinkersDefense.config.MaterialIndex; j<TinkersDefense.config.MaterialIndex + ((i+1)*TinkersDefense.config.MaterialIndex); j++)
-			{
-				if(!handleIcons.containsKey(j))
-				{
-					handleIcons.put(j, handleIcons.get(-1));
-				}
-			}
-			
-			TinkerTools.broadsword.handleStrings.putAll(handleStrings);
-			TinkerTools.broadsword.handleIcons.putAll(handleIcons);
-		}
-		
-		TinkerTools.broadsword.headIcons.put(-1, origHead);
-		TinkerTools.broadsword.accessoryIcons.put(-1, origAccessory);
-		TinkerTools.broadsword.handleIcons.put(-1, origHandle);
-	}
-	
-	@Override
-    public void registerIcons (IIconRegister iconRegister)
-    {
-		loadHeads(iconRegister);
-    }
-	
-	@Override
-	 public String getDefaultTexturePath()
-	    {
-	        return "tinkersdefense:" + getDefaultFolder();
-	    }
-
-	@Override
-	public Item getAccessoryItem() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getDefaultFolder() {
-		// TODO Auto-generated method stub
-		return "broadsword";
-	}
-
-	@Override
-	public String getEffectSuffix() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public Item getHeadItem() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getIconSuffix(int arg0) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String[] getTraits() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
diff --git a/src/main/java/gmail/Lance5057/items/QueensGoldIngot.java b/src/main/java/gmail/Lance5057/items/QueensGoldIngot.java
deleted file mode 100644
index 74c2708..0000000
--- a/src/main/java/gmail/Lance5057/items/QueensGoldIngot.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package gmail.Lance5057.items;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-
-public class QueensGoldIngot extends Item
-{
-	public QueensGoldIngot()
-	{
-		
-	}
-}
diff --git a/src/main/java/gmail/Lance5057/items/RoyalGuard.java b/src/main/java/gmail/Lance5057/items/RoyalGuard.java
deleted file mode 100644
index 04bce58..0000000
--- a/src/main/java/gmail/Lance5057/items/RoyalGuard.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package gmail.Lance5057.items;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import tconstruct.library.client.TConstructClientRegistry;
-import tconstruct.library.crafting.ToolBuilder;
-import tconstruct.library.tools.Weapon;
-
-import java.util.List;
-
-public abstract class RoyalGuard extends Weapon {
-	public RoyalGuard() {
-		super(10);
-	}
-	
-@Override
-public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
-super.addInformation(stack, player, list, par4);
-list.add(EnumChatFormatting.DARK_PURPLE + "Artisan crafted for the royal family");
-}
-@Override
-public void getSubItems(Item id, CreativeTabs tab, List list) 
-{
-	super.getSubItems(id, tab, list);
-	
-	ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, 2), new ItemStack(getHandleItem(), 1, 6), new ItemStack(getAccessoryItem(), 1, 33), "Royal Guard");
-	NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
-	tags.setInteger("Modifiers", 0);
-	tags.setInteger("Attack", 15);
-	tags.setInteger("TotalDurability", Integer.MAX_VALUE / 100);
-	tags.setInteger("BaseDurability", Integer.MAX_VALUE / 100);
-	tags.setInteger("MiningSpeed", Integer.MAX_VALUE / 100);
-	tags.setInteger("Unbreaking", 10);
-	tags.setBoolean("Built", true);
-	tags.setInteger("Fortune", 450);
-	list.add(tool);
-}
-}
\ No newline at end of file
diff --git a/src/main/java/gmail/Lance5057/items/TD_Patterns.java b/src/main/java/gmail/Lance5057/items/TD_Patterns.java
deleted file mode 100644
index 938cf02..0000000
--- a/src/main/java/gmail/Lance5057/items/TD_Patterns.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package gmail.Lance5057.items;
-
-import java.util.List;
-
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import tconstruct.tools.items.Pattern;
-import tconstruct.util.Reference;
-
-public class TD_Patterns extends Pattern {
-	 private static final String[] patternName = new String[] {"rivets","clasp","armorplate","cloth","chainmaille"};
-
-	    public TD_Patterns(String patternType, String name) {
-	        super(patternName, getPatternNames(patternName, patternType), "patterns/");
-
-	        this.setUnlocalizedName(Reference.prefix(name));
-	    }
-
-	    public static String[] getPatternNames (String[] patternName, String partType)
-	    {
-	        String[] names = new String[patternName.length];
-	        for (int i = 0; i < patternName.length; i++)
-	            names[i] = partType + patternName[i];
-	        return names;
-	    }
-
-	    @Override
-	    public void getSubItems (Item b, CreativeTabs tab, List list)
-	    {
-	        for (int i = 0; i < patternName.length; i++)
-	        {
-	            // if (i != 23)
-	            list.add(new ItemStack(b, 1, i));
-	        }
-	    }
-
-	    @Override
-	    public int getPatternCost(ItemStack pattern) {
-	        switch(pattern.getItemDamage())
-	        {
-	            case 0: return 1; //rivets
-	            case 1: return 2; //clasp
-	            case 2: return 8; //armorplate
-	            case 3: return 6; //cloth
-	            case 4: return 6; //chainmaille
-	        }
-	        return 0;
-	    }
-}
diff --git a/src/main/java/gmail/Lance5057/items/tools/ArmorCore.java b/src/main/java/gmail/Lance5057/items/tools/ArmorCore.java
deleted file mode 100644
index d834a53..0000000
--- a/src/main/java/gmail/Lance5057/items/tools/ArmorCore.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package gmail.Lance5057.items.tools;
-
-import tconstruct.library.tools.ToolCore;
-import cpw.mods.fml.relauncher.*;
-import mods.battlegear2.api.IEnchantable;
-import mods.battlegear2.api.ISheathed;
-import mods.battlegear2.api.shield.IArrowCatcher;
-import mods.battlegear2.api.shield.IArrowDisplay;
-import mods.battlegear2.api.shield.IShield;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.IProjectile;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.*;
-import net.minecraft.item.ItemArmor.ArmorMaterial;
-import net.minecraft.util.DamageSource;
-import net.minecraft.world.World;
-
-public abstract class ArmorCore extends ItemArmor
-{
-	public ArmorCore(ArmorMaterial par2EnumArmorMaterial, int par3, int par4) {
-		super(par2EnumArmorMaterial, par3, par4);
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java b/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java
deleted file mode 100644
index 94f3e2d..0000000
--- a/src/main/java/gmail/Lance5057/items/tools/HeaterShield.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package gmail.Lance5057.items.tools;
-
-import gmail.Lance5057.TinkersDefense;
-
-import java.util.List;
-
-import mods.battlegear2.api.ISheathed;
-import mods.battlegear2.api.shield.IArrowCatcher;
-import mods.battlegear2.api.shield.IArrowDisplay;
-import mods.battlegear2.api.shield.IShield;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.IProjectile;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.World;
-import tconstruct.library.tools.AbilityHelper;
-import tconstruct.library.tools.HarvestTool;
-import tconstruct.tools.TinkerTools;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class HeaterShield extends Shield {
-	int induceDamage = 0;
-
-	public HeaterShield() {
-		super(0);
-		this.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_face";
-		case 1:
-			return "_shield_face_broken";
-		case 2:
-			return "_shield_edge";
-		case 3:
-			return "_shield_face_other";
-		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
-	@SideOnly(Side.CLIENT)
-	public void addInformation(ItemStack par1ItemStack,
-			EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
-		NBTTagCompound tags = par1ItemStack.getTagCompound();
-		super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
-		par3List.add("");
-		par3List.add(EnumChatFormatting.DARK_GREEN
-				+ ItemStack.field_111284_a
-						.format(1F / (10f / (tags.getCompoundTag("InfiTool")
-								.getInteger("MiningSpeed") / 1.5f)) / 20F)
-				+ StatCollector.translateToLocal("attribute.shield.block.time"));
-		int arrowCount = getArrowCount(par1ItemStack);
-		if (arrowCount > 0) {
-			par3List.add(String.format("%s%s %s", EnumChatFormatting.GOLD,
-					arrowCount, StatCollector
-							.translateToLocal("attribute.shield.arrow.count")));
-		}
-	}
-
-	@Override
-	protected String getHarvestType() {
-		return "shield";
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/gmail/Lance5057/items/tools/RoundShield.java b/src/main/java/gmail/Lance5057/items/tools/RoundShield.java
deleted file mode 100644
index 45ea263..0000000
--- a/src/main/java/gmail/Lance5057/items/tools/RoundShield.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package gmail.Lance5057.items.tools;
-
-import gmail.Lance5057.TinkersDefense;
-
-import java.util.List;
-
-import mods.battlegear2.api.ISheathed;
-import mods.battlegear2.api.shield.IArrowCatcher;
-import mods.battlegear2.api.shield.IArrowDisplay;
-import mods.battlegear2.api.shield.IShield;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.IProjectile;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.World;
-import tconstruct.library.tools.AbilityHelper;
-import tconstruct.library.tools.HarvestTool;
-import tconstruct.tools.TinkerTools;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class RoundShield extends Shield {
-	int induceDamage = 0;
-
-	public RoundShield() {
-		super(0);
-		this.setUnlocalizedName("shield");
-	}
-
-	@Override
-	public Item getHeadItem() {
-		return TinkersDefense.partArmorplate;
-	}
-
-	@Override
-	public Item getHandleItem() {
-		return TinkerTools.toolRod;
-	}
-
-	@Override
-	public Item getAccessoryItem() {
-		return TinkerTools.frypanHead;
-	}
-
-	@Override
-	public int durabilityTypeAccessory() {
-		return 2;
-	}
-
-	@Override
-	public float getRepairCost() {
-		return 4.0f;
-	}
-
-	@Override
-	public float getDurabilityModifier() {
-		return 1.5f;
-	}
-
-	@Override
-	public float breakSpeedModifier() {
-		return 0.4f;
-	}
-
-	@Override
-	public float getDamageModifier() {
-		return 0f;
-	}
-
-	@Override
-	public int getPartAmount() {
-		return 3;
-	}
-
-	@Override
-	public String getIconSuffix(int partType) {
-		switch (partType) {
-		case 0:
-			return "_shield_face";
-			case 1:
-			return "_shield_face_broken";
-			case 2:
-			return "_shield_edge";
-			case 3:
-			return "_shield_boss";
-			default:
-			return "";
-		}
-	}
-
-	@Override
-	public String getEffectSuffix() {
-		return "_shield_effect";
-	}
-
-	@Override
-	public String getDefaultFolder() {
-		return "shield";
-	}
-
-//	/* 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
-	@SideOnly(Side.CLIENT)
-	public void addInformation(ItemStack par1ItemStack,
-			EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
-		NBTTagCompound tags = par1ItemStack.getTagCompound();
-		super.addInformation(par1ItemStack, par2EntityPlayer, par3List, par4);
-		par3List.add("");
-		par3List.add(EnumChatFormatting.DARK_GREEN
-				+ ItemStack.field_111284_a
-						.format(1F / (10f / (tags.getCompoundTag("InfiTool")
-								.getInteger("MiningSpeed") / 1.5f)) / 20F)
-				+ StatCollector.translateToLocal("attribute.shield.block.time"));
-		int arrowCount = getArrowCount(par1ItemStack);
-		if (arrowCount > 0) {
-			par3List.add(String.format("%s%s %s", EnumChatFormatting.GOLD,
-					arrowCount, StatCollector
-							.translateToLocal("attribute.shield.arrow.count")));
-		}
-	}
-
-	@Override
-	protected String getHarvestType() {
-		return "shield";
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/gmail/Lance5057/items/tools/Shield.java b/src/main/java/gmail/Lance5057/items/tools/Shield.java
deleted file mode 100644
index 5c8af46..0000000
--- a/src/main/java/gmail/Lance5057/items/tools/Shield.java
+++ /dev/null
@@ -1,263 +0,0 @@
-package gmail.Lance5057.items.tools;
-
-import cpw.mods.fml.common.Optional;
-import tconstruct.library.tools.ToolCore;
-import cpw.mods.fml.relauncher.*;
-import mods.battlegear2.api.ISheathed;
-import mods.battlegear2.api.shield.IArrowCatcher;
-import mods.battlegear2.api.shield.IArrowDisplay;
-import mods.battlegear2.api.shield.IShield;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.IProjectile;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.*;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.DamageSource;
-import net.minecraft.world.World;
-
-
-@Optional.InterfaceList({
-    @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.ISheathed"),
-    @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.shield.IArrowCatcher"),
-    @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.shield.IArrowDisplay"),
-    @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.shield.IShield")
-})
-
-public class Shield extends ToolCore implements IShield, ISheathed,
-		IArrowCatcher, IArrowDisplay {
-	public Shield(int baseDamage) {
-		super(baseDamage);
-	}
-
-	protected float baseSpeed() {
-		return 1.5f;
-	}
-
-	protected float effectiveSpeed() {
-		return 15f;
-	}
-
-	public float breakSpeedModifier() {
-		return 1.0f;
-	}
-
-	@Override
-	public float getDigSpeed(ItemStack stack, Block block, int meta) {
-		if (stack.getTagCompound().getCompoundTag("InfiTool")
-				.getBoolean("Broken"))
-			return 0.1f;
-		for (int i = 0; i < web.length; i++) {
-			if (web[i] == block.getMaterial()) {
-				return effectiveSpeed();
-			}
-		}
-		return baseSpeed();
-	}
-
-	/**
-	 * returns the action that specifies what animation to play when the items
-	 * is being used
-	 */
-	@Override
-	public EnumAction getItemUseAction(ItemStack par1ItemStack) {
-		return EnumAction.block;
-	}
-
-	/**
-	 * How long it takes to use or consume an item
-	 */
-	@Override
-	public int getMaxItemUseDuration(ItemStack par1ItemStack) {
-		return 72000;
-	}
-
-	/**
-	 * Called whenever this item is equipped and the right mouse button is
-	 * pressed. Args: itemStack, world, entityPlayer
-	 */
-	@Override
-	public ItemStack onItemRightClick(ItemStack stack, World world,
-			EntityPlayer player) {
-		player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
-		return stack;
-	}
-
-	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world,
-			int x, int y, int z, int side, float clickX, float clickY,
-			float clickZ) {
-		return false;
-	}
-
-	/**
-	 * Returns if the item (tool) can harvest results from the block type.
-	 */
-	@Override
-	public boolean canHarvestBlock(Block block, ItemStack is) {
-		for (int i = 0; i < web.length; i++) {
-			if (block.getMaterial() == web[i])
-				return true;
-		}
-		return super.canHarvestBlock(block, is);
-	}
-
-	protected Material[] getEffectiveMaterials() {
-		return web;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void onUpdate(ItemStack stack, World world, Entity entity, int par4,
-			boolean par5) {
-		super.onUpdate(stack, world, entity, par4, par5);
-		if (entity instanceof EntityPlayerSP) {
-			EntityPlayerSP player = (EntityPlayerSP) entity;
-			ItemStack usingItem = player.getItemInUse();
-			if (usingItem != null && usingItem.getItem() == this) {
-				player.movementInput.moveForward *= 2.5F;
-				player.movementInput.moveStrafe *= 2.5F;
-			}
-		}
-	}
-
-	@Override
-	public String[] getTraits() {
-		return new String[] { "shield", "blocking" };
-	}
-
-	public static Material[] web = new Material[] { Material.web,
-			Material.cloth, Material.coral, Material.cake };
-	public static Material[] none = new Material[0];
-
-	protected String getHarvestType() {
-		return null;
-	}
-
-	@Override
-	@Optional.Method(modid = "battlegear2")
-	public int getArrowCount(ItemStack stack) {
-		if (stack.hasTagCompound() && stack.getTagCompound().hasKey("arrows")) {
-			return stack.getTagCompound().getShort("arrows");
-		} else
-			return 0;
-	}
-
-	@Override
-	@Optional.Method(modid = "battlegear2")
-	public void setArrowCount(ItemStack stack, int count) {
-		if (!stack.hasTagCompound()) {
-			stack.setTagCompound(new NBTTagCompound());
-		}
-		// Should never happen, you would need A LOT of arrows for this to
-		// happen
-		if (count > Short.MAX_VALUE) {
-			count = Short.MAX_VALUE;
-		}
-		stack.getTagCompound().setShort("arrows", (short) count);
-
-	}
-
-	@Override
-	@Optional.Method(modid = "battlegear2")
-	public boolean catchArrow(ItemStack shield, EntityPlayer player,
-			IProjectile arrow) {
-		if (arrow instanceof EntityArrow) {
-			setArrowCount(shield, getArrowCount(shield) + 1);
-			player.setArrowCountInEntity(player.getArrowCountInEntity() - 1);
-			((EntityArrow) arrow).setDead();
-			return true;
-		}
-		return false;
-	}
-
-
-	@Override
-	@Optional.Method(modid = "battlegear2")
-	public boolean sheatheOnBack(ItemStack item) {
-		return true;
-	}
-
-	@Override
-	@Optional.Method(modid = "battlegear2")
-	public void blockAnimation(EntityPlayer player, float dmg) {
-		player.worldObj.playSoundAtEntity(player, "battlegear2:shield", 1, 1);
-	}
-
-	@Override
-	@Optional.Method(modid = "battlegear2")
-	public boolean canBlock(ItemStack shield, DamageSource source) {
-		return !source.isUnblockable();
-	}
-
-	@Override
-	@Optional.Method(modid = "battlegear2")
-	public int getBashTimer(ItemStack arg0) {
-		return 10;
-	}
-
-	@Override
-	@Optional.Method(modid = "battlegear2")
-	public float getBlockAngle(ItemStack arg0) {
-		return 60;
-	}
-
-	@Override
-	@Optional.Method(modid = "battlegear2")
-	public float getDamageDecayRate(ItemStack shield, float amount) {
-		return 0;
-	}
-
-	@Override
-	@Optional.Method(modid = "battlegear2")
-	public float getDamageReduction(ItemStack arg0, DamageSource arg1) {
-		return 1f;
-	}
-
-	@Override
-	@Optional.Method(modid = "battlegear2")
-	public float getDecayRate(ItemStack stack) {
-		NBTTagCompound tags = stack.getTagCompound();
-		float recovery = tags.getCompoundTag("InfiTool").getInteger(
-				"MiningSpeed") / 1.5f;
-		return 10f / recovery;
-	}
-
-	@Override
-	@Optional.Method(modid = "battlegear2")
-	public float getRecoveryRate(ItemStack stack) {
-		NBTTagCompound tags = stack.getTagCompound();
-		float recovery = tags.getCompoundTag("InfiTool").getInteger(
-				"MiningSpeed") / 1.5f;
-		return 10f / recovery;
-	}
-
-	@Override
-	
-	public Item getAccessoryItem() {
-		return null;
-	}
-
-	@Override
-	public String getDefaultFolder() {
-		return null;
-	}
-
-	@Override
-	public String getEffectSuffix() {
-		return null;
-	}
-
-	@Override
-	public Item getHeadItem() {
-		return null;
-	}
-
-	@Override
-	public String getIconSuffix(int arg0) {
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/gmail/Lance5057/items/tools/TinkerWrench.java b/src/main/java/gmail/Lance5057/items/tools/TinkerWrench.java
deleted file mode 100644
index 7435c87..0000000
--- a/src/main/java/gmail/Lance5057/items/tools/TinkerWrench.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package gmail.Lance5057.items.tools;
-
-import java.util.List;
-
-import buildcraft.api.tools.IToolWrench;
-import mods.battlegear2.api.ISheathed;
-import mods.battlegear2.api.shield.IArrowCatcher;
-import mods.battlegear2.api.shield.IArrowDisplay;
-import mods.battlegear2.api.shield.IShield;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.IProjectile;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.World;
-import tconstruct.library.tools.AbilityHelper;
-import tconstruct.library.tools.HarvestTool;
-import tconstruct.library.tools.Weapon;
-import tconstruct.tools.TinkerTools;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class TinkerWrench extends Weapon implements IToolWrench {
-	int induceDamage = 0;
-
-	public TinkerWrench() {
-		super(0);
-		this.setUnlocalizedName("tinkerwrench");
-	}
-
-	@Override
-	public Item getHeadItem() {
-		return TinkerTools.handGuard;
-	}
-
-	@Override
-	public Item getHandleItem() {
-		return TinkerTools.toolRod;
-	}
-
-	@Override
-	public Item getAccessoryItem() {
-		return TinkerTools.binding;
-	}
-
-	@Override
-	public int durabilityTypeAccessory() {
-		return 2;
-	}
-
-	@Override
-	public float getRepairCost() {
-		return 1.0f;
-	}
-
-	@Override
-	public float getDurabilityModifier() {
-		return 0.1f;
-	}
-
-	@Override
-	public float getDamageModifier() {
-		return 0.4f;
-	}
-
-	@Override
-	public int getPartAmount() {
-		return 3;
-	}
-
-	@Override
-	public String getIconSuffix(int partType) {
-		switch (partType) {
-		case 0:
-			return "_wrench_head";
-		case 1:
-			return "_wrench_head_broken";
-		case 2:
-			return "_wrench_handle";
-		case 3:
-			return "_wrench_binding";
-		default:
-			return "";
-		}
-	}
-
-	@Override
-	public String getEffectSuffix() {
-		return "_wrench_effect";
-	}
-
-	@Override
-	public String getDefaultFolder() {
-		return "wrench";
-	}
-
-	@Override
-	public boolean canWrench(EntityPlayer player, int x, int y, int z) {
-		NBTTagCompound tags = player.inventory.getCurrentItem()
-				.getTagCompound().getCompoundTag("InfiTool");
-
-		if (!tags.getBoolean("Broken")) {
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public void wrenchUsed(EntityPlayer player, int x, int y, int z) {
-
-		player.swingItem();
-		AbilityHelper.damageTool(player.inventory.getCurrentItem(), 1, player,
-				false);
-
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/gmail/Lance5057/items/tools/TinkerZweihander.java b/src/main/java/gmail/Lance5057/items/tools/TinkerZweihander.java
deleted file mode 100644
index 980542f..0000000
--- a/src/main/java/gmail/Lance5057/items/tools/TinkerZweihander.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package gmail.Lance5057.items.tools;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.item.Item;
-import tconstruct.library.tools.Weapon;
-import tconstruct.tools.TinkerTools;
-
-public class TinkerZweihander extends Weapon
-{
-
-	public TinkerZweihander(int baseDamage) {
-		super(5);
-        this.setUnlocalizedName("zweihander");
-	}
-
-	@Override
-	public Item getHeadItem() {
-		return TinkerTools.largeSwordBlade;
-	}
-
-	@Override
-	public Item getHandleItem() {
-		return TinkerTools.toughRod;
-	}
-	
-	@Override
-	public Item getAccessoryItem() {
-		return TinkerTools.wideGuard;
-	}
-	
-	@Override
-	public Item getExtraItem() {
-		return TinkerTools.swordBlade;
-	}
-
-
-//	@Override
-//	public int durabilityTypeAccessory() {
-//		return 2;
-//	}
-//	
-//	@Override
-//    public int durabilityTypeExtra ()
-//    {
-//        return 1;
-//    }
-
-	@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 "_zweihander_blade";
-		case 1:
-			return "_zweihander_blade_broken";
-		case 2:
-			return "_zweihander_handle";
-		case 3:
-			return "_zweihander_guard";
-		case 4:
-			return "_zweihander_core";
-		default:
-			return "";
-		}
-	}
-
-	@Override
-	public String getEffectSuffix() {
-		return "_zweihander_effect";
-	}
-
-	@Override
-	public String getDefaultFolder() {
-		return "zweihander";
-	}
-}