remove all

42 files changed, 0 insertions, 3371 deletions

diff --git a/src/main/java/gregtech/common/tools/GT_Tool.java b/src/main/java/gregtech/common/tools/GT_Tool.java
deleted file mode 100644
index 054aafb439..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.damagesources.GT_DamageSources;

-import gregtech.api.interfaces.IToolStats;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.block.Block;

-import net.minecraft.enchantment.Enchantment;

-import net.minecraft.entity.Entity;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.stats.AchievementList;

-import net.minecraft.util.DamageSource;

-import net.minecraft.util.EntityDamageSource;

-import net.minecraft.util.IChatComponent;

-import net.minecraftforge.event.world.BlockEvent;

-

-import java.util.List;

-

-public abstract class GT_Tool

-        implements IToolStats {

-    public static final Enchantment[] FORTUNE_ENCHANTMENT = {Enchantment.fortune};

-    public static final Enchantment[] LOOTING_ENCHANTMENT = {Enchantment.looting};

-    public static final Enchantment[] ZERO_ENCHANTMENTS = new Enchantment[0];

-    public static final int[] ZERO_ENCHANTMENT_LEVELS = new int[0];

-

-    public int getToolDamagePerBlockBreak() {

-        return 100;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 800;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public float getSpeedMultiplier() {

-        return 1.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) {

-        return aOriginalHurtResistance;

-    }

-

-    public String getMiningSound() {

-        return null;

-    }

-

-    public String getCraftingSound() {

-        return null;

-    }

-

-    public String getEntityHitSound() {

-        return null;

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public boolean canBlock() {

-        return false;

-    }

-

-    public boolean isCrowbar() {

-        return false;

-    }

-

-    public boolean isGrafter() {

-        return false;

-    }

-

-    public boolean isWeapon() {

-        return false;

-    }

-

-    public boolean isRangedWeapon() {

-        return false;

-    }

-

-    public boolean isMiningTool() {

-        return true;

-    }

-

-    public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity) {

-        return GT_DamageSources.getCombatDamage((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer, (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase) aEntity) : null);

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new EntityDamageSource((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer).func_151519_b(aEntity);

-    }

-

-    public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

-        return 0;

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public Enchantment[] getEnchantments(ItemStack aStack) {

-        return ZERO_ENCHANTMENTS;

-    }

-

-    public int[] getEnchantmentLevels(ItemStack aStack) {

-        return ZERO_ENCHANTMENT_LEVELS;

-    }

-

-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {

-        aPlayer.triggerAchievement(AchievementList.openInventory);

-        aPlayer.triggerAchievement(AchievementList.mineWood);

-        aPlayer.triggerAchievement(AchievementList.buildWorkBench);

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-    }

-

-    public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) {

-        return aOriginalDamage;

-    }

-

-    public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) {

-        return aOriginalDamage;

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
deleted file mode 100644
index f74aeca505..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.OrePrefixes;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-import net.minecraftforge.event.world.BlockEvent;

-

-import java.util.List;

-

-public class GT_Tool_Axe

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 100;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 3.0F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 2.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return null;

-    }

-

-    public String getEntityHitSound() {

-        return null;

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return null;

-    }

-

-    public boolean canBlock() {

-        return false;

-    }

-

-    public boolean isCrowbar() {

-        return false;

-    }

-

-    public boolean isWeapon() {

-        return true;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && (tTool.equals("axe"))) || (aBlock.getMaterial() == Material.wood);

-    }

-

-    public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

-        int rAmount = 0;

-        if ((GregTech_API.sTimber) && (!aPlayer.isSneaking()) && (OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData)))) {

-            int tY = aY + 1;

-            for (int tH = aPlayer.worldObj.getHeight(); tY < tH; tY++) {

-                if ((aPlayer.worldObj.getBlock(aX, tY, aZ) != aBlock) || (!aPlayer.worldObj.func_147480_a(aX, tY, aZ, true))) {

-                    break;

-                }

-                rAmount++;

-            }

-        }

-        return rAmount;

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.toolHeadAxe.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex];

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been chopped by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java b/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
deleted file mode 100644
index 7cefcdfd8d..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import gregtech.api.util.GT_ModHandler;

-import gregtech.api.util.GT_Utility;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.init.Blocks;

-import net.minecraft.init.Items;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-import net.minecraftforge.event.world.BlockEvent;

-

-import java.util.List;

-

-public class GT_Tool_BranchCutter

-        extends GT_Tool {

-    public float getBaseDamage() {

-        return 2.5F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 0.25F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 0.25F;

-    }

-

-    public boolean isGrafter() {

-        return true;

-    }

-

-    public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

-        if (aBlock.getMaterial() == Material.leaves) {

-            aEvent.dropChance = Math.min(1.0F, Math.max(aEvent.dropChance, (aStack.getItem().getHarvestLevel(aStack, "") + 1) * 0.2F));

-            if (aBlock == Blocks.leaves) {

-                aDrops.clear();

-                if (((aMetaData & 0x3) == 0) && (aPlayer.worldObj.rand.nextInt(9) <= aFortune * 2)) {

-                    aDrops.add(new ItemStack(Items.apple, 1, 0));

-                } else {

-                    aDrops.add(new ItemStack(Blocks.sapling, 1, aMetaData & 0x3));

-                }

-            } else if (aBlock == Blocks.leaves2) {

-                aDrops.clear();

-                aDrops.add(new ItemStack(Blocks.sapling, 1, (aMetaData & 0x3) + 4));

-            } else if (aBlock == GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("rubberLeaves", 1L))) {

-                aDrops.clear();

-                aDrops.add(GT_ModHandler.getIC2Item("rubberSapling", 1L));

-            }

-        }

-        return 0;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && (tTool.equals("grafter"))) || (aBlock.getMaterial() == Material.leaves);

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? Textures.ItemIcons.GRAFTER : null;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been trimmed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java b/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java
deleted file mode 100644
index 9208079520..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.block.Block;

-import net.minecraft.enchantment.Enchantment;

-import net.minecraft.entity.Entity;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_ButcheryKnife

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return 200;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 100;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 400;

-    }

-

-    public float getBaseDamage() {

-        return 1.0F;

-    }

-

-    public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) {

-        return aOriginalHurtResistance * 2;

-    }

-

