Fix - Added compatibility for GregTech 5.09.31.02

2 files changed, 8 insertions, 12 deletions

diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
index 5d6b351236..c500795e5d 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
@@ -11,6 +11,7 @@ import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.blocks.GT_Block_Ores_Abstract;
 import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.common.GT_UndergroundOil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
@@ -130,7 +131,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
                                     }
                                     break;
                                 case 2:
-                                    FluidStack fStack = GT_Utility.getUndergroundOil(aWorld, c.xPosition * 16 + x, c.zPosition * 16 + z);
+                                    FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(c.xPosition * 16 + x, c.zPosition * 16 + z), -1);
                                     if (fStack.amount > 10000) {
                                         packet.addBlock(c.xPosition * 16 + x, 2, c.zPosition * 16 + z, (short) (fStack.amount / 5000));
                                         packet.addBlock(c.xPosition * 16 + x, 1, c.zPosition * 16 + z, (short) fStack.getFluidID());
@@ -173,7 +174,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
             if(aWorld.getBlock(aX,aY,aZ) == Blocks.bedrock)
             {
                 if (!aWorld.isRemote) {
-                    FluidStack fStack = GT_Utility.getUndergroundOil(aWorld,aX,aZ);
+                    FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1);
                     addChatMassageByValue(aPlayer,fStack.amount/5000,fStack.getLocalizedName());
                     if (!aPlayer.capabilities.isCreativeMode)
                         ((DetravMetaGeneratedTool01)aItem).doDamage(aStack, this.mCosts);
@@ -193,7 +194,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
         }
         if (data < 3)
             if (!aWorld.isRemote) {
-                FluidStack fStack = GT_Utility.getUndergroundOil(aWorld, aX, aZ);
+                FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1);
                 addChatMassageByValue(aPlayer, fStack.amount / 5000, fStack.getLocalizedName());
                 if (!aPlayer.capabilities.isCreativeMode)
                     ((DetravMetaGeneratedTool01) aItem).doDamage(aStack, this.mCosts);
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
index 6b5fa11e57..78b6eb53b7 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
@@ -12,6 +12,8 @@ import gregtech.common.GT_Proxy;
 import gregtech.common.blocks.GT_Block_Ores_Abstract;
 import gregtech.common.blocks.GT_TileEntity_Ores;
 import gregtech.common.items.behaviors.Behaviour_None;
+import gregtech.common.GT_UndergroundOil;
+import gregtech.common.GT_Pollution;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
@@ -53,7 +55,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
         if(aWorld.getBlock(aX,aY,aZ) == Blocks.bedrock)
         {
             if (!aWorld.isRemote) {
-                FluidStack fStack = GT_Utility.getUndergroundOil(aWorld,aX,aZ);
+                FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1);
                 addChatMassageByValue(aPlayer,fStack.amount/5000,fStack.getLocalizedName());
                 if (!aPlayer.capabilities.isCreativeMode)
                     ((DetravMetaGeneratedTool01)aItem).doDamage(aStack, this.mCosts);
@@ -210,13 +212,6 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
 
     public static int getPolution(World aWorld, int aX, int aZ)
     {
-        ChunkPosition tPos = new ChunkPosition(aX / 16, 1, aZ / 16);
-        if(GT_Proxy.chunkData.containsKey(tPos)) {
-            int[] tInts = (int[])GT_Proxy.chunkData.get(tPos);
-            if(tInts.length > 1 && tInts[1] > 0) {
-                return tInts[1];
-            }
-        }
-        return 0;
+        return GT_Pollution.getPollution(aWorld.getChunkFromBlockCoords(aX, aZ));
     }
 }
\ No newline at end of file