Merge pull request #13 from draknyte1/NewMatSystem

New Back-end systems for dynamic Material (Alloys) and Tool generation.
Also fixes a few issues with other things, which were noticed during development of the new systems.

2 files changed, 65 insertions, 28 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..d5bd4c134c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -3,37 +3,29 @@ 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 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 static final short TURBINE_SMALL = 10;
-    public static final short TURBINE = 12;
-    public static final short TURBINE_LARGE = 14;
-    public static final short HUGE_ITEM = 16;
-    public static final short TURBINE_BLADE = 18;
-    
-    public static final short HARDHAMMER = 20;
-    public static final short SOFTHAMMER = 22;
-    public static final short WRENCH = 24;
-    
-    public static MetaGeneratedGregtechTools INSTANCE;
+public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
 
-    public MetaGeneratedGregtechTools() {
-        super("MU-metaitem.02");
-        INSTANCE = this;
-        
-        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);
-        
-        
-        //GregTech_API.registerTool(addTool(WRENCH, "Wrench", "Hold Leftclick to dismantle Machines", (Interface_ToolStats) new GT_Tool_Wrench(), new Object[]{ToolDictNames.craftingToolWrench, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)}), GregTech_API.sWrenchList);
-        
-        //addTool(TURBINE_SMALL, "Small Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Small(), new Object[]{});
-        //addTool(TURBINE, "Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Normal(), new Object[]{});
-        //addTool(TURBINE_LARGE, "Large Turbine", "Turbine Rotors for your power station", new GT_Tool_Turbine_Large(), new Object[]{});
-        //addTool(HUGE_ITEM, "Huge Item", "Item 4 for your power station", new TOOL_Gregtech_MaxEfficiencyMultiBlockItem(), new Object[]{});
+	public static final short SKOOKUM_CHOOCHER = 7734;
+	public static MetaGeneratedGregtechTools INSTANCE;
 
-    }
+	public MetaGeneratedGregtechTools() {
+		super("plusplus.metatool.01");
+		INSTANCE = this;       
+		GregTech_API.registerTool(
+				addTool(
+						SKOOKUM_CHOOCHER, "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/items/behaviours/Behaviour_Choocher.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
new file mode 100644
index 0000000000..1c4b4bc6c9
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
@@ -0,0 +1,45 @@
+package gtPlusPlus.xmod.gregtech.common.items.behaviours;
+
+import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.common.items.behaviors.Behaviour_None;
+import gregtech.common.items.behaviors.Behaviour_Prospecting;
+import gregtech.common.items.behaviors.Behaviour_Wrench;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class Behaviour_Choocher
+        extends Behaviour_None {
+    private final Behaviour_Wrench wrench = new Behaviour_Wrench(150);
+    private final Behaviour_Prospecting prospecting = new Behaviour_Prospecting(1, 1250);
+    private final String mTooltip = GT_LanguageManager.addStringLocalization("gt.behaviour.choochering", "Wrench by default, Hold shift & Right click to prospect.");
+
+    public Behaviour_Choocher() {
+    	
+    }
+
+    @Override
+	public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
+        if (aWorld.isRemote) {
+            return false;
+        }
+        if (!aPlayer.isSneaking()){
+        	//Utils.LOG_INFO("Using Choocher as a wrench.");
+        	wrench.onItemUseFirst(aItem, aStack, aPlayer, aWorld, aSide, aSide, aSide, aSide, hitZ, hitZ, hitZ);
+        	return false;
+        }
+    	//Utils.LOG_INFO("Using Choocher as a hard hammer.");
+		prospecting.onItemUseFirst(aItem, aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ);
+        
+        return false;
+    }
+
+	public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
+        aList.add(this.mTooltip);
+        return aList;
+    }
+}