-    public float getSpeedMultiplier() {

-        return 0.1F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public boolean isWeapon() {

-        return true;

-    }

-

-    public boolean isMiningTool() {

-        return false;

-    }

-

-    public Enchantment[] getEnchantments(ItemStack aStack) {

-        return LOOTING_ENCHANTMENT;

-    }

-

-    public int[] getEnchantmentLevels(ItemStack aStack) {

-        return new int[]{(2 + GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolQuality) / 2};

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? Textures.ItemIcons.BUTCHERYKNIFE : null;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " has butchered " + EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        return false;

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java b/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java
deleted file mode 100644
index d92baa7f98..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.block.Block;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_BuzzSaw

-        extends GT_Tool_Saw {

-    public int getToolDamagePerContainerCraft() {

-        return 100;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 300;

-    }

-

-    public float getBaseDamage() {

-        return 1.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(104));

-    }

-

-    public String getEntityHitSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(105));

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(104));

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        return false;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadBuzzSaw.mTextureIndex] : Textures.ItemIcons.HANDLE_BUZZSAW;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got buzzed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java
deleted file mode 100644
index d5f86f4b0a..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import net.minecraft.item.ItemStack;

-

-public class GT_Tool_Chainsaw_HV

-        extends GT_Tool_Chainsaw_LV {

-    public int getToolDamagePerBlockBreak() {

-        return 800;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 1600;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 12800;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 3200;

-    }

-

-    public int getBaseQuality() {

-        return 1;

-    }

-

-    public float getBaseDamage() {

-        return 4.0F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 4.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 4.0F;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_HV;

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
deleted file mode 100644
index 2e32c5eab8..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.GT_Mod;

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_Chainsaw_LV

-        extends GT_Tool_Saw {

-    public int getToolDamagePerBlockBreak() {

-        return 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 800;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 3.0F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 2.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(104));

-    }

-

-    public String getEntityHitSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(105));

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(104));

-    }

-

-    public boolean canBlock() {

-        return false;

-    }

-

-    public boolean isWeapon() {

-        return true;

-    }

-

-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {

-        super.onToolCrafted(aStack, aPlayer);

-        try {

-            GT_Mod.instance.achievements.issueAchievement(aPlayer, "brrrr");

-        } catch (Exception e) {

-        }

-    }

-

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_LV;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was massacred by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java
deleted file mode 100644
index 303420f0ba..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import net.minecraft.item.ItemStack;

-

-public class GT_Tool_Chainsaw_MV

-        extends GT_Tool_Chainsaw_LV {

-    public int getToolDamagePerBlockBreak() {

-        return 200;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 400;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 3200;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 800;

-    }

-

-    public int getBaseQuality() {

-        return 1;

-    }

-

-    public float getBaseDamage() {

-        return 3.5F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 3.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 2.0F;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_MV;

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java b/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java
deleted file mode 100644
index 185f34b714..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.interfaces.IToolStats;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import gregtech.common.items.GT_MetaGenerated_Tool_01;

-import gregtech.common.items.behaviors.Behaviour_Crowbar;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-import java.util.Iterator;

-

-public class GT_Tool_Crowbar

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 100;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 2.0F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 1.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getEntityHitSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public boolean canBlock() {

-        return true;

-    }

-

-    public boolean isCrowbar() {

-        return true;

-    }

-

-    public boolean isWeapon() {

-        return true;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        if (aBlock.getMaterial() == Material.circuits) {

-            return true;

-        }

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        if ((tTool == null) || (tTool.equals(""))) {

-            for (Iterator i$ = GT_MetaGenerated_Tool_01.INSTANCE.mToolStats.values().iterator(); i$.hasNext(); i$.next()) {

-                if (((i$ instanceof GT_Tool_Crowbar)) && (!((IToolStats) i$).isMinableBlock(aBlock, aMetaData))) {

-                    return false;

-                }

-            }

-            return true;

-        }

-        return tTool.equals("crowbar");

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? Textures.ItemIcons.CROWBAR : null;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : null;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-        aItem.addItemBehavior(aID, new Behaviour_Crowbar(1, 1000));

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was removed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java b/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java
deleted file mode 100644
index d51644f5f6..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.GT_Mod;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-

-public class GT_Tool_Drill_HV

-        extends GT_Tool_Drill_LV {

-    public int getToolDamagePerBlockBreak() {

-        return GT_Mod.gregtechproxy.mHardRock ? 400 : 800;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 1600;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 12800;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 3200;

-    }

-

-    public int getBaseQuality() {

-        return 1;

-    }

-

-    public float getBaseDamage() {

-        return 3.0F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 9.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 4.0F;

-    }

-

-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {

-        super.onToolCrafted(aStack, aPlayer);

-        try {

-            GT_Mod.instance.achievements.issueAchievement(aPlayer, "highpowerdrill");

-        } catch (Exception e) {

-        }

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_HV;

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java
deleted file mode 100644
index f816768757..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.GT_Mod;

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.stats.AchievementList;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_Drill_LV

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return GT_Mod.gregtechproxy.mHardRock ? 25 : 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 100;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 2.0F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 3.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(106));

-    }

-

-    public String getEntityHitSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(106));

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(106));

-    }

-

-    public String getMiningSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(106));

-    }

-

-    public boolean canBlock() {

-        return false;

-    }

-

-    public boolean isCrowbar() {

-        return false;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && ((tTool.equals("pickaxe")) || (tTool.equals("shovel")))) || (aBlock.getMaterial() == Material.rock) || (aBlock.getMaterial() == Material.iron) || (aBlock.getMaterial() == Material.anvil) || (aBlock.getMaterial() == Material.sand) || (aBlock.getMaterial() == Material.grass) || (aBlock.getMaterial() == Material.ground) || (aBlock.getMaterial() == Material.snow) || (aBlock.getMaterial() == Material.clay) || (aBlock.getMaterial() == Material.glass);

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_LV;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-    }

-

-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {

-        super.onToolCrafted(aStack, aPlayer);

-        aPlayer.triggerAchievement(AchievementList.buildPickaxe);

-        aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe);

-        try {

-            GT_Mod.instance.achievements.issueAchievement(aPlayer, "driltime");

-        } catch (Exception e) {

-        }

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got the Drill! (by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + ")");

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java b/src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java
deleted file mode 100644
index 05c62579d0..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.GT_Mod;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import net.minecraft.item.ItemStack;

