Fix #1308 Restore compatibility with old fluid pipes

This commit is contained in:
mezz committed 2016-06-09 18:35:12 -07:00
1 parent 12f5d7be6c
commit 92eab8d47a
2 files changed
+45 -2

No files matched your search

@@ -12,11 +12,54 @@ package forestry.core.tiles;
import javax.annotation.Nonnull;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.capability.IFluidTankProperties;
import forestry.core.fluids.ITankManager;
public interface ILiquidTankTile extends ILocatable {
public interface ILiquidTankTile extends ILocatable, IFluidHandler {
@Nonnull
ITankManager getTankManager();
@Override
default int fill(EnumFacing from, FluidStack resource, boolean doFill) {
return getTankManager().fill(resource, doFill);
}
@Override
default FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
return getTankManager().drain(resource, doDrain);
}
@Override
default FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) {
return getTankManager().drain(maxDrain, doDrain);
}
@Override
default boolean canFill(EnumFacing from, Fluid fluid) {
return getTankManager().canFillFluidType(new FluidStack(fluid, Fluid.BUCKET_VOLUME));
}
@Override
default boolean canDrain(EnumFacing from, Fluid fluid) {
return getTankManager().canDrainFluidType(new FluidStack(fluid, Fluid.BUCKET_VOLUME));
}
@Override
default FluidTankInfo[] getTankInfo(EnumFacing from) {
IFluidTankProperties[] tankProperties = getTankManager().getTankProperties();
FluidTankInfo[] tankInfos = new FluidTankInfo[tankProperties.length];
for (int i = 0; i < tankProperties.length; i++) {
IFluidTankProperties fluidTankProperties = tankProperties[i];
tankInfos[i] = new FluidTankInfo(fluidTankProperties.getContents(), fluidTankProperties.getCapacity());
}
return tankInfos;
}
}