item cost review

fix job byte size to 8 per crafting + 1 per item used/stored

gradle.properties

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

src/api/java/appeng/api/networking/storage/IStackWatcherHost.java

@@ -44,8 +44,11 @@ public interface IStackWatcherHost
 	/**
 	 * Called when a watched item changes amounts.
 	 *
+	 * @param o changed item list
+	 * @param fullStack old stack
 	 * @param diffStack new stack
+	 * @param src action source
 	 * @param chan storage channel
 	 */
-	void onStackChange( IAEStack<?> diffStack, IStorageChannel<?> chan );
+	void onStackChange( IItemList<?> o, IAEStack<?> fullStack, IAEStack<?> diffStack, IActionSource src, IStorageChannel<?> chan );
 }

src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java

@@ -52,9 +52,4 @@ public interface IMEMonitorHandlerReceiver<T extends IAEStack<T>>
 	 * called when the list updates its contents, this is mostly for handling power events.
 	 */
 	void onListUpdate();
-
-	default boolean hasListeners()
-	{
-		return true;
-	}
 }

src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java

@@ -237,7 +237,11 @@ public class GuiInterfaceTerminal extends AEBaseGui
 			int interfaceDim = dimHashMap.get( guiButtonHashMap.get( this.selectedButton ) );
 			if( playerDim != interfaceDim )
 			{
-				mc.player.sendStatusMessage( new TextComponentString( "Interface located at dimension: " + interfaceDim + " [" + DimensionManager.getWorld( interfaceDim ).provider.getDimensionType().getName() + "] and cant be highlighted" ), false );
+				try {
+					mc.player.sendStatusMessage( new TextComponentString( "Interface located at dimension: " + interfaceDim + " [" + DimensionManager.getWorld( interfaceDim ).provider.getDimensionType().getName() + "] and cant be highlighted" ), false );
+				} catch(Exception e){
+					mc.player.sendStatusMessage( new TextComponentString( "Interface is located in another dimension and cannot be highlighted" ), false );
+				}
 			}
 			else
 			{

src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java

@@ -270,12 +270,15 @@ public class GuiUpgradeable extends AEBaseGui implements IJEIGhostIngredients
 				@Override
 				public Rectangle getArea()
 				{
-					if( slot instanceof SlotFake )
+					if( slot instanceof SlotFake && ( (SlotFake) slot ).isSlotEnabled() )
+					{
 						return new Rectangle( getGuiLeft() + ( (SlotFake) slot ).xPos, getGuiTop() + ( (SlotFake) slot ).yPos, 16, 16 );
-					else
+					}
+					else if( slot instanceof GuiFluidSlot && ( (GuiFluidSlot) slot ).isSlotEnabled() )
 					{
 						return new Rectangle( getGuiLeft() + ( (GuiFluidSlot) slot ).xPos(), getGuiTop() + ( (GuiFluidSlot) slot ).yPos(), 16, 16 );
 					}
+					return new Rectangle();
 				}
 
 				@Override
@@ -284,7 +287,7 @@ public class GuiUpgradeable extends AEBaseGui implements IJEIGhostIngredients
 					PacketInventoryAction p = null;
 					try
 					{
-						if( slot instanceof SlotFake )
+						if( slot instanceof SlotFake && ( (SlotFake) slot ).isSlotEnabled() )
 						{
 							if( finalItemStack.isEmpty() && finalFluidStack != null )
 							{

src/main/java/appeng/client/gui/widgets/GuiCustomSlot.java

@@ -10,9 +10,9 @@ import net.minecraft.item.ItemStack;
 
 public abstract class GuiCustomSlot extends Gui implements ITooltip
 {
-	private final int x;
-	private final int y;
-	private final int id;
+	protected final int x;
+	protected final int y;
+	protected final int id;
 
 	public GuiCustomSlot( final int id, final int x, final int y )
 	{

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

@@ -22,9 +22,10 @@ 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.GlStateManager;
-import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.RenderItem;
+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.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 
@@ -32,6 +33,7 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.util.IWideReadableNumberConverter;
 import appeng.util.ReadableNumberConverter;
 import net.minecraftforge.fluids.FluidStack;
+import org.lwjgl.opengl.GL11;
 
 
 /**
@@ -121,6 +123,49 @@ 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.
 	 *
@@ -147,9 +192,9 @@ public class TesrRenderHelper
 
 	public static void renderFluid2dWithAmount( IAEFluidStack fluidStack, float scale, float spacing )
 	{
-		final ItemStack renderStack = fluidStack.asItemStackRepresentation();
+		final FluidStack renderStack = fluidStack.getFluidStack();
 
-		TesrRenderHelper.renderItem2d( renderStack, scale );
+		TesrRenderHelper.renderFluid2d( renderStack, scale );
 
 		final long stackSize = fluidStack.getStackSize() / 1000;
 		final String renderedStackSize = NUMBER_CONVERTER.toWideReadableForm( stackSize ) + "B";

src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java

@@ -245,7 +245,10 @@ public class PacketJEIRecipe extends AppEngPacket
 
 								if( out != null )
 								{
-									out.setStackSize( recipe[x][y].getCount() );
+									if (!cct.useRealItems())
+									{
+										out.setStackSize( recipe[x][y].getCount() );
+									}
 									currentItem = out.createItemStack();
 								}
 							}

src/main/java/appeng/core/sync/packets/PacketTargetFluidStack.java

@@ -19,6 +19,7 @@
 package appeng.core.sync.packets;
 
 
+import appeng.fluids.container.ContainerFluidInterface;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
@@ -90,5 +91,9 @@ public class PacketTargetFluidStack extends AppEngPacket
 		{
 			( (ContainerFluidTerminal) player.openContainer ).setTargetStack( this.stack );
 		}
+		else if( player.openContainer instanceof ContainerFluidInterface )
+		{
+			( (ContainerFluidInterface) player.openContainer ).setTargetStack( this.stack );
+		}
 	}
 }

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

@@ -59,6 +59,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 	private final IItemList<IAEItemStack> missing = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
 	private final HashMap<String, TwoIntegers> opsAndMultiplier = new HashMap<>();
 	private final Object monitor = new Object();
+	private final Stopwatch watch = Stopwatch.createUnstarted();
 	private CraftingTreeNode tree;
 	private final IAEItemStack output;
 	private boolean simulate = false;
@@ -66,7 +67,10 @@ public class CraftingJob implements Runnable, ICraftingJob
 	private long bytes = 0;
 	private final IActionSource actionSrc;
 	private final ICraftingCallback callback;
+	private boolean running = false;
 	private boolean done = false;
+	private int time;
+	private int incTime;
 
 	private World wrapWorld( final World w )
 	{
@@ -133,6 +137,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 			try
 			{
 				TickHandler.INSTANCE.registerCraftingSimulation( this.world, this );
+				this.handlePausing();
 
 				final Stopwatch timer = Stopwatch.createStarted();
 
@@ -214,6 +219,41 @@ public class CraftingJob implements Runnable, ICraftingJob
 		this.finish();
 	}
 
+	void handlePausing() throws InterruptedException
+	{
+		if( !this.actionSrc.player().isPresent() && this.incTime > 100 )
+		{
+			this.incTime = 0;
+			synchronized ( this.monitor )
+			{
+				if( this.watch.elapsed( TimeUnit.MICROSECONDS ) > this.time )
+				{
+					this.running = false;
+					this.watch.stop();
+					this.monitor.notify();
+				}
+
+				if( !this.running )
+				{
+					AELog.craftingDebug( "crafting job will now sleep" );
+
+					while ( !this.running )
+					{
+						this.monitor.wait();
+					}
+
+					AELog.craftingDebug( "crafting job now active" );
+				}
+			}
+
+			if( Thread.interrupted() )
+			{
+				throw new InterruptedException();
+			}
+		}
+		this.incTime++;
+	}
+
 	private void finish()
 	{
 		if( this.callback != null )
@@ -225,6 +265,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 
 		synchronized( this.monitor )
 		{
+			this.running = false;
 			this.done = true;
 			this.monitor.notify();
 		}
@@ -270,13 +311,41 @@ public class CraftingJob implements Runnable, ICraftingJob
 	/**
 	 * @return true if this needs more simulation
 	 */
-	public boolean simulateFor()
+	public boolean simulateFor(final int milli)
 	{
-		synchronized( this.monitor ) {
-			if ( this.done ) {
+		this.time = milli;
+
+		synchronized ( this.monitor )
+		{
+			if( this.done )
+			{
 				return false;
 			}
+			if( !this.actionSrc.player().isPresent() )
+			{
+				this.watch.reset();
+				this.watch.start();
+				this.running = true;
+
+				AELog.craftingDebug( "main thread is now going to sleep" );
+
+				this.monitor.notify();
+
+				while ( this.running )
+				{
+					try
+					{
+						this.monitor.wait();
+					}
+					catch( final InterruptedException ignored )
+					{
+					}
+				}
+
+				AELog.craftingDebug( "main thread is now active" );
+			}
 		}
+
 		return true;
 	}
 

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

@@ -25,6 +25,7 @@ import java.util.List;
 
 import com.google.common.collect.Lists;
 
+import net.minecraft.util.text.TextComponentString;
 import net.minecraft.world.World;
 
 import appeng.api.AEApi;
@@ -119,22 +120,47 @@ public class CraftingTreeNode
 
 	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 );
-		if( this.getSlot() >= 0 && this.parent != null && this.parent.details.isCraftable() )
+		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() )
 		{
 			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
@@ -156,7 +182,7 @@ public class CraftingTreeNode
 					fuzz = fuzz.copy();
 					fuzz.setStackSize( l );
 
-					final IAEItemStack available = inv.extractItems( fuzz, Actionable.MODULATE, src );
+					available = inv.extractItems( fuzz, Actionable.MODULATE, src );
 
 					if( available != null )
 					{
@@ -182,32 +208,6 @@ 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 +226,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 +234,7 @@ public class CraftingTreeNode
 
 				madeWhat.setStackSize( l );
 
-				final IAEItemStack available = inv.extractItems( madeWhat, Actionable.MODULATE, src );
+				available = inv.extractItems( madeWhat, Actionable.MODULATE, src );
 
 				if( available != null )
 				{
@@ -258,13 +258,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 );
-						final IAEItemStack available = subInv.extractItems( this.what, Actionable.MODULATE, src );
+						available = subInv.extractItems( this.what, Actionable.MODULATE, src );
 
 						if( available != null )
 						{
@@ -321,7 +321,7 @@ public class CraftingTreeNode
 		}
 		// missing = 0;
 
-		job.addBytes( 8 + this.bytes );
+		job.addBytes( this.bytes );
 
 		for( final CraftingTreeProcess pro : this.nodes )
 		{
@@ -358,6 +358,10 @@ 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() );
 			}
 

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

@@ -185,7 +185,7 @@ public class CraftingTreeProcess
 
 	void request( final MECraftingInventory inv, final long i, final IActionSource src ) throws CraftBranchFailure, InterruptedException
 	{
-
+		this.job.handlePausing();
 		if( this.fullSimulation )
 		{
 			final InventoryCrafting ic = new InventoryCrafting( new ContainerNull(), 3, 3 );
@@ -241,7 +241,6 @@ public class CraftingTreeProcess
 			o.setStackSize( o.getStackSize() * i );
 			inv.injectItems( o, Actionable.MODULATE, src );
 		}
-
 		this.crafts += i;
 	}
 
@@ -253,7 +252,7 @@ public class CraftingTreeProcess
 			pro.dive( job );
 		}
 
-		job.addBytes( 8 + this.crafts + this.bytes );
+		job.addBytes( this.crafts + 8 + this.bytes );
 	}
 
 	IAEItemStack getAmountCrafted( IAEItemStack what2 )
@@ -305,7 +304,7 @@ public class CraftingTreeProcess
 
 	void getPlan( final IItemList<IAEItemStack> plan )
 	{
-		for( IAEItemStack i : this.details.getCondensedOutputs() )
+		for( IAEItemStack i : this.details.getOutputs() )
 		{
 			i = i.copy();
 			i.setCountRequestable( i.getStackSize() * this.crafts );

src/main/java/appeng/crafting/MECraftingInventory.java

@@ -312,9 +312,13 @@ 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().getDisplayName() + " available but could not extract anything" ), false );
+						{
+							src.player().get().sendStatusMessage( new TextComponentString( "System reported " + extra.getStackSize() + " " + extra.getDefinition().getItem().getItemStackDisplayName( extra.getDefinition() ) + " available but could not extract anything" ), false );
+						}
 						else
-							src.player().get().sendStatusMessage( new TextComponentString( "System reported " + extra.getStackSize() + " " + extra.getDefinition().getDisplayName() + " available but could only extract " + result.getStackSize() ), false );
+						{
+							src.player().get().sendStatusMessage( new TextComponentString( "System reported " + extra.getStackSize() + " " + extra.getDefinition().getItem().getItemStackDisplayName( extra.getDefinition() ) + " available but could only extract " + result.getStackSize() ), false );
+						}
 					}
 					failed = true;
 					if( !src.player().isPresent() ) break;

src/main/java/appeng/fluids/client/gui/GuiFluidInterface.java

@@ -21,6 +21,9 @@ package appeng.fluids.client.gui;
 
 import java.io.IOException;
 
+import appeng.api.util.IConfigManager;
+import appeng.client.gui.widgets.GuiCustomSlot;
+import appeng.util.IConfigManagerHost;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 
@@ -38,11 +41,12 @@ import appeng.fluids.helper.IFluidInterfaceHost;
 import appeng.fluids.util.IAEFluidTank;
 
 
-public class GuiFluidInterface extends GuiUpgradeable
+public class GuiFluidInterface extends GuiUpgradeable implements IConfigManagerHost
 {
 	public final static int ID_BUTTON_TANK = 222;
 
 	private final IFluidInterfaceHost host;
+	private final ContainerFluidInterface container;
 	private GuiTabButton priority;
 
 	public GuiFluidInterface( final InventoryPlayer ip, final IFluidInterfaceHost te )
@@ -50,6 +54,8 @@ public class GuiFluidInterface extends GuiUpgradeable
 		super( new ContainerFluidInterface( ip, te ) );
 		this.ySize = 231;
 		this.host = te;
+		( this.container = (ContainerFluidInterface) this.inventorySlots ).setGui( this );
+
 	}
 
 	@Override
@@ -62,9 +68,7 @@ public class GuiFluidInterface extends GuiUpgradeable
 
 		for( int i = 0; i < DualityFluidInterface.NUMBER_OF_TANKS; ++i )
 		{
-			final GuiFluidTank guiTank = new GuiFluidTank( fluidTank, i, DualityFluidInterface.NUMBER_OF_TANKS + i, this.getGuiLeft() + 35 + 18 * i, this
-					.getGuiTop() + 53, 16, 68 );
-			this.buttonList.add( guiTank );
+			this.guiSlots.add( new GuiFluidTank( fluidTank, i, DualityFluidInterface.NUMBER_OF_TANKS + i, 36 + 18 * i, 53, 16, 68 ) );
 			this.guiSlots.add( new GuiFluidSlot( configFluids, i, i, 35 + 18 * i, 35 ) );
 		}
 
@@ -104,9 +108,33 @@ public class GuiFluidInterface extends GuiUpgradeable
 		}
 	}
 
+	@Override
+	protected void mouseClicked( int xCoord, int yCoord, int btn ) throws IOException
+	{
+		for( GuiCustomSlot slot : this.guiSlots )
+		{
+			if( slot instanceof GuiFluidTank )
+			{
+				if( this.isPointInRegion( slot.xPos(), slot.yPos(), slot.getWidth(), slot.getHeight(), xCoord, yCoord ) && slot.canClick( this.mc.player ) )
+				{
+					this.container.setTargetStack( ( (GuiFluidTank) slot ).getFluidStack() );
+					slot.slotClicked( this.mc.player.inventory.getItemStack(), btn );
+					return;
+				}
+			}
+		}
+		super.mouseClicked( xCoord, yCoord, btn );
+	}
+
 	@Override
 	protected boolean drawUpgrades()
 	{
 		return false;
 	}
+
+	@Override
+	public void updateSetting( IConfigManager manager, Enum settingName, Enum newValue )
+	{
+
+	}
 }

src/main/java/appeng/fluids/client/gui/widgets/GuiFluidTank.java

@@ -19,42 +19,50 @@
 package appeng.fluids.client.gui.widgets;
 
 
+import appeng.client.gui.widgets.GuiCustomSlot;
+import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.PacketInventoryAction;
+import appeng.helpers.InventoryAction;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.util.AEColor;
 import appeng.client.gui.widgets.ITooltip;
 import appeng.fluids.util.IAEFluidTank;
 
 
 @SideOnly( Side.CLIENT )
-public class GuiFluidTank extends GuiButton implements ITooltip
+public class GuiFluidTank extends GuiCustomSlot implements ITooltip
 {
 	private final IAEFluidTank tank;
 	private final int slot;
+	private final int width;
+	private final int height;
 
 	public GuiFluidTank( IAEFluidTank tank, int slot, int id, int x, int y, int w, int h )
 	{
-		super( id, x, y, w, h, "" );
+		super( id, x, y );
 		this.tank = tank;
 		this.slot = slot;
+		this.width = w;
+		this.height = h;
 	}
 
 	@Override
-	public void drawButton( final Minecraft mc, final int mouseX, final int mouseY, final float partialTicks )
+	public void drawContent( Minecraft mc, int mouseX, int mouseY, float partialTicks )
 	{
-		if( this.visible )
+		final IAEFluidStack fs = this.getFluidStack();
+		if( fs != null )
 		{
 			GlStateManager.disableBlend();
 			GlStateManager.disableLighting();
 
-			drawRect( this.x, this.y, this.x + this.width, this.y + this.height, AEColor.GRAY.blackVariant | 0xFF000000 );
+			//drawRect( this.x, this.y, this.x + this.width, this.y + this.height, AEColor.GRAY.blackVariant | 0xFF000000 );
 
 			final IAEFluidStack fluid = this.tank.getFluidInSlot( this.slot );
 			if( fluid != null && fluid.getStackSize() > 0 )
@@ -69,17 +77,16 @@ public class GuiFluidTank extends GuiButton implements ITooltip
 				TextureAtlasSprite sprite = mc.getTextureMapBlocks().getAtlasSprite( fluid.getFluid().getStill().toString() );
 				final int scaledHeight = (int) ( this.height * ( (float) fluid.getStackSize() / this.tank.getTankProperties()[this.slot].getCapacity() ) );
 
-				int iconHeightRemainder = scaledHeight % 16;
+				int iconHeightRemainder = scaledHeight % this.getHeight();
 				if( iconHeightRemainder > 0 )
 				{
-					this.drawTexturedModalRect( this.x, this.y + this.height - iconHeightRemainder, sprite, 16, iconHeightRemainder );
+					this.drawTexturedModalRect( this.xPos(), this.yPos() + this.getHeight() - iconHeightRemainder, sprite, this.getWidth(), iconHeightRemainder );
 				}
-				for( int i = 0; i < scaledHeight / 16; i++ )
+				for( int i = 0; i < scaledHeight / this.getHeight(); i++ )
 				{
-					this.drawTexturedModalRect( this.x, this.y + this.height - iconHeightRemainder - ( i + 1 ) * 16, sprite, 16, 16 );
+					this.drawTexturedModalRect( this.xPos(), this.yPos() + this.getHeight() - iconHeightRemainder - ( i + 1 ) * 16, sprite, this.getWidth(), this.getHeight() );
 				}
 			}
-
 		}
 	}
 
@@ -100,25 +107,25 @@ public class GuiFluidTank extends GuiButton implements ITooltip
 	@Override
 	public int xPos()
 	{
-		return this.x - 2;
+		return this.x - 1;
 	}
 
 	@Override
 	public int yPos()
 	{
-		return this.y - 2;
+		return this.y - 1;
 	}
 
 	@Override
 	public int getWidth()
 	{
-		return this.width + 4;
+		return this.width;
 	}
 
 	@Override
 	public int getHeight()
 	{
-		return this.height + 4;
+		return this.height + 1;
 	}
 
 	@Override
@@ -127,4 +134,24 @@ public class GuiFluidTank extends GuiButton implements ITooltip
 		return true;
 	}
 
