yet another try at energy issues

fix requesters not being added to the energy grid partially revert the energy 'fixes' potential desync on item count energy and items change
fluid pass
2021-09-17 00:09:49 -03:00 · 2021-09-13 04:22:52 -03:00 · 2021-09-13 02:10:28 -03:00 · 2021-09-11 22:48:45 -03:00 · 2021-09-06 23:51:32 -03:00 · 2021-09-05 20:28:37 -03:00
29 changed files with 533 additions and 856 deletions
@@ -3,7 +3,7 @@ aechannel=stable
 aebuild=7
 aegroup=appeng
 aebasename=appliedenergistics2
-trousers=omni-fixes-v47
+trousers=omni-fixes-v46aa

 #########################################################
 # Versions                                              #
@@ -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";
@@ -22,7 +22,6 @@ package appeng.crafting;
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;

-import appeng.me.cache.CraftingGridCache;
 import com.google.common.base.Stopwatch;

 import net.minecraft.entity.player.EntityPlayer;
@@ -72,8 +71,6 @@ public class CraftingJob implements Runnable, ICraftingJob
 	private boolean done = false;
 	private int time;
 	private int incTime;
-	private final ICraftingGrid cc;
-	private final IStorageGrid sg;

 	private World wrapWorld( final World w )
 	{
@@ -87,9 +84,10 @@ public class CraftingJob implements Runnable, ICraftingJob
 		this.actionSrc = actionSrc;

 		this.callback = callback;
-		this.cc = grid.getCache( ICraftingGrid.class );
-		this.sg = grid.getCache( IStorageGrid.class );
-		this.original = new MECraftingInventory( sg.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ), actionSrc, false, false, false );
+		final ICraftingGrid cc = grid.getCache( ICraftingGrid.class );
+		final IStorageGrid sg = grid.getCache( IStorageGrid.class );
+		this.original = new MECraftingInventory( sg
+				.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ), actionSrc, false, false, false );

 		this.setTree( this.getCraftingTree( cc, what ) );
 		this.availableCheck = null;
@@ -382,11 +380,6 @@ public class CraftingJob implements Runnable, ICraftingJob
 		}
 	}

-	public void addIncompletablePattern( ICraftingPatternDetails details, IAEItemStack stack )
-	{
-		( (CraftingGridCache) cc ).getPatternStatusManager().put( details, stack );
-	}
-
 	private static class TwoIntegers
 	{
 		private final long perOp = 0;
@@ -22,10 +22,7 @@ package appeng.crafting;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Optional;

-import appeng.util.item.OreHelper;
-import appeng.util.item.OreReference;
 import com.google.common.collect.Lists;

 import net.minecraft.world.World;
@@ -120,11 +117,6 @@ public class CraftingTreeNode
 		return this.parent.notRecursive( details );
 	}

-	public CraftingTreeProcess getParent()
-	{
-		return parent;
-	}
-
 	IAEItemStack request( final MECraftingInventory inv, long l, final IActionSource src ) throws CraftBranchFailure, InterruptedException
 	{
 		this.job.handlePausing();
@@ -326,7 +318,6 @@ public class CraftingTreeNode
 		if( this.missing > 0 )
 		{
 			job.addMissing( this.getStack( this.missing ) );
-			addMissingIAEStack();
 		}
 		// missing = 0;

@@ -338,29 +329,6 @@ public class CraftingTreeNode
 		}
 	}

-	void addMissingIAEStack()
-	{
-		if( parent != null )
-		{
-			parent.addMissingIAEStack();
-			if( missing > 0 )
-			{
-				if( this.parent.details.canSubstitute() && this.getSlot() >= 0 )
-				{
-					final List<IAEItemStack> substitutes = this.parent.details.getSubstituteInputs( this.slot );
-					for( IAEItemStack stack : substitutes )
-					{
-						job.addIncompletablePattern( this.getParent().details, stack.copy().setStackSize( this.missing ) );
-					}
-				}
-				else
-				{
-					job.addIncompletablePattern( this.getParent().details, this.getStack( this.missing ) );
-				}
-			}
-		}
-	}
-
 	IAEItemStack getStack( final long size )
 	{
 		final IAEItemStack is = this.what.copy();
@@ -23,10 +23,11 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;

-import appeng.me.cache.CraftingGridCache;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+import net.minecraftforge.fml.common.FMLCommonHandler;

 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
@@ -65,7 +66,7 @@ public class CraftingTreeProcess
 		this.depth = depth;
 		final World world = job.getWorld();

-		if( !( (CraftingGridCache) cc ).getPatternStatusManager().containsIncompletablePattern( details ) && details.isCraftable() )
+		if( details.isCraftable() )
 		{
 			final IAEItemStack[] list = details.getInputs();

@@ -173,11 +174,6 @@ public class CraftingTreeProcess
 		return this.parent == null || this.parent.notRecursive( details );
 	}

-	public CraftingTreeNode getParent()
-	{
-		return parent;
-	}
-
 	long getTimes( final long remaining, final long stackSize )
 	{
 		if( this.limitQty || this.fullSimulation )
@@ -309,7 +305,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 );
@@ -321,12 +317,4 @@ public class CraftingTreeProcess
 			pro.getPlan( plan );
 		}
 	}
-
-	public void addMissingIAEStack()
-	{
-		if( parent != null )
-		{
-			parent.addMissingIAEStack();
-		}
-	}
 }
@@ -91,12 +91,10 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 	private int isWorking = -1;
 	private int priority;

-	private final MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<>( new NullInventory<IAEItemStack>(), AEApi.instance()
-			.storage()
-			.getStorageChannel( IItemStorageChannel.class ) );
-	private final MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance()
-			.storage()
-			.getStorageChannel( IFluidStorageChannel.class ) );
+	private final MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<>( new NullInventory<IAEItemStack>(), AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
+	private final MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) );
+	private boolean resetConfigCache;
+	private IMEMonitor<IAEFluidStack> configCachedHandler;

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

 			return (IMEMonitor<T>) this.fluids;
@@ -450,7 +453,12 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable

 		if( inventory == this.config )
 		{
+			boolean cfg = hasConfig();
 			this.readConfig();
+			if( cfg != hasConfig )
+			{
+				resetConfigCache = true;
+			}
 		}
 		else if( inventory == this.tanks )
 		{
@@ -555,7 +563,6 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 		InterfaceInventory( final DualityFluidInterface tileInterface )
 		{
 			super( tileInterface.tanks );
-			this.setActionSource( new MachineSource( tileInterface.iHost ) );
 		}

 		@Override
@@ -232,18 +232,11 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo

 			for( IFluidTankProperties tankProperty : tankProperties )
 			{
-				FluidStack newFS = tankProperty.getContents();
-				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && newFS != null )
+				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && this.fluidHandler.drain( 1, false ) == null )
 				{
-					if( this.fluidHandler.drain( 1, false ) == null )
-					{
-						newFS = null;
-					}
-				}
-				if( newFS != null )
-				{
-					currentlyOnStorage.add( AEFluidStack.fromFluidStack( newFS ) );
+					continue;
 				}
+				currentlyOnStorage.add( AEFluidStack.fromFluidStack( tankProperty.getContents() ) );
 			}

 			for ( final IAEFluidStack is : currentlyCached )
@@ -227,7 +227,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 		{
 			this.resetCacheLogic = 2;
 		}
-		else
+		else if( this.resetCacheLogic < 2 )
 		{
 			this.resetCacheLogic = 1;
 		}
@@ -326,6 +326,10 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni

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

 			if( inv != null )
@@ -23,13 +23,9 @@ import java.util.*;

 import javax.annotation.Nullable;

-import appeng.api.definitions.IItemDefinition;
-import appeng.api.networking.crafting.*;
 import appeng.integration.modules.gregtech.GTCEInventoryAdaptor;
-import appeng.me.cache.CraftingGridCache;
 import appeng.util.*;
 import appeng.util.inv.*;
-import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableSet;

 import de.ellpeck.actuallyadditions.api.tile.IPhantomTile;
@@ -38,7 +34,6 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.MetaTileEntityHolder;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.Minecraft;
 import net.minecraft.init.Items;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