-

-public class GT_Tool_Drill_MV

-        extends GT_Tool_Drill_LV {

-    public int getToolDamagePerBlockBreak() {

-        return GT_Mod.gregtechproxy.mHardRock ? 100 : 200;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 400;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 3200;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 800;

-    }

-

-    public int getBaseQuality() {

-        return 1;

-    }

-

-    public float getBaseDamage() {

-        return 2.5F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 6.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 2.0F;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_MV;

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_File.java b/src/main/java/gregtech/common/tools/GT_Tool_File.java
deleted file mode 100644
index 5bb07c0614..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_File.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.block.Block;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_File

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 400;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 1.5F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 1.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return null;

-    }

-

-    public String getEntityHitSound() {

-        return null;

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return null;

-    }

-

-    public boolean canBlock() {

-        return true;

-    }

-

-    public boolean isCrowbar() {

-        return false;

-    }

-

-    public boolean isMiningTool() {

-        return false;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return (tTool != null) && (tTool.equals("file"));

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadFile.mTextureIndex] : Textures.ItemIcons.HANDLE_FILE;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been filed D for 'Dead' by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java
deleted file mode 100644
index cf8186b7bc..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.GT_Mod;

-import gregtech.api.GregTech_API;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import gregtech.api.util.GT_Recipe;

-import gregtech.api.util.GT_Utility;

-import gregtech.common.items.behaviors.Behaviour_Prospecting;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.Entity;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.monster.EntityIronGolem;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-import net.minecraftforge.event.world.BlockEvent;

-

-import java.util.Arrays;

-import java.util.List;

-

-public class GT_Tool_HardHammer

-        extends GT_Tool {

-    public static final List<String> mEffectiveList = Arrays.asList(new String[]{EntityIronGolem.class.getName(), "EntityTowerGuardian"});

-

-    public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) {

-        String tName = aEntity.getClass().getName();

-        tName = tName.substring(tName.lastIndexOf(".") + 1);

-        return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage;

-    }

-

-    public int getToolDamagePerBlockBreak() {

-        return 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 200;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 400;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 3.0F;

-    }

-

-    public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) {

-        return aOriginalHurtResistance * 2;

-    }

-

-    public float getSpeedMultiplier() {

-        return 0.75F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(1));

-    }

-

-    public String getEntityHitSound() {

-        return null;

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(2));

-    }

-

-    public String getMiningSound() {

-        return null;

-    }

-

-    public boolean canBlock() {

-        return true;

-    }

-

-    public boolean isCrowbar() {

-        return false;

-    }

-

-    public boolean isWeapon() {

-        return true;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && ((tTool.equals("hammer")) || (tTool.equals("pickaxe")))) || (aBlock.getMaterial() == Material.rock) || (aBlock.getMaterial() == Material.glass) || (aBlock.getMaterial() == Material.ice) || (aBlock.getMaterial() == Material.packedIce) || (GT_Recipe.GT_Recipe_Map.sHammerRecipes.containsInput(new ItemStack(aBlock, 1, aMetaData)));

-    }

-

-    public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

-        int rConversions = 0;

-        GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, 2147483647L, null, new ItemStack[]{new ItemStack(aBlock, 1, aMetaData)});

-        if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) {

-            for (ItemStack tDrop : aDrops) {

-                tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, 2147483647L, null, new ItemStack[]{GT_Utility.copyAmount(1L, new Object[]{tDrop})});

-                if (tRecipe != null) {

-                    ItemStack tHammeringOutput = tRecipe.getOutput(0);

-                    if (tHammeringOutput != null) {

-                        rConversions += tDrop.stackSize;

-                        tDrop.stackSize *= tHammeringOutput.stackSize;

-                        tHammeringOutput.stackSize = tDrop.stackSize;

-                        GT_Utility.setStack(tDrop, tHammeringOutput);

-                    }

-                }

-            }

-        } else {

-            aDrops.clear();

-            aDrops.add(tRecipe.getOutput(0));

-            rConversions++;

-        }

-        return rConversions;

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadHammer.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-        aItem.addItemBehavior(aID, new Behaviour_Prospecting(1, 1000));

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was squashed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-

-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {

-        super.onToolCrafted(aStack, aPlayer);

-        try {

-            GT_Mod.instance.achievements.issueAchievement(aPlayer, "tools");

-        } catch (Exception e) {

-        }

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Hoe.java b/src/main/java/gregtech/common/tools/GT_Tool_Hoe.java
deleted file mode 100644
index 7ae5b09334..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Hoe.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import gregtech.common.items.behaviors.Behaviour_Hoe;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.stats.AchievementList;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_Hoe

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 100;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 1.75F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 1.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return null;

-    }

-

-    public String getEntityHitSound() {

-        return null;

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return null;

-    }

-

-    public boolean canBlock() {

-        return false;

-    }

-

-    public boolean isCrowbar() {

-        return false;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && (tTool.equals("hoe"))) || (aBlock.getMaterial() == Material.gourd);

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadHoe.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-        aItem.addItemBehavior(aID, new Behaviour_Hoe(100));

-    }

-

-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {

-        super.onToolCrafted(aStack, aPlayer);

-        aPlayer.triggerAchievement(AchievementList.buildHoe);

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been called a stupid Hoe by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java
deleted file mode 100644
index a1ad88c69f..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.GT_Mod;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.util.GT_Recipe;

-import gregtech.api.util.GT_Utility;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-import net.minecraftforge.event.world.BlockEvent;

-

-import java.util.List;

-

-public class GT_Tool_JackHammer

-        extends GT_Tool_Drill_LV {

-    public int getToolDamagePerBlockBreak() {

-        return GT_Mod.gregtechproxy.mHardRock ? 200 : 400;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 400;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 3200;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 800;

-    }

-

-    public int getBaseQuality() {

-        return 1;

-    }

-

-    public float getBaseDamage() {

-        return 3.0F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 12.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 2.0F;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && (tTool.equals("pickaxe"))) || (aBlock.getMaterial() == Material.rock) || (aBlock.getMaterial() == Material.glass) || (aBlock.getMaterial() == Material.ice) || (aBlock.getMaterial() == Material.packedIce);

-    }

-

-    public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

-        int rConversions = 0;

-        GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, 2147483647L, null, new ItemStack[]{new ItemStack(aBlock, 1, aMetaData)});

