From 9b7f0824df242a152068beb551c1afdcc57fd311 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sat, 12 Nov 2016 02:16:13 +0100
Subject: [PATCH] Improve crafting monitor interface

---
 .../apiimpl/autocrafting/task/CraftingStepProcess.java      | 1 -
 .../raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java | 6 ++----
 .../tile/craftingmonitor/ICraftingMonitor.java              | 3 +++
 .../tile/craftingmonitor/TileCraftingMonitor.java           | 6 ++++++
 .../tile/craftingmonitor/WirelessCraftingMonitor.java       | 6 ++++++
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepProcess.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepProcess.java
index d6ddcc898..5bdcc402f 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepProcess.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepProcess.java
@@ -56,7 +56,6 @@ public class CraftingStepProcess extends CraftingStep {
 
     @Override
     public void execute(Deque<ItemStack> toInsertItems, Deque<FluidStack> toInsertFluids) {
-        // @TODO: fluid handling
         IItemHandler inventory = getPattern().getContainer().getFacingInventory();
         int compare = CraftingTask.DEFAULT_COMPARE | (getPattern().isOredict() ? IComparer.COMPARE_OREDICT : 0);
         for (ItemStack insertStack : getToInsert()) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java
index 6b239cb21..16d610745 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingMonitor.java
@@ -8,8 +8,6 @@ import com.raoulvdberge.refinedstorage.container.ContainerCraftingMonitor;
 import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
 import com.raoulvdberge.refinedstorage.network.MessageCraftingMonitorCancel;
 import com.raoulvdberge.refinedstorage.tile.craftingmonitor.ICraftingMonitor;
-import com.raoulvdberge.refinedstorage.tile.craftingmonitor.TileCraftingMonitor;
-import com.raoulvdberge.refinedstorage.tile.craftingmonitor.WirelessCraftingMonitor;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
@@ -65,8 +63,8 @@ public class GuiCraftingMonitor extends GuiBase {
 
     @Override
     public void init(int x, int y) {
-        if (!(craftingMonitor instanceof WirelessCraftingMonitor)) {
-            addSideButton(new SideButtonRedstoneMode(this, TileCraftingMonitor.REDSTONE_MODE));
+        if (craftingMonitor.getRedstoneModeParameter() != null) {
+            addSideButton(new SideButtonRedstoneMode(this, craftingMonitor.getRedstoneModeParameter()));
         }
 
         String cancel = t("gui.cancel");
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/ICraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/ICraftingMonitor.java
index 8c9e35f5c..1361b0c9d 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/ICraftingMonitor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/ICraftingMonitor.java
@@ -1,11 +1,14 @@
 package com.raoulvdberge.refinedstorage.tile.craftingmonitor;
 
+import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.util.math.BlockPos;
 
 public interface ICraftingMonitor {
     void onCancelled(EntityPlayerMP player, int id);
 
+    TileDataParameter<Integer> getRedstoneModeParameter();
+
     BlockPos getNetworkPosition();
 
     boolean isConnected();
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/TileCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/TileCraftingMonitor.java
index e60cbdbe1..77ddd7d4b 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/TileCraftingMonitor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/TileCraftingMonitor.java
@@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.tile.craftingmonitor;
 
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.tile.TileNode;
+import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.util.math.BlockPos;
@@ -28,6 +29,11 @@ public class TileCraftingMonitor extends TileNode implements ICraftingMonitor {
         }
     }
 
+    @Override
+    public TileDataParameter<Integer> getRedstoneModeParameter() {
+        return REDSTONE_MODE;
+    }
+
     @Override
     public BlockPos getNetworkPosition() {
         return network != null ? network.getPosition() : null;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java
index b2fe94b61..f7ebcdefd 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java
@@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.tile.craftingmonitor;
 
 import com.raoulvdberge.refinedstorage.item.ItemWirelessCraftingMonitor;
 import com.raoulvdberge.refinedstorage.tile.TileController;
+import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -27,6 +28,11 @@ public class WirelessCraftingMonitor implements ICraftingMonitor {
         }
     }
 
+    @Override
+    public TileDataParameter<Integer> getRedstoneModeParameter() {
+        return null;
+    }
+
     @Override
     public BlockPos getNetworkPosition() {
         return controller;