diff --git a/src/main/java/forestry/core/blocks/BlockForestry.java b/src/main/java/forestry/core/blocks/BlockForestry.java index e4f70ddfa..471db69e9 100644 --- a/src/main/java/forestry/core/blocks/BlockForestry.java +++ b/src/main/java/forestry/core/blocks/BlockForestry.java @@ -10,8 +10,13 @@ ******************************************************************************/ package forestry.core.blocks; +import com.mojang.authlib.GameProfile; +import forestry.api.core.IItemModelRegister; +import forestry.core.CreativeTabForestry; import forestry.core.owner.IOwnedTile; import forestry.core.owner.IOwnerHandler; +import forestry.core.tiles.TileForestry; +import forestry.core.utils.Log; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; @@ -21,15 +26,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.mojang.authlib.GameProfile; - -import forestry.api.core.IItemModelRegister; -import forestry.core.CreativeTabForestry; -import forestry.core.tiles.TileForestry; -import forestry.core.utils.Log; - public abstract class BlockForestry extends Block implements IItemModelRegister, ITileEntityProvider { protected BlockForestry(Material material) { @@ -57,16 +56,17 @@ public abstract class BlockForestry extends Block implements IItemModelRegister, } @Override - public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn) { + public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor) { + super.onNeighborChange(world, pos, neighbor); + try { - TileEntity tile = worldIn.getTileEntity(pos); + TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileForestry) { - ((TileForestry) tile).onNeighborBlockChange(state.getBlock()); + ((TileForestry) tile).onNeighborTileChange(world, pos, neighbor); } } catch (StackOverflowError error) { - Log.error("Stack Overflow Error in BlockMachine.onNeighborBlockChange()", error); + Log.error("Stack Overflow Error in BlockForestry.onNeighborChange()", error); throw error; } } - } diff --git a/src/main/java/forestry/core/fluids/FluidHelper.java b/src/main/java/forestry/core/fluids/FluidHelper.java index e78eefb5d..6d3d68c6b 100644 --- a/src/main/java/forestry/core/fluids/FluidHelper.java +++ b/src/main/java/forestry/core/fluids/FluidHelper.java @@ -10,17 +10,18 @@ ******************************************************************************/ package forestry.core.fluids; +import forestry.core.utils.InventoryUtil; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; - +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; -import forestry.core.utils.InventoryUtil; - public final class FluidHelper { private FluidHelper() { @@ -34,6 +35,18 @@ public final class FluidHelper { } } + public static boolean canAcceptFluid(World world, BlockPos pos, EnumFacing facing, FluidStack fluid) { + IFluidHandler capability = FluidUtil.getFluidHandler(world, pos, facing); + if (capability != null) { + for (IFluidTankProperties tankProperties : capability.getTankProperties()) { + if (tankProperties.canFillFluidType(fluid)) { + return true; + } + } + } + return false; + } + public enum FillStatus { SUCCESS, INVALID_INPUT, NO_FLUID, NO_SPACE } diff --git a/src/main/java/forestry/core/tiles/TileForestry.java b/src/main/java/forestry/core/tiles/TileForestry.java index 23b0055ca..1a620a5a0 100644 --- a/src/main/java/forestry/core/tiles/TileForestry.java +++ b/src/main/java/forestry/core/tiles/TileForestry.java @@ -15,24 +15,6 @@ import javax.annotation.Nullable; import java.io.IOException; import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.play.server.SPacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ITickable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.world.World; - -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.wrapper.SidedInvWrapper; - import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorLogicSource; import forestry.core.errors.ErrorLogic; @@ -45,6 +27,22 @@ import forestry.core.network.IStreamable; import forestry.core.network.packets.PacketTileStream; import forestry.core.proxy.Proxies; import forestry.core.utils.NBTUtilForestry; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.wrapper.SidedInvWrapper; //@Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraftAPI|statements") public abstract class TileForestry extends TileEntity implements IStreamable, IErrorLogicSource, ISidedInventory, IFilterSlotDelegate, ITitled, ILocatable, IGuiHandlerTile, ITickable { @@ -62,7 +60,7 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE return tileCache; } - public void onNeighborBlockChange(Block id) { + public void onNeighborTileChange(IBlockAccess world, BlockPos pos, BlockPos neighbor) { tileCache.onNeighborChange(); } diff --git a/src/main/java/forestry/factory/tiles/TileRaintank.java b/src/main/java/forestry/factory/tiles/TileRaintank.java index 426c9e079..04a569e4f 100644 --- a/src/main/java/forestry/factory/tiles/TileRaintank.java +++ b/src/main/java/forestry/factory/tiles/TileRaintank.java @@ -18,6 +18,7 @@ import forestry.api.core.IErrorLogic; import forestry.core.config.Constants; import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.ContainerFiller; +import forestry.core.fluids.FluidHelper; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.network.DataInputStreamForestry; @@ -34,19 +35,30 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.biome.Biome; import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTankTile { - private static final FluidStack STACK_WATER = new FluidStack(FluidRegistry.WATER, Constants.RAINTANK_AMOUNT_PER_UPDATE); + private static final FluidStack STACK_WATER = new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME); + private static final FluidStack WATER_PER_UPDATE = new FluidStack(FluidRegistry.WATER, Constants.RAINTANK_AMOUNT_PER_UPDATE); + @Nonnull private final FilteredTank resourceTank; + @Nonnull private final TankManager tankManager; + @Nonnull private final ContainerFiller containerFiller; + private Boolean canDumpBelow = null; + private boolean dumpingFluid = false; + // client private int fillingProgress; @@ -89,27 +101,47 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa @Override public void updateServerSide() { + if (updateOnInterval(20)) { + IErrorLogic errorLogic = getErrorLogic(); - if (!updateOnInterval(20)) { - return; + BlockPos pos = getPos(); + Biome biome = worldObj.getBiome(pos); + errorLogic.setCondition(!biome.canRain(), EnumErrorCode.NO_RAIN_BIOME); + + BlockPos posAbove = pos.up(); + boolean hasSky = worldObj.canBlockSeeSky(posAbove); + errorLogic.setCondition(!hasSky, EnumErrorCode.NO_SKY_RAIN_TANK); + + errorLogic.setCondition(!worldObj.isRainingAt(posAbove), EnumErrorCode.NOT_RAINING); + + if (!errorLogic.hasErrors()) { + resourceTank.fillInternal(WATER_PER_UPDATE, true); + } + + containerFiller.updateServerSide(); } - IErrorLogic errorLogic = getErrorLogic(); - - Biome biome = worldObj.getBiome(getPos()); - errorLogic.setCondition(!biome.canRain(), EnumErrorCode.NO_RAIN_BIOME); - - BlockPos posAbove = getPos().up(); - boolean hasSky = worldObj.canBlockSeeSky(posAbove); - errorLogic.setCondition(!hasSky, EnumErrorCode.NO_SKY_RAIN_TANK); - - errorLogic.setCondition(!worldObj.isRainingAt(posAbove), EnumErrorCode.NOT_RAINING); - - if (!errorLogic.hasErrors()) { - resourceTank.fillInternal(STACK_WATER, true); + if (canDumpBelow == null) { + canDumpBelow = FluidHelper.canAcceptFluid(worldObj, getPos().down(), EnumFacing.UP, STACK_WATER); } - containerFiller.updateServerSide(); + if (canDumpBelow) { + if (dumpingFluid || updateOnInterval(20)) { + dumpingFluid = dumpFluidBelow(); + } + } + } + + private boolean dumpFluidBelow() { + if (!resourceTank.isEmpty()) { + IFluidHandler fluidDestination = FluidUtil.getFluidHandler(worldObj, pos.down(), EnumFacing.UP); + if (fluidDestination != null) { + if (FluidUtil.tryFluidTransfer(fluidDestination, tankManager, Fluid.BUCKET_VOLUME / 20, true) != null) { + return true; + } + } + } + return false; } public boolean isFilling() { @@ -139,6 +171,15 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa return tankManager; } + @Override + public void onNeighborTileChange(IBlockAccess world, BlockPos pos, BlockPos neighbor) { + super.onNeighborTileChange(world, pos, neighbor); + + if (neighbor.equals(pos.down())) { + canDumpBelow = FluidHelper.canAcceptFluid(worldObj, neighbor, EnumFacing.UP, STACK_WATER); + } + } + @Override public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing);