2

prevent crafting job to be fired if its a pattern failed previously till
the lack of ingredient that caused the failure is satisfied
2021-08-14 00:09:32 -03:00 · 2021-08-13 22:50:14 -03:00
55 changed files with 1228 additions and 1180 deletions
@@ -3,7 +3,7 @@ aechannel=stable
 aebuild=7
 aegroup=appeng
 aebasename=appliedenergistics2
-trousers=omni-fixes-v49b
+trousers=omni-fixes-v47

 #########################################################
 # Versions                                              #
@@ -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.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.RenderItem;
 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";
@@ -31,10 +31,8 @@ public enum WailaText
 	DeviceMissingChannel,

 	P2PUnlinked,
-	P2P_INPUT_ONE_OUTPUT,
-	P2P_INPUT_MANY_OUTPUTS,
-	P2P_OUTPUT_ONE_INPUT,
-	P2P_OUTPUT_MANY_INPUTS,
+	P2PInputOneOutput,
+	P2PInputManyOutputs,
 	P2POutput,

 	Locked,
@@ -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 );
-		final IStorageGrid sg = grid.getCache( IStorageGrid.class );
-		this.original = new MECraftingInventory( sg
-				.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ), actionSrc, false, false, false );
+		this.cc = grid.getCache( ICraftingGrid.class );
+		this.sg = grid.getCache( IStorageGrid.class );
+		this.original = new MECraftingInventory( sg.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;
@@ -22,10 +22,12 @@ 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.util.text.TextComponentString;
 import net.minecraft.world.World;

 import appeng.api.AEApi;
@@ -118,49 +120,29 @@ 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();
 		final List<IAEItemStack> thingsUsed = new ArrayList<>();

 		this.what.setStackSize( l );
-		IAEItemStack available = inv.extractItems( this.what, Actionable.MODULATE, src );
-
-		if( available != null )
-		{
-			if( !this.exhausted )
-			{
-				final IAEItemStack is = this.job.checkUse( available );
-
-				if( is != null )
-				{
-					thingsUsed.add( is.copy() );
-					this.used.add( is );
-				}
-			}
-
-			this.bytes += available.getStackSize();
-			l -= available.getStackSize();
-
-			if( l == 0 )
-			{
-				return available;
-			}
-		}
-
-		else if( this.getSlot() >= 0 && this.parent != null && this.parent.details.isCraftable() )
+		if( this.getSlot() >= 0 && this.parent != null && this.parent.details.isCraftable() )
 		{
 			final Collection<IAEItemStack> itemList;
 			final IItemList<IAEItemStack> inventoryList = inv.getItemList();

 			if( this.parent.details.canSubstitute() )
 			{
-				final List<IAEItemStack> substitutes = this.parent.details.getSubstituteInputs( this.slot );
-				itemList = new ArrayList<>( substitutes.size() );
+				final List<IAEItemStack> substitutes = this.parent.details.getSubstituteInputs(this.slot);
+				itemList = new ArrayList<>(substitutes.size());

-				for( IAEItemStack stack : substitutes )
-				{
-					itemList.addAll( inventoryList.findFuzzy( stack, FuzzyMode.IGNORE_ALL ) );
+				for (IAEItemStack stack : substitutes) {
+					itemList.addAll(inventoryList.findFuzzy(stack, FuzzyMode.IGNORE_ALL));
 				}
 			}
 			else
@@ -182,7 +164,7 @@ public class CraftingTreeNode
 					fuzz = fuzz.copy();
 					fuzz.setStackSize( l );

-					available = inv.extractItems( fuzz, Actionable.MODULATE, src );
+					final IAEItemStack available = inv.extractItems( fuzz, Actionable.MODULATE, src );

 					if( available != null )
 					{
@@ -208,6 +190,32 @@ public class CraftingTreeNode
 				}
 			}
 		}
+		else
+		{
+			final IAEItemStack available = inv.extractItems( this.what, Actionable.MODULATE, src );
+
+			if( available != null )
+			{
+				if( !this.exhausted )
+				{
+					final IAEItemStack is = this.job.checkUse( available );
+
+					if( is != null )
+					{
+						thingsUsed.add( is.copy() );
+						this.used.add( is );
+					}
+				}
+
+				this.bytes += available.getStackSize();
+				l -= available.getStackSize();
+
+				if( l == 0 )
+				{
+					return available;
+				}
+			}
+		}

 		if( this.canEmit )
 		{
@@ -226,7 +234,7 @@ public class CraftingTreeNode
 		{
 			final CraftingTreeProcess pro = this.nodes.get( 0 );

-			while ( pro.possible && l > 0 )
+			while( pro.possible && l > 0 )
 			{
 				final IAEItemStack madeWhat = pro.getAmountCrafted( this.what );

@@ -234,7 +242,7 @@ public class CraftingTreeNode

 				madeWhat.setStackSize( l );

-				available = inv.extractItems( madeWhat, Actionable.MODULATE, src );
+				final IAEItemStack available = inv.extractItems( madeWhat, Actionable.MODULATE, src );

 				if( available != null )
 				{
@@ -258,13 +266,13 @@ public class CraftingTreeNode
 			{
 				try
 				{
-					while ( pro.possible && l > 0 )
+					while( pro.possible && l > 0 )
 					{
 						final MECraftingInventory subInv = new MECraftingInventory( inv, true, true, true );
 						pro.request( subInv, 1, src );

 						this.what.setStackSize( l );
-						available = subInv.extractItems( this.what, Actionable.MODULATE, src );
+						final IAEItemStack available = subInv.extractItems( this.what, Actionable.MODULATE, src );

 						if( available != null )
 						{
@@ -318,10 +326,11 @@ public class CraftingTreeNode
 		if( this.missing > 0 )
 		{
 			job.addMissing( this.getStack( this.missing ) );
+			addMissingIAEStack();
 		}
 		// missing = 0;

-		job.addBytes( this.bytes );
+		job.addBytes( 8 + this.bytes );

 		for( final CraftingTreeProcess pro : this.nodes )
 		{
@@ -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();
@@ -358,10 +390,6 @@ public class CraftingTreeNode

 			if( ex == null || ex.getStackSize() != i.getStackSize() )
 			{
-				if( src.player().isPresent() )
-				{
-					src.player().get().sendStatusMessage( new TextComponentString( "System reported " + i.getStackSize() + " " + i.getDefinition().getItem().getItemStackDisplayName( i.getDefinition() ) + " available but could not extract anything" ), false );
-				}
 				throw new CraftBranchFailure( i, i.getStackSize() );
 			}

@@ -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 )
@@ -241,6 +245,7 @@ public class CraftingTreeProcess
 			o.setStackSize( o.getStackSize() * i );
 			inv.injectItems( o, Actionable.MODULATE, src );
 		}
+
 		this.crafts += i;
 	}

@@ -252,7 +257,7 @@ public class CraftingTreeProcess
 			pro.dive( job );
 		}

-		job.addBytes( this.crafts * 8 + this.bytes );
+		job.addBytes( 8 + this.crafts + this.bytes );
 	}

 	IAEItemStack getAmountCrafted( IAEItemStack what2 )
@@ -304,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 );
@@ -316,4 +321,12 @@ public class CraftingTreeProcess
 			pro.getPlan( plan );
 		}
 	}
+
+	public void addMissingIAEStack()
+	{
+		if( parent != null )
+		{
+			parent.addMissingIAEStack();
+		}
+	}
 }
@@ -312,13 +312,9 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
 					if( src.player().isPresent() )
 					{
 						if( result == null )
-						{
-							src.player().get().sendStatusMessage( new TextComponentString( "System reported " + extra.getStackSize() + " " + extra.getDefinition().getItem().getItemStackDisplayName( extra.getDefinition() ) + " available but could not extract anything" ), false );
-						}
+							src.player().get().sendStatusMessage( new TextComponentString( "System reported " + extra.getStackSize() + " " + extra.getDefinition().getDisplayName() + " available but could not extract anything" ), false );
 						else
-						{
-							src.player().get().sendStatusMessage( new TextComponentString( "System reported " + extra.getStackSize() + " " + extra.getDefinition().getItem().getItemStackDisplayName( extra.getDefinition() ) + " available but could only extract " + result.getStackSize() ), false );
-						}
+							src.player().get().sendStatusMessage( new TextComponentString( "System reported " + extra.getStackSize() + " " + extra.getDefinition().getDisplayName() + " available but could only extract " + result.getStackSize() ), false );
 					}
 					failed = true;
 					if( !src.player().isPresent() ) break;
@@ -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<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) );
-	private boolean resetConfigCache;
-	private IMEMonitor<IAEFluidStack> configCachedHandler;
+	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 ) );

 	public DualityFluidInterface( final AENetworkProxy networkProxy, final IFluidInterfaceHost ih )
 	{
@@ -144,12 +146,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 		{
 			if( this.hasConfig() )
 			{
-				if( resetConfigCache )
-				{
-					resetConfigCache = false;
-					configCachedHandler = new InterfaceInventory( this );
-				}
-				return (IMEMonitor<T>) configCachedHandler;
+				return (IMEMonitor<T>) new InterfaceInventory( this );
 			}

 			return (IMEMonitor<T>) this.fluids;
@@ -386,7 +383,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 				{
 					changed = true;
 				}
-				else if( this.gridProxy.getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ).getStorageList().findPrecise( work ) != null )
+				else
 				{
 					final IAEFluidStack acquired = Platform.poweredExtraction( src, dest, work, this.interfaceRequestSource );
 					if( acquired != null )
@@ -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
@@ -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 )
@@ -178,9 +178,8 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluid
 		this.stateChanged();
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged changedChannels )
+	public void updateChannels( final MENetworkChannelsChanged changedChannels )
 	{
 		this.stateChanged();
 	}
@@ -90,16 +90,14 @@ public class PartFluidInterface extends PartBasicState implements IGridTickable,
 		return this.duality;
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged c )
+	public void stateChange( final MENetworkChannelsChanged c )
 	{
 		this.duality.notifyNeighbors();
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void powerRender( final MENetworkPowerStatusChange c )
+	public void stateChange( final MENetworkPowerStatusChange c )
 	{
 		this.duality.notifyNeighbors();
 	}
@@ -4,6 +4,7 @@ package appeng.fluids.parts;

 import java.util.Random;

+import appeng.api.networking.events.MENetworkChannelChanged;
 import appeng.api.storage.data.IItemList;
 import appeng.fluids.helper.IConfigurableFluidInventory;
 import appeng.me.cache.NetworkMonitor;
@@ -117,7 +118,7 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 	{
 		if( chan == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) && diffStack.equals( this.config.getFluidInSlot( 0 ) ) )
 		{
-			this.lastReportedValue = fullStack.getStackSize();
+			this.lastReportedValue += diffStack.getStackSize();
 			this.updateState();
 		}
 	}
@@ -128,9 +129,8 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 		this.configureWatchers();
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void powerRender( final MENetworkPowerStatusChange powerEvent )
+	public void powerStatusChange( final MENetworkPowerStatusChange powerEvent )
 	{
 		if (this.getProxy().isActive())
 		{
@@ -139,9 +139,8 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 		this.updateState();
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged c )
+	public void channelChanged( final MENetworkChannelsChanged c )
 	{
 		if (this.getProxy().isActive())
 		{
@@ -25,10 +25,7 @@ import java.util.Objects;

 import javax.annotation.Nonnull;

-import appeng.api.networking.storage.IStorageGrid;
-import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.fluids.helper.IConfigurableFluidInventory;
-import appeng.me.cache.GridStorageCache;
 import appeng.util.ConfigManager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -173,6 +170,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni

 		final MEInventoryHandler<IAEFluidStack> in = this.getInternalHandler();
 		IItemList<IAEFluidStack> before = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
+		boolean denyRead = false;
 		if( in != null )
 		{
 			if( accessChanged )
@@ -181,7 +179,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 				AccessRestriction oldAccess = (AccessRestriction) ( (ConfigManager) this.getConfigManager() ).getOldSetting( Settings.ACCESS );
 				if( oldAccess.hasPermission( AccessRestriction.READ ) && !currentAccess.hasPermission( AccessRestriction.READ ) )
 				{
-					readOncePass = true;
+					denyRead = true;
 				}
 				in.setBaseAccess( oldAccess );
 				before = in.getAvailableItems( before );
@@ -201,14 +199,16 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 		}

 		final MEInventoryHandler<IAEFluidStack> out = this.getInternalHandler();
-		IItemList<IAEFluidStack> after = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();

-		if( in != out )
+		if( in != out || denyRead )
 		{
-			if( out != null )
+			IItemList<IAEFluidStack> after = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
+
+			if( out != null && !denyRead )
 			{
 				after = out.getAvailableItems( after );
 			}
+
 			Platform.postListChanges( before, after, this, this.source );
 		}
 	}
@@ -227,7 +227,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 		{
 			this.resetCacheLogic = 2;
 		}
-		else if( this.resetCacheLogic < 2 )
+		else
 		{
 			this.resetCacheLogic = 1;
 		}
@@ -284,35 +284,25 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 	@Override
 	public void postChange( final IBaseMonitor<IAEFluidStack> monitor, final Iterable<IAEFluidStack> change, final IActionSource source )
 	{
-		if( this.getProxy().isActive() )
+		if( this.source.machine().map( machine -> machine == this ).orElse( false ) && monitor != null )
 		{
 			AccessRestriction currentAccess = (AccessRestriction) ( (ConfigManager) this.getConfigManager() ).getSetting( Settings.ACCESS );
-			if( readOncePass )
-			{
-				readOncePass = false;
-				try
-				{
-					this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ), change, source );
-				}
-				catch( final GridAccessException e )
-				{
-					// :(
-				}
-				return;
-			}
 			if( !currentAccess.hasPermission( AccessRestriction.READ ) )
 			{
 				return;
 			}
-			try
+		}
+		try
+		{
+			if( this.getProxy().isActive() )
 			{
-				this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ), change, source );
-			}
-			catch( final GridAccessException e )
-			{
-				// :(
+				this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ), change, this.source );
 			}
 		}
+		catch( final GridAccessException e )
+		{
+			// :(
+		}
 	}

 	public MEInventoryHandler<IAEFluidStack> getInternalHandler()
@@ -336,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 )
 		{
@@ -347,8 +333,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 			if( inv instanceof ITickingMonitor )
 			{
 				this.monitor = (ITickingMonitor) inv;
-				this.monitor.setActionSource( this.source );
-				this.monitor.setMode( (StorageFilter) this.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
+				this.monitor.setActionSource( new MachineSource( this ) );
 			}

 			if( inv != null )
@@ -385,10 +370,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni

 				if( inv instanceof IBaseMonitor )
 				{
-					if( ( (AccessRestriction) ( (ConfigManager) this.getConfigManager() ).getSetting( Settings.ACCESS ) ).hasPermission( AccessRestriction.READ ) )
-					{
-						( (IBaseMonitor<IAEFluidStack>) inv ).addListener( this, this.handler );
-					}
+					( (IBaseMonitor<IAEFluidStack>) inv ).addListener( this, this.handler );
 				}
 			}
 		}
@@ -417,7 +399,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 		try
 		{
 			// force grid to update handlers...
-			(( GridStorageCache ) this.getProxy().getGrid().getCache( IStorageGrid.class )).cellUpdate( null );
+			this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
 		}
 		catch( final GridAccessException ignore )
 		{
@@ -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() ) )
 		{
@@ -856,27 +849,20 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 					throw new GridAccessException();
 				}

-				IAEItemStack storedStack = this.gridProxy.getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).getStorageList().findPrecise( itemStack );
-				if( storedStack != null )
+				final IAEItemStack acquired = Platform.poweredExtraction( src, this.destination, itemStack, this.interfaceRequestSource );
+				if( acquired != null )
 				{
-					if( storedStack.getStackSize() > 0 )
+					changed = true;
+					final ItemStack issue = adaptor.addItems( acquired.createItemStack() );
+					if( !issue.isEmpty() )
 					{
-						final IAEItemStack acquired = Platform.poweredExtraction( src, this.destination, itemStack, this.interfaceRequestSource );
-						if( acquired != null )
-						{
-							changed = true;
-							final ItemStack issue = adaptor.addItems( acquired.createItemStack() );
-							if( !issue.isEmpty() )
-							{
-								throw new IllegalStateException( "bad attempt at managing inventory. ( addItems )" );
-							}
-						}
-					}
-					else if( storedStack.isCraftable() )
-					{
-						changed = this.handleCrafting( x, adaptor, itemStack ) || changed;
+						throw new IllegalStateException( "bad attempt at managing inventory. ( addItems )" );
 					}
 				}
+				else
+				{
+					changed = this.handleCrafting( x, adaptor, itemStack ) || changed;
+				}
 			}
 			else if( itemStack.getStackSize() < 0 )
 			{
@@ -943,17 +929,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			if( this.getInstalledUpgrades( Upgrades.CRAFTING ) > 0 && itemStack != null )
 			{
-				if (this.failedCraftTriesSlot[x] <= 0)
-				{
-					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;
+				return this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(), this.gridProxy.getGrid(), this.gridProxy.getCrafting(), this.mySource );
 			}
 		}
 		catch( final GridAccessException e )
@@ -987,12 +963,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			if( this.hasConfig() )
 			{
-				if( resetConfigCache )
-				{
-					resetConfigCache = false;
-					configCachedHandler = new InterfaceInventory( this );
-				}
-				return (IMEMonitor<T>) configCachedHandler;
+				return (IMEMonitor<T>) new InterfaceInventory( this );
 			}

 			return (IMEMonitor<T>) this.items;
@@ -1600,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
@@ -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 ) );
 				}
 			}
@@ -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]);
@@ -35,8 +35,6 @@ public enum TheOneProbeText
 	P2P_UNLINKED,
 	P2P_INPUT_ONE_OUTPUT,
 	P2P_INPUT_MANY_OUTPUTS,
-	P2P_OUTPUT_ONE_INPUT,
-	P2P_OUTPUT_MANY_INPUTS,
 	P2P_OUTPUT,
 	P2P_FREQUENCY,

@@ -57,11 +57,11 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider

 			// The default state
 			int state = STATE_UNLINKED;
-			int outputCount = getOutputCount( tunnel );
-			int inputCount = getInputCount( tunnel );
+			int outputCount = 0;

 			if( !tunnel.isOutput() )
 			{
+				outputCount = getOutputCount( tunnel );
 				if( outputCount > 0 )
 				{
 					// Only set it to INPUT if we know there are any outputs
@@ -70,7 +70,8 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider
 			}
 			else
 			{
-				if( inputCount > 0 )
+				final PartP2PTunnel input = tunnel.getInput();
+				if( input != null )
 				{
 					state = STATE_OUTPUT;
 				}
@@ -82,7 +83,7 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider
 					probeInfo.text( TheOneProbeText.P2P_UNLINKED.getLocal() );
 					break;
 				case STATE_OUTPUT:
-					probeInfo.text( getInputText( inputCount ) );
+					probeInfo.text( TheOneProbeText.P2P_OUTPUT.getLocal() );
 					break;
 				case STATE_INPUT:
 					probeInfo.text( getOutputText( outputCount ) );
@@ -109,19 +110,6 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider
 		}
 	}

-	private static int getInputCount( PartP2PTunnel tunnel )
-	{
-		try
-		{
-			return Iterators.size( tunnel.getInputs().iterator() );
-		}
-		catch( GridAccessException e )
-		{
-			// Well... unknown size it is!
-			return 0;
-		}
-	}
-
 	private static String getOutputText( int outputs )
 	{
 		if( outputs <= 1 )
@@ -134,16 +122,4 @@ public class P2PStateInfoProvider implements IPartProbInfoProvider
 		}
 	}

-	private static String getInputText( int inputs )
-	{
-		if( inputs <= 1 )
-		{
-			return TheOneProbeText.P2P_OUTPUT_ONE_INPUT.getLocal();
-		}
-		else
-		{
-			return String.format( TheOneProbeText.P2P_OUTPUT_MANY_INPUTS.getLocal(), inputs );
-		}
-	}
-
 }
@@ -21,7 +21,6 @@ package appeng.integration.modules.waila.part;

 import java.util.List;

-import appeng.integration.modules.theoneprobe.TheOneProbeText;
 import com.google.common.collect.Iterators;

 import net.minecraft.entity.player.EntityPlayerMP;
