refractored code

+added bartworks integration

1 files changed, 12 insertions, 10 deletions

diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
index e9419e310e..4a8655360f 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
@@ -1,12 +1,10 @@
 package com.detrav.items.behaviours;
 
-import java.util.HashMap;
-import java.util.Random;
-import java.util.SplittableRandom;
-
 import com.detrav.DetravScannerMod;
 import com.detrav.items.DetravMetaGeneratedTool01;
-
+import com.detrav.utils.BartWorksHelper;
+import com.detrav.utils.GTppHelper;
+import cpw.mods.fml.common.Loader;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.items.GT_MetaBase_Item;
@@ -18,7 +16,6 @@ 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;
@@ -31,6 +28,9 @@ import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.fluids.FluidStack;
 
+import java.util.HashMap;
+import java.util.SplittableRandom;
+
 /**
  * Created by wital_000 on 19.03.2016.
  */
@@ -216,10 +216,12 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
                                     addOreToHashMap(name, aPlayer);
                                 }
                             }
-                        } else if (tBlock instanceof BlockBaseOre) {
-                        	String name = tBlock.getLocalizedName();
-                            addOreToHashMap(name, aPlayer);
-                        	
+                        } else if (Loader.isModLoaded("miscutils") && GTppHelper.isGTppBlock(tBlock) ) {
+                            String name = GTppHelper.getGTppVeinName(tBlock);
+                            if (!name.isEmpty())
+                                addOreToHashMap(name, aPlayer);
+                        } else if (Loader.isModLoaded("bartworks") && BartWorksHelper.isOre(tBlock)){
+                                addOreToHashMap(GT_LanguageManager.getTranslation("bw.blockores.01." + ((BartWorksHelper.getMetaFromBlock(aChunk,x,y,z,tBlock))*-1) + ".name"), aPlayer);
                         } else if (data == 1) {
                             tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
                             if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {