diff --git a/gradle.properties b/gradle.properties index 127736ead..30f611a8b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ ic2_version=2.5.5-ex19 version_major=5 version_minor=0 -version_patch=11 +version_patch=12 diff --git a/src/main/java/forestry/core/tiles/ILiquidTankTile.java b/src/main/java/forestry/core/tiles/ILiquidTankTile.java index 622a73191..8b2f03e3b 100644 --- a/src/main/java/forestry/core/tiles/ILiquidTankTile.java +++ b/src/main/java/forestry/core/tiles/ILiquidTankTile.java @@ -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; + } }