Only keep the Scanners

24 files changed, 20 insertions, 1687 deletions

diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedItem.java b/src/main/java/com/detrav/items/DetravMetaGeneratedItem.java
deleted file mode 100644
index 90c00fb8d7..0000000000
--- a/src/main/java/com/detrav/items/DetravMetaGeneratedItem.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package com.detrav.items;
-
-/**
- * Created by wital_000 on 19.03.2016.
- */
-import com.detrav.enums.DetravSimpleItems;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.Materials;
-//import gregtech.api.enums.OrePrefixes;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Item;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static gregtech.api.enums.GT_Values.M;
-
-/**
- * @author Gregorius Techneticies
- *         <p/>
- *         One Item for everything!
- *         <p/>
- *         This brilliant Item Class is used for automatically generating all possible variations of Material Items, like Dusts, Ingots, Gems, Plates and similar.
- *         It saves me a ton of work, when adding Items, because I always have to make a new Item SubType for each OreDict Prefix, when adding a new Material.
- *         <p/>
- *         As you can see, up to 32766 Items can be generated using this Class. And the last 766 Items can be custom defined, just to save space and MetaData.
- *         <p/>
- *         These Items can also have special RightClick abilities, electric Charge or even be set to become a Food alike Item.
- */
-public abstract class DetravMetaGeneratedItem extends GT_MetaGenerated_Item {
-
-    protected final DetravSimpleItems[] mGeneratedItemList;
-
-
-    public DetravMetaGeneratedItem(String aUnlocalized, DetravSimpleItems... aGeneratedItemList) {
-        super(aUnlocalized, (short) 32000, (short) 766);
-        mGeneratedItemList = Arrays.copyOf(aGeneratedItemList, 32);
-
-        for (int i = 0; i < 32000; i++) {
-            DetravSimpleItems tPrefix = mGeneratedItemList[i / 1000];
-            if (tPrefix == null) continue;
-            Materials tMaterial = GregTech_API.sGeneratedMaterials[i % 1000];
-            if (tMaterial == null) continue;
-            if (doesMaterialAllowGeneration(tPrefix, tMaterial)) {
-                ItemStack tStack = new ItemStack(this, 1, i);
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName(tStack) + ".name", getDefaultLocalization(tPrefix, tMaterial, i));
-                GT_LanguageManager.addStringLocalization(getUnlocalizedName(tStack) + ".tooltip", tMaterial.getToolTip(tPrefix.getOrePrefixes().mMaterialAmount / M));
-                //Не знаю можно ли регистрировать, т.к. уже должен быть зареганы паренты с моего класса
-                if (tPrefix.mIsUnificatable) {
-                    GT_OreDictUnificator.set(tPrefix.getOrePrefixes(), tMaterial, tStack);
-                } else {
-                    GT_OreDictUnificator.registerOre(tPrefix.get(tMaterial), tStack);
-                }/*
-                if ((tPrefix == OrePrefixes.stick || tPrefix == OrePrefixes.wireFine || tPrefix == OrePrefixes.ingot) && (tMaterial == Materials.Lead || tMaterial == Materials.Tin || tMaterial == Materials.SolderingAlloy)) {
-                    GregTech_API.sSolderingMetalList.add(tStack);
-                }*/
-            }
-        }
-    }
-
-	/* ---------- OVERRIDEABLE FUNCTIONS ---------- */
-
-    /**
-     * @return the Color Modulation the Material is going to be rendered with.
-     */
-    @Override
-    public short[] getRGBa(ItemStack aStack) {
-        Materials tMaterial = GregTech_API.sGeneratedMaterials[getDamage(aStack) % 1000];
-        return tMaterial == null ? Materials._NULL.mRGBa : tMaterial.mRGBa;
-    }
-
-    /**
-     * @param aPrefix   this can be null, you have to return false in that case
-     * @param aMaterial this can be null, you have to return false in that case
-     * @return if this Item should be generated and visible.
-     */
-    public boolean doesMaterialAllowGeneration(DetravSimpleItems aPrefix, Materials aMaterial) {
-        // You have to check for at least these Conditions in every Case! So add a super Call like the following for this before executing your Code:
-        // if (!super.doesMaterialAllowGeneration(aPrefix, aMaterial)) return false;
-        return aPrefix != null && aMaterial != null && aPrefix.getOrePrefixes().doGenerateItem(aMaterial);
-    }
-
-	/* ---------- OVERRIDEABLE FUNCTIONS ---------- */
-
-    /**
-     * @param aPrefix   the OreDict Prefix
-     * @param aMaterial the Material
-     * @param aMetaData a Index from [0 - 31999]
-     * @return the Localized Name when default LangFiles are used.
-     */
-    public String getDefaultLocalization(DetravSimpleItems aPrefix, Materials aMaterial, int aMetaData) {
-        return aPrefix.getDefaultLocalNameForItem(aMaterial);
-    }
-
-    /**
-     * @param aMetaData a Index from [0 - 31999]
-     * @param aMaterial the Material
-     * @return an Icon Container for the Item Display.
-     */
-    public IIconContainer getIconContainer(int aMetaData, Materials aMaterial) {
-        return mGeneratedItemList[aMetaData / 1000] != null && mGeneratedItemList[aMetaData / 1000].getOrePrefixes().mTextureIndex >= 0 ? aMaterial.mIconSet.mTextures[mGeneratedItemList[aMetaData / 1000].getOrePrefixes().mTextureIndex] : null;
-    }
-
-    /**
-     * @param aPrefix         always != null
-     * @param aMaterial       always != null
-     * @param aDoShowAllItems this is the Configuration Setting of the User, if he wants to see all the Stuff like Tiny Dusts or Crushed Ores as well.
-     * @return if this Item should be visible in NEI or Creative
-     */
-    public boolean doesShowInCreative(DetravSimpleItems aPrefix, Materials aMaterial, boolean aDoShowAllItems) {
-        return true;
-    }
-
-	/* ---------- INTERNAL OVERRIDES ---------- */
-
-    @Override
-    public ItemStack getContainerItem(ItemStack aStack) {
-        int aDamage = aStack.getItemDamage();
-        if (aDamage < 32000 && aDamage >= 0) {
-            Materials aMaterial = GregTech_API.sGeneratedMaterials[aDamage % 1000];
-            if (aMaterial != null && aMaterial != Materials.Empty && aMaterial != Materials._NULL) {
-                DetravSimpleItems aPrefix = mGeneratedItemList[aDamage / 1000];
-                if (aPrefix != null) return GT_Utility.copyAmount(1, aPrefix.mContainerItem);
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public final IIconContainer getIconContainer(int aMetaData) {
-        return GregTech_API.sGeneratedMaterials[aMetaData % 1000] == null ? null : getIconContainer(aMetaData, GregTech_API.sGeneratedMaterials[aMetaData % 1000]);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public final void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) {
-        for (int i = 0; i < 32000; i++)
-            if (doesMaterialAllowGeneration(mGeneratedItemList[i / 1000], GregTech_API.sGeneratedMaterials[i % 1000]) && doesShowInCreative(mGeneratedItemList[i / 1000], GregTech_API.sGeneratedMaterials[i % 1000], GregTech_API.sDoShowAllItemsInCreative)) {
-                ItemStack tStack = new ItemStack(this, 1, i);
-                isItemStackUsable(tStack);
-                aList.add(tStack);
-            }
-        super.getSubItems(var1, aCreativeTab, aList);
-    }
-
-    @Override
-    public final IIcon getIconFromDamage(int aMetaData) {
-        if (aMetaData < 0) return null;
-        if (aMetaData < 32000) {
-            Materials tMaterial = GregTech_API.sGeneratedMaterials[aMetaData % 1000];
-            if (tMaterial == null) return null;
-            IIconContainer tIcon = getIconContainer(aMetaData, tMaterial);
-            if (tIcon != null) return tIcon.getIcon();
-            return null;
-        }
-        return aMetaData - 32000 < mIconList.length ? mIconList[aMetaData - 32000][0] : null;
-    }
-
-    @Override
-    public int getItemStackLimit(ItemStack aStack) {
-        int tDamage = getDamage(aStack);
-        if (tDamage < 32000 && mGeneratedItemList[tDamage / 1000] != null)
-            return Math.min(super.getItemStackLimit(aStack), mGeneratedItemList[tDamage / 1000].mDefaultStackSize);
-        return super.getItemStackLimit(aStack);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedItem01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedItem01.java
deleted file mode 100644
index 8edeb87b30..0000000000
--- a/src/main/java/com/detrav/items/DetravMetaGeneratedItem01.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.detrav.items;
-
-//import gregtech.api.items.DetravMetaGeneratedItem;
-
-import com.detrav.DetravScannerMod;
-import com.detrav.enums.DetravItemList;
-import com.detrav.enums.DetravSimpleItems;
-import com.detrav.enums.Textures01;
-import gregtech.api.enums.Materials;
-import gregtech.api.interfaces.IIconContainer;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-
-import java.util.List;
-
-/**
- * Created by wital_000 on 19.03.2016.
- */
-public class DetravMetaGeneratedItem01 extends DetravMetaGeneratedItem {
-
-    public static DetravMetaGeneratedItem01 INSTANCE;
-    //private final String mToolTipPurify = GT_LanguageManager.addStringLocalization("metaitem.01.tooltip.purify", "Throw into Cauldron to get clean Dust");
-
-    public DetravMetaGeneratedItem01() {
-        super("detrav.metaitem.01", new DetravSimpleItems[]{DetravSimpleItems.toolHeadProPick});
-        INSTANCE = this;
-        this.setCreativeTab(DetravScannerMod.TAB_DETRAV);
-        int tLastID;
-        DetravItemList.Shape_Extruder_ProPick.set(addItem(tLastID = 0, "Extruder Shape (Prospector's Pick Head)", "Extruder Shape for making Prospector's Picks", new Object[0]));
-        DetravItemList.ConfiguredCircuit.set(addItem(tLastID = 1, "Configured Circuit", "", new Object[0]));
-        //DetravItemList.Anvil.set(addItem(tLastID = 1, "Detrav Anvil","",new Object[0]));
-        //addItemBehavior(tLastID,new BahaviourDetravAnvil());
-    }
-
-    @Override
-    public final IIconContainer getIconContainer(int aMetaData, Materials aMaterial) {
-        return mGeneratedItemList[aMetaData / 1000] != null && mGeneratedItemList[aMetaData / 1000].mTextureIndex >= 0 ? Textures01.mTextures[mGeneratedItemList[aMetaData / 1000].mTextureIndex] : null;
-    }
-
-    public boolean doesShowInCreative(DetravSimpleItems aPrefix, Materials aMaterial, boolean aDoShowAllItems) {
-        return aDoShowAllItems || !aPrefix.name().startsWith("toolHead");
-    }
-
-    public boolean isConfiguredCircuit(ItemStack aStack) {
-        return aStack.getUnlocalizedName().indexOf("gt.detrav.metaitem.01." + (mOffset + 1)) == 0;
-    }
-
-
-    public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
-        int tOffset = aList.size();
-        String name = aStack.getUnlocalizedName();
-        String num = name.substring("gt.detrav.metaitem.01.".length());
-        int meta = Integer.parseInt(num) - mOffset;
-        switch (meta) {
-            case 1: {
-                NBTTagCompound aNBT = aStack.getTagCompound();
-                if (aNBT != null) {
-                    NBTTagCompound detravPosition = aNBT.getCompoundTag("DetravPosition");
-                    if (detravPosition != null) {
-                        tOffset = addToList(tOffset, aList, detravPosition, "Finished", false);
-                        tOffset = addToList(tOffset, aList, detravPosition, "Percent", true);
-                        tOffset = addToList(tOffset, aList, detravPosition, "XCurrent", true);
-                        tOffset = addToList(tOffset, aList, detravPosition, "ZCurrent", true);
-                        tOffset = addToList(tOffset, aList, detravPosition, "X", "XFrom", "XTo");
-                        tOffset = addToList(tOffset, aList, detravPosition, "Z", "ZFrom", "ZTo");
-                        tOffset = addToList(tOffset, aList, detravPosition, "Y", "YFrom", "YTo");
-                    }
-                }
-            }
-            break;
-        }
-    }
-
-    public int addToList(int tOffset, List aList, NBTTagCompound tag, String name, boolean integer) {
-        if (!tag.hasKey(name))
-            return tOffset;
-        if (integer) {
-            int value = tag.getInteger(name);
-            aList.add(tOffset, EnumChatFormatting.WHITE + name + " = " + value);
-        } else {
-            if (tag.getBoolean(name)) {
-                aList.add(tOffset, EnumChatFormatting.WHITE + name + EnumChatFormatting.GRAY);
-            }
-        }
-        return tOffset + 1;
-    }
-
-
-    public int addToList(int tOffset, List aList, NBTTagCompound tag, String text, String from, String to) {
-        String i_from = "";
-        String i_to = "";
-        boolean noFrom = true;
-        boolean noTo = true;
-        if (tag.hasKey(from)) {
-            i_from = "" + tag.getInteger(from);
-            noFrom = false;
-        }
-
-        if (tag.hasKey(to)) {
-            i_to = "" + tag.getInteger(to);
-            noTo = false;
-        }
-
-        if (noFrom && noTo)
-            return tOffset;
-
-        if (!noFrom && !noTo)
-            aList.add(tOffset, EnumChatFormatting.WHITE + text + " from " + i_from + " to " + i_to + EnumChatFormatting.GRAY);
-        else if (noFrom)
-            aList.add(tOffset, EnumChatFormatting.WHITE + text + " to " + i_to + EnumChatFormatting.GRAY);
-        else
-            aList.add(tOffset, EnumChatFormatting.WHITE + text + " from " + i_from + EnumChatFormatting.GRAY);
-
-
-        return tOffset + 1;
-    }
-}
diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
index 2aff81beaf..7335f4d57a 100644
--- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
+++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
@@ -28,17 +28,9 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool {
     public DetravMetaGeneratedTool01() {
         super("detrav.metatool.01");
         INSTANCE = this;
-        //addTool(0, "Prospector's Pick", "", new DetravToolProPick(), new Object[]{DetravToolDictNames.craftingToolProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)});
-        //addTool(2, "Portable Anvil", "", new DetravToolPortableAnvil(), new Object[] {DetravToolDictNames.craftingToolPortableAnvil}, new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM,10));
-        addTool(4, "Smart plunger 1 bucket", "", new DetravToolSmartPlunger(),new Object[] {DetravToolDictNames.craftingToolSmartPlunger},new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
-        addTool(6, "Smart plunger 16 buckets", "", new DetravToolSmartPlunger16(),new Object[] {DetravToolDictNames.craftingToolSmartPlunger},new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
-        addTool(8, "Smart plunger 64 buckets", "", new DetravToolSmartPlunger64(),new Object[] {DetravToolDictNames.craftingToolSmartPlunger},new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
-        addTool(10, "Smart Tree Tap","Changes resin tap",new DetravToolSmartTreeTap(),new Object[] {DetravToolDictNames.craftingToolSmartTreeTap}, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 5L) );
         addTool(100, "Electric Prospector's Scanner (IV)", "", new DetravToolLVElectricProPick(), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L));
         addTool(102, "Electric Prospector's Scanner (LuV)", "", new DetravToolMVElectricProPick(), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L));
         addTool(104, "Electric Prospector's Scanner (ZPM)", "", new DetravToolHVElectricProPick(), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L));
-        addTool(106, "Portable Battery Charger", "", new DetravToolPortableCharger(), new Object[]{DetravToolDictNames.craftingToolPortableCharger, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L));
-        addTool(108, "Circuit Confugurator", "", new DetravToolCircuitConfigurator(), new Object[]{DetravToolDictNames.craftingToolCictuitConfigurator, new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO,10L) });
 
         setCreativeTab(DetravScannerMod.TAB_DETRAV);
     }
@@ -50,7 +42,8 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool {
         long tMaxDamage = getToolMaxDamage(aStack);
         Materials tMaterial = getPrimaryMaterial(aStack);
         IToolStats tStats = getToolStats(aStack);
-        int tOffset = aList.size(); //getElectricStats(aStack) != null ? 2 : 1;
+        int tOffset = aList.size(); 
+		//getElectricStats(aStack) != null ? 2 : 1;
         if (tStats != null) {
             String name = aStack.getUnlocalizedName();
             String num = name.substring("gt.detrav.metatool.01.".length());
@@ -285,36 +278,14 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool {
     public void getDetravSubItems(Item item, CreativeTabs detravCreativeTab, List list) {
 
         ItemStack dStack;
-
-        dStack = getToolWithStatsPlus(106, 1, Materials.Tin, Materials.StainlessSteel, new long[]{4 * 100000L, 32L, 1L, -3L}, 1);
-        setCharge(dStack,4 * 100000L);
-        list.add(dStack);
-        dStack = getToolWithStatsPlus(106, 1, Materials.Tin, Materials.StainlessSteel, new long[]{4 * 75000L, 32L, 1L, -3L}, 1);
-        setCharge(dStack,4 * 75000L);
-        list.add(dStack);
-        dStack = getToolWithStatsPlus(106, 1, Materials.Tin, Materials.StainlessSteel, new long[]{4 * 50000L, 32L, 1L, -3L}, 1);
-        setCharge(dStack,4 * 50000L);
-        list.add(dStack);
-        dStack = getToolWithStatsPlus(106, 1, Materials.AnnealedCopper, Materials.Titanium, new long[]{4 * 400000L, 128L, 2L, -3L}, 1);
-        setCharge(dStack,4 * 400000L);
-        list.add(dStack);
-        dStack = getToolWithStatsPlus(106, 1, Materials.AnnealedCopper, Materials.Titanium, new long[]{4 * 300000L, 128L, 2L, -3L}, 1);
-        setCharge(dStack,4 * 300000L);
-        list.add(dStack);
-        dStack = getToolWithStatsPlus(106, 1, Materials.AnnealedCopper, Materials.Titanium, new long[]{4 * 200000L, 128L, 2L, -3L}, 1);
-        setCharge(dStack,4 * 200000L);
-        list.add(dStack);
-        dStack = getToolWithStatsPlus(106, 1, Materials.Silver, Materials.TungstenSteel, new long[]{4 * 1600000L, 512L, 3L, -3L}, 1);
-        setCharge(dStack,4 * 1600000L);
-        list.add(dStack);
-        dStack = getToolWithStatsPlus(106, 1, Materials.Silver, Materials.TungstenSteel, new long[]{4 * 1200000L, 512L, 3L, -3L}, 1);
-        setCharge(dStack,4 * 1200000L);
+		//Electric Scanners TODO
+        dStack = getToolWithStats(100, 1, Materials.Chrome, Materials.TungstenSteel, new long[]{1600000L, 8192L, 3L, -1L});
+        setCharge(dStack,1600000L);
         list.add(dStack);
-        dStack = getToolWithStatsPlus(106, 1, Materials.Silver, Materials.TungstenSteel, new long[]{4 * 800000L, 512L, 3L, -3L}, 1);
-        setCharge(dStack,4 * 800000L);
+        dStack = getToolWithStats(102, 1, Materials.Iridium, Materials.TungstenSteel, new long[]{1600000L, 32768L, 3L, -1L});
+        setCharge(dStack,1600000L);
         list.add(dStack);
-
-        dStack = getToolWithStats(104, 1, Materials.Neutronium, Materials.TungstenSteel, new long[]{1600000L, 512L, 3L, -1L});
+        dStack = getToolWithStats(104, 1, Materials.Neutronium, Materials.TungstenSteel, new long[]{1600000L, 131072L, 3L, -1L});
         setCharge(dStack,1600000L);
         list.add(dStack);
 
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravConfigurator.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravConfigurator.java
deleted file mode 100644
index e55d3c8c31..0000000000
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravConfigurator.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.detrav.items.behaviours;
-
-import com.detrav.enums.DetravItemList;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.common.items.behaviors.Behaviour_None;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.IChunkProvider;
-
-/**
- * Created by Detrav on 29.04.2017.
- */
-public class BehaviourDetravConfigurator  extends Behaviour_None {
-    public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
-
-        InventoryPlayer inv = aPlayer.inventory;
-        if (inv != null) {
-            for (int i = 0; i < inv.mainInventory.length; i++) {
-                if (inv.mainInventory[i].getUnlocalizedName().startsWith("gt.integrated_circuit")
-                        && inv.mainInventory[i].stackSize == 1) {
-
-                    int circuit_config = inv.mainInventory[i].getItemDamage();
-                    if(circuit_config > 5)
-                        circuit_config = 5;
-                    //circuit_config *= 2;
-                    circuit_config++;
-                    inv.mainInventory[i] = DetravItemList.ConfiguredCircuit.get(1);
-                    ItemStack aCircuit = inv.mainInventory[i];
-
-                    //in here if circuit is empty set data to chunk
-
-
-                    NBTTagCompound aNBT = aCircuit.getTagCompound();
-                    if (aNBT == null) {
-                        aNBT = new NBTTagCompound();
-                        NBTTagCompound detravPosition = new NBTTagCompound();
-                        aNBT.setTag("DetravPosition", detravPosition);
-                        aCircuit.setTagCompound(aNBT);
-                    }
-
-                    NBTTagCompound detravPosition = aNBT.getCompoundTag("DetravPosition");
-                    if (detravPosition == null) {
-                        detravPosition = new NBTTagCompound();
-                        aNBT.setTag("DetravPosition", detravPosition);
-                    }
-
-
-                    int x_from = ((((int) aPlayer.posX) >> 4) - circuit_config + 1) * 16;
-                    int x_to = ((((int) aPlayer.posX) >> 4) + circuit_config) * 16;
-                    int x_current = x_from;
-                    int z_from = ((((int) aPlayer.posZ) >> 4) - circuit_config + 1) * 16;
-                    int z_to = ((((int) aPlayer.posZ) >> 4) + circuit_config) * 16;
-                    int z_current = z_from;
-
-
-                    int y_from = (int) aPlayer.posY + 1;
-                    int y_to = (int) aPlayer.posY - 10;
-
-                    detravPosition.setInteger("XFrom", x_from);
-                    detravPosition.setInteger("XTo", x_to);
-                    detravPosition.setInteger("XCurrent", x_current);
-                    detravPosition.setInteger("ZFrom", z_from);
-                    detravPosition.setInteger("ZTo", z_to);
-                    detravPosition.setInteger("ZCurrent", z_current);
-                    detravPosition.setInteger("YFrom", y_from);
-                    detravPosition.setInteger("YTo", y_to);
-                    return super.onItemRightClick(aItem, aStack, aWorld, aPlayer);
-                }
-            }
-
-        }
-        return super.onItemRightClick(aItem, aStack, aWorld, aPlayer);
-
-    }
-}
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravPortableCharger.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravPortableCharger.java
deleted file mode 100644
index 08aa16a79c..0000000000
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravPortableCharger.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.detrav.items.behaviours;
-
-import com.detrav.DetravScannerMod;
-import com.detrav.gui.containers.DetravPortableChargerContainer;
-import com.detrav.items.DetravMetaGeneratedTool01;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.common.items.behaviors.Behaviour_None;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-/**
- * Created by wital_000 on 07.04.2016.
- */
-public class BehaviourDetravPortableCharger extends Behaviour_None {
-
-    public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
-        DetravScannerMod.proxy.openPortableChargerGui(aPlayer);
-        return super.onItemRightClick(aItem, aStack, aWorld, aPlayer);
-        //aPlayer.openContainer
-    }
-
-    public void onUpdate(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand) {
-        if(!aIsInHand) return;
-        //if(aStack.getm)
-        if(aWorld.isRemote) return;
-        if(aPlayer instanceof EntityPlayer)
-        {
-            EntityPlayer player = (EntityPlayer)aPlayer;
-            if(player.openContainer !=null)
-            {
-                if(player.openContainer instanceof DetravPortableChargerContainer)
-                {
-                    DetravPortableChargerContainer container = (DetravPortableChargerContainer)player.openContainer;
-                    container.onUpdate(aItem,aStack,aWorld,aPlayer,1);
-                }
-                Long[] selfStats = DetravMetaGeneratedTool01.INSTANCE.getElectricStats(aStack);
-                if(selfStats == null) return;
-
-                long selfCharge = DetravMetaGeneratedTool01.INSTANCE.getRealCharge(aStack);
-                if(selfCharge <0) return;
-                //update info
-                //long max = DetravMetaGeneratedTool01.getToolMaxDamage(aStack);
-                //double p = ((double)selfCharge)/((double)selfStats[0]);
-                //DetravMetaGeneratedTool01.setToolDamage(aStack,(long) (max * p) + 200);
-            }
-        }
-    }
-
-}
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
index c500795e5d..f352767466 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
@@ -42,7 +42,6 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
 
         if (!aWorld.isRemote) {
             int data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack).intValue();
-            //Проверяем если нажат шифт
             if (aPlayer.isSneaking()) {
                 data++;
                 if (data > 3) data = 0;
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolPortableAnvil.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolPortableAnvil.java
deleted file mode 100644
index 2ede8057f5..0000000000
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolPortableAnvil.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.detrav.items.behaviours;
-
-import com.detrav.DetravScannerMod;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.common.items.behaviors.Behaviour_None;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-/**
- * Created by Detrav on 30.10.2016.
- */
-public class BehaviourDetravToolPortableAnvil extends Behaviour_None {
-
-    public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
-        DetravScannerMod.proxy.openPortableAnvilGui(aPlayer);
-        return super.onItemRightClick(aItem, aStack, aWorld, aPlayer);
-        //aPlayer.openContainer
-    }
-}
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolSmartPlunger.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolSmartPlunger.java
deleted file mode 100644
index 0e7331ad6b..0000000000
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolSmartPlunger.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.detrav.items.behaviours;
-
-import com.detrav.items.DetravMetaGeneratedTool01;
-import gregtech.api.GregTech_API;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.items.behaviors.Behaviour_None;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidHandler;
-
-/**
- * Created by Detrav on 11.12.2016.
- */
-public class BehaviourDetravToolSmartPlunger extends Behaviour_None {
-
-    protected final int mCosts;
-    protected final int mFluidSpace;
-
-    public BehaviourDetravToolSmartPlunger(int aCosts,int fluidSpace) {
-        mCosts = aCosts;
-        mFluidSpace = fluidSpace;
-    }
-
-    public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
-        if (aWorld.isRemote) {
-            return false;
-        }
-        FluidStack fs =  DetravMetaGeneratedTool01.INSTANCE.getFluidStackFromDetravData(aStack);
-        boolean containts = fs!=null && fs.amount >0;
-        if(containts) {
-            TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-            if ((aTileEntity instanceof IFluidHandler)) {
-                for (ForgeDirection tDirection : ForgeDirection.VALID_DIRECTIONS) {
-                    if (((IFluidHandler) aTileEntity).fill(tDirection, fs, false) > 0) {
-                        if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
-                            int amount = ((IFluidHandler) aTileEntity).fill(tDirection, fs, true);
-                            //fs = ((IFluidHandler) aTileEntity).drain(tDirection, 1000, true);
-                            fs.amount -= amount;
-                            GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(101)), 1.0F, -1.0F, aX, aY, aZ);
-                            if (fs.amount > 0)
-                                DetravMetaGeneratedTool01.INSTANCE.setFluidStackToDetravData(aStack, fs);
-                            else
-                                DetravMetaGeneratedTool01.INSTANCE.setFluidStackToDetravData(aStack, null);
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-        else {
-            TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-            if ((aTileEntity instanceof IFluidHandler)) {
-                for (ForgeDirection tDirection : ForgeDirection.VALID_DIRECTIONS) {
-                    if (((IFluidHandler) aTileEntity).drain(tDirection, mFluidSpace, false) != null) {
-                        if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
-                            fs = ((IFluidHandler) aTileEntity).drain(tDirection, mFluidSpace, true);
-                            GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(101)), 1.0F, -1.0F, aX, aY, aZ);
-                            DetravMetaGeneratedTool01.INSTANCE.setFluidStackToDetravData(aStack,fs);
-                            return true;
-                        }
-                    }
-                }
-            }
-            if (aTileEntity instanceof IGregTechTileEntity) {
-                IGregTechTileEntity tTileEntity = (IGregTechTileEntity) aTileEntity;
-                IMetaTileEntity mTileEntity = tTileEntity.getMetaTileEntity();
-                if (mTileEntity instanceof GT_MetaTileEntity_BasicTank) {
-                    GT_MetaTileEntity_BasicTank machine = (GT_MetaTileEntity_BasicTank) mTileEntity;
-                    if (machine.mFluid != null && machine.mFluid.amount > 0) {
-                        fs = machine.mFluid.copy();
-                        if (fs.amount > mFluidSpace) fs.amount = mFluidSpace;
-                        machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, mFluidSpace);
-                        DetravMetaGeneratedTool01.INSTANCE.setFluidStackToDetravData(aStack,fs);
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolTreeTap.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolTreeTap.java
deleted file mode 100644
index a49b5b28de..0000000000
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolTreeTap.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.detrav.items.behaviours;
-
-import com.detrav.items.DetravMetaGeneratedTool01;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.common.items.behaviors.Behaviour_None;
-import ic2.core.block.BlockRubWood;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-/**
- * Created by Detrav on 01.04.2017.
- */
-public class BehaviourDetravToolTreeTap extends Behaviour_None {
-
-    public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
-        if (aWorld.isRemote) {
-            return false;
-        }
-        Block b = aWorld.getBlock(aX,aY,aZ);
-        if(b instanceof BlockRubWood)
-        {
-            int startPos = aY;
-            for(int i = aY; i> aY-10 && i> 1 && aWorld.getBlock(aX,i,aZ) instanceof  BlockRubWood; i--)
-                startPos = i;
-
-            for(int i = startPos; i< aY + 10; i++)
-            {
-                if(!(aWorld.getBlock(aX,i,aZ) instanceof  BlockRubWood))
-                    break;
-                if(i == aY)
-                {
-                    aWorld.setBlockMetadataWithNotify(aX,i,aZ,aSide,2);
-                }
-                else
-                {
-                    aWorld.setBlockMetadataWithNotify(aX,i,aZ,1,2);
-                }
-            }
-
-            ((DetravMetaGeneratedTool01)aItem).doDamage(aStack, 100);
-            return  true;
-        }
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/items/processing/ProcessingDetravPortableCharger.java b/src/main/java/com/detrav/items/processing/ProcessingDetravPortableCharger.java
deleted file mode 100644
index 079a0a4a06..0000000000
--- a/src/main/java/com/detrav/items/processing/ProcessingDetravPortableCharger.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.detrav.items.processing;
-
-import com.detrav.enums.DetravSimpleItems;
-import com.detrav.items.DetravMetaGeneratedTool01;
-import gregtech.GT_Mod;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.blocks.GT_Block_Machines;
-import gregtech.common.blocks.GT_Item_Machines;
-import net.minecraft.item.ItemStack;
-
-/**
- * Created by wital_000 on 07.04.2016.
- */
-public class ProcessingDetravPortableCharger  implements gregtech.api.interfaces.IOreRecipeRegistrator {
-
-    public ProcessingDetravPortableCharger() {
-        OrePrefixes.cableGt01.add(this);
-    }
-
-    @Override
-    public void registerOre(OrePrefixes orePrefixes, Materials materials, String s, String s1, ItemStack itemStack) {
-
-        boolean bEC = !GT_Mod.gregtechproxy.mHardcoreCables;
-        long loss = 0;
-        long voltage = 0;
-        if (materials == Materials.Cobalt) {
-            loss = bEC ? 2L : 2L;
-            voltage = gregtech.api.enums.GT_Values.V[1];
-        } else if (materials == Materials.Lead) {
-            loss = bEC ? 2L : 2L;
-            voltage = gregtech.api.enums.GT_Values.V[1];
-        } else if (materials == Materials.Tin) {
-            loss = bEC ? 1L : 1L;
-            voltage = gregtech.api.enums.GT_Values.V[1];
-        } else if (materials == Materials.Zinc) {
-            loss = bEC ? 1L : 1L;
-            voltage = gregtech.api.enums.GT_Values.V[1];
-        } else if (materials == Materials.SolderingAlloy) {
-            loss = bEC ? 1L : 1L;
-            voltage = gregtech.api.enums.GT_Values.V[1];
-        } else if (materials == Materials.Iron) {
-            loss = bEC ? 3L : 4L;
-            voltage = gregtech.api.enums.GT_Values.V[2];
-        } else if (materials == Materials.Nickel) {
-            loss = bEC ? 3L : 5L;
-            voltage = gregtech.api.enums.GT_Values.V[2];
-        } else if (materials == Materials.Cupronickel) {
-            loss = bEC ? 3L : 4L;
-            voltage = gregtech.api.enums.GT_Values.V[2];
-        } else if (materials == Materials.Copper) {
-            loss = bEC ? 2L : 3L;
-            voltage = gregtech.api.enums.GT_Values.V[2];
-        } else if (materials == Materials.AnnealedCopper) {
-            loss = bEC ? 1L : 2L;
-            voltage = gregtech.api.enums.GT_Values.V[2];
-        } else if (materials == Materials.Kanthal) {
-            loss = bEC ? 3L : 8L;
-            voltage = gregtech.api.enums.GT_Values.V[3];
-        } else if (materials == Materials.Gold) {
-            loss = bEC ? 2L : 6L;
-            voltage = gregtech.api.enums.GT_Values.V[3];
-        } else if (materials == Materials.Electrum) {
-            loss = bEC ? 2L : 5L;
-            voltage = gregtech.api.enums.GT_Values.V[3];
-        } else if (materials == Materials.Silver) {
-            loss = bEC ? 1L : 4L;
-            voltage = gregtech.api.enums.GT_Values.V[3];
-        } else if (materials == Materials.BlueAlloy) {
-            loss = bEC ? 1L : 4L;
-            voltage = gregtech.api.enums.GT_Values.V[3];
-        } else if (materials == Materials.Nichrome) {
-            loss = bEC ? 4L : 32L;
-            voltage = gregtech.api.enums.GT_Values.V[4];
-        } else if (materials == Materials.Steel) {
-            loss = bEC ? 2L : 16L;
-            voltage = gregtech.api.enums.GT_Values.V[4];
-        } else if (materials == Materials.TungstenSteel) {
-            loss = bEC ? 2L : 14L;
-            voltage = gregtech.api.enums.GT_Values.V[4];
-        } else if (materials == Materials.Tungsten) {
-            loss = bEC ? 2L : 12L;
-            voltage = gregtech.api.enums.GT_Values.V[4];
-        } else if (materials == Materials.Aluminium) {
-            loss = bEC ? 1L : 8L;
-            voltage = gregtech.api.enums.GT_Values.V[4];
-        } else if (materials == Materials.Graphene) {
-            loss = bEC ? 1L : 16L;
-            voltage = gregtech.api.enums.GT_Values.V[5];
-        } else if (materials == Materials.Osmium) {
-            loss = bEC ? 2L : 32L;
-            voltage = gregtech.api.enums.GT_Values.V[5];
-        } else if (materials == Materials.Platinum) {
-            loss = bEC ? 1L : 16L;
-            voltage = gregtech.api.enums.GT_Values.V[5];
-        } else if (materials == Materials.Naquadah) {
-            loss = bEC ? 1L : 64L;
-            voltage = gregtech.api.enums.GT_Values.V[6];
-        } else if (materials == Materials.NiobiumTitanium) {
-            loss = bEC ? 2L : 128L;
-            voltage = gregtech.api.enums.GT_Values.V[6];
-        } else if (materials == Materials.VanadiumGallium) {
-            loss = bEC ? 2L : 128L;
-            voltage = gregtech.api.enums.GT_Values.V[6];
-        } else if (materials == Materials.YttriumBariumCuprate) {
-            loss = bEC ? 4L : 256L;
-            voltage = gregtech.api.enums.GT_Values.V[6];
-        } else if (materials == Materials.RedAlloy) {
-            loss = 0L;
-            voltage = gregtech.api.enums.GT_Values.V[0];
-        } else if (materials == Materials.Superconductor) {
-            loss = 1L;
-            voltage = gregtech.api.enums.GT_Values.V[9];
-        } else {
-            loss = -1;
-            voltage = -1;
-        }
-        if (loss < 0) return;
-        ItemStack dStack = null;
-        switch ((int) voltage) {
-            case 32:
-                dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.StainlessSteel, new long[]{4 * 100000L, 32L, 1L, -3L}, loss);
-                GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('B'), ItemList.Battery_RE_LV_Lithium.get(1L, new Object[0]), Character.valueOf('W'), itemStack});
-                dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.StainlessSteel, new long[]{4 * 75000L, 32L, 1L, -3L}, loss);
-                GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('B'), ItemList.Battery_RE_LV_Cadmium.get(1L, new Object[0]), Character.valueOf('W'), itemStack});
-                dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.StainlessSteel, new long[]{4 * 50000L, 32L, 1L, -3L}, loss);
-                GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('B'), ItemList.Battery_RE_LV_Sodium.get(1L, new Object[0]), Character.valueOf('W'), itemStack});
-                break;
-            case 128:
-                dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.Titanium, new long[]{4 * 400000L, 128L, 2L, -3L}, loss);
-                GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('B'), ItemList.Battery_RE_MV_Lithium.get(1L, new Object[0]), Character.valueOf('W'), itemStack});
-                dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.Titanium, new long[]{4 * 300000L, 128L, 2L, -3L}, loss);
-                GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('B'), ItemList.Battery_RE_MV_Cadmium.get(1L, new Object[0]), Character.valueOf('W'), itemStack});
-                dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.Titanium, new long[]{4 * 200000L, 128L, 2L, -3L}, loss);
-                GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('B'), ItemList.Battery_RE_MV_Sodium.get(1L, new Object[0]), Character.valueOf('W'), itemStack});
-                break;
-            case 512:
-                dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.TungstenSteel, new long[]{4 * 1600000L, 512L, 3L, -3L}, loss);
-                GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('B'), ItemList.Battery_RE_HV_Lithium.get(1L, new Object[0]), Character.valueOf('W'), itemStack});
-                dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.TungstenSteel, new long[]{4 * 1200000L, 512L, 3L, -3L}, loss);
-                GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('B'), ItemList.Battery_RE_HV_Cadmium.get(1L, new Object[0]), Character.valueOf('W'), itemStack});
-                dStack = DetravMetaGeneratedTool01.INSTANCE.getToolWithStatsPlus(106, 1, materials, Materials.TungstenSteel, new long[]{4 * 800000L, 512L, 3L, -3L}, loss);
-                GT_ModHandler.addCraftingRecipe(dStack, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"WBW", "BCB", "WBW", Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('B'), ItemList.Battery_RE_HV_Sodium.get(1L, new Object[0]), Character.valueOf('W'), itemStack});
-                break;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/items/processing/ProcessingDetravShaping.java b/src/main/java/com/detrav/items/processing/ProcessingDetravShaping.java
deleted file mode 100644
index 6e4c676bf3..0000000000
--- a/src/main/java/com/detrav/items/processing/ProcessingDetravShaping.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.detrav.items.processing;
-
-import com.detrav.enums.DetravItemList;
-import com.detrav.enums.DetravSimpleItems;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.SubTag;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import net.minecraft.item.ItemStack;
-
-/**
- * Created by wital_000 on 20.03.2016.
- */
-public class ProcessingDetravShaping implements gregtech.api.interfaces.IOreRecipeRegistrator {
-
-    public ProcessingDetravShaping() {
-        OrePrefixes.ingot.add(this);
-    }
-
-    @Override
-    public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
-        if ((GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) && (!aMaterial.contains(SubTag.NO_SMELTING))) {
-            int tAmount = (int) (aPrefix.mMaterialAmount / 3628800L);
-            if ((tAmount > 0) && (tAmount <= 64) && (aPrefix.mMaterialAmount % 3628800L == 0L)) {
-                int tVoltageMultiplier = aMaterial.mBlastFurnaceTemp >= 2800 ? 64 : 32;
-
-                if (aMaterial.contains(SubTag.NO_SMASHING)) {
-                    tVoltageMultiplier /= 4;
-                } else if (aPrefix.name().startsWith(OrePrefixes.dust.name())) {
-                    return;
-                }
-                GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(2L, new Object[]{aStack}), DetravItemList.Shape_Extruder_ProPick.get(0L, new Object[0]), GT_OreDictUnificator.get(DetravSimpleItems.toolHeadProPick.get(aMaterial), tAmount), (int) Math.max(aMaterial.getMass() * 2L * tAmount, tAmount), 15 * tVoltageMultiplier);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/items/processing/ProcessingDetravSmartPlunger.java b/src/main/java/com/detrav/items/processing/ProcessingDetravSmartPlunger.java
deleted file mode 100644
index c866f95ea0..0000000000
--- a/src/main/java/com/detrav/items/processing/ProcessingDetravSmartPlunger.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.detrav.items.processing;
-
-import com.detrav.items.DetravMetaGeneratedTool01;
-import gregtech.api.enums.*;
-import gregtech.api.interfaces.IOreRecipeRegistrator;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import ic2.core.Ic2Items;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-
-/**
- * Created by Detrav on 11.12.2016.
- */
-public class ProcessingDetravSmartPlunger implements IOreRecipeRegistrator {
-        public ProcessingDetravSmartPlunger() {
-        OrePrefixes.toolHeadHammer.add(this);
-    }
-
-    public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
-        if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) {
-            if (aMaterial != Materials.Rubber) {
-                GT_ModHandler.addCraftingRecipe(
-                        DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(4, 1, aMaterial, aMaterial, null),
-                        GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
-                        new Object[]{"xRR", " CR", "S f",
-                                Character.valueOf('S'), OrePrefixes.stick.get(aMaterial),
-                                Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber),
-                                Character.valueOf('C'), Ic2Items.cell});
-                GT_ModHandler.addCraftingRecipe(
-                        DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(6, 1, aMaterial, aMaterial, null),
-                        GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
-                        new Object[]{"xRR", " CR", "S f",
-                                Character.valueOf('S'), OrePrefixes.stick.get(aMaterial),
-                                Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber),
-                                Character.valueOf('C'), ItemList.Large_Fluid_Cell_Steel.get(1)});
-                GT_ModHandler.addCraftingRecipe(
-                        DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(8, 1, aMaterial, aMaterial, null),
-                        GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
-                        new Object[]{"xRR", " CR", "S f",
-                                Character.valueOf('S'), OrePrefixes.stick.get(aMaterial),
-                                Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber),
-                                Character.valueOf('C'), ItemList.Large_Fluid_Cell_TungstenSteel.get(1)});
-            }
-        }
-    }
-}
diff --git a/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java
index b1ab21eb83..3c693345f4 100644
--- a/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java
+++ b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java
@@ -1,8 +1,5 @@
 package com.detrav.items.processing;
 
