From 881bd30bf88eedc451a75e5c3860a5638b2921d0 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Tue, 29 Mar 2016 12:28:28 +0200
Subject: [PATCH] Remove redstoneControlled uglyness

---
 src/main/java/refinedstorage/tile/TileController.java |  6 +-----
 src/main/java/refinedstorage/tile/TileDetector.java   | 10 ++++++----
 src/main/java/refinedstorage/tile/TileMachine.java    |  7 ++-----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java
index 93477b8f1..a0e081fe1 100755
--- a/src/main/java/refinedstorage/tile/TileController.java
+++ b/src/main/java/refinedstorage/tile/TileController.java
@@ -42,11 +42,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
     public void update() {
         super.update();
 
-        if (destroyed) {
-            return;
-        }
-
-        if (!worldObj.isRemote) {
+        if (!worldObj.isRemote && !destroyed) {
             int lastEnergy = energy.getEnergyStored();
 
             if (ticks % 20 == 0) {
diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java
index cb725c1b2..c94869f2a 100755
--- a/src/main/java/refinedstorage/tile/TileDetector.java
+++ b/src/main/java/refinedstorage/tile/TileDetector.java
@@ -8,6 +8,7 @@ import refinedstorage.RefinedStorageBlocks;
 import refinedstorage.inventory.InventorySimple;
 import refinedstorage.storage.StorageItem;
 import refinedstorage.tile.settings.ICompareSetting;
+import refinedstorage.tile.settings.RedstoneMode;
 import refinedstorage.util.InventoryUtils;
 
 public class TileDetector extends TileMachine implements ICompareSetting {
@@ -27,10 +28,6 @@ public class TileDetector extends TileMachine implements ICompareSetting {
 
     private boolean powered = false;
 
-    public TileDetector() {
-        this.redstoneControlled = false;
-    }
-
     @Override
     public void onDisconnected() {
         super.onDisconnected();
@@ -188,4 +185,9 @@ public class TileDetector extends TileMachine implements ICompareSetting {
     public IInventory getInventory() {
         return inventory;
     }
+
+    @Override
+    public void setRedstoneMode(RedstoneMode mode) {
+        // NO OP
+    }
 }
diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java
index c7d6f4c55..3e774cb91 100755
--- a/src/main/java/refinedstorage/tile/TileMachine.java
+++ b/src/main/java/refinedstorage/tile/TileMachine.java
@@ -10,7 +10,6 @@ import refinedstorage.tile.settings.RedstoneMode;
 
 public abstract class TileMachine extends TileBase implements INetworkTile, IRedstoneModeSetting {
     protected boolean connected = false;
-    protected boolean redstoneControlled = true;
 
     protected RedstoneMode redstoneMode = RedstoneMode.IGNORE;
 
@@ -69,11 +68,9 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed
 
     @Override
     public void setRedstoneMode(RedstoneMode mode) {
-        if (redstoneControlled) {
-            markDirty();
+        markDirty();
 
-            this.redstoneMode = mode;
-        }
+        this.redstoneMode = mode;
     }
 
     @Override