Merge pull request #34 from repo-alt/rv3-1.7.10

Blocking mode support for input buses and the like

Author: repo-alt

gradle.properties

@@ -1,6 +1,6 @@
 aeversion=rv3
 aechannel=beta
-aebuild=39-GTNH
+aebuild=40-GTNH
 #KEEP V6 FOR MOD SUPPORT
 aegroup=appeng
 aebasename=appliedenergistics2

src/main/java/appeng/helpers/DualityInterface.java

@@ -889,6 +889,11 @@ private boolean gtMachineHasOnlyCircuit(InventoryAdaptor ad) {
 		}
 		return true;
 	}
+	private boolean inventoryCountsAsEmpty(TileEntity te, InventoryAdaptor ad)
+	{
+		return te.getBlockType().getUnlocalizedName().equals("gt.blockmachines") && gtMachineHasOnlyCircuit(ad);
+	}
+
 	@Override
 	public boolean pushPattern( final ICraftingPatternDetails patternDetails, final InventoryCrafting table )
 	{
@@ -935,10 +940,8 @@ public boolean pushPattern( final ICraftingPatternDetails patternDetails, final
 			final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
 			if( ad != null )
 			{
-				if (this.isBlocking() && ad.containsItems()) {
-					if (!te.getBlockType().getUnlocalizedName().equals("gt.blockmachines") || !gtMachineHasOnlyCircuit(ad))
-						continue;
-				}
+				if (this.isBlocking() && ad.containsItems() && !inventoryCountsAsEmpty(te, ad))
+					continue;
 
 				if( this.acceptsItems( ad, table ) )
 				{
@@ -985,7 +988,7 @@ public boolean isBusy()
 				final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
 				if( ad != null )
 				{
-					if( ad.simulateRemove( 1, null, null ) == null )
+					if( ad.simulateRemove( 1, null, null ) == null || inventoryCountsAsEmpty(te, ad))
 					{
 						allAreBusy = false;
 						break;