@@ -118,11 +117,11 @@ public final class P2PStateWailaDataProvider extends BasePartWailaDataProvider

 			// The default state
 			int state = STATE_UNLINKED;
-			int outputCount = getOutputCount( tunnel );
-			int inputCount = getInputCount( tunnel );
+			int outputCount = 0;

 			if( !tunnel.isOutput() )
 			{
+				outputCount = getOutputCount( tunnel );
 				if( outputCount > 0 )
 				{
 					// Only set it to INPUT if we know there are any outputs
@@ -131,7 +130,8 @@ public final class P2PStateWailaDataProvider extends BasePartWailaDataProvider
 			}
 			else
 			{
-				if( inputCount > 0 )
+				PartP2PTunnel input = tunnel.getInput();
+				if( input != null )
 				{
 					state = STATE_OUTPUT;
 				}
@@ -160,40 +160,15 @@ public final class P2PStateWailaDataProvider extends BasePartWailaDataProvider
 		}
 	}

-	private static int getInputCount( PartP2PTunnel tunnel )
-	{
-		try
-		{
-			return Iterators.size( tunnel.getInputs().iterator() );
-		}
-		catch( GridAccessException e )
-		{
-			// Well... unknown size it is!
-			return 0;
-		}
-	}
-
 	private static String getOutputText( int outputs )
 	{
 		if( outputs <= 1 )
 		{
-			return WailaText.P2P_INPUT_ONE_OUTPUT.getLocal();
+			return WailaText.P2PInputOneOutput.getLocal();
 		}
 		else
 		{
-			return String.format( WailaText.P2P_INPUT_MANY_OUTPUTS.getLocal(), outputs );
-		}
-	}
-
-	private static String getInputText( int inputs )
-	{
-		if( inputs <= 1 )
-		{
-			return WailaText.P2P_OUTPUT_ONE_INPUT.getLocal();
-		}
-		else
-		{
-			return String.format( WailaText.P2P_OUTPUT_MANY_INPUTS.getLocal(), inputs );
+			return String.format( WailaText.P2PInputManyOutputs.getLocal(), outputs );
 		}
 	}

@@ -19,7 +19,6 @@
 package appeng.items.contents;


-import appeng.api.networking.security.IActionSource;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

@@ -43,8 +42,6 @@ import appeng.me.helpers.MEMonitorHandler;
 import appeng.util.ConfigManager;
 import appeng.util.Platform;

-import java.util.Collections;
-

 public class PortableCellViewer extends MEMonitorHandler<IAEItemStack> implements IPortableCell, IInventorySlotAware
 {
@@ -86,34 +83,6 @@ public class PortableCellViewer extends MEMonitorHandler<IAEItemStack> implement
 		return usePowerMultiplier.divide( this.ips.extractAEPower( this.target, amt, Actionable.MODULATE ) );
 	}

-	@Override
-	public IAEItemStack injectItems( IAEItemStack input, Actionable mode, IActionSource src )
-	{
-		final long size = input.getStackSize();
-
-		final IAEItemStack injected = super.injectItems( input, mode, src );
-
-		if( mode == Actionable.MODULATE && ( injected == null || injected.getStackSize() != size ) )
-		{
-			this.notifyListenersOfChange( Collections.singletonList( input.copy().setStackSize( input.getStackSize() - ( injected == null ? 0 : injected.getStackSize() ) ) ), null);
-		}
-
-		return injected;
-	}
-
-	@Override
-	public IAEItemStack extractItems( IAEItemStack request, Actionable mode, IActionSource src )
-	{
-		final IAEItemStack extractable = super.extractItems( request, mode, src );
-
-		if( mode == Actionable.MODULATE && extractable != null )
-		{
-			this.notifyListenersOfChange( Collections.singletonList( request.copy().setStackSize( -extractable.getStackSize() ) ), null );
-		}
-
-		return extractable;
-	}
-
 	@Override
 	public <T extends IAEStack<T>> IMEMonitor<T> getInventory( IStorageChannel<T> channel )
 	{
@@ -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;
@@ -403,7 +403,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell<
 					}
 					else if( pos.entityHit.attackEntityFrom( dmgSrc, dmg ) )
 					{
-						hasDestroyed = pos.entityHit.isEntityAlive();
+						hasDestroyed = true;
 					}
 				}
 				else if( pos.typeOfHit == RayTraceResult.Type.BLOCK )
@@ -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 Set<IAEItemStack> oldEmitableItems = new HashSet<>(this.emitableItems);
+		final Object2ObjectMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = new Object2ObjectOpenHashMap<>( this.craftableItems );

 		// 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();
-				changedStack.reset();
-				changedStack.setCraftable( false );
-				craftablesChanged.put( changedStack, ais.getValue() );
+				craftablesChanged.put( ais.getKey().setCraftable( false ), 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();
-				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 );
+				craftablesChanged.put( ais.getKey().setCraftable( true ), ais.getValue() );
 			}
 		}

@@ -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>
 	{

@@ -19,21 +19,10 @@
 package appeng.me.cache;


-import java.util.Collection;
-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 java.util.*;

 import com.google.common.base.Preconditions;
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.Multiset;
-import com.google.common.collect.Sets;
+import com.google.common.collect.*;

 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
@@ -65,9 +54,11 @@ public class EnergyGridCache implements IEnergyGrid
 {

 	private static final double MAX_BUFFER_STORAGE = 800;
-	private static final Comparator<IEnergyGridProvider> COMPARATOR_HIGHEST_AMOUNT_STORED_FIRST = ( o1, o2 ) -> Double.compare( o2.getProviderStoredEnergy(), o1.getProviderStoredEnergy() );
+	private static final Comparator<IEnergyGridProvider> COMPARATOR_HIGHEST_AMOUNT_STORED_FIRST = ( o1, o2 ) -> Double.compare( o2.getProviderStoredEnergy(),
+			o1.getProviderStoredEnergy() );

-	private static final Comparator<IEnergyGridProvider> COMPARATOR_LOWEST_PERCENTAGE_FIRST = ( o1, o2 ) -> {
+	private static final Comparator<IEnergyGridProvider> COMPARATOR_LOWEST_PERCENTAGE_FIRST = ( o1, o2 ) ->
+	{
 		final double percent1 = ( o1.getProviderStoredEnergy() + 1 ) / ( o1.getProviderMaxEnergy() + 1 );
 		final double percent2 = ( o2.getProviderStoredEnergy() + 1 ) / ( o2.getProviderMaxEnergy() + 1 );

@@ -79,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.
@@ -87,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.
@@ -124,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> requesterToRemove = new HashSet<>();
+	private Set<IAEPowerStorage> providersToRemove = 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.providers.add( this.localStorage );
+		this.requesters.put( 0, this.localStorage );
+		this.providers.put( 1, this.localStorage );
 	}

 	@MENetworkEventSubscribe
@@ -161,33 +152,34 @@ public class EnergyGridCache implements IEnergyGrid
 	{
 		if( ev.storage.isAEPublicPowerStorage() )
 		{
-			if( ev.type == PowerEventType.PROVIDE_POWER )
+			switch ( ev.type )
 			{
-				if( ev.storage.getPowerFlow() != AccessRestriction.WRITE )
-				{
-					if( !ongoingExtractOperation )
+				case PROVIDE_POWER:
+					if( ev.storage.getPowerFlow() != AccessRestriction.WRITE )
 					{
-						addProvider( ev.storage );
+						if( !ongoingExtractOperation )
+						{
+							addProvider( ev.storage );
+						}
+						else
+						{
+							this.providersToAdd.add( ev.storage );
+						}
 					}
-					else
+					break;
+				case REQUEST_POWER:
+					if( ev.storage.getPowerFlow() != AccessRestriction.READ )
 					{
-						this.providersToAdd.add( ev.storage );
+						if( !ongoingInjectOperation )
+						{
+							addRequester( ev.storage );
+						}
+						else
+						{
+							this.requestersToAdd.add( ev.storage );
+						}
 					}
-				}
-			}
-			else if( ev.type == PowerEventType.REQUEST_POWER )
-			{
-				if( ev.storage.getPowerFlow() != AccessRestriction.READ )
-				{
-					if( !ongoingInjectOperation )
-					{
-						addRequester( ev.storage );
-					}
-					else
-					{
-						this.requesterToAdd.add( ev.storage );
-					}
-				}
+					break;
 			}
 		}
 		else
@@ -315,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();
 		}
@@ -332,57 +324,50 @@ 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();
-		providers.removeIf( providerToRemove::contains );
-		this.providerToRemove.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 != null )
-				{
-					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;
+				final double req = amt - extractedPower;
+				final double newPower = node.extractAEPower( req, mode, PowerMultiplier.ONE );
+				extractedPower += newPower;

-					if( newPower < req && mode == Actionable.MODULATE )
-					{
-						it.remove();
-					}
-				}
-				else
+				if( newPower < req && mode == Actionable.MODULATE )
 				{
 					it.remove();
 				}
 			}
 		} finally
 		{
-			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 )
+			providersToRemove.forEach( provider -> {
+				if( provider instanceof GridPowerStorage )
 				{
-					providers.remove( localStorage );
+					providers.remove( 1, provider );
 				}
-			}
+				else
+				{
+					providers.remove( 0, provider );
+				}
+			} );
+			this.providersToRemove.clear();
+			ongoingExtractOperation = false;
 		}

 		final double result = Math.min( extractedPower, amt );
