aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/detrav/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/detrav/tools')
-rw-r--r--src/main/java/com/detrav/tools/BehaviourDetravToolProPick.java7
-rw-r--r--src/main/java/com/detrav/tools/DetravToolProPick.java6
-rw-r--r--src/main/java/com/detrav/tools/Detrav_MetaGenerated_Tool_01.java25
-rw-r--r--src/main/java/com/detrav/tools/ProcessingDetravToolProPick.java24
-rw-r--r--src/main/java/com/detrav/tools/ProcessingToolHeadProPick.java22
-rw-r--r--src/main/java/com/detrav/tools/ToolDictNames.java9
6 files changed, 36 insertions, 57 deletions
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