Fixed External Storage not updating correctly

CHANGELOG.md

@@ -3,8 +3,9 @@
 ### 0.8.6
 **Bugfixes**
 - Fixed External Storage disconnecting on world reload
+- Fixed External Storage not updating correctly
 - Fixed wireless signal starting from Controller instead of per Wireless Transmitter individually
-- Huge performance improvements to large networks
+- Huge performance improvements to large storage networks
 
 **Features**
 - Re-added Controllers exploding when two of them are connected to the same network

src/main/java/refinedstorage/RefinedStorageUtils.java

@@ -327,4 +327,16 @@ public final class RefinedStorageUtils {
     public static boolean hasPattern(INetworkMaster network, ItemStack stack) {
         return RefinedStorageUtils.getPattern(network, stack) != null;
     }
+
+    public static int getItemStackHashCode(ItemStack stack) {
+        return getItemStackHashCode(stack, stack == null ? 0 : stack.stackSize);
+    }
+
+    public static int getItemStackHashCode(ItemStack stack, int stackSize) {
+        if (stack == null) {
+            return 0;
+        }
+
+        return stack.getItem().hashCode() + Math.max(1, stackSize) * (stack.hasTagCompound() ? stack.getTagCompound().hashCode() : 1);
+    }
 }

src/main/java/refinedstorage/block/BlockExternalStorage.java

@@ -36,8 +36,12 @@ public class BlockExternalStorage extends BlockNode {
     public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) {
         super.neighborChanged(state, world, pos, block);
 
-        if (!world.isRemote && ((TileExternalStorage) world.getTileEntity(pos)).isConnected()) {
+        if (!world.isRemote) {
-            ((TileExternalStorage) world.getTileEntity(pos)).updateStorage();
+            TileExternalStorage externalStorage = (TileExternalStorage) world.getTileEntity(pos);
+
+            if (externalStorage.getNetwork() != null) {
+                externalStorage.updateStorage(externalStorage.getNetwork());
+            }
         }
     }
 

src/main/java/refinedstorage/tile/controller/TileController.java

@@ -50,6 +50,7 @@ import refinedstorage.tile.TileBase;
 import refinedstorage.tile.TileCrafter;
 import refinedstorage.tile.config.IRedstoneModeConfig;
 import refinedstorage.tile.config.RedstoneMode;
+import refinedstorage.tile.externalstorage.ExternalStorage;
 
 import java.util.*;
 
@@ -488,6 +489,10 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
         for (IStorage storage : this.storage.getStorages()) {
             remainder = storage.insertItem(remainder, size, simulate);
 
+            if (storage instanceof ExternalStorage && !simulate) {
+                ((ExternalStorage) storage).setHash();
+            }
+
             if (remainder == null) {
                 break;
             } else {
@@ -524,6 +529,10 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
         for (IStorage storage : this.storage.getStorages()) {
             ItemStack took = storage.extractItem(stack, requested - received, flags);
 
+            if (storage instanceof ExternalStorage) {
+                ((ExternalStorage) storage).setHash();
+            }
+
             if (took != null) {
                 if (newStack == null) {
                     newStack = took;

src/main/java/refinedstorage/tile/externalstorage/DeepStorageUnitStorage.java

@@ -17,6 +17,8 @@ public class DeepStorageUnitStorage extends ExternalStorage {
     public DeepStorageUnitStorage(TileExternalStorage externalStorage, IDeepStorageUnit unit) {
         this.externalStorage = externalStorage;
         this.unit = unit;
+
+        setHash();
     }
 
     @Override
@@ -24,6 +26,11 @@ public class DeepStorageUnitStorage extends ExternalStorage {
         return unit.getMaxStoredCount();
     }
 
+    @Override
+    public int getHash() {
+        return RefinedStorageUtils.getItemStackHashCode(unit.getStoredItemType());
+    }
+
     @Override
     public List<ItemStack> getItems() {
         if (unit.getStoredItemType() != null && unit.getStoredItemType().stackSize > 0) {

src/main/java/refinedstorage/tile/externalstorage/DrawerStorage.java

@@ -17,6 +17,8 @@ public class DrawerStorage extends ExternalStorage {
     public DrawerStorage(TileExternalStorage externalStorage, IDrawer drawer) {
         this.externalStorage = externalStorage;
         this.drawer = drawer;
+
+        setHash();
     }
 
     @Override
@@ -24,6 +26,11 @@ public class DrawerStorage extends ExternalStorage {
         return drawer.getMaxCapacity();
     }
 
+    @Override
+    public int getHash() {
+        return RefinedStorageUtils.getItemStackHashCode(drawer.getStoredItemPrototype(), drawer.getStoredItemCount());
+    }
+
     @Override
     public List<ItemStack> getItems() {
         if (!drawer.isEmpty() && drawer.getStoredItemCount() > 0) {

src/main/java/refinedstorage/tile/externalstorage/ExternalStorage.java

@@ -3,5 +3,23 @@ package refinedstorage.tile.externalstorage;
 import refinedstorage.api.storage.IStorage;
 
 public abstract class ExternalStorage implements IStorage {
+    private int hash = -1;
+
     public abstract int getCapacity();
+
+    public void setHash() {
+        this.hash = getHash();
+    }
+
+    public abstract int getHash();
+
+    public boolean isDirty() {
+        if (hash != -1 && hash != getHash()) {
+            hash = getHash();
+
+            return true;
+        }
+
+        return false;
+    }
 }

src/main/java/refinedstorage/tile/externalstorage/ItemHandlerStorage.java

@@ -16,6 +16,8 @@ public class ItemHandlerStorage extends ExternalStorage {
     public ItemHandlerStorage(TileExternalStorage externalStorage, IItemHandler handler) {
         this.externalStorage = externalStorage;
         this.handler = handler;
+
+        setHash();
     }
 
     @Override
@@ -23,6 +25,19 @@ public class ItemHandlerStorage extends ExternalStorage {
         return handler.getSlots() * 64;
     }
 
+    @Override
+    public int getHash() {
+        int code = 0;
+
+        for (int i = 0; i < handler.getSlots(); ++i) {
+            if (handler.getStackInSlot(i) != null && handler.getStackInSlot(i).getItem() != null) {
+                code += RefinedStorageUtils.getItemStackHashCode(handler.getStackInSlot(i));
+            }
+        }
+
+        return code;
+    }
+
     @Override
     public List<ItemStack> getItems() {
         List<ItemStack> items = new ArrayList<ItemStack>();

src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java

@@ -42,7 +42,6 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I
 
     private List<ExternalStorage> storages = new ArrayList<ExternalStorage>();
     private int lastDrawerCount;
-    private boolean updatedOnce;
 
     @Override
     public int getEnergyUsage() {
@@ -58,21 +57,23 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I
         super.onConnectionChange(network, state);
 
         network.getStorage().rebuild();
-
-        updatedOnce = false;
     }
 
     @Override
     public void update() {
-        if (isConnected()) {
+        if (!worldObj.isRemote && network != null) {
-            if (!updatedOnce) {
+            for (ExternalStorage storage : storages) {
-                updateStorage();
+                if (storage.isDirty()) {
+                    updateStorage(network);
 
-                updatedOnce = true;
+                    break;
-            } else if (getFacingTile() instanceof IDrawerGroup && lastDrawerCount != ((IDrawerGroup) getFacingTile()).getDrawerCount()) {
+                }
+            }
+
+            if (getFacingTile() instanceof IDrawerGroup && lastDrawerCount != ((IDrawerGroup) getFacingTile()).getDrawerCount()) {
                 lastDrawerCount = ((IDrawerGroup) getFacingTile()).getDrawerCount();
 
-                updateStorage();
+                updateStorage(network);
             }
         }
 
@@ -173,8 +174,9 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I
         markDirty();
     }
 
-    // Called when the neighbor block changes or when a drawer is added or removed to a drawer group
+    public void updateStorage(INetworkMaster network) {
-    public void updateStorage() {
+        System.out.println("Updating storages");
+
         storages.clear();
 
         TileEntity facing = getFacingTile();