Add Mold, Electric ProPick, Refactor Resources

13 files changed, 428 insertions, 9 deletions

diff --git a/src/main/java/com/detrav/enums/DetravItemList.java b/src/main/java/com/detrav/enums/DetravItemList.java
new file mode 100644
index 0000000000..0bbf61ea59
--- /dev/null
+++ b/src/main/java/com/detrav/enums/DetravItemList.java
@@ -0,0 +1,141 @@
+package com.detrav.enums;
+
+import gregtech.api.interfaces.IItemContainer;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+import static gregtech.api.enums.GT_Values.W;
+
+/**
+ * Created by wital_000 on 20.03.2016.
+ */
+public enum DetravItemList implements IItemContainer {
+    Shape_Extruder_ProPick;
+
+    private ItemStack mStack;
+    private boolean mHasNotBeenSet = true;
+
+    @Override
+    public IItemContainer set(Item aItem) {
+        mHasNotBeenSet = false;
+        if (aItem == null) return this;
+        ItemStack aStack = new ItemStack(aItem, 1, 0);
+        mStack = GT_Utility.copyAmount(1, aStack);
+        return this;
+    }
+
+    @Override
+    public IItemContainer set(ItemStack aStack) {
+        mHasNotBeenSet = false;
+        mStack = GT_Utility.copyAmount(1, aStack);
+        return this;
+    }
+
+    @Override
+    public Item getItem() {
+        if (mHasNotBeenSet)
+            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
+        if (GT_Utility.isStackInvalid(mStack)) return null;
+        return mStack.getItem();
+    }
+
+    @Override
+    public Block getBlock() {
+        if (mHasNotBeenSet)
+            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
+        return GT_Utility.getBlockFromStack(getItem());
+    }
+
+    @Override
+    public final boolean hasBeenSet() {
+        return !mHasNotBeenSet;
+    }
+
+    @Override
+    public boolean isStackEqual(Object aStack) {
+        return isStackEqual(aStack, false, false);
+    }
+
+    @Override
+    public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT) {
+        if (GT_Utility.isStackInvalid(aStack)) return false;
+        return GT_Utility.areUnificationsEqual((ItemStack) aStack, aWildcard ? getWildcard(1) : get(1), aIgnoreNBT);
+    }
+
+    @Override
+    public ItemStack get(long aAmount, Object... aReplacements) {
+        if (mHasNotBeenSet)
+            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
+        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
+        return GT_Utility.copyAmount(aAmount, GT_OreDictUnificator.get(mStack));
+    }
+
+    @Override
+    public ItemStack getWildcard(long aAmount, Object... aReplacements) {
+        if (mHasNotBeenSet)
+            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
+        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
+        return GT_Utility.copyAmountAndMetaData(aAmount, W, GT_OreDictUnificator.get(mStack));
+    }
+
+    @Override
+    public ItemStack getUndamaged(long aAmount, Object... aReplacements) {
+        if (mHasNotBeenSet)
+            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
+        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
+        return GT_Utility.copyAmountAndMetaData(aAmount, 0, GT_OreDictUnificator.get(mStack));
+    }
+
+    @Override
+    public ItemStack getAlmostBroken(long aAmount, Object... aReplacements) {
+        if (mHasNotBeenSet)
+            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
+        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
+        return GT_Utility.copyAmountAndMetaData(aAmount, mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(mStack));
+    }
+
+    @Override
+    public ItemStack getWithName(long aAmount, String aDisplayName, Object... aReplacements) {
+        ItemStack rStack = get(1, aReplacements);
+        if (GT_Utility.isStackInvalid(rStack)) return null;
+        rStack.setStackDisplayName(aDisplayName);
+        return GT_Utility.copyAmount(aAmount, rStack);
+    }
+
+    @Override
+    public ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements) {
+        ItemStack rStack = get(1, aReplacements);
+        if (GT_Utility.isStackInvalid(rStack)) return null;
+        GT_ModHandler.chargeElectricItem(rStack, aEnergy, Integer.MAX_VALUE, true, false);
+        return GT_Utility.copyAmount(aAmount, rStack);
+    }
+
+    @Override
+    public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements) {
+        if (mHasNotBeenSet)
+            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
+        if (GT_Utility.isStackInvalid(mStack)) return GT_Utility.copyAmount(aAmount, aReplacements);
+        return GT_Utility.copyAmountAndMetaData(aAmount, aMetaValue, GT_OreDictUnificator.get(mStack));
+    }
+
+    @Override
+    public IItemContainer registerOre(Object... aOreNames) {
+        if (mHasNotBeenSet)
+            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
+        for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, get(1));
+        return this;
+    }
+
+    @Override
+    public IItemContainer registerWildcardAsOre(Object... aOreNames) {
+        if (mHasNotBeenSet)
+            throw new IllegalAccessError("The Enum '" + name() + "' has not been set to an Item at this time!");
+        for (Object tOreName : aOreNames) GT_OreDictUnificator.registerOre(tOreName, getWildcard(1));
+        return this;
+    }
+
+}
diff --git a/src/main/java/com/detrav/enums/DetravSimpleItems.java b/src/main/java/com/detrav/enums/DetravSimpleItems.java
index 9598f2d63e..5db1977650 100644
--- a/src/main/java/com/detrav/enums/DetravSimpleItems.java
+++ b/src/main/java/com/detrav/enums/DetravSimpleItems.java
@@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack;
  * Created by wital_000 on 19.03.2016.
  */
 public enum DetravSimpleItems {
-    toolProPickHead(OrePrefixes.toolHeadPickaxe,"Prospector's Pick Heads",""," Prospector's Pick Head",0);
+    toolHeadProPick(OrePrefixes.toolHeadPickaxe,"Prospector's Pick Heads",""," Prospector's Pick Head",0);
 
     static {
 
diff --git a/src/main/java/com/detrav/enums/DetravToolDictNames.java b/src/main/java/com/detrav/enums/DetravToolDictNames.java
index 203124c185..5cbbf2b373 100644
--- a/src/main/java/com/detrav/enums/DetravToolDictNames.java
+++ b/src/main/java/com/detrav/enums/DetravToolDictNames.java
@@ -4,5 +4,6 @@ package com.detrav.enums;
  * Created by wital_000 on 19.03.2016.
  */
 public enum  DetravToolDictNames {
-    craftingToolProPick
+    craftingToolProPick,
+    craftingToolElectricProPick
 }
diff --git a/src/main/java/com/detrav/enums/Textures01.java b/src/main/java/com/detrav/enums/Textures01.java
index 1280109826..6b1f8503c1 100644
--- a/src/main/java/com/detrav/enums/Textures01.java
+++ b/src/main/java/com/detrav/enums/Textures01.java
@@ -13,6 +13,9 @@ import net.minecraft.util.ResourceLocation;
 public class Textures01 {
     public static final IIconContainer[] mTextures = new IIconContainer[]
             {
-                    new Textures.ItemIcons.CustomIcon("iconsets/PRO_PICK_HEAD")
+                    new Textures.ItemIcons.CustomIcon("gt.detrav.metaitem.01/PRO_PICK_HEAD"),
+                    new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_LV_PRO_PICK_HEAD"),
+                    new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_MV_PRO_PICK_HEAD"),
+                    new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_HV_PRO_PICK_HEAD")
             };
 }
diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedItem01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedItem01.java
index 93ac24e563..2e3e14fc5e 100644
--- a/src/main/java/com/detrav/items/DetravMetaGeneratedItem01.java
+++ b/src/main/java/com/detrav/items/DetravMetaGeneratedItem01.java
@@ -3,6 +3,7 @@ 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;
@@ -18,13 +19,19 @@ public class DetravMetaGeneratedItem01 extends DetravMetaGeneratedItem {
     //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.toolProPickHead});
+        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]));
     }
 
     @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");