@@ -68,6 +63,10 @@ import appeng.api.implementations.tiles.ICraftingMachine;
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridNode;
+import appeng.api.networking.crafting.ICraftingLink;
+import appeng.api.networking.crafting.ICraftingPatternDetails;
+import appeng.api.networking.crafting.ICraftingProvider;
+import appeng.api.networking.crafting.ICraftingProviderHelper;
 import appeng.api.networking.energy.IEnergySource;
 import appeng.api.networking.events.MENetworkCraftingPatternChange;
 import appeng.api.networking.security.IActionHost;
@@ -109,6 +108,7 @@ import static gregtech.api.block.machines.BlockMachine.getMetaTileEntity;

 public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost
 {
+	private int[] failedCraftTriesSlot = {0,0,0,0,0,0,0,0,0};

 	public static final int NUMBER_OF_STORAGE_SLOTS = 9;
 	public static final int NUMBER_OF_CONFIG_SLOTS = 9;
@@ -140,15 +140,17 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	private int isWorking = -1;
 	private final Accessor accessor = new Accessor();
 	private EnumSet<EnumFacing> visitedFaces = EnumSet.noneOf( EnumFacing.class );
-	private EnumMap<EnumFacing,List<ItemStack>> waitingToSendFacing = new EnumMap<>(EnumFacing.class);
+	private EnumMap<EnumFacing, List<ItemStack>> waitingToSendFacing = new EnumMap<>( EnumFacing.class );
 	private GTCEInventoryAdaptor GTad;
+	private boolean resetConfigCache = true;
+	private IMEMonitor<IAEItemStack> configCachedHandler;

 	public DualityInterface( final AENetworkProxy networkProxy, final IInterfaceHost ih )
 	{
 		this.gridProxy = networkProxy;
 		this.gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL );

-		this.upgrades = new StackUpgradeInventory( this.gridProxy.getMachineRepresentation(), this, 4);
+		this.upgrades = new StackUpgradeInventory( this.gridProxy.getMachineRepresentation(), this, 4 );
 		this.cm.registerSetting( Settings.BLOCK, YesNo.NO );
 		this.cm.registerSetting( Settings.INTERFACE_TERMINAL, YesNo.YES );

@@ -176,9 +178,14 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			return;
 		}
-		if( inv == this.config )
+		if( inv == this.config && ( !removed.isEmpty() || !added.isEmpty() ) )
 		{
+			boolean cfg = hasConfig();
 			this.readConfig();
+			if( cfg != hasConfig )
+			{
+				resetConfigCache = true;
+			}
 		}
 		else if( inv == this.patterns && ( !removed.isEmpty() || !added.isEmpty() ) )
 		{
@@ -929,7 +936,17 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			if( this.getInstalledUpgrades( Upgrades.CRAFTING ) > 0 && itemStack != null )
 			{
-				return this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(), this.gridProxy.getGrid(), this.gridProxy.getCrafting(), this.mySource );
+				if (this.failedCraftTriesSlot[x] <= 0)
+				{
+					boolean crafted = this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(),
+						this.gridProxy.getGrid(), this.gridProxy.getCrafting(), this.mySource );
+
+					if (crafted) this.failedCraftTriesSlot[x] = 0;
+					else{
+						this.failedCraftTriesSlot[x] += 2;
+					}
+				}
+				this.failedCraftTriesSlot[x] -= 1;
 			}
 		}
 		catch( final GridAccessException e )
@@ -963,7 +980,12 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			if( this.hasConfig() )
 			{
-				return (IMEMonitor<T>) new InterfaceInventory( this );
+				if( resetConfigCache )
+				{
+					resetConfigCache = false;
+					configCachedHandler = new InterfaceInventory( this );
+				}
+				return (IMEMonitor<T>) configCachedHandler;
 			}

 			return (IMEMonitor<T>) this.items;
@@ -1571,7 +1593,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		public InterfaceInventory( final DualityInterface tileInterface )
 		{
 			super( new AdaptorItemHandler( tileInterface.storage ) );
-			this.setActionSource( new MachineSource( DualityInterface.this.iHost ) );
 		}

 		@Override
@@ -22,9 +22,6 @@ package appeng.helpers;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-import appeng.api.networking.crafting.*;
-import appeng.me.cache.CraftingGridCache;
-import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableSet;

 import net.minecraft.nbt.NBTTagCompound;
@@ -32,6 +29,10 @@ import net.minecraft.world.World;

 import appeng.api.AEApi;
 import appeng.api.networking.IGrid;
+import appeng.api.networking.crafting.ICraftingGrid;
+import appeng.api.networking.crafting.ICraftingJob;
+import appeng.api.networking.crafting.ICraftingLink;
+import appeng.api.networking.crafting.ICraftingRequester;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.util.InventoryAdaptor;
@@ -131,17 +132,6 @@ public class MultiCraftingTracker
 					final IAEItemStack aisC = ais.copy();
 					aisC.setStackSize( itemToCraft );

-					CraftingGridCache cgc = (CraftingGridCache) cg;
-
-					ImmutableCollection<ICraftingPatternDetails> cl = cgc.getCraftingFor( aisC, null, x, w );
-					for( ICraftingPatternDetails craftingPatternDetails : cl )
-					{
-						if( cgc.getPatternStatusManager().containsIncompletablePattern( craftingPatternDetails ) )
-						{
-							return false;
-						}
-					}
-
 					this.setJob( x, cg.beginCraftingJob( w, g, mySrc, aisC, null ) );
 				}
 			}
@@ -147,7 +147,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 				}
 			}
 		}
-		final int outputLength = 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]);
@@ -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;
@@ -35,7 +35,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadFactory;

-import appeng.me.helpers.PatternStatusManager;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableList;
@@ -267,17 +266,17 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 		// coalesce change events during a grid traversal to a single rebuild
 		if (pauseRebuilds != 0)
 		{
-			rebuildNeeded.add( this );
+			rebuildNeeded.add(this);
 			return;
 		}

-		final Object2ObjectMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = new Object2ObjectOpenHashMap<>( this.craftableItems );
+		final Object2ObjectMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = new Object2ObjectOpenHashMap<>(this.craftableItems);
+		final Set<IAEItemStack> oldEmitableItems = new HashSet<>(this.emitableItems);

 		// erase list.
 		this.craftingMethods.clear();
 		this.craftableItems.clear();
 		this.emitableItems.clear();
-		( (GridStorageCache) this.storageGrid ).clearPatternStatus();

 		// re-create list..
 		for( final ICraftingProvider provider : this.craftingProviders )
@@ -290,7 +289,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();
@@ -318,14 +317,42 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 		ObjectSet<Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>>> i = oldItems.entrySet();
 		for ( Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>> ais : i) {
 			if (!this.craftableItems.containsKey( ais.getKey() )) {
-				craftablesChanged.put( ais.getKey().setCraftable( false ), ais.getValue() );
+				IAEItemStack changedStack = ais.getKey().copy();
+				changedStack.reset();
+				changedStack.setCraftable( false );
+				craftablesChanged.put( changedStack, ais.getValue() );
 			}
 		}

 		ObjectSet<Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>>> j = this.craftableItems.entrySet();
 		for ( Entry<IAEItemStack, ImmutableList<ICraftingPatternDetails>> ais : j) {
 			if (!oldItems.containsKey( ais )){
-				craftablesChanged.put( ais.getKey().setCraftable( true ), ais.getValue() );
+				IAEItemStack changedStack = ais.getKey().copy();
+				changedStack.reset();
+				changedStack.setCraftable( true );
+				craftablesChanged.put( changedStack, ais.getValue() );
+			}
+		}
+
+		for( final IAEItemStack st : oldEmitableItems )
+		{
+			if( !emitableItems.contains( st ) )
+			{
+				IAEItemStack changedStack = st.copy();
+				changedStack.reset();
+				changedStack.setCraftable( false );
+				craftablesChanged.put( changedStack, null );
+			}
+		}
+
+		for( final IAEItemStack st : this.emitableItems )
+		{
+			if( !oldEmitableItems.contains( st ) )
+			{
+				IAEItemStack changedStack = st.copy();
+				changedStack.reset();
+				changedStack.setCraftable( true );
+				craftablesChanged.put( changedStack, null );
 			}
 		}

