avoid relaying changes if theres no one listening to the passthrough

gradle.properties

@@ -3,7 +3,7 @@ aechannel=stable
 aebuild=7
 aegroup=appeng
 aebasename=appliedenergistics2
-trousers=omni-fixes-v43h
+trousers=omni-fixes-v44
 
 #########################################################
 # Versions                                              #

src/api/java/appeng/api/networking/storage/IStackWatcherHost.java

@@ -44,11 +44,8 @@ public interface IStackWatcherHost
 	/**
 	 * Called when a watched item changes amounts.
 	 *
-	 * @param o changed item list
-	 * @param fullStack old stack
 	 * @param diffStack new stack
-	 * @param src action source
 	 * @param chan storage channel
 	 */
-	void onStackChange( IItemList<?> o, IAEStack<?> fullStack, IAEStack<?> diffStack, IActionSource src, IStorageChannel<?> chan );
+	void onStackChange( IAEStack<?> diffStack, IStorageChannel<?> chan );
 }

src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java

@@ -52,4 +52,9 @@ public interface IMEMonitorHandlerReceiver<T extends IAEStack<T>>
 	 * called when the list updates its contents, this is mostly for handling power events.
 	 */
 	void onListUpdate();
+
+	default boolean hasListeners()
+	{
+		return true;
+	}
 }

src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java

@@ -20,7 +20,6 @@ package appeng.fluids.parts;
 
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -45,7 +44,6 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IItemList;
 import appeng.fluids.util.AEFluidStack;
-import appeng.me.GridAccessException;
 import appeng.me.helpers.IGridProxyable;
 import appeng.me.storage.ITickingMonitor;
 
@@ -94,14 +92,9 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 
 		if( type == Actionable.MODULATE )
 		{
-			try
-			{
-				this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
-			}
-			catch( GridAccessException ignore )
-			{
-				// meh
-			}
+			this.cache
+					.currentlyCached
+					.add( input.copy().setStackSize( wasFillled ));
 		}
 
 		fluidStack.amount = remaining;
@@ -123,18 +116,16 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 			return null;
 		}
 
+		IAEFluidStack gatheredAEFluidstack = AEFluidStack.fromFluidStack( gathered );
 		if( mode == Actionable.MODULATE )
 		{
-			try
+			IAEFluidStack e = this.cache.currentlyCached.findPrecise( gatheredAEFluidstack );
+			if (e != null)
 			{
-				this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
-			}
-			catch( GridAccessException ignore )
-			{
-				// meh
+				e.decStackSize( gathered.amount );
 			}
 		}
-		return AEFluidStack.fromFluidStack( gathered );
+		return gatheredAEFluidstack;
 	}
 
 	@Override
@@ -202,9 +193,10 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 
 	private static class InventoryCache
 	{
-		private IAEFluidStack[] cachedAeStacks = new IAEFluidStack[0];
 		private final IFluidHandler fluidHandler;
 		private final StorageFilter mode;
+		IItemList<IAEFluidStack> currentlyCached = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
+
 
 		public InventoryCache( IFluidHandler fluidHandler, StorageFilter mode )
 		{
@@ -216,19 +208,12 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 		{
 			final List<IAEFluidStack> changes = new ArrayList<>();
 			final IFluidTankProperties[] tankProperties = this.fluidHandler.getTankProperties();
-			final int slots = tankProperties.length;
 
-			// Make room for new slots
-			if( slots > this.cachedAeStacks.length )
-			{
-				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
-			}
+			IItemList<IAEFluidStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
 
-			for( int slot = 0; slot < slots; slot++ )
+			for( IFluidTankProperties tankProperty : tankProperties )
 			{
-				// Save the old stuff
-				final IAEFluidStack oldAEFS = this.cachedAeStacks[slot];
-				FluidStack newFS = tankProperties[slot].getContents();
+				FluidStack newFS = tankProperty.getContents();
 				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && newFS != null )
 				{
 					if( this.fluidHandler.drain( 1, false ) == null )
@@ -236,82 +221,40 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 						newFS = null;
 					}
 				}
-				this.handlePossibleSlotChanges( slot, oldAEFS, newFS, changes );
-			}
-
-			// Handle cases where the number of slots actually is lower now than before
-			if( slots < this.cachedAeStacks.length )
-			{
-				for( int slot = slots; slot < this.cachedAeStacks.length; slot++ )
+				if( newFS != null )
 				{
-					final IAEFluidStack aeStack = this.cachedAeStacks[slot];
-
-					if( aeStack != null )
-					{
-						final IAEFluidStack a = aeStack.copy();
-						a.setStackSize( -a.getStackSize() );
-						changes.add( a );
-					}
+					currentlyOnStorage.add( AEFluidStack.fromFluidStack( newFS ) );
 				}
-
-				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
 			}
+
+			for ( final IAEFluidStack is : currentlyCached )
+			{
+				is.setStackSize( -is.getStackSize() );
+			}
+
+			for ( final IAEFluidStack is : currentlyOnStorage )
+			{
+				currentlyCached.add( is );
+			}
+
+			for ( final IAEFluidStack is : currentlyCached )
+			{
+				if( is.getStackSize() != 0 )
+				{
+					changes.add( is );
+				}
+			}
+
+			currentlyCached = currentlyOnStorage;
+
 			return changes;
 		}
 
 		public IItemList<IAEFluidStack> getAvailableItems( IItemList<IAEFluidStack> out )
 		{
-			Arrays.stream( this.cachedAeStacks ).forEach( out::add );
+			currentlyCached.iterator().forEachRemaining( out::add );
 			return out;
 		}
 
