$ Fixed the Skookum Choocher.

$ Now it Renders properly and functions as a GT-esque type tool.
- Removed static calls to excluded build classes.
% Started changing things to final in all cases. (Apparently better Java practice)

3 files changed, 29 insertions, 17 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
index 2ee00f99d4..b63ea674ad 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -3,11 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.items;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.enums.ToolDictNames;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechToolDictNames;
-import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
 import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_Choocher;
 
-public class MetaGeneratedGregtechTools extends Gregtech_MetaTool {
+public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
     
     public static final short TURBINE_SMALL = 10;
     public static final short TURBINE = 12;
@@ -19,11 +20,11 @@ public class MetaGeneratedGregtechTools extends Gregtech_MetaTool {
     public static final short SOFTHAMMER = 22;
     public static final short WRENCH = 24;
     
-    public static MetaGeneratedGregtechTools INSTANCE;
+    public static GT_MetaGenerated_Tool_01 INSTANCE;
 
     public MetaGeneratedGregtechTools() {
-        super("MU-metaitem.02");
-        INSTANCE = this;
+        super("GT++_metatool");
+        INSTANCE = GT_MetaGenerated_Tool_01.INSTANCE;
         
         GregTech_API.registerTool(addTool(7734, "Skookum Choocher", "Can Really Chooch. Does a Skookum job at Hammering and Wrenching stuff.", new TOOL_Gregtech_Choocher(), new Object[]{GregtechToolDictNames.craftingToolSkookumChoocher, ToolDictNames.craftingToolHardHammer, ToolDictNames.craftingToolWrench, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)}), GregTech_API.sWrenchList);
         
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java
index 11e8a6b240..d46e777f47 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Base.java
@@ -2,7 +2,7 @@ package gtPlusPlus.xmod.gregtech.common.tools;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.damagesources.GT_DamageSources;
-import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats;
+import gregtech.api.interfaces.IToolStats;
 import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
 
 import java.util.List;
@@ -20,7 +20,7 @@ import net.minecraft.util.IChatComponent;
 import net.minecraftforge.event.world.BlockEvent;
 
 public abstract class TOOL_Gregtech_Base
-implements Interface_ToolStats {
+implements IToolStats {
 	public static final Enchantment[] FORTUNE_ENCHANTMENT = {Enchantment.fortune};
 	public static final Enchantment[] LOOTING_ENCHANTMENT = {Enchantment.looting};
 	public static final Enchantment[] ZERO_ENCHANTMENTS = new Enchantment[0];
@@ -152,7 +152,6 @@ implements Interface_ToolStats {
 		aPlayer.triggerAchievement(AchievementList.buildWorkBench);
 	}
 	
-	@Override
 	public void onStatsAddedToTool(Gregtech_MetaTool aItem, int aID) {
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
index 42d8750f24..ce652bdda8 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Choocher.java
@@ -2,14 +2,14 @@ package gtPlusPlus.xmod.gregtech.common.tools;
 
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.items.GT_MetaGenerated_Tool;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
-import gtPlusPlus.xmod.gregtech.api.enums.CustomGtTextures;
+import gregtech.common.items.behaviors.Behaviour_Prospecting;
+import gregtech.common.items.behaviors.Behaviour_Wrench;
 import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
-import gtPlusPlus.xmod.gregtech.api.items.types.ToolType_HardHammer;
-import gtPlusPlus.xmod.gregtech.api.items.types.ToolType_Wrench;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
 
 import java.util.Arrays;
 import java.util.List;
@@ -157,8 +157,10 @@ public class TOOL_Gregtech_Choocher
         return null;
     }
 
-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
-        return aIsToolHead ? CustomGtTextures.ItemIcons.SKOOKUMCHOOCHER : Gregtech_MetaTool.getSecondaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex];
+    @Override
+	public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {
+    	//Utils.LOG_INFO("Texture: "+TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile());
+        return TexturesGtTools.SKOOKUM_CHOOCHER;
     }
     
    /* @Override
@@ -176,13 +178,13 @@ public class TOOL_Gregtech_Choocher
     
     @Override
 	public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
-		return aIsToolHead ? Gregtech_MetaTool.getPrimaryMaterial(aStack).mRGBa : null;
+		return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
 	}
 
     @Override
 	public void onStatsAddedToTool(Gregtech_MetaTool aItem, int aID) {
-        aItem.addItemBehavior(aID, new ToolType_Wrench(150));
-        aItem.addItemBehavior(aID, new ToolType_HardHammer(1, 1250));
+        aItem.addItemBehavior(aID, new Behaviour_Wrench(150));
+        aItem.addItemBehavior(aID, new Behaviour_Prospecting(1, 1250));
     }
 
     @Override
@@ -200,4 +202,14 @@ public class TOOL_Gregtech_Choocher
 	public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {
         return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been Choochered by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
     }
+
+	@Override
+	public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
+		
+	}
+
+	@Override
+	public boolean isGrafter() {
+		return false;
+	}
 }