dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exporter in fluid mode no longer duplicates fluids that are less than 1 bucket, fixes #369

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-09-20 17:22:40 +02:00
parent a16898231a
commit 4323f872cf
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/refinedstorage/tile/TileExporter.java
View File

@@ -84,13 +84,19 @@ public class TileExporter extends TileMultipartNode implements IComparable, ITyp
if (handler != null) {
for (FluidStack stack : fluidFilters.getFluids()) {
if (stack != null) {
FluidStack took = network.extractFluid(stack, Fluid.BUCKET_VOLUME, compare);
FluidStack stackInStorage = network.getFluidStorage().get(stack, compare);
if (took != null) {
int remainder = Fluid.BUCKET_VOLUME - handler.fill(took, true);
if (stackInStorage != null) {
int toExtract = Math.min(Fluid.BUCKET_VOLUME, stackInStorage.amount);
if (remainder > 0) {
network.insertFluid(took, remainder, false);
FluidStack took = network.extractFluid(stack, toExtract, compare);
if (took != null) {
int remainder = toExtract - handler.fill(took, true);
if (remainder > 0) {
network.insertFluid(took, remainder, false);
}
}
}
}

4
src/main/java/refinedstorage/tile/config/RedstoneMode.java
View File

@@ -22,9 +22,9 @@ public enum RedstoneMode {
return world.isBlockPowered(pos);
case LOW:
return !world.isBlockPowered(pos);
default:
return false;
}
return false;
}
public void write(NBTTagCompound tag) {