refresh ETA not only when items are crafted

src/main/java/appeng/container/implementations/ContainerCraftingCPU.java

@@ -159,9 +159,7 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH
 	@Override
 	public void detectAndSendChanges()
 	{
-		if( Platform.isServer() && this.getMonitor() != null && !this.list.isEmpty() )
+		if( Platform.isServer() && this.getMonitor() != null )
-		{
-			try
 		{
 			if( this.getEstimatedTime() >= 0 )
 			{
@@ -171,7 +169,10 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH
 				final long eta = (long) ( elapsedTime / Math.max( 1d, ( startItems - remainingItems ) ) * remainingItems );
 				this.setEstimatedTime( eta );
 			}
-
+			if( !this.list.isEmpty() )
+			{
+				try
+				{
 					final PacketMEInventoryUpdate a = new PacketMEInventoryUpdate( (byte) 0 );
 					final PacketMEInventoryUpdate b = new PacketMEInventoryUpdate( (byte) 1 );
 					final PacketMEInventoryUpdate c = new PacketMEInventoryUpdate( (byte) 2 );
@@ -211,6 +212,7 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH
 					// :P
 				}
 			}
+		}
 		super.detectAndSendChanges();
 	}
 

src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java

@@ -292,7 +292,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 				{
 					is.decStackSize( what.getStackSize() );
 
-					this.updateElapsedTime( what );
+					this.updateRemainingItemCount( what );
 					this.markDirty();
 					this.postCraftingStatusChange( what.copy().setStackSize( -what.getStackSize() ) );
 
@@ -939,14 +939,13 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 	@Override
 	public boolean isBusy()
 	{
-		final Iterator<Entry<ICraftingPatternDetails, TaskProgress>> i = this.tasks.entrySet().iterator();
 
-		while( i.hasNext() )
+		this.tasks.entrySet().removeIf(
+				taskProgressEntry -> taskProgressEntry.getValue().value <= 0 );
+
+		if( !this.waitingFor.isEmpty() || !this.tasks.isEmpty() )
 		{
-			if( i.next().getValue().value <= 0 )
+			this.updateElapsedTime();
-			{
-				i.remove();
-			}
 		}
 
 		return !this.tasks.isEmpty() || !this.waitingFor.isEmpty();
@@ -1338,12 +1337,16 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 		this.remainingItemCount = itemCount;
 	}
 
-	private void updateElapsedTime( final IAEItemStack is )
+	private void updateRemainingItemCount( final IAEItemStack is )
+	{
+		this.remainingItemCount = this.getRemainingItemCount() - is.getStackSize();
+	}
+
+	private void updateElapsedTime()
 	{
 		final long nextStartTime = System.nanoTime();
 		this.elapsedTime = this.getElapsedTime() + nextStartTime - this.lastTime;
 		this.lastTime = nextStartTime;
-		this.remainingItemCount = this.getRemainingItemCount() - is.getStackSize();
 	}
 
 	public long getElapsedTime()