Merge remote-tracking branch 'origin/experimental' into experimental

1 files changed, 8 insertions, 0 deletions

diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java
index 8dc944227b..57af0c4598 100644
--- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java
+++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java
@@ -8,6 +8,7 @@ public class GT_Circuit_Timer extends GT_CircuitryBehavior {
         super(aIndex);
     }
 
+    @Override
     public void initParameters(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {
         aCircuitData[0] = 2;
         aCircuitData[1] = 1;
@@ -15,6 +16,7 @@ public class GT_Circuit_Timer extends GT_CircuitryBehavior {
         aCircuitData[4] = 0;
     }
 
+    @Override
     public void validateParameters(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {
         if (aCircuitData[0] < 2) {
             aCircuitData[0] = 2;
@@ -36,6 +38,7 @@ public class GT_Circuit_Timer extends GT_CircuitryBehavior {
         }
     }
 
+    @Override
     public void onTick(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) {
         if (aCircuitData[3] == 1) {
             if (getAnyRedstone(aRedstoneCircuitBlock)) {
@@ -65,14 +68,17 @@ public class GT_Circuit_Timer extends GT_CircuitryBehavior {
         }
     }
 
+    @Override
     public String getName() {
         return "Timer";
     }
 
+    @Override
     public String getDescription() {
         return "Pulses Redstone";
     }
 
+    @Override
     public String getDataDescription(int[] aCircuitData, int aCircuitDataIndex) {
         switch (aCircuitDataIndex) {
             case 0:
@@ -89,10 +95,12 @@ public class GT_Circuit_Timer extends GT_CircuitryBehavior {
         return "";
     }
 
+    @Override
     public boolean displayItemStack(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock, int aIndex) {
         return false;
     }
 
+    @Override
     public String getDataDisplay(int[] aCircuitData, int aCircuitDataIndex) {
         if (aCircuitDataIndex == 3) {
             return "";