+ Added recipes for all Multipickaxes.

% Improved handling of xmod item integration.
% Changed the way the Skookum Choocher works, now it's mode is toggle with shift+Rightclick.
- Removed some old textures and committed some classes I missed in earlier updates.

2 files changed, 169 insertions, 25 deletions

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
index 1c4b4bc6c9..fcd991583b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
@@ -3,7 +3,6 @@ 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;
@@ -13,33 +12,57 @@ 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.");
+extends Behaviour_None {
+	private boolean isWrench = true;
+	private final Behaviour_Wrench wrench = new Behaviour_Wrench(150);
+	private final Behaviour_Prospecting_Ex prospecting = new Behaviour_Prospecting_Ex(10, 1250);
+	private String mTooltip1 = GT_LanguageManager.addStringLocalization("gt.behaviour.choochering1", "Current tool mode: ");
+	private String mTooltip2 = GT_LanguageManager.addStringLocalization("gt.behaviour.choochering2", "Change tool mode using Shift+Rightclick.");
+	private final String mTooltipH = GT_LanguageManager.addStringLocalization("gt.behaviour.prospectingEx", "Usable for Prospecting large areas.");
+	private final String mTooltipW = GT_LanguageManager.addStringLocalization("gt.behaviour.wrench", "Rotates Blocks on Rightclick.");
 
-    public Behaviour_Choocher() {
-    	
-    }
+	public Behaviour_Choocher() {
 
-    @Override
+	}
+
+	@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;
-    }
+		if (aWorld.isRemote) {
+			return false;
+		}
+		if (aPlayer.isSneaking()){
+			if (isWrench){
+				isWrench = false;
+				return false;
+			}
+			isWrench = true; 
+			return false;
+		}
+		else if (!aPlayer.isSneaking()){
+			if (isWrench){
+				wrench.onItemUseFirst(aItem, aStack, aPlayer, aWorld, aSide, aSide, aSide, aSide, hitZ, hitZ, hitZ);
+				return false;
+			}
+			prospecting.onItemUseFirst(aItem, aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ);
+			return false;
+		}
+		return false;
+	}
 
+	@Override
 	public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
-        aList.add(this.mTooltip);
-        return aList;
-    }
+
+		  
+		if (isWrench){
+			aList.add(this.mTooltip1+"Wrench");   
+			aList.add(this.mTooltipW);
+		}
+		else {
+			aList.add(this.mTooltip1+"Prospecting");   
+			aList.add(this.mTooltipH);
+		}
+		aList.add(this.mTooltip2);
+
+		return aList;
+	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
new file mode 100644
index 0000000000..7093a23511
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
@@ -0,0 +1,121 @@
+package gtPlusPlus.xmod.gregtech.common.items.behaviours;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.Materials;
+import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.objects.ItemData;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.blocks.GT_Block_Ores;
+import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.common.items.behaviors.Behaviour_Prospecting;
+
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.IFluidBlock;
+
+public class Behaviour_Prospecting_Ex
+        extends Behaviour_Prospecting {
+    private final int mVanillaCosts;
+    private final int mEUCosts;
+
+    public Behaviour_Prospecting_Ex(int aVanillaCosts, int aEUCosts) {
+        super(aVanillaCosts, aEUCosts);
+        this.mVanillaCosts = aVanillaCosts;
+        this.mEUCosts = aEUCosts;
+    }
+
+    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;
+        }
+        Block aBlock = aWorld.getBlock(aX, aY, aZ);
+        if (aBlock == null) {
+            return false;
+        }
+        byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);
+
+
+        ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta));
+        if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {
+            GT_Utility.sendChatToPlayer(aPlayer, "This is " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore.");
+            GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(1)), 1.0F, -1.0F, aX, aY, aZ);
+            return true;
+        }
+        if ((aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone)) || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites)) || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.netherrack)) || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.end_stone)) || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.dirt)) ||(aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.grass))  ) {
+            if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) {
+                GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(Integer.valueOf(1)), 1.0F, -1.0F, aX, aY, aZ);
+                int tX = aX;
+                int tY = aY;
+                int tZ = aZ;
+                int tMetaID = 0;
+                int tQuality = ((aItem instanceof GT_MetaGenerated_Tool) ? ((GT_MetaGenerated_Tool) aItem).getHarvestLevel(aStack, "") : 0)*3;
+
+                int i = 0;
+                for (int j = 6 + tQuality; i < j; i++) {
+                    tX -= ForgeDirection.getOrientation(aSide).offsetX;
+                    tY -= ForgeDirection.getOrientation(aSide).offsetY;
+                    tZ -= ForgeDirection.getOrientation(aSide).offsetZ;
+
+                    Block tBlock = aWorld.getBlock(tX, tY, tZ);
+                    if ((tBlock == Blocks.lava) || (tBlock == Blocks.flowing_lava)) {
+                        GT_Utility.sendChatToPlayer(aPlayer, "There is Lava behind this Block.");
+                        break;
+                    }
+                    if ((tBlock == Blocks.water) || (tBlock == Blocks.flowing_water) || ((tBlock instanceof IFluidBlock))) {
+                        GT_Utility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Block.");
+                        break;
+                    }
+                    if ((tBlock == Blocks.monster_egg) || (!GT_Utility.hasBlockHitBox(aWorld, tX, tY, tZ))) {
+                        GT_Utility.sendChatToPlayer(aPlayer, "There is an Air Pocket behind this Block.");
+                        break;
+                    }
+                    if (tBlock != aBlock) {
+                        if (i >= 4) {
+                            break;
+                        }
+                        GT_Utility.sendChatToPlayer(aPlayer, "Material is changing behind this Block.");
+                        break;
+                    }
+                }
+                Random tRandom = new Random(aX ^ aY ^ aZ ^ aSide);
+                i = 0;
+                for (int j = 9 + 2 * tQuality; i < j; i++) {
+                    tX = aX - 4 - tQuality + tRandom.nextInt(j);
+                    tY = aY - 4 - tQuality + tRandom.nextInt(j);
+                    tZ = aZ - 4 - tQuality + tRandom.nextInt(j);
+                    Block tBlock = aWorld.getBlock(tX, tY, tZ);
+                    if ((tBlock instanceof GT_Block_Ores)) {
+                        TileEntity tTileEntity = aWorld.getTileEntity(tX, tY, tZ);
+                        if ((tTileEntity instanceof GT_TileEntity_Ores)) {
+                            Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData % 1000)];
+                            if ((tMaterial != null) && (tMaterial != Materials._NULL)) {
+                                GT_Utility.sendChatToPlayer(aPlayer, "Found traces of " + tMaterial.mDefaultLocalName + " Ore.");
+                                return true;
+                            }
+                        }
+                    } else {
+                        tMetaID = aWorld.getBlockMetadata(tX, tY, tZ);
+                        tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
+                        if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {
+                            GT_Utility.sendChatToPlayer(aPlayer, "Found traces of " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore.");
+                            return true;
+                        }
+                    }
+                }
+                GT_Utility.sendChatToPlayer(aPlayer, "No Ores found.");
+            }
+            return true;
+        }
+        return false;
+    }
+}