BackUped

Just added a propick

9 files changed, 64 insertions, 151 deletions

diff --git a/src/main/java/com/detrav/DetravLoader.java b/src/main/java/com/detrav/DetravLoader.java
index 71ebe88336..ce6482d588 100644
--- a/src/main/java/com/detrav/DetravLoader.java
+++ b/src/main/java/com/detrav/DetravLoader.java
@@ -1,6 +1,8 @@
 package com.detrav;
 
 import com.detrav.items.DetravMetaGeneratedItem01;
+import com.detrav.items.DetravMetaGeneratedTool01;
+import com.detrav.tools.ProcessingDetravToolProPick;
 
 /**
  * Created by wital_000 on 18.03.2016.
@@ -10,7 +12,9 @@ public class DetravLoader implements Runnable {
     public void run() {
 
         new DetravMetaGeneratedItem01();
+        new DetravMetaGeneratedTool01();
+        new ProcessingDetravToolProPick();
         //new Detrav_MetaGenerated_Tool_01();
-        //new ProcessingToolHeadProPick();
+        //new ProcessingDetravToolProPick();
     }
 }
diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
new file mode 100644
index 0000000000..fa3eae6ee8
--- /dev/null
+++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
@@ -0,0 +1,23 @@
+package com.detrav.items;
+
+import com.detrav.DetravScannerMod;
+import com.detrav.tools.DetravToolProPick;
+import gregtech.api.enums.TC_Aspects;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+
+/**
+ * Created by wital_000 on 19.03.2016.
+ */
+public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool {
+    public static DetravMetaGeneratedTool01 INSTANCE;
+
+    public DetravMetaGeneratedTool01() {
+        super("detrav.metatool.01");
+        INSTANCE = this;
+        addTool(0, "ProPick", "", new DetravToolProPick(), new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)});
+        setCreativeTab(DetravScannerMod.TAB_DETRAV);
+        //addItemBehavior(0,)
+    }
+
+
+}
diff --git a/src/main/java/com/detrav/items/ItemList.java b/src/main/java/com/detrav/items/ItemList.java
deleted file mode 100644
index 28e33448b4..0000000000
--- a/src/main/java/com/detrav/items/ItemList.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.detrav.items;
-
-import gregtech.api.interfaces.IItemContainer;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-/**
- * Created by wital_000 on 19.03.2016.
- */
-public enum ItemList implements IItemContainer {
-    ;
-
-    @Override
-    public Item getItem() {
-        return null;
-    }
-
-    @Override
-    public Block getBlock() {
-        return null;
-    }
-
-    @Override
-    public boolean isStackEqual(Object o) {
-        return false;
-    }
-
-    @Override
-    public boolean isStackEqual(Object o, boolean b, boolean b1) {
-        return false;
-    }
-
-    @Override
-    public ItemStack get(long l, Object... objects) {
-        return null;
-    }
-
-    @Override
-    public ItemStack getWildcard(long l, Object... objects) {
-        return null;
-    }
-
-    @Override
-    public ItemStack getUndamaged(long l, Object... objects) {
-        return null;
-    }
-
-    @Override
-    public ItemStack getAlmostBroken(long l, Object... objects) {
-        return null;
-    }
-
-    @Override
-    public ItemStack getWithDamage(long l, long l1, Object... objects) {
-        return null;
-    }
-
-    @Override
-    public IItemContainer set(Item item) {
-        return null;
-    }
-
-    @Override
-    public IItemContainer set(ItemStack itemStack) {
-        return null;
-    }
-
-    @Override
-    public IItemContainer registerOre(Object... objects) {
-        return null;
-    }
-
-    @Override
-    public IItemContainer registerWildcardAsOre(Object... objects) {
-        return null;
-    }
-
-    @Override
-    public ItemStack getWithCharge(long l, int i, Object... objects) {
-        return null;
-    }
-
-    @Override
-    public ItemStack getWithName(long l, String s, Object... objects) {
-        return null;
-    }
-
-    @Override
-    public boolean hasBeenSet() {
-        return false;
-    }
-}
diff --git a/src/main/java/com/detrav/tools/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/tools/BehaviourDetravToolProPick.java
new file mode 100644
index 0000000000..22e3f66e27
--- /dev/null
+++ b/src/main/java/com/detrav/tools/BehaviourDetravToolProPick.java
@@ -0,0 +1,7 @@
+package com.detrav.tools;
+
+/**
+ * Created by wital_000 on 19.03.2016.
+ */
+public class BehaviourDetravToolProPick {
+}
diff --git a/src/main/java/com/detrav/tools/DetravToolProPick.java b/src/main/java/com/detrav/tools/DetravToolProPick.java
index ee6a074792..351af7c396 100644
--- a/src/main/java/com/detrav/tools/DetravToolProPick.java
+++ b/src/main/java/com/detrav/tools/DetravToolProPick.java
@@ -1,5 +1,7 @@
 package com.detrav.tools;
 
