Remove redstoneControlled uglyness
This commit is contained in:
@@ -42,11 +42,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
|
|||||||
public void update() {
|
public void update() {
|
||||||
super.update();
|
super.update();
|
||||||
|
|
||||||
if (destroyed) {
|
if (!worldObj.isRemote && !destroyed) {
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!worldObj.isRemote) {
|
|
||||||
int lastEnergy = energy.getEnergyStored();
|
int lastEnergy = energy.getEnergyStored();
|
||||||
|
|
||||||
if (ticks % 20 == 0) {
|
if (ticks % 20 == 0) {
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import refinedstorage.RefinedStorageBlocks;
|
|||||||
import refinedstorage.inventory.InventorySimple;
|
import refinedstorage.inventory.InventorySimple;
|
||||||
import refinedstorage.storage.StorageItem;
|
import refinedstorage.storage.StorageItem;
|
||||||
import refinedstorage.tile.settings.ICompareSetting;
|
import refinedstorage.tile.settings.ICompareSetting;
|
||||||
|
import refinedstorage.tile.settings.RedstoneMode;
|
||||||
import refinedstorage.util.InventoryUtils;
|
import refinedstorage.util.InventoryUtils;
|
||||||
|
|
||||||
public class TileDetector extends TileMachine implements ICompareSetting {
|
public class TileDetector extends TileMachine implements ICompareSetting {
|
||||||
@@ -27,10 +28,6 @@ public class TileDetector extends TileMachine implements ICompareSetting {
|
|||||||
|
|
||||||
private boolean powered = false;
|
private boolean powered = false;
|
||||||
|
|
||||||
public TileDetector() {
|
|
||||||
this.redstoneControlled = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDisconnected() {
|
public void onDisconnected() {
|
||||||
super.onDisconnected();
|
super.onDisconnected();
|
||||||
@@ -188,4 +185,9 @@ public class TileDetector extends TileMachine implements ICompareSetting {
|
|||||||
public IInventory getInventory() {
|
public IInventory getInventory() {
|
||||||
return inventory;
|
return inventory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setRedstoneMode(RedstoneMode mode) {
|
||||||
|
// NO OP
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import refinedstorage.tile.settings.RedstoneMode;
|
|||||||
|
|
||||||
public abstract class TileMachine extends TileBase implements INetworkTile, IRedstoneModeSetting {
|
public abstract class TileMachine extends TileBase implements INetworkTile, IRedstoneModeSetting {
|
||||||
protected boolean connected = false;
|
protected boolean connected = false;
|
||||||
protected boolean redstoneControlled = true;
|
|
||||||
|
|
||||||
protected RedstoneMode redstoneMode = RedstoneMode.IGNORE;
|
protected RedstoneMode redstoneMode = RedstoneMode.IGNORE;
|
||||||
|
|
||||||
@@ -69,12 +68,10 @@ public abstract class TileMachine extends TileBase implements INetworkTile, IRed
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setRedstoneMode(RedstoneMode mode) {
|
public void setRedstoneMode(RedstoneMode mode) {
|
||||||
if (redstoneControlled) {
|
|
||||||
markDirty();
|
markDirty();
|
||||||
|
|
||||||
this.redstoneMode = mode;
|
this.redstoneMode = mode;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BlockPos getMachinePos() {
|
public BlockPos getMachinePos() {
|
||||||
|
|||||||
Reference in New Issue
Block a user