-        if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) {

-            for (ItemStack tDrop : aDrops) {

-                tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, 2147483647L, null, new ItemStack[]{GT_Utility.copyAmount(1L, new Object[]{tDrop})});

-                if (tRecipe != null) {

-                    ItemStack tHammeringOutput = tRecipe.getOutput(0);

-                    if (tHammeringOutput != null) {

-                        rConversions += tDrop.stackSize;

-                        tDrop.stackSize *= tHammeringOutput.stackSize;

-                        tHammeringOutput.stackSize = tDrop.stackSize;

-                        GT_Utility.setStack(tDrop, tHammeringOutput);

-                    }

-                }

-            }

-        } else {

-            aDrops.clear();

-            aDrops.add(tRecipe.getOutput(0));

-            rConversions++;

-        }

-        return rConversions;

-    }

-

-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {

-        super.onToolCrafted(aStack, aPlayer);

-        try {

-            GT_Mod.instance.achievements.issueAchievement(aPlayer, "hammertime");

-        } catch (Exception e) {

-        }

-    }

-

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? Textures.ItemIcons.JACKHAMMER : null;

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been jackhammered into pieces by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Knife.java b/src/main/java/gregtech/common/tools/GT_Tool_Knife.java
deleted file mode 100644
index 5b46e82b50..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Knife.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_Knife

-        extends GT_Tool_Sword {

-    public int getToolDamagePerBlockBreak() {

-        return 100;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 100;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public float getBaseDamage() {

-        return 2.0F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 0.5F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? Textures.ItemIcons.KNIFE : null;

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText("<" + EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + "> " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " what are you doing?, " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + "?!? STAHP!!!");

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Mortar.java b/src/main/java/gregtech/common/tools/GT_Tool_Mortar.java
deleted file mode 100644
index c569e4b551..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Mortar.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.Dyes;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.block.Block;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_Mortar

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 400;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 2.0F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 1.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return null;

-    }

-

-    public String getEntityHitSound() {

-        return null;

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return null;

-    }

-

-    public boolean canBlock() {

-        return false;

-    }

-

-    public boolean isCrowbar() {

-        return false;

-    }

-

-    public boolean isMiningTool() {

-        return false;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        return false;

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? Textures.ItemIcons.MORTAR : null;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Dyes._NULL.mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was grounded by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java b/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java
deleted file mode 100644
index 59fd09aa73..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.GT_Mod;

-import gregtech.api.GregTech_API;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.stats.AchievementList;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_Pickaxe

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return GT_Mod.gregtechproxy.mHardRock ? 25 : 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 100;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 1.5F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 1.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return null;

-    }

-

-    public String getEntityHitSound() {

-        return null;

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return null;

-    }

-

-    public boolean canBlock() {

-        return false;

-    }

-

-    public boolean isCrowbar() {

-        return false;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && (tTool.equals("pickaxe"))) || (aBlock.getMaterial() == Material.rock) || (aBlock.getMaterial() == Material.iron) || (aBlock.getMaterial() == Material.anvil) || (aBlock.getMaterial() == Material.glass);

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadPickaxe.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-    }

-

-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {

-        super.onToolCrafted(aStack, aPlayer);

-        aPlayer.triggerAchievement(AchievementList.buildPickaxe);

-        aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe);

-        try {

-            GT_Mod.instance.achievements.issueAchievement(aPlayer, "flintpick");

-        } catch (Exception e) {

-        }

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got mined by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java b/src/main/java/gregtech/common/tools/GT_Tool_Plow.java
deleted file mode 100644
index a7666d34c8..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.Entity;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.monster.EntitySnowman;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.entity.player.EntityPlayerMP;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-import net.minecraftforge.event.world.BlockEvent;

-

-import java.util.List;

-

-public class GT_Tool_Plow

-        extends GT_Tool {

-    private ThreadLocal<Object> sIsHarvestingRightNow = new ThreadLocal();

-

-    public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) {

-        return (aEntity instanceof EntitySnowman) ? aOriginalDamage * 4.0F : aOriginalDamage;

-    }

-

-    public float getBaseDamage() {

-        return 1.0F;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && (tTool.equals("plow"))) || (aBlock.getMaterial() == Material.snow) || (aBlock.getMaterial() == Material.craftedSnow);

-    }

-

-    public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

-        int rConversions = 0;

-        if ((this.sIsHarvestingRightNow.get() == null) && ((aPlayer instanceof EntityPlayerMP))) {

-            this.sIsHarvestingRightNow.set(this);

-            for (int i = -1; i < 2; i++) {

-                for (int j = -1; j < 2; j++) {

-                    for (int k = -1; k < 2; k++) {

-                        if (((i != 0) || (j != 0) || (k != 0)) && (aStack.getItem().getDigSpeed(aStack, aPlayer.worldObj.getBlock(aX + i, aY + j, aZ + k), aPlayer.worldObj.getBlockMetadata(aX + i, aY + j, aZ + k)) > 0.0F) && (((EntityPlayerMP) aPlayer).theItemInWorldManager.tryHarvestBlock(aX + i, aY + j, aZ + k))) {

-                            rConversions++;

-                        }

-                    }

-                }

-            }

-            this.sIsHarvestingRightNow.set(null);

-        }

-        return rConversions;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadPlow.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " plew through the yard of " + EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java b/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java
deleted file mode 100644
index ba615a39a1..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.interfaces.IItemBehaviour;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import gregtech.api.util.GT_Utility;

-import gregtech.common.items.behaviors.Behaviour_Plunger_Fluid;

-import gregtech.common.items.behaviors.Behaviour_Plunger_Item;

-import net.minecraft.block.Block;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_Plunger

-        extends GT_Tool {

-    public float getBaseDamage() {

-        return 1.25F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 0.25F;

-    }

-

-    public String getCraftingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));

-    }

-

-    public String getEntityHitSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return (tTool != null) && (tTool.equals("plunger"));

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? Textures.ItemIcons.PLUNGER : null;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-        aItem.addItemBehavior(aID, new Behaviour_Plunger_Item(getToolDamagePerDropConversion()));

-        aItem.addItemBehavior(aID, new Behaviour_Plunger_Fluid(getToolDamagePerDropConversion()));