+	public IAEFluidStack getFluidStack()
+	{
+		return this.tank.getFluidInSlot( this.slot );
+	}
+
+	@Override
+	public void slotClicked( ItemStack clickStack, final int mouseButton )
+	{
+
+		if( getFluidStack() != null )
+		{
+			NetworkHandler.instance().sendToServer( new PacketInventoryAction( InventoryAction.FILL_ITEM, slot, 0 ) );
+		}
+		else
+		{
+			NetworkHandler.instance().sendToServer( new PacketInventoryAction( InventoryAction.EMPTY_ITEM, slot, 0 ) );
+		}
+
+	}
+
 }

src/main/java/appeng/fluids/container/ContainerFluidInterface.java

@@ -19,9 +19,17 @@
 package appeng.fluids.container;
 
 
+import javax.annotation.Nonnull;
+
 import java.util.Collections;
 import java.util.Map;
 
+import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.PacketTargetFluidStack;
+import appeng.fluids.util.AEFluidStack;
+import appeng.helpers.InventoryAction;
+import appeng.util.IConfigManagerHost;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IContainerListener;
 
@@ -33,12 +41,19 @@ import appeng.fluids.helper.FluidSyncHelper;
 import appeng.fluids.helper.IFluidInterfaceHost;
 import appeng.fluids.util.IAEFluidTank;
 import appeng.util.Platform;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
+import net.minecraftforge.fluids.capability.IFluidHandlerItem;
 
 
-public class ContainerFluidInterface extends ContainerFluidConfigurable
+public class ContainerFluidInterface extends ContainerFluidConfigurable implements IConfigManagerHost
 {
 	private final DualityFluidInterface myDuality;
 	private final FluidSyncHelper tankSync;
+	private IConfigManagerHost gui;
+	// Holds the fluid the client wishes to extract, or null for insert
+	private IAEFluidStack clientRequestedTargetFluid = null;
 
 	public ContainerFluidInterface( final InventoryPlayer ip, final IFluidInterfaceHost te )
 	{
@@ -60,6 +75,15 @@ public class ContainerFluidInterface extends ContainerFluidConfigurable
 		return this.myDuality.getConfig();
 	}
 
+	@Override
+	public void updateSetting( IConfigManager manager, Enum settingName, Enum newValue )
+	{
+		if( this.getGui() != null )
+		{
+			this.getGui().updateSetting( manager, settingName, newValue );
+		}
+	}
+
 	@Override
 	public void detectAndSendChanges()
 	{
@@ -97,6 +121,126 @@ public class ContainerFluidInterface extends ContainerFluidConfigurable
 		this.tankSync.readPacket( fluids );
 	}
 
+	private IConfigManagerHost getGui()
+	{
+		return this.gui;
+	}
+
+	public void setGui( @Nonnull final IConfigManagerHost gui )
+	{
+		this.gui = gui;
+	}
+
+	public void doAction( EntityPlayerMP player, InventoryAction action, int slot, long id )
+	{
+		if( action != InventoryAction.FILL_ITEM && action != InventoryAction.EMPTY_ITEM )
+		{
+			super.doAction( player, action, slot, id );
+			return;
+		}
+
+		final ItemStack held = player.inventory.getItemStack();
+		ItemStack heldCopy = held.copy();
+		heldCopy.setCount( 1 );
+		IFluidHandlerItem fh = FluidUtil.getFluidHandler( heldCopy );
+		if( fh == null )
+		{
+			// only fluid handlers items
+			return;
+		}
+
+		if( action == InventoryAction.FILL_ITEM && this.clientRequestedTargetFluid != null )
+		{
+			final IAEFluidStack stack = this.clientRequestedTargetFluid.copy();
+
+			// Check how much we can store in the item
+			stack.setStackSize( Integer.MAX_VALUE );
+			int amountAllowed = fh.fill( stack.getFluidStack(), false );
+			int heldAmount = held.getCount();
+			for( int i = 0; i < heldAmount; i++ )
+			{
+				ItemStack copiedFluidContainer = held.copy();
+				copiedFluidContainer.setCount( 1 );
+				fh = FluidUtil.getFluidHandler( copiedFluidContainer );
+
+				FluidStack extractableFluid = this.myDuality.getTanks().drain( stack.setStackSize( amountAllowed ).getFluidStack(), false );
+				if( extractableFluid == null || extractableFluid.amount == 0 )
+				{
+					break;
+				}
+
+				int fillableAmount = fh.fill( extractableFluid, false );
+				if( fillableAmount > 0 )
+				{
+					FluidStack extractedFluid = this.myDuality.getTanks().drain( extractableFluid, true );
+					fh.fill( extractedFluid, true );
+				}
+
+				if( held.getCount() == 1 )
+				{
+					player.inventory.setItemStack( fh.getContainer() );
+				}
+				else
+				{
+					player.inventory.getItemStack().shrink( 1 );
+					if( !player.inventory.addItemStackToInventory( fh.getContainer() ) )
+					{
+						player.dropItem( fh.getContainer(), false );
+					}
+				}
+			}
+		}
+		else if( action == InventoryAction.EMPTY_ITEM )
+		{
+			int heldAmount = held.getCount();
+			for( int i = 0; i < heldAmount; i++ )
+			{
+				ItemStack copiedFluidContainer = held.copy();
+				copiedFluidContainer.setCount( 1 );
+				fh = FluidUtil.getFluidHandler( copiedFluidContainer );
+
+				FluidStack drainable = fh.drain( this.myDuality.getTanks().getTankProperties()[slot].getCapacity(), false );
+				if( drainable != null )
+				{
+					fh.drain( drainable, true );
+					this.myDuality.getTanks().fill( drainable, true );
+				}
+
+				if( held.getCount() == 1 )
+				{
+					player.inventory.setItemStack( fh.getContainer() );
+				}
+				else
+				{
+					player.inventory.getItemStack().shrink( 1 );
+					if( !player.inventory.addItemStackToInventory( fh.getContainer() ) )
+					{
+						player.dropItem( fh.getContainer(), false );
+					}
+				}
+			}
+		}
+		this.updateHeld( player );
+	}
+
+	public void setTargetStack( final IAEFluidStack stack )
+	{
+		if( Platform.isClient() )
+		{
+			if( stack == null && this.clientRequestedTargetFluid == null )
+			{
+				return;
+			}
+			if( stack != null && this.clientRequestedTargetFluid != null && stack.getFluidStack().isFluidEqual( this.clientRequestedTargetFluid.getFluidStack() ) )
+			{
+				return;
+			}
+			NetworkHandler.instance().sendToServer( new PacketTargetFluidStack( (AEFluidStack) stack ) );
+		}
+
+		this.clientRequestedTargetFluid = stack == null ? null : stack.copy();
+	}
+
 	@Override
 	protected boolean supportCapacity()
 	{

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

@@ -20,6 +20,7 @@ package appeng.fluids.parts;
 
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -44,6 +45,7 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IItemList;
 import appeng.fluids.util.AEFluidStack;
+import appeng.me.GridAccessException;
 import appeng.me.helpers.IGridProxyable;
 import appeng.me.storage.ITickingMonitor;
 
@@ -92,9 +94,14 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 
 		if( type == Actionable.MODULATE )
 		{
-			this.cache
-					.currentlyCached
-					.add( input.copy().setStackSize( wasFillled ));
+			try
+			{
+				this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
+			}
+			catch( GridAccessException ignore )
+			{
+				// meh
+			}
 		}
 
 		fluidStack.amount = remaining;
@@ -116,16 +123,18 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 			return null;
 		}
 
-		IAEFluidStack gatheredAEFluidstack = AEFluidStack.fromFluidStack( gathered );
 		if( mode == Actionable.MODULATE )
 		{
-			IAEFluidStack e = this.cache.currentlyCached.findPrecise( gatheredAEFluidstack );
-			if (e != null)
+			try
 			{
-				e.decStackSize( gathered.amount );
+				this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
+			}
+			catch( GridAccessException ignore )
+			{
+				// meh
 			}
 		}
-		return gatheredAEFluidstack;
+		return AEFluidStack.fromFluidStack( gathered );
 	}
 
 	@Override
@@ -193,10 +202,9 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 
 	private static class InventoryCache
 	{
+		private IAEFluidStack[] cachedAeStacks = new IAEFluidStack[0];
 		private final IFluidHandler fluidHandler;
 		private final StorageFilter mode;
-		IItemList<IAEFluidStack> currentlyCached = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
-
 
 		public InventoryCache( IFluidHandler fluidHandler, StorageFilter mode )
 		{
@@ -208,12 +216,19 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 		{
 			final List<IAEFluidStack> changes = new ArrayList<>();
 			final IFluidTankProperties[] tankProperties = this.fluidHandler.getTankProperties();
+			final int slots = tankProperties.length;
 
-			IItemList<IAEFluidStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
-
-			for( IFluidTankProperties tankProperty : tankProperties )
+			// Make room for new slots
+			if( slots > this.cachedAeStacks.length )
 			{
-				FluidStack newFS = tankProperty.getContents();
+				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
+			}
+
+			for( int slot = 0; slot < slots; slot++ )
+			{
+				// Save the old stuff
+				final IAEFluidStack oldAEFS = this.cachedAeStacks[slot];
+				FluidStack newFS = tankProperties[slot].getContents();
 				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && newFS != null )
 				{
 					if( this.fluidHandler.drain( 1, false ) == null )
@@ -221,40 +236,82 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 						newFS = null;
 					}
 				}
-				if( newFS != null )
+				this.handlePossibleSlotChanges( slot, oldAEFS, newFS, changes );
+			}
+
+			// Handle cases where the number of slots actually is lower now than before
+			if( slots < this.cachedAeStacks.length )
+			{
+				for( int slot = slots; slot < this.cachedAeStacks.length; slot++ )
 				{
-					currentlyOnStorage.add( AEFluidStack.fromFluidStack( newFS ) );
+					final IAEFluidStack aeStack = this.cachedAeStacks[slot];
+
+					if( aeStack != null )
+					{
+						final IAEFluidStack a = aeStack.copy();
+						a.setStackSize( -a.getStackSize() );
+						changes.add( a );
+					}
 				}
+
+				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
 			}
-
-			for ( final IAEFluidStack is : currentlyCached )
-			{
-				is.setStackSize( -is.getStackSize() );
-			}
-
-			for ( final IAEFluidStack is : currentlyOnStorage )
-			{
-				currentlyCached.add( is );
-			}
-
-			for ( final IAEFluidStack is : currentlyCached )
-			{
-				if( is.getStackSize() != 0 )
-				{
-					changes.add( is );
-				}
-			}
-
-			currentlyCached = currentlyOnStorage;
-
 			return changes;
 		}
 
 		public IItemList<IAEFluidStack> getAvailableItems( IItemList<IAEFluidStack> out )
 		{
-			currentlyCached.iterator().forEachRemaining( out::add );
+			Arrays.stream( this.cachedAeStacks ).forEach( out::add );
 			return out;
 		}
 
