From b8e788f8f670ca67bce243f28c14fdcb71db16fd Mon Sep 17 00:00:00 2001 From: Robert S Date: Fri, 26 Sep 2014 13:28:34 -0400 Subject: [PATCH] Fixed odd compile time error with classes not inheriting INode from NodeFluidHandler --- .../scala/resonantinduction/core/prefab/node/NodePressure.java | 1 + .../scala/resonantinduction/core/prefab/node/NodeTank.java | 3 ++- .../resonantinduction/mechanical/fluid/transport/TilePump.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/scala/resonantinduction/core/prefab/node/NodePressure.java b/src/main/scala/resonantinduction/core/prefab/node/NodePressure.java index f106e4884..06e2784c9 100644 --- a/src/main/scala/resonantinduction/core/prefab/node/NodePressure.java +++ b/src/main/scala/resonantinduction/core/prefab/node/NodePressure.java @@ -3,6 +3,7 @@ package resonantinduction.core.prefab.node; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; +import universalelectricity.api.core.grid.INode; import universalelectricity.api.core.grid.INodeProvider; import universalelectricity.api.core.grid.IUpdate; diff --git a/src/main/scala/resonantinduction/core/prefab/node/NodeTank.java b/src/main/scala/resonantinduction/core/prefab/node/NodeTank.java index ed2bd1eca..ff5b83c7e 100644 --- a/src/main/scala/resonantinduction/core/prefab/node/NodeTank.java +++ b/src/main/scala/resonantinduction/core/prefab/node/NodeTank.java @@ -13,6 +13,7 @@ import resonant.lib.network.handle.IPacketIDReceiver; import resonant.lib.prefab.fluid.LimitedTank; import resonant.lib.prefab.fluid.NodeFluidHandler; import resonant.lib.utility.WorldUtility; +import universalelectricity.api.core.grid.INode; import universalelectricity.api.core.grid.INodeProvider; import universalelectricity.api.core.grid.ISave; import universalelectricity.core.grid.node.NodeConnector; @@ -22,7 +23,7 @@ import universalelectricity.core.grid.node.NodeConnector; * * @author Darkguardsman */ -public class NodeTank extends NodeFluidHandler implements ISave, IPacketIDReceiver +public class NodeTank extends NodeFluidHandler implements ISave, IPacketIDReceiver, INode { static final int PACKET_DESCRIPTION = 100, PACKET_TANK = 101; int renderSides = 0; diff --git a/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.java b/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.java index 359b3aeea..abd0a3b8c 100644 --- a/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.java +++ b/src/main/scala/resonantinduction/mechanical/fluid/transport/TilePump.java @@ -82,7 +82,7 @@ public class TilePump extends TileMechanical implements IRotatable, IFluidHandle if (tileIn instanceof IFluidHandler) { - FluidStack drain = ((IFluidHandler) tileIn).drain(getDirection(), pressureNode.maxOutput(), false); + FluidStack drain = ((IFluidHandler) tileIn).drain(getDirection(), pressureNode.getCapacity(), false); if (drain != null) {