-        try {

-            Object tObject = GT_Utility.callConstructor("gregtech.common.items.behaviors.Behaviour_Plunger_Essentia", 0, null, false, new Object[]{Integer.valueOf(getToolDamagePerDropConversion())});

-            if ((tObject instanceof IItemBehaviour)) {

-                aItem.addItemBehavior(aID, (IItemBehaviour) tObject);

-            }

-        } catch (Throwable e) {

-        }

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got stuck trying to escape through a Pipe while fighting " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_RollingPin.java b/src/main/java/gregtech/common/tools/GT_Tool_RollingPin.java
deleted file mode 100644
index 910b58c934..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_RollingPin.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.enums.Dyes;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.block.Block;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_RollingPin

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 100;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public float getBaseDamage() {

-        return 2.0F;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        return false;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Dyes._NULL.mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? Textures.ItemIcons.ROLLING_PIN : null;

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got flattened by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Saw.java b/src/main/java/gregtech/common/tools/GT_Tool_Saw.java
deleted file mode 100644
index 084873eb9b..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Saw.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.init.Blocks;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-import net.minecraftforge.common.IShearable;

-import net.minecraftforge.event.world.BlockEvent;

-

-import java.util.ArrayList;

-import java.util.List;

-

-public class GT_Tool_Saw

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 200;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 1.75F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 1.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return null;

-    }

-

-    public String getEntityHitSound() {

-        return null;

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return null;

-    }

-

-    public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

-        if ((aBlock.getMaterial() == Material.leaves) && ((aBlock instanceof IShearable))) {

-            aPlayer.worldObj.setBlock(aX, aY, aZ, aBlock, aMetaData, 0);

-            if (((IShearable) aBlock).isShearable(aStack, aPlayer.worldObj, aX, aY, aZ)) {

-                ArrayList<ItemStack> tDrops = ((IShearable) aBlock).onSheared(aStack, aPlayer.worldObj, aX, aY, aZ, aFortune);

-                aDrops.clear();

-                aDrops.addAll(tDrops);

-                aEvent.dropChance = 1.0F;

-            }

-            aPlayer.worldObj.setBlock(aX, aY, aZ, Blocks.air, 0, 0);

-        } else if (((aBlock.getMaterial() == Material.ice) || (aBlock.getMaterial() == Material.packedIce)) && (aDrops.isEmpty())) {

-            aDrops.add(new ItemStack(aBlock, 1, aMetaData));

-            aPlayer.worldObj.setBlockToAir(aX, aY, aZ);

-            aEvent.dropChance = 1.0F;

-            return 1;

-        }

-        return 0;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && ((tTool.equals("axe")) || (tTool.equals("saw")))) || (aBlock.getMaterial() == Material.leaves) || (aBlock.getMaterial() == Material.vine) || (aBlock.getMaterial() == Material.wood) || (aBlock.getMaterial() == Material.cactus) || (aBlock.getMaterial() == Material.ice) || (aBlock.getMaterial() == Material.packedIce);

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadSaw.mTextureIndex] : Textures.ItemIcons.HANDLE_SAW;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was getting cut down by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
deleted file mode 100644
index 422ca7af80..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.interfaces.IItemBehaviour;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import gregtech.api.util.GT_Utility;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_Scoop

-        extends GT_Tool {

-    public static Material sBeeHiveMaterial;

-

-    public int getToolDamagePerBlockBreak() {

-        return 200;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 800;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 1.0F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 1.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return null;

-    }

-

-    public String getEntityHitSound() {

-        return null;

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return null;

-    }

-

-    public boolean canBlock() {

-        return false;

-    }

-

-    public boolean isCrowbar() {

-        return false;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && (tTool.equals("scoop"))) || (aBlock.getMaterial() == sBeeHiveMaterial);

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? Textures.ItemIcons.SCOOP : null;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-        try {

-            Object tObject = GT_Utility.callConstructor("gregtech.common.items.behaviors.Behaviour_Scoop", 0, null, false, new Object[]{Integer.valueOf(200)});

-            if ((tObject instanceof IItemBehaviour)) {

-                aItem.addItemBehavior(aID, (IItemBehaviour) tObject);

-            }

-        } catch (Throwable e) {

-        }

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got scooped up by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java b/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java
deleted file mode 100644
index a49459fc95..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import gregtech.common.items.behaviors.Behaviour_Screwdriver;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.Entity;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.monster.EntityCaveSpider;

-import net.minecraft.entity.monster.EntitySpider;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-import java.util.Arrays;

-import java.util.List;

-

-public class GT_Tool_Screwdriver

-        extends GT_Tool {

-    public static final List<String> mEffectiveList = Arrays.asList(new String[]{EntityCaveSpider.class.getName(), EntitySpider.class.getName(), "EntityTFHedgeSpider", "EntityTFKingSpider", "EntityTFSwarmSpider", "EntityTFTowerBroodling"});

-

-    public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) {

-        String tName = aEntity.getClass().getName();

-        tName = tName.substring(tName.lastIndexOf(".") + 1);

-        return mEffectiveList.contains(tName) ? aOriginalDamage * 2.0F : aOriginalDamage;

-    }

-

-    public int getToolDamagePerBlockBreak() {

-        return 200;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 400;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 1.5F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 1.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(100));

-    }

-

-    public String getEntityHitSound() {

-        return null;

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return null;

-    }

-

-    public boolean canBlock() {

-        return true;

-    }

-

-    public boolean isCrowbar() {

-        return false;

-    }

-

-    public boolean isMiningTool() {

-        return false;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && (tTool.equals("screwdriver"))) || (aBlock.getMaterial() == Material.circuits);

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadScrewdriver.mTextureIndex] : Textures.ItemIcons.HANDLE_SCREWDRIVER;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-        aItem.addItemBehavior(aID, new Behaviour_Screwdriver(1, 200));

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " is screwed! (by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + ")");

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver_LV.java
deleted file mode 100644
index eeb1adcbc8..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver_LV.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.item.ItemStack;

-

-public class GT_Tool_Screwdriver_LV

