diff --git a/src/main/java/mekanism/common/base/FluidHandlerWrapper.java b/src/main/java/mekanism/common/base/FluidHandlerWrapper.java index 0e01a94f2..1394d99e4 100644 --- a/src/main/java/mekanism/common/base/FluidHandlerWrapper.java +++ b/src/main/java/mekanism/common/base/FluidHandlerWrapper.java @@ -2,10 +2,13 @@ package mekanism.common.base; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.capability.FluidTankProperties; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; +import java.util.Arrays; + public class FluidHandlerWrapper implements IFluidHandler { public IFluidHandlerWrapper wrapper; @@ -21,6 +24,9 @@ public class FluidHandlerWrapper implements IFluidHandler @Override public IFluidTankProperties[] getTankProperties() { + if (side == null){ + return convertReadOnly(wrapper.getAllTanks()); + } return wrapper.getTankInfo(side) != null ? FluidTankProperties.convert(wrapper.getTankInfo(side)) : new IFluidTankProperties[]{}; } @@ -28,6 +34,9 @@ public class FluidHandlerWrapper implements IFluidHandler @Override public int fill(FluidStack resource, boolean doFill) { + if (side == null){ + return 0; + } if(wrapper.canFill(side, resource != null ? resource.getFluid() : null)) { return wrapper.fill(side, resource, doFill); @@ -39,6 +48,10 @@ public class FluidHandlerWrapper implements IFluidHandler @Override public FluidStack drain(FluidStack resource, boolean doDrain) { + if(side == null) + { + return null; + } if(wrapper.canDrain(side, resource != null ? resource.getFluid() : null)) { return wrapper.drain(side, resource, doDrain); @@ -50,6 +63,10 @@ public class FluidHandlerWrapper implements IFluidHandler @Override public FluidStack drain(int maxDrain, boolean doDrain) { + if(side == null) + { + return null; + } if(wrapper.canDrain(side, null)) { return wrapper.drain(side, maxDrain, doDrain); @@ -57,4 +74,8 @@ public class FluidHandlerWrapper implements IFluidHandler return null; } + + private static IFluidTankProperties[] convertReadOnly(FluidTankInfo[] fluidTankInfos){ + return Arrays.stream(fluidTankInfos).map(t->new FluidTankProperties(t.fluid, t.capacity, false, false)).toArray(IFluidTankProperties[]::new); + } } diff --git a/src/main/java/mekanism/common/base/IFluidHandlerWrapper.java b/src/main/java/mekanism/common/base/IFluidHandlerWrapper.java index 013f59cb6..b74864d67 100644 --- a/src/main/java/mekanism/common/base/IFluidHandlerWrapper.java +++ b/src/main/java/mekanism/common/base/IFluidHandlerWrapper.java @@ -18,4 +18,6 @@ public interface IFluidHandlerWrapper boolean canDrain(EnumFacing from, Fluid fluid); FluidTankInfo[] getTankInfo(EnumFacing from); + + FluidTankInfo[] getAllTanks(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java b/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java index d05bad1a9..ad3b7ea94 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java @@ -83,6 +83,12 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl return PipeUtils.EMPTY; } + @Override + public FluidTankInfo[] getAllTanks() + { + return new FluidTankInfo[] { steamTank.getInfo(), waterTank.getInfo() }; + } + @Override public int fill(EnumFacing from, FluidStack resource, boolean doFill) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 5cd5f7e78..c0d8c7fb2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -455,6 +455,12 @@ public class TileEntityChemicalWasher extends TileEntityMachine implements IGasH return PipeUtils.EMPTY; } + @Override + public FluidTankInfo[] getAllTanks() + { + return new FluidTankInfo[] {fluidTank.getInfo()}; + } + @Override public void writeSustainedData(ItemStack itemStack) { diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java b/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java index 26fdb2d67..cd5ee7c75 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicValve.java @@ -28,6 +28,12 @@ public class TileEntityDynamicValve extends TileEntityDynamicTank implements IFl return ((!world.isRemote && structure != null) || (world.isRemote && clientHasStructure)) ? new FluidTankInfo[] {fluidTank.getInfo()} : PipeUtils.EMPTY; } + @Override + public FluidTankInfo[] getAllTanks() + { + return getTankInfo(null); + } + @Override public int fill(EnumFacing from, FluidStack resource, boolean doFill) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 0a6c97cb3..0d3a9d5c1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -453,6 +453,12 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I return PipeUtils.EMPTY; } + @Override + public FluidTankInfo[] getAllTanks() + { + return getTankInfo(EnumFacing.UP); + } + @Override public void setFluidStack(FluidStack fluidStack, Object... data) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 35dc0740d..6695c8306 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -554,6 +554,12 @@ public class TileEntityElectrolyticSeparator extends TileEntityMachine implement return new FluidTankInfo[] {fluidTank.getInfo()}; } + @Override + public FluidTankInfo[] getAllTanks() + { + return getTankInfo(null); + } + @Override public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 7f0aef24a..e0bdff567 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -607,7 +607,13 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc { return new FluidTankInfo[] {fluidTank.getInfo()}; } - + + @Override + public FluidTankInfo[] getAllTanks() + { + return getTankInfo(null); + } + @Override public void setFluidStack(FluidStack fluidStack, Object... data) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index a07c5dd8f..23dcc9587 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -417,6 +417,12 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen return PipeUtils.EMPTY; } + @Override + public FluidTankInfo[] getAllTanks() + { + return getTankInfo(EnumFacing.UP); + } + @Override public void setFluidStack(FluidStack fluidStack, Object... data) { diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index fbfa264de..517e999cb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -402,6 +402,12 @@ public class TileEntityPRC extends TileEntityBasicMachine