@@ -649,7 +676,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper

 	public boolean hasCpu( final ICraftingCPU cpu )
 	{
-		if( cpu instanceof CraftingCPUCluster )
+		if (cpu instanceof CraftingCPUCluster)
 		{
 			return this.craftingCPUClusters.contains( (CraftingCPUCluster) cpu );
 		}
@@ -661,11 +688,6 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 		return this.interestManager;
 	}

-	public PatternStatusManager getPatternStatusManager()
-	{
-		return ( (GridStorageCache) this.storageGrid ).getPatternStatusManager();
-	}
-
 	private static class ActiveCpuIterator implements Iterator<ICraftingCPU>
 	{

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


-import java.util.*;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.NavigableSet;
+import java.util.PriorityQueue;
+import java.util.Queue;
+import java.util.Set;

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

 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
@@ -70,7 +81,7 @@ public class EnergyGridCache implements IEnergyGrid
 	// Should only be modified from the add/remove methods below to guard against
 	// concurrent modifications
 	private final double averageLength = 40.0;
-	private final Multimap<Integer,IAEPowerStorage> providers = HashMultimap.create();
+	private final Set<IAEPowerStorage> providers = new LinkedHashSet<>();
 	// Used to track whether an extraction is currently in progress, to fail fast
 	// when something externally
 	// modifies the energy grid.
@@ -78,7 +89,7 @@ public class EnergyGridCache implements IEnergyGrid

 	// Should only be modified from the add/remove methods below to guard against
 	// concurrent modifications
-	private final Multimap<Integer,IAEPowerStorage> requesters = HashMultimap.create();
+	private final Set<IAEPowerStorage> requesters = new LinkedHashSet<>();
 	// Used to track whether an injection is currently in progress, to fail fast
 	// when something externally
 	// modifies the energy grid.
@@ -115,16 +126,16 @@ public class EnergyGridCache implements IEnergyGrid
 	private double lastStoredPower = -1;

 	private final GridPowerStorage localStorage = new GridPowerStorage();
-	private Set<IAEPowerStorage> providersToRemove = new HashSet<>();
-	private Set<IAEPowerStorage> requestersToRemove = new HashSet<>();
+	private Set<IAEPowerStorage> providerToRemove = new HashSet<>();
+	private Set<IAEPowerStorage> requesterToRemove = new HashSet<>();
 	private Set<IAEPowerStorage> providersToAdd = new HashSet<>();
-	private Set<IAEPowerStorage> requestersToAdd = new HashSet<>();
+	private Set<IAEPowerStorage> requesterToAdd = new HashSet<>();

 	public EnergyGridCache( final IGrid g )
 	{
 		this.myGrid = g;
-		this.requesters.put( 0, this.localStorage );
-		this.providers.put( 1, this.localStorage );
+		this.requesters.add( this.localStorage );
+		this.providers.add( this.localStorage );
 	}

 	@MENetworkEventSubscribe
@@ -176,7 +187,7 @@ public class EnergyGridCache implements IEnergyGrid
 						}
 						else
 						{
-							this.requestersToAdd.add( ev.storage );
+							this.requesterToAdd.add( ev.storage );
 						}
 					}
 					break;
@@ -307,7 +318,7 @@ public class EnergyGridCache implements IEnergyGrid
 	{
 		this.availableTicksSinceUpdate = 0;
 		this.globalAvailablePower = 0;
-		for( final IAEPowerStorage p : this.providers.values() )
+		for( final IAEPowerStorage p : this.providers )
 		{
 			this.globalAvailablePower += p.getAECurrentPower();
 		}
@@ -324,27 +335,25 @@ public class EnergyGridCache implements IEnergyGrid
 	{
 		double extractedPower = 0;

-		providersToAdd.forEach( provider -> {
-			if( provider instanceof GridPowerStorage )
-			{
-				providers.put( 1, provider );
-			}
-			else
-			{
-				providers.put( 0, provider );
-			}
-		} );
+		this.providers.addAll( providersToAdd );
 		providersToAdd.clear();

-		final Iterator<IAEPowerStorage> it = this.providers.values().iterator();
+		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 == localStorage && mode == Actionable.MODULATE )
+				{
+					ls = true;
+					continue;
+				}
+
 				final double req = amt - extractedPower;
 				final double newPower = node.extractAEPower( req, mode, PowerMultiplier.ONE );
 				extractedPower += newPower;
@@ -356,20 +365,25 @@ public class EnergyGridCache implements IEnergyGrid
 			}
 		} finally
 		{
-			providersToRemove.forEach( provider -> {
-				if( provider instanceof GridPowerStorage )
-				{
-					providers.remove( 1, provider );
-				}
-				else
-				{
-					providers.remove( 0, provider );
-				}
-			} );
-			this.providersToRemove.clear();
 			ongoingExtractOperation = false;
 		}

+		if( ls && extractedPower < amt )
+		{
+			final double req = amt - extractedPower;
+			final double newPower = localStorage.extractAEPower( req, mode, PowerMultiplier.ONE );
+
+			extractedPower += newPower;
+
+			if( newPower < req )
+			{
+				providers.remove( localStorage );
+			}
+		}
+
+		providers.removeIf( p -> providerToRemove.contains( p ) );
+		this.providerToRemove.clear();
+
 		final double result = Math.min( extractedPower, amt );

 		if( mode == Actionable.MODULATE )
@@ -391,19 +405,10 @@ public class EnergyGridCache implements IEnergyGrid
 	{
 		final double originalAmount = amt;

-		requestersToAdd.forEach( requester -> {
-			if( requester instanceof GridPowerStorage )
-			{
-				requesters.put( 0, requester );
-			}
-			else
-			{
-				requesters.put( 1, requester );
-			}
-		} );
-		requestersToAdd.clear();
+		this.requesters.addAll( requesterToAdd );
+		requesterToAdd.clear();

-		final Iterator<IAEPowerStorage> it = this.requesters.values().iterator();
+		final Iterator<IAEPowerStorage> it = this.requesters.iterator();

 		ongoingInjectOperation = true;
 		try
@@ -421,20 +426,12 @@ public class EnergyGridCache implements IEnergyGrid
 			}
 		} finally
 		{
-			requestersToRemove.forEach( requester -> {
-				if( requester instanceof GridPowerStorage )
-				{
-					requesters.remove( 0, requester );
-				}
-				else
-				{
-					requesters.remove( 1, requester );
-				}
-			} );
-			this.requestersToRemove.clear();
 			ongoingInjectOperation = false;
 		}

+		requesters.removeIf( r -> requesterToRemove.contains( r ) );
+		this.requesterToRemove.clear();
+
 		final double overflow = Math.max( 0.0, amt );

 		if( mode == Actionable.MODULATE )
@@ -450,8 +447,8 @@ public class EnergyGridCache implements IEnergyGrid
 	{
 		double required = 0;

-		final Iterator<IAEPowerStorage> it = this.requesters.values().iterator();
-		while( required < maxRequired && it.hasNext() )
+		final Iterator<IAEPowerStorage> it = this.requesters.iterator();
+		while ( required < maxRequired && it.hasNext() )
 		{
 			final IAEPowerStorage node = it.next();
 			if( node.getPowerFlow() != AccessRestriction.READ )
@@ -591,7 +588,7 @@ public class EnergyGridCache implements IEnergyGrid
 				}
 				else
 				{
-					this.providersToRemove.add( ps );
+					this.providerToRemove.add( ps );
 				}
 				if( !ongoingInjectOperation )
 				{
@@ -599,7 +596,7 @@ public class EnergyGridCache implements IEnergyGrid
 				}
 				else
 				{
-					this.requestersToRemove.add( ps );
+					this.requesterToRemove.add( ps );
 				}
 			}
 		}