-		private void handlePossibleSlotChanges( int slot, IAEFluidStack oldAeFS, FluidStack newFS, List<IAEFluidStack> changes )
-		{
-			if( oldAeFS != null && oldAeFS.getFluidStack().isFluidEqual( newFS ) )
-			{
-				this.handleStackSizeChanged( slot, oldAeFS, newFS, changes );
-			}
-			else
-			{
-				this.handleFluidChanged( slot, oldAeFS, newFS, changes );
-			}
-		}
-
-		private void handleStackSizeChanged( int slot, IAEFluidStack oldAeFS, FluidStack newFS, List<IAEFluidStack> changes )
-		{
-			// Still the same fluid, but amount might have changed
-			final long diff = newFS.amount - oldAeFS.getStackSize();
-
-			if( diff != 0 )
-			{
-				final IAEFluidStack stack = oldAeFS.copy();
-				stack.setStackSize( newFS.amount );
-
-				this.cachedAeStacks[slot] = stack;
-
-				final IAEFluidStack a = stack.copy();
-				a.setStackSize( diff );
-				changes.add( a );
-			}
-		}
-
-		private void handleFluidChanged( int slot, IAEFluidStack oldAeFS, FluidStack newFS, List<IAEFluidStack> changes )
-		{
-			// Completely different fluid
-			this.cachedAeStacks[slot] = AEFluidStack.fromFluidStack( newFS );
-
-			// If we had a stack previously in this slot, notify the network about its disappearance
-			if( oldAeFS != null )
-			{
-				oldAeFS.setStackSize( -oldAeFS.getStackSize() );
-				changes.add( oldAeFS );
-			}
-
-			// Notify the network about the new stack. Note that this is null if newFS was null
-			if( this.cachedAeStacks[slot] != null )
-			{
-				changes.add( this.cachedAeStacks[slot] );
-			}
-		}
 	}
 }

src/main/java/appeng/fluids/parts/PartFluidLevelEmitter.java

@@ -4,7 +4,9 @@ package appeng.fluids.parts;
 
 import java.util.Random;
 
+import appeng.api.networking.events.MENetworkChannelChanged;
 import appeng.fluids.helper.IConfigurableFluidInventory;
+import appeng.me.cache.NetworkMonitor;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -34,7 +36,6 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEStack;
-import appeng.api.storage.data.IItemList;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.IConfigManager;
@@ -112,11 +113,11 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 	}
 
 	@Override
-	public void onStackChange( IItemList<?> o, IAEStack<?> fullStack, IAEStack<?> diffStack, IActionSource src, IStorageChannel<?> chan )
+	public void onStackChange( IAEStack<?> diffStack, IStorageChannel<?> chan )
 	{
-		if( chan == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) && fullStack.equals( this.config.getFluidInSlot( 0 ) ) )
+		if( chan == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) && diffStack.equals( this.config.getFluidInSlot( 0 ) ) )
 		{
-			this.lastReportedValue = fullStack.getStackSize();
+			this.lastReportedValue += diffStack.getStackSize();
 			this.updateState();
 		}
 	}
@@ -128,14 +129,22 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 	}
 
 	@MENetworkEventSubscribe
-	public void channelChanged( final MENetworkChannelsChanged c )
+	public void powerStatusChange( final MENetworkPowerStatusChange powerEvent )
 	{
+		if (this.getProxy().isActive())
+		{
+			onListUpdate();
+		}
 		this.updateState();
 	}
 
 	@MENetworkEventSubscribe
-	public void powerChanged( final MENetworkPowerStatusChange c )
+	public void channelChanged( final MENetworkChannelsChanged c )
 	{
+		if (this.getProxy().isActive())
+		{
+			onListUpdate();
+		}
 		this.updateState();
 	}
 
@@ -247,10 +256,9 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 
 		if( myStack == null )
 		{
-			this.lastReportedValue = 0;
-			for( final IAEFluidStack st : monitor.getStorageList() )
+			if( monitor instanceof NetworkMonitor )
 			{
-				this.lastReportedValue += st.getStackSize();
+				this.lastReportedValue = ( (NetworkMonitor<IAEFluidStack>) monitor ).getGridCurrentCount();
 			}
 		}
 		else

src/main/java/appeng/fluids/parts/PartFluidStorageBus.java

@@ -264,20 +264,17 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 	@Override
 	public void postChange( final IBaseMonitor<IAEFluidStack> monitor, final Iterable<IAEFluidStack> change, final IActionSource source )
 	{
-		if( source == this.source || source.machine().map( machine -> machine == this ).orElse( false ) )
+		try
 		{
-			try
+			if( this.getProxy().isActive() )
 			{
-				if( this.getProxy().isActive() )
-				{
-					this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ), change, this.source );
-				}
-			}
-			catch( final GridAccessException e )
-			{
-				// :(
+				this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ), change, this.source );
 			}
 		}
+		catch( final GridAccessException e )
+		{
+			// :(
+		}
 	}
 
 	public MEInventoryHandler<IAEFluidStack> getInternalHandler()
@@ -415,7 +412,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 	{
 		if( channel == this.getStorageChannel() )
 		{
-			final IMEInventoryHandler<IAEFluidStack> out = this.getProxy().isActive() ? this.getInternalHandler() : null;
+			final IMEInventoryHandler<IAEFluidStack> out = this.getInternalHandler();
 			if( out != null )
 			{
 				return Collections.singletonList( out );

src/main/java/appeng/me/cache/NetworkMonitor.java

@@ -19,17 +19,21 @@
 package appeng.me.cache;
 
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Deque;
-import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.Map.Entry;
 
 import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import appeng.api.AEApi;
+import appeng.api.storage.channels.IFluidStorageChannel;
+import appeng.api.storage.channels.IItemStorageChannel;
+import appeng.api.storage.data.IAEFluidStack;
+import appeng.api.storage.data.IAEItemStack;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Queues;
 
@@ -66,6 +70,8 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 	private boolean hasChanged = false;
 	@Nonnegative
 	private int localDepthSemaphore = 0;
+	private long gridItemCount;
+	private long gridFluidCount;
 
 	public NetworkMonitor( final GridStorageCache cache, final IStorageChannel<T> chan )
 	{
@@ -137,6 +143,32 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 		return this.getHandler().getSlot();
 	}
 
+	public long getGridCurrentCount()
+	{
+		if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
+		{
+			return gridItemCount;
+		}
+		else if( myChannel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
+		{
+			return gridFluidCount;
+		}
+		return 0;
+	}
+
+	public long incGridCurrentCount(long count)
+	{
+		if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
+		{
+			return gridItemCount += count;
+		}
+		else if( myChannel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
+		{
+			return gridFluidCount += count;
+		}
+		return 0;
+	}
+
 	@Nonnull
 	@Override
 	public IItemList<T> getStorageList()
@@ -230,7 +262,7 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 		{
 			final Entry<IMEMonitorHandlerReceiver<T>, Object> o = i.next();
 			final IMEMonitorHandlerReceiver<T> receiver = o.getKey();
-			if( receiver.isValid( o.getValue() ) )
+			if( receiver.isValid( o.getValue() ) && receiver.hasListeners() )
 			{
 				receiver.postChange( this, diff, src );
 			}
@@ -258,9 +290,7 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 
 		this.sendEvent = true;
 
-		this.notifyListenersOfChange( changes, src );
-
-		for( final T changedItem : changes )
+		for ( final T changedItem : changes )
 		{
 			T difference = changedItem;
 
@@ -270,25 +300,20 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 				difference.setStackSize( -changedItem.getStackSize() );
 			}
 
+			incGridCurrentCount( difference.getStackSize() );
+			this.cachedList.add( difference );
+
 			if( this.myGridCache.getInterestManager().containsKey( changedItem ) )
 			{
 				final Collection<ItemWatcher> list = this.myGridCache.getInterestManager().get( changedItem );
 
 				if( !list.isEmpty() )
 				{
-					IAEStack<T> fullStack = this.getStorageList().findPrecise( changedItem );
-
-					if( fullStack == null )
-					{
-						fullStack = changedItem.copy();
-						fullStack.setStackSize( 0 );
-					}
-
 					this.myGridCache.getInterestManager().enableTransactions();
 
 					for( final ItemWatcher iw : list )
 					{
-						iw.getHost().onStackChange( this.getStorageList(), fullStack, difference, src, this.getChannel() );
+						iw.getHost().onStackChange( difference, this.getChannel() );
 					}
 
 					this.myGridCache.getInterestManager().disableTransactions();
@@ -296,6 +321,8 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 			}
 		}
 
+		this.notifyListenersOfChange( changes, src );
+
 		final NetworkMonitor<?> last = GLOBAL_DEPTH.pop();
 		this.localDepthSemaphore--;
 
@@ -308,9 +335,28 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 	void forceUpdate()
 	{
 		this.hasChanged = true;
+		//when the grid comes back online, reset the count to 0 so
+		//it reflects the correct amount after the changes are accounted for
+
+		if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
+		{
+			gridItemCount = 0;
+			for( IAEItemStack iaeItemStack : (Iterable<IAEItemStack>) getStorageList() )
+			{
+				gridItemCount += iaeItemStack.getStackSize();
+			}
+		}
+		else if( myChannel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
+		{
+			gridFluidCount = 0;
+			for( IAEFluidStack iaeFluidStack : (Iterable<IAEFluidStack>) getStorageList() )
+			{
+				gridFluidCount += iaeFluidStack.getStackSize();
+			}
+		}
 
 		final Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> i = this.getListeners();
-		while( i.hasNext() )
+		while ( i.hasNext() )
 		{
 			final Entry<IMEMonitorHandlerReceiver<T>, Object> o = i.next();
 			final IMEMonitorHandlerReceiver<T> receiver = o.getKey();
@@ -333,5 +379,6 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 			this.sendEvent = false;
 			this.myGridCache.getGrid().postEvent( new MENetworkStorageEvent( this, this.myChannel ) );
 		}
+
 	}
 }

src/main/java/appeng/me/cache/TickManagerCache.java

@@ -138,7 +138,6 @@ public class TickManagerCache implements ITickManager
 			tt.addEntityCrashInfo( crashreportcategory );
 			throw new ReportedException( crashreport );
 		}
-		PartLevelEmitter.wipeCache();
 	}
 
 	private void addToQueue( final TickTracker tt )

src/main/java/appeng/me/helpers/GenericInterestManager.java

@@ -23,9 +23,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import com.google.common.collect.Multimap;
-
+import appeng.api.config.FuzzyMode;
 import appeng.api.storage.data.IAEStack;
+import appeng.util.item.AEItemStack;
+import com.google.common.collect.Multimap;
 
 
 public class GenericInterestManager<T>
@@ -101,12 +102,30 @@ public class GenericInterestManager<T>
 
 	public boolean containsKey( final IAEStack stack )
 	{
+		if( stack.isItem() && ( ( AEItemStack ) stack ).getItem().isDamageable() )
+		{
+			return this.container.keySet().stream().filter( s -> s.isItem() )
+					.anyMatch( s -> s.fuzzyComparison( stack, FuzzyMode.IGNORE_ALL ) );
+		}
 		return this.container.containsKey( stack );
 	}
 
 	public Collection<T> get( final IAEStack stack )
 	{
-		return this.container.get( stack );
+		Collection<T> watchers = new ArrayList<>();
+		if( stack.isItem() && ( ( AEItemStack ) stack ).getItem().isDamageable() )
+		{
+			this.container.keySet().stream().filter( s -> s.isItem() )
+					.filter( k -> k.fuzzyComparison( stack, FuzzyMode.IGNORE_ALL ) )
+					.forEach( key ->
+							watchers.addAll( this.container.get( key ) )
+					);
+		}
+		else
+		{
+			return this.container.get( stack );
+		}
+		return watchers;
 	}
 
 	private class SavedTransactions

src/main/java/appeng/me/storage/MEMonitorPassThrough.java

@@ -90,6 +90,13 @@ public class MEMonitorPassThrough<T extends IAEStack<T>> extends MEPassThrough<T
 	@Override
 	public void addListener( final IMEMonitorHandlerReceiver<T> l, final Object verificationToken )
 	{
+		if( this.listeners.size() == 0 )
+		{
+			if( this.monitor != null )
+			{
+				this.monitor.addListener( this, this.monitor );
+			}
+		}
 		this.listeners.put( l, verificationToken );
 	}
 
@@ -117,6 +124,12 @@ public class MEMonitorPassThrough<T extends IAEStack<T>> extends MEPassThrough<T
 		return verificationToken == this.monitor;
 	}
 
+	@Override
+	public boolean hasListeners()
+	{
+		return this.listeners.size() > 0;
+	}
+
 	@Override
 	public void postChange( final IBaseMonitor<T> monitor, final Iterable<T> change, final IActionSource source )
 	{

src/main/java/appeng/parts/automation/PartLevelEmitter.java

@@ -19,11 +19,17 @@
 package appeng.parts.automation;
 
 
+import java.util.Collections;
+import java.util.Optional;
 import java.util.Random;
 
+import appeng.api.networking.events.*;
 import appeng.me.Grid;
 import appeng.me.GridNode;
+import appeng.me.cache.NetworkMonitor;
 import appeng.util.item.AEItemStack;
+import appeng.util.item.OreHelper;
+import appeng.util.item.OreReference;
 import it.unimi.dsi.fastutil.objects.Object2LongMap;
 import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
@@ -56,10 +62,6 @@ import appeng.api.networking.crafting.ICraftingWatcherHost;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.networking.energy.IEnergyWatcher;
 import appeng.api.networking.energy.IEnergyWatcherHost;
-import appeng.api.networking.events.MENetworkChannelsChanged;
-import appeng.api.networking.events.MENetworkCraftingPatternChange;
-import appeng.api.networking.events.MENetworkEventSubscribe;
-import appeng.api.networking.events.MENetworkPowerStatusChange;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.networking.storage.IBaseMonitor;
 import appeng.api.networking.storage.IStackWatcher;
@@ -72,7 +74,6 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
-import appeng.api.storage.data.IItemList;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.IConfigManager;
@@ -123,9 +124,6 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	private double centerX;
 	private double centerY;
 	private double centerZ;
-	static Object2LongMap<Grid> gridItemCount = new Object2LongOpenHashMap<>();
-	static Object2ObjectOpenHashMap<Grid, Object2LongMap<AEItemStack>> fuzzyAEItemStackCount = new Object2ObjectOpenHashMap<>();
-	static Object2ObjectOpenHashMap<Grid, Object2LongMap<AEItemStack>> preciseAEItemStackCount = new Object2ObjectOpenHashMap<>();
 
 	@Reflected
 	public PartLevelEmitter( final ItemStack is )
@@ -156,12 +154,6 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 		}
 	}
 
-	@MENetworkEventSubscribe
-	public void powerChanged( final MENetworkPowerStatusChange c )
-	{
-		this.updateState();
-	}
-
 	private void updateState()
 	{
 		final boolean isOn = this.isLevelEmitterOn();
@@ -206,9 +198,23 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 		return flipState ? this.reportingValue >= this.lastReportedValue + 1 : this.reportingValue < this.lastReportedValue + 1;
 	}
 
+	@MENetworkEventSubscribe
+	public void powerStatusChange( final MENetworkPowerStatusChange powerEvent )
+	{
+		if (this.getProxy().isActive())
+		{
+			onListUpdate();
+		}
+		this.updateState();
+	}
+
 	@MENetworkEventSubscribe
 	public void channelChanged( final MENetworkChannelsChanged c )
 	{
+		if (this.getProxy().isActive())
+		{
+			onListUpdate();
+		}
 		this.updateState();
 	}
 
@@ -296,24 +302,37 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 
 		try
 		{
-			if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 || myStack == null )
+
+			if( myStack == null )
 			{
-				this.getProxy()
-						.getStorage()
-						.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
-						.addListener( this,
-								this.getProxy().getGrid() );
+				this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).addListener( this, this.getProxy().getGrid() );
 			}
 			else
 			{
 				this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).removeListener( this );
-
 				if( this.myWatcher != null )
 				{
-					this.myWatcher.add( myStack );
+					if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
+					{
+						Optional<OreReference> ores = OreHelper.INSTANCE.getOre( myStack.getDefinition() );
+						if( ores.isPresent() )
+						{
+							for( IAEItemStack iaeItemStack : ores.get().getAEEquivalents() )
+							{
+								this.myWatcher.add( iaeItemStack );
+							}
+						}
+						else
+						{
+							this.myWatcher.add( myStack );
+						}
+					}
+					else
+					{
+						this.myWatcher.add( myStack );
+					}
 				}
 			}
-
 			this.updateReportingValue( this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) );
 		}
 		catch( final GridAccessException e )
@@ -323,90 +342,29 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	}
 
 	private void updateReportingValue( final IMEMonitor<IAEItemStack> monitor )
-	{
-		updateReportingValue( monitor,null );
-	}
-
-	private void updateReportingValue( final IMEMonitor<IAEItemStack> monitor, Iterable<IAEItemStack> change )
 	{
 		final IAEItemStack myStack = this.config.getAEStackInSlot( 0 );
 
-		GridNode node = (GridNode) (this.getGridNode());
-
-		if( node != null )
+		if( myStack == null )
 		{
-
-			final Grid g = node.getInternalGrid();
-
-			if( myStack == null )
+			if( monitor instanceof NetworkMonitor )
 			{
-				if( change != null )
-				{
-					if( gridItemCount.containsKey( g ) )
-					{
-						change.forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
-					}
-				}
-				gridItemCount.computeIfAbsent( g, ( aLong ) -> {
-					this.lastReportedValue = 0;
-					monitor.getStorageList().forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
-					return ( lastReportedValue );
-				} );
-				this.lastReportedValue = gridItemCount.get( g );
+				this.lastReportedValue = ( (NetworkMonitor<IAEItemStack>) monitor ).getGridCurrentCount();
 			}
+		}
 
-			else if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
-			{
-				final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE );
-				if( change != null )
-				{
-					if( fuzzyAEItemStackCount.containsKey( g ) )
-					{
-						change.forEach( iaeItemStack -> {
-							if( iaeItemStack.sameOre( myStack ) ) lastReportedValue += iaeItemStack.getStackSize();
-						} );
-					}
-				}
+		else if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
+		{
+			final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE );
 
-				fuzzyAEItemStackCount.computeIfAbsent( g, ( grid -> new Object2LongOpenHashMap<>() ) );
-				fuzzyAEItemStackCount.get( g ).computeIfAbsent( (AEItemStack) myStack, ( aLong -> {
-					this.lastReportedValue = 0;
-					monitor.getStorageList().findFuzzy( myStack, fzMode ).forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
-					return ( lastReportedValue );
-				} ) );
-
-				this.lastReportedValue = fuzzyAEItemStackCount.get( g ).get( myStack );
-				if( this.lastReportedValue == 0 )
-				{
-					fuzzyAEItemStackCount.get( g ).remove( myStack );
-					fuzzyAEItemStackCount.trim();
-				}
-			}
-			else
-			{
-				if( change != null )
-				{
-					if( preciseAEItemStackCount.containsKey( g ) )
-					{
-						change.forEach( iaeItemStack -> {
-							if( iaeItemStack.isSameType( myStack ) ) lastReportedValue += iaeItemStack.getStackSize();
-						} );
-					}
-				}
-				preciseAEItemStackCount.computeIfAbsent( g, ( grid -> new Object2LongOpenHashMap<>() ) );
-				preciseAEItemStackCount.get( g ).computeIfAbsent( (AEItemStack) myStack, ( aLong -> {
-					this.lastReportedValue = 0;
-					IAEItemStack precise = monitor.getStorageList().findPrecise( myStack );
-					if( precise != null ) lastReportedValue = precise.getStackSize();
-					return ( lastReportedValue );
-				} ) );
-				this.lastReportedValue = preciseAEItemStackCount.get( g ).get( myStack );
-				if( this.lastReportedValue == 0 )
-				{
-					preciseAEItemStackCount.get( g ).remove( myStack );
-					preciseAEItemStackCount.trim();
-				}
-			}
+			this.lastReportedValue = 0;
+			monitor.getStorageList().findFuzzy( myStack, fzMode ).forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
+		}
+		else
+		{
+			this.lastReportedValue = 0;
+			IAEItemStack precise = monitor.getStorageList().findPrecise( myStack );
+			if( precise != null ) lastReportedValue = precise.getStackSize();
 		}
 		this.updateState();
 	}
@@ -419,12 +377,23 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	}
 
 	@Override
-	public void onStackChange( final IItemList o, final IAEStack fullStack, final IAEStack diffStack, final IActionSource src, final IStorageChannel chan )
+	public void onStackChange( final IAEStack diffStack, final IStorageChannel chan )
 	{
-		if( chan == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) && fullStack.equals( this.config.getAEStackInSlot( 0 ) ) && this
-				.getInstalledUpgrades( Upgrades.FUZZY ) == 0 )
+		if( chan == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
 		{
-			this.lastReportedValue = fullStack.getStackSize();
+			IAEItemStack myStack = this.config.getAEStackInSlot( 0 );
+			if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
+			{
+				final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE );
+				if( Platform.itemComparisons().isFuzzyEqualItem( myStack.getDefinition(), ( (IAEItemStack) diffStack ).getDefinition(), fzMode ) )
+				{
+					this.lastReportedValue += diffStack.getStackSize();
+				}
+			}
+			else if( diffStack.equals( myStack ) )
+			{
+				this.lastReportedValue += diffStack.getStackSize();
+			}
 			this.updateState();
 		}
 	}
@@ -459,7 +428,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	@Override
 	public void postChange( final IBaseMonitor<IAEItemStack> monitor, final Iterable<IAEItemStack> change, final IActionSource actionSource )
 	{
-		this.updateReportingValue( (IMEMonitor<IAEItemStack>) monitor, change );
+		this.updateReportingValue( (IMEMonitor<IAEItemStack>) monitor );
 	}
 
 	@Override
@@ -636,9 +605,4 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 		}
 	}
 
-	public static void wipeCache(){
-		fuzzyAEItemStackCount.clear();
-		preciseAEItemStackCount.clear();
-		gridItemCount.clear();
-	}
 }

src/main/java/appeng/parts/misc/ItemHandlerAdapter.java

@@ -33,7 +33,6 @@ import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.core.AELog;
-import appeng.me.GridAccessException;
 import appeng.me.helpers.IGridProxyable;
 import appeng.me.storage.ITickingMonitor;
 import appeng.util.inv.ItemHandlerIterator;
@@ -44,7 +43,6 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.items.ItemHandlerHelper;
 
 import java.util.*;
 
@@ -83,6 +81,8 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 		stackCache = null;
 
 		ItemStack orgInput;
+		int slotCount = this.itemHandler.getSlots();
+
 		if( currentCached != null && iox.isSameType( currentCached ) )
 		{
 			// Cache is suitable, just update the count
@@ -94,10 +94,16 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 			// We need a new stack :-(
 			orgInput = iox.createItemStack();
 		}
-		ItemStack remaining = ItemHandlerHelper.insertItem( this.itemHandler, orgInput, type == Actionable.SIMULATE );
+
+		ItemStack remaining = orgInput;
+
+		for ( int i = 0; i < slotCount && !remaining.isEmpty(); i++ )
+		{
+			remaining = this.itemHandler.insertItem( i, remaining, type == Actionable.SIMULATE );
+		}
 
 		// Store the stack in the cache for next time.
-		if (!remaining.isEmpty() && remaining != orgInput)
+		if( !remaining.isEmpty() && remaining != orgInput )
 		{
 			stackCache = remaining;
 		}
@@ -111,15 +117,9 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 		if( type == Actionable.MODULATE )
 		{
-			try
-			{
-				this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
-			}
-			catch( GridAccessException ex )
-			{
-				// meh
-			}
-
+			this.cache
+					.currentlyCached
+					.add( AEItemStack.fromItemStack( orgInput ).setStackSize( orgInput.getCount() - remaining.getCount() ) );
 		}
 
 		return AEItemStack.fromItemStack( remaining );
@@ -128,18 +128,17 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 	@Override
 	public IAEItemStack extractItems( IAEItemStack request, Actionable mode, IActionSource src )
 	{
-		int remainingSize = Ints.saturatedCast(request.getStackSize());
+		int remainingSize = Ints.saturatedCast( request.getStackSize() );
 
 		// Use this to gather the requested items
 		ItemStack gathered = ItemStack.EMPTY;
 
 		final boolean simulate = ( mode == Actionable.SIMULATE );
-
-		for( int i = 0; i < this.itemHandler.getSlots(); i++ )
+		for ( int i = 0; i < this.itemHandler.getSlots(); i++ )
 		{
 			ItemStack stackInInventorySlot = this.itemHandler.getStackInSlot( i );
 
-			if (!request.isSameType(stackInInventorySlot))
+			if( !request.isSameType( stackInInventorySlot ) )
 			{
 				continue;
 			}
@@ -191,19 +190,17 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 		if( !gathered.isEmpty() )
 		{
+			IAEItemStack gatheredAEItemStack = AEItemStack.fromItemStack( gathered );
 			if( mode == Actionable.MODULATE )
 			{
-				try
+				IAEItemStack e = this.cache.currentlyCached.findPrecise( gatheredAEItemStack );
+				if (e != null)
 				{
-					this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
-				}
-				catch( GridAccessException ex )
-				{
-					// meh
+					e.decStackSize( gathered.getCount() );
 				}
 			}
 
-			return AEItemStack.fromItemStack( gathered );
+			return gatheredAEItemStack;
 		}
 
 		return null;
@@ -274,9 +271,10 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 	private static class InventoryCache implements Iterable<ItemSlot>
 	{
-		private IAEItemStack[] cachedAeStacks = new IAEItemStack[0];
 		private final IItemHandler itemHandler;
 		private final StorageFilter mode;
+		IItemList<IAEItemStack> currentlyCached = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+
 
 		public InventoryCache( IItemHandler itemHandler, StorageFilter mode )
 		{
@@ -286,7 +284,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 		public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
 		{
-			Arrays.stream( this.cachedAeStacks ).forEach( out::add );
+			currentlyCached.iterator().forEachRemaining( out::add );
 			return out;
 		}
 
@@ -298,93 +296,41 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 		public List<IAEItemStack> update()
 		{
 			final List<IAEItemStack> changes = new ArrayList<>();
-			final int slots = this.itemHandler.getSlots();
 
-			// Make room for new slots
-			if( slots > this.cachedAeStacks.length )
-			{
-				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
-			}
+			IItemList<IAEItemStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
 
-			for( final ItemSlot is : this )
+			for ( final ItemSlot is : this )
 			{
-				// Save the old stuff
-				final IAEItemStack oldAeIS = this.cachedAeStacks[is.getSlot()];
 				final ItemStack newIS = !is.isExtractable() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? ItemStack.EMPTY : is.getItemStack();
-
-				this.handlePossibleSlotChanges( is.getSlot(), oldAeIS, newIS, changes );
-			}
-			// Handle cases where the number of slots actually is lower now than before
-			if( slots < this.cachedAeStacks.length )
-			{
-				for( int slot = slots; slot < this.cachedAeStacks.length; slot++ )
+				if( !newIS.isEmpty() )
 				{
-					final IAEItemStack aeStack = this.cachedAeStacks[slot];
-
-					if( aeStack != null )
-					{
-						final IAEItemStack a = aeStack.copy();
-						a.setStackSize( -a.getStackSize() );
-						changes.add( a );
-					}
+					currentlyOnStorage.add( is.getAEItemStack() );
 				}
-
-				// Reduce the cache size
-				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
 			}
 
+			for ( final IAEItemStack is : currentlyCached )
+			{
+				is.setStackSize( -is.getStackSize() );
+			}
+
+			for ( final IAEItemStack is : currentlyOnStorage )
+			{
+				currentlyCached.add( is );
+			}
+
+			for ( final IAEItemStack is : currentlyCached )
+			{
+				if( is.getStackSize() != 0 )
+				{
+					changes.add( is );
+				}
+			}
+
+			currentlyCached = currentlyOnStorage;
+
 			return changes;
 		}
 
-		private void handlePossibleSlotChanges( int slot, IAEItemStack oldAeIS, ItemStack newIS, List<IAEItemStack> changes )
-		{
-			if( oldAeIS != null && oldAeIS.isSameType( newIS ) )
-			{
-				this.handleStackSizeChanged( slot, oldAeIS, newIS, changes );
-			}
-			else
-			{
-				this.handleItemChanged( slot, oldAeIS, newIS, changes );
-			}
-		}
-
-		private void handleStackSizeChanged( int slot, IAEItemStack oldAeIS, ItemStack newIS, List<IAEItemStack> changes )
-		{
-			// Still the same item, but amount might have changed
-			final long diff = newIS.getCount() - oldAeIS.getStackSize();
-
-			if( diff != 0 )
-			{
-				final IAEItemStack stack = oldAeIS.copy();
-				stack.setStackSize( newIS.getCount() );
-
-				this.cachedAeStacks[slot] = stack;
-
-				final IAEItemStack a = stack.copy();
-				a.setStackSize( diff );
-				changes.add( a );
-			}
-		}
-
-		private void handleItemChanged( int slot, IAEItemStack oldAeIS, ItemStack newIS, List<IAEItemStack> changes )
-		{
-			// Completely different item
-			this.cachedAeStacks[slot] = AEItemStack.fromItemStack( newIS );
-
-			// If we had a stack previously in this slot, notify the network about its disappearance
-			if( oldAeIS != null )
-			{
-				oldAeIS.setStackSize( -oldAeIS.getStackSize() );
-				changes.add( oldAeIS );
-			}
-
-			// Notify the network about the new stack. Note that this is null if newIS was null
-			if( this.cachedAeStacks[slot] != null )
-			{
-				changes.add( this.cachedAeStacks[slot] );
-			}
-		}
-
 		@Override
 		public Iterator<ItemSlot> iterator()
 		{

src/main/java/appeng/parts/misc/ItemRepositoryAdapter.java

@@ -13,7 +13,6 @@ import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.core.AELog;
-import appeng.me.GridAccessException;
 import appeng.me.helpers.IGridProxyable;
 import appeng.me.storage.ITickingMonitor;
 import appeng.util.item.AEItemStack;
@@ -24,7 +23,6 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.item.ItemStack;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 
 /**
@@ -85,14 +83,9 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
 
         if( type == Actionable.MODULATE )
         {
-            try
-            {
-                this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
-            }
-            catch( GridAccessException ex )
-            {
-                // meh
-            }
+            this.cache
+                    .currentlyCached
+                    .add( AEItemStack.fromItemStack( orgInput ).setStackSize( orgInput.getCount() - remaining.getCount() ) );
         }
 
         return AEItemStack.fromItemStack( remaining );
@@ -102,7 +95,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
     @Override
     public IAEItemStack extractItems( IAEItemStack request, Actionable mode, IActionSource src )
     {
-        int remainingSize = Ints.saturatedCast(request.getStackSize());
+        int remainingSize = Ints.saturatedCast( request.getStackSize() );
 
         final boolean simulate = ( mode == Actionable.SIMULATE );
 
@@ -112,25 +105,22 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
         {
             // Something broke. It should never return more than we requested...
             // We're going to silently eat the remainder
-            AELog.warn( "Mod that provided item handler %s is broken. Returned %s items while only requesting %d.",
-                    this.itemRepository.getClass().getName(), extracted.toString(), remainingSize );
+            AELog.warn( "Mod that provided item handler %s is broken. Returned %s items while only requesting %d.", this.itemRepository.getClass().getName(), extracted.toString(), remainingSize );
             extracted.setCount( remainingSize );
         }
 
         if( !extracted.isEmpty() )
         {
+            IAEItemStack extractedAEItemStack = AEItemStack.fromItemStack( extracted );
             if( mode == Actionable.MODULATE )
             {
-                try
+                IAEItemStack e = this.cache.currentlyCached.findPrecise( extractedAEItemStack );
+                if (e != null)
                 {
-                    this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
-                }
-                catch( GridAccessException ex )
-                {
-                    // meh
+                    e.decStackSize( extracted.getCount() );
                 }
             }
-            return AEItemStack.fromItemStack( extracted );
+            return extractedAEItemStack;
         }
         return null;
     }
@@ -202,7 +192,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
 
     private static class InventoryCache
     {
-        private IAEItemStack[] cachedAeStacks = new IAEItemStack[0];
+        private IItemList<IAEItemStack> currentlyCached = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
         private final IItemRepository iItemRepository;
 
         public InventoryCache( IItemRepository iItemRepository )
@@ -212,7 +202,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
 
         public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
         {
-            Arrays.stream( this.cachedAeStacks ).forEach( out::add );
+            currentlyCached.iterator().forEachRemaining( out::add );
             return out;
         }
 
@@ -220,95 +210,31 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
         {
             final List<IAEItemStack> changes = new ArrayList<>();
 
-            List<IAEItemStack> out = this.iItemRepository.getAllItems().stream().map( s -> AEItemStack.fromItemStack( s.itemPrototype ).setStackSize( s.count ) ).collect( Collectors.toList() );
+            IItemList<IAEItemStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+            this.iItemRepository.getAllItems().stream().map( s -> AEItemStack.fromItemStack( s.itemPrototype ).setStackSize( s.count ) ).forEach( currentlyOnStorage::add );
 
-            final int size = out.size();
-
-            // Make room for new slots
-            if( size > this.cachedAeStacks.length )
+            for ( final IAEItemStack is : currentlyCached )
             {
-                this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, size );
+                is.setStackSize( -is.getStackSize() );
             }
 
-            for( int x = 0; x < size; x++ )
+            for ( final IAEItemStack is : currentlyOnStorage )
             {
-                // Save the old stuff
-                final IAEItemStack oldAeIS = this.cachedAeStacks[x];
-                final IAEItemStack newIS = out.get( x );
-
-                this.handlePossibleSlotChanges( x, oldAeIS, newIS, changes );
+                currentlyCached.add( is );
             }
 
-            // Handle cases where the number of slots actually is lower now than before
-            if( size < this.cachedAeStacks.length )
+            for ( final IAEItemStack is : currentlyCached )
             {
-                for( int x = 0; x < this.cachedAeStacks.length; x++ )
+                if( is.getStackSize() != 0 )
                 {
-                    final IAEItemStack aeStack = this.cachedAeStacks[x];
-
-                    if( aeStack != null )
-                    {
-                        final IAEItemStack a = aeStack.copy();
-                        a.setStackSize( -a.getStackSize() );
-                        changes.add( a );
-                    }
+                    changes.add( is );
                 }
-
-                // Reduce the cache size
-                this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, size );
             }
 
+            currentlyCached = currentlyOnStorage;
+
             return changes;
         }
 
-        private void handlePossibleSlotChanges( int slot, IAEItemStack oldAeIS, IAEItemStack newIS, List<IAEItemStack> changes )
-        {
-            if( oldAeIS != null && oldAeIS.isSameType( newIS ) )
-            {
-                this.handleStackSizeChanged( slot, oldAeIS, newIS, changes );
-            }
-            else
-            {
-                this.handleItemChanged( slot, oldAeIS, newIS, changes );
-            }
-        }
-
-        private void handleStackSizeChanged( int slot, IAEItemStack oldAeIS, IAEItemStack newIS, List<IAEItemStack> changes )
-        {
-            // Still the same item, but amount might have changed
-            final long diff = newIS.getStackSize() - oldAeIS.getStackSize();
-
-            if( diff != 0 )
-            {
-                final IAEItemStack stack = oldAeIS.copy();
-                stack.setStackSize( newIS.getStackSize() );
-
-                this.cachedAeStacks[slot] = stack;
-
-                final IAEItemStack a = stack.copy();
-                a.setStackSize( diff );
-                changes.add( a );
-            }
-        }
-
-        private void handleItemChanged( int slot, IAEItemStack oldAeIS, IAEItemStack newIS, List<IAEItemStack> changes )
-        {
-            // Completely different item
-            this.cachedAeStacks[slot] =  newIS ;
-
-            // If we had a stack previously in this slot, notify the network about its disappearance
-            if( oldAeIS != null )
-            {
-                oldAeIS.setStackSize( -oldAeIS.getStackSize() );
-                changes.add( oldAeIS );
-            }
-
-            // Notify the network about the new stack. Note that this is null if newIS was null
-            if( this.cachedAeStacks[slot] != null )
-            {
-                changes.add( this.cachedAeStacks[slot] );
-            }
-        }
-
     }
 }

src/main/java/appeng/parts/misc/PartStorageBus.java

@@ -258,20 +258,17 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	@Override
 	public void postChange( final IBaseMonitor<IAEItemStack> monitor, final Iterable<IAEItemStack> change, final IActionSource source )
 	{
-		if( source == this.mySrc || source.machine().map( machine -> machine == this ).orElse( false ) )
+		try
 		{
-			try
+			if( this.getProxy().isActive() )
 			{
-				if( this.getProxy().isActive() )
-				{
-					this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change, this.mySrc );
-				}
-			}
-			catch( final GridAccessException e )
-			{
-				// :(
+				this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change, this.mySrc );
 			}
 		}
+		catch( final GridAccessException e )
+		{
+			// :(
+		}
 	}
 
 	@Override
@@ -598,7 +595,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	{
 		if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
 		{
-			final IMEInventoryHandler<IAEItemStack> out = this.getProxy().isActive() ? this.getInternalHandler() : null;
+			final IMEInventoryHandler<IAEItemStack> out = this.getInternalHandler();
 			if( out != null )
 			{
 				return Collections.singletonList( out );

src/main/java/appeng/parts/reporting/AbstractPartMonitor.java

@@ -21,10 +21,12 @@ package appeng.parts.reporting;
 
 import java.io.IOException;
 
+import appeng.api.networking.events.MENetworkChannelsChanged;
+import appeng.api.networking.events.MENetworkEventSubscribe;
+import appeng.api.networking.events.MENetworkPowerStatusChange;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.fluids.util.AEFluidStack;
-import appeng.util.item.AEStack;
 import io.netty.buffer.ByteBuf;
 
 import net.minecraft.client.renderer.GlStateManager;
@@ -43,7 +45,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.AEApi;
 import appeng.api.implementations.parts.IPartStorageMonitor;
-import appeng.api.networking.security.IActionSource;
 import appeng.api.networking.storage.IStackWatcher;
 import appeng.api.networking.storage.IStackWatcherHost;
 import appeng.api.parts.IPartModel;
@@ -52,7 +53,6 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
-import appeng.api.storage.data.IItemList;
 import appeng.client.render.TesrRenderHelper;
 import appeng.core.localization.PlayerMessages;
 import appeng.helpers.Reflected;
@@ -385,19 +385,87 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 		this.configureWatchers();
 	}
 
+	@MENetworkEventSubscribe
+	public void powerStatusChange( final MENetworkPowerStatusChange ev )
+	{
+		if( !this.getProxy().isPowered() )
+		{
+			if( this.myWatcher != null )
+			{
+				if( this.configuredItem != null )
+				{
+					this.configuredItem.setStackSize( 0 );
+				}
+				if( this.configuredFluid != null )
+				{
+					this.configuredFluid.setStackSize( 0 );
+				}
+			}
+		}
+		else
+		{
+			try
+			{
+				if( this.configuredItem != null )
+				{
+					this.updateReportingValue( this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) );
+				}
+				if( this.configuredFluid != null )
+				{
+					this.updateReportingValue( this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ) );
+				}
+			}
+			catch( final GridAccessException e )
+			{
+				// ;P
+			}
+		}
+	}
+
+	@MENetworkEventSubscribe
+	public void channelChanged( final MENetworkChannelsChanged c )
+	{
+		if( !this.getProxy().isPowered() )
+		{
+			if( this.myWatcher != null )
+			{
+				if( this.configuredItem != null )
+				{
+					this.configuredItem.setStackSize( 0 );
+				}
+				if( this.configuredFluid != null )
+				{
+					this.configuredFluid.setStackSize( 0 );
+				}
+			}
+		}
+		else
+		{
+			try
+			{
+				if( this.configuredItem != null )
+				{
+					this.updateReportingValue( this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) );
+				}
+				if( this.configuredFluid != null )
+				{
+					this.updateReportingValue( this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ) );
+				}
+			}
+			catch( final GridAccessException e )
+			{
+				// ;P
+			}
+		}
+	}
+
 	@Override
-	public void onStackChange( final IItemList o, final IAEStack fullStack, final IAEStack diffStack, final IActionSource src, final IStorageChannel chan )
+	public void onStackChange( final IAEStack diffStack, final IStorageChannel chan )
 	{
 		if( this.configuredItem != null )
 		{
-			if( fullStack == null )
-			{
-				this.configuredItem.setStackSize( 0 );
-			}
-			else
-			{
-				this.configuredItem.setStackSize( fullStack.getStackSize() );
-			}
+			long diff = this.configuredItem.getStackSize() + diffStack.getStackSize();
+			this.configuredItem.setStackSize( diff >= 0 ? this.configuredItem.getStackSize() + diffStack.getStackSize() : 0 );
 
 			final long stackSize = this.configuredItem.getStackSize();
 			final String humanReadableText = NUMBER_CONVERTER.toWideReadableForm( stackSize );
@@ -410,14 +478,8 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 		}
 		else if( this.configuredFluid != null )
 		{
-			if( fullStack == null )
-			{
-				this.configuredFluid.setStackSize( 0 );
-			}
-			else
-			{
-				this.configuredFluid.setStackSize( fullStack.getStackSize() );
-			}
+			long diff = this.configuredFluid.getStackSize() + diffStack.getStackSize();
+			this.configuredFluid.setStackSize( diff >= 0 ? this.configuredFluid.getStackSize() + diffStack.getStackSize() : 0 );
 
 			final long stackSize = this.configuredFluid.getStackSize() / 1000;
 			final String humanReadableText = NUMBER_CONVERTER.toWideReadableForm( stackSize ) + "B";

src/main/java/appeng/util/item/OreReference.java

@@ -43,7 +43,7 @@ public class OreReference
 		return this.otherOptions;
 	}
 
-	List<IAEItemStack> getAEEquivalents()
+	public List<IAEItemStack> getAEEquivalents()
 	{
 		if( this.aeOtherOptions == null )
 		{