import bus optimization

AE2-UEL · May 9, 2021 · 366b31b · 366b31b
1 parent 533fb5c
commit 366b31b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/src/main/java/appeng/parts/automation/PartImportBus.java b/src/main/java/appeng/parts/automation/PartImportBus.java
@@ -219,8 +219,9 @@ private boolean importStuff( final InventoryAdaptor myAdaptor, final IAEItemStac
 	{
 		final int toSend = this.calculateMaximumAmountToImport( myAdaptor, whatToImport, inv, fzMode );
 
-		if( toSend == 0 ){
-			return false;
+		if( toSend == 0 )
+		{
+			return true;
 		}
 
 		final ItemStack newItems;
@@ -291,9 +292,14 @@ private int calculateMaximumAmountToImport( final InventoryAdaptor myAdaptor, fi
 			itemAmountNotStorable = inv.injectItems( AEItemStack.fromItemStack( simResult ), Actionable.SIMULATE, this.source );
 		}
 
+		if( simResult.isEmpty() )
+		{
+			return 0;
+		}
+
 		if( itemAmountNotStorable != null )
 		{
-			if (simResult.getCount() == itemAmountNotStorable.getStackSize())
+			if( simResult.getCount() == itemAmountNotStorable.getStackSize() )
 			{
 				return 0;
 			}

diff --git a/src/main/java/appeng/parts/misc/ItemRepositoryAdapter.java b/src/main/java/appeng/parts/misc/ItemRepositoryAdapter.java
@@ -72,8 +72,24 @@ public IAEItemStack injectItems( IAEItemStack iox, Actionable type, IActionSourc
         if( type == Actionable.MODULATE )
         {
             if (this.cache.cachedAeStacks.length == 0) this.cache.update();
-            this.cache.cachedAeStacks = Arrays.copyOf( this.cache.cachedAeStacks, this.cache.cachedAeStacks.length + 1 );
-            this.cache.cachedAeStacks[this.cache.cachedAeStacks.length - 1] = iox.copy();
+            boolean found = false;
+            for (IAEItemStack iaeItemStack : this.cache.cachedAeStacks)
+            {
+                if( iaeItemStack == null )
+                {
+                    continue;
+                }
+                if( iaeItemStack.equals( iox ) )
+                {
+                    found = true;
+                    iaeItemStack.incStackSize( iox.getStackSize() );
+                }
+            }
+            if (!found)
+            {
+                this.cache.cachedAeStacks = Arrays.copyOf( this.cache.cachedAeStacks, this.cache.cachedAeStacks.length + 1 );
+                this.cache.cachedAeStacks[this.cache.cachedAeStacks.length - 1] = iox.copy();
+            }
         }
 
         return AEItemStack.fromItemStack( remaining );