From 11712a762e9d7949ab89d544d7c57e17f94bf27d Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Fri, 1 Apr 2016 01:51:48 +0200
Subject: [PATCH] We can't have EnumGridType.WIRELESS, iterferes with block
 stuff

---
 src/main/java/refinedstorage/block/EnumGridType.java     | 3 +--
 .../java/refinedstorage/container/ContainerGrid.java     | 3 ++-
 src/main/java/refinedstorage/gui/GuiGrid.java            | 2 +-
 src/main/java/refinedstorage/tile/grid/IGrid.java        | 2 ++
 src/main/java/refinedstorage/tile/grid/TileGrid.java     | 5 +++++
 src/main/java/refinedstorage/tile/grid/WirelessGrid.java | 9 +++++++--
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/refinedstorage/block/EnumGridType.java b/src/main/java/refinedstorage/block/EnumGridType.java
index daef604a3..7ad35d165 100755
--- a/src/main/java/refinedstorage/block/EnumGridType.java
+++ b/src/main/java/refinedstorage/block/EnumGridType.java
@@ -4,8 +4,7 @@ import net.minecraft.util.IStringSerializable;
 
 public enum EnumGridType implements IStringSerializable {
     NORMAL(0, "normal"),
-    CRAFTING(1, "crafting"),
-    WIRELESS(2, "wireless");
+    CRAFTING(1, "crafting");
 
     private int id;
     private String name;
diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java
index 2aefdf39a..6aed298b3 100755
--- a/src/main/java/refinedstorage/container/ContainerGrid.java
+++ b/src/main/java/refinedstorage/container/ContainerGrid.java
@@ -6,6 +6,7 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import refinedstorage.block.EnumGridType;
 import refinedstorage.container.slot.SlotGridCraftingResult;
+import refinedstorage.tile.TileController;
 import refinedstorage.tile.grid.IGrid;
 import refinedstorage.tile.grid.TileGrid;
 
@@ -79,7 +80,7 @@ public class ContainerGrid extends ContainerBase {
     public void onContainerClosed(EntityPlayer player) {
         super.onContainerClosed(player);
 
-        if (grid.getType() == EnumGridType.WIRELESS && grid.isConnected()) {
+        if (grid.getController() instanceof TileController && grid.isWireless()) {
             grid.getController().onCloseWirelessGrid(player);
         }
     }
diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java
index 267a6c401..3088fbeb7 100755
--- a/src/main/java/refinedstorage/gui/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/GuiGrid.java
@@ -165,7 +165,7 @@ public class GuiGrid extends GuiBase {
     public void drawForeground(int mouseX, int mouseY) {
         scrollbar.update(this, mouseX, mouseY);
 
-        drawString(7, 7, t(grid.getType() == EnumGridType.WIRELESS ? "gui.refinedstorage:wireless_grid" : "gui.refinedstorage:grid"));
+        drawString(7, 7, t(grid.isWireless() ? "gui.refinedstorage:wireless_grid" : "gui.refinedstorage:grid"));
 
         if (grid.getType() == EnumGridType.CRAFTING) {
             drawString(7, 94, t("container.crafting"));
diff --git a/src/main/java/refinedstorage/tile/grid/IGrid.java b/src/main/java/refinedstorage/tile/grid/IGrid.java
index 0406c8373..825395005 100755
--- a/src/main/java/refinedstorage/tile/grid/IGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/IGrid.java
@@ -24,4 +24,6 @@ public interface IGrid {
     IRedstoneModeSetting getRedstoneModeSetting();
 
     boolean isConnected();
+
+    boolean isWireless();
 }
diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java
index ab6891320..63feee7d1 100755
--- a/src/main/java/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java
@@ -209,6 +209,11 @@ public class TileGrid extends TileMachine implements IGrid {
         return this;
     }
 
+    @Override
+    public boolean isWireless() {
+        return false;
+    }
+
     public void setSearchBoxMode(int searchBoxMode) {
         this.searchBoxMode = searchBoxMode;
     }
diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
index 2e67077fe..7df40e3d7 100755
--- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java
@@ -30,7 +30,7 @@ public class WirelessGrid implements IGrid {
 
     @Override
     public EnumGridType getType() {
-        return EnumGridType.WIRELESS;
+        return EnumGridType.NORMAL;
     }
 
     @Override
@@ -81,6 +81,11 @@ public class WirelessGrid implements IGrid {
 
     @Override
     public boolean isConnected() {
-        return getController() instanceof TileController;
+        return getController() instanceof TileController && getController().isActive();
+    }
+
+    @Override
+    public boolean isWireless() {
+        return true;
     }
 }