maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #2478; make sure to use correct units when calculating fuel usage per tick (#2499)

Browse source
This commit is contained in:
Dave Smith 2021-09-16 14:25:02 -06:00 committed by GitHub
parent 086ad25a47
commit 41422f4a66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java
View file

@ -59,8 +59,8 @@ public abstract class BaseFluidGeneratorBlockEntity extends PowerAcceptorBlockEn
protected long lastOutput = 0;
/*
* We use this to keep track of fractional millibuckets, allowing us to hit
* our eu/bucket targets while still only ever removing integer millibucket
* We use this to keep track of fractional fluid units, allowing us to hit
* our eu/bucket targets while still only ever removing integer fluid unit
* amounts.
*/
double pendingWithdraw = 0.0;
@ -110,10 +110,12 @@ public abstract class BaseFluidGeneratorBlockEntity extends PowerAcceptorBlockEn
if (currentRecipe != null) {
final int euPerBucket = currentRecipe.getEnergyPerBucket();
final float millibucketsPerTick = euTick * 1000 / (float) euPerBucket;
// Make sure to calculate the fluid used per tick based on the underlying fluid unit (droplets)
final float fluidPerTick = (euTick / (euPerBucket / (float)FluidValue.BUCKET.getRawValue()));
if (tryAddingEnergy(euTick)) {
pendingWithdraw += millibucketsPerTick;
pendingWithdraw += fluidPerTick;
final int currentWithdraw = (int) pendingWithdraw;
pendingWithdraw -= currentWithdraw;
tank.getFluidInstance().subtractAmount(FluidValue.fromRaw(currentWithdraw));