@@ -406,12 +391,19 @@ public class EnergyGridCache implements IEnergyGrid
 	{
 		final double originalAmount = amt;

-		this.requesters.addAll( requesterToAdd );
-		requesterToAdd.clear();
-		requesters.removeIf( requesterToRemove::contains );
-		this.requesterToRemove.clear();
+		requestersToAdd.forEach( requester -> {
+			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
@@ -420,22 +412,26 @@ public class EnergyGridCache implements IEnergyGrid
 			{
 				final IAEPowerStorage node = it.next();

-				if( node != null )
-				{
-					amt = node.injectAEPower( amt, mode );
+				amt = node.injectAEPower( amt, mode );

-					if( amt > 0 && mode == Actionable.MODULATE )
-					{
-						it.remove();
-					}
-				}
-				else
+				if( amt > 0 && mode == Actionable.MODULATE )
 				{
 					it.remove();
 				}
 			}
 		} finally
 		{
+			requestersToRemove.forEach( requester -> {
+				if( requester instanceof GridPowerStorage )
+				{
+					requesters.remove( 0, requester );
+				}
+				else
+				{
+					requesters.remove( 1, requester );
+				}
+			} );
+			this.requestersToRemove.clear();
 			ongoingInjectOperation = false;
 		}

@@ -454,8 +450,8 @@ public class EnergyGridCache implements IEnergyGrid
 	{
 		double required = 0;

-		final Iterator<IAEPowerStorage> it = this.requesters.iterator();
-		while ( required < maxRequired && it.hasNext() )
+		final Iterator<IAEPowerStorage> it = this.requesters.values().iterator();
+		while( required < maxRequired && it.hasNext() )
 		{
 			final IAEPowerStorage node = it.next();
 			if( node.getPowerFlow() != AccessRestriction.READ )
@@ -595,7 +591,7 @@ public class EnergyGridCache implements IEnergyGrid
 				}
 				else
 				{
-					this.providerToRemove.add( ps );
+					this.providersToRemove.add( ps );
 				}
 				if( !ongoingInjectOperation )
 				{
@@ -603,7 +599,7 @@ public class EnergyGridCache implements IEnergyGrid
 				}
 				else
 				{
-					this.requesterToRemove.add( ps );
+					this.requestersToRemove.add( ps );
 				}
 			}
 		}
@@ -620,31 +616,58 @@ 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 );
+	private void addRequester(IAEPowerStorage requester) {
+		Preconditions.checkState(!ongoingInjectOperation,
+				"Cannot modify energy requesters while energy is being injected.");
+		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 );
+	private void removeRequester(IAEPowerStorage requester) {
+		Preconditions.checkState(!ongoingInjectOperation,
+				"Cannot modify energy requesters while energy is being injected.");
+		if( requester instanceof GridPowerStorage )
+		{
+			requesters.remove( 0, requester );
+		}
+		else
+		{
+			requesters.remove( 1, requester );
+		}
 	}

-	private void addProvider( IAEPowerStorage provider )
+	private void addProvider(IAEPowerStorage provider) {
+		Preconditions.checkState(!ongoingExtractOperation,
+				"Cannot modify energy providers while energy is being extracted.");
+		if( provider instanceof GridPowerStorage )
+		{
+			providers.put( 1, provider );
+		}
+		else
+		{
+			providers.put( 0, provider );
+		}
+	}
+
+	private void removeProvider(IAEPowerStorage provider)
 	{
 		Preconditions.checkState( !ongoingExtractOperation, "Cannot modify energy providers while energy is being extracted." );
-		this.providers.add( provider );
+		if( provider instanceof GridPowerStorage )
+		{
+			providers.remove( 1, provider );
+		}
+		else
+		{
+			providers.remove( 0, provider );
+		}
 	}

-	private void removeProvider( IAEPowerStorage provider )
-	{
-		Preconditions.checkState( !ongoingExtractOperation, "Cannot modify energy providers while energy is being extracted." );
-		this.providers.remove( provider );
-	}
-
-
 	@Override
 	public void addNode( final IGridNode node, final IGridHost machine )
 	{
@@ -694,7 +717,7 @@ public class EnergyGridCache implements IEnergyGrid
 					}
 					else
 					{
-						this.requesterToAdd.add( ps );
+						this.requestersToAdd.add( ps );
 					}
 				}
 			}
@@ -822,4 +845,4 @@ public class EnergyGridCache implements IEnergyGrid
 			}
 		}
 	}
-}
+}
@@ -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;
@@ -94,7 +101,7 @@ public class GridStorageCache implements IStorageGrid

 			this.removeCellProvider( cc, tracker );
 			this.inactiveCellProviders.remove( cc );
-			cellUpdate( null );
+			this.getGrid().postEvent( new MENetworkCellArrayUpdate() );

 			tracker.applyChanges();
 		}
@@ -119,7 +126,7 @@ public class GridStorageCache implements IStorageGrid
 			final ICellContainer cc = (ICellContainer) machine;
 			this.inactiveCellProviders.add( cc );

-			cellUpdate( null );
+			this.getGrid().postEvent( new MENetworkCellArrayUpdate() );

 			if( node.isActive() )
 			{
@@ -170,7 +177,7 @@ public class GridStorageCache implements IStorageGrid

 	private CellChangeTracker addCellProvider( final ICellProvider cc, final CellChangeTracker tracker )
 	{
-		if( this.inactiveCellProviders.contains( cc ) && !this.activeCellProviders.contains( cc ))
+		if( this.inactiveCellProviders.contains( cc ) )
 		{
 			this.inactiveCellProviders.remove( cc );
 			this.activeCellProviders.add( cc );
@@ -304,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;
@@ -328,10 +347,7 @@ public class GridStorageCache implements IStorageGrid

 		public void applyChanges()
 		{
-			if( !this.list.isEmpty() )
-			{
-				GridStorageCache.this.postChangesToNetwork( this.channel, this.up_or_down, this.list, this.src );
-			}
+			GridStorageCache.this.postChangesToNetwork( this.channel, this.up_or_down, this.list, this.src );
 		}
 	}

@@ -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;
@@ -40,17 +43,16 @@ import com.google.common.collect.Queues;
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;

-import java.util.*;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.Iterator;
 import java.util.Map.Entry;


 public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 {
 	@Nonnull
-	private static final Set<NetworkMonitor<?>> NESTED_MONITORS = new HashSet<>();
-	private static final HashMap<IActionSource, Set<NetworkMonitor<?>>> sourceSetHashMap = new HashMap<>();
-	protected static boolean nested = false;
-	protected boolean isNested = false;
+	private static final Deque<NetworkMonitor<?>> GLOBAL_DEPTH = Queues.newArrayDeque();

 	@Nonnull
 	private final GridStorageCache myGridCache;
@@ -62,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;
@@ -137,16 +138,17 @@ 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
@@ -199,7 +201,6 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 		{
 			final Entry<IMEMonitorHandlerReceiver<T>, Object> o = i.next();
 			final IMEMonitorHandlerReceiver<T> receiver = o.getKey();
-
 			if( receiver.isValid( o.getValue() ) )
 			{
 				receiver.postChange( this, diff, src );
@@ -216,55 +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 );
-				if (i != null)
-				i.setCraftable( false );
+				this.cachedList.findPrecise( changedItem ).setCraftable( false );
 			}
 		}
 	}

 	protected void postChange( final boolean add, final Iterable<T> changes, final IActionSource src )
 	{
-
-		if( sourceSetHashMap.get( src ) != null && sourceSetHashMap.get( src ).contains( this ) )
+		if( GLOBAL_DEPTH.contains( this ) )
 		{
-			NESTED_MONITORS.add( this );
-			nested = true;
 			return;
 		}

-		sourceSetHashMap.putIfAbsent( src, new HashSet<>() );
-		sourceSetHashMap.get( src ).add( this );
+		GLOBAL_DEPTH.push( this );

 		this.sendEvent = true;

-		for( final T change : changes )
+		for( final T changedItem : changes )
 		{
-			//T change = changed;
-			if( !add && change != null )
+			if( !add && changedItem != null )
 			{
-				//change = changed.copy();
-				change.setStackSize( -change.getStackSize() );
+				changedItem.setStackSize( -changedItem.getStackSize() );
 			}

-			incGridCurrentCount( change.getStackSize() );
-			this.cachedList.addStorage( change );
+			incGridCurrentCount( changedItem.getStackSize() );
+			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 );
 					}

@@ -272,102 +265,82 @@ 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 );

-		sourceSetHashMap.get( src ).remove( this );
-		if( sourceSetHashMap.get( src ).isEmpty() )
+		final NetworkMonitor<?> last = GLOBAL_DEPTH.pop();
+
+		if( last != this )
 		{
-			sourceSetHashMap.remove( src );
-		}
-
-		if( sourceSetHashMap.isEmpty() )
-		{
-			for( NetworkMonitor<?> nm : NESTED_MONITORS )
-			{
-				nm.setupForceUpdate();
-			}
-			nested = false;
-			NESTED_MONITORS.clear();
-		}
-	}
-
-	void setupForceUpdate()
-	{
-		if( nested != isNested )
-		{
-			isNested = nested;
-			forceUpdate();
-		}
-	}
-
-	void forceUpdate()
-	{
-		forceUpdate = false;
-		this.cachedList.resetStatus();
-		this.getAvailableItems( this.cachedList );
-
-		long count = 0;
-		for( T stack : this.cachedList )
-		{
-			count += stack.getStackSize();
-
-			if( this.myGridCache.getInterestManager().containsKey( stack ) )
-			{
-				final Collection<ItemWatcher> list = this.myGridCache.getInterestManager().get( stack );
-
-				if( !list.isEmpty() )
-				{
-					IAEStack<T> fullStack = this.getStorageList().findPrecise( stack );
-
-					if( fullStack == null )
-					{
-						fullStack = stack.copy();
-						fullStack.setStackSize( 0 );
-					}
-
-					this.myGridCache.getInterestManager().enableTransactions();
-
-					for ( final ItemWatcher iw : list )
-					{
-						iw.getHost().onStackChange( this.getStorageList(), fullStack, stack, null, this.getChannel() );
-					}
-
-					this.myGridCache.getInterestManager().disableTransactions();
-				}
-			}
-		}
-
-		if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
-		{
-			gridItemCount = count;
-		}
-		else if( myChannel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
-		{
-			gridFluidCount = count;
-		}
-
-		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();
-			}
+			throw new IllegalStateException( "Invalid Access to Networked Storage API detected." );
 		}
 	}

@@ -378,5 +351,6 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 			this.sendEvent = false;
 			this.myGridCache.getGrid().postEvent( new MENetworkStorageEvent( this, this.myChannel ) );
 		}
+
 	}
 }
@@ -19,7 +19,7 @@
 package appeng.me.cache;


-import java.util.Collection;
+import java.util.HashMap;
 import java.util.Random;

 import com.google.common.collect.LinkedHashMultimap;
@@ -46,7 +46,7 @@ public class P2PCache implements IGridCache
 	private static final TunnelCollection<PartP2PTunnel> NULL_COLLECTION = new TunnelCollection<PartP2PTunnel>( null, null );

 	private final IGrid myGrid;