@@ -619,55 +616,28 @@ public class EnergyGridCache implements IEnergyGrid
 	private void addRequester(IAEPowerStorage requester) {
 		Preconditions.checkState(!ongoingInjectOperation,
 				"Cannot modify energy requesters while energy is being injected.");
-		if( requester instanceof GridPowerStorage )
-		{
-			requesters.put( 0, requester );
-		}
-		else
-		{
-			requesters.put( 1, requester );
-		}
+		this.requesters.add(requester);
 	}

 	private void removeRequester(IAEPowerStorage requester) {
 		Preconditions.checkState(!ongoingInjectOperation,
 				"Cannot modify energy requesters while energy is being injected.");
-		if( requester instanceof GridPowerStorage )
-		{
-			requesters.remove( 0, requester );
-		}
-		else
-		{
-			requesters.remove( 1, requester );
-		}
+		this.requesters.remove(requester);
 	}

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

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

+
 	@Override
 	public void addNode( final IGridNode node, final IGridHost machine )
 	{
@@ -717,7 +687,7 @@ public class EnergyGridCache implements IEnergyGrid
 					}
 					else
 					{
-						this.requestersToAdd.add( ps );
+						this.requesterToAdd.add( ps );
 					}
 				}
 			}
@@ -845,4 +815,4 @@ public class EnergyGridCache implements IEnergyGrid
 			}
 		}
 	}
-}
+}
@@ -26,10 +26,7 @@ import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;

-import appeng.api.networking.crafting.ICraftingPatternDetails;
-import appeng.me.helpers.PatternStatusManager;
 import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
 import com.google.common.collect.SetMultimap;

 import appeng.api.AEApi;
@@ -68,10 +65,6 @@ public class GridStorageCache implements IStorageGrid
 	private final HashSet<ICellProvider> inactiveCellProviders = new HashSet<>();
 	private final SetMultimap<IAEStack, ItemWatcher> interests = HashMultimap.create();
 	private final GenericInterestManager<ItemWatcher> interestManager = new GenericInterestManager<>( this.interests );
-	private final Multimap<ICraftingPatternDetails, IAEStack> patternDetails2IAEStackMultimap = HashMultimap.create();
-	private final Multimap<IAEStack, ICraftingPatternDetails> iaeStack2PatternDetailsMultimap = HashMultimap.create();
-	private final PatternStatusManager patternStatusManager = new PatternStatusManager( this.patternDetails2IAEStackMultimap, this.iaeStack2PatternDetailsMultimap );
-
 	private final HashMap<IGridNode, IStackWatcher> watchers = new HashMap<>();
 	private Map<IStorageChannel<? extends IAEStack>, NetworkInventoryHandler<?>> storageNetworks;
 	private Map<IStorageChannel<? extends IAEStack>, NetworkMonitor<?>> storageMonitors;
@@ -116,6 +109,9 @@ public class GridStorageCache implements IStorageGrid
 				this.watchers.remove( node );
 			}
 		}
+
+		this.storageMonitors.forEach( ( channel, monitor ) -> monitor.forceUpdate() );
+
 	}

 	@Override
@@ -144,6 +140,9 @@ public class GridStorageCache implements IStorageGrid
 			this.watchers.put( node, iw );
 			swh.updateWatcher( iw );
 		}
+
+		this.storageMonitors.forEach( ( channel, monitor ) -> monitor.forceUpdate() );
+
 	}

 	@Override
@@ -311,18 +310,6 @@ public class GridStorageCache implements IStorageGrid
 		return this.interestManager;
 	}

-	public PatternStatusManager getPatternStatusManager()
-	{
-		return this.patternStatusManager;
-	}
-
-	public void clearPatternStatus()
-	{
-		System.out.println( "reseting pattern status due to pattern changes" );
-		this.patternDetails2IAEStackMultimap.clear();
-		this.iaeStack2PatternDetailsMultimap.clear();
-	}
-
 	IGrid getGrid()
 	{
 		return this.myGrid;
@@ -25,8 +25,6 @@ import javax.annotation.Nullable;
 import appeng.api.AEApi;
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
-import appeng.api.config.FuzzyMode;
-import appeng.api.networking.crafting.ICraftingPatternDetails;
 import appeng.api.networking.events.MENetworkStorageEvent;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.storage.IMEInventoryHandler;
@@ -35,7 +33,6 @@ import appeng.api.storage.IMEMonitorHandlerReceiver;
 import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
-import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;
 import appeng.me.storage.ItemWatcher;
@@ -64,6 +61,7 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 	private final Object2ObjectMap<IMEMonitorHandlerReceiver<T>, Object> listeners;

 	private boolean sendEvent = false;
+	private boolean forceUpdate = false;
 	@Nonnegative
 	private int localDepthSemaphore = 0;
 	private long gridItemCount;
@@ -127,6 +125,10 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>

 	public long getGridCurrentCount()
 	{
+		if( forceUpdate )
+		{
+			getStorageList();
+		}
 		if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
 		{
 			return gridItemCount;
@@ -138,23 +140,42 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 		return 0;
 	}

-	public long incGridCurrentCount(long count)
+	public void incGridCurrentCount(long count)
 	{
 		if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
 		{
-			return gridItemCount += count;
+			gridItemCount += count;
 		}
 		else if( myChannel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
 		{
-			return gridFluidCount += count;
+			gridFluidCount += count;
 		}
-		return 0;
 	}

 	@Nonnull
 	@Override
 	public IItemList<T> getStorageList()
 	{
+		if( forceUpdate )
+		{
+			forceUpdate = false;
+			this.cachedList.resetStatus();
+			this.getAvailableItems( this.cachedList );
+
+			long count = 0;
+			for (T stack : this.cachedList) {
+				count += stack.getStackSize();
+			}
+			if( myChannel == AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) )
+			{
+				gridItemCount = count;
+			}
+			else if( myChannel == AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) )
+			{
+				gridFluidCount = count;
+			}
+		}
+
 		return this.cachedList;
 	}

@@ -217,47 +238,52 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 		for( final T changedItem : input )
 		{
 			if (changedItem.isCraftable()) {
-				this.cachedList.add( changedItem.copy().setCraftable( true ) );
+				this.cachedList.add( changedItem );
 			}
 			else
 			{
-				this.cachedList.findPrecise( changedItem ).setCraftable( false );
+				T i = this.cachedList.findPrecise( changedItem );
+				if (i != null)
+				i.setCraftable( false );
 			}
 		}
 	}

 	protected void postChange( final boolean add, final Iterable<T> changes, final IActionSource src )
 	{
-		if( GLOBAL_DEPTH.contains( this ) )
+		if( this.localDepthSemaphore > 0 || GLOBAL_DEPTH.contains( this ) )
 		{
 			return;
 		}

+		this.localDepthSemaphore++;
 		GLOBAL_DEPTH.push( this );

 		this.sendEvent = true;

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

-			incGridCurrentCount( changedItem.getStackSize() );
-			this.cachedList.add( changedItem );
+			incGridCurrentCount( change.getStackSize() );
+			this.cachedList.add( change );

-			if( this.myGridCache.getInterestManager().containsKey( changedItem ) )
+			if( this.myGridCache.getInterestManager().containsKey( change ) )
 			{
-				final Collection<ItemWatcher> list = this.myGridCache.getInterestManager().get( changedItem );
+				final Collection<ItemWatcher> list = this.myGridCache.getInterestManager().get( change );

 				if( !list.isEmpty() )
 				{
-					IAEStack<T> fullStack = this.getStorageList().findPrecise( changedItem );
+					IAEStack<T> fullStack = this.getStorageList().findPrecise( change );

 					if( fullStack == null )
 					{
-						fullStack = changedItem.copy();
+						fullStack = change.copy();
 						fullStack.setStackSize( 0 );
 					}

@@ -265,78 +291,18 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>

 					for( final ItemWatcher iw : list )
 					{
-						iw.getHost().onStackChange( this.getStorageList(), fullStack, changedItem, src, this.getChannel() );
+						iw.getHost().onStackChange( this.getStorageList(), fullStack, change, src, this.getChannel() );
 					}

 					this.myGridCache.getInterestManager().disableTransactions();
 				}
 			}
-			if( changedItem instanceof IAEItemStack )
-			{
-				if( this.myGridCache.getPatternStatusManager().containsMissingIAEStack( changedItem ) )
-				{
-					this.myGridCache.getPatternStatusManager().enableTransactions();
-
-					for( ICraftingPatternDetails craftingPatternDetails : this.myGridCache.getPatternStatusManager().getIncompletablePattern( changedItem ) )
-					{
-						for( IAEStack stack : this.myGridCache.getPatternStatusManager().getMissingIAEStack( craftingPatternDetails ) )
-						{
-							if( craftingPatternDetails.canSubstitute() )
-							{
-								if( ( (IAEItemStack) stack ).getItem().isDamageable() )
-								{
-									if( ( (IAEStack) changedItem ).fuzzyComparison( stack, FuzzyMode.IGNORE_ALL ) )
-									{
-										if( changedItem.getStackSize() > 0 )
-										{
-											this.myGridCache.getPatternStatusManager().remove( craftingPatternDetails, stack );
-										}
-									}
-								}
-								else
-								{
-									if( ( (IAEItemStack) stack ).sameOre( (IAEItemStack) changedItem ) )
-									{
-										if( changedItem.getStackSize() > 0 )
-										{
-											if( changedItem.getStackSize() >= stack.getStackSize() )
-											{
-												this.myGridCache.getPatternStatusManager().remove( craftingPatternDetails, stack );
-											}
-											else
-											{
-												stack.decStackSize( changedItem.getStackSize() );
-											}
-										}
-									}
-								}
-							}
-							else if( stack.equals( changedItem ) )
-							{
-								if( changedItem.getStackSize() > 0 )
-								{
-									if( changedItem.getStackSize() >= stack.getStackSize() )
-									{
-										this.myGridCache.getPatternStatusManager().remove( craftingPatternDetails, stack );
-									}
-									else
-									{
-										stack.decStackSize( changedItem.getStackSize() );
-									}
-								}
-							}
-						}
-					}
-
-					this.myGridCache.getPatternStatusManager().disableTransactions();
-
-				}
-			}
 		}

 		this.notifyListenersOfChange( changes, src );

 		final NetworkMonitor<?> last = GLOBAL_DEPTH.pop();