+		private void handlePossibleSlotChanges( int slot, IAEFluidStack oldAeFS, FluidStack newFS, List<IAEFluidStack> changes )
+		{
+			if( oldAeFS != null && oldAeFS.getFluidStack().isFluidEqual( newFS ) )
+			{
+				this.handleStackSizeChanged( slot, oldAeFS, newFS, changes );
+			}
+			else
+			{
+				this.handleFluidChanged( slot, oldAeFS, newFS, changes );
+			}
+		}
+
+		private void handleStackSizeChanged( int slot, IAEFluidStack oldAeFS, FluidStack newFS, List<IAEFluidStack> changes )
+		{
+			// Still the same fluid, but amount might have changed
+			final long diff = newFS.amount - oldAeFS.getStackSize();
+
+			if( diff != 0 )
+			{
+				final IAEFluidStack stack = oldAeFS.copy();
+				stack.setStackSize( newFS.amount );
+
+				this.cachedAeStacks[slot] = stack;
+
+				final IAEFluidStack a = stack.copy();
+				a.setStackSize( diff );
+				changes.add( a );
+			}
+		}
+
+		private void handleFluidChanged( int slot, IAEFluidStack oldAeFS, FluidStack newFS, List<IAEFluidStack> changes )
+		{
+			// Completely different fluid
+			this.cachedAeStacks[slot] = AEFluidStack.fromFluidStack( newFS );
+
+			// If we had a stack previously in this slot, notify the network about its disappearance
+			if( oldAeFS != null )
+			{
+				oldAeFS.setStackSize( -oldAeFS.getStackSize() );
+				changes.add( oldAeFS );
+			}
+
+			// Notify the network about the new stack. Note that this is null if newFS was null
+			if( this.cachedAeStacks[slot] != null )
+			{
+				changes.add( this.cachedAeStacks[slot] );
+			}
+		}
 	}
 }

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

@@ -4,9 +4,7 @@ package appeng.fluids.parts;
 
 import java.util.Random;
 
-import appeng.api.networking.events.MENetworkChannelChanged;
 import appeng.fluids.helper.IConfigurableFluidInventory;
-import appeng.me.cache.NetworkMonitor;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -36,6 +34,7 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEStack;
+import appeng.api.storage.data.IItemList;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.IConfigManager;
@@ -113,11 +112,11 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 	}
 
 	@Override
-	public void onStackChange( IAEStack<?> diffStack, IStorageChannel<?> chan )
+	public void onStackChange( IItemList<?> o, IAEStack<?> fullStack, IAEStack<?> diffStack, IActionSource src, IStorageChannel<?> chan )
 	{
-		if( chan == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) && diffStack.equals( this.config.getFluidInSlot( 0 ) ) )
+		if( chan == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) && fullStack.equals( this.config.getFluidInSlot( 0 ) ) )
 		{
-			this.lastReportedValue += diffStack.getStackSize();
+			this.lastReportedValue = fullStack.getStackSize();
 			this.updateState();
 		}
 	}
@@ -129,22 +128,14 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 	}
 
 	@MENetworkEventSubscribe
-	public void powerStatusChange( final MENetworkPowerStatusChange powerEvent )
+	public void channelChanged( final MENetworkChannelsChanged c )
 	{
-		if (this.getProxy().isActive())
-		{
-			onListUpdate();
-		}
 		this.updateState();
 	}
 
 	@MENetworkEventSubscribe
-	public void channelChanged( final MENetworkChannelsChanged c )
+	public void powerChanged( final MENetworkPowerStatusChange c )
 	{
-		if (this.getProxy().isActive())
-		{
-			onListUpdate();
-		}
 		this.updateState();
 	}
 
@@ -256,9 +247,10 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 
 		if( myStack == null )
 		{
-			if( monitor instanceof NetworkMonitor )
+			this.lastReportedValue = 0;
+			for( final IAEFluidStack st : monitor.getStorageList() )
 			{
-				this.lastReportedValue = ( (NetworkMonitor<IAEFluidStack>) monitor ).getGridCurrentCount();
+				this.lastReportedValue += st.getStackSize();
 			}
 		}
 		else

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

@@ -25,7 +25,9 @@ import java.util.Objects;
 
 import javax.annotation.Nonnull;
 
+import appeng.api.networking.storage.IStorageGrid;
 import appeng.fluids.helper.IConfigurableFluidInventory;
+import appeng.me.cache.GridStorageCache;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -207,7 +209,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 		{
 			this.resetCacheLogic = 2;
 		}
-		else
+		else if( resetCacheLogic < 2 )
 		{
 			this.resetCacheLogic = 1;
 		}
@@ -264,16 +266,19 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 	@Override
 	public void postChange( final IBaseMonitor<IAEFluidStack> monitor, final Iterable<IAEFluidStack> change, final IActionSource source )
 	{
-		try
+		if( source == this.source || source.machine().map( machine -> machine == this ).orElse( false ) )
 		{
-			if( this.getProxy().isActive() )
+			try
 			{
-				this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ), change, this.source );
+				if( this.getProxy().isActive() )
+				{
+					this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ), change, this.source );
+				}
+			}
+			catch( final GridAccessException e )
+			{
+				// :(
 			}
-		}
-		catch( final GridAccessException e )
-		{
-			// :(
 		}
 	}
 
@@ -371,7 +376,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 		try
 		{
 			// force grid to update handlers...
-			this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
+			(( GridStorageCache ) this.getProxy().getGrid().getCache( IStorageGrid.class )).cellUpdate( null );
 		}
 		catch( final GridAccessException ignore )
 		{
@@ -412,7 +417,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 	{
 		if( channel == this.getStorageChannel() )
 		{
-			final IMEInventoryHandler<IAEFluidStack> out = this.getInternalHandler();
+			final IMEInventoryHandler<IAEFluidStack> out = this.getProxy().isActive() ? this.getInternalHandler() : null;
 			if( out != null )
 			{
 				return Collections.singletonList( out );

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

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

src/main/java/appeng/hooks/TickHandler.java

@@ -187,20 +187,15 @@ public class TickHandler
 		if( ev.type == Type.WORLD && ev.phase == Phase.END )
 		{
 			final WorldTickEvent wte = (WorldTickEvent) ev;
-			synchronized( this.craftingJobs )
+			synchronized ( this.craftingJobs )
 			{
 				final Collection<CraftingJob> jobSet = this.craftingJobs.get( wte.world );
-				if( !jobSet.isEmpty() )
-				{
-					final Iterator<CraftingJob> i = jobSet.iterator();
-					while( i.hasNext() )
-					{
-						final CraftingJob cj = i.next();
-						if( !cj.simulateFor() )
-						{
-							i.remove();
-						}
-					}
+				if (!jobSet.isEmpty()) {
+					final int jobSize = jobSet.size();
+					final int microSecondsPerTick = AEConfig.instance().getCraftingCalculationTimePerTick() * 1000;
+					final int simTime = Math.max(1, microSecondsPerTick / jobSize);
+
+					jobSet.removeIf( cj -> !cj.simulateFor( simTime ) );
 				}
 			}
 		}

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

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

src/main/java/appeng/items/tools/powered/ToolMatterCannon.java

@@ -403,7 +403,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell<
 					}
 					else if( pos.entityHit.attackEntityFrom( dmgSrc, dmg ) )
 					{
-						hasDestroyed = true;
+						hasDestroyed = pos.entityHit.isEntityAlive();
 					}
 				}
 				else if( pos.typeOfHit == RayTraceResult.Type.BLOCK )

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

@@ -296,7 +296,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 		// new craftables!
 		for( final ICraftingPatternDetails details : this.craftingMethods.keySet() )
 		{
-			for( IAEItemStack out : details.getCondensedOutputs() )
+			for( IAEItemStack out : details.getOutputs() )
 			{
 				out = out.copy();
 				out.reset();

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

@@ -65,11 +65,9 @@ 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 );
 
@@ -163,34 +161,33 @@ public class EnergyGridCache implements IEnergyGrid
 	{
 		if( ev.storage.isAEPublicPowerStorage() )
 		{
-			switch ( ev.type )
+			if( ev.type == PowerEventType.PROVIDE_POWER )
 			{
-				case PROVIDE_POWER:
-					if( ev.storage.getPowerFlow() != AccessRestriction.WRITE )
+				if( ev.storage.getPowerFlow() != AccessRestriction.WRITE )
+				{
+					if( !ongoingExtractOperation )
 					{
-						if( !ongoingExtractOperation )
-						{
-							addProvider( ev.storage );
-						}
-						else
-						{
-							this.providersToAdd.add( ev.storage );
-						}
+						addProvider( ev.storage );
 					}
-					break;
-				case REQUEST_POWER:
-					if( ev.storage.getPowerFlow() != AccessRestriction.READ )
+					else
 					{
-						if( !ongoingInjectOperation )
-						{
-							addRequester( ev.storage );
-						}
-						else
-						{
-							this.requesterToAdd.add( ev.storage );
-						}
+						this.providersToAdd.add( ev.storage );
 					}
-					break;
+				}
+			}
+			else if( ev.type == PowerEventType.REQUEST_POWER )
+			{
+				if( ev.storage.getPowerFlow() != AccessRestriction.READ )
+				{
+					if( !ongoingInjectOperation )
+					{
+						addRequester( ev.storage );
+					}
+					else
+					{
+						this.requesterToAdd.add( ev.storage );
+					}
+				}
 			}
 		}
 		else
@@ -231,7 +228,7 @@ public class EnergyGridCache implements IEnergyGrid
 		if( this.drainPerTick > 0.0001 )
 		{
 			final double drained = this.extractAEPower( this.getIdlePowerUsage(), Actionable.MODULATE, PowerMultiplier.CONFIG );
-			currentlyHasPower = drained >= this.drainPerTick - 0.001 && this.getStoredPower() > 0;
+			currentlyHasPower = drained >= this.drainPerTick - 0.001;
 		}
 		else
 		{
@@ -337,30 +334,55 @@ public class EnergyGridCache implements IEnergyGrid
 
 		this.providers.addAll( providersToAdd );
 		providersToAdd.clear();
+		providers.removeIf( providerToRemove::contains );
+		this.providerToRemove.clear();
 
 		final Iterator<IAEPowerStorage> it = this.providers.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 )
+					if( newPower < req && mode == Actionable.MODULATE )
+					{
+						it.remove();
+					}
+				}
+				else
 				{
 					it.remove();
 				}
 			}
 		} finally
 		{
-			providers.removeIf( p -> providerToRemove.contains( p ) );
-			this.providerToRemove.clear();
 			ongoingExtractOperation = false;
+			if( ls && extractedPower < amt )
+			{
+				final double req = amt - extractedPower;
+				final double newPower = localStorage.extractAEPower( req, mode, PowerMultiplier.ONE );
+
+				extractedPower += newPower;
+
+				if( newPower < req )
+				{
+					providers.remove( localStorage );
+				}
+			}
 		}
 
 		final double result = Math.min( extractedPower, amt );
@@ -386,6 +408,8 @@ public class EnergyGridCache implements IEnergyGrid
 
 		this.requesters.addAll( requesterToAdd );
 		requesterToAdd.clear();
+		requesters.removeIf( requesterToRemove::contains );
+		this.requesterToRemove.clear();
 
 		final Iterator<IAEPowerStorage> it = this.requesters.iterator();
 
@@ -396,17 +420,22 @@ public class EnergyGridCache implements IEnergyGrid
 			{
 				final IAEPowerStorage node = it.next();
 
-				amt = node.injectAEPower( amt, mode );
+				if( node != null )
+				{
+					amt = node.injectAEPower( amt, mode );
 
-				if( amt > 0 && mode == Actionable.MODULATE )
+					if( amt > 0 && mode == Actionable.MODULATE )
+					{
+						it.remove();
+					}
+				}
+				else
 				{
 					it.remove();
 				}
 			}
 		} finally
 		{
-			requesters.removeIf( r -> requesterToRemove.contains( r ) );
-			this.requesterToRemove.clear();
 			ongoingInjectOperation = false;
 		}
 
@@ -426,7 +455,7 @@ public class EnergyGridCache implements IEnergyGrid
 		double required = 0;
 
 		final Iterator<IAEPowerStorage> it = this.requesters.iterator();
-		while( required < maxRequired && it.hasNext() )
+		while ( required < maxRequired && it.hasNext() )
 		{
 			final IAEPowerStorage node = it.next();
 			if( node.getPowerFlow() != AccessRestriction.READ )
@@ -591,28 +620,28 @@ 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." );
+		this.requesters.add( 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." );
+		this.requesters.remove( requester );
 	}
 
-	private void addProvider(IAEPowerStorage provider) {
-		Preconditions.checkState(!ongoingExtractOperation,
-				"Cannot modify energy providers while energy is being extracted.");
-		this.providers.add(provider);
+	private void addProvider( IAEPowerStorage provider )
+	{
+		Preconditions.checkState( !ongoingExtractOperation, "Cannot modify energy providers while energy is being extracted." );
+		this.providers.add( provider );
 	}
 
-	private void removeProvider(IAEPowerStorage provider) {
-		Preconditions.checkState(!ongoingExtractOperation,
-				"Cannot modify energy providers while energy is being extracted.");
-		this.providers.remove(provider);
+	private void removeProvider( IAEPowerStorage provider )
+	{
+		Preconditions.checkState( !ongoingExtractOperation, "Cannot modify energy providers while energy is being extracted." );
+		this.providers.remove( provider );
 	}
 
 
@@ -788,13 +817,9 @@ public class EnergyGridCache implements IEnergyGrid
 
 			if( this.stored < 0.01 )
 			{
-				refreshPower();
-				if (globalAvailablePower < MAX_BUFFER_STORAGE - 0.001)
-				{
-					EnergyGridCache.this.ticksSinceHasPowerChange = 0;
-					EnergyGridCache.this.publicPowerState( false, EnergyGridCache.this.myGrid );
-				}
+				EnergyGridCache.this.ticksSinceHasPowerChange = 0;
+				EnergyGridCache.this.publicPowerState( false, EnergyGridCache.this.myGrid );
 			}
 		}
 	}
-}
+}

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