+    }
 }
diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
index 30c3b20ede..31e6992e65 100644
--- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
+++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
@@ -2,8 +2,7 @@ package com.detrav.items;
 
 import com.detrav.DetravScannerMod;
 import com.detrav.enums.DetravToolDictNames;
-import com.detrav.tools.BehaviourDetravToolProPick;
-import com.detrav.tools.DetravToolProPick;
+import com.detrav.tools.*;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.items.GT_MetaGenerated_Tool;
 
@@ -17,6 +16,9 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool {
         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, "Electric Prospector's Pick (LV)", "", 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(4, "Electric Prospector's Pick (MV)", "", 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(6, "Electric Prospector's Pick (HV)", "", 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));
         setCreativeTab(DetravScannerMod.TAB_DETRAV);
         //addItemBehavior(0,new BehaviourDetravToolProPick());
     }
diff --git a/src/main/java/com/detrav/proxies/CommonProxy.java b/src/main/java/com/detrav/proxies/CommonProxy.java
index 1edb3ccecb..7e7c84fc06 100644
--- a/src/main/java/com/detrav/proxies/CommonProxy.java
+++ b/src/main/java/com/detrav/proxies/CommonProxy.java
@@ -22,7 +22,7 @@ public class CommonProxy {
         for (Materials aMaterial : Materials.VALUES) {
             if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) {
                 if (!aMaterial.contains(SubTag.NO_SMASHING)) {
-                    GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(DetravSimpleItems.toolProPickHead.get(aMaterial), null, 1L), tBits, new Object[]{"PI", "fh",
+                    GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(DetravSimpleItems.toolHeadProPick.get(aMaterial), null, 1L), tBits, new Object[]{"PI", "fh",
                             Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial)});
                 }
             }