-        extends GT_Tool_Screwdriver {

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 200;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadScrewdriver.mTextureIndex] : Textures.ItemIcons.HANDLE_ELECTRIC_SCREWDRIVER;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java b/src/main/java/gregtech/common/tools/GT_Tool_Sense.java
deleted file mode 100644
index 44a70a6701..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import gregtech.common.items.behaviors.Behaviour_Sense;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.entity.player.EntityPlayerMP;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-import net.minecraftforge.event.world.BlockEvent;

-

-import java.util.List;

-

-public class GT_Tool_Sense

-        extends GT_Tool {

-    private ThreadLocal<Object> sIsHarvestingRightNow = new ThreadLocal();

-

-    public float getBaseDamage() {

-        return 3.0F;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && ((tTool.equals("sense")) || (tTool.equals("scythe")))) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.leaves);

-    }

-

-    public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {

-        int rConversions = 0;

-        if ((this.sIsHarvestingRightNow.get() == null) && ((aPlayer instanceof EntityPlayerMP))) {

-            this.sIsHarvestingRightNow.set(this);

-            for (int i = -1; i < 2; i++) {

-                for (int j = -1; j < 2; j++) {

-                    for (int k = -1; k < 2; k++) {

-                        if (((i != 0) || (j != 0) || (k != 0)) && (aStack.getItem().getDigSpeed(aStack, aPlayer.worldObj.getBlock(aX + i, aY + j, aZ + k), aPlayer.worldObj.getBlockMetadata(aX + i, aY + j, aZ + k)) > 0.0F) && (((EntityPlayerMP) aPlayer).theItemInWorldManager.tryHarvestBlock(aX + i, aY + j, aZ + k))) {

-                            rConversions++;

-                        }

-                    }

-                }

-            }

-            this.sIsHarvestingRightNow.set(null);

-        }

-        return rConversions;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadSense.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-        aItem.addItemBehavior(aID, new Behaviour_Sense(getToolDamagePerBlockBreak()));

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " has taken the Soul of " + EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Shovel.java b/src/main/java/gregtech/common/tools/GT_Tool_Shovel.java
deleted file mode 100644
index 677777d301..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Shovel.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_Shovel

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 100;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 1.5F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 1.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return null;

-    }

-

-    public String getEntityHitSound() {

-        return null;

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return null;

-    }

-

-    public boolean canBlock() {

-        return false;

-    }

-

-    public boolean isCrowbar() {

-        return false;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && (tTool.equals("shovel"))) || (aBlock.getMaterial() == Material.sand) || (aBlock.getMaterial() == Material.grass) || (aBlock.getMaterial() == Material.ground) || (aBlock.getMaterial() == Material.snow) || (aBlock.getMaterial() == Material.clay);

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadShovel.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got dug up by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java
deleted file mode 100644
index 1f1624ea68..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import gregtech.common.items.behaviors.Behaviour_SoftHammer;

-import net.minecraft.block.Block;

-import net.minecraft.entity.Entity;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_SoftHammer

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 800;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 3.0F;

-    }

-

-    public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) {

-        return aOriginalHurtResistance * 2;

-    }

-

-    public float getSpeedMultiplier() {

-        return 0.1F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 8.0F;

-    }

-

-    public String getCraftingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));

-    }

-

-    public String getEntityHitSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(101));

-    }

-

-    public boolean canBlock() {

-        return true;

-    }

-

-    public boolean isCrowbar() {

-        return false;

-    }

-

-    public boolean isMiningTool() {

-        return false;

-    }

-

-    public boolean isWeapon() {

-        return true;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return (tTool != null) && (tTool.equals("softhammer"));

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadHammer.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-        aItem.addItemBehavior(aID, new Behaviour_SoftHammer(100));

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was hammered to death by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java b/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java
deleted file mode 100644
index b104527873..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package gregtech.common.tools;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.items.behaviors.Behaviour_Screwdriver;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.monster.EntityCaveSpider;
-import net.minecraft.entity.monster.EntitySpider;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class GT_Tool_Soldering_Iron extends GT_Tool {
-    public static final List<String> mEffectiveList = Arrays.asList(new String[]{EntityCaveSpider.class.getName(), EntitySpider.class.getName(), "EntityTFHedgeSpider", "EntityTFKingSpider", "EntityTFSwarmSpider", "EntityTFTowerBroodling"});
-
-    public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) {
-        String tName = aEntity.getClass().getName();
-        tName = tName.substring(tName.lastIndexOf(".") + 1);
-        return mEffectiveList.contains(tName) ? aOriginalDamage * 2.0F : aOriginalDamage;
-    }
-
-    public int getToolDamagePerBlockBreak() {
-        return 1000;
-    }
-
-    public int getToolDamagePerDropConversion() {
-        return 500;
-    }
-
-    public int getToolDamagePerContainerCraft() {
-        return 1000;
-    }
-
-    public int getToolDamagePerEntityAttack() {
-        return 500;
-    }
-
-    public int getBaseQuality() {
-        return 0;
-    }
-
-    public float getBaseDamage() {
-        return 1.5F;
-    }
-
-    public float getSpeedMultiplier() {
-        return 1.0F;
-    }
-
-    public float getMaxDurabilityMultiplier() {
-        return 1.0F;
-    }
-
-    public String getCraftingSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(100));
-    }
-
-    public String getEntityHitSound() {
-        return null;
-    }
-
-    public String getBreakingSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));
-    }
-
-    public String getMiningSound() {
-        return null;
-    }
-
-    public boolean canBlock() {
-        return true;
-    }
-
-    public boolean isCrowbar() {
-        return false;
-    }
-
-    public boolean isMiningTool() {
-        return false;
-    }
-
-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        String tTool = aBlock.getHarvestTool(aMetaData);
-        return ((tTool != null) && (tTool.equals("soldering_iron"))) || (aBlock.getMaterial() == Material.circuits);
-    }
-
-    public ItemStack getBrokenItem(ItemStack aStack) {
-        return null;
-    }
-
-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[49] : Textures.ItemIcons.HANDLE_SOLDERING;
-    }
-
-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
-    }
-
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new Behaviour_Screwdriver(1, 200));
-    }
-
-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got soldert! (by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + ")");
-    }
-}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Sword.java b/src/main/java/gregtech/common/tools/GT_Tool_Sword.java
deleted file mode 100644
index 44e524e548..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Sword.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.stats.AchievementList;

-

-public class GT_Tool_Sword

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return 200;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 100;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 100;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 4.0F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 1.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return null;