-	private final Multimap<Short, PartP2PTunnel> inputs = LinkedHashMultimap.create();
+	private final HashMap<Short, PartP2PTunnel> inputs = new HashMap<>();
 	private final Multimap<Short, PartP2PTunnel> outputs = LinkedHashMultimap.create();
 	private final Random frequencyGenerator;

@@ -110,19 +110,10 @@ public class P2PCache implements IGridCache
 			}
 			else
 			{
-				this.inputs.remove( t.getFrequency(), t );
+				this.inputs.remove( t.getFrequency() );
 			}

-			if( this.inputs.get( t.getFrequency() ).isEmpty() )
-			{
-				this.inputs.removeAll( t.getFrequency() );
-			}
-			if( this.outputs.get( t.getFrequency() ).isEmpty() )
-			{
-				this.outputs.removeAll( t.getFrequency() );
-			}
-
-			this.updateTunnel( t.getFrequency(), t.isOutput(), false );
+			this.updateTunnel( t.getFrequency(), !t.isOutput(), false );
 		}
 	}

@@ -151,7 +142,7 @@ public class P2PCache implements IGridCache
 				this.inputs.put( t.getFrequency(), t );
 			}

-			this.updateTunnel( t.getFrequency(), t.isOutput(), false );
+			this.updateTunnel( t.getFrequency(), !t.isOutput(), false );
 		}
 	}

@@ -173,20 +164,6 @@ public class P2PCache implements IGridCache

 	}

-	public void removeTunnel( final PartP2PTunnel t, short freq )
-	{
-		this.outputs.remove( freq, t );
-		this.inputs.remove( freq, t );
-		if( this.inputs.get( t.getFrequency() ).isEmpty() )
-		{
-			this.inputs.removeAll( t.getFrequency() );
-		}
-		if( this.outputs.get( t.getFrequency() ).isEmpty() )
-		{
-			this.outputs.removeAll( t.getFrequency() );
-		}
-	}
-
 	private void updateTunnel( final short freq, final boolean updateOutputs, final boolean configChange )
 	{
 		for( final PartP2PTunnel p : this.outputs.get( freq ) )
@@ -198,7 +175,8 @@ public class P2PCache implements IGridCache
 			p.onTunnelNetworkChange();
 		}

-		for( final PartP2PTunnel in : this.inputs.get( freq ) )
+		final PartP2PTunnel in = this.inputs.get( freq );
+		if( in != null )
 		{
 			if( configChange )
 			{
@@ -217,7 +195,7 @@ public class P2PCache implements IGridCache

 		if( this.inputs.containsValue( t ) )
 		{
-			this.inputs.remove( t.getFrequency(), t );
+			this.inputs.remove( t.getFrequency() );
 		}

 		t.setFrequency( newFrequency );
@@ -233,6 +211,7 @@ public class P2PCache implements IGridCache

 		// AELog.info( "update-" + (t.output ? "output: " : "input: ") + t.freq );
 		this.updateTunnel( t.getFrequency(), t.isOutput(), true );
+		this.updateTunnel( t.getFrequency(), !t.isOutput(), true );
 	}

 	public short newFrequency()
@@ -257,43 +236,25 @@ public class P2PCache implements IGridCache

 	public TunnelCollection<PartP2PTunnel> getOutputs( final short freq, final Class<? extends PartP2PTunnel> c )
 	{
-		Collection<PartP2PTunnel> in = this.inputs.get( freq );
+		final PartP2PTunnel in = this.inputs.get( freq );

 		if( in == null )
 		{
 			return NULL_COLLECTION;
 		}

-		TunnelCollection<PartP2PTunnel> out;
-		for( PartP2PTunnel part : this.inputs.get( freq ) )
-		{
-			out = part.getCollection( this.outputs.get( freq ), c );
-			if( out != null )
-			{
-				return out;
-			}
-		}
-		return NULL_COLLECTION;
-	}
-
-	public TunnelCollection<PartP2PTunnel> getInputs( final short freq, final Class<? extends PartP2PTunnel> c )
-	{
-		Collection<PartP2PTunnel> out = this.outputs.get( freq );
+		final TunnelCollection<PartP2PTunnel> out = this.inputs.get( freq ).getCollection( this.outputs.get( freq ), c );

 		if( out == null )
 		{
 			return NULL_COLLECTION;
 		}

-		TunnelCollection<PartP2PTunnel> in;
-		for( PartP2PTunnel part : this.outputs.get( freq ) )
-		{
-			in = part.getCollection( this.inputs.get( freq ), c );
-			if( in != null )
-			{
-				return in;
-			}
-		}
-		return NULL_COLLECTION;
+		return out;
+	}
+
+	public PartP2PTunnel getInput( final short freq )
+	{
+		return this.inputs.get( freq );
 	}
 }
@@ -23,9 +23,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

-import com.google.common.collect.Multimap;
-
+import appeng.api.config.FuzzyMode;
 import appeng.api.storage.data.IAEStack;
+import appeng.util.item.AEItemStack;
+import com.google.common.collect.Multimap;


 public class GenericInterestManager<T>
@@ -101,12 +102,30 @@ public class GenericInterestManager<T>

 	public boolean containsKey( final IAEStack stack )
 	{
+		if( stack.isItem() && ( ( AEItemStack ) stack ).getItem().isDamageable() )
+		{
+			return this.container.keySet().stream().filter( s -> s.isItem() )
+					.anyMatch( s -> s.fuzzyComparison( stack, FuzzyMode.IGNORE_ALL ) );
+		}
 		return this.container.containsKey( stack );
 	}

 	public Collection<T> get( final IAEStack stack )
 	{
-		return this.container.get( stack );
+		Collection<T> watchers = new ArrayList<>();
+		if( stack.isItem() && ( ( AEItemStack ) stack ).getItem().isDamageable() )
+		{
+			this.container.keySet().stream().filter( s -> s.isItem() )
+					.filter( k -> k.fuzzyComparison( stack, FuzzyMode.IGNORE_ALL ) )
+					.forEach( key ->
+							watchers.addAll( this.container.get( key ) )
+					);
+		}
+		else
+		{
+			return this.container.get( stack );
+		}
+		return watchers;
 	}

 	private class SavedTransactions
@@ -123,4 +142,4 @@ public class GenericInterestManager<T>
 			this.iw = watcher;
 		}
 	}
-}
+}
@@ -28,6 +28,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map.Entry;

+import com.google.common.collect.ImmutableList;
+
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.networking.security.IActionSource;
@@ -83,7 +85,11 @@ public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T>
 	@Override
 	public T injectItems( final T input, final Actionable mode, final IActionSource src )
 	{
-		return this.getHandler().injectItems( input, mode, src );
+		if( mode == Actionable.SIMULATE )
+		{
+			return this.getHandler().injectItems( input, mode, src );
+		}
+		return this.monitorDifference( input.copy(), this.getHandler().injectItems( input, mode, src ), false, src );
 	}

 	protected IMEInventoryHandler<T> getHandler()
@@ -91,7 +97,28 @@ public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T>
 		return this.internalHandler;
 	}

-	public void postChangesToListeners( final Iterable<T> changes, final IActionSource src )
+	private T monitorDifference( final T original, final T leftOvers, final boolean extraction, final IActionSource src )
+	{
+		final T diff = original.copy();
+
+		if( extraction )
+		{
+			diff.setStackSize( leftOvers == null ? 0 : -leftOvers.getStackSize() );
+		}
+		else if( leftOvers != null )
+		{
+			diff.decStackSize( leftOvers.getStackSize() );
+		}
+
+		if( diff.getStackSize() != 0 )
+		{
+			this.postChangesToListeners( ImmutableList.of( diff ), src );
+		}
+
+		return leftOvers;
+	}
+
+	protected void postChangesToListeners( final Iterable<T> changes, final IActionSource src )
 	{
 		this.notifyListenersOfChange( changes, src );
 	}
@@ -123,7 +150,11 @@ public class MEMonitorHandler<T extends IAEStack<T>> implements IMEMonitor<T>
 	@Override
 	public T extractItems( final T request, final Actionable mode, final IActionSource src )
 	{
-		return this.getHandler().extractItems( request, mode, src );
+		if( mode == Actionable.SIMULATE )
+		{
+			return this.getHandler().extractItems( request, mode, src );
+		}
+		return this.monitorDifference( request.copy(), this.getHandler().extractItems( request, mode, src ), true, src );
 	}

 	@Override
@@ -19,7 +19,6 @@
 package appeng.me.helpers;


-import java.util.Objects;
 import java.util.Optional;

 import net.minecraft.entity.player.EntityPlayer;
@@ -56,24 +55,4 @@ public class MachineSource implements IActionSource
 		return Optional.empty();
 	}

-	@Override
-	public boolean equals( Object o )
-	{
-		if( this == o )
-		{
-			return true;
-		}
-		if( o == null || getClass() != o.getClass() )
-		{
-			return false;
-		}
-		MachineSource that = (MachineSource) o;
-		return via.equals( that.via );
-	}
-
-	@Override
-	public int hashCode()
-	{
-		return Objects.hash( via );
-	}
 }
@@ -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;
+		}
+	}
+}
@@ -19,20 +19,19 @@
 package appeng.me.storage;


-import appeng.core.features.registries.cell.CreativeCellHandler;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.MachineSource;
 import appeng.tile.storage.TileDrive;
+import com.google.common.collect.ImmutableList;
 import net.minecraft.item.ItemStack;

 import appeng.api.config.Actionable;
+import appeng.api.implementations.tiles.IChestOrDrive;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.storage.ICellHandler;
 import appeng.api.storage.ICellInventoryHandler;
 import appeng.api.storage.data.IAEStack;

