From 275857085d3da2a1d1a73d18949e6785fccc21cd Mon Sep 17 00:00:00 2001
From: Technus <daniel112092@gmail.com>
Date: Wed, 13 Sep 2017 20:49:37 +0200
Subject: Add more uo methods for reading easily, make consumption scaleable
 Makes the code more A ok

---
 src/main/java/gregtech/api/util/GT_Utility.java    |  4 ++--
 .../java/gregtech/common/GT_UndergroundOil.java    | 23 ++++++++++++++++------
 .../GT_MetaTileEntity_AdvSeismicProspector.java    |  2 +-
 .../basic/GT_MetaTileEntity_SeismicProspector.java |  2 +-
 .../multi/GT_MetaTileEntity_OilDrillBase.java      | 17 ++++++++--------
 5 files changed, 30 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index e6bfacdf67..9f890ec412 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -71,7 +71,7 @@ import java.util.Map.Entry;
 
 import static gregtech.api.enums.GT_Values.*;
 import static gregtech.common.GT_Proxy.GTPOLLUTION;
-import static gregtech.common.GT_UndergroundOil.undergroundOil;
+import static gregtech.common.GT_UndergroundOil.undergroundOilReadInformation;
 
 /**
  * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
@@ -1770,7 +1770,7 @@ public class GT_Utility {
         }
         
         if (aPlayer.capabilities.isCreativeMode) {
-            FluidStack tFluid = undergroundOil(aWorld.getChunkFromBlockCoords(aX,aZ),-1);//-# to only read
+            FluidStack tFluid = undergroundOilReadInformation(aWorld.getChunkFromBlockCoords(aX,aZ));//-# to only read
             if (tFluid!=null)
             	tList.add(EnumChatFormatting.GOLD+tFluid.getLocalizedName()+EnumChatFormatting.RESET+": " +EnumChatFormatting.YELLOW+ tFluid.amount +EnumChatFormatting.RESET+" L");
             else
diff --git a/src/main/java/gregtech/common/GT_UndergroundOil.java b/src/main/java/gregtech/common/GT_UndergroundOil.java
index a4354a17b5..05bb338d85 100644
--- a/src/main/java/gregtech/common/GT_UndergroundOil.java
+++ b/src/main/java/gregtech/common/GT_UndergroundOil.java
@@ -19,6 +19,15 @@ import static gregtech.common.GT_Proxy.*;
  */
 public class GT_UndergroundOil {
     public static final short DIVIDER=5000;
+    private static final XSTR random=new XSTR();
+
+    public static FluidStack undergroundOilReadInformation(IGregTechTileEntity te){
+        return undergroundOil(te.getWorld().getChunkFromBlockCoords(te.getXCoord(),te.getZCoord()),-1);
+    }
+
+    public static FluidStack undergroundOilReadInformation(Chunk chunk) {
+        return undergroundOil(chunk,-1);
+    }
 
     public static FluidStack undergroundOil(IGregTechTileEntity te, float drainSpeedCoefficient){
         return undergroundOil(te.getWorld().getChunkFromBlockCoords(te.getXCoord(),te.getZCoord()),drainSpeedCoefficient);
@@ -46,7 +55,7 @@ public class GT_UndergroundOil {
         }
 
         //GEN IT TO GET OBJECT...
-        XSTR tRandom = new XSTR(aWorld.getSeed() + aWorld.provider.dimensionId * 2 +
+        final XSTR tRandom = new XSTR(aWorld.getSeed() + aWorld.provider.dimensionId * 2 +
                        (chunk.getChunkCoordIntPair().chunkXPos>>3) +
                 8267 * (chunk.getChunkCoordIntPair().chunkZPos>>3));
         GT_UO_Fluid uoFluid = GT_Mod.gregtechproxy.mUndergroundOil.GetDimension(aWorld.provider.dimensionId).getRandomFluid(tRandom);
@@ -65,8 +74,7 @@ public class GT_UndergroundOil {
                 fluidInChunk = new FluidStack(uoFluid.getFluid(),tInts[GTOIL]);
             }else{
                 fluidInChunk  = new FluidStack(uoFluid.getFluid(), uoFluid.getRandomAmount(tRandom));
-                tRandom=new XSTR();
-                fluidInChunk.amount=(int)((float)fluidInChunk.amount*(0.75f+(tRandom.nextFloat()/2f)));//Randomly change amounts by +/- 25%
+                fluidInChunk.amount=(int)((float)fluidInChunk.amount*(0.75f+(random.nextFloat()/2f)));//Randomly change amounts by +/- 25%
             }
             tInts[GTOIL]=fluidInChunk.amount;
             tInts[GTOILFLUID]=fluidInChunk.getFluidID();
@@ -74,15 +82,18 @@ public class GT_UndergroundOil {
 
         //do stuff on it if needed
         if(drainSpeedCoefficient>=0){
-            if(fluidInChunk.amount<DIVIDER || fluidInChunk.amount<uoFluid.DecreasePerOperationAmount){
+            if(fluidInChunk.amount<DIVIDER || fluidInChunk.amount<=(uoFluid.DecreasePerOperationAmount*(double)drainSpeedCoefficient)+1){
                 fluidInChunk=null;
                 tInts[GTOIL]=0;//so in next access it will stop way above
             }else{
                 fluidInChunk.amount = (int)(fluidInChunk.amount*(double)drainSpeedCoefficient/DIVIDER);//give appropriate amount
-                tInts[GTOIL]-=uoFluid.DecreasePerOperationAmount;//diminish amount
+                double avrDecrease=uoFluid.DecreasePerOperationAmount * (double)drainSpeedCoefficient;
+                int decrease=(int)Math.floor(avrDecrease);
+                decrease+=random.nextFloat()<(avrDecrease-decrease)?1:0;
+                tInts[GTOIL]-=decrease;//diminish amount
             }
         }else{//just get info
-            if(fluidInChunk.amount<DIVIDER){
+            if(fluidInChunk.amount<DIVIDER || fluidInChunk.amount<=(uoFluid.DecreasePerOperationAmount*(double)drainSpeedCoefficient)+1){
                 fluidInChunk.amount=0;//return informative stack
                 tInts[GTOIL]=0;//so in next access it will stop way above
             }else{
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
index b0f36ae7e5..3099959501 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
@@ -145,7 +145,7 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
                 {
                 	ChunkPosition tPos = new ChunkPosition(GT_Utility.getScaleCoordinates(x*16,96), 0, GT_Utility.getScaleCoordinates(z*16,96));
                 	ChunkCoordIntPair cInts = getBaseMetaTileEntity().getWorld().getChunkFromChunkCoords(tPos.chunkPosX,tPos.chunkPosZ).getChunkCoordIntPair();
-                	FluidStack tFluid = GT_UndergroundOil.undergroundOil(getBaseMetaTileEntity().getWorld().getChunkFromChunkCoords(tPos.chunkPosX,tPos.chunkPosZ),-1);
+                	FluidStack tFluid = GT_UndergroundOil.undergroundOilReadInformation(getBaseMetaTileEntity().getWorld().getChunkFromChunkCoords(tPos.chunkPosX,tPos.chunkPosZ));
             		if (tFluid != null)
 	                	if (tFluids.containsKey(cInts)) {
 	                		if (tFluids.get(cInts).amount<tFluid.amount)
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
index de9b656941..f6c5013a7b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
@@ -103,7 +103,7 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic
                     }
                 }
                 if(tStringList.size()<1){tStringList.add("No Ores found.");}
-                FluidStack tFluid = GT_UndergroundOil.undergroundOil(getBaseMetaTileEntity(),-1);
+                FluidStack tFluid = GT_UndergroundOil.undergroundOilReadInformation(getBaseMetaTileEntity());
                 String[] tStringArray = new String[tStringList.size()];
                 {
                     for (int i = 0; i < tStringArray.length; i++) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java
index 23fafc3c7d..9b885717e2 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java
@@ -1,11 +1,5 @@
 package gregtech.common.tileentities.machines.multi;
 
-import static gregtech.api.enums.GT_Values.V;
-import static gregtech.api.enums.GT_Values.VN;
-import static gregtech.common.GT_UndergroundOil.undergroundOil;
-
-import java.util.ArrayList;
-
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.GT_Utility;
@@ -16,6 +10,13 @@ import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
+import java.util.ArrayList;
+
+import static gregtech.api.enums.GT_Values.V;
+import static gregtech.api.enums.GT_Values.VN;
+import static gregtech.common.GT_UndergroundOil.undergroundOil;
+import static gregtech.common.GT_UndergroundOil.undergroundOilReadInformation;
+
 public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_DrillerBase {
 
     private boolean completedCycle = false;
@@ -114,7 +115,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
     private boolean tryFillChunkList(){
         FluidStack tFluid, tOil;
         if (mOilId <= 0) {
-            tFluid = undergroundOil(getBaseMetaTileEntity(), -1);
+            tFluid = undergroundOilReadInformation(getBaseMetaTileEntity());
             if (tFluid == null) return false;
             mOilId = tFluid.getFluidID();
         }
@@ -128,7 +129,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
             for (int i = 0; i < range; i++) {
                 for (int j = 0; j < range; j++) {
                     tChunk = getBaseMetaTileEntity().getWorld().getChunkFromChunkCoords(xChunk + i * xDir, zChunk + j * zDir);
-                    tFluid = undergroundOil(tChunk, -1);
+                    tFluid = undergroundOilReadInformation(tChunk);
                     if (tOil.isFluidEqual(tFluid))
                         mOilFieldChunks.add(tChunk);
                 }
-- 
cgit