Merge pull request #6 from bartimaeusnek/master

GT++ Ores 

2 files changed, 38 insertions, 11 deletions

diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
index 70b5296e00..3a588aa74f 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
@@ -1,8 +1,15 @@
 package com.detrav.items.behaviours;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import com.detrav.DetravScannerMod;
 import com.detrav.items.DetravMetaGeneratedTool01;
 import com.detrav.net.DetravNetwork;
 import com.detrav.net.DetravProPickPacket00;
+import com.detrav.utils.GTppHelper;
+
 import gregtech.api.items.GT_MetaBase_Item;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.GT_LanguageManager;
@@ -10,6 +17,8 @@ import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.common.GT_UndergroundOil;
 import gregtech.common.blocks.GT_Block_Ores_Abstract;
 import gregtech.common.blocks.GT_TileEntity_Ores;
+import gtPlusPlus.core.block.base.BlockBaseOre;
+import gtPlusPlus.core.material.Material;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -21,10 +30,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.fluids.FluidStack;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
 /**
  * Created by wital_000 on 19.03.2016.
  */
@@ -34,8 +39,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
         super(aCosts);
     }
 
-    public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
-
+	public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
         if (!aWorld.isRemote) {
             int data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack).intValue();
             if (aPlayer.isSneaking()) {
@@ -88,7 +92,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
                         int ySize = c.getHeightValue(x, z);//(int)aPlayer.posY;//c.getHeightValue(x, z);
                         for (int y = 1; y < ySize; y++) {
                             switch (data) {
-                                case 0:
+                                case 0: 
                                 case 1:
                                     Block tBlock = c.getBlock(x,y,z);
                                     short tMetaID = (short)c.getBlockMetadata(x,y,z);
@@ -112,6 +116,17 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
                                             }
                                         }
                                     }
+                                    else if (tBlock instanceof BlockBaseOre) {
+                                    	Short packaged = 0;
+                                    	Material m = ((BlockBaseOre) tBlock).getMaterialEx();
+                                    	packaged = GTppHelper.encodeoresGTpp.get(m);
+                                    	try {
+                                    	packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, (short) (packaged+7000));
+                                    	}
+                                        catch(Exception e) {
+                                        	
+                                        }
+                                    	}
                                     else if (data == 1) {
                                         ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
                                         if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {
@@ -142,7 +157,8 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
                                     packet.addBlock(c.xPosition * 16 + x, 1, c.zPosition * 16 + z, (short) polution);
                                     break;
                             }
-                            if (data > 1) break;
+                            if (data > 1) 
+                            	break;
                         }
                     }
             }
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
index c4a12e42bd..5dd8ddd55d 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
@@ -1,6 +1,10 @@
 package com.detrav.items.behaviours;
 
+import java.util.HashMap;
+import java.util.Random;
+
 import com.detrav.items.DetravMetaGeneratedTool01;
+
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.items.GT_MetaBase_Item;
@@ -12,6 +16,7 @@ import gregtech.common.GT_UndergroundOil;
 import gregtech.common.blocks.GT_Block_Ores_Abstract;
 import gregtech.common.blocks.GT_TileEntity_Ores;
 import gregtech.common.items.behaviors.Behaviour_None;
+import gtPlusPlus.core.block.base.BlockBaseOre;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
@@ -23,9 +28,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.fluids.FluidStack;
 
-import java.util.HashMap;
-import java.util.Random;
-
 /**
  * Created by wital_000 on 19.03.2016.
  */
@@ -137,6 +139,15 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
                                     }
                                 }
                             }
+                        } else if (tBlock instanceof BlockBaseOre) {
+                        	String name = tBlock.getLocalizedName();
+                        	if (!ores.containsKey(name))
+                                ores.put(name, 1);
+                            else {
+                                int val = ores.get(name);
+                                ores.put(name, val + 1);
+                            }
+                        	
                         } else if (data == 1) {
                             tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
                             if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {