Fix StorageBus not updating item count correctly (#3218)

* Queue tick instead of ticking immediatley

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

@@ -19,10 +19,10 @@
 package appeng.parts.misc;
 
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -36,11 +36,12 @@ import appeng.api.networking.storage.IBaseMonitor;
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.IMEMonitorHandlerReceiver;
-import appeng.api.storage.IStorageChannel;
 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.Platform;
 import appeng.util.item.AEItemStack;
@@ -51,20 +52,17 @@ import appeng.util.item.AEItemStack;
  */
 class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAEItemStack>, ITickingMonitor
 {
-
 	private final Map<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
-
 	private IActionSource mySource;
-
 	private final IItemHandler itemHandler;
+	private final IGridProxyable proxyable;
+	private final InventoryCache cache;
 
-	private ItemStack[] cachedStacks = new ItemStack[0];
+	ItemHandlerAdapter( IItemHandler itemHandler, IGridProxyable proxy )
-
-	private IAEItemStack[] cachedAeStacks = new IAEItemStack[0];
-
-	ItemHandlerAdapter( IItemHandler itemHandler )
 	{
 		this.itemHandler = itemHandler;
+		this.proxyable = proxy;
+		this.cache = new InventoryCache( this.itemHandler );
 	}
 
 	@Override
@@ -91,7 +89,14 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 		if( type == Actionable.MODULATE )
 		{
-			this.onTick();
+			try
+			{
+				this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
+			}
+			catch( GridAccessException ex )
+			{
+				// meh
+			}
 		}
 
 		return AEItemStack.fromItemStack( remaining );
@@ -167,7 +172,14 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 		{
 			if( mode == Actionable.MODULATE )
 			{
-				this.onTick();
+				try
+				{
+					this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
+				}
+				catch( GridAccessException ex )
+				{
+					// meh
+				}
 			}
 
 			return AEItemStack.fromItemStack( gathered );
@@ -176,25 +188,89 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 		return null;
 	}
 
-	private ItemStack getItemStackInCachedSlot( int pos )
-	{
-		if( pos > this.cachedStacks.length )
-		{
-			return ItemStack.EMPTY;
-		}
-
-		if( this.cachedStacks[pos] == null )
-		{
-			return ItemStack.EMPTY;
-		}
-
-		return this.cachedStacks[pos];
-	}
-
 	@Override
 	public TickRateModulation onTick()
 	{
-		LinkedList<IAEItemStack> changes = new LinkedList<>();
+		List<IAEItemStack> changes = this.cache.update();
+		if( !changes.isEmpty() )
+		{
+			this.postDifference( changes );
+			return TickRateModulation.URGENT;
+		}
+		else
+		{
+			return TickRateModulation.SLOWER;
+		}
+	}
+
+	@Override
+	public void setActionSource( final IActionSource mySource )
+	{
+		this.mySource = mySource;
+	}
+
+	@Override
+	public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
+	{
+
+		for( int i = 0; i < this.itemHandler.getSlots(); i++ )
+		{
+			out.addStorage( AEItemStack.fromItemStack( this.itemHandler.getStackInSlot( i ) ) );
+		}
+
+		return out;
+	}
+
+	@Override
+	public IItemStorageChannel getChannel()
+	{
+		return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class );
+	}
+
+	@Override
+	public void addListener( final IMEMonitorHandlerReceiver<IAEItemStack> l, final Object verificationToken )
+	{
+		this.listeners.put( l, verificationToken );
+	}
+
+	@Override
+	public void removeListener( final IMEMonitorHandlerReceiver<IAEItemStack> l )
+	{
+		this.listeners.remove( l );
+	}
+
+	private void postDifference( Iterable<IAEItemStack> a )
+	{
+		final Iterator<Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object>> i = this.listeners.entrySet().iterator();
+		while( i.hasNext() )
+		{
+			final Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object> l = i.next();
+			final IMEMonitorHandlerReceiver<IAEItemStack> key = l.getKey();
+			if( key.isValid( l.getValue() ) )
+			{
+				key.postChange( this, a, this.mySource );
+			}
+			else
+			{
+				i.remove();
+			}
+		}
+	}
+
+	private static class InventoryCache
+	{
+		private ItemStack[] cachedStacks = new ItemStack[0];
+		private IAEItemStack[] cachedAeStacks = new IAEItemStack[0];
+		private final IItemHandler itemHandler;
+
+		public InventoryCache( IItemHandler itemHandler )
+		{
+			this.itemHandler = itemHandler;
+		}
+
+		public List<IAEItemStack> update()
+		{
+			List<IAEItemStack> changes = new ArrayList<>();
 
 			int slots = this.itemHandler.getSlots();
 
@@ -213,7 +289,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 				ItemStack newIS = this.itemHandler.getStackInSlot( slot );
 
-			if( this.isDifferent( newIS, oldIS ) )
+				if( isDifferent( newIS, oldIS ) )
 				{
 					this.addItemChange( slot, oldAeIS, newIS, changes );
 				}
@@ -242,17 +318,43 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
 			}
 
-		if( !changes.isEmpty() )
+			return changes;
-		{
-			this.postDifference( changes );
-			return TickRateModulation.URGENT;
 		}
-		else
+
+		private void addPossibleStackSizeChange( int slot, IAEItemStack oldAeIS, ItemStack newIS, List<IAEItemStack> changes )
 		{
-			return TickRateModulation.SLOWER;
+			// Still the same item, but amount might have changed
+			long diff = newIS.getCount() - oldAeIS.getStackSize();
+
+			if( diff != 0 )
+			{
+				IAEItemStack stack = oldAeIS.copy();
+				stack.setStackSize( newIS.getCount() );
+
+				this.cachedStacks[slot] = newIS;
+				this.cachedAeStacks[slot] = stack;
+
+				final IAEItemStack a = stack.copy();
+				a.setStackSize( diff );
+				changes.add( a );
 			}
 		}
 
+		private ItemStack getItemStackInCachedSlot( int pos )
+		{
+			if( pos > this.cachedStacks.length )
+			{
+				return ItemStack.EMPTY;
+			}
+
+			if( this.cachedStacks[pos] == null )
+			{
+				return ItemStack.EMPTY;
+			}
+
+			return this.cachedStacks[pos];
+		}
+
 		private void addItemChange( int slot, IAEItemStack oldAeIS, ItemStack newIS, List<IAEItemStack> changes )
 		{
 			// Completely different item
@@ -273,26 +375,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 			}
 		}
 
-	private void addPossibleStackSizeChange( int slot, IAEItemStack oldAeIS, ItemStack newIS, List<IAEItemStack> changes )
+		private static boolean isDifferent( final ItemStack a, final ItemStack b )
-	{
-		// Still the same item, but amount might have changed
-		long diff = newIS.getCount() - oldAeIS.getStackSize();
-
-		if( diff != 0 )
-		{
-			IAEItemStack stack = oldAeIS.copy();
-			stack.setStackSize( newIS.getCount() );
-
-			this.cachedStacks[slot] = newIS;
-			this.cachedAeStacks[slot] = stack;
-
-			final IAEItemStack a = stack.copy();
-			a.setStackSize( diff );
-			changes.add( a );
-		}
-	}
-
-	private boolean isDifferent( final ItemStack a, final ItemStack b )
 		{
 			if( a == b && b.isEmpty() )
 			{
@@ -301,58 +384,6 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 			return a.isEmpty() || b.isEmpty() || !Platform.itemComparisons().isSameItem( a, b );
 		}
-
-	private void postDifference( Iterable<IAEItemStack> a )
-	{
-		final Iterator<Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object>> i = this.listeners.entrySet().iterator();
-		while( i.hasNext() )
-		{
-			final Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object> l = i.next();
-			final IMEMonitorHandlerReceiver<IAEItemStack> key = l.getKey();
-			if( key.isValid( l.getValue() ) )
-			{
-				key.postChange( this, a, this.mySource );
-			}
-			else
-			{
-				i.remove();
-			}
-		}
 	}
 
-	@Override
-	public void setActionSource( final IActionSource mySource )
-	{
-		this.mySource = mySource;
-	}
-
-	@Override
-	public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
-	{
-
-		for( int i = 0; i < this.itemHandler.getSlots(); i++ )
-		{
-			out.addStorage( AEItemStack.fromItemStack( this.itemHandler.getStackInSlot( i ) ) );
-		}
-
-		return out;
-	}
-
-	@Override
-	public IStorageChannel getChannel()
-	{
-		return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class );
-	}
-
-	@Override
-	public void addListener( final IMEMonitorHandlerReceiver<IAEItemStack> l, final Object verificationToken )
-	{
-		this.listeners.put( l, verificationToken );
-	}
-
-	@Override
-	public void removeListener( final IMEMonitorHandlerReceiver<IAEItemStack> l )
-	{
-		this.listeners.remove( l );
-	}
 }

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