-import com.detrav.enums.DetravItemList;
-import com.detrav.enums.DetravSimpleItems;
-import com.detrav.items.DetravMetaGeneratedItem01;
 import com.detrav.items.DetravMetaGeneratedTool01;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
@@ -21,23 +18,16 @@ public class ProcessingDetravToolProPick implements gregtech.api.interfaces.IOre
 
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
         if(!aPrefix.doGenerateItem(aMaterial)) return;;
-        //GT_ModHandler.
-                //addShapelessCraftingRecipe(
-                        //DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(0, 1, aMaterial, aMaterial.mHandleMaterial, null),
-                        //new Object[]{DetravSimpleItems.toolHeadProPick.get(aMaterial), OrePrefixes.stick.get(aMaterial.mHandleMaterial)});
 
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(100, 1, aMaterial, Materials.Chrome, new long[]{100000L, 32L, 1L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EPR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_IV,Character.valueOf('E'), ItemList.Emitter_LuV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('B'), ItemList.Battery_RE_LV_Lithium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(100, 1, aMaterial, Materials.Chrome, new long[]{75000L, 32L, 1L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EPR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_IV,Character.valueOf('E'), ItemList.Emitter_LuV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('B'), ItemList.Battery_RE_LV_Cadmium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(100, 1, aMaterial, Materials.Chrome, new long[]{50000L, 32L, 1L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EPR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_IV,Character.valueOf('E'), ItemList.Emitter_LuV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('B'), ItemList.Battery_RE_LV_Sodium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(102, 1, aMaterial, Materials.Iridium, new long[]{400000L, 128L, 2L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EPR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_LuV,Character.valueOf('E'), ItemList.Emitter_ZPM,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('B'), ItemList.Battery_RE_MV_Lithium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(102, 1, aMaterial, Materials.Iridium, new long[]{300000L, 128L, 2L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EPR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_LuV,Character.valueOf('E'), ItemList.Emitter_ZPM,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('B'), ItemList.Battery_RE_MV_Cadmium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(102, 1, aMaterial, Materials.Iridium, new long[]{200000L, 128L, 2L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EPR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_LuV,Character.valueOf('E'), ItemList.Emitter_ZPM,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('B'), ItemList.Battery_RE_MV_Sodium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(104, 1, aMaterial, Materials.Neutronium, new long[]{1600000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EPR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_ZPM,Character.valueOf('E'), ItemList.Emitter_UV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Neutronium),  Character.valueOf('B'), ItemList.Battery_RE_HV_Lithium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(104, 1, aMaterial, Materials.Neutronium, new long[]{1200000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EPR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_ZPM,Character.valueOf('E'), ItemList.Emitter_UV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Neutronium),  Character.valueOf('B'), ItemList.Battery_RE_HV_Cadmium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(104, 1, aMaterial, Materials.Neutronium, new long[]{800000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EPR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_ZPM,Character.valueOf('E'), ItemList.Emitter_UV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Neutronium), Character.valueOf('B'), ItemList.Battery_RE_HV_Sodium.get(1L, new Object[0])});
 
-        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(100, 1, aMaterial, Materials.Chrome, new long[]{100000L, 32L, 1L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_IV,Character.valueOf('E'), ItemList.Emitter_LuV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('B'), ItemList.Battery_RE_LV_Lithium.get(1L, new Object[0])});
-        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(100, 1, aMaterial, Materials.Chrome, new long[]{75000L, 32L, 1L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_IV,Character.valueOf('E'), ItemList.Emitter_LuV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('B'), ItemList.Battery_RE_LV_Cadmium.get(1L, new Object[0])});
-        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(100, 1, aMaterial, Materials.Chrome, new long[]{50000L, 32L, 1L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_IV,Character.valueOf('E'), ItemList.Emitter_LuV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Master), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Chrome), Character.valueOf('B'), ItemList.Battery_RE_LV_Sodium.get(1L, new Object[0])});
-        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(102, 1, aMaterial, Materials.Iridium, new long[]{400000L, 128L, 2L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_LuV,Character.valueOf('E'), ItemList.Emitter_ZPM,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('B'), ItemList.Battery_RE_MV_Lithium.get(1L, new Object[0])});
-        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(102, 1, aMaterial, Materials.Iridium, new long[]{300000L, 128L, 2L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_LuV,Character.valueOf('E'), ItemList.Emitter_ZPM,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('B'), ItemList.Battery_RE_MV_Cadmium.get(1L, new Object[0])});
-        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(102, 1, aMaterial, Materials.Iridium, new long[]{200000L, 128L, 2L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_LuV,Character.valueOf('E'), ItemList.Emitter_ZPM,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Iridium), Character.valueOf('B'), ItemList.Battery_RE_MV_Sodium.get(1L, new Object[0])});
-        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(104, 1, aMaterial, Materials.Neutronium, new long[]{1600000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_ZPM,Character.valueOf('E'), ItemList.Emitter_UV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Neutronium),  Character.valueOf('B'), ItemList.Battery_RE_HV_Lithium.get(1L, new Object[0])});
-        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(104, 1, aMaterial, Materials.Neutronium, new long[]{1200000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_ZPM,Character.valueOf('E'), ItemList.Emitter_UV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Neutronium),  Character.valueOf('B'), ItemList.Battery_RE_HV_Cadmium.get(1L, new Object[0])});
-        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(104, 1, aMaterial, Materials.Neutronium, new long[]{800000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_ZPM,Character.valueOf('E'), ItemList.Emitter_UV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Neutronium), Character.valueOf('B'), ItemList.Battery_RE_HV_Sodium.get(1L, new Object[0])});
-
-        GT_ModHandler.addCraftingRecipe(DetravItemList.Shape_Extruder_ProPick.get(1L,new Object[0]),
-                new Object[]{"h","X","M", Character.valueOf('X'),DetravSimpleItems.toolHeadProPick.get(aMaterial),Character.valueOf('M'),ItemList.Shape_Empty});
     }
 }
\ No newline at end of file
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