move nonblocking call out of method used by ae2fc coremod

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

@@ -19,39 +19,6 @@
 package appeng.helpers;
 
 
-import java.util.*;
-
-import javax.annotation.Nullable;
-
-import appeng.util.inv.BlockingInventoryAdaptor;
-import appeng.util.*;
-import appeng.util.inv.*;
-import com.google.common.collect.ImmutableSet;
-
-import com.google.common.primitives.Ints;
-import de.ellpeck.actuallyadditions.api.tile.IPhantomTile;
-import gregtech.api.block.machines.BlockMachine;
-import gregtech.api.metatileentity.MetaTileEntity;
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.init.Items;
-import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.fml.common.Loader;
-import net.minecraftforge.items.CapabilityItemHandler;
-import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.items.wrapper.RangedWrapper;
-
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.Settings;
@@ -75,11 +42,7 @@ import appeng.api.networking.ticking.IGridTickable;
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
 import appeng.api.parts.IPart;
-import appeng.api.storage.IMEInventory;
+import appeng.api.storage.*;
-import appeng.api.storage.IMEMonitor;
-import appeng.api.storage.IStorageChannel;
-import appeng.api.storage.IStorageMonitorable;
-import appeng.api.storage.IStorageMonitorableAccessor;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
@@ -101,7 +64,39 @@ import appeng.parts.automation.StackUpgradeInventory;
 import appeng.parts.automation.UpgradeInventory;
 import appeng.tile.inventory.AppEngInternalAEInventory;
 import appeng.tile.inventory.AppEngInternalInventory;
+import appeng.util.ConfigManager;
+import appeng.util.IConfigManagerHost;
+import appeng.util.InventoryAdaptor;
+import appeng.util.Platform;
+import appeng.util.inv.*;
 import appeng.util.item.AEItemStack;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.primitives.Ints;
+import de.ellpeck.actuallyadditions.api.tile.IPhantomTile;
+import gregtech.api.block.machines.BlockMachine;
+import gregtech.api.metatileentity.MetaTileEntity;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.fml.common.Loader;
+import net.minecraftforge.items.CapabilityItemHandler;
+import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.wrapper.RangedWrapper;
+
+import javax.annotation.Nullable;
+import java.util.*;
 
 import static gregtech.api.block.machines.BlockMachine.getMetaTileEntity;
 
@@ -113,9 +108,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	public static final int NUMBER_OF_PATTERN_SLOTS = 36;
 
 	private static final Collection<Block> BAD_BLOCKS = new HashSet<>( 100 );
-	private final IAEItemStack[] requireWork = {
+	private final IAEItemStack[] requireWork = {null, null, null, null, null, null, null, null, null};
-			null, null, null, null, null, null, null, null, null
-	};
 	private final MultiCraftingTracker craftingTracker;
 	private final AENetworkProxy gridProxy;
 	private final IInterfaceHost iHost;
@@ -128,13 +121,13 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	private final MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<>( new NullInventory<IAEItemStack>(), AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
 	private final MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) );
 	private final UpgradeInventory upgrades;
+	private final Accessor accessor = new Accessor();
 	private boolean hasConfig = false;
 	private int priority;
 	private List<ICraftingPatternDetails> craftingList = null;
 	private List<ItemStack> waitingToSend = null;
 	private IMEInventory<IAEItemStack> destination;
 	private int isWorking = -1;
-	private final Accessor accessor = new Accessor();
 	private EnumSet<EnumFacing> visitedFaces = EnumSet.noneOf( EnumFacing.class );
 	private EnumMap<EnumFacing, List<ItemStack>> waitingToSendFacing = new EnumMap<>( EnumFacing.class );
 	private boolean resetConfigCache = true;
@@ -160,6 +153,11 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		this.interfaceRequestSource = new InterfaceRequestSource( this.iHost );
 	}
 
+	private static boolean invIsCustomBlocking( BlockingInventoryAdaptor inv )
+	{
+		return ( inv.containsBlockingItems() );
+	}
+
 	@Override
 	public void saveChanges()
 	{
@@ -281,6 +279,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		final NBTTagCompound waitingListSided = data.getCompoundTag( "sidedWaitList" );
 
 		for( EnumFacing s : EnumFacing.values() )
+		{
 			if( waitingListSided.hasKey( s.name() ) )
 			{
 				NBTTagList w = waitingListSided.getTagList( s.name(), 10 );
@@ -294,6 +293,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 					}
 				}
 			}
+		}
 
 		this.craftingTracker.readFromNBT( data );
 
@@ -926,11 +926,12 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 					}
 					else if( storedStack.isCraftable() )
 					{
-                        itemStack.setCachedItemStack(inputStack);
+						itemStack.setCachedItemStack( inputStack );
 						changed = this.handleCrafting( x, adaptor, itemStack ) || changed;
 					}
-					if (acquired == null) {
+					if( acquired == null )
-                        itemStack.setCachedItemStack(inputStack);
+					{
+						itemStack.setCachedItemStack( inputStack );
 					}
 				}
 			}
@@ -1104,11 +1105,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		return ( inv.containsItems() );
 	}
 
-	private static boolean invIsCustomBlocking( BlockingInventoryAdaptor inv )
-	{
-		return ( inv.containsBlockingItems() );
-	}
-
 	@Override
 	public boolean pushPattern( final ICraftingPatternDetails patternDetails, final InventoryCrafting table )
 	{
@@ -1158,9 +1154,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				}
 			}
 
-			final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
-			if( ad != null )
-			{
 			if( this.isBlocking() )
 			{
 				IPhantomTile phantomTE;
@@ -1189,7 +1182,10 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 					}
 				}
 
-					else if( invIsBlocked( ad ) )
+				final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
+				if( ad != null )
+				{
+					if( invIsBlocked( ad ) )
 					{
 						visitedFaces.remove( s );
 						continue;
@@ -1239,9 +1235,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				final TileEntity te = w.getTileEntity( tile.getPos().offset( s ) );
 				IPhantomTile phantomTE;
 
-				final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
-				if( ad != null )
-				{
 				if( Loader.isModLoaded( "actuallyadditions" ) && Loader.isModLoaded( "gregtech" ) && te instanceof IPhantomTile )
 				{
 					phantomTE = ( (IPhantomTile) te );
@@ -1258,7 +1251,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 						}
 					}
 				}
-
 				else if( NonBlockingItems.INSTANCE.getMap().containsKey( te.getBlockType().getRegistryName().getResourceDomain() ) )
 				{
 					if( !isCustomInvBlocking( te, s ) )
@@ -1267,14 +1259,19 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 						break;
 					}
 				}
-
+				else
-					else if( !invIsBlocked( ad ) )
+				{
+					final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
+					if( ad != null )
+					{
+						if( !invIsBlocked( ad ) )
 						{
 							allAreBusy = false;
 							break;
 						}
 					}
 				}
+			}
 			busy = allAreBusy;
 		}
 		return busy;
@@ -1597,6 +1594,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 
 	}
 
+
 	private class InterfaceRequestContext implements Comparable<Integer>
 	{
 
@@ -1607,6 +1605,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		}
 	}
 
+
 	private class InterfaceInventory extends MEMonitorIInventory
 	{
 
@@ -1644,6 +1643,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		}
 	}
 
+
 	private class Accessor implements IStorageMonitorableAccessor
 	{