From 618e9390c6929ecfceb89be4fb552d8c222fd517 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Fri, 13 Aug 2021 00:16:16 -0300 Subject: [PATCH] fixes item showing incorrect amounts --- gradle.properties | 2 +- .../appeng/me/cache/GridStorageCache.java | 2 -- .../java/appeng/me/cache/NetworkMonitor.java | 29 ------------------- 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/gradle.properties b/gradle.properties index 399d9336e..2cced3398 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ aechannel=stable aebuild=7 aegroup=appeng aebasename=appliedenergistics2 -trousers=omni-fixes-v46d +trousers=omni-fixes-v46e ######################################################### # Versions # diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index 559180776..15f7cd395 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/src/main/java/appeng/me/cache/GridStorageCache.java @@ -248,8 +248,6 @@ public class GridStorageCache implements IStorageGrid } } - this.storageMonitors.forEach( ( channel, monitor ) -> monitor.forceUpdate() ); - tracker.applyChanges(); } diff --git a/src/main/java/appeng/me/cache/NetworkMonitor.java b/src/main/java/appeng/me/cache/NetworkMonitor.java index 484d90487..5ec5cb76a 100644 --- a/src/main/java/appeng/me/cache/NetworkMonitor.java +++ b/src/main/java/appeng/me/cache/NetworkMonitor.java @@ -61,7 +61,6 @@ public class NetworkMonitor> implements IMEMonitor private final Object2ObjectMap, Object> listeners; private boolean sendEvent = false; - private boolean forceUpdate = false; @Nonnegative private int localDepthSemaphore = 0; private long gridItemCount; @@ -153,13 +152,6 @@ public class NetworkMonitor> implements IMEMonitor @Override public IItemList getStorageList() { - if( forceUpdate ) - { - forceUpdate = false; - this.cachedList.resetStatus(); - return this.getAvailableItems( this.cachedList ); - } - return this.cachedList; } @@ -288,27 +280,6 @@ public class NetworkMonitor> implements IMEMonitor } } - void forceUpdate() - { - this.forceUpdate = true; - - final Iterator, Object>> i = this.getListeners(); - while ( i.hasNext() ) - { - final Entry, Object> o = i.next(); - final IMEMonitorHandlerReceiver receiver = o.getKey(); - - if( receiver.isValid( o.getValue() ) ) - { - receiver.onListUpdate(); - } - else - { - i.remove(); - } - } - } - void onTick() { if( this.sendEvent )