Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Optimize a bit

Browse source
This commit is contained in:
Technus 2017-09-13 21:25:48 +02:00
parent 339494f8c3
commit d111a4f130
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/gregtech/common/GT_UndergroundOil.java
View file

@ -82,18 +82,24 @@ public class GT_UndergroundOil {
//do stuff on it if needed
if(drainSpeedCoefficient>=0){
if(fluidInChunk.amount<DIVIDER || fluidInChunk.amount<=(uoFluid.DecreasePerOperationAmount*(double)drainSpeedCoefficient)+1){
int fluidExtracted=(int)Math.floor(fluidInChunk.amount * (double) drainSpeedCoefficient / DIVIDER);
double averageDecrease=uoFluid.DecreasePerOperationAmount * (double)drainSpeedCoefficient;
int decrease=(int)Math.ceil(averageDecrease);
if(fluidExtracted<=0 || fluidInChunk.amount<=decrease){//decrease - here it is max value of extraction for easy check
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
double avrDecrease=uoFluid.DecreasePerOperationAmount * (double)drainSpeedCoefficient;
int decrease=(int)Math.floor(avrDecrease);
decrease+=random.nextFloat()<(avrDecrease-decrease)?1:0;
tInts[GTOIL]-=decrease;//diminish amount
fluidInChunk.amount = fluidExtracted;//give appropriate amount
if(random.nextFloat()<(decrease-averageDecrease)) decrease--;//use random to "subtract double from int"
//ex.
// averageDecrease=3.9
// decrease= ceil from 3.9 = 4
// decrease-averageDecrease=0.1 -> chance to subtract 1
// if random is < chance then subtract 1
tInts[GTOIL]-=decrease;//diminish amount, "randomly" adjusted to double value (averageDecrease)
}
}else{//just get info
if(fluidInChunk.amount<DIVIDER || fluidInChunk.amount<=(uoFluid.DecreasePerOperationAmount*(double)drainSpeedCoefficient)+1){
if(fluidInChunk.amount<=DIVIDER){
fluidInChunk.amount=0;//return informative stack
tInts[GTOIL]=0;//so in next access it will stop way above
}else{