Merge pull request #3 from Ethryan/master

GT Scanner

11 files changed, 3 insertions, 814 deletions

diff --git a/src/main/java/com/detrav/items/tools/DetravToolCircuitConfigurator.java b/src/main/java/com/detrav/items/tools/DetravToolCircuitConfigurator.java
deleted file mode 100644
index de95f5bc41..0000000000
--- a/src/main/java/com/detrav/items/tools/DetravToolCircuitConfigurator.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.detrav.items.tools;
-
-
-
-import com.detrav.enums.Textures01;
-import com.detrav.items.behaviours.BehaviourDetravConfigurator;
-import gregtech.api.GregTech_API;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.tools.GT_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;
-
-import java.util.List;
-
-/**
- * Created by Detrav on 29.04.2017.
- */
-public class DetravToolCircuitConfigurator extends GT_Tool {
-    public float getBaseDamage() {
-        return 0.25F;
-    }
-
-    public float getSpeedMultiplier() {
-        return 0.3F;
-    }
-
-    public float getMaxDurabilityMultiplier() {
-        return 0.50F;
-    }
-
-    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) {
-        return false;
-    }
-
-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? Textures01.mTextures[8] : 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 BehaviourDetravConfigurator());
-    }
-
-    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/com/detrav/items/tools/DetravToolHVElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolHVElectricProPick.java
index 3196ac7f5d..071416763c 100644
--- a/src/main/java/com/detrav/items/tools/DetravToolHVElectricProPick.java
+++ b/src/main/java/com/detrav/items/tools/DetravToolHVElectricProPick.java
@@ -17,6 +17,6 @@ public class DetravToolHVElectricProPick extends DetravToolMVElectricProPick {
     }
 
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return Textures01.mTextures[3];
+        return Textures01.mTextures[2];
     }
 }
diff --git a/src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java
index 9cf53e299a..7be34f23d6 100644
--- a/src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java
+++ b/src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java
@@ -159,7 +159,7 @@ public class DetravToolLVElectricProPick implements IToolStats {
     }
 
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return Textures01.mTextures[1];
+        return Textures01.mTextures[0];
     }
 
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
diff --git a/src/main/java/com/detrav/items/tools/DetravToolMVElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolMVElectricProPick.java
index 81bfed4f17..05d719c2d3 100644
--- a/src/main/java/com/detrav/items/tools/DetravToolMVElectricProPick.java
+++ b/src/main/java/com/detrav/items/tools/DetravToolMVElectricProPick.java
@@ -16,6 +16,6 @@ public class DetravToolMVElectricProPick extends DetravToolLVElectricProPick {
     }
 
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return Textures01.mTextures[2];
+        return Textures01.mTextures[1];
     }
 }
