From 6db06249fbede596ad278a03a29b1fb4aac27073 Mon Sep 17 00:00:00 2001
From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Date: Wed, 18 Apr 2018 18:05:17 +0200
Subject: Try to make GT++ Ores work + Version increase

---
 .../items/behaviours/BehaviourDetravToolElectricProPick.java   |  4 ++++
 .../detrav/items/behaviours/BehaviourDetravToolProPick.java    | 10 ++++++++++
 2 files changed, 14 insertions(+)

(limited to 'src/main/java/com/detrav/items')

diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
index 70b5296e00..8b8732a848 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
@@ -10,6 +10,7 @@ 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 net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -112,6 +113,9 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
                                             }
                                         }
                                     }
+                                   else if (tBlock instanceof BlockBaseOre) {
+                                    	packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, new Short((short) (7000+(short) ((BlockBaseOre) tBlock).getMaterialEx().calculateProtons())));
+                                   }
                                     else if (data == 1) {
                                         ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
                                         if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
index c4a12e42bd..16b6a94e5d 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
@@ -12,6 +12,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;
@@ -137,6 +138,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"))) {
-- 
cgit