@@ -94,7 +94,7 @@ public class GridStorageCache implements IStorageGrid
 
 			this.removeCellProvider( cc, tracker );
 			this.inactiveCellProviders.remove( cc );
-			this.getGrid().postEvent( new MENetworkCellArrayUpdate() );
+			cellUpdate( null );
 
 			tracker.applyChanges();
 		}
@@ -119,7 +119,7 @@ public class GridStorageCache implements IStorageGrid
 			final ICellContainer cc = (ICellContainer) machine;
 			this.inactiveCellProviders.add( cc );
 
-			this.getGrid().postEvent( new MENetworkCellArrayUpdate() );
+			cellUpdate( null );
 
 			if( node.isActive() )
 			{
@@ -170,7 +170,7 @@ public class GridStorageCache implements IStorageGrid
 
 	private CellChangeTracker addCellProvider( final ICellProvider cc, final CellChangeTracker tracker )
 	{
-		if( this.inactiveCellProviders.contains( cc ) )
+		if( this.inactiveCellProviders.contains( cc ) && !this.activeCellProviders.contains( cc ))
 		{
 			this.inactiveCellProviders.remove( cc );
 			this.activeCellProviders.add( cc );

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

@@ -19,21 +19,17 @@
 package appeng.me.cache;
 
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Deque;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import appeng.api.AEApi;
-import appeng.api.storage.channels.IFluidStorageChannel;
-import appeng.api.storage.channels.IItemStorageChannel;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.storage.data.IAEItemStack;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Queues;
 
@@ -70,8 +66,6 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 	private boolean hasChanged = false;
 	@Nonnegative
 	private int localDepthSemaphore = 0;
-	private long gridItemCount;
-	private long gridFluidCount;
 
 	public NetworkMonitor( final GridStorageCache cache, final IStorageChannel<T> chan )
 	{
@@ -143,32 +137,6 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 		return this.getHandler().getSlot();
 	}
 
-	public long getGridCurrentCount()
-	{
-		if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
-		{
-			return gridItemCount;
-		}
-		else if( myChannel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
-		{
-			return gridFluidCount;
-		}
-		return 0;
-	}
-
-	public long incGridCurrentCount(long count)
-	{
-		if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
-		{
-			return gridItemCount += count;
-		}
-		else if( myChannel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
-		{
-			return gridFluidCount += count;
-		}
-		return 0;
-	}
-
 	@Nonnull
 	@Override
 	public IItemList<T> getStorageList()
@@ -262,7 +230,7 @@ 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.hasListeners() )
+			if( receiver.isValid( o.getValue() ) )
 			{
 				receiver.postChange( this, diff, src );
 			}
@@ -290,7 +258,9 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 
 		this.sendEvent = true;
 
-		for ( final T changedItem : changes )
+		this.notifyListenersOfChange( changes, src );
+
+		for( final T changedItem : changes )
 		{
 			T difference = changedItem;
 
@@ -300,20 +270,25 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 				difference.setStackSize( -changedItem.getStackSize() );
 			}
 
-			incGridCurrentCount( difference.getStackSize() );
-			this.cachedList.add( difference );
-
 			if( this.myGridCache.getInterestManager().containsKey( changedItem ) )
 			{
 				final Collection<ItemWatcher> list = this.myGridCache.getInterestManager().get( changedItem );
 
 				if( !list.isEmpty() )
 				{
+					IAEStack<T> fullStack = this.getStorageList().findPrecise( changedItem );
+
+					if( fullStack == null )
+					{
+						fullStack = changedItem.copy();
+						fullStack.setStackSize( 0 );
+					}
+
 					this.myGridCache.getInterestManager().enableTransactions();
 
 					for( final ItemWatcher iw : list )
 					{
-						iw.getHost().onStackChange( difference, this.getChannel() );
+						iw.getHost().onStackChange( this.getStorageList(), fullStack, difference, src, this.getChannel() );
 					}
 
 					this.myGridCache.getInterestManager().disableTransactions();
@@ -321,8 +296,6 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 			}
 		}
 
-		this.notifyListenersOfChange( changes, src );
-
 		final NetworkMonitor<?> last = GLOBAL_DEPTH.pop();
 		this.localDepthSemaphore--;
 
@@ -335,28 +308,9 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 	void forceUpdate()
 	{
 		this.hasChanged = true;
-		//when the grid comes back online, reset the count to 0 so
-		//it reflects the correct amount after the changes are accounted for
-
-		if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
-		{
-			gridItemCount = 0;
-			for( IAEItemStack iaeItemStack : (Iterable<IAEItemStack>) getStorageList() )
-			{
-				gridItemCount += iaeItemStack.getStackSize();
-			}
-		}
-		else if( myChannel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
-		{
-			gridFluidCount = 0;
-			for( IAEFluidStack iaeFluidStack : (Iterable<IAEFluidStack>) getStorageList() )
-			{
-				gridFluidCount += iaeFluidStack.getStackSize();
-			}
-		}
 
 		final Iterator<Entry<IMEMonitorHandlerReceiver<T>, Object>> i = this.getListeners();
-		while ( i.hasNext() )
+		while( i.hasNext() )
 		{
 			final Entry<IMEMonitorHandlerReceiver<T>, Object> o = i.next();
 			final IMEMonitorHandlerReceiver<T> receiver = o.getKey();
@@ -379,6 +333,5 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 			this.sendEvent = false;
 			this.myGridCache.getGrid().postEvent( new MENetworkStorageEvent( this, this.myChannel ) );
 		}
-
 	}
 }

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

@@ -138,6 +138,7 @@ public class TickManagerCache implements ITickManager
 			tt.addEntityCrashInfo( crashreportcategory );
 			throw new ReportedException( crashreport );
 		}
+		PartLevelEmitter.wipeCache();
 	}
 
 	private void addToQueue( final TickTracker tt )

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

@@ -23,11 +23,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import appeng.api.config.FuzzyMode;
-import appeng.api.storage.data.IAEStack;
-import appeng.util.item.AEItemStack;
 import com.google.common.collect.Multimap;
 
+import appeng.api.storage.data.IAEStack;
+
 
 public class GenericInterestManager<T>
 {
@@ -102,30 +101,12 @@ 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 )
 	{
-		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;
+		return this.container.get( stack );
 	}
 
 	private class SavedTransactions

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

@@ -72,7 +72,7 @@ public class MEMonitorPassThrough<T extends IAEStack<T>> extends MEPassThrough<T
 		final IItemList<T> after = this.getInternal() == null ? this.getWrappedChannel().createList() : this.getInternal()
 				.getAvailableItems( new ItemListIgnoreCrafting( this.getWrappedChannel().createList() ) );
 
-		if( this.monitor != null )
+		if( this.monitor != null && this.listeners.size() > 0 )
 		{
 			this.monitor.addListener( this, this.monitor );
 		}
@@ -90,13 +90,6 @@ public class MEMonitorPassThrough<T extends IAEStack<T>> extends MEPassThrough<T
 	@Override
 	public void addListener( final IMEMonitorHandlerReceiver<T> l, final Object verificationToken )
 	{
-		if( this.listeners.size() == 0 )
-		{
-			if( this.monitor != null )
-			{
-				this.monitor.addListener( this, this.monitor );
-			}
-		}
 		this.listeners.put( l, verificationToken );
 	}
 
@@ -124,12 +117,6 @@ public class MEMonitorPassThrough<T extends IAEStack<T>> extends MEPassThrough<T
 		return verificationToken == this.monitor;
 	}
 
-	@Override
-	public boolean hasListeners()
-	{
-		return this.listeners.size() > 0;
-	}
-
 	@Override
 	public void postChange( final IBaseMonitor<T> monitor, final Iterable<T> change, final IActionSource source )
 	{

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

@@ -180,7 +180,10 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 					}
 					else
 					{
-						this.pushItemIntoTarget( destination, energy, inv, ais );
+						if( inv.getStorageList().findPrecise( ais ) != null )
+						{
+							this.pushItemIntoTarget( destination, energy, inv, ais );
+						}
 					}
 
 					if( this.itemToSend == before && this.isCraftingEnabled() )

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

@@ -283,12 +283,12 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
 		final ItemStack simResult;
 		if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
 		{
-			simResult = myAdaptor.simulateSimilarRemove( toSend, itemStackToImport, fzMode, this );
+			simResult = myAdaptor.simulateSimilarRemove( toSend, itemStackToImport, fzMode, null );
 			itemAmountNotStorable = inv.injectItems( AEItemStack.fromItemStack( simResult ), Actionable.SIMULATE, this.source );
 		}
 		else
 		{
-			simResult = myAdaptor.simulateRemove( toSend, itemStackToImport, this );
+			simResult = myAdaptor.simulateRemove( toSend, itemStackToImport, null );
 			itemAmountNotStorable = inv.injectItems( AEItemStack.fromItemStack( simResult ), Actionable.SIMULATE, this.source );
 		}
 

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

@@ -19,17 +19,11 @@
 package appeng.parts.automation;
 
 
-import java.util.Collections;
-import java.util.Optional;
 import java.util.Random;
 
-import appeng.api.networking.events.*;
 import appeng.me.Grid;
 import appeng.me.GridNode;
-import appeng.me.cache.NetworkMonitor;
 import appeng.util.item.AEItemStack;
-import appeng.util.item.OreHelper;
-import appeng.util.item.OreReference;
 import it.unimi.dsi.fastutil.objects.Object2LongMap;
 import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
@@ -62,6 +56,10 @@ import appeng.api.networking.crafting.ICraftingWatcherHost;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.networking.energy.IEnergyWatcher;
 import appeng.api.networking.energy.IEnergyWatcherHost;
+import appeng.api.networking.events.MENetworkChannelsChanged;
+import appeng.api.networking.events.MENetworkCraftingPatternChange;
+import appeng.api.networking.events.MENetworkEventSubscribe;
+import appeng.api.networking.events.MENetworkPowerStatusChange;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.networking.storage.IBaseMonitor;
 import appeng.api.networking.storage.IStackWatcher;
@@ -74,6 +72,7 @@ import appeng.api.storage.IStorageChannel;
 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.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.IConfigManager;
@@ -124,6 +123,9 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	private double centerX;
 	private double centerY;
 	private double centerZ;
+	static Object2LongMap<Grid> gridItemCount = new Object2LongOpenHashMap<>();
+	static Object2ObjectOpenHashMap<Grid, Object2LongMap<AEItemStack>> fuzzyAEItemStackCount = new Object2ObjectOpenHashMap<>();
+	static Object2ObjectOpenHashMap<Grid, Object2LongMap<AEItemStack>> preciseAEItemStackCount = new Object2ObjectOpenHashMap<>();
 
 	@Reflected
 	public PartLevelEmitter( final ItemStack is )
@@ -154,6 +156,12 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 		}
 	}
 