-import java.util.Collections;
-

 public class DriveWatcher<T extends IAEStack<T>> extends MEInventoryHandler<T>
 {
@@ -40,16 +39,16 @@ public class DriveWatcher<T extends IAEStack<T>> extends MEInventoryHandler<T>
 	private int oldStatus = 0;
 	private final ItemStack is;
 	private final ICellHandler handler;
-	private final TileDrive drive;
+	private final IChestOrDrive cord;
 	private IActionSource source;

-	public DriveWatcher( final ICellInventoryHandler<T> i, final ItemStack is, final ICellHandler han, final TileDrive drive )
+	public DriveWatcher( final ICellInventoryHandler<T> i, final ItemStack is, final ICellHandler han, final IChestOrDrive cod )
 	{
 		super( i, i.getChannel() );
 		this.is = is;
 		this.handler = han;
-		this.drive = drive;
-		this.source = new MachineSource( drive );
+		this.cord = cod;
+		this.source = new MachineSource( cod );
 	}

 	public int getStatus()
@@ -62,58 +61,55 @@ public class DriveWatcher<T extends IAEStack<T>> extends MEInventoryHandler<T>
 	{
 		final long size = input.getStackSize();

-		final T remainder = super.injectItems( input, type, src );
+		final T a = super.injectItems( input, type, src );

-		if( type == Actionable.MODULATE && ( remainder == null || remainder.getStackSize() != size ) )
+		if( type == Actionable.MODULATE && ( a == null || a.getStackSize() != size ) )
 		{
 			final int newStatus = this.getStatus();

 			if( newStatus != this.oldStatus )
 			{
-				this.drive.blinkCell( this.getSlot() );
+				this.cord.blinkCell( this.getSlot() );
 				this.oldStatus = newStatus;
 			}
-			if (this.drive.getProxy().isActive() && !(handler instanceof CreativeCellHandler))
+			try
 			{
-				try
-				{
-					this.drive.getProxy().getStorage().postAlterationOfStoredItems( this.getChannel(), Collections.singletonList( input.copy().setStackSize( input.getStackSize() - ( remainder == null ? 0 : remainder.getStackSize() ) ) ), this.source );
-				} catch ( GridAccessException e )
-				{
-					e.printStackTrace();
-				}
+				( (TileDrive) this.cord ).getProxy().getStorage().postAlterationOfStoredItems( this.getChannel(), ImmutableList.of( input.copy().setStackSize( input.getStackSize() - ( a == null ? 0 : a.getStackSize() ) ) ), this.source );
+			}
+			catch( GridAccessException e )
+			{
+				e.printStackTrace();
 			}
 		}

-		return remainder;
+		return a;
 	}

 	@Override
 	public T extractItems( final T request, final Actionable type, final IActionSource src )
 	{
-		final T extractable = super.extractItems( request, type, src );
+		final T a = super.extractItems( request, type, src );

-		if( type == Actionable.MODULATE && extractable != null )
+		if( type == Actionable.MODULATE && a != null )
 		{
 			final int newStatus = this.getStatus();

 			if( newStatus != this.oldStatus )
 			{
-				this.drive.blinkCell( this.getSlot() );
+				this.cord.blinkCell( this.getSlot() );
 				this.oldStatus = newStatus;
 			}
-			if (this.drive.getProxy().isActive() && !(handler instanceof CreativeCellHandler ))
+
+			try
 			{
-				try
-				{
-					this.drive.getProxy().getStorage().postAlterationOfStoredItems( this.getChannel(), Collections.singletonList( request.copy().setStackSize( -extractable.getStackSize() ) ), this.source );
-				} catch ( GridAccessException e )
-				{
-					e.printStackTrace();
-				}
+				( (TileDrive) this.cord ).getProxy().getStorage().postAlterationOfStoredItems( this.getChannel(), ImmutableList.of( request.copy().setStackSize( -a.getStackSize() ) ), this.source );
+			}
+			catch( GridAccessException e )
+			{
+				e.printStackTrace();
 			}
 		}

-		return extractable;
+		return a;
 	}
 }
@@ -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 );
-			if( cachedStack != null )
-			{
-				cachedStack.decStackSize( o.getStackSize() );
-				this.postDifference( Collections.singletonList( o.copy().setStackSize( -o.getStackSize() ) ) );
-			}
+			this.onTick();
 		}
+
+		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[] tankProperties = this.handler.getTankProperties();
-
-		IItemList<IAEFluidStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
-
-		for( IFluidTankProperties tankProperty : tankProperties )
+		final IFluidTankProperties[] props = this.handler.getTankProperties();
+		for( int slot = 0; slot < this.handler.getTankProperties().length; ++slot )
 		{
-			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() ) );
-		}
-
-		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 )
+			else
 			{
-				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 );
+			}
+		}
+	}
 }
@@ -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();
-
-		for( final ItemSlot is : adaptor )
+		this.list.resetStatus();
+		int high = 0;
+		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() );
-		}
-
-		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 )
+			else
 			{
-				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()
@@ -288,4 +341,24 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 		this.mySource = mySource;
 	}

+	private static class CachedItemStack
+	{
+
+		private final ItemStack itemStack;
+		private final IAEItemStack aeStack;
+
+		public CachedItemStack( final ItemStack is )
+		{
+			if( is.isEmpty() )
+			{
+				this.itemStack = ItemStack.EMPTY;
+				this.aeStack = null;
+			}
+			else
+			{
+				this.itemStack = is.copy();
+				this.aeStack = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( is );
+			}
+		}
+	}
 }
@@ -171,5 +171,4 @@ public class MEMonitorPassThrough<T extends IAEStack<T>> extends MEPassThrough<T
 	{
 		this.changeSource = changeSource;
 	}
-
 }
@@ -19,8 +19,6 @@
 package appeng.me.storage;


-import appeng.me.helpers.MEMonitorHandler;
-import appeng.me.helpers.MachineSource;
 import com.mojang.authlib.GameProfile;

 import appeng.api.AEApi;
@@ -37,20 +35,16 @@ import appeng.api.storage.data.IItemList;
 import appeng.me.GridAccessException;
 import appeng.tile.misc.TileSecurityStation;

-import java.util.Collections;
-

 public class SecurityStationInventory implements IMEInventoryHandler<IAEItemStack>
 {

 	private final IItemList<IAEItemStack> storedItems = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
 	private final TileSecurityStation securityTile;
-	private final MachineSource src;

 	public SecurityStationInventory( final TileSecurityStation ts )
 	{
 		this.securityTile = ts;
-		this.src = new MachineSource( securityTile );
 	}

 	@Override
@@ -67,11 +61,6 @@ public class SecurityStationInventory implements IMEInventoryHandler<IAEItemStac
 						return null;
 					}

-					if( securityTile.getProxy().isActive() )
-					{
-						( ( MEMonitorHandler<IAEItemStack> ) securityTile.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) ).postChangesToListeners( Collections.singletonList( input.copy() ), this.src );
-					}
-
 					this.getStoredItems().add( input );
 					this.securityTile.inventoryChanged();
 					return null;
@@ -112,11 +101,6 @@ public class SecurityStationInventory implements IMEInventoryHandler<IAEItemStac
 					return output;
 				}

-				if( securityTile.getProxy().isActive() )
-				{
-					( ( MEMonitorHandler<IAEItemStack> ) securityTile.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) ).postChangesToListeners( Collections.singletonList( target.copy().setStackSize( -target.getStackSize() ) ), this.src );
-				}
-
 				target.setStackSize( 0 );
 				this.securityTile.inventoryChanged();
 				return output;
@@ -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.failedCraftTriesSlot[x] <= 0) {
-
-							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;
+					if( this.craftOnly() )
+					{
+						this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(), this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething;
 						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;
-
-							if (this.didSomething) this.failedCraftTriesSlot[x] = 0;
-							else this.failedCraftTriesSlot[x] += 2;
-						}
-						this.failedCraftTriesSlot[x] -= 1;
+						this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(), this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething;
 					}
 				}

@@ -187,9 +187,8 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
 		this.stateChanged();
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged changedChannels )
+	public void updateChannels( final MENetworkChannelsChanged changedChannels )
 	{
 		this.stateChanged();
 	}
@@ -184,9 +184,8 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 		return flipState ? this.reportingValue >= this.lastReportedValue + 1 : this.reportingValue < this.lastReportedValue + 1;
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void powerRender( final MENetworkPowerStatusChange powerEvent )
+	public void powerStatusChange( final MENetworkPowerStatusChange powerEvent )
 	{
 		if (this.getProxy().isActive())
 		{
@@ -195,9 +194,8 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 		this.updateState();
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged c )
+	public void channelChanged( final MENetworkChannelsChanged c )
 	{
 		if (this.getProxy().isActive())
 		{
@@ -290,24 +288,37 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH

 		try
 		{
-			if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 || myStack == null )
+
+			if( myStack == null )
 			{
-				this.getProxy()
-						.getStorage()
-						.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
-						.addListener( this,
-								this.getProxy().getGrid() );
+				this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).addListener( this, this.getProxy().getGrid() );
 			}
 			else
 			{
 				this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).removeListener( this );
-
 				if( this.myWatcher != null )
 				{
-					this.myWatcher.add( myStack );
+					if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
+					{
+						Optional<OreReference> ores = OreHelper.INSTANCE.getOre( myStack.getDefinition() );
+						if( ores.isPresent() )
+						{
+							for( IAEItemStack iaeItemStack : ores.get().getAEEquivalents() )
+							{
+								this.myWatcher.add( iaeItemStack );
+							}
+						}
+						else
+						{
+							this.myWatcher.add( myStack );
+						}
+					}
+					else
+					{
+						this.myWatcher.add( myStack );
+					}
 				}
 			}
-
 			this.updateReportingValue( this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) );
 		}
 		catch( final GridAccessException e )
@@ -496,7 +507,6 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	public void upgradesChanged()
 	{
 		this.configureWatchers();
-		this.updateState();
 	}

 	@Override
@@ -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 )
@@ -95,16 +95,14 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
 		super( is );
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged c )
+	public void stateChange( final MENetworkChannelsChanged c )
 	{
 		this.duality.notifyNeighbors();
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void powerRender( final MENetworkPowerStatusChange c )
+	public void stateChange( final MENetworkPowerStatusChange c )
 	{
 		this.duality.notifyNeighbors();
 	}
@@ -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;

@@ -62,7 +57,6 @@ public abstract class PartSharedStorageBus extends PartUpgradeable implements IG
 	private boolean wasActive = false;
 	private int priority = 0;
 	protected boolean accessChanged;
-	protected boolean readOncePass;

 	public PartSharedStorageBus( ItemStack is )
 	{
@@ -87,9 +81,8 @@ public abstract class PartSharedStorageBus extends PartUpgradeable implements IG
 		}
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged changedChannels )
+	public void updateChannels( final MENetworkChannelsChanged changedChannels )
 	{
 		this.updateStatus();
 	}
