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;