revert improvements from b284f46

Merge branch 'GTNewHorizons:master' into master
set fluid conduit default to output only
2026-11-15 09:34:50 +00:00 · 2023-10-15 13:59:23 +02:00 · 2023-10-15 13:54:42 +02:00 · 2023-10-15 13:34:45 +02:00 · 2023-10-15 13:34:45 +02:00
2 changed files with 8 additions and 13 deletions
@@ -53,11 +53,6 @@ public abstract class AbstractGasConduit extends AbstractConduit implements IGas
        return true;
    }

-    @Override
-    protected ConnectionMode getDefaultConnectionMode() {
-        return ConnectionMode.INPUT;
-    }
-
    @Override
    public Class<? extends IConduit> getBaseConduitType() {
        return IGasConduit.class;
@@ -75,11 +75,6 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I
        return true;
    }

-    @Override
-    protected ConnectionMode getDefaultConnectionMode() {
-        return ConnectionMode.INPUT;
-    }
-
    @Override
    public Class<? extends IConduit> getBaseConduitType() {
        return ILiquidConduit.class;
@@ -162,11 +157,11 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I
        boolean res;
        if (mode == RedstoneControlMode.OFF) {
            // if checking for no signal, must be no signal from both
-            res = mode.isConditionMet(mode, signal)
+            res = RedstoneControlMode.isConditionMet(mode, signal)
                    && (col != DyeColor.RED || isConditionMetByExternalSignal(dir, mode, col));
        } else {
            // if checking for a signal, either is fine
-            res = mode.isConditionMet(mode, signal)
+            res = RedstoneControlMode.isConditionMet(mode, signal)
                    || (col == DyeColor.RED && isConditionMetByExternalSignal(dir, mode, col));
        }
        return res;
@@ -185,7 +180,12 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I
            }
        }

-        return mode.isConditionMet(mode, externalSignal);
+        return RedstoneControlMode.isConditionMet(mode, externalSignal);
+    }
+
+    @Override
+    protected ConnectionMode getDefaultConnectionMode() {
+        return ConnectionMode.INPUT;
    }

    @Override
Author	SHA1	Message	Date
Pilzinsel64	ec694d2833	revert improvements from `b284f46`	2023-10-15 13:59:23 +02:00
Pascal	e878c8e276	Merge branch 'GTNewHorizons:master' into master	2023-10-15 13:54:42 +02:00
Alexdoru	1af6fcae0b	set fluid conduit default to output only	2023-10-15 13:34:45 +02:00
Alexdoru	f44111da96	revert changes to conduit default connection modes	2023-10-15 13:34:45 +02:00