From 5e3c3d58a69a4d9d44db981c74ca613005fdba86 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 16 Sep 2014 17:14:56 +0800 Subject: [PATCH] #961 #1010 Fluid and energy conduits not behaving correctly in 'without a redstone signal' mode --- .../conduit/liquid/AbstractLiquidConduit.java | 23 +++++++++++-------- .../enderio/conduit/power/PowerConduit.java | 20 ++++++++-------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java index 67cf35b5..2bf5aba8 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java @@ -48,11 +48,11 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I //it causes issues with not conecting to empty tanks such as dim. trans + //BC fluid pipes, so I am removing it for now. -// FluidTankInfo[] info = h.getTankInfo(direction.getOpposite()); -// if(info == null) { -// return false; -// } -// return info.length > 0; + // FluidTankInfo[] info = h.getTankInfo(direction.getOpposite()); + // if(info == null) { + // return false; + // } + // return info.length > 0; return true; } @@ -134,11 +134,16 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I DyeColor col = getExtractionSignalColor(dir); int signal = ConduitUtil.getInternalSignalForColor(getBundle(), col); - if(mode.isConditionMet(mode, signal) && mode != RedstoneControlMode.OFF) { - return true; + + boolean res; + if(mode == RedstoneControlMode.OFF) { + //if checking for no signal, must be no signal from both + res = mode.isConditionMet(mode, signal) && (col != DyeColor.RED || isConditionMetByExternalSignal(dir, mode, col)); + } else { + //if checking for a signal, either is fine + res = mode.isConditionMet(mode, signal) || (col == DyeColor.RED && isConditionMetByExternalSignal(dir, mode, col)); } - - return isConditionMetByExternalSignal(dir, mode, col); + return res; } private boolean isConditionMetByExternalSignal(ForgeDirection dir, RedstoneControlMode mode, DyeColor col) { diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index 1b5052e1..3e7fd14f 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -285,19 +285,17 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { } DyeColor col = getExtractionSignalColor(dir); - // internal signal int signal = ConduitUtil.getInternalSignalForColor(getBundle(), col); - if(mode.isConditionMet(mode, signal)) { - return true; + int exSig = getExternalRedstoneSignalForDir(dir); + boolean res; + if(mode == RedstoneControlMode.OFF) { + //if checking for no signal, must be no signal from both + res = mode.isConditionMet(mode, signal) && (col != DyeColor.RED || mode.isConditionMet(mode, exSig)); + } else { + //if checking for a signal, either is fine + res = mode.isConditionMet(mode, signal) || (col == DyeColor.RED && mode.isConditionMet(mode, exSig)); } - - // external signal - if(col != DyeColor.RED) { - //can't get a non-red signal externally at this stage so no go - return false; - } - int val = getExternalRedstoneSignalForDir(dir); - return mode.isConditionMet(mode, val); + return res; } private int getExternalRedstoneSignalForDir(ForgeDirection dir) {