+	@MENetworkEventSubscribe
+	public void powerChanged( final MENetworkPowerStatusChange c )
+	{
+		this.updateState();
+	}
+
 	private void updateState()
 	{
 		final boolean isOn = this.isLevelEmitterOn();
@@ -198,23 +206,9 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 		return flipState ? this.reportingValue >= this.lastReportedValue + 1 : this.reportingValue < this.lastReportedValue + 1;
 	}
 
-	@MENetworkEventSubscribe
-	public void powerStatusChange( final MENetworkPowerStatusChange powerEvent )
-	{
-		if (this.getProxy().isActive())
-		{
-			onListUpdate();
-		}
-		this.updateState();
-	}
-
 	@MENetworkEventSubscribe
 	public void channelChanged( final MENetworkChannelsChanged c )
 	{
-		if (this.getProxy().isActive())
-		{
-			onListUpdate();
-		}
 		this.updateState();
 	}
 
@@ -302,37 +296,24 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 
 		try
 		{
-
-			if( myStack == null )
+			if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 || 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 )
 				{
-					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.myWatcher.add( myStack );
 				}
 			}
+
 			this.updateReportingValue( this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) );
 		}
 		catch( final GridAccessException e )
@@ -342,29 +323,90 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	}
 
 	private void updateReportingValue( final IMEMonitor<IAEItemStack> monitor )
+	{
+		updateReportingValue( monitor,null );
+	}
+
+	private void updateReportingValue( final IMEMonitor<IAEItemStack> monitor, Iterable<IAEItemStack> change )
 	{
 		final IAEItemStack myStack = this.config.getAEStackInSlot( 0 );
 
-		if( myStack == null )
+		GridNode node = (GridNode) (this.getGridNode());
+
+		if( node != null )
 		{
-			if( monitor instanceof NetworkMonitor )
+
+			final Grid g = node.getInternalGrid();
+
+			if( myStack == null )
 			{
-				this.lastReportedValue = ( (NetworkMonitor<IAEItemStack>) monitor ).getGridCurrentCount();
+				if( change != null )
+				{
+					if( gridItemCount.containsKey( g ) )
+					{
+						change.forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
+					}
+				}
+				gridItemCount.computeIfAbsent( g, ( aLong ) -> {
+					this.lastReportedValue = 0;
+					monitor.getStorageList().forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
+					return ( lastReportedValue );
+				} );
+				this.lastReportedValue = gridItemCount.get( g );
 			}
-		}
 
-		else if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
-		{
-			final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE );
+			else if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
+			{
+				final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE );
+				if( change != null )
+				{
+					if( fuzzyAEItemStackCount.containsKey( g ) )
+					{
+						change.forEach( iaeItemStack -> {
+							if( iaeItemStack.sameOre( myStack ) ) lastReportedValue += iaeItemStack.getStackSize();
+						} );
+					}
+				}
 
-			this.lastReportedValue = 0;
-			monitor.getStorageList().findFuzzy( myStack, fzMode ).forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
-		}
-		else
-		{
-			this.lastReportedValue = 0;
-			IAEItemStack precise = monitor.getStorageList().findPrecise( myStack );
-			if( precise != null ) lastReportedValue = precise.getStackSize();
+				fuzzyAEItemStackCount.computeIfAbsent( g, ( grid -> new Object2LongOpenHashMap<>() ) );
+				fuzzyAEItemStackCount.get( g ).computeIfAbsent( (AEItemStack) myStack, ( aLong -> {
+					this.lastReportedValue = 0;
+					monitor.getStorageList().findFuzzy( myStack, fzMode ).forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
+					return ( lastReportedValue );
+				} ) );
+
+				this.lastReportedValue = fuzzyAEItemStackCount.get( g ).get( myStack );
+				if( this.lastReportedValue == 0 )
+				{
+					fuzzyAEItemStackCount.get( g ).remove( myStack );
+					fuzzyAEItemStackCount.trim();
+				}
+			}
+			else
+			{
+				if( change != null )
+				{
+					if( preciseAEItemStackCount.containsKey( g ) )
+					{
+						change.forEach( iaeItemStack -> {
+							if( iaeItemStack.isSameType( myStack ) ) lastReportedValue += iaeItemStack.getStackSize();
+						} );
+					}
+				}
+				preciseAEItemStackCount.computeIfAbsent( g, ( grid -> new Object2LongOpenHashMap<>() ) );
+				preciseAEItemStackCount.get( g ).computeIfAbsent( (AEItemStack) myStack, ( aLong -> {
+					this.lastReportedValue = 0;
+					IAEItemStack precise = monitor.getStorageList().findPrecise( myStack );
+					if( precise != null ) lastReportedValue = precise.getStackSize();
+					return ( lastReportedValue );
+				} ) );
+				this.lastReportedValue = preciseAEItemStackCount.get( g ).get( myStack );
+				if( this.lastReportedValue == 0 )
+				{
+					preciseAEItemStackCount.get( g ).remove( myStack );
+					preciseAEItemStackCount.trim();
+				}
+			}
 		}
 		this.updateState();
 	}
@@ -377,23 +419,12 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	}
 
 	@Override
-	public void onStackChange( final IAEStack diffStack, final IStorageChannel chan )
+	public void onStackChange( final IItemList o, final IAEStack fullStack, final IAEStack diffStack, final IActionSource src, final IStorageChannel chan )
 	{
-		if( chan == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
+		if( chan == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) && fullStack.equals( this.config.getAEStackInSlot( 0 ) ) && this
+				.getInstalledUpgrades( Upgrades.FUZZY ) == 0 )
 		{
-			IAEItemStack myStack = this.config.getAEStackInSlot( 0 );
-			if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
-			{
-				final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE );
-				if( Platform.itemComparisons().isFuzzyEqualItem( myStack.getDefinition(), ( (IAEItemStack) diffStack ).getDefinition(), fzMode ) )
-				{
-					this.lastReportedValue += diffStack.getStackSize();
-				}
-			}
-			else if( diffStack.equals( myStack ) )
-			{
-				this.lastReportedValue += diffStack.getStackSize();
-			}
+			this.lastReportedValue = fullStack.getStackSize();
 			this.updateState();
 		}
 	}
@@ -428,7 +459,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	@Override
 	public void postChange( final IBaseMonitor<IAEItemStack> monitor, final Iterable<IAEItemStack> change, final IActionSource actionSource )
 	{
-		this.updateReportingValue( (IMEMonitor<IAEItemStack>) monitor );
+		this.updateReportingValue( (IMEMonitor<IAEItemStack>) monitor, change );
 	}
 
 	@Override
@@ -605,4 +636,9 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 		}
 	}
 
+	public static void wipeCache(){
+		fuzzyAEItemStackCount.clear();
+		preciseAEItemStackCount.clear();
+		gridItemCount.clear();
+	}
 }

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

@@ -33,6 +33,7 @@ import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.core.AELog;
+import appeng.me.GridAccessException;
 import appeng.me.helpers.IGridProxyable;
 import appeng.me.storage.ITickingMonitor;
 import appeng.util.inv.ItemHandlerIterator;
@@ -43,6 +44,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.ItemHandlerHelper;
 
 import java.util.*;
 
@@ -81,8 +83,6 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 		stackCache = null;
 
 		ItemStack orgInput;
-		int slotCount = this.itemHandler.getSlots();
-
 		if( currentCached != null && iox.isSameType( currentCached ) )
 		{
 			// Cache is suitable, just update the count
@@ -94,16 +94,10 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 			// We need a new stack :-(
 			orgInput = iox.createItemStack();
 		}
-
-		ItemStack remaining = orgInput;
-
-		for ( int i = 0; i < slotCount && !remaining.isEmpty(); i++ )
-		{
-			remaining = this.itemHandler.insertItem( i, remaining, type == Actionable.SIMULATE );
-		}
+		ItemStack remaining = ItemHandlerHelper.insertItem( this.itemHandler, orgInput, type == Actionable.SIMULATE );
 
 		// Store the stack in the cache for next time.
