* Updated gregtech to 5.09.28

5 files changed, 7 insertions, 49 deletions

diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java
index 93fcf78618..e972c4da8e 100644
--- a/src/main/java/com/detrav/DetravScannerMod.java
+++ b/src/main/java/com/detrav/DetravScannerMod.java
@@ -22,7 +22,7 @@ import net.minecraftforge.common.config.Configuration;
 public class DetravScannerMod
 {
     public static final String MODID = "detravscannermod";
-    public static final String VERSION = "0.34";
+    public static final String VERSION = "0.35";
 
     public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab();
 
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
index c198c26a56..5d6b351236 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
@@ -130,7 +130,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
                                     }
                                     break;
                                 case 2:
-                                    FluidStack fStack = getUndergroundOil(aWorld, c.xPosition * 16 + x, c.zPosition * 16 + z);
+                                    FluidStack fStack = GT_Utility.getUndergroundOil(aWorld, c.xPosition * 16 + x, c.zPosition * 16 + z);
                                     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 +173,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
             if(aWorld.getBlock(aX,aY,aZ) == Blocks.bedrock)
             {
                 if (!aWorld.isRemote) {
-                    FluidStack fStack = getUndergroundOil(aWorld,aX,aZ);
+                    FluidStack fStack = GT_Utility.getUndergroundOil(aWorld,aX,aZ);
                     addChatMassageByValue(aPlayer,fStack.amount/5000,fStack.getLocalizedName());
                     if (!aPlayer.capabilities.isCreativeMode)
                         ((DetravMetaGeneratedTool01)aItem).doDamage(aStack, this.mCosts);
@@ -193,7 +193,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
         }
         if (data < 3)
             if (!aWorld.isRemote) {
-                FluidStack fStack = getUndergroundOil(aWorld, aX, aZ);
+                FluidStack fStack = GT_Utility.getUndergroundOil(aWorld, aX, aZ);
                 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 7840a3bce5..56b2ee18ee 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
@@ -7,6 +7,7 @@ import gregtech.api.items.GT_MetaBase_Item;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
 import gregtech.common.GT_Proxy;
 import gregtech.common.blocks.GT_Block_Ores_Abstract;
 import gregtech.common.blocks.GT_TileEntity_Ores;
@@ -52,7 +53,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
         if(aWorld.getBlock(aX,aY,aZ) == Blocks.bedrock)
         {
             if (!aWorld.isRemote) {
-                FluidStack fStack = getUndergroundOil(aWorld,aX,aZ);
+                FluidStack fStack = GT_Utility.getUndergroundOil(aWorld,aX,aZ);
                 addChatMassageByValue(aPlayer,fStack.amount/5000,fStack.getLocalizedName());
                 if (!aPlayer.capabilities.isCreativeMode)
                     ((DetravMetaGeneratedTool01)aItem).doDamage(aStack, this.mCosts);
@@ -203,44 +204,6 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
             aPlayer.addChatMessage(new ChatComponentText(foundTexts[5] + name));
     }
 
-    public static FluidStack getUndergroundOil(World aWorld, int aX, int aZ) {
-        Random tRandom = new Random((aWorld.getSeed() + (aX / 96) + (7 * (aZ / 96))));
-        int oil = tRandom.nextInt(3);
-        double amount = tRandom.nextInt(50) + tRandom.nextDouble();
-        oil = tRandom.nextInt(4);
-//		System.out.println("Oil: "+(aX/96)+" "+(aZ/96)+" "+oil+" "+amount);
-//		amount = 40;
-        Fluid tFluid = null;
-        switch(oil) {
-            case 0:
-                tFluid = Materials.NatruralGas.mGas;
-                break;
-            case 1:
-                tFluid = Materials.OilLight.mFluid;
-                break;
-            case 2:
-                tFluid = Materials.OilMedium.mFluid;
-                break;
-            case 3:
-                tFluid = Materials.OilHeavy.mFluid;
-                break;
-            default:
-                tFluid = Materials.Oil.mFluid;
-        }
-
-        int tAmount = (int)(Math.pow(amount, 5.0D) / 100.0D);
-        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 > 0 && tInts[0] > 0) {
-                tAmount = tInts[0];
-            }
-        }
-        tAmount -= 5;
-
-        return new FluidStack(tFluid, tAmount);
-    }
-
     public static int getPolution(World aWorld, int aX, int aZ)
     {
         ChunkPosition tPos = new ChunkPosition(aX / 16, 1, aZ / 16);
diff --git a/src/main/java/com/detrav/proxies/CommonProxy.java b/src/main/java/com/detrav/proxies/CommonProxy.java
index f3d78a2aa3..5398c372ae 100644
--- a/src/main/java/com/detrav/proxies/CommonProxy.java
+++ b/src/main/java/com/detrav/proxies/CommonProxy.java
@@ -33,7 +33,7 @@ public class CommonProxy implements IGuiHandler {
     public void onPostLoad() {
         long tBits = GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED
                 | GT_ModHandler.RecipeBits.ONLY_ADD_IF_RESULT_IS_NOT_NULL | GT_ModHandler.RecipeBits.NOT_REMOVABLE;
-        for (Materials aMaterial : Materials.VALUES) {
+        for (Materials aMaterial : Materials.values()) {
             if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial)) {
                 if (!aMaterial.contains(SubTag.NO_SMASHING)) {
                     GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(DetravSimpleItems.toolHeadProPick.get(aMaterial), null, 1L), tBits, new Object[]{"PI", "fh",
diff --git a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_AdvMiner2.java b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_AdvMiner2.java
index 0ed7d9be97..7bc0ffecc2 100644
--- a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_AdvMiner2.java
+++ b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_AdvMiner2.java
@@ -356,11 +356,6 @@ public class Detrav_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBloc
     }
 
     @Override
-    public int getAmountOfOutputs() {
-        return 0;
-    }
-
-    @Override
     public boolean explodesOnComponentBreak(ItemStack aStack) {
         return false;
     }