From db8f2546f75f22ba7d20a5304367719d1c07bda8 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Tue, 18 Feb 2014 08:04:47 -0500 Subject: [PATCH] Minor changes to fluid channel code --- .../resonantinduction/archaic/channel/BlockChannel.java | 1 - .../resonantinduction/archaic/channel/TileChannel.java | 8 +++++++- .../resonantinduction/core/prefab/fluid/FluidNetwork.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/archaic/src/main/java/resonantinduction/archaic/channel/BlockChannel.java b/archaic/src/main/java/resonantinduction/archaic/channel/BlockChannel.java index d132b8ee8..ff0ab171d 100644 --- a/archaic/src/main/java/resonantinduction/archaic/channel/BlockChannel.java +++ b/archaic/src/main/java/resonantinduction/archaic/channel/BlockChannel.java @@ -57,7 +57,6 @@ public class BlockChannel extends BlockFluidNetwork { return FluidUtility.playerActivatedFluidItem(world, x, y, z, entityplayer, side); } - return super.onMachineActivated(world, x, y, z, entityplayer, side, hitX, hitY, hitZ); } diff --git a/archaic/src/main/java/resonantinduction/archaic/channel/TileChannel.java b/archaic/src/main/java/resonantinduction/archaic/channel/TileChannel.java index e49196169..0e83df7ff 100644 --- a/archaic/src/main/java/resonantinduction/archaic/channel/TileChannel.java +++ b/archaic/src/main/java/resonantinduction/archaic/channel/TileChannel.java @@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import resonantinduction.api.mechanical.fluid.IFluidConnector; @@ -19,6 +20,11 @@ import calclavia.lib.utility.WrenchUtility; public class TileChannel extends TileFluidNetwork implements IBlockActivate, IFluidPipe { private boolean isExtracting = false; + + public TileChannel() + { + this.getInternalTank().setCapacity(1 * FluidContainerRegistry.BUCKET_VOLUME); + } @Override public void updateEntity() @@ -67,7 +73,7 @@ public class TileChannel extends TileFluidNetwork implements IBlockActivate, IFl { if (tileEntity instanceof TileChannel) { - getNetwork().merge(((IFluidConnector) tileEntity).getNetwork()); + getNetwork().merge(((TileChannel) tileEntity).getNetwork()); this.setRenderSide(side, true); connectedBlocks[side.ordinal()] = tileEntity; } diff --git a/src/main/java/resonantinduction/core/prefab/fluid/FluidNetwork.java b/src/main/java/resonantinduction/core/prefab/fluid/FluidNetwork.java index 118e5b21a..37ad81ca1 100644 --- a/src/main/java/resonantinduction/core/prefab/fluid/FluidNetwork.java +++ b/src/main/java/resonantinduction/core/prefab/fluid/FluidNetwork.java @@ -38,7 +38,7 @@ public abstract class FluidNetwork extends NodeNetwork