@@ -66,7 +66,6 @@ import appeng.api.storage.IStorageMonitorable;
 import appeng.api.storage.IStorageMonitorableAccessor;
 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;
@@ -112,7 +111,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	private int priority = 0;
 	private boolean cached = false;
 	private ITickingMonitor monitor = null;
-	private MEInventoryHandler<? extends IAEStack> handler = null;
+	private MEInventoryHandler<IAEItemStack> handler = null;
 	private int handlerHash = 0;
 	private boolean wasActive = false;
 	private byte resetCacheLogic = 0;
@@ -355,22 +354,18 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 
 		final IMEInventory<IAEItemStack> out = this.getInternalHandler();
 
-		if( this.monitor != null )
+		if( in != out )
 		{
-			this.monitor.onTick();
-		}
-
 			IItemList<IAEItemStack> after = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
 			if( out != null )
 			{
 				after = out.getAvailableItems( after );
 			}
-
 			Platform.postListChanges( before, after, this, this.mySrc );
 		}
+	}
 
-	@SuppressWarnings( "unchecked" )
+	private IMEInventory<IAEItemStack> getInventoryWrapper( TileEntity target )
-	private IMEInventory<? extends IAEItemStack> getInventoryWrapper( TileEntity target )
 	{
 
 		EnumFacing targetSide = this.getSide().getFacing().getOpposite();
@@ -397,7 +392,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		IItemHandler handlerExt = target.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, targetSide );
 		if( handlerExt != null )
 		{
-			return new ItemHandlerAdapter( handlerExt );
+			return new ItemHandlerAdapter( handlerExt, this );
 		}
 
 		return null;
@@ -428,7 +423,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		return 0;
 	}
 
-	public MEInventoryHandler getInternalHandler()
+	public MEInventoryHandler<IAEItemStack> getInternalHandler()
 	{
 		if( this.cached )
 		{
@@ -452,7 +447,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		this.monitor = null;
 		if( target != null )
 		{
-			IMEInventory<? extends IAEStack> inv = this.getInventoryWrapper( target );
+			IMEInventory<IAEItemStack> inv = this.getInventoryWrapper( target );
 
 			if( inv instanceof MEMonitorIInventory )
 			{
@@ -470,7 +465,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 			{
 				this.checkInterfaceVsStorageBus( target, this.getSide().getOpposite() );
 
-				this.handler = new MEInventoryHandler( inv, AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
+				this.handler = new MEInventoryHandler<IAEItemStack>( inv, AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
 
 				this.handler.setBaseAccess( (AccessRestriction) this.getConfigManager().getSetting( Settings.ACCESS ) );
 				this.handler.setWhitelist( this.getInstalledUpgrades( Upgrades.INVERTER ) > 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST );
@@ -491,16 +486,17 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 				if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
 				{
 					this.handler
-							.setPartitionList( new FuzzyPriorityList( priorityList, (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE ) ) );
+							.setPartitionList( new FuzzyPriorityList<IAEItemStack>( priorityList, (FuzzyMode) this.getConfigManager()
+									.getSetting( Settings.FUZZY_MODE ) ) );
 				}
 				else
 				{
-					this.handler.setPartitionList( new PrecisePriorityList( priorityList ) );
+					this.handler.setPartitionList( new PrecisePriorityList<IAEItemStack>( priorityList ) );
 				}
 
 				if( inv instanceof IBaseMonitor )
 				{
-					( (IBaseMonitor) inv ).addListener( this, this.handler );
+					( (IBaseMonitor<IAEItemStack>) inv ).addListener( this, this.handler );
 				}
 			}
 		}
@@ -570,7 +566,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	{
 		if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
 		{
-			final IMEInventoryHandler out = this.getProxy().isActive() ? this.getInternalHandler() : null;
+			final IMEInventoryHandler<IAEItemStack> out = this.getProxy().isActive() ? this.getInternalHandler() : null;
 			if( out != null )
 			{
 				return Collections.singletonList( out );