+		this.localDepthSemaphore--;

 		if( last != this )
 		{
@@ -344,6 +310,27 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 		}
 	}

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


-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.NavigableMap;
 import java.util.concurrent.ConcurrentSkipListMap;

+import appeng.fluids.util.AEFluidStack;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidTankProperties;
@@ -48,16 +45,14 @@ import appeng.api.storage.data.IItemList;
 public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITickingMonitor
 {
 	private final IFluidHandler handler;
-	private final IItemList<IAEFluidStack> list = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
+	private IItemList<IAEFluidStack> cache = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
 	private final HashMap<IMEMonitorHandlerReceiver<IAEFluidStack>, Object> listeners = new HashMap<>();
-	private final NavigableMap<Integer, CachedFluidStack> memory;
 	private IActionSource mySource;
 	private StorageFilter mode = StorageFilter.EXTRACTABLE_ONLY;

 	public MEMonitorIFluidHandler( final IFluidHandler handler )
 	{
 		this.handler = handler;
-		this.memory = new ConcurrentSkipListMap<>();
 	}

 	@Override
@@ -82,11 +77,6 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 			return input.copy();
 		}

-		if( type == Actionable.MODULATE )
-		{
-			this.onTick();
-		}
-
 		if( filled == input.getStackSize() )
 		{
 			return null;
@@ -94,6 +84,15 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki

 		final IAEFluidStack o = input.copy();
 		o.setStackSize( input.getStackSize() - filled );
+
+		if( type == Actionable.MODULATE )
+		{
+			IAEFluidStack added = o.copy();
+			this.cache.add( added );
+			this.postDifference( Collections.singletonList( added ) );
+			this.onTick();
+		}
+
 		return o;
 	}

@@ -107,13 +106,18 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 			return null;
 		}

-		if( type == Actionable.MODULATE )
-		{
-			this.onTick();
-		}
-
 		final IAEFluidStack o = request.copy();
 		o.setStackSize( removed.amount );
+
+		if( type == Actionable.MODULATE )
+		{
+			IAEFluidStack cachedStack = this.cache.findPrecise( request );
+			if( cachedStack != null )
+			{
+				cachedStack.decStackSize( o.getStackSize() );
+				this.postDifference( Collections.singletonList( o.copy().setStackSize( -o.getStackSize() ) ) );
+			}
+		}
 		return o;
 	}

@@ -126,111 +130,51 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 	@Override
 	public TickRateModulation onTick()
 	{
-		final List<IAEFluidStack> changes = new ArrayList<>();
-
-		this.list.resetStatus();
-		int high = 0;
 		boolean changed = false;

-		final IFluidTankProperties[] props = this.handler.getTankProperties();
-		for( int slot = 0; slot < this.handler.getTankProperties().length; ++slot )
+		final List<IAEFluidStack> changes = new ArrayList<>();
+		final IFluidTankProperties[] tankProperties = this.handler.getTankProperties();
+
+		IItemList<IAEFluidStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createList();
+
+		for( IFluidTankProperties tankProperty : tankProperties )
 		{
-			final CachedFluidStack old = this.memory.get( slot );
-			high = Math.max( high, slot );
-
-			final FluidStack newIS = !props[slot].canDrain() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? null : props[slot].getContents();
-			final FluidStack oldIS = old == null ? null : old.fluidStack;
-
-			if( isDifferent( newIS, oldIS ) )
+			if( this.mode == StorageFilter.EXTRACTABLE_ONLY && this.handler.drain( 1, false ) == null )
 			{
-				final CachedFluidStack cis = new CachedFluidStack( newIS );
-				this.memory.put( slot, cis );
-
-				if( old != null && old.aeStack != null )
-				{
-					old.aeStack.setStackSize( -old.aeStack.getStackSize() );
-					changes.add( old.aeStack );
-				}
-
-				if( cis.aeStack != null )
-				{
-					changes.add( cis.aeStack );
-					this.list.add( cis.aeStack );
-				}
-
-				changed = true;
+				continue;
 			}
-			else
+			currentlyOnStorage.add( AEFluidStack.fromFluidStack( tankProperty.getContents() ) );
+		}
+
+		for( final IAEFluidStack is : cache )
+		{
+			is.setStackSize( -is.getStackSize() );
+		}
+
+		for( final IAEFluidStack is : currentlyOnStorage )
+		{
+			cache.add( is );
+		}
+
+		for( final IAEFluidStack is : cache )
+		{
+			if( is.getStackSize() != 0 )
 			{
-				final int newSize = newIS == null ? 0 : newIS.amount;
-				final int diff = newSize - ( oldIS == null ? 0 : oldIS.amount );
-
-				IAEFluidStack stack = null;
-
-				if( newIS != null )
-				{
-					stack = ( old == null || old.aeStack == null ? AEApi.instance()
-							.storage()
-							.getStorageChannel( IFluidStorageChannel.class )
-							.createStack( newIS ) : old.aeStack.copy() );
-				}
-				if( stack != null )
-				{
-					stack.setStackSize( newSize );
-					this.list.add( stack );
-				}
-
-				if( diff != 0 && stack != null )
-				{
-					final CachedFluidStack cis = new CachedFluidStack( newIS );
-					this.memory.put( slot, cis );
-
-					final IAEFluidStack a = stack.copy();
-					a.setStackSize( diff );
-					changes.add( a );
-					changed = true;
-				}
+				changes.add( is );
 			}
 		}

-		// detect dropped items; should fix non IISided Inventory Changes.
-		final NavigableMap<Integer, CachedFluidStack> end = this.memory.tailMap( high, false );
-		if( !end.isEmpty() )
-		{
-			for( final CachedFluidStack cis : end.values() )
-			{
-				if( cis != null && cis.aeStack != null )
-				{
-					final IAEFluidStack a = cis.aeStack.copy();
-					a.setStackSize( -a.getStackSize() );
-					changes.add( a );
-					changed = true;
-				}
-			}
-			end.clear();
-		}
+		cache = currentlyOnStorage;

 		if( !changes.isEmpty() )
 		{
 			this.postDifference( changes );
+			changed = true;
 		}

 		return changed ? TickRateModulation.URGENT : TickRateModulation.SLOWER;
 	}

