From a5e8f4c811b0eaeb3517b6e29015be7ec077dd55 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sat, 2 Jul 2016 22:29:29 +0200
Subject: [PATCH] Add helper method

---
 src/main/java/refinedstorage/RefinedStorageUtils.java         | 4 ++++
 src/main/java/refinedstorage/apiimpl/network/GridHandler.java | 3 +--
 .../java/refinedstorage/tile/controller/TileController.java   | 3 +--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/refinedstorage/RefinedStorageUtils.java b/src/main/java/refinedstorage/RefinedStorageUtils.java
index 0aa9ab18e..26ef66825 100755
--- a/src/main/java/refinedstorage/RefinedStorageUtils.java
+++ b/src/main/java/refinedstorage/RefinedStorageUtils.java
@@ -302,6 +302,10 @@ public final class RefinedStorageUtils {
         return network.take(stack, size, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT);
     }
 
+    public static ItemStack getFromNetwork(INetworkMaster network, ItemStack stack) {
+        return network.getStorage().get(stack, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT);
+    }
+
     public static ICraftingPattern getPatternFromNetwork(INetworkMaster network, ItemStack stack) {
         return network.getPattern(stack, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT);
     }
diff --git a/src/main/java/refinedstorage/apiimpl/network/GridHandler.java b/src/main/java/refinedstorage/apiimpl/network/GridHandler.java
index ca114b95b..2be12de2e 100755
--- a/src/main/java/refinedstorage/apiimpl/network/GridHandler.java
+++ b/src/main/java/refinedstorage/apiimpl/network/GridHandler.java
@@ -9,7 +9,6 @@ import refinedstorage.api.autocrafting.ICraftingTask;
 import refinedstorage.api.network.GridPullFlags;
 import refinedstorage.api.network.IGridHandler;
 import refinedstorage.api.network.INetworkMaster;
-import refinedstorage.api.storage.CompareFlags;
 import refinedstorage.item.ItemWirelessGrid;
 
 public class GridHandler implements IGridHandler {
@@ -23,7 +22,7 @@ public class GridHandler implements IGridHandler {
 
     @Override
     public void onPull(ItemStack stack, int flags, EntityPlayerMP player) {
-        ItemStack item = network.getStorage().get(stack, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT);
+        ItemStack item = RefinedStorageUtils.getFromNetwork(network, stack);
 
         if (item == null) {
             return;
diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java
index 02a7c61e6..618d525a3 100755
--- a/src/main/java/refinedstorage/tile/controller/TileController.java
+++ b/src/main/java/refinedstorage/tile/controller/TileController.java
@@ -24,7 +24,6 @@ import refinedstorage.api.network.IGridHandler;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.network.INetworkSlave;
 import refinedstorage.api.network.IWirelessGridHandler;
-import refinedstorage.api.storage.CompareFlags;
 import refinedstorage.api.storage.IGroupedStorage;
 import refinedstorage.api.storage.IStorage;
 import refinedstorage.apiimpl.autocrafting.BasicCraftingTask;
@@ -340,7 +339,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
             int score = 0;
 
             for (ItemStack input : patterns.get(i).getInputs()) {
-                ItemStack stored = storage.get(input, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT);
+                ItemStack stored = RefinedStorageUtils.getFromNetwork(this, input);
 
                 score += stored != null ? stored.stackSize : 0;
             }