diff --git a/src/main/java/com/detrav/tools/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/tools/BehaviourDetravToolElectricProPick.java
new file mode 100644
index 0000000000..a1c9ddf602
--- /dev/null
+++ b/src/main/java/com/detrav/tools/BehaviourDetravToolElectricProPick.java
@@ -0,0 +1,26 @@
+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 Behaviour_None
+{
+
+    public BehaviourDetravToolElectricProPick(int aCosts) {
+
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/tools/DetravToolHVElectricProPick.java b/src/main/java/com/detrav/tools/DetravToolHVElectricProPick.java
new file mode 100644
index 0000000000..8310ed9b95
--- /dev/null
+++ b/src/main/java/com/detrav/tools/DetravToolHVElectricProPick.java
@@ -0,0 +1,22 @@
+package com.detrav.tools;
+
+import com.detrav.enums.Textures01;
+import gregtech.api.interfaces.IIconContainer;
+import net.minecraft.item.ItemStack;
+
+/**
+ * Created by wital_000 on 19.03.2016.
+ */
+public class DetravToolHVElectricProPick extends DetravToolMVElectricProPick {
+    public int getBaseQuality() {
+        return 1;
+    }
+
+    public float getMaxDurabilityMultiplier() {
+        return 4.0F;
+    }
+
+    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
+        return Textures01.mTextures[3];
+    }
+}
diff --git a/src/main/java/com/detrav/tools/DetravToolLVElectricProPick.java b/src/main/java/com/detrav/tools/DetravToolLVElectricProPick.java
new file mode 100644
index 0000000000..313b9525b2
--- /dev/null
+++ b/src/main/java/com/detrav/tools/DetravToolLVElectricProPick.java
@@ -0,0 +1,183 @@
+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;
+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;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraftforge.event.world.BlockEvent;
+
+import java.util.List;
+
+/**
+ * Created by wital_000 on 19.03.2016.
+ */
+public class DetravToolLVElectricProPick implements IToolStats {
+    public int getToolDamagePerBlockBreak() {
+        return GT_Mod.gregtechproxy.mHardRock ? 50 : 100;
+    }
+
+    public int getToolDamagePerDropConversion() {
+        return 100;
+    }
+
+    public int getToolDamagePerContainerCraft() {
+        return 100;
+    }
+
+    public int getToolDamagePerEntityAttack() {
+        return 2000;
+    }
+
+    public int getBaseQuality() {
+        return 0;
+    }
+
+    public float getBaseDamage() {
+        return 1.0F;
+    }
+
+    @Override
+    public int getHurtResistanceTime(int i, Entity entity) {
+        return i;
+    }
+
+    public float getSpeedMultiplier() {
+        return 1.0F;
+    }
+
+    public float getMaxDurabilityMultiplier() {
+        return 1.0F;
+    }
+
+    @Override
+    public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity) {
+        return GT_DamageSources.getCombatDamage((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer, (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase) aEntity) : null);
+    }
+
+    public String getCraftingSound() {
+        return null;
+    }
+
+    public String getEntityHitSound() {
+        return null;
+    }
+
+    public String getBreakingSound() {
+        return (String) GregTech_API.sSoundList.get(Integer.valueOf(0));
+    }
+
+    @Override
+    public Enchantment[] getEnchantments(ItemStack itemStack) {
+        return new Enchantment[0];
+    }
+
+    @Override
+    public int[] getEnchantmentLevels(ItemStack itemStack) {
+        return new int[0];
+    }
+
+    public String getMiningSound() {
+        return null;
+    }
+
+    public boolean canBlock() {
+        return false;
+    }
+
+    public boolean isCrowbar() {
+        return false;
+    }
+
+    @Override
+    public boolean isGrafter() {
+        return false;
+    }
+
+    @Override
+    public boolean isChainsaw() {
+        return false;
+    }
+
+    @Override
+    public boolean isWrench() {
+        return false;
+    }
+
+    @Override
+    public boolean isWeapon() {
+        return false;
+    }
+
+    @Override
+    public boolean isRangedWeapon() {
+        return false;
+    }
+
+    @Override
+    public boolean isMiningTool() {
+        return false;
+    }
+
+    public boolean isMinableBlock(Block aBlock, byte aMetaData) {
+
+        return false;
+    }
+
+    @Override
+    public int convertBlockDrops(List<ItemStack> list, ItemStack itemStack, EntityPlayer entityPlayer, Block block, int i, int i1, int i2, byte b, int i3, boolean b1, BlockEvent.HarvestDropsEvent harvestDropsEvent) {
+        return 0;
+    }
+
+    public ItemStack getBrokenItem(ItemStack aStack) {
+        return null;
+    }
+
+    @Override
+    public float getNormalDamageAgainstEntity(float v, Entity entity, ItemStack itemStack, EntityPlayer entityPlayer) {
+        return v;
+    }
+
+    @Override
+    public float getMagicDamageAgainstEntity(float v, Entity entity, ItemStack itemStack, EntityPlayer entityPlayer) {
+        return v;
+    }
+
+    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
+        return Textures01.mTextures[1];
+    }
+
+    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
+        return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa;
+    }
+
+    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+        aItem.addItemBehavior(aID, new BehaviourDetravToolElectricProPick(getToolDamagePerBlockBreak()));
+    }
+
+    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) {
+
+        aPlayer.triggerAchievement(AchievementList.openInventory);
+        aPlayer.triggerAchievement(AchievementList.mineWood);
+        aPlayer.triggerAchievement(AchievementList.buildWorkBench);
+    }
+
+    public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
+        return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got Pick Up'ed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/tools/DetravToolMVElectricProPick.java b/src/main/java/com/detrav/tools/DetravToolMVElectricProPick.java
new file mode 100644
index 0000000000..1afcbb9b2c
--- /dev/null
+++ b/src/main/java/com/detrav/tools/DetravToolMVElectricProPick.java
@@ -0,0 +1,21 @@
+package com.detrav.tools;
+
+import com.detrav.enums.Textures01;
+import gregtech.api.interfaces.IIconContainer;
+import net.minecraft.item.ItemStack;
+
+/**
+ * Created by wital_000 on 19.03.2016.
+ */
+public class DetravToolMVElectricProPick extends DetravToolLVElectricProPick {
+    public int getBaseQuality() {
+        return 1;
+    }
+    public float getMaxDurabilityMultiplier() {
+        return 2.0F;
+    }
+
+    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
+        return Textures01.mTextures[2];
+    }
+}
diff --git a/src/main/java/com/detrav/tools/DetravToolProPick.java b/src/main/java/com/detrav/tools/DetravToolProPick.java
index 9fda26e639..6e0eac39e1 100644
--- a/src/main/java/com/detrav/tools/DetravToolProPick.java
+++ b/src/main/java/com/detrav/tools/DetravToolProPick.java
@@ -161,7 +161,7 @@ public class DetravToolProPick implements IToolStats {
 
     public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
         return aIsToolHead ?
-                Textures01.mTextures[DetravSimpleItems.toolProPickHead.mTextureIndex] :
+                Textures01.mTextures[DetravSimpleItems.toolHeadProPick.mTextureIndex] :
                 GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.stick.mTextureIndex];
     }
 
