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

Fix all fluid external storage bugs

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-08-22 01:16:59 +02:00
parent ff8497ca25
commit 2a9854d767
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/refinedstorage/api/storage/CompareUtils.java
View File

@@ -98,6 +98,12 @@ public final class CompareUtils {
return false;
}
if ((flags & COMPARE_QUANTITY) == COMPARE_QUANTITY) {
if (left.amount != right.amount) {
return false;
}
}
if ((flags & COMPARE_NBT) == COMPARE_NBT) {
if (left.tag != null && !left.tag.equals(right)) {
return false;

26
src/main/java/refinedstorage/tile/externalstorage/FluidStorageExternal.java
View File

@@ -18,23 +18,29 @@ public class FluidStorageExternal implements IFluidStorage {
private TileExternalStorage externalStorage;
private IFluidHandler handler;
private IFluidTankProperties properties;
public FluidStorageExternal(TileExternalStorage externalStorage, IFluidHandler handler, IFluidTankProperties properties) {
this.externalStorage = externalStorage;
this.handler = handler;
this.properties = properties;
}
public IFluidTankProperties getProperties() {
return handler.getTankProperties().length != 0 ? handler.getTankProperties()[0] : null;
}
public FluidStack getContents() {
return getProperties() == null ? null : getProperties().getContents();
}
@Override
public List<FluidStack> getStacks() {
return properties.getContents() == null ? Collections.emptyList() : Collections.singletonList(properties.getContents().copy());
return getContents() == null ? Collections.emptyList() : Collections.singletonList(getContents().copy());
}
@Nullable
@Override
public FluidStack insertFluid(@Nonnull FluidStack stack, int size, boolean simulate) {
if (IFilterable.canTakeFluids(externalStorage.getFluidFilters(), externalStorage.getMode(), externalStorage.getCompare(), stack) && properties.canFillFluidType(stack)) {
if (getProperties() != null && IFilterable.canTakeFluids(externalStorage.getFluidFilters(), externalStorage.getMode(), externalStorage.getCompare(), stack) && getProperties().canFillFluidType(stack)) {
int filled = handler.fill(FluidUtils.copyStackWithSize(stack, size), !simulate);
if (filled == size) {
@@ -52,7 +58,7 @@ public class FluidStorageExternal implements IFluidStorage {
public FluidStack extractFluid(@Nonnull FluidStack stack, int size, int flags) {
FluidStack toDrain = FluidUtils.copyStackWithSize(stack, size);
if (CompareUtils.compareStack(properties.getContents(), toDrain, flags)) {
if (CompareUtils.compareStack(getContents(), toDrain, flags)) {
return handler.drain(toDrain, true);
}
@@ -61,11 +67,11 @@ public class FluidStorageExternal implements IFluidStorage {
@Override
public int getStored() {
return properties.getContents() != null ? properties.getContents().amount : 0;
return getContents() != null ? getContents().amount : 0;
}
public int getCapacity() {
return properties.getCapacity();
return getProperties() != null ? getProperties().getCapacity() : 0;
}
@Override
@@ -74,11 +80,11 @@ public class FluidStorageExternal implements IFluidStorage {
}
public boolean updateCache() {
FluidStack stack = properties.getContents();
FluidStack stack = getContents();
if (cache == null) {
cache = FluidUtils.copy(stack);
} else if (!CompareUtils.compareStack(stack, cache, CompareUtils.COMPARE_NBT)) {
} else if (!CompareUtils.compareStack(stack, cache, CompareUtils.COMPARE_NBT | CompareUtils.COMPARE_QUANTITY)) {
cache = FluidUtils.copy(stack);
return true;
@@ -88,6 +94,6 @@ public class FluidStorageExternal implements IFluidStorage {
}
public void updateCacheForcefully() {
cache = FluidUtils.copy(properties.getContents());
cache = FluidUtils.copy(getContents());
}
}

1
src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
View File

@@ -142,7 +142,6 @@ public class TileExternalStorage extends TileMultipartNode implements IItemStora
network.getItemStorage().rebuild();
}
// @TODO: This is broken?
if (fluidChangeDetected) {
network.getFluidStorage().rebuild();
}