@@ -155,7 +148,7 @@ public abstract class PartSharedStorageBus extends PartUpgradeable implements IG
 	@Override
 	public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
 	{
-		if( settingName.name().equals( "ACCESS" ) )
+		if( settingName instanceof AccessRestriction )
 		{
 			this.accessChanged = true;
 		}
@@ -168,27 +161,7 @@ public abstract class PartSharedStorageBus extends PartUpgradeable implements IG
 	{
 		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( ( (TileCableBus) te ).getPart( this.getSide().getOpposite() ) instanceof PartFluidInterface )
-				{
-					this.resetCache( true );
-					this.resetCache();
-				}
-			}
-			else if( te == null || te instanceof TileFluidInterface )
-			{
-				this.resetCache( true );
-				this.resetCache();
-			}
-			else
-			{
-				this.resetCache( false );
-			}
+			this.resetCache( false );
 		}
 	}

@@ -197,7 +170,6 @@ public abstract class PartSharedStorageBus extends PartUpgradeable implements IG
 	{
 		super.readFromNBT( data );
 		this.priority = data.getInteger( "priority" );
-		this.accessChanged = false;
 	}

 	@Override
@@ -23,10 +23,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Objects;

-import appeng.api.networking.storage.IStorageGrid;
-import appeng.me.cache.GridStorageCache;
-import appeng.tile.misc.TileInterface;
-import appeng.tile.networking.TileCableBus;
+import appeng.fluids.parts.FluidHandlerAdapter;
+import appeng.me.storage.MEPassThrough;
 import appeng.util.ConfigManager;
 import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
 import net.minecraft.entity.player.EntityPlayer;
@@ -91,6 +89,7 @@ import appeng.me.GridAccessException;
 import appeng.me.helpers.MachineSource;
 import appeng.me.storage.ITickingMonitor;
 import appeng.me.storage.MEInventoryHandler;
+import appeng.me.storage.MEMonitorIInventory;
 import appeng.parts.PartModel;
 import appeng.parts.automation.PartUpgradeable;
 import appeng.tile.inventory.AppEngInternalAEInventory;
@@ -126,7 +125,6 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	private boolean wasActive = false;
 	private byte resetCacheLogic = 0;
 	private boolean accessChanged;
-	private boolean readOncePass;

 	@Reflected
 	public PartStorageBus( final ItemStack is )
@@ -163,9 +161,8 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		}
 	}

-	@Override
 	@MENetworkEventSubscribe
-	public void chanRender( final MENetworkChannelsChanged changedChannels )
+	public void updateChannels( final MENetworkChannelsChanged changedChannels )
 	{
 		this.updateStatus();
 	}
@@ -179,7 +176,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	@Override
 	public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
 	{
-		if( settingName.name().equals( "ACCESS" ) )
+		if( settingName instanceof AccessRestriction )
 		{
 			this.accessChanged = true;
 		}
@@ -211,7 +208,6 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		super.readFromNBT( data );
 		this.Config.readFromNBT( data, "config" );
 		this.priority = data.getInteger( "priority" );
-		this.accessChanged = false;
 	}

 	@Override
@@ -246,7 +242,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		{
 			this.resetCacheLogic = 2;
 		}
-		else if( this.resetCacheLogic < 2 )
+		else
 		{
 			this.resetCacheLogic = 1;
 		}
@@ -270,35 +266,25 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	@Override
 	public void postChange( final IBaseMonitor<IAEItemStack> monitor, final Iterable<IAEItemStack> change, final IActionSource source )
 	{
-		if( this.getProxy().isActive() )
+		if( this.mySrc.machine().map( machine -> machine == this ).orElse( false ) && monitor != null )
 		{
 			AccessRestriction currentAccess = (AccessRestriction) ( (ConfigManager) this.getConfigManager() ).getSetting( Settings.ACCESS );
-			if( readOncePass )
-			{
-				readOncePass = false;
-				try
-				{
-					this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change, source );
-				}
-				catch( final GridAccessException e )
-				{
-					// :(
-				}
-				return;
-			}
 			if( !currentAccess.hasPermission( AccessRestriction.READ ) )
 			{
 				return;
 			}
-			try
+		}
+		try
+		{
+			if( this.getProxy().isActive() )
 			{
-				this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change, source );
-			}
-			catch( final GridAccessException e )
-			{
-				// :(
+				this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change, this.mySrc );
 			}
 		}
+		catch( final GridAccessException e )
+		{
+			// :(
+		}
 	}

 	@Override
@@ -320,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( ( (TileCableBus) te ).getPart( this.getSide().getOpposite() ) instanceof PartInterface )
-				{
-					this.resetCache( true );
-					this.resetCache();
-				}
-			}
-			else if( te == null || te instanceof TileInterface )
+			if( te == null )
 			{
 				this.resetCache( true );
 				this.resetCache();
@@ -388,8 +365,8 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		this.resetCacheLogic = 0;

 		final MEInventoryHandler<IAEItemStack> in = this.getInternalHandler();
-
 		IItemList<IAEItemStack> before = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+		boolean denyRead = false;
 		if( in != null )
 		{
 			if( accessChanged )
@@ -398,7 +375,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 				AccessRestriction oldAccess = (AccessRestriction) ( (ConfigManager) this.getConfigManager() ).getOldSetting( Settings.ACCESS );
 				if( oldAccess.hasPermission( AccessRestriction.READ ) && !currentAccess.hasPermission( AccessRestriction.READ ) )
 				{
-					readOncePass = true;
+					denyRead = true;
 				}
 				in.setBaseAccess( oldAccess );
 				before = in.getAvailableItems( before );
@@ -419,15 +396,17 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC

 		final MEInventoryHandler<IAEItemStack> out = this.getInternalHandler();

-		IItemList<IAEItemStack> after = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
-
-		if( in != out )
+		if( in != out || denyRead )
 		{
-			if( out != null )
+			IItemList<IAEItemStack> after = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+
+			if( out != null && !denyRead )
 			{
 				after = out.getAvailableItems( after );
 			}
+
 			Platform.postListChanges( before, after, this, this.mySrc );
+
 		}
 	}

@@ -519,19 +498,21 @@ 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;
-				this.monitor.setActionSource( mySrc );
+				this.monitor.setActionSource( new MachineSource( this ) );
 				this.monitor.setMode( (StorageFilter) this.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
 			}

@@ -570,10 +551,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC

 				if( inv instanceof IBaseMonitor )
 				{
-					if( ( (AccessRestriction) ( (ConfigManager) this.getConfigManager() ).getSetting( Settings.ACCESS ) ).hasPermission( AccessRestriction.READ ) )
-					{
-						( (IBaseMonitor<IAEItemStack>) inv ).addListener( this, this.handler );
-					}
+					( (IBaseMonitor<IAEItemStack>) inv ).addListener( this, this.handler );
 				}
 			}
 		}
@@ -602,7 +580,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		try
 		{
 			// force grid to update handlers...
-			(( GridStorageCache ) this.getProxy().getGrid().getCache( IStorageGrid.class )).cellUpdate( null );
+			this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
 		}
 		catch( final GridAccessException e )
 		{
@@ -83,19 +83,10 @@ public class PartP2PFluids extends PartP2PTunnel<PartP2PFluids> implements IFlui

 		if( this.isOutput() )
 		{
-			try
+			final PartP2PFluids in = this.getInput();
+			if( in != null )
 			{
-				for( PartP2PFluids in : this.getInputs() )
-				{
-					if( in != null )
-					{
-						in.onTunnelNetworkChange();
-					}
-				}
-			}
-			catch( GridAccessException e )
-			{
-				e.printStackTrace();
+				in.onTunnelNetworkChange();
 			}
 		}
 	}
@@ -133,21 +124,13 @@ public class PartP2PFluids extends PartP2PTunnel<PartP2PFluids> implements IFlui
 	{
 		if( !this.isOutput() )
 		{
-			try
+			final PartP2PFluids tun = this.getInput();
+			if( tun != null )
 			{
-				for( PartP2PFluids tun : this.getInputs() )
-				{
-					if( tun != null )
-					{
-						return ACTIVE_TANK;
-					}
-				}
-			}
-			catch( GridAccessException e )
-			{
-				e.printStackTrace();
+				return ACTIVE_TANK;
 			}
 		}
+
 		return INACTIVE_TANK;
 	}

@@ -74,19 +74,10 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IItemHa
 	public void onNeighborChanged( IBlockAccess w, BlockPos pos, BlockPos neighbor )
 	{
 		this.cachedInv = null;
-		try
+		final PartP2PItems input = this.getInput();
+		if( input != null && this.isOutput() )
 		{
-			for( PartP2PItems input : this.getInputs() )
-			{
-				if( input != null && this.isOutput() )
-				{
-					input.onTunnelNetworkChange();
-				}
-			}
-		}
-		catch( GridAccessException e )
-		{
-			e.printStackTrace();
+			input.onTunnelNetworkChange();
 		}
 	}

@@ -231,19 +222,10 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IItemHa
 		}
 		else
 		{
-			try
+			final PartP2PItems input = this.getInput();
+			if( input != null )
 			{
-				for( PartP2PItems input : this.getInputs() )
-				{
-					if( input != null )
-					{
-						input.getHost().notifyNeighbors();
-					}
-				}
-			}
-			catch( GridAccessException e )
-			{
-				e.printStackTrace();
+				input.getHost().notifyNeighbors();
 			}
 		}
 	}
@@ -196,23 +196,14 @@ public class PartP2PLight extends PartP2PTunnel<PartP2PLight> implements IGridTi
 	{
 		if( this.isOutput() )
 		{
-			try
+			final PartP2PLight src = this.getInput();
+			if( src != null && src.getProxy().isActive() )
 			{
-				for( PartP2PLight src : this.getInputs() )
-				{
-					if( src != null && src.getProxy().isActive() )
-					{
-						this.setLightLevel( src.lastValue );
-					}
-					else
-					{
-						this.getHost().markForUpdate();
-					}
-				}
+				this.setLightLevel( src.lastValue );
 			}
-			catch( GridAccessException e )
+			else
 			{
-				e.printStackTrace();
+				this.getHost().markForUpdate();
 			}
 		}
 		else
@@ -70,19 +70,10 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone>
 	{
 		if( this.isOutput() )
 		{
-			try
+			final PartP2PRedstone in = this.getInput();
+			if( in != null )
 			{
-				for( PartP2PRedstone in : this.getInputs() )
-				{
-					if( in != null )
-					{
-						this.putInput( in.power );
-					}
-				}
-			}
-			catch( GridAccessException e )
-			{
-				e.printStackTrace();
+				this.putInput( in.power );
 			}
 		}
 	}
@@ -53,7 +53,6 @@ import appeng.me.cache.P2PCache;
 import appeng.me.cache.helpers.TunnelCollection;
 import appeng.parts.PartBasicState;
 import appeng.util.Platform;
-import org.lwjgl.input.Keyboard;


 public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
@@ -78,13 +77,26 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 		return null;
 	}

