Merge branch 'experimental'

1 files changed, 64 insertions, 64 deletions

diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java
index 16ef890b5a..f328b6adde 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java
@@ -1,64 +1,64 @@
-package gregtech.common.redstonecircuits;

-

-import gregtech.api.interfaces.IRedstoneCircuitBlock;

-import gregtech.api.util.GT_CircuitryBehavior;

-

-public class GT_Circuit_Equals

-        extends GT_CircuitryBehavior {

-    public GT_Circuit_Equals(int aIndex) {

-        super(aIndex);

-    }

-

-    public void initParameters(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {

-        aCircuitData[0] = 0;

-        aCircuitData[1] = 0;

-    }

-

-    public void validateParameters(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {

-        if (aCircuitData[0] < 0) {

-            aCircuitData[0] = 0;

-        }

-        if (aCircuitData[0] > 15) {

-            aCircuitData[0] = 15;

-        }

-        if (aCircuitData[1] < 0) {

-            aCircuitData[3] = 0;

-        }

-        if (aCircuitData[1] > 1) {

-            aCircuitData[3] = 1;

-        }

-    }

-

-    public void onTick(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {

-        aRedstoneCircuitBlock.setRedstone(((byte) ((aCircuitData[1] != 0 ? getStrongestRedstone(aRedstoneCircuitBlock) == aCircuitData[0] : getStrongestRedstone(aRedstoneCircuitBlock) != aCircuitData[0]) ? 0 : 15)), aRedstoneCircuitBlock.getOutputFacing());

-    }

-

-    public String getName() {

-        return "Equals";

-    }

-

-    public String getDescription() {

-        return "signal == this";

-    }

-

-    public String getDataDescription(int[] aCircuitData, int aCircuitDataIndex) {

-        switch (aCircuitDataIndex) {

-            case 0:

-                return "Signal";

-            case 1:

-                return aCircuitData[1] == 0 ? "Equal" : "Unequal";

-        }

-        return "";

-    }

-

-    public boolean displayItemStack(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock, int aIndex) {

-        return false;

-    }

-

-    public String getDataDisplay(int[] aCircuitData, int aCircuitDataIndex) {

-        if (aCircuitDataIndex > 0) {

-            return "";

-        }

-        return null;

-    }

-}

+package gregtech.common.redstonecircuits;
+
+import gregtech.api.interfaces.IRedstoneCircuitBlock;
+import gregtech.api.util.GT_CircuitryBehavior;
+
+public class GT_Circuit_Equals
+        extends GT_CircuitryBehavior {
+    public GT_Circuit_Equals(int aIndex) {
+        super(aIndex);
+    }
+
+    public void initParameters(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {
+        aCircuitData[0] = 0;
+        aCircuitData[1] = 0;
+    }
+
+    public void validateParameters(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {
+        if (aCircuitData[0] < 0) {
+            aCircuitData[0] = 0;
+        }
+        if (aCircuitData[0] > 15) {
+            aCircuitData[0] = 15;
+        }
+        if (aCircuitData[1] < 0) {
+            aCircuitData[3] = 0;
+        }
+        if (aCircuitData[1] > 1) {
+            aCircuitData[3] = 1;
+        }
+    }
+
+    public void onTick(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {
+        aRedstoneCircuitBlock.setRedstone(((byte) ((aCircuitData[1] != 0 ? getStrongestRedstone(aRedstoneCircuitBlock) == aCircuitData[0] : getStrongestRedstone(aRedstoneCircuitBlock) != aCircuitData[0]) ? 0 : 15)), aRedstoneCircuitBlock.getOutputFacing());
+    }
+
+    public String getName() {
+        return "Equals";
+    }
+
+    public String getDescription() {
+        return "signal == this";
+    }
+
+    public String getDataDescription(int[] aCircuitData, int aCircuitDataIndex) {
+        switch (aCircuitDataIndex) {
+            case 0:
+                return "Signal";
+            case 1:
+                return aCircuitData[1] == 0 ? "Equal" : "Unequal";
+        }
+        return "";
+    }
+
+    public boolean displayItemStack(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock, int aIndex) {
+        return false;
+    }
+
+    public String getDataDisplay(int[] aCircuitData, int aCircuitDataIndex) {
+        if (aCircuitDataIndex > 0) {
+            return "";
+        }
+        return null;
+    }
+}