-	private static boolean isDifferent( FluidStack a, FluidStack b )
-	{
-		if( a == b )
-		{
-			return false;
-		}
-		if( a == null || b == null )
-		{
-			return true;
-		}
-		return !a.getFluid().equals( b.getFluid() );
-	}
-
 	private void postDifference( final Iterable<IAEFluidStack> a )
 	{
 		if( a != null )
@@ -291,9 +235,9 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 	@Override
 	public IItemList<IAEFluidStack> getAvailableItems( final IItemList out )
 	{
-		for( final CachedFluidStack is : this.memory.values() )
+		for( final IAEFluidStack fs : cache )
 		{
-			out.addStorage( is.aeStack );
+			out.addStorage( fs );
 		}

 		return out;
@@ -302,7 +246,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 	@Override
 	public IItemList<IAEFluidStack> getStorageList()
 	{
-		return this.list;
+		return this.cache;
 	}

 	private StorageFilter getMode()
@@ -326,24 +270,4 @@ public class MEMonitorIFluidHandler implements IMEMonitor<IAEFluidStack>, ITicki
 		this.mySource = mySource;
 	}

-	private static class CachedFluidStack
-	{
-
-		private final FluidStack fluidStack;
-		private final IAEFluidStack aeStack;
-
-		CachedFluidStack( final FluidStack is )
-		{
-			if( is == null )
-			{
-				this.fluidStack = null;
-				this.aeStack = null;
-			}
-			else
-			{
-				this.fluidStack = is.copy();
-				this.aeStack = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ).createStack( is );
-			}
-		}
-	}
 }
@@ -19,12 +19,8 @@
 package appeng.me.storage;


-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.NavigableMap;
 import java.util.concurrent.ConcurrentSkipListMap;

 import net.minecraft.item.ItemStack;
@@ -50,16 +46,15 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 {

 	private final InventoryAdaptor adaptor;
-	private final IItemList<IAEItemStack> list = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+	private IItemList<IAEItemStack> cache = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+
 	private final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
-	private final NavigableMap<Integer, CachedItemStack> memory;
 	private IActionSource mySource;
 	private StorageFilter mode = StorageFilter.EXTRACTABLE_ONLY;

 	public MEMonitorIInventory( final InventoryAdaptor adaptor )
 	{
 		this.adaptor = adaptor;
-		this.memory = new ConcurrentSkipListMap<>();
 	}

 	@Override
@@ -88,11 +83,6 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 			out = this.adaptor.addItems( input.createItemStack() );
 		}

-		if( type == Actionable.MODULATE )
-		{
-			this.onTick();
-		}
-
 		if( out.isEmpty() )
 		{
 			return null;
@@ -101,6 +91,15 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 		// better then doing construction from scratch :3
 		final IAEItemStack o = input.copy();
 		o.setStackSize( out.getCount() );
+
+		if( type == Actionable.MODULATE )
+		{
+			IAEItemStack added = o.copy();
+			this.cache.add( added );
+			this.postDifference( Collections.singletonList( added ) );
+			this.onTick();
+		}
+
 		return o;
 	}

@@ -129,6 +128,12 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo

 		if( type == Actionable.MODULATE )
 		{
+			IAEItemStack cachedStack = this.cache.findPrecise( request );
+			if( cachedStack != null )
+			{
+				cachedStack.decStackSize( o.getStackSize() );
+				this.postDifference( Collections.singletonList( o.copy().setStackSize( -o.getStackSize() ) ) );
+			}
 			this.onTick();
 		}

@@ -144,110 +149,52 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 	@Override
 	public TickRateModulation onTick()
 	{
+		boolean changed = false;

 		final List<IAEItemStack> changes = new ArrayList<>();

-		this.list.resetStatus();
-		int high = 0;
-		boolean changed = false;
-		for( final ItemSlot is : this.adaptor )
+		IItemList<IAEItemStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+
+		for( final ItemSlot is : adaptor )
 		{
-			final CachedItemStack old = this.memory.get( is.getSlot() );
-			high = Math.max( high, is.getSlot() );
-
-			final ItemStack newIS = !is.isExtractable() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? ItemStack.EMPTY : is.getItemStack();
-			final ItemStack oldIS = old == null ? ItemStack.EMPTY : old.itemStack;
-
-			if( this.isDifferent( newIS, oldIS ) )
+			if( this.mode == StorageFilter.EXTRACTABLE_ONLY && !is.isExtractable() )
 			{
-				final CachedItemStack cis = new CachedItemStack( is.getItemStack() );
-				this.memory.put( is.getSlot(), cis );
-
-				if( old != null && old.aeStack != null )
-				{
-					old.aeStack.setStackSize( -old.aeStack.getStackSize() );
-					changes.add( old.aeStack );
-				}
-
-				if( cis.aeStack != null )
-				{
-					changes.add( cis.aeStack );
-					this.list.add( cis.aeStack );
-				}
-
-				changed = true;
+				continue;
 			}
-			else
+			currentlyOnStorage.add( is.getAEItemStack() );
+		}
+
+		for( final IAEItemStack is : cache )
+		{
+			is.setStackSize( -is.getStackSize() );
+		}
+
+		for( final IAEItemStack is : currentlyOnStorage )
+		{
+			cache.add( is );
+		}
+
+		for( final IAEItemStack is : cache )
+		{
+			if( is.getStackSize() != 0 )
 			{
-				final int newSize = ( newIS.isEmpty() ? 0 : newIS.getCount() );
-				final int diff = newSize - ( oldIS.isEmpty() ? 0 : oldIS.getCount() );
-
-				final IAEItemStack stack = ( old == null || old.aeStack == null ? AEApi.instance()
-						.storage()
-						.getStorageChannel( IItemStorageChannel.class )
-						.createStack( newIS ) : old.aeStack.copy() );
-				if( stack != null )
-				{
-					stack.setStackSize( newSize );
-					this.list.add( stack );
-				}
-
-				if( diff != 0 && stack != null )
-				{
-					final CachedItemStack cis = new CachedItemStack( is.getItemStack() );
-					this.memory.put( is.getSlot(), cis );
-
-					final IAEItemStack a = stack.copy();
-					a.setStackSize( diff );
-					changes.add( a );
-					changed = true;
-				}
+				changes.add( is );
 			}
 		}

-		// detect dropped items; should fix non IISided Inventory Changes.
-		final NavigableMap<Integer, CachedItemStack> end = this.memory.tailMap( high, false );
-		if( !end.isEmpty() )
-		{
-			for( final CachedItemStack cis : end.values() )
-			{
-				if( cis != null && cis.aeStack != null )
-				{
-					final IAEItemStack a = cis.aeStack.copy();
-					a.setStackSize( -a.getStackSize() );
-					changes.add( a );
-					changed = true;
-				}
-			}
-			end.clear();
-		}
+		cache = currentlyOnStorage;

 		if( !changes.isEmpty() )
 		{
 			this.postDifference( changes );
+			changed = true;
 		}

 		return changed ? TickRateModulation.URGENT : TickRateModulation.SLOWER;
 	}

