2

the lack of ingredient that caused the failure is satisfied

gradle.properties

@@ -3,7 +3,7 @@ aechannel=stable
 aebuild=7
 aegroup=appeng
 aebasename=appliedenergistics2
-trousers=omni-fixes-v46aa
+trousers=omni-fixes-v47
 
 #########################################################
 # Versions                                              #

src/main/java/appeng/client/render/TesrRenderHelper.java

@@ -22,10 +22,9 @@ package appeng.client.render;
 import appeng.api.storage.data.IAEFluidStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.renderer.*;
+import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.renderer.RenderItem;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 
@@ -33,7 +32,6 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.util.IWideReadableNumberConverter;
 import appeng.util.ReadableNumberConverter;
 import net.minecraftforge.fluids.FluidStack;
-import org.lwjgl.opengl.GL11;
 
 
 /**
@@ -123,49 +121,6 @@ public class TesrRenderHelper
 		}
 	}
 
-	public static void renderFluid2d( FluidStack fluidStack, float scale )
-	{
-		if( fluidStack != null )
-		{
-			GlStateManager.pushMatrix();
-			int color = fluidStack.getFluid().getColor( fluidStack );
-			float r = ( color >> 16 & 255 ) / 255.0f;
-			float g = ( color >> 8 & 255 ) / 255.0f;
-			float b = ( color & 255 ) / 255.0f;
-			TextureAtlasSprite sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite( fluidStack.getFluid().getStill( fluidStack ).toString() );
-			GlStateManager.enableBlend();
-			GlStateManager.blendFunc( GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA );
-			GlStateManager.disableAlpha();
-			GlStateManager.disableLighting();
-			Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.LOCATION_BLOCKS_TEXTURE );
-			Tessellator tess = Tessellator.getInstance();
-			BufferBuilder buf = tess.getBuffer();
-
-			float width = 0.4f;
-			float height = 0.4f;
-			float alpha = 1.0f;
-			float z = 0.0001f;
-			float x = -0.20f;
-			float y = -0.25f;
-
-			buf.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR );
-			double uMin = sprite.getInterpolatedU( 16D - width * 16D ), uMax = sprite.getInterpolatedU( width * 16D );
-			double vMin = sprite.getMinV(), vMax = sprite.getInterpolatedV( height * 16D );
-			buf.pos( x, y, z ).tex( uMin, vMin ).color( r, g, b, alpha ).endVertex();
-			buf.pos( x, y + height, z ).tex( uMin, vMax ).color( r, g, b, alpha ).endVertex();
-			buf.pos( x + width, y + height, z ).tex( uMax, vMax ).color( r, g, b, alpha ).endVertex();
-			buf.pos( x + width, y, z ).tex( uMax, vMin ).color( r, g, b, alpha ).endVertex();
-
-			tess.draw();
-			GlStateManager.enableLighting();
-			GlStateManager.enableAlpha();
-			GlStateManager.disableBlend();
-			GlStateManager.color( 1F, 1F, 1F, 1F );
-			GlStateManager.popMatrix();
-
-		}
-	}
-
 	/**
 	 * Render an item in 2D and the given text below it.
 	 *
@@ -192,9 +147,9 @@ public class TesrRenderHelper
 
 	public static void renderFluid2dWithAmount( IAEFluidStack fluidStack, float scale, float spacing )
 	{
-		final FluidStack renderStack = fluidStack.getFluidStack();
+		final ItemStack renderStack = fluidStack.asItemStackRepresentation();
 
-		TesrRenderHelper.renderFluid2d( renderStack, scale );
+		TesrRenderHelper.renderItem2d( renderStack, scale );
 
 		final long stackSize = fluidStack.getStackSize() / 1000;
 		final String renderedStackSize = NUMBER_CONVERTER.toWideReadableForm( stackSize ) + "B";

src/main/java/appeng/crafting/CraftingJob.java

@@ -22,6 +22,7 @@ package appeng.crafting;
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 
+import appeng.me.cache.CraftingGridCache;
 import com.google.common.base.Stopwatch;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -71,6 +72,8 @@ public class CraftingJob implements Runnable, ICraftingJob
 	private boolean done = false;
 	private int time;
 	private int incTime;
+	private final ICraftingGrid cc;
+	private final IStorageGrid sg;
 
 	private World wrapWorld( final World w )
 	{
@@ -84,10 +87,9 @@ public class CraftingJob implements Runnable, ICraftingJob
 		this.actionSrc = actionSrc;
 
 		this.callback = callback;
-		final ICraftingGrid cc = grid.getCache( ICraftingGrid.class );
+		this.cc = grid.getCache( ICraftingGrid.class );
-		final IStorageGrid sg = grid.getCache( IStorageGrid.class );
+		this.sg = grid.getCache( IStorageGrid.class );
-		this.original = new MECraftingInventory( sg
+		this.original = new MECraftingInventory( sg.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ), actionSrc, false, false, false );
-				.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ), actionSrc, false, false, false );
 
 		this.setTree( this.getCraftingTree( cc, what ) );
 		this.availableCheck = null;
@@ -380,6 +382,11 @@ public class CraftingJob implements Runnable, ICraftingJob
 		}
 	}
 
+	public void addIncompletablePattern( ICraftingPatternDetails details, IAEItemStack stack )
+	{
+		( (CraftingGridCache) cc ).getPatternStatusManager().put( details, stack );
+	}
+
 	private static class TwoIntegers
 	{
 		private final long perOp = 0;

src/main/java/appeng/crafting/CraftingTreeNode.java

@@ -22,7 +22,10 @@ package appeng.crafting;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 
+import appeng.util.item.OreHelper;
+import appeng.util.item.OreReference;
 import com.google.common.collect.Lists;
 
 import net.minecraft.world.World;
@@ -117,6 +120,11 @@ public class CraftingTreeNode
 		return this.parent.notRecursive( details );
 	}
 
+	public CraftingTreeProcess getParent()
+	{
+		return parent;
+	}
+
 	IAEItemStack request( final MECraftingInventory inv, long l, final IActionSource src ) throws CraftBranchFailure, InterruptedException
 	{
 		this.job.handlePausing();
@@ -318,6 +326,7 @@ public class CraftingTreeNode
 		if( this.missing > 0 )
 		{
 			job.addMissing( this.getStack( this.missing ) );
+			addMissingIAEStack();
 		}
 		// missing = 0;
 
@@ -329,6 +338,29 @@ public class CraftingTreeNode
 		}
 	}
 
+	void addMissingIAEStack()
+	{
+		if( parent != null )
+		{
+			parent.addMissingIAEStack();
+			if( missing > 0 )
+			{
+				if( this.parent.details.canSubstitute() && this.getSlot() >= 0 )
+				{
+					final List<IAEItemStack> substitutes = this.parent.details.getSubstituteInputs( this.slot );
+					for( IAEItemStack stack : substitutes )
+					{
+						job.addIncompletablePattern( this.getParent().details, stack.copy().setStackSize( this.missing ) );
+					}
+				}
+				else
+				{
+					job.addIncompletablePattern( this.getParent().details, this.getStack( this.missing ) );
+				}
+			}
+		}
+	}
+
 	IAEItemStack getStack( final long size )
 	{
 		final IAEItemStack is = this.what.copy();

src/main/java/appeng/crafting/CraftingTreeProcess.java

@@ -23,11 +23,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import appeng.me.cache.CraftingGridCache;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-import net.minecraft.world.WorldServer;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
@@ -66,7 +65,7 @@ public class CraftingTreeProcess
 		this.depth = depth;
 		final World world = job.getWorld();
 
-		if( details.isCraftable() )
+		if( !( (CraftingGridCache) cc ).getPatternStatusManager().containsIncompletablePattern( details ) && details.isCraftable() )
 		{
 			final IAEItemStack[] list = details.getInputs();
 
@@ -174,6 +173,11 @@ public class CraftingTreeProcess
 		return this.parent == null || this.parent.notRecursive( details );
 	}
 
+	public CraftingTreeNode getParent()
+	{
+		return parent;
+	}
+
 	long getTimes( final long remaining, final long stackSize )
 	{
 		if( this.limitQty || this.fullSimulation )
@@ -305,7 +309,7 @@ public class CraftingTreeProcess
 
 	void getPlan( final IItemList<IAEItemStack> plan )
 	{
-		for( IAEItemStack i : this.details.getOutputs() )
+		for( IAEItemStack i : this.details.getCondensedOutputs() )
 		{
 			i = i.copy();
 			i.setCountRequestable( i.getStackSize() * this.crafts );
@@ -317,4 +321,12 @@ public class CraftingTreeProcess
 			pro.getPlan( plan );
 		}
 	}
+
+	public void addMissingIAEStack()
+	{
+		if( parent != null )
+		{
+			parent.addMissingIAEStack();
+		}
+	}
 }

src/main/java/appeng/fluids/helper/DualityFluidInterface.java

@@ -91,10 +91,12 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 	private int isWorking = -1;
 	private int priority;
 
-	private final MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<>( new NullInventory<IAEItemStack>(), AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
+	private final MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<>( new NullInventory<IAEItemStack>(), AEApi.instance()
-	private final MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) );
+			.storage()
-	private boolean resetConfigCache;
+			.getStorageChannel( IItemStorageChannel.class ) );
-	private IMEMonitor<IAEFluidStack> configCachedHandler;
+	private final MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance()
+			.storage()
+			.getStorageChannel( IFluidStorageChannel.class ) );
 
 	public DualityFluidInterface( final AENetworkProxy networkProxy, final IFluidInterfaceHost ih )
 	{
@@ -144,12 +146,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 		{
 			if( this.hasConfig() )
 			{
-				if( resetConfigCache )
+				return (IMEMonitor<T>) new InterfaceInventory( this );
-				{
-					resetConfigCache = false;
-					configCachedHandler = new InterfaceInventory( this );
-				}
-				return (IMEMonitor<T>) configCachedHandler;
 			}
 
 			return (IMEMonitor<T>) this.fluids;
@@ -453,12 +450,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 
 		if( inventory == this.config )
 		{
-			boolean cfg = hasConfig();
 			this.readConfig();
-			if( cfg != hasConfig )
-			{
-				resetConfigCache = true;
-			}
 		}
 		else if( inventory == this.tanks )
 		{
@@ -563,6 +555,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 		InterfaceInventory( final DualityFluidInterface tileInterface )
 		{
 			super( tileInterface.tanks );
+			this.setActionSource( new MachineSource( tileInterface.iHost ) );
 		}
 
 		@Override

src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java

@@ -232,11 +232,18 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 
 			for( IFluidTankProperties tankProperty : tankProperties )
 			{
-				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && this.fluidHandler.drain( 1, false ) == null )
+				FluidStack newFS = tankProperty.getContents();
+				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && newFS != null )
 				{
-					continue;
+					if( this.fluidHandler.drain( 1, false ) == null )
+					{
+						newFS = null;
+					}
+				}
+				if( newFS != null )
+				{
+					currentlyOnStorage.add( AEFluidStack.fromFluidStack( newFS ) );
 				}
-				currentlyOnStorage.add( AEFluidStack.fromFluidStack( tankProperty.getContents() ) );
 			}
 
 			for ( final IAEFluidStack is : currentlyCached )

src/main/java/appeng/fluids/parts/PartFluidStorageBus.java

@@ -227,7 +227,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 		{
 			this.resetCacheLogic = 2;
 		}
-		else if( this.resetCacheLogic < 2 )
+		else
 		{
 			this.resetCacheLogic = 1;
 		}
@@ -326,10 +326,6 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 
 		this.handlerHash = newHandlerHash;
 		this.handler = null;
-		if( this.monitor != null )
-		{
-			( (IBaseMonitor<IAEFluidStack>) monitor ).removeListener( this );
-		}
 		this.monitor = null;
 		if( target != null )
 		{
@@ -338,7 +334,6 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 			{
 				this.monitor = (ITickingMonitor) inv;
 				this.monitor.setActionSource( new MachineSource( this ) );
-				this.monitor.setMode( (StorageFilter) this.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
 			}
 
 			if( inv != null )

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

@@ -23,9 +23,13 @@ import java.util.*;
 
 import javax.annotation.Nullable;
 
+import appeng.api.definitions.IItemDefinition;
+import appeng.api.networking.crafting.*;
 import appeng.integration.modules.gregtech.GTCEInventoryAdaptor;
+import appeng.me.cache.CraftingGridCache;
 import appeng.util.*;
 import appeng.util.inv.*;
+import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableSet;
 
 import de.ellpeck.actuallyadditions.api.tile.IPhantomTile;
@@ -34,6 +38,7 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.MetaTileEntityHolder;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
 import net.minecraft.init.Items;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
@@ -63,10 +68,6 @@ import appeng.api.implementations.tiles.ICraftingMachine;
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridNode;
-import appeng.api.networking.crafting.ICraftingLink;
-import appeng.api.networking.crafting.ICraftingPatternDetails;
-import appeng.api.networking.crafting.ICraftingProvider;
-import appeng.api.networking.crafting.ICraftingProviderHelper;
 import appeng.api.networking.energy.IEnergySource;
 import appeng.api.networking.events.MENetworkCraftingPatternChange;
 import appeng.api.networking.security.IActionHost;
@@ -108,7 +109,6 @@ import static gregtech.api.block.machines.BlockMachine.getMetaTileEntity;
 
 public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost
 {
-	private int[] failedCraftTriesSlot = {0,0,0,0,0,0,0,0,0};
 
 	public static final int NUMBER_OF_STORAGE_SLOTS = 9;
 	public static final int NUMBER_OF_CONFIG_SLOTS = 9;
@@ -140,17 +140,15 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	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 EnumMap<EnumFacing,List<ItemStack>> waitingToSendFacing = new EnumMap<>(EnumFacing.class);
 	private GTCEInventoryAdaptor GTad;
-	private boolean resetConfigCache = true;
-	private IMEMonitor<IAEItemStack> configCachedHandler;
 
 	public DualityInterface( final AENetworkProxy networkProxy, final IInterfaceHost ih )
 	{
 		this.gridProxy = networkProxy;
 		this.gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL );
 
-		this.upgrades = new StackUpgradeInventory( this.gridProxy.getMachineRepresentation(), this, 4 );
+		this.upgrades = new StackUpgradeInventory( this.gridProxy.getMachineRepresentation(), this, 4);
 		this.cm.registerSetting( Settings.BLOCK, YesNo.NO );
 		this.cm.registerSetting( Settings.INTERFACE_TERMINAL, YesNo.YES );
 
@@ -178,14 +176,9 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			return;
 		}
-		if( inv == this.config && ( !removed.isEmpty() || !added.isEmpty() ) )
+		if( inv == this.config )
 		{
-			boolean cfg = hasConfig();
 			this.readConfig();
-			if( cfg != hasConfig )
-			{
-				resetConfigCache = true;
-			}
 		}
 		else if( inv == this.patterns && ( !removed.isEmpty() || !added.isEmpty() ) )
 		{
@@ -936,17 +929,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			if( this.getInstalledUpgrades( Upgrades.CRAFTING ) > 0 && itemStack != null )
 			{
-				if (this.failedCraftTriesSlot[x] <= 0)
+				return this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(), this.gridProxy.getGrid(), this.gridProxy.getCrafting(), this.mySource );
-				{
-					boolean crafted = this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(),
-						this.gridProxy.getGrid(), this.gridProxy.getCrafting(), this.mySource );
-
-					if (crafted) this.failedCraftTriesSlot[x] = 0;
-					else{
-						this.failedCraftTriesSlot[x] += 2;
-					}
-				}
-				this.failedCraftTriesSlot[x] -= 1;
 			}
 		}
 		catch( final GridAccessException e )
@@ -980,12 +963,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			if( this.hasConfig() )
 			{
-				if( resetConfigCache )
+				return (IMEMonitor<T>) new InterfaceInventory( this );
-				{
-					resetConfigCache = false;
-					configCachedHandler = new InterfaceInventory( this );
-				}
-				return (IMEMonitor<T>) configCachedHandler;
 			}
 
 			return (IMEMonitor<T>) this.items;
@@ -1593,6 +1571,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		public InterfaceInventory( final DualityInterface tileInterface )
 		{
 			super( new AdaptorItemHandler( tileInterface.storage ) );
+			this.setActionSource( new MachineSource( DualityInterface.this.iHost ) );
 		}
 
 		@Override

src/main/java/appeng/helpers/MultiCraftingTracker.java

@@ -22,6 +22,9 @@ package appeng.helpers;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
+import appeng.api.networking.crafting.*;
+import appeng.me.cache.CraftingGridCache;
+import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableSet;
 
 import net.minecraft.nbt.NBTTagCompound;
@@ -29,10 +32,6 @@ import net.minecraft.world.World;
 
 import appeng.api.AEApi;
 import appeng.api.networking.IGrid;
-import appeng.api.networking.crafting.ICraftingGrid;
-import appeng.api.networking.crafting.ICraftingJob;
-import appeng.api.networking.crafting.ICraftingLink;
-import appeng.api.networking.crafting.ICraftingRequester;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.util.InventoryAdaptor;
@@ -132,6 +131,17 @@ public class MultiCraftingTracker
 					final IAEItemStack aisC = ais.copy();
 					aisC.setStackSize( itemToCraft );
 
+					CraftingGridCache cgc = (CraftingGridCache) cg;
+
+					ImmutableCollection<ICraftingPatternDetails> cl = cgc.getCraftingFor( aisC, null, x, w );
+					for( ICraftingPatternDetails craftingPatternDetails : cl )
+					{
+						if( cgc.getPatternStatusManager().containsIncompletablePattern( craftingPatternDetails ) )
+						{
+							return false;
+						}
+					}
+
 					this.setJob( x, cg.beginCraftingJob( w, g, mySrc, aisC, null ) );
 				}
 			}

src/main/java/appeng/helpers/PatternHelper.java

@@ -147,7 +147,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 				}
 			}
 		}
-		final int outputLength = out.size();
+		final int outputLength = this.isCrafting ? CRAFTING_OUTPUT_LIMIT : PROCESSING_OUTPUT_LIMIT;
 
 		this.inputs = in.toArray(new IAEItemStack[ALL_INPUT_LIMIT]);
 		this.outputs = out.toArray(new IAEItemStack[outputLength]);

src/main/java/appeng/items/misc/ItemEncodedPattern.java

@@ -225,7 +225,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
 
 		final ICraftingPatternDetails details = this.getPatternForItem( item, w );
 
-		out = details != null ? details.getOutputs()[0].createItemStack() : ItemStack.EMPTY;
+		out = details != null ? details.getCondensedOutputs()[0].createItemStack() : ItemStack.EMPTY;
 
 		SIMPLE_CACHE.put( item, out );
 		return out;

src/main/java/appeng/me/cache/CraftingGridCache.java

@@ -35,6 +35,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadFactory;
 
+import appeng.me.helpers.PatternStatusManager;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableList;
@@ -266,17 +267,17 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 		// coalesce change events during a grid traversal to a single rebuild
 		if (pauseRebuilds != 0)
 		{
-			rebuildNeeded.add(this);
+			rebuildNeeded.add( this );
 			return;
 		}
 
-		final Object2ObjectMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = new Object2ObjectOpenHashMap<>(this.craftableItems);
+		final Object2ObjectMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = new Object2ObjectOpenHashMap<>( this.craftableItems );
-		final Set<IAEItemStack> oldEmitableItems = new HashSet<>(this.emitableItems);
 
 		// erase list.
 		this.craftingMethods.clear();
 		this.craftableItems.clear();
 		this.emitableItems.clear();
+		( (GridStorageCache) this.storageGrid ).clearPatternStatus();
 
 		// re-create list..
 		for( final ICraftingProvider provider : this.craftingProviders )
@@ -289,7 +290,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 		// new craftables!
 		for( final ICraftingPatternDetails details : this.craftingMethods.keySet() )
 		{
-			for( IAEItemStack out : details.getOutputs() )
+			for( IAEItemStack out : details.getCondensedOutputs() )
 			{
 				out = out.copy();
 				out.reset();
@@ -317,42 +318,14 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 		ObjectSet<Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>>> i = oldItems.entrySet();
 		for ( Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>> ais : i) {
 			if (!this.craftableItems.containsKey( ais.getKey() )) {
-				IAEItemStack changedStack = ais.getKey().copy();
+				craftablesChanged.put( ais.getKey().setCraftable( false ), ais.getValue() );
-				changedStack.reset();
-				changedStack.setCraftable( false );
-				craftablesChanged.put( changedStack, ais.getValue() );
 			}
 		}
 
 		ObjectSet<Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>>> j = this.craftableItems.entrySet();
 		for ( Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>> ais : j) {
 			if (!oldItems.containsKey( ais )){
-				IAEItemStack changedStack = ais.getKey().copy();
+				craftablesChanged.put( ais.getKey().setCraftable( true ), ais.getValue() );
-				changedStack.reset();
-				changedStack.setCraftable( true );
-				craftablesChanged.put( changedStack, ais.getValue() );
-			}
-		}
-
-		for( final IAEItemStack st : oldEmitableItems )
-		{
-			if( !emitableItems.contains( st ) )
-			{
-				IAEItemStack changedStack = st.copy();
-				changedStack.reset();
-				changedStack.setCraftable( false );
-				craftablesChanged.put( changedStack, null );
-			}
-		}
-
-		for( final IAEItemStack st : this.emitableItems )
-		{
-			if( !oldEmitableItems.contains( st ) )
-			{
-				IAEItemStack changedStack = st.copy();
-				changedStack.reset();
-				changedStack.setCraftable( true );
-				craftablesChanged.put( changedStack, null );
 			}
 		}
 
@@ -676,7 +649,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 
 	public boolean hasCpu( final ICraftingCPU cpu )
 	{
-		if (cpu instanceof CraftingCPUCluster)
+		if( cpu instanceof CraftingCPUCluster )
 		{
 			return this.craftingCPUClusters.contains( (CraftingCPUCluster) cpu );
 		}
@@ -688,6 +661,11 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 		return this.interestManager;
 	}
 
+	public PatternStatusManager getPatternStatusManager()
+	{
+		return ( (GridStorageCache) this.storageGrid ).getPatternStatusManager();
+	}
+
 	private static class ActiveCpuIterator implements Iterator<ICraftingCPU>
 	{
 

src/main/java/appeng/me/cache/EnergyGridCache.java

@@ -19,21 +19,10 @@
 package appeng.me.cache;
 
 
-import java.util.Collection;
+import java.util.*;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.NavigableSet;
-import java.util.PriorityQueue;
-import java.util.Queue;
-import java.util.Set;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.HashMultiset;
+import com.google.common.collect.*;
-import com.google.common.collect.Multiset;
-import com.google.common.collect.Sets;
 
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
@@ -81,7 +70,7 @@ public class EnergyGridCache implements IEnergyGrid
 	// Should only be modified from the add/remove methods below to guard against
 	// concurrent modifications
 	private final double averageLength = 40.0;
-	private final Set<IAEPowerStorage> providers = new LinkedHashSet<>();
+	private final Multimap<Integer,IAEPowerStorage> providers = HashMultimap.create();
 	// Used to track whether an extraction is currently in progress, to fail fast
 	// when something externally
 	// modifies the energy grid.
@@ -89,7 +78,7 @@ public class EnergyGridCache implements IEnergyGrid
 
 	// Should only be modified from the add/remove methods below to guard against
 	// concurrent modifications
-	private final Set<IAEPowerStorage> requesters = new LinkedHashSet<>();
+	private final Multimap<Integer,IAEPowerStorage> requesters = HashMultimap.create();
 	// Used to track whether an injection is currently in progress, to fail fast
 	// when something externally
 	// modifies the energy grid.
@@ -126,16 +115,16 @@ public class EnergyGridCache implements IEnergyGrid
 	private double lastStoredPower = -1;
 
 	private final GridPowerStorage localStorage = new GridPowerStorage();
-	private Set<IAEPowerStorage> providerToRemove = new HashSet<>();
+	private Set<IAEPowerStorage> providersToRemove = new HashSet<>();
-	private Set<IAEPowerStorage> requesterToRemove = new HashSet<>();
+	private Set<IAEPowerStorage> requestersToRemove = new HashSet<>();
 	private Set<IAEPowerStorage> providersToAdd = new HashSet<>();
-	private Set<IAEPowerStorage> requesterToAdd = new HashSet<>();
+	private Set<IAEPowerStorage> requestersToAdd = new HashSet<>();
 
 	public EnergyGridCache( final IGrid g )
 	{
 		this.myGrid = g;
-		this.requesters.add( this.localStorage );
+		this.requesters.put( 0, this.localStorage );
-		this.providers.add( this.localStorage );
+		this.providers.put( 1, this.localStorage );
 	}
 
 	@MENetworkEventSubscribe
@@ -187,7 +176,7 @@ public class EnergyGridCache implements IEnergyGrid
 						}
 						else
 						{
-							this.requesterToAdd.add( ev.storage );
+							this.requestersToAdd.add( ev.storage );
 						}
 					}
 					break;
@@ -318,7 +307,7 @@ public class EnergyGridCache implements IEnergyGrid
 	{
 		this.availableTicksSinceUpdate = 0;
 		this.globalAvailablePower = 0;
-		for( final IAEPowerStorage p : this.providers )
+		for( final IAEPowerStorage p : this.providers.values() )
 		{
 			this.globalAvailablePower += p.getAECurrentPower();
 		}
@@ -335,25 +324,27 @@ public class EnergyGridCache implements IEnergyGrid
 	{
 		double extractedPower = 0;
 
-		this.providers.addAll( providersToAdd );
+		providersToAdd.forEach( provider -> {
+			if( provider instanceof GridPowerStorage )
+			{
+				providers.put( 1, provider );
+			}
+			else
+			{
+				providers.put( 0, provider );
+			}
+		} );
 		providersToAdd.clear();
 
-		final Iterator<IAEPowerStorage> it = this.providers.iterator();
+		final Iterator<IAEPowerStorage> it = this.providers.values().iterator();
 
 		ongoingExtractOperation = true;
-		boolean ls = false;
 		try
 		{
 			while ( extractedPower < amt && it.hasNext() )
 			{
 				final IAEPowerStorage node = it.next();
 
-				if( node == localStorage && mode == Actionable.MODULATE )
-				{
-					ls = true;
-					continue;
-				}
-
 				final double req = amt - extractedPower;
 				final double newPower = node.extractAEPower( req, mode, PowerMultiplier.ONE );
 				extractedPower += newPower;
@@ -365,25 +356,20 @@ public class EnergyGridCache implements IEnergyGrid
 			}
 		} finally
 		{
+			providersToRemove.forEach( provider -> {
+				if( provider instanceof GridPowerStorage )
+				{
+					providers.remove( 1, provider );
+				}
+				else
+				{
+					providers.remove( 0, provider );
+				}
+			} );
+			this.providersToRemove.clear();
 			ongoingExtractOperation = false;
 		}
 
-		if( ls && extractedPower < amt )
-		{
-			final double req = amt - extractedPower;
-			final double newPower = localStorage.extractAEPower( req, mode, PowerMultiplier.ONE );
-
-			extractedPower += newPower;
-
-			if( newPower < req )
-			{
-				providers.remove( localStorage );
-			}
-		}
-
-		providers.removeIf( p -> providerToRemove.contains( p ) );
-		this.providerToRemove.clear();
-
 		final double result = Math.min( extractedPower, amt );
 
 		if( mode == Actionable.MODULATE )
@@ -405,10 +391,19 @@ public class EnergyGridCache implements IEnergyGrid
 	{
 		final double originalAmount = amt;
 
-		this.requesters.addAll( requesterToAdd );
+		requestersToAdd.forEach( requester -> {
-		requesterToAdd.clear();
+			if( requester instanceof GridPowerStorage )
+			{
+				requesters.put( 0, requester );
+			}
+			else
+			{
+				requesters.put( 1, requester );
+			}
+		} );
+		requestersToAdd.clear();
 
-		final Iterator<IAEPowerStorage> it = this.requesters.iterator();
+		final Iterator<IAEPowerStorage> it = this.requesters.values().iterator();
 
 		ongoingInjectOperation = true;
 		try
@@ -426,12 +421,20 @@ public class EnergyGridCache implements IEnergyGrid
 			}
 		} finally
 		{
+			requestersToRemove.forEach( requester -> {
+				if( requester instanceof GridPowerStorage )
+				{
+					requesters.remove( 0, requester );
+				}
+				else
+				{
+					requesters.remove( 1, requester );
+				}
+			} );
+			this.requestersToRemove.clear();
 			ongoingInjectOperation = false;
 		}
 
-		requesters.removeIf( r -> requesterToRemove.contains( r ) );
-		this.requesterToRemove.clear();
-
 		final double overflow = Math.max( 0.0, amt );
 
 		if( mode == Actionable.MODULATE )
@@ -447,8 +450,8 @@ public class EnergyGridCache implements IEnergyGrid
 	{
 		double required = 0;
 
-		final Iterator<IAEPowerStorage> it = this.requesters.iterator();
+		final Iterator<IAEPowerStorage> it = this.requesters.values().iterator();
-		while ( required < maxRequired && it.hasNext() )
+		while( required < maxRequired && it.hasNext() )
 		{
 			final IAEPowerStorage node = it.next();
 			if( node.getPowerFlow() != AccessRestriction.READ )
@@ -588,7 +591,7 @@ public class EnergyGridCache implements IEnergyGrid
 				}
 				else
 				{
-					this.providerToRemove.add( ps );
+					this.providersToRemove.add( ps );
 				}
 				if( !ongoingInjectOperation )
 				{
@@ -596,7 +599,7 @@ public class EnergyGridCache implements IEnergyGrid
 				}
 				else
 				{
-					this.requesterToRemove.add( ps );
+					this.requestersToRemove.add( ps );
 				}
 			}
 		}
@@ -616,28 +619,55 @@ public class EnergyGridCache implements IEnergyGrid
 	private void addRequester(IAEPowerStorage requester) {
 		Preconditions.checkState(!ongoingInjectOperation,
 				"Cannot modify energy requesters while energy is being injected.");
-		this.requesters.add(requester);
+		if( requester instanceof GridPowerStorage )
+		{
+			requesters.put( 0, requester );
+		}
+		else
+		{
+			requesters.put( 1, requester );
+		}
 	}
 
 	private void removeRequester(IAEPowerStorage requester) {
 		Preconditions.checkState(!ongoingInjectOperation,
 				"Cannot modify energy requesters while energy is being injected.");
-		this.requesters.remove(requester);
+		if( requester instanceof GridPowerStorage )
+		{
+			requesters.remove( 0, requester );
+		}
+		else
+		{
+			requesters.remove( 1, requester );
+		}
 	}
 
 	private void addProvider(IAEPowerStorage provider) {
 		Preconditions.checkState(!ongoingExtractOperation,
 				"Cannot modify energy providers while energy is being extracted.");
-		this.providers.add(provider);
+		if( provider instanceof GridPowerStorage )
+		{
+			providers.put( 1, provider );
+		}
+		else
+		{
+			providers.put( 0, provider );
+		}
 	}
 
-	private void removeProvider(IAEPowerStorage provider) {
+	private void removeProvider(IAEPowerStorage provider)
-		Preconditions.checkState(!ongoingExtractOperation,
+	{
-				"Cannot modify energy providers while energy is being extracted.");
+		Preconditions.checkState( !ongoingExtractOperation, "Cannot modify energy providers while energy is being extracted." );
-		this.providers.remove(provider);
+		if( provider instanceof GridPowerStorage )
+		{
+			providers.remove( 1, provider );
+		}
+		else
+		{
+			providers.remove( 0, provider );
+		}
 	}
 
-
 	@Override
 	public void addNode( final IGridNode node, final IGridHost machine )
 	{
@@ -687,7 +717,7 @@ public class EnergyGridCache implements IEnergyGrid
 					}
 					else
 					{
-						this.requesterToAdd.add( ps );
+						this.requestersToAdd.add( ps );
 					}
 				}
 			}
@@ -815,4 +845,4 @@ public class EnergyGridCache implements IEnergyGrid
 			}
 		}
 	}
-}
+}

src/main/java/appeng/me/cache/GridStorageCache.java

@@ -26,7 +26,10 @@ import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 
+import appeng.api.networking.crafting.ICraftingPatternDetails;
+import appeng.me.helpers.PatternStatusManager;
 import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
 import com.google.common.collect.SetMultimap;
 
 import appeng.api.AEApi;
@@ -65,6 +68,10 @@ public class GridStorageCache implements IStorageGrid
 	private final HashSet<ICellProvider> inactiveCellProviders = new HashSet<>();
 	private final SetMultimap<IAEStack, ItemWatcher> interests = HashMultimap.create();
 	private final GenericInterestManager<ItemWatcher> interestManager = new GenericInterestManager<>( this.interests );
+	private final Multimap<ICraftingPatternDetails, IAEStack> patternDetails2IAEStackMultimap = HashMultimap.create();
+	private final Multimap<IAEStack, ICraftingPatternDetails> iaeStack2PatternDetailsMultimap = HashMultimap.create();
+	private final PatternStatusManager patternStatusManager = new PatternStatusManager( this.patternDetails2IAEStackMultimap, this.iaeStack2PatternDetailsMultimap );
+
 	private final HashMap<IGridNode, IStackWatcher> watchers = new HashMap<>();
 	private Map<IStorageChannel<? extends IAEStack>, NetworkInventoryHandler<?>> storageNetworks;
 	private Map<IStorageChannel<? extends IAEStack>, NetworkMonitor<?>> storageMonitors;
@@ -109,9 +116,6 @@ public class GridStorageCache implements IStorageGrid
 				this.watchers.remove( node );
 			}
 		}
-
-		this.storageMonitors.forEach( ( channel, monitor ) -> monitor.forceUpdate() );
-
 	}
 
 	@Override
@@ -140,9 +144,6 @@ public class GridStorageCache implements IStorageGrid
 			this.watchers.put( node, iw );
 			swh.updateWatcher( iw );
 		}
-
-		this.storageMonitors.forEach( ( channel, monitor ) -> monitor.forceUpdate() );
-
 	}
 
 	@Override
@@ -310,6 +311,18 @@ public class GridStorageCache implements IStorageGrid
 		return this.interestManager;
 	}
 
+	public PatternStatusManager getPatternStatusManager()
+	{
+		return this.patternStatusManager;
+	}
+
+	public void clearPatternStatus()
+	{
+		System.out.println( "reseting pattern status due to pattern changes" );
+		this.patternDetails2IAEStackMultimap.clear();
+		this.iaeStack2PatternDetailsMultimap.clear();
+	}
+
 	IGrid getGrid()
 	{
 		return this.myGrid;

src/main/java/appeng/me/cache/NetworkMonitor.java

@@ -25,6 +25,8 @@ import javax.annotation.Nullable;
 import appeng.api.AEApi;
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
+import appeng.api.config.FuzzyMode;
+import appeng.api.networking.crafting.ICraftingPatternDetails;
 import appeng.api.networking.events.MENetworkStorageEvent;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.storage.IMEInventoryHandler;
@@ -33,6 +35,7 @@ import appeng.api.storage.IMEMonitorHandlerReceiver;
 import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IFluidStorageChannel;
 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.me.storage.ItemWatcher;
@@ -61,7 +64,6 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 	private final Object2ObjectMap<IMEMonitorHandlerReceiver<T>, Object> listeners;
 
 	private boolean sendEvent = false;
-	private boolean forceUpdate = false;
 	@Nonnegative
 	private int localDepthSemaphore = 0;
 	private long gridItemCount;
@@ -125,10 +127,6 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 
 	public long getGridCurrentCount()
 	{
-		if( forceUpdate )
-		{
-			getStorageList();
-		}
 		if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
 		{
 			return gridItemCount;
@@ -140,42 +138,23 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 		return 0;
 	}
 
-	public void incGridCurrentCount(long count)
+	public long incGridCurrentCount(long count)
 	{
 		if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
 		{
-			gridItemCount += count;
+			return gridItemCount += count;
 		}
 		else if( myChannel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
 		{
-			gridFluidCount += count;
+			return gridFluidCount += count;
 		}
+		return 0;
 	}
 
 	@Nonnull
 	@Override
 	public IItemList<T> getStorageList()
 	{
-		if( forceUpdate )
-		{
-			forceUpdate = false;
-			this.cachedList.resetStatus();
-			this.getAvailableItems( this.cachedList );
-
-			long count = 0;
-			for (T stack : this.cachedList) {
-				count += stack.getStackSize();
-			}
-			if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
-			{
-				gridItemCount = count;
-			}
-			else if( myChannel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
-			{
-				gridFluidCount = count;
-			}
-		}
-
 		return this.cachedList;
 	}
 
@@ -238,52 +217,47 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 		for( final T changedItem : input )
 		{
 			if (changedItem.isCraftable()) {
-				this.cachedList.add( changedItem );
+				this.cachedList.add( changedItem.copy().setCraftable( true ) );
 			}
 			else
 			{
-				T i = this.cachedList.findPrecise( changedItem );
+				this.cachedList.findPrecise( changedItem ).setCraftable( false );
-				if (i != null)
-				i.setCraftable( false );
 			}
 		}
 	}
 
 	protected void postChange( final boolean add, final Iterable<T> changes, final IActionSource src )
 	{
-		if( this.localDepthSemaphore > 0 || GLOBAL_DEPTH.contains( this ) )
+		if( GLOBAL_DEPTH.contains( this ) )
 		{
 			return;
 		}
 
-		this.localDepthSemaphore++;
 		GLOBAL_DEPTH.push( this );
 
 		this.sendEvent = true;
 
-		for( final T changed : changes )
+		for( final T changedItem : changes )
 		{
-			T change = changed;
+			if( !add && changedItem != null )
-			if( !add && change != null )
 			{
-				change = changed.copy();
+				changedItem.setStackSize( -changedItem.getStackSize() );
-				change.setStackSize( -change.getStackSize() );
 			}
 
-			incGridCurrentCount( change.getStackSize() );
+			incGridCurrentCount( changedItem.getStackSize() );
-			this.cachedList.add( change );
+			this.cachedList.add( changedItem );
 
-			if( this.myGridCache.getInterestManager().containsKey( change ) )
+			if( this.myGridCache.getInterestManager().containsKey( changedItem ) )
 			{
-				final Collection<ItemWatcher> list = this.myGridCache.getInterestManager().get( change );
+				final Collection<ItemWatcher> list = this.myGridCache.getInterestManager().get( changedItem );
 
 				if( !list.isEmpty() )
 				{
-					IAEStack<T> fullStack = this.getStorageList().findPrecise( change );
+					IAEStack<T> fullStack = this.getStorageList().findPrecise( changedItem );
 
 					if( fullStack == null )
 					{
-						fullStack = change.copy();
+						fullStack = changedItem.copy();
 						fullStack.setStackSize( 0 );
 					}
 
@@ -291,18 +265,78 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 
 					for( final ItemWatcher iw : list )
 					{
-						iw.getHost().onStackChange( this.getStorageList(), fullStack, change, src, this.getChannel() );
+						iw.getHost().onStackChange( this.getStorageList(), fullStack, changedItem, src, this.getChannel() );
 					}
 
 					this.myGridCache.getInterestManager().disableTransactions();
 				}
 			}
+			if( changedItem instanceof IAEItemStack )
+			{
+				if( this.myGridCache.getPatternStatusManager().containsMissingIAEStack( changedItem ) )
+				{
+					this.myGridCache.getPatternStatusManager().enableTransactions();
+
+					for( ICraftingPatternDetails craftingPatternDetails : this.myGridCache.getPatternStatusManager().getIncompletablePattern( changedItem ) )
+					{
+						for( IAEStack stack : this.myGridCache.getPatternStatusManager().getMissingIAEStack( craftingPatternDetails ) )
+						{
+							if( craftingPatternDetails.canSubstitute() )
+							{
+								if( ( (IAEItemStack) stack ).getItem().isDamageable() )
+								{
+									if( ( (IAEStack) changedItem ).fuzzyComparison( stack, FuzzyMode.IGNORE_ALL ) )
+									{
+										if( changedItem.getStackSize() > 0 )
+										{
+											this.myGridCache.getPatternStatusManager().remove( craftingPatternDetails, stack );
+										}
+									}
+								}
+								else
+								{
+									if( ( (IAEItemStack) stack ).sameOre( (IAEItemStack) changedItem ) )
+									{
+										if( changedItem.getStackSize() > 0 )
+										{
+											if( changedItem.getStackSize() >= stack.getStackSize() )
+											{
+												this.myGridCache.getPatternStatusManager().remove( craftingPatternDetails, stack );
+											}
+											else
+											{
+												stack.decStackSize( changedItem.getStackSize() );
+											}
+										}
+									}
+								}
+							}
+							else if( stack.equals( changedItem ) )
+							{
+								if( changedItem.getStackSize() > 0 )
+								{
+									if( changedItem.getStackSize() >= stack.getStackSize() )
+									{
+										this.myGridCache.getPatternStatusManager().remove( craftingPatternDetails, stack );
+									}
+									else
+									{
+										stack.decStackSize( changedItem.getStackSize() );
+									}
+								}
+							}
+						}
+					}
+
+					this.myGridCache.getPatternStatusManager().disableTransactions();
+
+				}
+			}
 		}
 
 		this.notifyListenersOfChange( changes, src );
 
 		final NetworkMonitor<?> last = GLOBAL_DEPTH.pop();
-		this.localDepthSemaphore--;
 
 		if( last != this )
 		{
@@ -310,27 +344,6 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 		}
 	}
 
-	void forceUpdate()
-	{
-		this.forceUpdate = true;
-
-		final Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> i = this.getListeners();
-		while ( i.hasNext() )
-		{
-			final Entry<IMEMonitorHandlerReceiver<T>, Object> o = i.next();
-			final IMEMonitorHandlerReceiver<T> receiver = o.getKey();
-
-			if( receiver.isValid( o.getValue() ) )
-			{
-				receiver.onListUpdate();
-			}
-			else
-			{
-				i.remove();
-			}
-		}
-	}
-
 	void onTick()
 	{
 		if( this.sendEvent )

src/main/java/appeng/me/helpers/PatternStatusManager.java

@@ -0,0 +1,166 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.me.helpers;
+
+
+import appeng.api.config.FuzzyMode;
+import appeng.api.networking.crafting.ICraftingPatternDetails;
+import appeng.api.storage.data.IAEItemStack;
+import appeng.api.storage.data.IAEStack;
+import com.google.common.collect.Multimap;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+
+public class PatternStatusManager
+{
+
+	private final Multimap<ICraftingPatternDetails, IAEStack> patternDetailsIAEStackMultimap;
+	private final Multimap<IAEStack, ICraftingPatternDetails> iaeStackPatternDetailsMultimap;
+
+	private List<SavedTransactions> transactions = null;
+	private int transDepth = 0;
+
+	public PatternStatusManager( final Multimap<ICraftingPatternDetails, IAEStack> interests, final Multimap<IAEStack, ICraftingPatternDetails> interested )
+	{
+		this.patternDetailsIAEStackMultimap = interests;
+		this.iaeStackPatternDetailsMultimap = interested;
+	}
+
+	public void enableTransactions()
+	{
+		if( this.transDepth == 0 )
+		{
+			this.transactions = new ArrayList<>();
+		}
+
+		this.transDepth++;
+	}
+
+	public void disableTransactions()
+	{
+		this.transDepth--;
+
+		if( this.transDepth == 0 )
+		{
+			final List<SavedTransactions> myActions = this.transactions;
+			this.transactions = null;
+
+			for( final SavedTransactions t : myActions )
+			{
+				if( t.put )
+				{
+					this.put( t.patternDetails, t.stack );
+				}
+				else
+				{
+					this.remove( t.patternDetails, t.stack );
+				}
+			}
+		}
+	}
+
+	public boolean put( final ICraftingPatternDetails craftingPatternDetails, final IAEStack debtStack )
+	{
+		if( this.transactions != null )
+		{
+			this.transactions.add( new SavedTransactions( true, craftingPatternDetails, debtStack ) );
+			return true;
+		}
+		else
+		{
+			this.iaeStackPatternDetailsMultimap.put( debtStack, craftingPatternDetails );
+			return this.patternDetailsIAEStackMultimap.put( craftingPatternDetails, debtStack );
+		}
+	}
+
+	public boolean remove( final ICraftingPatternDetails craftingPatternDetails, final IAEStack debtStack )
+	{
+		if( this.transactions != null )
+		{
+			this.transactions.add( new SavedTransactions( false, craftingPatternDetails, debtStack ) );
+			return true;
+		}
+		else
+		{
+			this.iaeStackPatternDetailsMultimap.remove( debtStack, craftingPatternDetails );
+			return this.patternDetailsIAEStackMultimap.remove( craftingPatternDetails, debtStack );
+		}
+	}
+
+	public boolean containsIncompletablePattern( final ICraftingPatternDetails craftingPatternDetails )
+	{
+		return this.patternDetailsIAEStackMultimap.containsKey( craftingPatternDetails );
+	}
+
+	public boolean containsMissingIAEStack( final IAEStack stack )
+	{
+		if( ( (IAEItemStack) stack ).getItem().isDamageable() )
+		{
+			for( IAEStack i : iaeStackPatternDetailsMultimap.keySet() )
+			{
+				if( i.fuzzyComparison( stack, FuzzyMode.IGNORE_ALL ) )
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+		return this.iaeStackPatternDetailsMultimap.containsKey( stack );
+	}
+
+	public Collection<IAEStack> getMissingIAEStack( final ICraftingPatternDetails patternDetails )
+	{
+		return this.patternDetailsIAEStackMultimap.get( patternDetails );
+	}
+
+	public Collection<ICraftingPatternDetails> getIncompletablePattern( final IAEStack stack )
+	{
+		Collection<ICraftingPatternDetails> a = new ArrayList<>();
+		if( ( (IAEItemStack) stack ).getItem().isDamageable() )
+		{
+			for( IAEStack i : iaeStackPatternDetailsMultimap.keySet() )
+			{
+				if( i.fuzzyComparison( stack, FuzzyMode.IGNORE_ALL ) )
+				{
+					a.addAll( this.iaeStackPatternDetailsMultimap.get( i ) );
+				}
+			}
+			return a;
+		}
+		return this.iaeStackPatternDetailsMultimap.get( stack );
+	}
+
+	private class SavedTransactions
+	{
+
+		private final boolean put;
+		private final ICraftingPatternDetails patternDetails;
+		private final IAEStack stack;
+
+		public SavedTransactions( final boolean putOperation, final ICraftingPatternDetails myPatternDetails, final IAEStack stack )
+		{
+			this.put = putOperation;
+			this.patternDetails = myPatternDetails;
+			this.stack = stack;
+		}
+	}
+}

src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java

@@ -19,11 +19,14 @@
 package appeng.me.storage;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map.Entry;
+import java.util.NavigableMap;
 import java.util.concurrent.ConcurrentSkipListMap;
 
-import appeng.fluids.util.AEFluidStack;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidTankProperties;
@@ -45,14 +48,16 @@ import appeng.api.storage.data.IItemList;
 public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITickingMonitor
 {
 	private final IFluidHandler handler;
-	private IItemList<IAEFluidStack> cache = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
+	private final IItemList<IAEFluidStack> list = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
 	private final HashMap<IMEMonitorHandlerReceiver<IAEFluidStack>, Object> listeners = new HashMap<>();
+	private final NavigableMap<Integer, CachedFluidStack> memory;
 	private IActionSource mySource;
 	private StorageFilter mode = StorageFilter.EXTRACTABLE_ONLY;
 
 	public MEMonitorIFluidHandler( final IFluidHandler handler )
 	{
 		this.handler = handler;
+		this.memory = new ConcurrentSkipListMap<>();
 	}
 
 	@Override
@@ -77,6 +82,11 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 			return input.copy();
 		}
 
+		if( type == Actionable.MODULATE )
+		{
+			this.onTick();
+		}
+
 		if( filled == input.getStackSize() )
 		{
 			return null;
@@ -84,15 +94,6 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 
 		final IAEFluidStack o = input.copy();
 		o.setStackSize( input.getStackSize() - filled );
-
-		if( type == Actionable.MODULATE )
-		{
-			IAEFluidStack added = o.copy();
-			this.cache.add( added );
-			this.postDifference( Collections.singletonList( added ) );
-			this.onTick();
-		}
-
 		return o;
 	}
 
@@ -106,18 +107,13 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 			return null;
 		}
 
-		final IAEFluidStack o = request.copy();
-		o.setStackSize( removed.amount );
-
 		if( type == Actionable.MODULATE )
 		{
-			IAEFluidStack cachedStack = this.cache.findPrecise( request );
+			this.onTick();
-			if( cachedStack != null )
-			{
-				cachedStack.decStackSize( o.getStackSize() );
-				this.postDifference( Collections.singletonList( o.copy().setStackSize( -o.getStackSize() ) ) );
-			}
 		}
+
+		final IAEFluidStack o = request.copy();
+		o.setStackSize( removed.amount );
 		return o;
 	}
 
@@ -130,51 +126,111 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 	@Override
 	public TickRateModulation onTick()
 	{
+		final List<IAEFluidStack> changes = new ArrayList<>();
+
+		this.list.resetStatus();
+		int high = 0;
 		boolean changed = false;
 
-		final List<IAEFluidStack> changes = new ArrayList<>();
+		final IFluidTankProperties[] props = this.handler.getTankProperties();
-		final IFluidTankProperties[] tankProperties = this.handler.getTankProperties();
+		for( int slot = 0; slot < this.handler.getTankProperties().length; ++slot )
-
-		IItemList<IAEFluidStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
-
-		for( IFluidTankProperties tankProperty : tankProperties )
 		{
-			if( this.mode == StorageFilter.EXTRACTABLE_ONLY && this.handler.drain( 1, false ) == null )
+			final CachedFluidStack old = this.memory.get( slot );
+			high = Math.max( high, slot );
+
+			final FluidStack newIS = !props[slot].canDrain() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? null : props[slot].getContents();
+			final FluidStack oldIS = old == null ? null : old.fluidStack;
+
+			if( isDifferent( newIS, oldIS ) )
 			{
-				continue;
+				final CachedFluidStack cis = new CachedFluidStack( newIS );
+				this.memory.put( slot, cis );
+
+				if( old != null && old.aeStack != null )
+				{
+					old.aeStack.setStackSize( -old.aeStack.getStackSize() );
+					changes.add( old.aeStack );
+				}
+
+				if( cis.aeStack != null )
+				{
+					changes.add( cis.aeStack );
+					this.list.add( cis.aeStack );
+				}
+
+				changed = true;
 			}
-			currentlyOnStorage.add( AEFluidStack.fromFluidStack( tankProperty.getContents() ) );
+			else
-		}
-
-		for( final IAEFluidStack is : cache )
-		{
-			is.setStackSize( -is.getStackSize() );
-		}
-
-		for( final IAEFluidStack is : currentlyOnStorage )
-		{
-			cache.add( is );
-		}
-
-		for( final IAEFluidStack is : cache )
-		{
-			if( is.getStackSize() != 0 )
 			{
-				changes.add( is );
+				final int newSize = newIS == null ? 0 : newIS.amount;
+				final int diff = newSize - ( oldIS == null ? 0 : oldIS.amount );
+
+				IAEFluidStack stack = null;
+
+				if( newIS != null )
+				{
+					stack = ( old == null || old.aeStack == null ? AEApi.instance()
+							.storage()
+							.getStorageChannel( IFluidStorageChannel.class )
+							.createStack( newIS ) : old.aeStack.copy() );
+				}
+				if( stack != null )
+				{
+					stack.setStackSize( newSize );
+					this.list.add( stack );
+				}
+
+				if( diff != 0 && stack != null )
+				{
+					final CachedFluidStack cis = new CachedFluidStack( newIS );
+					this.memory.put( slot, cis );
+
+					final IAEFluidStack a = stack.copy();
+					a.setStackSize( diff );
+					changes.add( a );
+					changed = true;
+				}
 			}
 		}
 
-		cache = currentlyOnStorage;
+		// detect dropped items; should fix non IISided Inventory Changes.
+		final NavigableMap<Integer, CachedFluidStack> end = this.memory.tailMap( high, false );
+		if( !end.isEmpty() )
+		{
+			for( final CachedFluidStack cis : end.values() )
+			{
+				if( cis != null && cis.aeStack != null )
+				{
+					final IAEFluidStack a = cis.aeStack.copy();
+					a.setStackSize( -a.getStackSize() );
+					changes.add( a );
+					changed = true;
+				}
+			}
+			end.clear();
+		}
 
 		if( !changes.isEmpty() )
 		{
 			this.postDifference( changes );
-			changed = true;
 		}
 
 		return changed ? TickRateModulation.URGENT : TickRateModulation.SLOWER;
 	}
 
+	private static boolean isDifferent( FluidStack a, FluidStack b )
+	{
+		if( a == b )
+		{
+			return false;
+		}
+		if( a == null || b == null )
+		{
+			return true;
+		}
+		return !a.getFluid().equals( b.getFluid() );
+	}
+
 	private void postDifference( final Iterable<IAEFluidStack> a )
 	{
 		if( a != null )
@@ -235,9 +291,9 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 	@Override
 	public IItemList<IAEFluidStack> getAvailableItems( final IItemList out )
 	{
-		for( final IAEFluidStack fs : cache )
+		for( final CachedFluidStack is : this.memory.values() )
 		{
-			out.addStorage( fs );
+			out.addStorage( is.aeStack );
 		}
 
 		return out;
@@ -246,7 +302,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 	@Override
 	public IItemList<IAEFluidStack> getStorageList()
 	{
-		return this.cache;
+		return this.list;
 	}
 
 	private StorageFilter getMode()
@@ -270,4 +326,24 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 		this.mySource = mySource;
 	}
 
+	private static class CachedFluidStack
+	{
+
+		private final FluidStack fluidStack;
+		private final IAEFluidStack aeStack;
+
+		CachedFluidStack( final FluidStack is )
+		{
+			if( is == null )
+			{
+				this.fluidStack = null;
+				this.aeStack = null;
+			}
+			else
+			{
+				this.fluidStack = is.copy();
+				this.aeStack = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createStack( is );
+			}
+		}
+	}
 }

src/main/java/appeng/me/storage/MEMonitorIInventory.java

@@ -19,8 +19,12 @@
 package appeng.me.storage;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map.Entry;
+import java.util.NavigableMap;
 import java.util.concurrent.ConcurrentSkipListMap;
 
 import net.minecraft.item.ItemStack;
@@ -46,15 +50,16 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 {
 
 	private final InventoryAdaptor adaptor;
-	private IItemList<IAEItemStack> cache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+	private final IItemList<IAEItemStack> list = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
-
 	private final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
+	private final NavigableMap<Integer, CachedItemStack> memory;
 	private IActionSource mySource;
 	private StorageFilter mode = StorageFilter.EXTRACTABLE_ONLY;
 
 	public MEMonitorIInventory( final InventoryAdaptor adaptor )
 	{
 		this.adaptor = adaptor;
+		this.memory = new ConcurrentSkipListMap<>();
 	}
 
 	@Override
@@ -83,6 +88,11 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 			out = this.adaptor.addItems( input.createItemStack() );
 		}
 
+		if( type == Actionable.MODULATE )
+		{
+			this.onTick();
+		}
+
 		if( out.isEmpty() )
 		{
 			return null;
@@ -91,15 +101,6 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 		// better then doing construction from scratch :3
 		final IAEItemStack o = input.copy();
 		o.setStackSize( out.getCount() );
-
-		if( type == Actionable.MODULATE )
-		{
-			IAEItemStack added = o.copy();
-			this.cache.add( added );
-			this.postDifference( Collections.singletonList( added ) );
-			this.onTick();
-		}
-
 		return o;
 	}
 
@@ -128,12 +129,6 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 
 		if( type == Actionable.MODULATE )
 		{
-			IAEItemStack cachedStack = this.cache.findPrecise( request );
-			if( cachedStack != null )
-			{
-				cachedStack.decStackSize( o.getStackSize() );
-				this.postDifference( Collections.singletonList( o.copy().setStackSize( -o.getStackSize() ) ) );
-			}
 			this.onTick();
 		}
 
@@ -149,52 +144,110 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 	@Override
 	public TickRateModulation onTick()
 	{
-		boolean changed = false;
 
 		final List<IAEItemStack> changes = new ArrayList<>();
 
-		IItemList<IAEItemStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+		this.list.resetStatus();
-
+		int high = 0;
-		for( final ItemSlot is : adaptor )
+		boolean changed = false;
+		for( final ItemSlot is : this.adaptor )
 		{
-			if( this.mode == StorageFilter.EXTRACTABLE_ONLY && !is.isExtractable() )
+			final CachedItemStack old = this.memory.get( is.getSlot() );
+			high = Math.max( high, is.getSlot() );
+
+			final ItemStack newIS = !is.isExtractable() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? ItemStack.EMPTY : is.getItemStack();
+			final ItemStack oldIS = old == null ? ItemStack.EMPTY : old.itemStack;
+
+			if( this.isDifferent( newIS, oldIS ) )
 			{
-				continue;
+				final CachedItemStack cis = new CachedItemStack( is.getItemStack() );
+				this.memory.put( is.getSlot(), cis );
+
+				if( old != null && old.aeStack != null )
+				{
+					old.aeStack.setStackSize( -old.aeStack.getStackSize() );
+					changes.add( old.aeStack );
+				}
+
+				if( cis.aeStack != null )
+				{
+					changes.add( cis.aeStack );
+					this.list.add( cis.aeStack );
+				}
+
+				changed = true;
 			}
-			currentlyOnStorage.add( is.getAEItemStack() );
+			else
-		}
-
-		for( final IAEItemStack is : cache )
-		{
-			is.setStackSize( -is.getStackSize() );
-		}
-
-		for( final IAEItemStack is : currentlyOnStorage )
-		{
-			cache.add( is );
-		}
-
-		for( final IAEItemStack is : cache )
-		{
-			if( is.getStackSize() != 0 )
 			{
-				changes.add( is );
+				final int newSize = ( newIS.isEmpty() ? 0 : newIS.getCount() );
+				final int diff = newSize - ( oldIS.isEmpty() ? 0 : oldIS.getCount() );
+
+				final IAEItemStack stack = ( old == null || old.aeStack == null ? AEApi.instance()
+						.storage()
+						.getStorageChannel( IItemStorageChannel.class )
+						.createStack( newIS ) : old.aeStack.copy() );
+				if( stack != null )
+				{
+					stack.setStackSize( newSize );
+					this.list.add( stack );
+				}
+
+				if( diff != 0 && stack != null )
+				{
+					final CachedItemStack cis = new CachedItemStack( is.getItemStack() );
+					this.memory.put( is.getSlot(), cis );
+
+					final IAEItemStack a = stack.copy();
+					a.setStackSize( diff );
+					changes.add( a );
+					changed = true;
+				}
 			}
 		}
 
-		cache = currentlyOnStorage;
+		// detect dropped items; should fix non IISided Inventory Changes.
+		final NavigableMap<Integer, CachedItemStack> end = this.memory.tailMap( high, false );
+		if( !end.isEmpty() )
+		{
+			for( final CachedItemStack cis : end.values() )
+			{
+				if( cis != null && cis.aeStack != null )
+				{
+					final IAEItemStack a = cis.aeStack.copy();
+					a.setStackSize( -a.getStackSize() );
+					changes.add( a );
+					changed = true;
+				}
+			}
+			end.clear();
+		}
 
 		if( !changes.isEmpty() )
 		{
 			this.postDifference( changes );
-			changed = true;
 		}
 
 		return changed ? TickRateModulation.URGENT : TickRateModulation.SLOWER;
 	}
 
+	private boolean isDifferent( final ItemStack a, final ItemStack b )
+	{
+		if( a == b && b.isEmpty() )
+		{
+			return false;
+		}
+
+		if( ( a.isEmpty() && !b.isEmpty() ) || ( !a.isEmpty() && b.isEmpty() ) )
+		{
+			return true;
+		}
+
+		return !Platform.itemComparisons().isSameItem( a, b );
+	}
+
 	private void postDifference( final Iterable<IAEItemStack> a )
 	{
+		// AELog.info( a.getItemStack().getUnlocalizedName() + " @ " + a.getStackSize() );
 		if( a != null )
 		{
 			final Iterator<Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object>> i = this.listeners.entrySet().iterator();
@@ -253,9 +306,9 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 	@Override
 	public IItemList<IAEItemStack> getAvailableItems( final IItemList out )
 	{
-		for( IAEItemStack is : cache )
+		for( final CachedItemStack is : this.memory.values() )
 		{
-			out.addStorage( is );
+			out.addStorage( is.aeStack );
 		}
 
 		return out;
@@ -264,7 +317,7 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 	@Override
 	public IItemList<IAEItemStack> getStorageList()
 	{
-		return this.cache;
+		return this.list;
 	}
 
 	private StorageFilter getMode()

src/main/java/appeng/parts/automation/PartExportBus.java

@@ -19,6 +19,9 @@
 package appeng.parts.automation;
 
 
+import appeng.api.networking.crafting.ICraftingPatternDetails;
+import appeng.me.cache.CraftingGridCache;
+import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 
@@ -150,18 +153,14 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 
 					final IAEItemStack ais = this.getConfig().getAEStackInSlot( slotToExport );
 
-					if( ais == null || this.itemToSend <= 0 ) continue;
+					if( ais == null || this.itemToSend <= 0 )
+					{
+						continue;
+					}
 
-					if ( this.craftOnly() ) {
+					if( this.craftOnly() )
-						if (this.failedCraftTriesSlot[x] <= 0) {
+					{
-
+						this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(), this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething;
-							this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
-									this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething;
-
-							if (this.didSomething) this.failedCraftTriesSlot[x] = 0;
-							else this.failedCraftTriesSlot[x] += 2;
-						}
-						this.failedCraftTriesSlot[x] -= 1;
 						continue;
 					}
 
@@ -188,15 +187,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 
 					if( this.itemToSend == before && this.isCraftingEnabled() )
 					{
-						if (this.failedCraftTriesSlot[x] <= 0) {
+						this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(), this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething;
-
-							this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
-									this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething;
-
-							if (this.didSomething) this.failedCraftTriesSlot[x] = 0;
-							else this.failedCraftTriesSlot[x] += 2;
-						}
-						this.failedCraftTriesSlot[x] -= 1;
 					}
 				}
 

src/main/java/appeng/parts/automation/PartLevelEmitter.java

@@ -507,7 +507,6 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	public void upgradesChanged()
 	{
 		this.configureWatchers();
-		this.updateState();
 	}
 
 	@Override

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

@@ -320,13 +320,13 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 			IItemList<IAEItemStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
 
-			for( final ItemSlot is : this )
+			for ( final ItemSlot is : this )
 			{
-				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && !is.isExtractable() )
+				final ItemStack newIS = !is.isExtractable() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? ItemStack.EMPTY : is.getItemStack();
+				if( !newIS.isEmpty() )
 				{
-					continue;
+					currentlyOnStorage.add( is.getAEItemStack() );
 				}
-				currentlyOnStorage.add( is.getAEItemStack() );
 			}
 
 			for ( final IAEItemStack is : currentlyCached )

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

@@ -23,13 +23,8 @@ import java.util.Collections;
 import java.util.List;
 
 import appeng.api.config.AccessRestriction;
-import appeng.fluids.parts.PartFluidInterface;
-import appeng.fluids.tile.TileFluidInterface;
-import appeng.tile.misc.TileInterface;
-import appeng.tile.networking.TileCableBus;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 
@@ -166,27 +161,7 @@ public abstract class PartSharedStorageBus extends PartUpgradeable implements IG
 	{
 		if( pos.offset( this.getSide().getFacing() ).equals( neighbor ) )
 		{
-
+			this.resetCache( false );
-			final TileEntity te = w.getTileEntity( neighbor );
-
-			// In case the TE was destroyed, we have to do a full reset immediately.
-			if( te instanceof TileCableBus )
-			{
-				if( ( (TileCableBus) te ).getPart( this.getSide().getOpposite() ) instanceof PartFluidInterface )
-				{
-					this.resetCache( true );
-					this.resetCache();
-				}
-			}
-			if( te == null || te instanceof TileFluidInterface )
-			{
-				this.resetCache( true );
-				this.resetCache();
-			}
-			else
-			{
-				this.resetCache( false );
-			}
 		}
 	}
 

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

@@ -25,9 +25,6 @@ import java.util.Objects;
 
 import appeng.fluids.parts.FluidHandlerAdapter;
 import appeng.me.storage.MEPassThrough;
-import appeng.parts.AEBasePart;
-import appeng.tile.misc.TileInterface;
-import appeng.tile.networking.TileCableBus;
 import appeng.util.ConfigManager;
 import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
 import net.minecraft.entity.player.EntityPlayer;
@@ -245,7 +242,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		{
 			this.resetCacheLogic = 2;
 		}
-		else if( this.resetCacheLogic < 2 )
+		else
 		{
 			this.resetCacheLogic = 1;
 		}
@@ -309,19 +306,10 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	{
 		if( pos.offset( this.getSide().getFacing() ).equals( neighbor ) )
 		{
-
 			final TileEntity te = w.getTileEntity( neighbor );
 
 			// In case the TE was destroyed, we have to do a full reset immediately.
-			if( te instanceof TileCableBus )
+			if( te == null )
-			{
-				if( ( (TileCableBus) te ).getPart( this.getSide().getOpposite() ) instanceof PartInterface )
-				{
-					this.resetCache( true );
-					this.resetCache();
-				}
-			}
-			if( te == null || te instanceof TileInterface )
 			{
 				this.resetCache( true );
 				this.resetCache();
@@ -510,15 +498,17 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 
 		this.handlerHash = newHandlerHash;
 		this.handler = null;
-		if( this.monitor != null )
-		{
-			( (IBaseMonitor<IAEItemStack>) monitor ).removeListener( this );
-		}
 		this.monitor = null;
 		if( target != null )
 		{
 			IMEInventory<IAEItemStack> inv = this.getInventoryWrapper( target );
 
+			if( inv instanceof MEMonitorIInventory )
+			{
+				final MEMonitorIInventory h = (MEMonitorIInventory) inv;
+				h.setMode( (StorageFilter) this.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
+			}
+
 			if( inv instanceof ITickingMonitor )
 			{
 				this.monitor = (ITickingMonitor) inv;

src/main/java/appeng/parts/p2p/PartP2PTunnel.java

@@ -350,25 +350,9 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 				if( needsNewFrequency )
 				{
 					newFreq = this.getProxy().getP2P().newFrequency();
-
-					final ItemStack newType = this.getHost().getPart( this.getSide() ).getItemStack( PartItemStack.WRENCH );
-
-					this.getHost().removePart( this.getSide(), false );
-					final AEPartLocation dir = this.getHost().addPart( newType, this.getSide(), player, hand );
-					final IPart newBus = this.getHost().getPart( dir );
-
-					if( newBus instanceof PartP2PTunnel )
-					{
-						final PartP2PTunnel newTunnel = (PartP2PTunnel) newBus;
-						newTunnel.setOutput( false );
-						newTunnel.onTunnelNetworkChange();
-						newTunnel.getProxy().getP2P().updateFreq( newTunnel, newFreq );
-					}
-				}
-				else
-				{
-					this.getProxy().getP2P().updateFreq( this, newFreq );
 				}
+
+				this.getProxy().getP2P().updateFreq( this, newFreq );
 			}
 			catch( final GridAccessException e )
 			{
@@ -381,17 +365,10 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 			final String type = p2pItem.getUnlocalizedName();
 
 			p2pItem.writeToNBT( data );
-			if( needsNewFrequency )
+			data.setShort( "freq", this.getFrequency() );
-			{
-				data.setShort( "freq", newFreq );
-			}
-			else
-			{
-				data.setShort( "freq", this.getFrequency() );
-			}
 
 			final AEColor[] colors = Platform.p2p().toColors( this.getFrequency() );
-			final int[] colorCode = new int[]{
+			final int[] colorCode = new int[] {
 					colors[0].ordinal(), colors[0].ordinal(), colors[1].ordinal(), colors[1].ordinal(),
 					colors[2].ordinal(), colors[2].ordinal(), colors[3].ordinal(), colors[3].ordinal(),
 			};

src/main/java/appeng/parts/reporting/AbstractPartMonitor.java

@@ -82,7 +82,6 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 
 	private IAEItemStack configuredItem;
 	private IAEFluidStack configuredFluid;
-	private long configuredAmount;
 	private String lastHumanReadableText;
 	private boolean isLocked;
 	private IStackWatcher myWatcher;
@@ -209,21 +208,14 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 				fluidInTank = fluidHandlerItem.drain( Integer.MAX_VALUE, false );
 			}
 
-			if( fluidInTank == null )
+			if (fluidInTank == null)
 			{
 				this.configuredFluid = null;
-				if( !eq.isEmpty() )
+				this.configuredItem = AEItemStack.fromItemStack( eq );
-				{
-					this.configuredItem = AEItemStack.fromItemStack( eq ).setStackSize( 0 );
-				}
-				else
-				{
-					this.configuredItem = null;
-				}
 			}
 			else if( fluidInTank.amount > 0 )
 			{
-				this.configuredFluid = AEFluidStack.fromFluidStack( fluidInTank ).setStackSize( 0 );
+				this.configuredFluid = AEFluidStack.fromFluidStack( fluidInTank );
 				this.configuredItem = null;
 			}
 
@@ -307,31 +299,30 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 
 	private <T extends IAEStack<T>> void updateReportingValue ( final IMEMonitor<T> monitor )
 	{
+
 		if( this.configuredItem != null)
 		{
 			final IAEItemStack result = (IAEItemStack) monitor.getStorageList().findPrecise( (T) this.configuredItem );
 			if( result == null )
 			{
-				this.configuredAmount = 0;
+				this.configuredItem.setStackSize( 0 );
 			}
 			else
 			{
-				this.configuredAmount = result.getStackSize();
+				this.configuredItem.setStackSize( result.getStackSize() );
 			}
-			this.configuredItem.setStackSize( this.configuredAmount );
 		}
 		else if( this.configuredFluid != null)
 		{
 			final IAEFluidStack result = (IAEFluidStack) monitor.getStorageList().findPrecise( (T) this.configuredFluid );
 			if( result == null )
 			{
-				this.configuredAmount = 0;
+				this.configuredFluid.setStackSize( 0 );
 			}
 			else
 			{
-				this.configuredAmount = result.getStackSize();
+				this.configuredFluid.setStackSize( result.getStackSize() );
 			}
-			this.configuredFluid.setStackSize( this.configuredAmount );
 		}
 	}
 
@@ -399,35 +390,108 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 	@MENetworkEventSubscribe
 	public void powerStatusChange( final MENetworkPowerStatusChange ev )
 	{
-		if( this.getProxy().isPowered() )
+		if( !this.getProxy().isPowered() )
 		{
-			this.configureWatchers();
+			if( this.myWatcher != null )
+			{
+				if( this.configuredItem != null )
+				{
+					this.configuredItem.setStackSize( 0 );
+				}
+				if( this.configuredFluid != null )
+				{
+					this.configuredFluid.setStackSize( 0 );
+				}
+			}
+		}
+		else
+		{
+			try
+			{
+				if( this.configuredItem != null )
+				{
+					this.updateReportingValue( this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) );
+				}
+				if( this.configuredFluid != null )
+				{
+					this.updateReportingValue( this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ) );
+				}
+			}
+			catch( final GridAccessException e )
+			{
+				// ;P
+			}
 		}
 	}
 
 	@MENetworkEventSubscribe
 	public void channelChanged( final MENetworkChannelsChanged c )
 	{
-		if( this.getProxy().isPowered() )
+		if( !this.getProxy().isPowered() )
 		{
-			this.configureWatchers();
+			if( this.myWatcher != null )
+			{
+				if( this.configuredItem != null )
+				{
+					this.configuredItem.setStackSize( 0 );
+				}
+				if( this.configuredFluid != null )
+				{
+					this.configuredFluid.setStackSize( 0 );
+				}
+			}
+		}
+		else
+		{
+			try
+			{
+				if( this.configuredItem != null )
+				{
+					this.updateReportingValue( this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) );
+				}
+				if( this.configuredFluid != null )
+				{
+					this.updateReportingValue( this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ) );
+				}
+			}
+			catch( final GridAccessException e )
+			{
+				// ;P
+			}
 		}
 	}
 
 	@Override
 	public void onStackChange( IItemList<?> o, IAEStack<?> fullStack, IAEStack<?> diffStack, IActionSource src, IStorageChannel<?> chan )
 	{
-		this.configuredAmount = this.configuredAmount + diffStack.getStackSize();
-
 		if( this.configuredItem != null )
 		{
-			this.configuredItem.setStackSize( this.configuredAmount );
+			long diff = this.configuredItem.getStackSize() + diffStack.getStackSize();
+			this.configuredItem.setStackSize( diff >= 0 ? this.configuredItem.getStackSize() + diffStack.getStackSize() : 0 );
+
+			final long stackSize = this.configuredItem.getStackSize();
+			final String humanReadableText = NUMBER_CONVERTER.toWideReadableForm( stackSize );
+
+			if( !humanReadableText.equals( this.lastHumanReadableText ) )
+			{
+				this.lastHumanReadableText = humanReadableText;
+				this.getHost().markForUpdate();
+			}
 		}
 		else if( this.configuredFluid != null )
 		{
-			this.configuredFluid.setStackSize( this.configuredAmount );
+			long diff = this.configuredFluid.getStackSize() + diffStack.getStackSize();
+			this.configuredFluid.setStackSize( diff >= 0 ? this.configuredFluid.getStackSize() + diffStack.getStackSize() : 0 );
+
+			final long stackSize = this.configuredFluid.getStackSize() / 1000;
+			final String humanReadableText = NUMBER_CONVERTER.toWideReadableForm( stackSize ) + "B";
+
+			if( !humanReadableText.equals( this.lastHumanReadableText ) )
+			{
+				this.lastHumanReadableText = humanReadableText;
+				this.getHost().markForUpdate();
+			}
 		}
-		this.getHost().markForUpdate();
 	}
 
 	@Override

src/main/java/appeng/parts/reporting/PartConversionMonitor.java

@@ -137,10 +137,14 @@ public class PartConversionMonitor extends AbstractPartMonitor
 			{
 				this.insertItem( player, hand, false );
 			}
+
 		}
 
 		//If its a fluid container, grab its fluidstack. if its empty pass its itemstack;
 
+		if (eq.isEmpty()){
+			return super.onPartActivate( player, hand, pos );
+		}
 		if( fluidInTank != null && fluidInTank.amount > 0 )
 		{
 			if( getDisplayed() instanceof IAEItemStack || getDisplayed() == null )
@@ -151,16 +155,23 @@ public class PartConversionMonitor extends AbstractPartMonitor
 			{
 				this.drainFluidContainer( player, hand );
 			}
-			else
+			else {
-			{
 				return super.onPartActivate( player, hand, pos );
 			}
 		}
-		else if( this.getDisplayed() != null && this.getDisplayed().equals( player.getHeldItem( hand ) ) )
+		else
 		{
-			this.insertItem( player, hand, false );
+			if( getDisplayed() instanceof IAEFluidStack || getDisplayed() == null )
+			{
+				return super.onPartActivate( player, hand, pos );
+			}
+			if( ( (IAEItemStack) this.getDisplayed() ).equals( eq ) )
+			{
+				this.insertItem( player, hand, false );
+			}
 		}
-		return super.onPartActivate( player, hand, pos );
+
+		return true;
 	}
 
 	@Override
@@ -181,6 +192,7 @@ public class PartConversionMonitor extends AbstractPartMonitor
 			return false;
 		}
 
+		ItemStack eq = player.getHeldItem( hand );
 		if( this.getDisplayed() != null && this.getDisplayed() instanceof IAEItemStack )
 		{
 			this.extractItem( player, ( (IAEItemStack) this.getDisplayed() ).getDefinition().getMaxStackSize() );
@@ -270,7 +282,7 @@ public class PartConversionMonitor extends AbstractPartMonitor
 	{
 		if (!(this.getDisplayed() instanceof IAEItemStack))
 			return;
-		final IAEItemStack input = (IAEItemStack) this.getDisplayed().copy();
+		final IAEItemStack input = (IAEItemStack) this.getDisplayed();
 		if( input != null )
 		{
 			try

src/main/java/appeng/tile/storage/TileChest.java

@@ -494,14 +494,12 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
 			try
 			{
 				this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
-				if( this.getProxy().isActive() )
+				final IStorageGrid gs = this.getProxy().getStorage();
-				{
+				Platform.postChanges( gs, removed, added, this.mySrc );
-					final IStorageGrid gs = this.getProxy().getStorage();
-					Platform.postChanges( gs, removed, added, this.mySrc );
-				}
 			}
 			catch( final GridAccessException ignored )
 			{
+
 			}
 
 			// update the neighbors

src/main/java/appeng/tile/storage/TileDrive.java

@@ -264,11 +264,9 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
 		try
 		{
 			this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
-			if( this.getProxy().isActive() )
+
-			{
+			final IStorageGrid gs = this.getProxy().getStorage();
-				final IStorageGrid gs = this.getProxy().getStorage();
+			Platform.postChanges( gs, removed, added, this.mySrc );
-				Platform.postChanges( gs, removed, added, this.mySrc );
-			}
 		}
 		catch( final GridAccessException ignored )
 		{