Refactor name and path

11 files changed, 48 insertions, 38 deletions

diff --git a/src/main/java/com/detrav/DetravLoader.java b/src/main/java/com/detrav/DetravLoader.java
index 2254ecfe88..dc4c5c0d2d 100644
--- a/src/main/java/com/detrav/DetravLoader.java
+++ b/src/main/java/com/detrav/DetravLoader.java
@@ -2,8 +2,8 @@ package com.detrav;
 
 import com.detrav.items.DetravMetaGeneratedItem01;
 import com.detrav.items.DetravMetaGeneratedTool01;
-import com.detrav.tools.ProcessingDetravShaping;
-import com.detrav.tools.ProcessingDetravToolProPick;
+import com.detrav.items.processing.ProcessingDetravShaping;
+import com.detrav.items.processing.ProcessingDetravToolProPick;
 
 /**
  * Created by wital_000 on 18.03.2016.
diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
index 31e6992e65..a00cdb228e 100644
--- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
+++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
@@ -2,7 +2,10 @@ package com.detrav.items;
 
 import com.detrav.DetravScannerMod;
 import com.detrav.enums.DetravToolDictNames;
-import com.detrav.tools.*;
+import com.detrav.items.tools.DetravToolHVElectricProPick;
+import com.detrav.items.tools.DetravToolLVElectricProPick;
+import com.detrav.items.tools.DetravToolMVElectricProPick;
+import com.detrav.items.tools.DetravToolProPick;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.items.GT_MetaGenerated_Tool;
 
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
new file mode 100644
index 0000000000..1ba9a77968
--- /dev/null
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
@@ -0,0 +1,33 @@
+package com.detrav.items.behaviours;
+
+import gregtech.api.items.GT_MetaBase_Item;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.world.World;
+
+/**
+ * Created by wital_000 on 19.03.2016.
+ */
+public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPick
+{
+
+    public BehaviourDetravToolElectricProPick(int aCosts) {
+        super(aCosts);
+    }
+
+    public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
+
+        if (!aWorld.isRemote) {
+            //aPlayer.openGui();
+
+            aPlayer.addChatMessage(new ChatComponentText("Scanning Begin"));
+            try {
+                Thread.sleep(5000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+        return super.onItemRightClick(aItem,aStack,aWorld,aPlayer);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/tools/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
index a0dfc599f8..5c5b64d53c 100644
--- a/src/main/java/com/detrav/tools/BehaviourDetravToolProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
@@ -1,4 +1,4 @@
-package com.detrav.tools;
+package com.detrav.items.behaviours;
 
 import com.detrav.items.DetravMetaGeneratedTool01;
 import gregtech.api.GregTech_API;
diff --git a/src/main/java/com/detrav/tools/ProcessingDetravShaping.java b/src/main/java/com/detrav/items/processing/ProcessingDetravShaping.java
index b10c3c43ae..9cffbf28f7 100644
--- a/src/main/java/com/detrav/tools/ProcessingDetravShaping.java
+++ b/src/main/java/com/detrav/items/processing/ProcessingDetravShaping.java
@@ -1,4 +1,4 @@
-package com.detrav.tools;
+package com.detrav.items.processing;
 
 import com.detrav.enums.DetravItemList;
 import com.detrav.enums.DetravSimpleItems;
diff --git a/src/main/java/com/detrav/tools/ProcessingDetravToolProPick.java b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java
index 6037fa1f85..7f1d53db42 100644
--- a/src/main/java/com/detrav/tools/ProcessingDetravToolProPick.java
+++ b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java
@@ -1,4 +1,4 @@
-package com.detrav.tools;
+package com.detrav.items.processing;
 
 import com.detrav.enums.DetravItemList;
 import com.detrav.enums.DetravSimpleItems;
diff --git a/src/main/java/com/detrav/tools/DetravToolHVElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolHVElectricProPick.java
index 7b27f83d80..3196ac7f5d 100644
--- a/src/main/java/com/detrav/tools/DetravToolHVElectricProPick.java
+++ b/src/main/java/com/detrav/items/tools/DetravToolHVElectricProPick.java
@@ -1,4 +1,4 @@
-package com.detrav.tools;
+package com.detrav.items.tools;
 
 import com.detrav.enums.Textures01;
 import gregtech.api.interfaces.IIconContainer;
diff --git a/src/main/java/com/detrav/tools/DetravToolLVElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java
index 313b9525b2..4ad574a6dc 100644
--- a/src/main/java/com/detrav/tools/DetravToolLVElectricProPick.java
+++ b/src/main/java/com/detrav/items/tools/DetravToolLVElectricProPick.java
@@ -1,7 +1,7 @@
-package com.detrav.tools;
+package com.detrav.items.tools;
 
-import com.detrav.enums.DetravSimpleItems;
 import com.detrav.enums.Textures01;
+import com.detrav.items.behaviours.BehaviourDetravToolElectricProPick;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.damagesources.GT_DamageSources;
@@ -9,7 +9,6 @@ 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;
diff --git a/src/main/java/com/detrav/tools/DetravToolMVElectricProPick.java b/src/main/java/com/detrav/items/tools/DetravToolMVElectricProPick.java
index 1afcbb9b2c..81bfed4f17 100644
--- a/src/main/java/com/detrav/tools/DetravToolMVElectricProPick.java
+++ b/src/main/java/com/detrav/items/tools/DetravToolMVElectricProPick.java
@@ -1,4 +1,4 @@
-package com.detrav.tools;
+package com.detrav.items.tools;
 
 import com.detrav.enums.Textures01;
 import gregtech.api.interfaces.IIconContainer;
diff --git a/src/main/java/com/detrav/tools/DetravToolProPick.java b/src/main/java/com/detrav/items/tools/DetravToolProPick.java
index 6e0eac39e1..c7f61b955b 100644
--- a/src/main/java/com/detrav/tools/DetravToolProPick.java
+++ b/src/main/java/com/detrav/items/tools/DetravToolProPick.java
@@ -1,7 +1,8 @@
-package com.detrav.tools;
+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;
diff --git a/src/main/java/com/detrav/tools/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/tools/BehaviourDetravToolElectricProPick.java
deleted file mode 100644
index a64d9f0063..0000000000
--- a/src/main/java/com/detrav/tools/BehaviourDetravToolElectricProPick.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.detrav.tools;
-
-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 19.03.2016.
- */
-public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPick
-{
-
-    public BehaviourDetravToolElectricProPick(int aCosts) {
-        super(aCosts);
-    }
-}
\ No newline at end of file