WTF!!!

3 files changed, 23 insertions, 41 deletions

diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravRepairTool.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravRepairTool.java
deleted file mode 100644
index ab23490fa3..0000000000
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravRepairTool.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.detrav.items.behaviours;
-
-import com.detrav.DetravScannerMod;
-import com.detrav.items.DetravMetaGeneratedTool01;
-import gregtech.api.enums.SubTag;
-import gregtech.api.interfaces.IItemBehaviour;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.common.items.behaviors.Behaviour_None;
-import net.minecraft.dispenser.IBlockSource;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-import java.util.List;
-
-/**
- * Created by wital_000 on 08.04.2016.
- */
-public class BehaviourDetravRepairTool extends Behaviour_None {
-    public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
-        if(DetravMetaGeneratedTool01.getToolDamage(aStack)< DetravMetaGeneratedTool01.INSTANCE.getToolMaxDamage(aStack)-1) {
-            DetravScannerMod.proxy.openRepairToolGui(aPlayer);
-        } else DetravMetaGeneratedTool01.INSTANCE.doDamage(aStack,1000);
-
-        return super.onItemRightClick(aItem, aStack, aWorld, aPlayer);
-        //aPlayer.openContainer
-    }
-}
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
index d14323139f..1fe38299b8 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
@@ -35,12 +35,20 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
             long data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack);
             //Проверяем если нажат шифт
             if (aPlayer.isSneaking()) {
-                if (data == 0) {
-                    aPlayer.addChatMessage(new ChatComponentText("Set Mode: Oil, Any Block"));
-                    DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, 1);
-                } else {
-                    aPlayer.addChatMessage(new ChatComponentText("Set Mode: Ore, Any Rock Block"));
-                    DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, 0);
+                switch ((int)data)
+                {
+                    case 0:
+                        aPlayer.addChatMessage(new ChatComponentText("Set Mode: Ore (with small), Any Rock Block"));
+                        DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, 1);
+                        break;
+                    case 1:
+                        aPlayer.addChatMessage(new ChatComponentText("Set Mode: Oil, Any Block"));
+                        DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, 2);
+                        break;
+                    default:
+                        aPlayer.addChatMessage(new ChatComponentText("Set Mode: Ore, Any Rock Block"));
+                        DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, 0);
+                        break;
                 }
                 return super.onItemRightClick(aItem, aStack, aWorld, aPlayer);
             }
@@ -69,7 +77,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
                     for (int z = 0; z < 16; z++) {
                         int ySize = c.getHeightValue(x, z);
                         for (int y = 1; y < ySize; y++) {
-                            if(data == 0) {
+                            if(data < 2) {
                                 Block b = c.getBlock(x, y, z);
                                 if (b == GregTech_API.sBlockOres1) {
                                     TileEntity entity = c.getTileEntityUnsafe(x, y, z);
@@ -77,7 +85,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
                                         GT_TileEntity_Ores gt_entity = (GT_TileEntity_Ores) entity;
                                         String name = GT_LanguageManager.getTranslation(
                                                 b.getUnlocalizedName() + "." + gt_entity.getMetaData() + ".name");
-                                        if (name.startsWith("Small")) continue;
+                                        if (name.startsWith("Small")) if(data!=1) continue;
                                         packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, gt_entity.getMetaData());
                                     }
                                 }
@@ -110,7 +118,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
 
     public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
         long data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack);
-        if (data == 0)
+        if (data < 2)
             return super.onItemUse(aItem, aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ);
         if (!aWorld.isRemote) {
             FluidStack fStack = getUndergroundOil(aWorld,aX,aZ);
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
index 9e7a97752a..f33d88555d 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
@@ -79,6 +79,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
                 return;
             }
         } else if (aRandom.nextInt(10) < 4) {
+            long data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack);
             HashMap<String, Integer> ores = new HashMap<String, Integer>();
             for (int x = 0; x < 16; x++)
                 for (int z = 0; z < 16; z++) {
@@ -91,7 +92,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
                                 GT_TileEntity_Ores gt_entity = (GT_TileEntity_Ores) entity;
                                 String name = GT_LanguageManager.getTranslation(
                                         b.getUnlocalizedName() + "." + gt_entity.getMetaData() + ".name");
-                                if (name.startsWith("Small")) continue;
+                                if (name.startsWith("Small")) if(data!=1) continue;
                                 if (!ores.containsKey(name))
                                     ores.put(name, 1);
                                 else {
@@ -102,10 +103,13 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
                         }
                     }
                 }
+            int total = 0;
             for (String key : ores.keySet()) {
                 int value = ores.get(key);
+                total+=value;
                addChatMassageByValue(aPlayer,value,key);
             }
+            addChatMassageByValue(aPlayer,total,"Total");
             if (!aPlayer.capabilities.isCreativeMode)
                 aItem.doDamage(aStack, this.mCosts);
             return;
@@ -114,6 +118,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
     }
 
     void addChatMassageByValue(EntityPlayer aPlayer, int value, String name) {
+        if(name == "Total") return;
         if (value < 0) {
             aPlayer.addChatMessage(new ChatComponentText(foundTexts[6] + name));
         } else if (value < 1) {