diff --git a/src/main/java/com/detrav/tools/ProcessingDetravToolProPick.java b/src/main/java/com/detrav/tools/ProcessingDetravToolProPick.java
index 060ddb5a25..86895e00da 100644
--- a/src/main/java/com/detrav/tools/ProcessingDetravToolProPick.java
+++ b/src/main/java/com/detrav/tools/ProcessingDetravToolProPick.java
@@ -2,9 +2,11 @@ package com.detrav.tools;
 
 import com.detrav.enums.DetravSimpleItems;
 import com.detrav.items.DetravMetaGeneratedTool01;
+import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
+import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import net.minecraft.item.ItemStack;
 
 /**
@@ -19,6 +21,17 @@ public class ProcessingDetravToolProPick implements gregtech.api.interfaces.IOre
         GT_ModHandler.
                 addShapelessCraftingRecipe(
                         DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(0, 1, aMaterial, aMaterial.mHandleMaterial, null),
-                        new Object[]{DetravSimpleItems.toolProPickHead.get(aMaterial), OrePrefixes.stick.get(aMaterial.mHandleMaterial)});
+                        new Object[]{DetravSimpleItems.toolHeadProPick.get(aMaterial), OrePrefixes.stick.get(aMaterial.mHandleMaterial)});
+
+
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(2, 1, aMaterial, Materials.StainlessSteel, new long[]{100000L, 32L, 1L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_LV,Character.valueOf('E'), ItemList.Emitter_LV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('B'), ItemList.Battery_RE_LV_Lithium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(2, 1, aMaterial, Materials.StainlessSteel, new long[]{75000L, 32L, 1L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_LV,Character.valueOf('E'), ItemList.Emitter_LV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('B'), ItemList.Battery_RE_LV_Cadmium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(2, 1, aMaterial, Materials.StainlessSteel, new long[]{50000L, 32L, 1L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_LV,Character.valueOf('E'), ItemList.Emitter_LV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.StainlessSteel), Character.valueOf('B'), ItemList.Battery_RE_LV_Sodium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(4, 1, aMaterial, Materials.Titanium, new long[]{400000L, 128L, 2L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_MV,Character.valueOf('E'), ItemList.Emitter_MV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Titanium), Character.valueOf('B'), ItemList.Battery_RE_MV_Lithium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(4, 1, aMaterial, Materials.Titanium, new long[]{300000L, 128L, 2L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_MV,Character.valueOf('E'), ItemList.Emitter_MV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Titanium), Character.valueOf('B'), ItemList.Battery_RE_MV_Cadmium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(4, 1, aMaterial, Materials.Titanium, new long[]{200000L, 128L, 2L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_MV,Character.valueOf('E'), ItemList.Emitter_MV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Titanium), Character.valueOf('B'), ItemList.Battery_RE_MV_Sodium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(6, 1, aMaterial, Materials.TungstenSteel, new long[]{1600000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_HV,Character.valueOf('E'), ItemList.Emitter_HV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.TungstenSteel),  Character.valueOf('B'), ItemList.Battery_RE_HV_Lithium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(6, 1, aMaterial, Materials.TungstenSteel, new long[]{1200000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_HV,Character.valueOf('E'), ItemList.Emitter_HV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.TungstenSteel),  Character.valueOf('B'), ItemList.Battery_RE_HV_Cadmium.get(1L, new Object[0])});
+        GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(6, 1, aMaterial, Materials.TungstenSteel, new long[]{800000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_HV,Character.valueOf('E'), ItemList.Emitter_HV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('B'), ItemList.Battery_RE_HV_Sodium.get(1L, new Object[0])});
     }
 }
\ No newline at end of file