-    }

-

-    public String getEntityHitSound() {

-        return null;

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return null;

-    }

-

-    public boolean canBlock() {

-        return true;

-    }

-

-    public boolean isCrowbar() {

-        return false;

-    }

-

-    public boolean isWeapon() {

-        return true;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && (tTool.equals("sword"))) || (aBlock.getMaterial() == Material.leaves) || (aBlock.getMaterial() == Material.gourd) || (aBlock.getMaterial() == Material.vine) || (aBlock.getMaterial() == Material.web) || (aBlock.getMaterial() == Material.cloth) || (aBlock.getMaterial() == Material.carpet) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.cactus) || (aBlock.getMaterial() == Material.cake) || (aBlock.getMaterial() == Material.tnt) || (aBlock.getMaterial() == Material.sponge);

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadSword.mTextureIndex] : Textures.ItemIcons.HANDLE_SWORD;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {

-        super.onToolCrafted(aStack, aPlayer);

-        aPlayer.triggerAchievement(AchievementList.buildSword);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Turbine.java b/src/main/java/gregtech/common/tools/GT_Tool_Turbine.java
deleted file mode 100644
index 8ac83ef486..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Turbine.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package gregtech.common.tools;
-
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import net.minecraft.block.Block;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
-
-public abstract class GT_Tool_Turbine extends GT_Tool {
-    public abstract float getBaseDamage();
-
-    @Override
-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return false;
-    }
-
-    @Override
-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? getTurbineIcon() : null;
-    }
-
-    @Override
-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : null;
-    }
-
-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
-        return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " put " + EnumChatFormatting.RED +
-                aEntity.getCommandSenderName() + "s" + EnumChatFormatting.WHITE + " head into a turbine");
-    }
-
-    public abstract IIconContainer getTurbineIcon();
-
-    public abstract float getSpeedMultiplier();
-
-    public abstract float getMaxDurabilityMultiplier();
-
-    public ItemStack getBrokenItem(ItemStack aStack) {
-        return null;
-    }
-}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java b/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java
deleted file mode 100644
index fa5d9901a8..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package gregtech.common.tools;
-
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.IIconContainer;
-
-public class GT_Tool_Turbine_Huge extends GT_Tool_Turbine {
-    @Override
-    public float getSpeedMultiplier() {
-        return 4.0F;
-    }
-
-    @Override
-    public float getMaxDurabilityMultiplier() {
-        return 4.0F;
-    }
-
-    @Override
-    public float getBaseDamage() {
-        return 3.0F;
-    }
-
-    @Override
-    public IIconContainer getTurbineIcon() {
-        return Textures.ItemIcons.TURBINE_HUGE;
-    }
-}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java b/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java
deleted file mode 100644
index d8bff76ca8..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package gregtech.common.tools;
-
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.IIconContainer;
-
-public class GT_Tool_Turbine_Large extends GT_Tool_Turbine {
-    @Override
-    public float getSpeedMultiplier() {
-        return 3.0F;
-    }
-
-    @Override
-    public float getMaxDurabilityMultiplier() {
-        return 3.0F;
-    }
-
-    @Override
-    public float getBaseDamage() {
-        return 5.0F;
-    }
-
-    @Override
-    public IIconContainer getTurbineIcon() {
-        return Textures.ItemIcons.TURBINE_LARGE;
-    }
-}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java b/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java
deleted file mode 100644
index a4ff2368d9..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package gregtech.common.tools;
-
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.IIconContainer;
-
-public class GT_Tool_Turbine_Normal extends GT_Tool_Turbine {
-    @Override
-    public float getSpeedMultiplier() {
-        return 2.0F;
-    }
-
-    @Override
-    public float getMaxDurabilityMultiplier() {
-        return 2.0F;
-    }
-
-    @Override
-    public float getBaseDamage() {
-        return 2.5F;
-    }
-
-    @Override
-    public IIconContainer getTurbineIcon() {
-        return Textures.ItemIcons.TURBINE;
-    }
-}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java b/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java
deleted file mode 100644
index 58bd6b2d00..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package gregtech.common.tools;
-
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.IIconContainer;
-
-public class GT_Tool_Turbine_Small extends GT_Tool_Turbine {
-    @Override
-    public float getSpeedMultiplier() {
-        return 1.0F;
-    }
-
-    @Override
-    public float getMaxDurabilityMultiplier() {
-        return 1.0F;
-    }
-
-    @Override
-    public float getBaseDamage() {
-        return 0.0F;
-    }
-
-    @Override
-    public IIconContainer getTurbineIcon() {
-        return Textures.ItemIcons.TURBINE_SMALL;
-    }
-
-}
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java b/src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java
deleted file mode 100644
index 03fd6a97a1..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.GT_Mod;

-import gregtech.api.GregTech_API;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import gregtech.common.items.behaviors.Behaviour_Crowbar;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-import net.minecraft.stats.AchievementList;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_UniversalSpade

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 400;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 100;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 3.0F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 0.75F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return null;

-    }

-

-    public String getEntityHitSound() {

-        return null;

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return null;

-    }

-

-    public boolean canBlock() {

-        return true;

-    }

-

-    public boolean isCrowbar() {

-        return true;

-    }

-

-    public boolean isWeapon() {

-        return true;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && ((tTool.equals("shovel")) || (tTool.equals("axe")) || (tTool.equals("saw")) || (tTool.equals("sword")) || (tTool.equals("crowbar")))) || (aBlock.getMaterial() == Material.sand) || (aBlock.getMaterial() == Material.grass) || (aBlock.getMaterial() == Material.ground) || (aBlock.getMaterial() == Material.snow) || (aBlock.getMaterial() == Material.clay) || (aBlock.getMaterial() == Material.leaves) || (aBlock.getMaterial() == Material.vine) || (aBlock.getMaterial() == Material.wood) || (aBlock.getMaterial() == Material.cactus) || (aBlock.getMaterial() == Material.circuits) || (aBlock.getMaterial() == Material.gourd) || (aBlock.getMaterial() == Material.web) || (aBlock.getMaterial() == Material.cloth) || (aBlock.getMaterial() == Material.carpet) || (aBlock.getMaterial() == Material.plants) || (aBlock.getMaterial() == Material.cake) || (aBlock.getMaterial() == Material.tnt) || (aBlock.getMaterial() == Material.sponge);

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadUniversalSpade.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-        aItem.addItemBehavior(aID, new Behaviour_Crowbar(2, 2000));