-		if( !remaining.isEmpty() && remaining != orgInput )
+		if (!remaining.isEmpty() && remaining != orgInput)
 		{
 			stackCache = remaining;
 		}
@@ -117,9 +111,15 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 		if( type == Actionable.MODULATE )
 		{
-			this.cache
-					.currentlyCached
-					.add( AEItemStack.fromItemStack( orgInput ).setStackSize( orgInput.getCount() - remaining.getCount() ) );
+			try
+			{
+				this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
+			}
+			catch( GridAccessException ex )
+			{
+				// meh
+			}
+
 		}
 
 		return AEItemStack.fromItemStack( remaining );
@@ -128,17 +128,18 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 	@Override
 	public IAEItemStack extractItems( IAEItemStack request, Actionable mode, IActionSource src )
 	{
-		int remainingSize = Ints.saturatedCast( request.getStackSize() );
+		int remainingSize = Ints.saturatedCast(request.getStackSize());
 
 		// Use this to gather the requested items
 		ItemStack gathered = ItemStack.EMPTY;
 
 		final boolean simulate = ( mode == Actionable.SIMULATE );
-		for ( int i = 0; i < this.itemHandler.getSlots(); i++ )
+
+		for( int i = 0; i < this.itemHandler.getSlots(); i++ )
 		{
 			ItemStack stackInInventorySlot = this.itemHandler.getStackInSlot( i );
 
-			if( !request.isSameType( stackInInventorySlot ) )
+			if (!request.isSameType(stackInInventorySlot))
 			{
 				continue;
 			}
@@ -190,17 +191,19 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 		if( !gathered.isEmpty() )
 		{
-			IAEItemStack gatheredAEItemStack = AEItemStack.fromItemStack( gathered );
 			if( mode == Actionable.MODULATE )
 			{
-				IAEItemStack e = this.cache.currentlyCached.findPrecise( gatheredAEItemStack );
-				if (e != null)
+				try
 				{
-					e.decStackSize( gathered.getCount() );
+					this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
+				}
+				catch( GridAccessException ex )
+				{
+					// meh
 				}
 			}
 
-			return gatheredAEItemStack;
+			return AEItemStack.fromItemStack( gathered );
 		}
 
 		return null;
@@ -271,10 +274,9 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 	private static class InventoryCache implements Iterable<ItemSlot>
 	{
+		private IAEItemStack[] cachedAeStacks = new IAEItemStack[0];
 		private final IItemHandler itemHandler;
 		private final StorageFilter mode;
-		IItemList<IAEItemStack> currentlyCached = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
-
 
 		public InventoryCache( IItemHandler itemHandler, StorageFilter mode )
 		{
@@ -284,7 +286,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 		public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
 		{
-			currentlyCached.iterator().forEachRemaining( out::add );
+			Arrays.stream( this.cachedAeStacks ).forEach( out::add );
 			return out;
 		}
 
@@ -296,41 +298,93 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 		public List<IAEItemStack> update()
 		{
 			final List<IAEItemStack> changes = new ArrayList<>();
+			final int slots = this.itemHandler.getSlots();
 
-			IItemList<IAEItemStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
-
-			for ( final ItemSlot is : this )
+			// Make room for new slots
+			if( slots > this.cachedAeStacks.length )
 			{
+				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
+			}
+
+			for( final ItemSlot is : this )
+			{
+				// Save the old stuff
+				final IAEItemStack oldAeIS = this.cachedAeStacks[is.getSlot()];
 				final ItemStack newIS = !is.isExtractable() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? ItemStack.EMPTY : is.getItemStack();
-				if( !newIS.isEmpty() )
+
+				this.handlePossibleSlotChanges( is.getSlot(), oldAeIS, newIS, changes );
+			}
+			// Handle cases where the number of slots actually is lower now than before
+			if( slots < this.cachedAeStacks.length )
+			{
+				for( int slot = slots; slot < this.cachedAeStacks.length; slot++ )
 				{
-					currentlyOnStorage.add( is.getAEItemStack() );
+					final IAEItemStack aeStack = this.cachedAeStacks[slot];
+
+					if( aeStack != null )
+					{
+						final IAEItemStack a = aeStack.copy();
+						a.setStackSize( -a.getStackSize() );
+						changes.add( a );
+					}
 				}
-			}
 
-			for ( final IAEItemStack is : currentlyCached )
-			{
-				is.setStackSize( -is.getStackSize() );
+				// Reduce the cache size
+				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
 			}
 
-			for ( final IAEItemStack is : currentlyOnStorage )
-			{
-				currentlyCached.add( is );
-			}
-
-			for ( final IAEItemStack is : currentlyCached )
-			{
-				if( is.getStackSize() != 0 )
-				{
-					changes.add( is );
-				}
-			}
-
-			currentlyCached = currentlyOnStorage;
-
 			return changes;
 		}
 
+		private void handlePossibleSlotChanges( int slot, IAEItemStack oldAeIS, ItemStack newIS, List<IAEItemStack> changes )
+		{
+			if( oldAeIS != null && oldAeIS.isSameType( newIS ) )
+			{
+				this.handleStackSizeChanged( slot, oldAeIS, newIS, changes );
+			}
+			else
+			{
+				this.handleItemChanged( slot, oldAeIS, newIS, changes );
+			}
+		}
+
+		private void handleStackSizeChanged( int slot, IAEItemStack oldAeIS, ItemStack newIS, List<IAEItemStack> changes )
+		{
+			// Still the same item, but amount might have changed
+			final long diff = newIS.getCount() - oldAeIS.getStackSize();
+
+			if( diff != 0 )
+			{
+				final IAEItemStack stack = oldAeIS.copy();
+				stack.setStackSize( newIS.getCount() );
+
+				this.cachedAeStacks[slot] = stack;
+
+				final IAEItemStack a = stack.copy();
+				a.setStackSize( diff );
+				changes.add( a );
+			}
+		}
+
+		private void handleItemChanged( int slot, IAEItemStack oldAeIS, ItemStack newIS, List<IAEItemStack> changes )
+		{
+			// Completely different item
+			this.cachedAeStacks[slot] = AEItemStack.fromItemStack( newIS );
+
+			// If we had a stack previously in this slot, notify the network about its disappearance
+			if( oldAeIS != null )
+			{
+				oldAeIS.setStackSize( -oldAeIS.getStackSize() );
+				changes.add( oldAeIS );
+			}
+
+			// Notify the network about the new stack. Note that this is null if newIS was null
+			if( this.cachedAeStacks[slot] != null )
+			{
+				changes.add( this.cachedAeStacks[slot] );
+			}
+		}
+
 		@Override
 		public Iterator<ItemSlot> iterator()
 		{

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

@@ -13,6 +13,7 @@ import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.core.AELog;
+import appeng.me.GridAccessException;
 import appeng.me.helpers.IGridProxyable;
 import appeng.me.storage.ITickingMonitor;
 import appeng.util.item.AEItemStack;
@@ -23,6 +24,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.item.ItemStack;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -83,9 +85,14 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
 
         if( type == Actionable.MODULATE )
         {
-            this.cache
-                    .currentlyCached
-                    .add( AEItemStack.fromItemStack( orgInput ).setStackSize( orgInput.getCount() - remaining.getCount() ) );
+            try
+            {
+                this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
+            }
+            catch( GridAccessException ex )
+            {
+                // meh
+            }
         }
 
         return AEItemStack.fromItemStack( remaining );
@@ -95,7 +102,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
     @Override
     public IAEItemStack extractItems( IAEItemStack request, Actionable mode, IActionSource src )
     {
-        int remainingSize = Ints.saturatedCast( request.getStackSize() );
+        int remainingSize = Ints.saturatedCast(request.getStackSize());
 
         final boolean simulate = ( mode == Actionable.SIMULATE );
 
@@ -105,22 +112,25 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
         {
             // Something broke. It should never return more than we requested...
             // We're going to silently eat the remainder
-            AELog.warn( "Mod that provided item handler %s is broken. Returned %s items while only requesting %d.", this.itemRepository.getClass().getName(), extracted.toString(), remainingSize );
+            AELog.warn( "Mod that provided item handler %s is broken. Returned %s items while only requesting %d.",
+                    this.itemRepository.getClass().getName(), extracted.toString(), remainingSize );
             extracted.setCount( remainingSize );
         }
 
         if( !extracted.isEmpty() )
         {
-            IAEItemStack extractedAEItemStack = AEItemStack.fromItemStack( extracted );
             if( mode == Actionable.MODULATE )
             {
-                IAEItemStack e = this.cache.currentlyCached.findPrecise( extractedAEItemStack );
-                if (e != null)
+                try
                 {
-                    e.decStackSize( extracted.getCount() );
+                    this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
+                }
+                catch( GridAccessException ex )
+                {
+                    // meh
                 }
             }
-            return extractedAEItemStack;
+            return AEItemStack.fromItemStack( extracted );
         }
         return null;
     }
@@ -192,7 +202,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
 
     private static class InventoryCache
     {
-        private IItemList<IAEItemStack> currentlyCached = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+        private IAEItemStack[] cachedAeStacks = new IAEItemStack[0];
         private final IItemRepository iItemRepository;
 
         public InventoryCache( IItemRepository iItemRepository )
@@ -202,7 +212,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
 
         public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
         {
-            currentlyCached.iterator().forEachRemaining( out::add );
+            Arrays.stream( this.cachedAeStacks ).forEach( out::add );
             return out;
         }
 
@@ -210,31 +220,95 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
         {
             final List<IAEItemStack> changes = new ArrayList<>();
 
-            IItemList<IAEItemStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
-            this.iItemRepository.getAllItems().stream().map( s -> AEItemStack.fromItemStack( s.itemPrototype ).setStackSize( s.count ) ).forEach( currentlyOnStorage::add );
+            List<IAEItemStack> out = this.iItemRepository.getAllItems().stream().map( s -> AEItemStack.fromItemStack( s.itemPrototype ).setStackSize( s.count ) ).collect( Collectors.toList() );
 
-            for ( final IAEItemStack is : currentlyCached )
+            final int size = out.size();
+
+            // Make room for new slots
+            if( size > this.cachedAeStacks.length )
             {
-                is.setStackSize( -is.getStackSize() );
+                this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, size );
             }
 
-            for ( final IAEItemStack is : currentlyOnStorage )
+            for( int x = 0; x < size; x++ )
             {
-                currentlyCached.add( is );
+                // Save the old stuff
+                final IAEItemStack oldAeIS = this.cachedAeStacks[x];
+                final IAEItemStack newIS = out.get( x );
+
+                this.handlePossibleSlotChanges( x, oldAeIS, newIS, changes );
             }
 
-            for ( final IAEItemStack is : currentlyCached )
+            // Handle cases where the number of slots actually is lower now than before
+            if( size < this.cachedAeStacks.length )
             {
-                if( is.getStackSize() != 0 )
+                for( int x = 0; x < this.cachedAeStacks.length; x++ )
                 {
-                    changes.add( is );
-                }
-            }
+                    final IAEItemStack aeStack = this.cachedAeStacks[x];
 
-            currentlyCached = currentlyOnStorage;
+                    if( aeStack != null )
+                    {
+                        final IAEItemStack a = aeStack.copy();
+                        a.setStackSize( -a.getStackSize() );
+                        changes.add( a );
+                    }
+                }
+
+                // Reduce the cache size
+                this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, size );
+            }
 
             return changes;
         }
 
+        private void handlePossibleSlotChanges( int slot, IAEItemStack oldAeIS, IAEItemStack newIS, List<IAEItemStack> changes )
+        {
+            if( oldAeIS != null && oldAeIS.isSameType( newIS ) )
+            {
+                this.handleStackSizeChanged( slot, oldAeIS, newIS, changes );
+            }
+            else
+            {
+                this.handleItemChanged( slot, oldAeIS, newIS, changes );
+            }
+        }
+
+        private void handleStackSizeChanged( int slot, IAEItemStack oldAeIS, IAEItemStack newIS, List<IAEItemStack> changes )
+        {
+            // Still the same item, but amount might have changed
+            final long diff = newIS.getStackSize() - oldAeIS.getStackSize();
+
+            if( diff != 0 )
+            {
+                final IAEItemStack stack = oldAeIS.copy();
+                stack.setStackSize( newIS.getStackSize() );
+
+                this.cachedAeStacks[slot] = stack;
+
+                final IAEItemStack a = stack.copy();
+                a.setStackSize( diff );
+                changes.add( a );
+            }
+        }
+
+        private void handleItemChanged( int slot, IAEItemStack oldAeIS, IAEItemStack newIS, List<IAEItemStack> changes )
+        {
+            // Completely different item
+            this.cachedAeStacks[slot] =  newIS ;
+
+            // If we had a stack previously in this slot, notify the network about its disappearance
+            if( oldAeIS != null )
+            {
+                oldAeIS.setStackSize( -oldAeIS.getStackSize() );
+                changes.add( oldAeIS );
+            }
+
+            // Notify the network about the new stack. Note that this is null if newIS was null
+            if( this.cachedAeStacks[slot] != null )
+            {
+                changes.add( this.cachedAeStacks[slot] );
+            }
+        }
+
     }
 }

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