-	private boolean isDifferent( final ItemStack a, final ItemStack b )
-	{
-		if( a == b && b.isEmpty() )
-		{
-			return false;
-		}
-
-		if( ( a.isEmpty() && !b.isEmpty() ) || ( !a.isEmpty() && b.isEmpty() ) )
-		{
-			return true;
-		}
-
-		return !Platform.itemComparisons().isSameItem( a, b );
-	}
-
 	private void postDifference( final Iterable<IAEItemStack> a )
 	{
-		// AELog.info( a.getItemStack().getUnlocalizedName() + " @ " + a.getStackSize() );
 		if( a != null )
 		{
 			final Iterator<Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object>> i = this.listeners.entrySet().iterator();
@@ -306,9 +253,9 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 	@Override
 	public IItemList<IAEItemStack> getAvailableItems( final IItemList out )
 	{
-		for( final CachedItemStack is : this.memory.values() )
+		for( IAEItemStack is : cache )
 		{
-			out.addStorage( is.aeStack );
+			out.addStorage( is );
 		}

 		return out;
@@ -317,7 +264,7 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
 	@Override
 	public IItemList<IAEItemStack> getStorageList()
 	{
-		return this.list;
+		return this.cache;
 	}

 	private StorageFilter getMode()
@@ -19,9 +19,6 @@
 package appeng.parts.automation;


-import appeng.api.networking.crafting.ICraftingPatternDetails;
-import appeng.me.cache.CraftingGridCache;
-import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;

@@ -153,14 +150,18 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest

 					final IAEItemStack ais = this.getConfig().getAEStackInSlot( slotToExport );

-					if( ais == null || this.itemToSend <= 0 )
-					{
-						continue;
-					}
+					if( ais == null || this.itemToSend <= 0 ) continue;

-					if( this.craftOnly() )
-					{
-						this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(), this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething;
+					if ( this.craftOnly() ) {
+						if (this.failedCraftTriesSlot[x] <= 0) {
+
+							this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
+									this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething;
+
+							if (this.didSomething) this.failedCraftTriesSlot[x] = 0;
+							else this.failedCraftTriesSlot[x] += 2;
+						}
+						this.failedCraftTriesSlot[x] -= 1;
 						continue;
 					}

@@ -187,7 +188,15 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest

 					if( this.itemToSend == before && this.isCraftingEnabled() )
 					{
-						this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(), this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething;
+						if (this.failedCraftTriesSlot[x] <= 0) {
+
+							this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
+									this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething;
+
+							if (this.didSomething) this.failedCraftTriesSlot[x] = 0;
+							else this.failedCraftTriesSlot[x] += 2;
+						}
+						this.failedCraftTriesSlot[x] -= 1;
 					}
 				}

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

 	@Override
@@ -320,13 +320,13 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE

 			IItemList<IAEItemStack> currentlyOnStorage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();

-			for ( final ItemSlot is : this )
+			for( final ItemSlot is : this )
 			{
-				final ItemStack newIS = !is.isExtractable() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? ItemStack.EMPTY : is.getItemStack();
-				if( !newIS.isEmpty() )
+				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && !is.isExtractable() )
 				{
-					currentlyOnStorage.add( is.getAEItemStack() );
+					continue;
 				}
+				currentlyOnStorage.add( is.getAEItemStack() );
 			}

 			for ( final IAEItemStack is : currentlyCached )
@@ -23,8 +23,13 @@ import java.util.Collections;
 import java.util.List;

 import appeng.api.config.AccessRestriction;
+import appeng.fluids.parts.PartFluidInterface;
+import appeng.fluids.tile.TileFluidInterface;
+import appeng.tile.misc.TileInterface;
+import appeng.tile.networking.TileCableBus;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;

@@ -161,7 +166,27 @@ public abstract class PartSharedStorageBus extends PartUpgradeable implements IG
 	{
 		if( pos.offset( this.getSide().getFacing() ).equals( neighbor ) )
 		{
-			this.resetCache( false );
+
+			final TileEntity te = w.getTileEntity( neighbor );
+
+			// In case the TE was destroyed, we have to do a full reset immediately.
+			if( te instanceof TileCableBus )
+			{
+				if( ( (TileCableBus) te ).getPart( this.getSide().getOpposite() ) instanceof PartFluidInterface )
+				{
+					this.resetCache( true );
+					this.resetCache();
+				}
+			}
+			if( te == null || te instanceof TileFluidInterface )
+			{
+				this.resetCache( true );
+				this.resetCache();
+			}
+			else
+			{
+				this.resetCache( false );
+			}
 		}
 	}

@@ -25,6 +25,9 @@ import java.util.Objects;

 import appeng.fluids.parts.FluidHandlerAdapter;
 import appeng.me.storage.MEPassThrough;
+import appeng.parts.AEBasePart;
+import appeng.tile.misc.TileInterface;
+import appeng.tile.networking.TileCableBus;
 import appeng.util.ConfigManager;
 import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
 import net.minecraft.entity.player.EntityPlayer;
@@ -242,7 +245,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		{
 			this.resetCacheLogic = 2;
 		}
-		else
+		else if( this.resetCacheLogic < 2 )
 		{
 			this.resetCacheLogic = 1;
 		}
@@ -306,10 +309,19 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	{
 		if( pos.offset( this.getSide().getFacing() ).equals( neighbor ) )
 		{
+
 			final TileEntity te = w.getTileEntity( neighbor );

 			// In case the TE was destroyed, we have to do a full reset immediately.
-			if( te == 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();
@@ -498,17 +510,15 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC

 		this.handlerHash = newHandlerHash;
 		this.handler = null;
+		if( this.monitor != null )
+		{
+			( (IBaseMonitor<IAEItemStack>) monitor ).removeListener( this );
+		}
 		this.monitor = null;
 		if( target != null )
 		{
 			IMEInventory<IAEItemStack> inv = this.getInventoryWrapper( target );

-			if( inv instanceof MEMonitorIInventory )
-			{
-				final MEMonitorIInventory h = (MEMonitorIInventory) inv;
-				h.setMode( (StorageFilter) this.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
-			}
-
 			if( inv instanceof ITickingMonitor )
 			{
 				this.monitor = (ITickingMonitor) inv;
@@ -350,9 +350,25 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 				if( needsNewFrequency )
 				{
 					newFreq = this.getProxy().getP2P().newFrequency();
-				}

-				this.getProxy().getP2P().updateFreq( this, newFreq );
+					final ItemStack newType = this.getHost().getPart( this.getSide() ).getItemStack( PartItemStack.WRENCH );
+
+					this.getHost().removePart( this.getSide(), false );
+					final AEPartLocation dir = this.getHost().addPart( newType, this.getSide(), player, hand );
+					final IPart newBus = this.getHost().getPart( dir );
+
+					if( newBus instanceof PartP2PTunnel )
+					{
+						final PartP2PTunnel newTunnel = (PartP2PTunnel) newBus;
+						newTunnel.setOutput( false );
+						newTunnel.onTunnelNetworkChange();
+						newTunnel.getProxy().getP2P().updateFreq( newTunnel, newFreq );
+					}
+				}
+				else
+				{
+					this.getProxy().getP2P().updateFreq( this, newFreq );
+				}
 			}
 			catch( final GridAccessException e )
 			{
@@ -365,10 +381,17 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 			final String type = p2pItem.getUnlocalizedName();

 			p2pItem.writeToNBT( data );
-			data.setShort( "freq", this.getFrequency() );
+			if( needsNewFrequency )
+			{
+				data.setShort( "freq", newFreq );
+			}
+			else
+			{
+				data.setShort( "freq", this.getFrequency() );
+			}

 			final AEColor[] colors = Platform.p2p().toColors( this.getFrequency() );
-			final int[] colorCode = new int[] {
+			final int[] colorCode = new int[]{
 					colors[0].ordinal(), colors[0].ordinal(), colors[1].ordinal(), colors[1].ordinal(),
 					colors[2].ordinal(), colors[2].ordinal(), colors[3].ordinal(), colors[3].ordinal(),
 			};
@@ -82,6 +82,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements

 	private IAEItemStack configuredItem;
 	private IAEFluidStack configuredFluid;
+	private long configuredAmount;
 	private String lastHumanReadableText;
 	private boolean isLocked;
 	private IStackWatcher myWatcher;
@@ -208,14 +209,21 @@ 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 )
 			{
-				this.configuredFluid = AEFluidStack.fromFluidStack( fluidInTank );
+				this.configuredFluid = AEFluidStack.fromFluidStack( fluidInTank ).setStackSize( 0 );
 				this.configuredItem = null;
 			}

@@ -299,30 +307,31 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements

 	private <T extends IAEStack<T>> void updateReportingValue ( final IMEMonitor<T> monitor )
 	{
-
 		if( this.configuredItem != null)
 		{
 			final IAEItemStack result = (IAEItemStack) monitor.getStorageList().findPrecise( (T) this.configuredItem );
 			if( result == null )
 			{
-				this.configuredItem.setStackSize( 0 );
+				this.configuredAmount = 0;
 			}
 			else
 			{
-				this.configuredItem.setStackSize( result.getStackSize() );
+				this.configuredAmount = result.getStackSize();
 			}
+			this.configuredItem.setStackSize( this.configuredAmount );
 		}
 		else if( this.configuredFluid != null)
 		{
 			final IAEFluidStack result = (IAEFluidStack) monitor.getStorageList().findPrecise( (T) this.configuredFluid );
 			if( result == null )
 			{
-				this.configuredFluid.setStackSize( 0 );
+				this.configuredAmount = 0;
 			}
 			else
 			{
-				this.configuredFluid.setStackSize( result.getStackSize() );
+				this.configuredAmount = result.getStackSize();
 			}
+			this.configuredFluid.setStackSize( this.configuredAmount );
 		}
 	}

@@ -390,108 +399,35 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 	@MENetworkEventSubscribe
 	public void powerStatusChange( final MENetworkPowerStatusChange ev )
 	{
-		if( !this.getProxy().isPowered() )
+		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
-			}
+			this.configureWatchers();
 		}
 	}

 	@MENetworkEventSubscribe
 	public void channelChanged( final MENetworkChannelsChanged c )
 	{
-		if( !this.getProxy().isPowered() )
+		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
-			}
+			this.configureWatchers();
 		}
 	}

 	@Override
 	public void onStackChange( IItemList<?> o, IAEStack<?> fullStack, IAEStack<?> diffStack, IActionSource src, IStorageChannel<?> chan )
 	{
+		this.configuredAmount = this.configuredAmount + diffStack.getStackSize();
+
 		if( this.configuredItem != null )
 		{
-			long diff = this.configuredItem.getStackSize() + diffStack.getStackSize();
-			this.configuredItem.setStackSize( diff >= 0 ? this.configuredItem.getStackSize() + diffStack.getStackSize() : 0 );
-
-			final long stackSize = this.configuredItem.getStackSize();
-			final String humanReadableText = NUMBER_CONVERTER.toWideReadableForm( stackSize );
-
-			if( !humanReadableText.equals( this.lastHumanReadableText ) )
-			{
-				this.lastHumanReadableText = humanReadableText;
-				this.getHost().markForUpdate();
-			}
+			this.configuredItem.setStackSize( this.configuredAmount );
 		}
 		else if( this.configuredFluid != null )
 		{
-			long diff = this.configuredFluid.getStackSize() + diffStack.getStackSize();
-			this.configuredFluid.setStackSize( diff >= 0 ? this.configuredFluid.getStackSize() + diffStack.getStackSize() : 0 );
-
-			final long stackSize = this.configuredFluid.getStackSize() / 1000;
-			final String humanReadableText = NUMBER_CONVERTER.toWideReadableForm( stackSize ) + "B";
-
-			if( !humanReadableText.equals( this.lastHumanReadableText ) )
-			{
-				this.lastHumanReadableText = humanReadableText;
-				this.getHost().markForUpdate();
-			}
+			this.configuredFluid.setStackSize( this.configuredAmount );
 		}
+		this.getHost().markForUpdate();
 	}

 	@Override
@@ -137,14 +137,10 @@ public class PartConversionMonitor extends AbstractPartMonitor
 			{
 				this.insertItem( player, hand, false );
 			}
-
 		}

 		//If its a fluid container, grab its fluidstack. if its empty pass its itemstack;

-		if (eq.isEmpty()){
-			return super.onPartActivate( player, hand, pos );
-		}
 		if( fluidInTank != null && fluidInTank.amount > 0 )
 		{
 			if( getDisplayed() instanceof IAEItemStack || getDisplayed() == null )
@@ -155,23 +151,16 @@ public class PartConversionMonitor extends AbstractPartMonitor
 			{
 				this.drainFluidContainer( player, hand );
 			}
-			else {
+			else
+			{
 				return super.onPartActivate( player, hand, pos );
 			}
 		}
-		else
+		else if( this.getDisplayed() != null && this.getDisplayed().equals( player.getHeldItem( hand ) ) )
 		{
-			if( getDisplayed() instanceof IAEFluidStack || getDisplayed() == null )
-			{
-				return super.onPartActivate( player, hand, pos );
-			}
-			if( ( (IAEItemStack) this.getDisplayed() ).equals( eq ) )
-			{
-				this.insertItem( player, hand, false );
-			}
+			this.insertItem( player, hand, false );
 		}
-
-		return true;
+		return super.onPartActivate( player, hand, pos );
 	}

 	@Override
@@ -192,7 +181,6 @@ public class PartConversionMonitor extends AbstractPartMonitor
 			return false;
 		}

-		ItemStack eq = player.getHeldItem( hand );
 		if( this.getDisplayed() != null && this.getDisplayed() instanceof IAEItemStack )
 		{
 			this.extractItem( player, ( (IAEItemStack) this.getDisplayed() ).getDefinition().getMaxStackSize() );
@@ -282,7 +270,7 @@ public class PartConversionMonitor extends AbstractPartMonitor
 	{
 		if (!(this.getDisplayed() instanceof IAEItemStack))
 			return;
-		final IAEItemStack input = (IAEItemStack) this.getDisplayed();
+		final IAEItemStack input = (IAEItemStack) this.getDisplayed().copy();
 		if( input != null )
 		{
 			try
@@ -494,12 +494,14 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminal
 			try
 			{
 				this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
-				final IStorageGrid gs = this.getProxy().getStorage();
-				Platform.postChanges( gs, removed, added, this.mySrc );
+				if( this.getProxy().isActive() )
+				{
+					final IStorageGrid gs = this.getProxy().getStorage();
+					Platform.postChanges( gs, removed, added, this.mySrc );
+				}
 			}
 			catch( final GridAccessException ignored )
 			{
-
 			}

 			// update the neighbors
@@ -264,9 +264,11 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
 		try
 		{
 			this.getProxy().getGrid().postEvent( new MENetworkCellArrayUpdate() );
-
-			final IStorageGrid gs = this.getProxy().getStorage();
-			Platform.postChanges( gs, removed, added, this.mySrc );
+			if( this.getProxy().isActive() )
+			{
+				final IStorageGrid gs = this.getProxy().getStorage();
+				Platform.postChanges( gs, removed, added, this.mySrc );
+			}
 		}
 		catch( final GridAccessException ignored )
 		{
Author	SHA1	Message	Date
PrototypeTrousers	517bd77df7	yet another try at energy issues fix requesters not being added to the energy grid partially revert the energy 'fixes' potential desync on item count energy and items change	2021-09-17 00:09:49 -03:00
PrototypeTrousers	19f928a9a5	fluid pass	2021-09-13 04:22:52 -03:00
PrototypeTrousers	73251a0fe5	more item count changes....	2021-09-13 02:10:28 -03:00
PrototypeTrousers	9335daff7d	Revert "fixes item showing incorrect amounts" This reverts commit `618e9390c6`.	2021-09-11 22:48:45 -03:00
PrototypeTrousers	cc5377d53b	fluid storage bus handler cache tweaks and simplify energy cache	2021-09-06 23:51:32 -03:00
Salomão	059f20d801	yet another try at fixing power issues	2021-09-05 20:28:37 -03:00
Salomão	d229570495	try to fix energy issues again fix issue with voiding p2p parts when shift-right clicking with a memory card	2021-09-04 18:59:46 -03:00
PrototypeTrousers	c284748b6c	fix p2p not updating properly on memory card loading	2021-09-02 20:42:02 -03:00
PrototypeTrousers	880a9c8821	another case of wrong item count caused by weak reset logic overriding a full reset needed	2021-09-01 16:11:45 -03:00
PrototypeTrousers	c68c02ef3b	more cases of wrong item counting fixed	2021-08-26 22:03:23 -03:00
PrototypeTrousers	89c4d2736c	borrowed some fancy, colored, fluid rendering from gregicality thank you @Yefancy	2021-08-23 22:35:26 -03:00
PrototypeTrousers	01778794e5	try to fix #51	2021-08-22 23:59:02 -03:00
PrototypeTrousers	8f2a06e457	fix #49 . you can now actually clear storage and conversion monitors	2021-08-20 23:26:33 -03:00
PrototypeTrousers	2d71b75019	actually fix it	2021-08-17 07:46:47 -03:00
PrototypeTrousers	9f09cd04d4	enforce cache reset of storage bus attached to interfaces were configs changed	2021-08-16 21:55:35 -03:00
PrototypeTrousers	b041fae0d5	fix storage/monitors wrong item count and interactions	2021-08-16 19:26:25 -03:00
Salomão	c466a0e00e	fix items in level emitters with crafting cards not showing up	2021-08-14 09:44:47 -03:00