From 124ff352609173ab4d370eb2ae95414e89276395 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Thu, 30 Jun 2016 16:59:31 +0200
Subject: [PATCH] Fixes and shit

---
 .../java/refinedstorage/api/network/INetworkMaster.java    | 6 ++++++
 .../java/refinedstorage/api/storage/IGroupedStorage.java   | 3 +--
 .../refinedstorage/apiimpl/storage/GroupedStorage.java     | 5 ++---
 .../refinedstorage/tile/controller/TileController.java     | 7 ++++++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/refinedstorage/api/network/INetworkMaster.java b/src/main/java/refinedstorage/api/network/INetworkMaster.java
index af698b0f3..f7c6bbbac 100755
--- a/src/main/java/refinedstorage/api/network/INetworkMaster.java
+++ b/src/main/java/refinedstorage/api/network/INetworkMaster.java
@@ -8,6 +8,7 @@ import refinedstorage.api.autocrafting.ICraftingPattern;
 import refinedstorage.api.autocrafting.ICraftingTask;
 import refinedstorage.api.storage.CompareFlags;
 import refinedstorage.api.storage.IGroupedStorage;
+import refinedstorage.api.storage.IStorage;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -64,6 +65,11 @@ public interface INetworkMaster {
      */
     IGroupedStorage getStorage();
 
+    /**
+     * @return The storages connected to this network
+     */
+    List<IStorage> getStorages();
+
     /**
      * @return The crafting tasks in this network, do NOT modify this list
      */
diff --git a/src/main/java/refinedstorage/api/storage/IGroupedStorage.java b/src/main/java/refinedstorage/api/storage/IGroupedStorage.java
index c95a7f43d..5fedca9c1 100755
--- a/src/main/java/refinedstorage/api/storage/IGroupedStorage.java
+++ b/src/main/java/refinedstorage/api/storage/IGroupedStorage.java
@@ -4,7 +4,6 @@ import net.minecraft.item.ItemStack;
 import refinedstorage.api.network.INetworkMaster;
 
 import java.util.Collection;
-import java.util.List;
 
 /**
  * This holds all items from all the connected storages from a {@link INetworkMaster}.
@@ -14,7 +13,7 @@ public interface IGroupedStorage {
      * Rebuilds the storages and items for a network. Typically called when a {@link IStorageProvider} is
      * added or removed from the network.
      */
-    void rebuild(List<IStorage> storages);
+    void rebuild();
 
     /**
      * Adds an item to the network. Will merge it with another item if it already exists.
diff --git a/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java b/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java
index cf318e332..9a705ed5d 100755
--- a/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java
+++ b/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java
@@ -11,7 +11,6 @@ import refinedstorage.api.storage.IGroupedStorage;
 import refinedstorage.api.storage.IStorage;
 
 import java.util.Collection;
-import java.util.List;
 
 public class GroupedStorage implements IGroupedStorage {
     private INetworkMaster network;
@@ -22,10 +21,10 @@ public class GroupedStorage implements IGroupedStorage {
     }
 
     @Override
-    public void rebuild(List<IStorage> storages) {
+    public void rebuild() {
         stacks.clear();
 
-        for (IStorage storage : storages) {
+        for (IStorage storage : network.getStorages()) {
             for (ItemStack stack : storage.getItems()) {
                 add(stack);
             }
diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java
index 408d1cbb3..a35c00f0f 100755
--- a/src/main/java/refinedstorage/tile/controller/TileController.java
+++ b/src/main/java/refinedstorage/tile/controller/TileController.java
@@ -252,6 +252,11 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
         return storage;
     }
 
+    @Override
+    public List<IStorage> getStorages() {
+        return storages;
+    }
+
     @Override
     public List<ICraftingTask> getCraftingTasks() {
         return craftingTasks;
@@ -400,7 +405,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
             }
         });
 
-        this.storage.rebuild(storages);
+        storage.rebuild();
     }
 
     @Override