diff --git a/src/main/java/com/detrav/items/tools/DetravToolPortableAnvil.java b/src/main/java/com/detrav/items/tools/DetravToolPortableAnvil.java
deleted file mode 100644
index f181844e71..0000000000
--- a/src/main/java/com/detrav/items/tools/DetravToolPortableAnvil.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.detrav.items.tools;
-
-import com.detrav.enums.DetravSimpleItems;
-import com.detrav.enums.Textures01;
-import com.detrav.items.behaviours.BehaviourDetravToolPortableAnvil;
-import com.detrav.items.behaviours.BehaviourDetravToolProPick;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.damagesources.GT_DamageSources;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-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.ChatComponentText;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
-import net.minecraft.world.World;
-import net.minecraftforge.event.world.BlockEvent;
-
-import java.util.List;
-
-/**
- * Created by Detrav on 30.10.2016.
- */
-public class DetravToolPortableAnvil implements IToolStats {
-    public int getToolDamagePerBlockBreak() {
-        return 0;
-    }
-
-    public int getToolDamagePerDropConversion() {
-        return 0;
-    }
-
-    public int getToolDamagePerContainerCraft() {
-        return 0;
-    }
-
-    public int getToolDamagePerEntityAttack() {
-        return 0;
-    }
-
-    public int getBaseQuality() {
-        return 0;
-    }
-
-    public float getBaseDamage() {
-        return 3.0F;
-    }
-
-    @Override
-    public int getHurtResistanceTime(int i, Entity entity) {
-        return i;
-    }
-
-    public float getSpeedMultiplier() {
-        return 0F;
-    }
-
-    public float getMaxDurabilityMultiplier() {
-        return 0F;
-    }
-
-    @Override
-    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 String getCraftingSound() {
-        return null;
-    }
-
-    public String getEntityHitSound() {
-        return null;
-    }
-
-    public String getBreakingSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));
-    }
-
-    @Override
-    public Enchantment[] getEnchantments(ItemStack itemStack) {
-        return new Enchantment[0];
-    }
-
-    @Override
-    public int[] getEnchantmentLevels(ItemStack itemStack) {
-        return new int[0];
-    }
-
-    public String getMiningSound() {
-        return null;
-    }
-
-    public boolean canBlock() {
-        return false;
-    }
-
-    public boolean isCrowbar() {
-        return false;
-    }
-
-    @Override
-    public boolean isGrafter() {
-        return false;
-    }
-
-    @Override
-    public boolean isChainsaw() {
-        return false;
-    }
-
-    @Override
-    public boolean isWrench() {
-        return false;
-    }
-
-    @Override
-    public boolean isWeapon() {
-        return false;
-    }
-
-    @Override
-    public boolean isRangedWeapon() {
-        return false;
-    }
-
-    @Override
-    public boolean isMiningTool() {
-        return false;
-    }
-
-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-
-        return false;
-    }
-
-    @Override
-    public int convertBlockDrops(List<ItemStack> list, ItemStack itemStack, EntityPlayer entityPlayer, Block block, int i, int i1, int i2, byte b, int i3, boolean b1, BlockEvent.HarvestDropsEvent harvestDropsEvent) {
-        return 0;
-    }
-
-    public ItemStack getBrokenItem(ItemStack aStack) {
-        return null;
-    }
-
-    @Override
-    public float getNormalDamageAgainstEntity(float v, Entity entity, ItemStack itemStack, EntityPlayer entityPlayer) {
-        return v;
-    }
-
-    @Override
-    public float getMagicDamageAgainstEntity(float v, Entity entity, ItemStack itemStack, EntityPlayer entityPlayer) {
-        return v;
-    }
-
-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ?
-                Textures01.mTextures[6] : null;
-    }
-
-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-        return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
-    }
-
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new BehaviourDetravToolPortableAnvil());
-    }
-
-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
-
-        aPlayer.triggerAchievement(AchievementList.openInventory);
-        aPlayer.triggerAchievement(AchievementList.mineWood);
-        aPlayer.triggerAchievement(AchievementList.buildWorkBench);
-    }
-
-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got Anviled by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
-    }
-
-	public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) {
-		return aDefault;
-	}
-}
diff --git a/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java b/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java
deleted file mode 100644
index d915bbb1a0..0000000000
--- a/src/main/java/com/detrav/items/tools/DetravToolPortableCharger.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.detrav.items.tools;
-
-import com.detrav.enums.DetravSimpleItems;
-import com.detrav.enums.Textures01;
-import com.detrav.items.behaviours.BehaviourDetravPortableCharger;
-import com.detrav.items.behaviours.BehaviourDetravToolProPick;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.damagesources.GT_DamageSources;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-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.ChatComponentText;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
-import net.minecraft.world.World;
-import net.minecraftforge.event.world.BlockEvent;
-
-import java.util.List;
-
-/**
- * Created by wital_000 on 07.04.2016.
- */
-public class DetravToolPortableCharger implements IToolStats {
-    public int getToolDamagePerBlockBreak() {
-        return GT_Mod.gregtechproxy.mHardRock ? 50 : 100;
-    }
-
-    public int getToolDamagePerDropConversion() {
-        return 1000;
-    }
-
-    public int getToolDamagePerContainerCraft() {
-        return 1000;
-    }
-
-    public int getToolDamagePerEntityAttack() {
-        return 1000;
-    }
-
-    public int getBaseQuality() {
-        return 0;
-    }
-
-    public float getBaseDamage() {
-        return 2.5F;
-    }
-
-    @Override
-    public int getHurtResistanceTime(int i, Entity entity) {
-        return i;
-    }
-
-    public float getSpeedMultiplier() {
-        return 1F;
-    }
-
-    public float getMaxDurabilityMultiplier() {
-        return 1F;
-    }
-
-    @Override
-    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 String getCraftingSound() {
-        return null;
-    }
-
-    public String getEntityHitSound() {
-        return null;
-    }
-
-    public String getBreakingSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));
-    }
-
-    @Override
-    public Enchantment[] getEnchantments(ItemStack itemStack) {
-        return new Enchantment[0];
-    }
-
-    @Override
-    public int[] getEnchantmentLevels(ItemStack itemStack) {
-        return new int[0];
-    }
-
-    public String getMiningSound() {
-        return null;
-    }
-
-    public boolean canBlock() {
-        return false;
-    }
-
-    public boolean isCrowbar() {
-        return false;
-    }
-
-    @Override
-    public boolean isGrafter() {
-        return false;
-    }
-
-    @Override
-    public boolean isChainsaw() {
-        return false;
-    }
-
-    @Override
-    public boolean isWrench() {
-        return false;
-    }
-
-    @Override
-    public boolean isWeapon() {
-        return true;
-    }
-
-    @Override
-    public boolean isRangedWeapon() {
-        return false;
-    }
-
-    @Override
-    public boolean isMiningTool() {
-        return false;
-    }
-
-    public boolean isMinableBlock(Block aBlock, byte aMetaData) {
-        return false;
-    }
-
-    @Override
-    public int convertBlockDrops(List<ItemStack> list, ItemStack itemStack, EntityPlayer entityPlayer, Block block, int i, int i1, int i2, byte b, int i3, boolean b1, BlockEvent.HarvestDropsEvent harvestDropsEvent) {
-        return 0;
-    }
-
-    public ItemStack getBrokenItem(ItemStack aStack) {
-        return null;
-    }
-
-    @Override
-    public float getNormalDamageAgainstEntity(float v, Entity entity, ItemStack itemStack, EntityPlayer entityPlayer) {
-        return v;
-    }
-
-    @Override
-    public float getMagicDamageAgainstEntity(float v, Entity entity, ItemStack itemStack, EntityPlayer entityPlayer) {
-        return v;
-    }
-
-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ?
-                Textures01.mTextures[4]:
-                Textures01.mTextures[5];
-    }
-
-    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 BehaviourDetravPortableCharger());
-    }
-
-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
-
-        aPlayer.triggerAchievement(AchievementList.openInventory);
-        aPlayer.triggerAchievement(AchievementList.mineWood);
-        aPlayer.triggerAchievement(AchievementList.buildWorkBench);
-    }
-
-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " \"CHARGED!\" by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
-    }
-
-	public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) {
-		return aDefault;
-	}
-}
diff --git a/src/main/java/com/detrav/items/tools/DetravToolProPick.java b/src/main/java/com/detrav/items/tools/DetravToolProPick.java
deleted file mode 100644
index b1ceef0078..0000000000
--- a/src/main/java/com/detrav/items/tools/DetravToolProPick.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package com.detrav.items.tools;
-
-import com.detrav.enums.DetravSimpleItems;
-import com.detrav.enums.Textures01;
-import com.detrav.items.behaviours.BehaviourDetravToolProPick;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.damagesources.GT_DamageSources;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.interfaces.IToolStats;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-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.ChatComponentText;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
-import net.minecraft.world.World;
-import net.minecraftforge.event.world.BlockEvent;
-
-import java.util.List;
-
-/**
- * Created by wital_000 on 18.03.2016.
- */
-public class DetravToolProPick implements IToolStats {
-    public int getToolDamagePerBlockBreak() {
-        return GT_Mod.gregtechproxy.mHardRock ? 50 : 100;
-    }
-
-    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.0F;
-    }
-
-    @Override
-    public int getHurtResistanceTime(int i, Entity entity) {
-        return i;
-    }
-
-    public float getSpeedMultiplier() {
-        return 0.5F;
-    }
-
-    public float getMaxDurabilityMultiplier() {
-        return 0.5F;
-    }
-
-    @Override
-    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 String getCraftingSound() {
-        return null;
-    }
-
-    public String getEntityHitSound() {
-        return null;
-    }
-
-    public String getBreakingSound() {
-        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));
-    }
-
-    @Override
-    public Enchantment[] getEnchantments(ItemStack itemStack) {
-        return new Enchantment[0];
-    }
-
-    @Override
-    public int[] getEnchantmentLevels(ItemStack itemStack) {
-        return new int[0];
-    }
-
-    public String getMiningSound() {
-        return null;
-    }
-
-    public boolean canBlock() {
-        return false;
-    }
-
-    public boolean isCrowbar() {
-        return false;
-    }
-
-    @Override
-    public boolean isGrafter() {
-        return false;
-    }
-
-    @Override
-    public boolean isChainsaw() {
-        return false;
-    }
-
-    @Override
-    public boolean isWrench() {
-        return false;
-    }
-
-    @Override
-    public boolean isWeapon() {
-        return false;
-    }
-
-    @Override
-    public boolean isRangedWeapon() {
-        return false;
-    }
-
-    @Override
-    public boolean isMiningTool() {
-        return true;
-    }
-
-    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;
-    }
-
-    @Override
-    public int convertBlockDrops(List<ItemStack> list, ItemStack itemStack, EntityPlayer entityPlayer, Block block, int i, int i1, int i2, byte b, int i3, boolean b1, BlockEvent.HarvestDropsEvent harvestDropsEvent) {
-        return 0;
-    }
-
-    public ItemStack getBrokenItem(ItemStack aStack) {
-        return null;
-    }
-
-    @Override
-    public float getNormalDamageAgainstEntity(float v, Entity entity, ItemStack itemStack, EntityPlayer entityPlayer) {
-        return v;
-    }
-
-    @Override
-    public float getMagicDamageAgainstEntity(float v, Entity entity, ItemStack itemStack, EntityPlayer entityPlayer) {
-        return v;
-    }
-
-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ?
-                Textures01.mTextures[DetravSimpleItems.toolHeadProPick.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 BehaviourDetravToolProPick(getToolDamagePerBlockBreak()));
-    }
-
-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
-
-        aPlayer.triggerAchievement(AchievementList.openInventory);
-        aPlayer.triggerAchievement(AchievementList.mineWood);
-        aPlayer.triggerAchievement(AchievementList.buildWorkBench);
-    }
-
-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got ProPicked by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
-    }
-
-	public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) {
-		return aDefault;
-	}
-}
diff --git a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger.java b/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger.java
deleted file mode 100644
index 7cde3efad2..0000000000
--- a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.detrav.items.tools;
-
-import com.detrav.items.behaviours.BehaviourDetravToolSmartPlunger;
-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 gregtech.common.tools.GT_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;
-
-/**
- * Created by Detrav on 11.12.2016.
- */
-public class DetravToolSmartPlunger
-        extends GT_Tool {
-    public float getBaseDamage() {
-        return 1.25F;
-    }
-
-    public float getMaxDurabilityMultiplier() {
-        return 0.50F;
-    }
-
-    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 BehaviourDetravToolSmartPlunger(getToolDamagePerDropConversion(),1000));
-    }
-
-    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);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger16.java b/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger16.java
deleted file mode 100644
index 28b08cb226..0000000000
--- a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger16.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.detrav.items.tools;
-
-import com.detrav.items.behaviours.BehaviourDetravToolSmartPlunger;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-
-/**
- * Created by Detrav on 16.12.2016.
- */
-public class DetravToolSmartPlunger16 extends DetravToolSmartPlunger {
-    public float getMaxDurabilityMultiplier() {
-        return 1F;
-    }
-
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new BehaviourDetravToolSmartPlunger(getToolDamagePerDropConversion(),16000));
-    }
-}
diff --git a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger64.java b/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger64.java
deleted file mode 100644
index 0e13efa837..0000000000
--- a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger64.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.detrav.items.tools;
-
-import com.detrav.items.behaviours.BehaviourDetravToolSmartPlunger;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-
-/**
- * Created by Detrav on 16.12.2016.
- */
-public class DetravToolSmartPlunger64 extends DetravToolSmartPlunger {
-    public float getMaxDurabilityMultiplier() {
-        return 2F;
-    }
-
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new BehaviourDetravToolSmartPlunger(getToolDamagePerDropConversion(), 64000));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/items/tools/DetravToolSmartTreeTap.java b/src/main/java/com/detrav/items/tools/DetravToolSmartTreeTap.java
deleted file mode 100644
index 911dc87061..0000000000
--- a/src/main/java/com/detrav/items/tools/DetravToolSmartTreeTap.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.detrav.items.tools;
-
-import com.detrav.enums.Textures01;
-import com.detrav.items.behaviours.BehaviourDetravToolTreeTap;
-import gregtech.api.GregTech_API;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.tools.GT_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;
-
-/**
- * Created by Detrav on 01.04.2017.
- */
-public class DetravToolSmartTreeTap extends GT_Tool {
-    public float getBaseDamage() {
-        return 1.25F;
-    }
-
-    public float getMaxDurabilityMultiplier() {
-        return 0.5F;
-    }
-
-    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) {
-        return false;
-    }
-
-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? Textures01.mTextures[7] : 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 BehaviourDetravToolTreeTap());
-    }
-
-    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
-        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was sucked through a hole while fighting " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
-    }
-}
\ No newline at end of file