@@ -22,8 +22,12 @@ package appeng.parts.misc;
 import java.util.Collections;
 import java.util.List;
 
+import appeng.fluids.parts.PartFluidInterface;
+import appeng.fluids.tile.TileFluidInterface;
+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;
 
@@ -153,7 +157,24 @@ public abstract class PartSharedStorageBus extends PartUpgradeable implements IG
 	@Override
 	public void onNeighborChanged( IBlockAccess w, BlockPos pos, BlockPos neighbor )
 	{
-		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();
+			}
+		}
+		if( te == null || te instanceof TileFluidInterface )
+		{
+			this.resetCache( true );
+			this.resetCache();
+		}
+		else
 		{
 			this.resetCache( false );
 		}

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

@@ -23,6 +23,10 @@ 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 com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -234,7 +238,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		{
 			this.resetCacheLogic = 2;
 		}
-		else
+		else if( resetCacheLogic < 2 )
 		{
 			this.resetCacheLogic = 1;
 		}
@@ -258,16 +262,19 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	@Override
 	public void postChange( final IBaseMonitor<IAEItemStack> monitor, final Iterable<IAEItemStack> change, final IActionSource source )
 	{
-		try
+		if( source == this.mySrc || source.machine().map( machine -> machine == this ).orElse( false ) )
 		{
-			if( this.getProxy().isActive() )
+			try
 			{
-				this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change, this.mySrc );
+				if( this.getProxy().isActive() )
+				{
+					this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change, this.mySrc );
+				}
+			}
+			catch( final GridAccessException e )
+			{
+				// :(
 			}
-		}
-		catch( final GridAccessException e )
-		{
-			// :(
 		}
 	}
 
@@ -293,7 +300,15 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 			final TileEntity te = w.getTileEntity( neighbor );
 
 			// In case the TE was destroyed, we have to do a full reset immediately.
-			if( te == null )
+			if( te instanceof TileCableBus )
+			{
+				if( ( (TileCableBus) te ).getPart( this.getSide().getOpposite() ) instanceof PartInterface )
+				{
+					this.resetCache( true );
+					this.resetCache();
+				}
+			}
+			if( te == null || te instanceof TileInterface )
 			{
 				this.resetCache( true );
 				this.resetCache();
@@ -431,16 +446,6 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 			return Objects.hash( target, target.getCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, targetSide ) );
 		}
 
-		if (ITEM_REPOSITORY_CAPABILITY != null && target.hasCapability( ITEM_REPOSITORY_CAPABILITY, targetSide ))
-		{
-			final IItemRepository handlerRepo = target.getCapability( ITEM_REPOSITORY_CAPABILITY, targetSide );
-
-			if( handlerRepo != null )
-			{
-				return Objects.hash( target, handlerRepo, handlerRepo.getAllItems().size() );
-			}
-		}
-
 		final IItemHandler itemHandler = target.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, targetSide );
 
 		if( itemHandler != null )
@@ -554,7 +559,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		try
 		{
 			// force grid to update handlers...
-			this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
+			(( GridStorageCache ) this.getProxy().getGrid().getCache( IStorageGrid.class )).cellUpdate( null );
 		}
 		catch( final GridAccessException e )
 		{
@@ -595,7 +600,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	{
 		if( channel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
 		{
-			final IMEInventoryHandler<IAEItemStack> out = this.getInternalHandler();
+			final IMEInventoryHandler<IAEItemStack> out = this.getProxy().isActive() ? this.getInternalHandler() : null;
 			if( out != null )
 			{
 				return Collections.singletonList( out );

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

@@ -21,12 +21,10 @@ package appeng.parts.reporting;
 
 import java.io.IOException;
 
-import appeng.api.networking.events.MENetworkChannelsChanged;
-import appeng.api.networking.events.MENetworkEventSubscribe;
-import appeng.api.networking.events.MENetworkPowerStatusChange;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.fluids.util.AEFluidStack;
+import appeng.util.item.AEStack;
 import io.netty.buffer.ByteBuf;
 
 import net.minecraft.client.renderer.GlStateManager;
@@ -45,6 +43,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.AEApi;
 import appeng.api.implementations.parts.IPartStorageMonitor;
+import appeng.api.networking.security.IActionSource;
 import appeng.api.networking.storage.IStackWatcher;
 import appeng.api.networking.storage.IStackWatcherHost;
 import appeng.api.parts.IPartModel;
@@ -53,6 +52,7 @@ import appeng.api.storage.IStorageChannel;
 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.client.render.TesrRenderHelper;
 import appeng.core.localization.PlayerMessages;
 import appeng.helpers.Reflected;
@@ -206,10 +206,17 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 				fluidInTank = fluidHandlerItem.drain( Integer.MAX_VALUE, false );
 			}
 
-			if (fluidInTank == null)
+			if( fluidInTank == null )
 			{
 				this.configuredFluid = null;
-				this.configuredItem = AEItemStack.fromItemStack( eq );
+				if( !eq.isEmpty() )
+				{
+					this.configuredItem = AEItemStack.fromItemStack( eq ).setStackSize( 0 );
+				}
+				else
+				{
+					this.configuredItem = null;
+				}
 			}
 			else if( fluidInTank.amount > 0 )
 			{
@@ -385,87 +392,19 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 		this.configureWatchers();
 	}
 
-	@MENetworkEventSubscribe
-	public void powerStatusChange( final MENetworkPowerStatusChange ev )
-	{
-		if( !this.getProxy().isPowered() )
-		{
-			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.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( final IAEStack diffStack, final IStorageChannel chan )
+	public void onStackChange( final IItemList o, final IAEStack fullStack, final IAEStack diffStack, final IActionSource src, final IStorageChannel chan )
 	{
 		if( this.configuredItem != null )
 		{
-			long diff = this.configuredItem.getStackSize() + diffStack.getStackSize();
-			this.configuredItem.setStackSize( diff >= 0 ? this.configuredItem.getStackSize() + diffStack.getStackSize() : 0 );
+			if( fullStack == null )
+			{
+				this.configuredItem.setStackSize( 0 );
+			}
+			else
+			{
+				this.configuredItem.setStackSize( fullStack.getStackSize() );
+			}
 
 			final long stackSize = this.configuredItem.getStackSize();
 			final String humanReadableText = NUMBER_CONVERTER.toWideReadableForm( stackSize );
@@ -478,8 +417,14 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 		}
 		else if( this.configuredFluid != null )
 		{
-			long diff = this.configuredFluid.getStackSize() + diffStack.getStackSize();
-			this.configuredFluid.setStackSize( diff >= 0 ? this.configuredFluid.getStackSize() + diffStack.getStackSize() : 0 );
+			if( fullStack == null )
+			{
+				this.configuredFluid.setStackSize( 0 );
+			}
+			else
+			{
+				this.configuredFluid.setStackSize( fullStack.getStackSize() );
+			}
 
 			final long stackSize = this.configuredFluid.getStackSize() / 1000;
 			final String humanReadableText = NUMBER_CONVERTER.toWideReadableForm( stackSize ) + "B";

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

@@ -170,8 +170,7 @@ public class PartConversionMonitor extends AbstractPartMonitor
 				this.insertItem( player, hand, false );
 			}
 		}
-
-		return true;
+		return super.onPartActivate( player, hand, pos );
 	}
 
 	@Override

src/main/java/appeng/tile/networking/TileEnergyCell.java

@@ -155,7 +155,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage
 			return 0;
 		}
 
-		if( this.internalCurrentPower < 0.01 && amt > 0.01 )
+		if( this.internalCurrentPower < 0.01 && amt > 0 )
 		{
 			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.001 )
+		if( wasFull && amt > 0 )
 		{
 			try
 			{

src/main/java/appeng/util/item/OreReference.java

@@ -43,7 +43,7 @@ public class OreReference
 		return this.otherOptions;
 	}
 
-	public List<IAEItemStack> getAEEquivalents()
+	List<IAEItemStack> getAEEquivalents()
 	{
 		if( this.aeOtherOptions == null )
 		{