-	public TunnelCollection<T> getInputs() throws GridAccessException
+	public T getInput()
 	{
-		if( this.getProxy().isActive() && this.getFrequency() != 0 )
+		if( this.getFrequency() == 0 )
 		{
-			return (TunnelCollection<T>) this.getProxy().getP2P().getInputs( this.getFrequency(), this.getClass() );
+			return null;
 		}
-		return new TunnelCollection( new ArrayList(), this.getClass() );
+
+		try
+		{
+			final PartP2PTunnel tunnel = this.getProxy().getP2P().getInput( this.getFrequency() );
+			if( this.getClass().isInstance( tunnel ) )
+			{
+				return (T) tunnel;
+			}
+		}
+		catch( final GridAccessException e )
+		{
+			// :P
+		}
+		return null;
 	}

 	public TunnelCollection<T> getOutputs() throws GridAccessException
@@ -199,28 +211,14 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 					final IPart testPart = ( (IPartItem) newType.getItem() ).createPartFromItemStack( newType );
 					if( testPart instanceof PartP2PTunnel )
 					{
-
-						try
-						{
-							this.getProxy().getP2P().removeTunnel( this, this.getFrequency() );
-						}
-						catch( GridAccessException e )
-						{
-							e.printStackTrace();
-						}
-
 						this.getHost().removePart( this.getSide(), true );
-
 						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;
-							if( !Keyboard.isKeyDown( Keyboard.KEY_LCONTROL ) && !Keyboard.isKeyDown( Keyboard.KEY_RCONTROL ) )
-							{
-								newTunnel.setOutput( true );
-							}
+							newTunnel.setOutput( true );

 							try
 							{
@@ -297,17 +295,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 				final boolean oldOutput = this.isOutput();
 				final short myFreq = this.getFrequency();

-				try
-				{
-					this.getProxy().getP2P().removeTunnel( this, this.getFrequency() );
-				}
-				catch( GridAccessException e )
-				{
-					e.printStackTrace();
-				}
-
 				this.getHost().removePart( this.getSide(), false );
-
 				final AEPartLocation dir = this.getHost().addPart( newType, this.getSide(), player, hand );
 				final IPart newBus = this.getHost().getPart( dir );

@@ -315,6 +303,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 				{
 					final PartP2PTunnel newTunnel = (PartP2PTunnel) newBus;
 					newTunnel.setOutput( oldOutput );
+					newTunnel.onTunnelNetworkChange();

 					try
 					{
@@ -325,10 +314,9 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 					{
 						// :P
 					}
-					newTunnel.onTunnelNetworkChange();
-
 				}

+				Platform.notifyBlocksOfNeighbors( this.getTile().getWorld(), this.getTile().getPos() );
 				return true;
 			}
 		}
@@ -362,38 +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 );
-
-					try
-					{
-						this.getProxy().getP2P().removeTunnel( this, this.getFrequency() );
-					}
-					catch( GridAccessException e )
-					{
-						e.printStackTrace();
-					}
-
-					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.getProxy().getP2P().updateFreq( newTunnel, newFreq );
-
-						newTunnel.onTunnelNetworkChange();
-					}
 				}
-				else
-				{
-					this.getProxy().getP2P().updateFreq( this, newFreq );
-					this.onTunnelNetworkChange();
-				}
-				Platform.notifyBlocksOfNeighbors( this.getTile().getWorld(), this.getTile().getPos() );
+
+				this.getProxy().getP2P().updateFreq( this, newFreq );
 			}
 			catch( final GridAccessException e )
 			{
@@ -406,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", newFreq );
-			}
-			else
-			{
-				data.setShort( "freq", this.getFrequency() );
-			}
+			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(),
 			};
@@ -443,6 +395,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt

 	public void onTunnelNetworkChange()
 	{
+
 	}

 	protected void queueTunnelDrain( final PowerUnits unit, final double f )
@@ -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 ).setStackSize( 0 );
-				}
-				else
-				{
-					this.configuredItem = null;
-				}
+				this.configuredItem = AEItemStack.fromItemStack( eq );
 			}
 			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 = fullStack.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
@@ -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
@@ -123,7 +123,7 @@ public class AppEngInternalInventory extends ItemStackHandler implements Iterabl
 			ItemStack oldStack = this.previousStack;
 			InvOperation op = InvOperation.SET;

-			if( newStack.isEmpty() || oldStack.isEmpty() || ( oldStack.getCount() < oldStack.getMaxStackSize() && oldStack.getCount() < this.getSlotLimit( slot ) && ItemStack.areItemsEqual( newStack, oldStack ) ) )
+			if( newStack.isEmpty() || oldStack.isEmpty() || ItemStack.areItemsEqual( newStack, oldStack ) )
 			{
 				if( newStack.getCount() > oldStack.getCount() )
 				{
@@ -155,7 +155,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
 			return 0;
 		}

-		if( this.internalCurrentPower < 0.01 && amt > 0 )
+		if( this.internalCurrentPower < 0.01 && amt > 0.01 )
 		{
 			this.getProxy().getNode().getGrid().postEvent( new MENetworkPowerStorage( this, PowerEventType.PROVIDE_POWER ) );
 		}
@@ -217,7 +217,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage

 		final boolean wasFull = this.internalCurrentPower >= this.getInternalMaxPower() - 0.001;

-		if( wasFull && amt > 0 )
+		if( wasFull && amt > 0.001 )
 		{
 			try
 			{
@@ -26,8 +26,6 @@ import java.util.List;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

-import appeng.me.storage.BasicCellInventoryHandler;
-import appeng.me.storage.CreativeCellInventory;
 import io.netty.buffer.ByteBuf;

 import net.minecraft.entity.player.EntityPlayer;
@@ -496,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
@@ -737,15 +733,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
 			{
 				return input;
 			}
-			T injected = super.injectItems( input, mode, src );
-			if (mode == Actionable.MODULATE && ( injected == null || injected.getStackSize() != input.getStackSize() ))
-			{
-				if( TileChest.this.getProxy().isActive() && this.getInternalHandler().getCellInv() != null )
-				{
-					TileChest.this.cellHandler.postChangesToListeners(Collections.singletonList( input.copy().setStackSize( input.getStackSize() - ( injected == null ? 0 : injected.getStackSize() ) ) ), TileChest.this.mySrc  );
-				}
-			}
-			return injected;
+			return super.injectItems( input, mode, src );
 		}

 		private boolean securityCheck( final EntityPlayer player, final SecurityPermissions requiredPermission )
@@ -789,15 +777,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
 			{
 				return null;
 			}
-			T extracted = super.extractItems( request, mode, src );
-			if( mode == Actionable.MODULATE && extracted != null )
-			{
-				if( TileChest.this.getProxy().isActive() && this.getInternalHandler().getCellInv() != null )
-				{
-					TileChest.this.cellHandler.postChangesToListeners(Collections.singletonList( request.copy().setStackSize( -extracted.getStackSize() ) ), TileChest.this.mySrc  );
-				}
-			}
-			return extracted;
+			return super.extractItems( request, mode, src );
 		}
 	}

@@ -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();
-				Platform.postChanges( gs, removed, added, this.mySrc );
-			}
+
+			final IStorageGrid gs = this.getProxy().getStorage();
+			Platform.postChanges( gs, removed, added, this.mySrc );
 		}
 		catch( final GridAccessException ignored )
 		{
@@ -405,10 +405,8 @@ waila.appliedenergistics2.Showing=Showing
 waila.appliedenergistics2.Contains=Contains
 waila.appliedenergistics2.Channels=%1$d of %2$d Channels
 waila.appliedenergistics2.P2PUnlinked=Unlinked
-waila.appliedenergistics2.p2p_input_one_output=Linked (Input Side) - 1 Output
-waila.appliedenergistics2.p2p_input_many_outputs=Linked (Input Side) - %d Outputs
-waila.appliedenergistics2.p2p_output_one_input=Linked (Output Side) - 1 Input
-waila.appliedenergistics2.p2p_output_many_inputs=Linked (Output Side) - %d Inputs
+waila.appliedenergistics2.P2PInputOneOutput=Linked (Input Side)
+waila.appliedenergistics2.P2PInputManyOutputs=Linked (Input Side) - %d Outputs
 waila.appliedenergistics2.P2POutput=Linked (Output Side)

 // TheOneProbe
@@ -422,10 +420,8 @@ theoneprobe.appliedenergistics2.showing=Showing
 theoneprobe.appliedenergistics2.contains=Contains
 theoneprobe.appliedenergistics2.channels=%1$d of %2$d Channels
 theoneprobe.appliedenergistics2.p2p_unlinked=Unlinked
-theoneprobe.appliedenergistics2.p2p_input_one_output=Linked (Input Side) - 1 Output
+theoneprobe.appliedenergistics2.p2p_input_one_output=Linked (Input Side)
 theoneprobe.appliedenergistics2.p2p_input_many_outputs=Linked (Input Side) - %d Outputs
-theoneprobe.appliedenergistics2.p2p_output_one_input=Linked (Output Side) - 1 Input
-theoneprobe.appliedenergistics2.p2p_output_many_inputs=Linked (Output Side) - %d Inputs
 theoneprobe.appliedenergistics2.p2p_output=Linked (Output Side)
 theoneprobe.appliedenergistics2.p2p_frequency=Frequency: %1$s
 theoneprobe.appliedenergistics2.stored_energy=%1$d / %2$d
Author	SHA1	Message	Date
PrototypeTrousers	e09f74cb5f	2	2021-08-14 00:09:32 -03:00
PrototypeTrousers	facc1b4ef4	prevent crafting job to be fired if its a pattern failed previously till the lack of ingredient that caused the failure is satisfied	2021-08-13 22:50:14 -03:00