+import com.detrav.enums.DetravSimpleItems;
+import com.detrav.enums.Textures01;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.damagesources.GT_DamageSources;
@@ -155,7 +157,9 @@ public class DetravToolProPick implements IToolStats {
     }
 
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadPickaxe.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
+        return aIsToolHead ?
+                Textures01.mTextures[DetravSimpleItems.toolProPickHead.mTextureIndex] :
+                GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
     public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
diff --git a/src/main/java/com/detrav/tools/Detrav_MetaGenerated_Tool_01.java b/src/main/java/com/detrav/tools/Detrav_MetaGenerated_Tool_01.java
deleted file mode 100644
index 8db6de9595..0000000000
--- a/src/main/java/com/detrav/tools/Detrav_MetaGenerated_Tool_01.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.detrav.tools;
-
-import gregtech.api.enums.TC_Aspects;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-
-/**
- * Created by wital_000 on 18.03.2016.
- */
-public class Detrav_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool {
-    public static Detrav_MetaGenerated_Tool_01 INSTANCE;
-
-    public Detrav_MetaGenerated_Tool_01() {
-        super("detrav.metatool.01");
-        INSTANCE = this;
-        addTool(1, "Prospector's Pick", "", new DetravToolProPick(),
-                new Object[]
-                        {
-                                ToolDictNames.craftingToolProPick,
-                                new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-                                new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 4L),
-                                new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 4L),
-                                new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)
-                        });
-    }
-}
diff --git a/src/main/java/com/detrav/tools/ProcessingDetravToolProPick.java b/src/main/java/com/detrav/tools/ProcessingDetravToolProPick.java
new file mode 100644
index 0000000000..060ddb5a25
--- /dev/null
+++ b/src/main/java/com/detrav/tools/ProcessingDetravToolProPick.java
@@ -0,0 +1,24 @@
+package com.detrav.tools;
+
+import com.detrav.enums.DetravSimpleItems;
+import com.detrav.items.DetravMetaGeneratedTool01;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_ModHandler;
+import net.minecraft.item.ItemStack;
+
+/**
+ * Created by wital_000 on 18.03.2016.
+ */
+public class ProcessingDetravToolProPick implements gregtech.api.interfaces.IOreRecipeRegistrator {
+    public ProcessingDetravToolProPick() {
+        OrePrefixes.toolHeadPickaxe.add(this);
+    }
+
+    public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
+        GT_ModHandler.
+                addShapelessCraftingRecipe(
+                        DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(0, 1, aMaterial, aMaterial.mHandleMaterial, null),
+                        new Object[]{DetravSimpleItems.toolProPickHead.get(aMaterial), OrePrefixes.stick.get(aMaterial.mHandleMaterial)});
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/tools/ProcessingToolHeadProPick.java b/src/main/java/com/detrav/tools/ProcessingToolHeadProPick.java
deleted file mode 100644
index c822a60162..0000000000
--- a/src/main/java/com/detrav/tools/ProcessingToolHeadProPick.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.detrav.tools;
-
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import net.minecraft.item.ItemStack;
-
-/**
- * Created by wital_000 on 18.03.2016.
- */
-public class ProcessingToolHeadProPick implements gregtech.api.interfaces.IOreRecipeRegistrator {
-    public ProcessingToolHeadProPick() {
-        OrePrefixes.toolHeadPickaxe.add(this);
-    }
-
-    public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
-        /*GT_ModHandler.
-                addShapelessCraftingRecipe(
-                        Detrav_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(1, 1, aMaterial, aMaterial.mHandleMaterial, null),
-                        new Object[]{aOreDictName, OrePrefixes.stick.get(aMaterial.mHandleMaterial),}});*/
-    }
-}
diff --git a/src/main/java/com/detrav/tools/ToolDictNames.java b/src/main/java/com/detrav/tools/ToolDictNames.java
deleted file mode 100644
index 4c25220c05..0000000000
--- a/src/main/java/com/detrav/tools/ToolDictNames.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.detrav.tools;
-
-/**
- * Created by wital_000 on 18.03.2016.
- */
-public enum ToolDictNames {
-    craftingToolProPickHead,
-    craftingToolProPick;
-}
\ No newline at end of file