-    }

-

-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {

-        super.onToolCrafted(aStack, aPlayer);

-        aPlayer.triggerAchievement(AchievementList.buildSword);

-        try {

-            GT_Mod.instance.achievements.issueAchievement(aPlayer, "unitool");

-        } catch (Exception e) {

-        }

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been digged by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_WireCutter.java b/src/main/java/gregtech/common/tools/GT_Tool_WireCutter.java
deleted file mode 100644
index 473abf7889..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_WireCutter.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.block.Block;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-public class GT_Tool_WireCutter

-        extends GT_Tool {

-    public int getToolDamagePerBlockBreak() {

-        return 100;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 400;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 1.25F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 1.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return null;

-    }

-

-    public String getEntityHitSound() {

-        return null;

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return null;

-    }

-

-    public boolean canBlock() {

-        return false;

-    }

-

-    public boolean isCrowbar() {

-        return false;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return (tTool != null) && (tTool.equals("cutter"));

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? Textures.ItemIcons.WIRE_CUTTER : null;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " has cut the Cable for the Life Support Machine of " + EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java b/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java
deleted file mode 100644
index 0a703f23cc..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.GregTech_API;

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import gregtech.common.items.behaviors.Behaviour_Wrench;

-import net.minecraft.block.Block;

-import net.minecraft.block.material.Material;

-import net.minecraft.entity.Entity;

-import net.minecraft.entity.EntityLivingBase;

-import net.minecraft.entity.monster.EntityIronGolem;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.init.Blocks;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.ChatComponentText;

-import net.minecraft.util.EnumChatFormatting;

-import net.minecraft.util.IChatComponent;

-

-import java.util.Arrays;

-import java.util.List;

-

-public class GT_Tool_Wrench

-        extends GT_Tool {

-    public static final List<String> mEffectiveList = Arrays.asList(new String[]{EntityIronGolem.class.getName(), "EntityTowerGuardian"});

-

-    public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) {

-        String tName = aEntity.getClass().getName();

-        tName = tName.substring(tName.lastIndexOf(".") + 1);

-        return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage;

-    }

-

-    public int getToolDamagePerBlockBreak() {

-        return 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 800;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 3.0F;

-    }

-

-    public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) {

-        return aOriginalHurtResistance * 2;

-    }

-

-    public float getSpeedMultiplier() {

-        return 1.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public String getCraftingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(100));

-    }

-

-    public String getEntityHitSound() {

-        return null;

-    }

-

-    public String getBreakingSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));

-    }

-

-    public String getMiningSound() {

-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(100));

-    }

-

-    public boolean canBlock() {

-        return false;

-    }

-

-    public boolean isCrowbar() {

-        return false;

-    }

-

-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {

-        String tTool = aBlock.getHarvestTool(aMetaData);

-        return ((tTool != null) && (tTool.equals("wrench"))) || (aBlock.getMaterial() == Material.piston) || (aBlock == Blocks.hopper) || (aBlock == Blocks.dispenser) || (aBlock == Blocks.dropper);

-    }

-

-    public ItemStack getBrokenItem(ItemStack aStack) {

-        return null;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? Textures.ItemIcons.WRENCH : null;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : null;

-    }

-

-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {

-        aItem.addItemBehavior(aID, new Behaviour_Wrench(100));

-    }

-

-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

-        return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " threw a Monkey Wrench into the Plans of " + EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE);

-    }

-}
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_HV.java b/src/main/java/gregtech/common/tools/GT_Tool_Wrench_HV.java
deleted file mode 100644
index 3d5bf97ca0..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_HV.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.item.ItemStack;

-

-public class GT_Tool_Wrench_HV

-        extends GT_Tool_Wrench_LV {

-    public int getToolDamagePerBlockBreak() {

-        return 800;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 1600;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 12800;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 3200;

-    }

-

-    public int getBaseQuality() {

-        return 1;

-    }

-

-    public float getBaseDamage() {

-        return 2.0F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 4.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 4.0F;

-    }

-

-    public boolean canBlock() {

-        return false;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadWrench.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_HV;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Wrench_LV.java
deleted file mode 100644
index f9b333f1f7..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_LV.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.entity.Entity;

-import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.item.ItemStack;

-

-public class GT_Tool_Wrench_LV

-        extends GT_Tool_Wrench {

-    public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) {

-        return aOriginalDamage;

-    }

-

-    public int getToolDamagePerBlockBreak() {

-        return 50;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 100;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 800;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 200;

-    }

-

-    public int getBaseQuality() {

-        return 0;

-    }

-

-    public float getBaseDamage() {

-        return 1.0F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 2.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 1.0F;

-    }

-

-    public boolean canBlock() {

-        return false;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadWrench.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_LV;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-}

diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_MV.java b/src/main/java/gregtech/common/tools/GT_Tool_Wrench_MV.java
deleted file mode 100644
index 45f87fa327..0000000000
--- a/src/main/java/gregtech/common/tools/GT_Tool_Wrench_MV.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package gregtech.common.tools;

-

-import gregtech.api.enums.Textures;

-import gregtech.api.interfaces.IIconContainer;

-import gregtech.api.items.GT_MetaGenerated_Tool;

-import net.minecraft.item.ItemStack;

-

-public class GT_Tool_Wrench_MV

-        extends GT_Tool_Wrench_LV {

-    public int getToolDamagePerBlockBreak() {

-        return 200;

-    }

-

-    public int getToolDamagePerDropConversion() {

-        return 400;

-    }

-

-    public int getToolDamagePerContainerCraft() {

-        return 3200;

-    }

-

-    public int getToolDamagePerEntityAttack() {

-        return 800;

-    }

-

-    public int getBaseQuality() {

-        return 1;

-    }

-

-    public float getBaseDamage() {

-        return 1.5F;

-    }

-

-    public float getSpeedMultiplier() {

-        return 3.0F;

-    }

-

-    public float getMaxDurabilityMultiplier() {

-        return 2.0F;

-    }

-

-    public boolean canBlock() {

-        return false;

-    }

-

-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadWrench.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_MV;

-    }

-

-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {

-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;

-    }

-}