fix advancements

CHANGES.md

@@ -1,47 +0,0 @@
-Changes so far :
-
-Design changes/breakages:
- - Interfaces no longer spill items of one pattern on other faces
- - Interfaces now push patterns in round-robin (Interfaces, then sides)
-
-
-
-
-Fixes:
-
- - Fix gregtech machines appearing with 'unnamed' or 'draconium lens' on the interface terminal on specific situations.
- - Add memorycard support for fluid interfaces, import/export/storage busses and level emitters ( this fix was upstreamed to AE2 for MC 1.16)
- - Storage busses now hide/show inaccessible items as configured.
- - Exclusive Blocking mode for GTCE ( shapes, molds and configured circuits do not block GTCE machines )
- - Blocking modes default to block on any item in the iventory the entity exposes
- - Fuzzy includes items that report that they're damageable, but report a maxDamage of 0 ( auto-crafting of basic capacitors -> resonant capacitors is now possible ) <- Broken item implementation.
-
-Performance:
-
- - Added @talchas fixes for insane channelless AE networks.
- - Implemented StorageDrawers slotless itemrepository.
- - Removed CraftedEvent calls (really bad lag with craftweaker versions before CraftTweaker2-1.12-4.1.20.626)
- - Count items set in interfaces before queuing crafting for them needlessly
- - Backported b7ca98d ( Avoid copying items on simulated item extraction )
- - Cache some level emitters functions
-
-QOL:
-
- - added highlight interface button to interface terminal ("?" button on the left of the interface slots)
- - Added bar on the interface terminal that search by inputs ( The one on the LEFT, also searchs by interface name )
- - Shortcut to molecular assemblers with free slots on the terminal interface by @Theisyat
- - Toggle button on interface terminal to hide full interfaces
- - JEI "U""R" and "A" (Usages/Recipes/Bookmark) now work on the Crafting Status GUI. ( the one that shows the total items to craft, and whats missing)
- - Patterns can now be made with items currently showing on JEI. ( This is overriden by Just Enough Energistics. )
- - Added multiplier buttons to processing pattern gui
- - Switched crafting terminal JEI search to fuzzy mode. If the recipe uses a damageable item, AE will try to grab it ( damaged tools )
- - Encoded patterns stack up to 64 ( holding shift and clicking the encode arrow will transfer the encoded pattern to the player inventory)
- - Encoded patterns can be draggred on the interface terminal.
- - Storage Monitor and Conversion Monitor now also ccepts fluids
- - Draggable JEI ghost items (also works on bookmarked items. SHIFT + Click will move the hovered item into the first free target slot)
-  -JEI auto switches between crafting and processing patterns
-
-HOTKEYS:
-
- - Implemented mousetweaks API. AE2 custom keybinds now work. (Try right clicking and use the scroll-wheel on the terminals)
- - Holding SHIFT and scrolling UP and DOWN will increase the items set on the configured slots of Interfaces and Pattern Terminal (Processing mode)

gradle/scripts/dependencies.gradle

@@ -19,6 +19,11 @@
 repositories {
     mavenLocal()
 
+    maven {
+        name = "storagedrawers"
+        url = "https://dl.bintray.com/jaquadro/dev/"
+    }
+
     maven {
         name "Mobius"
         url "http://mobiusstrip.eu/maven"
@@ -34,11 +39,6 @@ repositories {
         url "http://maven.mcmoddev.com"
     }
 
-    maven {
-        name "Ellpeck"
-        url "https://maven.ellpeck.de"
-    }
-
     maven {
         name = "IC2 repo"
         url = "http://maven.ic2.player.to"
@@ -59,6 +59,11 @@ repositories {
         url "http://maven.k-4u.nl/"
     }
 
+    maven { // Hwyla
+        name 'tehnut'
+        url "http://tehnut.info/maven"
+    }
+
    	maven { // CraftTweaker
         name 'jared maven'
         url "http://maven.blamejared.com/"
@@ -80,6 +85,7 @@ configurations {
 }
 
 dependencies {
+    compileOnly "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12.2-5.4.2:api"
     compileOnly "gregtechce:gregtech:1.12.2:1.12.0.662"
 
     // installable runtime dependencies
@@ -97,10 +103,11 @@ dependencies {
     compileOnly "CraftTweaker2:CraftTweaker2-API:${crafttweaker_version}"
 	compileOnly "inventory-tweaks:InventoryTweaks:${inventorytweaks_version}:api"
     compileOnly "team.chisel.ctm:CTM:${ctm_version}"
-    compileOnly "de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r152.16:api"
 
     // at runtime, use the full JEI jar
     runtime "mezz.jei:jei_${minecraft_version}:${jei_version}"
+    runtime "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12.2-5.4.2"
+    runtime "com.jaquadro.minecraft.chameleon:Chameleon:1.12-4.1.3"
 
     // unit test dependencies
     testCompile "junit:junit:4.12"

src/api/java/appeng/api/config/FuzzyMode.java

@@ -23,18 +23,38 @@
 
 package appeng.api.config;
 
+public enum FuzzyMode {
+    /**
+     * Matches any item from undamaged to including 0% durability, but not negative durability (where item damage
+     * exceeds maxdamage).
+     */
+    IGNORE_ALL(-1),
+    /**
+     * Matches items that have less than 100% durability (that is, at least 1 damage point) if a damaged item is used as
+     * the filter, or undamaged items otherwise.
+     */
+    PERCENT_99(0),
+    /**
+     * If an item with less than 75% durability is used as the filter, items with less than 75% durability are matched.
+     * Otherwise items with 75% durability or more are matched.
+     */
+    PERCENT_75(25),
+    /**
+     * If an item with less than 50% durability is used as the filter, items with less than 50% durability are matched.
+     * Otherwise items with 50% durability or more are matched.
+     */
+    PERCENT_50(50),
+    /**
+     * If an item with less than 25% durability is used as the filter, items with less than 50% durability are matched.
+     * Otherwise items with 25% durability or more are matched.
+     */
+    PERCENT_25(75);
 
-public enum FuzzyMode
-{
-	// Note that percentage damaged, is the inverse of percentage durability.
-	IGNORE_ALL( -1 ),
-	PERCENT_99( 0 ),
-	PERCENT_75( 25 ),
-	PERCENT_50( 50 ),
-	PERCENT_25( 75 );
-
-	public final float breakPoint;
-	public final float percentage;
+    public final float breakPoint;
+    /**
+     * Note this is percentage "damaged". It's the inverse of percentage durability.
+     */
+    public final float percentage;
 
 	FuzzyMode( final float p )
 	{

src/api/java/appeng/api/storage/data/IAEItemStack.java

@@ -114,8 +114,8 @@ public interface IAEItemStack extends IAEStack<IAEItemStack>
 	ItemStack getDefinition();
 
 	/**
-	 * Compare this AE item stack to another item stack, but ignores
-	 * the amount. It checks the item type, NBT and damage values.
+	 * Compare this AE item stack to another item stack, but ignores the amount. It checks the item type, NBT and damage
+	 * values.
 	 *
 	 * @param is An item stack
 	 */

src/api/java/appeng/api/storage/data/IAEStack.java

@@ -23,27 +23,24 @@
 
 package appeng.api.storage.data;
 
-
 import java.io.IOException;
 
 import io.netty.buffer.ByteBuf;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.PacketBuffer;
 
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.IStorageChannel;
 
-
-public interface IAEStack<T extends IAEStack<T>>
-{
+public interface IAEStack<T extends IAEStack<T>> {
 
 	/**
 	 * add two stacks together
 	 *
 	 * @param is added item
 	 */
-	void add( T is );
+	void add(T is);
 
 	/**
 	 * number of items in the stack.
@@ -57,7 +54,7 @@ public interface IAEStack<T extends IAEStack<T>>
 	 *
 	 * @param stackSize , ItemStack.stackSize = N
 	 */
-	T setStackSize( long stackSize );
+	T setStackSize(long stackSize);
 
 	/**
 	 * Same as getStackSize, but for requestable items. ( LP )
@@ -71,7 +68,7 @@ public interface IAEStack<T extends IAEStack<T>>
 	 *
 	 * @return basically itemStack.stackSize = N but for setStackSize items.
 	 */
-	T setCountRequestable( long countRequestable );
+	T setCountRequestable(long countRequestable);
 
 	/**
 	 * true, if the item can be crafted.
@@ -85,7 +82,7 @@ public interface IAEStack<T extends IAEStack<T>>
 	 *
 	 * @param isCraftable can item be crafted
 	 */
-	T setCraftable( boolean isCraftable );
+	T setCraftable(boolean isCraftable);
 
 	/**
 	 * clears, requestable, craftable, and stack sizes.
@@ -104,33 +101,33 @@ public interface IAEStack<T extends IAEStack<T>>
 	 *
 	 * @param i additional stack size
 	 */
-	void incStackSize( long i );
+	void incStackSize(long i);
 
 	/**
 	 * removes some from the stack size.
 	 */
-	void decStackSize( long i );
+	void decStackSize(long i);
 
 	/**
 	 * adds items to the requestable
 	 *
 	 * @param i increased amount of requested items
 	 */
-	void incCountRequestable( long i );
+	void incCountRequestable(long i);
 
 	/**
 	 * removes items from the requestable
 	 *
 	 * @param i decreased amount of requested items
 	 */
-	void decCountRequestable( long i );
+	void decCountRequestable(long i);
 
 	/**
-	 * write to a NBTTagCompound.
+	 * write to a CompoundNBT.
 	 *
 	 * @param i to be written data
 	 */
-	void writeToNBT( NBTTagCompound i );
+	void writeToNBT( NBTTagCompound i);
 
 	/**
 	 * Compare stacks using precise logic.
@@ -146,17 +143,18 @@ public interface IAEStack<T extends IAEStack<T>>
 	 * @return true if they are the same.
 	 */
 	@Override
-	boolean equals( Object obj );
+	boolean equals(Object obj);
 
 	/**
-	 * Compare the same subtype of {@link IAEStack} with another using a fuzzy comparison.
+	 * Compare the same subtype of {@link IAEStack} with another using a fuzzy
+	 * comparison.
 	 *
 	 * @param other The stack to compare.
-	 * @param mode Which {@link FuzzyMode} should be used.
+	 * @param mode  Which {@link FuzzyMode} should be used.
 	 *
 	 * @return true if two stacks are equal based on AE Fuzzy Comparison.
 	 */
-	boolean fuzzyComparison( T other, FuzzyMode mode );
+	boolean fuzzyComparison(T other, FuzzyMode mode);
 
 	/**
 	 * Slower for disk saving, but smaller/more efficient for packets.
@@ -165,7 +163,7 @@ public interface IAEStack<T extends IAEStack<T>>
 	 *
 	 * @throws IOException
 	 */
-	void writeToPacket( ByteBuf data ) throws IOException;
+	void writeToPacket( ByteBuf data) throws IOException;
 
 	/**
 	 * Clone the Item / Fluid Stack
@@ -182,17 +180,7 @@ public interface IAEStack<T extends IAEStack<T>>
 	T empty();
 
 	/**
-	 * @return true if the stack is a {@link IAEItemStack}
-	 */
-	boolean isItem();
-
-	/**
-	 * @return true if the stack is a {@link IAEFluidStack}
-	 */
-	boolean isFluid();
-
-	/**
-	 * @return ITEM or FLUID
+	 * @return The {@link IStorageChannel} backing this stack.
 	 */
 	IStorageChannel<T> getChannel();
 
@@ -202,4 +190,4 @@ public interface IAEStack<T extends IAEStack<T>>
 	 * @return itemstack
 	 */
 	ItemStack asItemStackRepresentation();
-}
+}

src/api/java/com/jaquadro/minecraft/storagedrawers/api/capabilities/IItemRepository.java

@@ -1,143 +0,0 @@
-package com.jaquadro.minecraft.storagedrawers.api.capabilities;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
-
-import javax.annotation.Nonnull;
-import java.util.function.Predicate;
-
-/**
- * An interface for treating an inventory as a slotless, central repository of items.
- *
- * For all operations that accept a predicate, if a predicate is supplied, a stored ItemStack must pass the predicate
- * in order to be considered for the given operation.
- *
- * An IItemRepository implementation MAY relax or eliminate its own internal tests when a predicate is supplied.  If
- * the predicate is derived from DefaultPredicate, then the implementation MUST apply any tests it would have applied
- * had no predicate been provided at all, in addition to testing the predicate itself.
- */
-public interface IItemRepository
-{
-    /**
-     * Gets a list of all items in the inventory.  The same item may appear multiple times with varying counts.
-
-     * @return A list of zero or more items in the inventory.
-     */
-    @Nonnull
-    NonNullList<ItemRecord> getAllItems ();
-
-    /**
-     * Inserts an ItemStack into the inventory and returns the remainder.
-     *
-     * @param stack     ItemStack to insert.
-     * @param simulate  If true, the insertion is only simulated
-     * @param predicate See interface notes about predicates.  Passing null specifies default matching.
-     * @return The remaining ItemStack that was not inserted.  If the entire stack was accepted, returns
-     * ItemStack.EMPTY instead.
-     */
-    @Nonnull
-    ItemStack insertItem (@Nonnull ItemStack stack, boolean simulate, Predicate<ItemStack> predicate);
-
-    @Nonnull
-    default ItemStack insertItem (@Nonnull ItemStack stack, boolean simulate) {
-        return insertItem(stack, simulate, null);
-    }
-
-    /**
-     * Tries to extract the given ItemStack from the inventory.  The returned value will be a matching ItemStack
-     * with a stack size equal to or less than amount, or the empty ItemStack if the item could not be found at all.
-     * The returned stack size may exceed the ItemStack's getMaxStackSize() value.
-
-     * @param stack     The item to extract.  The stack size is ignored.
-     * @param amount    Amount to extract (may be greater than the stacks max limit)
-     * @param simulate  If true, the extraction is only simulated
-     * @param predicate See interface notes about predicates.  Passing null specifies default matching.
-     * @return ItemStack extracted from the inventory, or ItemStack.EMPTY if nothing could be extracted.
-     */
-    @Nonnull
-    ItemStack extractItem (@Nonnull ItemStack stack, int amount, boolean simulate, Predicate<ItemStack> predicate);
-
-    @Nonnull
-    default ItemStack extractItem (@Nonnull ItemStack stack, int amount, boolean simulate) {
-        return extractItem(stack, amount, simulate, null);
-    }
-
-    /**
-     * Gets the number of items matching the given ItemStack stored by the inventory.
-
-     * @param stack     ItemStack to query.
-     * @param predicate See interface notes about predicates.  Passing null specifies default matching.
-     * @return The number of stored matching items.  A value of Integer.MAX_VALUE may indicate an infinite item source.
-     */
-    default int getStoredItemCount (@Nonnull ItemStack stack, Predicate<ItemStack> predicate) {
-        ItemStack amount = extractItem(stack, Integer.MAX_VALUE, true, predicate);
-        return amount.getCount();
-    }
-
-    default int getStoredItemCount (@Nonnull ItemStack stack) {
-        return getStoredItemCount(stack, null);
-    }
-
-    /**
-     * Gets the number items matching the given ItemStack that additionally still be stored by the inventory.
-     * Remaining capacity may include space that is internally empty or unassigned to any given item.
-     *
-     * @param stack     ItemStack to query.
-     * @param predicate See interface notes about predicates.  Passing null specifies default matching.
-     * @return The available remaining space for matching items.
-     */
-    default int getRemainingItemCapacity (@Nonnull ItemStack stack, Predicate<ItemStack> predicate) {
-        stack = stack.copy();
-        stack.setCount(Integer.MAX_VALUE);
-        ItemStack remainder = insertItem(stack, true, predicate);
-        return Integer.MAX_VALUE - remainder.getCount();
-    }
-
-    default int getRemainingItemCapacity (@Nonnull ItemStack stack) {
-        return getRemainingItemCapacity(stack, null);
-    }
-
-    /**
-     * Gets the total inventory capacity for items matching the given ItemStack.
-     * Total capacity may include space that is internally empty or unassigned to any given item.
-     *
-     * @param stack     ItemStack to query.
-     * @param predicate See interface notes about predicates.  Passing null specifies default matching.
-     * @return The total capacity for matching items.
-     */
-    default int getItemCapacity (@Nonnull ItemStack stack, Predicate<ItemStack> predicate) {
-        long capacity = getStoredItemCount(stack, predicate) + getRemainingItemCapacity(stack, predicate);
-        if (capacity > Integer.MAX_VALUE)
-            return Integer.MAX_VALUE;
-        return (int)capacity;
-    }
-
-    default int getItemCapacity (@Nonnull ItemStack stack) {
-        return getItemCapacity(stack, null);
-    }
-
-    /**
-     * An item record representing an item and the amount stored.
-     *
-     * The ItemStack held by itemPrototype always reports a stack size of 1.
-     * IT IS IMPORTANT THAT YOU NEVER MODIFY itemPrototype.
-     */
-    class ItemRecord
-    {
-        @Nonnull
-        public final ItemStack itemPrototype;
-        public final int count;
-
-        public ItemRecord (@Nonnull ItemStack itemPrototype, int count) {
-            this.itemPrototype = itemPrototype;
-            this.count = count;
-        }
-    }
-
-    /**
-     * A variant of the standard Predicate interface that when passed to IItemRepository functions, will ask the
-     * internal default predicate to be tested in addition to the custom predicate.  An IItemRepository function
-     * may choose to enforce its own predicate regardless.
-     */
-    interface DefaultPredicate<T> extends Predicate<T> { }
-}

src/main/java/appeng/client/ClientHelper.java

@@ -25,11 +25,8 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Random;
 
-import appeng.client.gui.AEBaseGui;
-import appeng.container.interfaces.IJEIGhostIngredients;
 import appeng.helpers.HighlighterHandler;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.entity.player.EntityPlayer;
@@ -39,7 +36,10 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
-import net.minecraftforge.client.event.*;
+import net.minecraftforge.client.event.MouseEvent;
+import net.minecraftforge.client.event.RenderLivingEvent;
+import net.minecraftforge.client.event.RenderWorldLastEvent;
+import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.ForgeModContainer;
 import net.minecraftforge.common.MinecraftForge;
@@ -75,7 +75,6 @@ import appeng.hooks.TickHandler;
 import appeng.hooks.TickHandler.PlayerColor;
 import appeng.server.ServerHelper;
 import appeng.util.Platform;
-import org.lwjgl.input.Mouse;
 
 
 public class ClientHelper extends ServerHelper
@@ -316,28 +315,6 @@ public class ClientHelper extends ServerHelper
 		Minecraft.getMinecraft().effectRenderer.addEffect( fx );
 	}
 
-	@SubscribeEvent
-	public void MouseClickEvent( final GuiScreenEvent.MouseInputEvent.Pre me )
-	{
-		final Minecraft mc = Minecraft.getMinecraft();
-		if( mc.currentScreen instanceof IJEIGhostIngredients )
-		{
-			AEBaseGui gui = ( (AEBaseGui) mc.currentScreen );
-			Object ingredient = gui.getBookmarkedIngredient();
-			if( ingredient != null )
-			{
-				if( GuiScreen.isShiftKeyDown() )
-				{
-					me.setCanceled( true );
-				}
-				else if( Mouse.isButtonDown( 0 ) )
-				{
-					me.setCanceled( true );
-				}
-			}
-		}
-	}
-
 	@SubscribeEvent
 	public void wheelEvent( final MouseEvent me )
 	{

src/main/java/appeng/client/gui/AEBaseGui.java

@@ -19,7 +19,6 @@
 package appeng.client.gui;
 
 
-import java.awt.*;
 import java.io.IOException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
@@ -32,16 +31,13 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import appeng.container.slot.*;
+import appeng.tile.inventory.AppEngInternalInventory;
 import com.google.common.base.Joiner;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;
 
-import mezz.jei.api.gui.IGhostIngredientHandler;
-import net.minecraft.client.gui.Gui;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidUtil;
 import net.minecraftforge.fml.common.Optional;
+import net.minecraftforge.items.IItemHandler;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
@@ -75,7 +71,17 @@ import appeng.client.me.SlotDisconnected;
 import appeng.client.me.SlotME;
 import appeng.client.render.StackSizeRenderer;
 import appeng.container.AEBaseContainer;
+import appeng.container.slot.AppEngCraftingSlot;
+import appeng.container.slot.AppEngSlot;
 import appeng.container.slot.AppEngSlot.hasCalculatedValidness;
+import appeng.container.slot.IOptionalSlot;
+import appeng.container.slot.SlotCraftingTerm;
+import appeng.container.slot.SlotDisabled;
+import appeng.container.slot.SlotFake;
+import appeng.container.slot.SlotInaccessible;
+import appeng.container.slot.SlotOutput;
+import appeng.container.slot.SlotPatternTerm;
+import appeng.container.slot.SlotRestrictedInput;
 import appeng.core.AELog;
 import appeng.core.AppEng;
 import appeng.core.sync.network.NetworkHandler;
@@ -86,9 +92,6 @@ import appeng.fluids.container.slots.IMEFluidSlot;
 import appeng.helpers.InventoryAction;
 import yalter.mousetweaks.api.IMTModGuiContainer2;
 
-import static appeng.integration.modules.jei.JEIPlugin.aeGuiHandler;
-import static appeng.integration.modules.jei.JEIPlugin.runtime;
-
 
 @Optional.Interface( iface = "yalter.mousetweaks.api.IMTModGuiContainer2", modid = "mousetweaks" )
 public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContainer2
@@ -103,28 +106,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 	private Stopwatch dbl_clickTimer = Stopwatch.createStarted();
 	private ItemStack dbl_whichItem = ItemStack.EMPTY;
 	private Slot bl_clicked;
-	private Stopwatch lastClicked = Stopwatch.createStarted();
-	private List<IGhostIngredientHandler.Target<Object>> hoveredIngredientTargets = new ArrayList<>();
-	private Object bookmarkedIngredient;
-	private boolean isDraggingJeiGhostItem;
-
-	public void setJeiGhostItem( boolean jeiGhostItem )
-	{
-		isJeiGhostItem = jeiGhostItem;
-	}
-
-	private boolean isJeiGhostItem;
-
-	public Object getBookmarkedIngredient()
-	{
-		return bookmarkedIngredient;
-	}
-
-	public List<GuiCustomSlot> getGuiSlots()
-	{
-		return guiSlots;
-	}
-
 	protected final List<GuiCustomSlot> guiSlots = new ArrayList<>();
 
 	public AEBaseGui( final Container container )
@@ -207,65 +188,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 				this.drawTooltip( (ITooltip) c, mouseX, mouseY );
 			}
 		}
-		GlStateManager.enableDepth();
-		bookmarkedJEIghostItem(mouseX,mouseY);
-		GlStateManager.disableDepth();
-	}
-
-	void bookmarkedJEIghostItem(final int mouseX, final int mouseY) {
-
-		if (!isJeiGhostItem)
-		{
-			bookmarkedIngredient = runtime.getBookmarkOverlay().getIngredientUnderMouse();
-		}
-
-		if( bookmarkedIngredient != null )
-		{
-			hoveredIngredientTargets = aeGuiHandler.getTargets( this, bookmarkedIngredient, false );
-			ItemStack dragItem = ItemStack.EMPTY;
-			if( hoveredIngredientTargets.size() > 0 )
-			{
-				if( isShiftKeyDown() && Mouse.isButtonDown( 0 ) && this.lastClicked.elapsed( TimeUnit.MILLISECONDS ) > 200 )
-				{
-					this.lastClicked = Stopwatch.createStarted();
-					aeGuiHandler.getTargets( this, bookmarkedIngredient, true );
-				}
-				else if( Mouse.isButtonDown( 0 ) && this.lastClicked.elapsed( TimeUnit.MILLISECONDS ) > 200 )
-				{
-					this.lastClicked = Stopwatch.createStarted();
-					if( bookmarkedIngredient instanceof ItemStack )
-					{
-						dragItem = ( (ItemStack) bookmarkedIngredient );
-					}
-					else if( bookmarkedIngredient instanceof FluidStack )
-					{
-						dragItem = FluidUtil.getFilledBucket( ( (FluidStack) bookmarkedIngredient ) );
-					}
-					mc.player.inventory.setItemStack( dragItem.copy() );
-					this.isJeiGhostItem = true;
-				}
-				drawTargets( mouseX, mouseY );
-			}
-		}
-	}
-	private void drawTargets(int mouseX, int mouseY) {
-		GlStateManager.disableLighting();
-		for( IGhostIngredientHandler.Target target : hoveredIngredientTargets )
-		{
-			Rectangle area = target.getArea();
-			Color color;
-			if( area.contains( mouseX, mouseY ) )
-			{
-				color = new Color( 76, 201, 25, 128 );
-			}
-			else
-			{
-				color = new Color( 19, 201, 10, 64 );
-			}
-			Gui.drawRect( area.x, area.y, area.x + area.width, area.y + area.height, color.getRGB() );
-		}
-		GlStateManager.color( 1f, 1f, 1f, 1f );
-		GlStateManager.enableDepth();
 	}
 
 	protected void drawGuiSlot( GuiCustomSlot slot, int mouseX, int mouseY, float partialTicks )
@@ -398,6 +320,7 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 		{
 			slot.drawBackground( ox, oy );
 		}
+
 	}
 
 	@Override
@@ -464,13 +387,29 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 			{
 				if( !itemstack.isEmpty() )
 				{
+					Set<IItemHandler> visitedInterfaces = new HashSet<>();
 					for( final Slot dr : this.drag_click )
 					{
-						if( slot.getStack().isEmpty() )
+						IItemHandler interfaceHandler = ( (SlotDisconnected) slot ).getSlot().getInventory();
+						if (visitedInterfaces.contains( interfaceHandler )) break;
+						visitedInterfaces.add( interfaceHandler );
+						boolean canInsert = true;
+						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
 						{
-							InventoryAction action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
-							final PacketInventoryAction p = new PacketInventoryAction( action, dr.getSlotIndex(), ( (SlotDisconnected) slot ).getSlot().getId() );
-							NetworkHandler.instance().sendToServer( p );
+							if( ItemStack.areItemStacksEqual( interfaceHandler.getStackInSlot( s ), itemstack ) )
+							{
+								canInsert = false;
+								break;
+							}
+						}
+						if( canInsert )
+						{
+							if( slot.getStack().isEmpty() )
+							{
+								InventoryAction action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
+								final PacketInventoryAction p = new PacketInventoryAction( action, dr.getSlotIndex(), ( (SlotDisconnected) slot ).getSlot().getId() );
+								NetworkHandler.instance().sendToServer( p );
+							}
 						}
 					}
 				}
@@ -506,56 +445,18 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 	{
 		final EntityPlayer player = Minecraft.getMinecraft().player;
 
-		if( this.isJeiGhostItem && isDraggingJeiGhostItem)
+		if( slot instanceof SlotFake )
 		{
-			for( IGhostIngredientHandler.Target target : hoveredIngredientTargets )
-			{
-				Rectangle area = target.getArea();
-				final int x = Mouse.getEventX() * this.width / this.mc.displayWidth;
-				final int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
-
-				if( area.contains( x, y ) )
-				{
-					target.accept( bookmarkedIngredient );
-					break;
-				}
-			}
-			this.isJeiGhostItem = false;
-			this.isDraggingJeiGhostItem = false;
-
-			ItemStack dragItem = ItemStack.EMPTY;
-			if( runtime.getBookmarkOverlay().getIngredientUnderMouse() != null )
-			{
-				bookmarkedJEIghostItem( Mouse.getX(), this.mc.displayHeight - Mouse.getY() );
-				if( bookmarkedIngredient instanceof ItemStack )
-				{
-					dragItem = ( (ItemStack) bookmarkedIngredient );
-				}
-				else if( bookmarkedIngredient instanceof FluidStack )
-				{
-					dragItem = FluidUtil.getFilledBucket( ( (FluidStack) bookmarkedIngredient ) );
-				}
-				mc.player.inventory.setItemStack( dragItem.copy() );
-				this.isJeiGhostItem = true;
-			}
-			else
-			{
-				mc.player.inventory.setItemStack( dragItem );
-			}
-		}
-
-		else if( slot instanceof SlotFake )
-		{
-			final InventoryAction action;
-			action = mouseButton == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
+			final InventoryAction action = mouseButton == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
 
 			if( this.drag_click.size() > 1 )
 			{
 				return;
 			}
 
-			PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
+			final PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
 			NetworkHandler.instance().sendToServer( p );
+
 			return;
 		}
 
@@ -637,12 +538,23 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 				case PICKUP: // pickup / set-down.
 					if( slot.getStack().isEmpty() && !player.inventory.getItemStack().isEmpty() )
 					{
-						action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
-					}
-					if( !slot.getStack().isEmpty() && player.inventory.getItemStack().getCount() <= 1 )
-					{
-						action = InventoryAction.PICKUP_OR_SET_DOWN;
+						boolean canInsert = true;
+						IItemHandler interfaceHandler = ( (SlotDisconnected) slot ).getSlot().getInventory();
+						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
+						{
+							if( ItemStack.areItemStacksEqual( interfaceHandler.getStackInSlot( s ), player.inventory.getItemStack() ) )
+							{
+								canInsert = false;
+								break;
+							}
+						}
+						if( canInsert )
+						{
+							action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
+						}
+						break;
 					}
+					if( !slot.getStack().isEmpty() && player.inventory.getItemStack().getCount() <= 1 ) action = InventoryAction.PICKUP_OR_SET_DOWN;
 					break;
 				case QUICK_MOVE:
 					action = ( mouseButton == 1 ) ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
@@ -675,13 +587,14 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 			InventoryAction action = null;
 			IAEItemStack stack = null;
 
-			switch ( clickType )
+			switch( clickType )
 			{
 				case PICKUP: // pickup / set-down.
 					action = ( mouseButton == 1 ) ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
 					stack = ( (SlotME) slot ).getAEStack();
 
-					if( stack != null && action == InventoryAction.PICKUP_OR_SET_DOWN && stack.getStackSize() == 0 && player.inventory.getItemStack().isEmpty() )
+					if( stack != null && action == InventoryAction.PICKUP_OR_SET_DOWN && stack.getStackSize() == 0 && player.inventory.getItemStack()
+							.isEmpty() )
 					{
 						action = InventoryAction.AUTO_CRAFT;
 					}
@@ -748,7 +661,9 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 				final List<Slot> slots = this.getInventorySlots();
 				for( final Slot inventorySlot : slots )
 				{
-					if( inventorySlot != null && inventorySlot.canTakeStack( this.mc.player ) && inventorySlot.getHasStack() && inventorySlot.isSameInventory( slot ) && Container.canAddItemToSlot( inventorySlot, this.dbl_whichItem, true ) )
+					if( inventorySlot != null && inventorySlot.canTakeStack(
+							this.mc.player ) && inventorySlot.getHasStack() && inventorySlot.isSameInventory( slot ) && Container.canAddItemToSlot(
+									inventorySlot, this.dbl_whichItem, true ) )
 					{
 						this.handleMouseClick( inventorySlot, inventorySlot.slotNumber, 0, ClickType.QUICK_MOVE );
 					}
@@ -759,11 +674,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 			this.disableShiftClick = false;
 		}
 
-		if (clickType == ClickType.PICKUP && isJeiGhostItem && !isDraggingJeiGhostItem) {
-			this.isDraggingJeiGhostItem = true;
-			return;
-		}
-
 		super.handleMouseClick( slot, slotIdx, mouseButton, clickType );
 	}
 
@@ -1191,5 +1101,4 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 	{
 		return false;
 	}
-
 }

src/main/java/appeng/client/gui/AEGuiHandler.java

@@ -2,23 +2,26 @@ package appeng.client.gui;
 
 import javax.annotation.Nullable;
 import appeng.api.storage.data.IAEItemStack;
-import appeng.client.gui.implementations.*;
-import appeng.container.interfaces.IJEIGhostIngredients;
-import appeng.container.slot.SlotFake;
-import appeng.fluids.client.gui.widgets.GuiFluidSlot;
+import appeng.client.gui.implementations.GuiCraftAmount;
+import appeng.client.gui.implementations.GuiCraftConfirm;
+import appeng.client.gui.implementations.GuiCraftingCPU;
+import appeng.client.gui.widgets.GuiCustomSlot;
+import appeng.container.implementations.ContainerCraftAmount;
 import mezz.jei.api.gui.IAdvancedGuiHandler;
-import mezz.jei.api.gui.IGhostIngredientHandler;
-import net.minecraft.client.gui.GuiScreen;
-import org.lwjgl.input.Mouse;
+import net.minecraft.client.renderer.RenderItem;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
 
 import java.awt.*;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
 
-public class AEGuiHandler implements IAdvancedGuiHandler<AEBaseGui>, IGhostIngredientHandler<AEBaseGui>
+public class AEGuiHandler implements IAdvancedGuiHandler<AEBaseGui>
 {
+
     @Override
     public Class<AEBaseGui> getGuiContainerClass()
     {
@@ -36,8 +39,8 @@ public class AEGuiHandler implements IAdvancedGuiHandler<AEBaseGui>, IGhostIngre
     @Override
     public Object getIngredientUnderMouse( AEBaseGui guiContainer, int mouseX, int mouseY )
     {
-        List<IAEItemStack> visual;
-        int guiSlotIdx;
+        List<IAEItemStack> visual = new ArrayList<>();
+        int guiSlotIdx = 0;
         Object result = null;
         if( guiContainer instanceof GuiCraftConfirm )
         {
@@ -91,54 +94,4 @@ public class AEGuiHandler implements IAdvancedGuiHandler<AEBaseGui>, IGhostIngre
         if( guiSloty > ( rows - 1 ) || mouseY < guitop + yo ) return -1;
         return ( guiSloty * 3 ) + guiSlotx + ( currentScroll * 3 );
     }
-
-    @Override
-    public <I> List<Target<I>> getTargets( AEBaseGui gui, I ingredient, boolean doStart )
-    {
-        ArrayList<Target<I>> targets = new ArrayList<>();
-        if( gui instanceof IJEIGhostIngredients )
-        {
-            IJEIGhostIngredients g = (IJEIGhostIngredients) gui;
-            List<Target<?>> phantomTargets = g.getPhantomTargets( ingredient );
-            targets.addAll( (List<Target<I>>) (Object) phantomTargets );
-        }
-        if( doStart && GuiScreen.isShiftKeyDown() && Mouse.isButtonDown( 0 ) )
-        {
-            if( gui instanceof GuiUpgradeable || gui instanceof GuiPatternTerm )
-            {
-                IJEIGhostIngredients ghostGui = ( (IJEIGhostIngredients) gui );
-                for( Target<I> target : targets )
-                {
-                    if( ghostGui.getFakeSlotTargetMap().get( target ) instanceof SlotFake )
-                    {
-                        if( ( (SlotFake) ghostGui.getFakeSlotTargetMap().get( target ) ).getStack().isEmpty() )
-                        {
-                            target.accept( ingredient );
-                            break;
-                        }
-                    }
-                    else if( ghostGui.getFakeSlotTargetMap().get( target ) instanceof GuiFluidSlot )
-                    {
-                        if( ( (GuiFluidSlot) ghostGui.getFakeSlotTargetMap().get( target ) ).getFluidStack() == null )
-                        {
-                            target.accept( ingredient );
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        return targets;
-    }
-
-    @Override
-    public void onComplete(){
-    }
-
-    @Override
-    public boolean shouldHighlightTargets()
-    {
-        return true;
-    }
-
 }

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

@@ -25,7 +25,6 @@ import java.util.*;
 import appeng.api.config.ActionItems;
 import appeng.api.config.Settings;
 import appeng.client.gui.widgets.GuiImgButton;
-import appeng.core.worlddata.IWorldPlayerMapping;
 import appeng.util.BlockPosUtils;
 import com.google.common.collect.HashMultimap;
 
@@ -50,8 +49,6 @@ import appeng.util.Platform;
 import net.minecraft.nbt.NBTUtil;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextComponentString;
-import net.minecraftforge.common.DimensionManager;
-import org.lwjgl.input.Mouse;
 
 
 import static appeng.client.render.BlockPosHighlighter.hilightBlock;
@@ -71,7 +68,6 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	private final HashMap<GuiButton,ClientDCInternalInv> guiButtonHashMap = new HashMap<>();
 	private final ArrayList<String> names = new ArrayList<>();
 	private final ArrayList<Object> lines = new ArrayList<>();
-	private final Set<Object> matchedStacks = new HashSet<>();
 
 	private final Map<String, Set<Object>> cachedSearches = new WeakHashMap<>();
 
@@ -81,7 +77,6 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	private PartInterfaceTerminal partInterfaceTerminal;
 	private GuiButton guiButtonHide;
 	private GuiButton guiButtonNextAssembler;
-	private HashMap<ClientDCInternalInv,Integer> dimHashMap = new HashMap<>();
 
 	public GuiInterfaceTerminal( final InventoryPlayer inventoryPlayer, final PartInterfaceTerminal te )
 	{
@@ -128,6 +123,14 @@ public class GuiInterfaceTerminal extends AEBaseGui
 		super.onGuiClosed();
 	}
 
+	@Override
+	protected boolean isPointInRegion( int rectX, int rectY, int rectWidth, int rectHeight, int pointX, int pointY )
+	{
+		if( searchFieldInputs.isMouseIn( pointX, pointY ) ) drawTooltip( pointX - guiLeft - offsetX, pointY - guiTop , "Inputs OR names" );
+		else if( searchFieldOutputs.isMouseIn( pointX, pointY ) ) drawTooltip( pointX - guiLeft - offsetX, pointY - guiTop, "Outputs OR names" );
+		return super.isPointInRegion( rectX, rectY, rectWidth, rectHeight, pointX, pointY );
+	}
+
 	@Override
 	public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
 	{
@@ -158,8 +161,6 @@ public class GuiInterfaceTerminal extends AEBaseGui
 				for( int z = 0; z < inv.getInventory().getSlots(); z++ )
 				{
 					this.inventorySlots.inventorySlots.add( new SlotDisconnected( inv, z, z * 18 + 22, 1 + offset ) );
-					if (this.matchedStacks.contains(inv.getInventory().getStackInSlot(z)))
-						drawRect( z * 18 + 22, 1 + offset, z * 18 + 22 + 16, 1 + offset + 16, 0x2A00FF00 );
 				}
 
 				GuiButton guiButton = new GuiImgButton(guiLeft + 4, guiTop + offset + 1, Settings.ACTIONS, ActionItems.HIGHLIGHT_INTERFACE);
@@ -185,10 +186,6 @@ public class GuiInterfaceTerminal extends AEBaseGui
 			}
 			offset += 18;
 		}
-
-		if( searchFieldInputs.isMouseIn( mouseX , mouseY ) ) drawTooltip( Mouse.getEventX() * this.width / this.mc.displayWidth - offsetX, mouseY - guiTop, "Inputs OR names" );
-		else if( searchFieldOutputs.isMouseIn( mouseX, mouseY ) ) drawTooltip( Mouse.getEventX() * this.width / this.mc.displayWidth - offsetX, mouseY - guiTop, "Outputs OR names" );
-
 	}
 
 	@Override
@@ -220,17 +217,8 @@ public class GuiInterfaceTerminal extends AEBaseGui
 		{
 			BlockPos blockPos = blockPosHashMap.get( guiButtonHashMap.get( this.selectedButton ) );
 			BlockPos blockPos2 = mc.player.getPosition();
-			int playerDim = mc.world.provider.getDimension();
-			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 );
-			}
-			else
-			{
-				hilightBlock( blockPos, System.currentTimeMillis() + 500 * BlockPosUtils.getDistance( blockPos, blockPos2 ), playerDim );
-				mc.player.sendStatusMessage( new TextComponentString( "The interface is now highlighted at " + "X: " + blockPos.getX() + " Y: " + blockPos.getY() + " Z: " + blockPos.getZ() ), false );
-			}
+			hilightBlock( blockPos, System.currentTimeMillis() + 500 * BlockPosUtils.getDistance(blockPos, blockPos2) );
+			mc.player.sendStatusMessage( new TextComponentString( "The interface is now highlighted at " + "X: " + blockPos.getX() + " Y: " + blockPos.getY() + " Z: " + blockPos.getZ() ), false );
 			mc.player.closeScreen();
 		}
 
@@ -336,7 +324,6 @@ public class GuiInterfaceTerminal extends AEBaseGui
 					final NBTTagCompound invData = in.getCompoundTag( key );
 					final ClientDCInternalInv current = this.getById( id, invData.getLong( "sortBy" ), invData.getString( "un" ) );
 					blockPosHashMap.put( current, NBTUtil.getPosFromTag( invData.getCompoundTag( "pos" )) );
-					dimHashMap.put( current, invData.getInteger( "dim" ));
 
 					for( int x = 0; x < current.getInventory().getSlots(); x++ )
 					{
@@ -371,7 +358,6 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	{
 		this.byName.clear();
 		this.buttonList.clear();
-		this.matchedStacks.clear();
 
 		final String searchFieldInputs = this.searchFieldInputs.getText().toLowerCase();
 		final String searchFieldOutputs = this.searchFieldOutputs.getText().toLowerCase();
@@ -390,36 +376,37 @@ public class GuiInterfaceTerminal extends AEBaseGui
 			// Shortcut to skip any filter if search term is ""/empty
 
 			boolean found = (searchFieldInputs.isEmpty() && searchFieldOutputs.isEmpty() && !partInterfaceTerminal.onlyInterfacesWithFreeSlots);
-			boolean interfaceHasFreeSlots = false;
 
 			// Search if the current inventory holds a pattern containing the search term.
 			if( !found )
 			{
 				for( final ItemStack itemStack : entry.getInventory() )
 				{
-					if( !searchFieldInputs.isEmpty() && !searchFieldOutputs.isEmpty() ) {
-						if (this.itemStackMatchesSearchTerm(itemStack, searchFieldInputs, 0) || this.itemStackMatchesSearchTerm(itemStack, searchFieldOutputs, 1)) {
-							found = true;
-							matchedStacks.add(itemStack);
-						}
+					if( !searchFieldInputs.isEmpty() && !searchFieldOutputs.isEmpty() )
+						found = ( this.itemStackMatchesSearchTerm( itemStack, searchFieldInputs, 0 ) || this.itemStackMatchesSearchTerm( itemStack, searchFieldOutputs, 1 ) );
+					else if( !searchFieldInputs.isEmpty() )
+						found = ( this.itemStackMatchesSearchTerm( itemStack, searchFieldInputs, 0 ) );
+					else if( !searchFieldOutputs.isEmpty() )
+						found = ( this.itemStackMatchesSearchTerm( itemStack, searchFieldOutputs, 1 ) );
+					if( found )
+					{
+						break;
 					}
-					else if( !searchFieldInputs.isEmpty() ) {
-						if (this.itemStackMatchesSearchTerm(itemStack, searchFieldInputs, 0)) {
-							found = true;
-							matchedStacks.add(itemStack);
-						}
-					}
-					else if( !searchFieldOutputs.isEmpty() ) {
-						if (this.itemStackMatchesSearchTerm(itemStack, searchFieldOutputs, 1)) {
-							found = true;
-							matchedStacks.add(itemStack);
-						}
-					}
-					// If only Interfaces with empty slots should be shown, check that here
-					if(itemStack.isEmpty())
+				}
+			} 
+
+			// If only Interfaces with empty slots should be shown, check that here
+			boolean interfaceHasFreeSlots = false;
+			if (partInterfaceTerminal.onlyInterfacesWithFreeSlots) {
+				for( final ItemStack itemStack : entry.getInventory() )
+				{
+					if(itemStack.isEmpty()){
 						interfaceHasFreeSlots = true;
+						break;
+					}
 				}
 			}
+
 			// if found, filter skipped or machine name matching the search term, add it
 			if( found || (entry.getName().toLowerCase().contains( searchFieldInputs ) && entry.getName().toLowerCase().contains( searchFieldOutputs )))
 			{

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

@@ -19,21 +19,11 @@
 package appeng.client.gui.implementations;
 
 
-import java.awt.*;
 import java.io.IOException;
-import java.util.*;
-import java.util.List;
 
-import appeng.container.interfaces.IJEIGhostIngredients;
-import appeng.container.slot.SlotFake;
-import appeng.core.sync.packets.PacketInventoryAction;
-import appeng.helpers.InventoryAction;
-import appeng.util.item.AEItemStack;
-import mezz.jei.api.gui.IGhostIngredientHandler.Target;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.init.Blocks;
-import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.config.ActionItems;
@@ -50,7 +40,7 @@ import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketValueConfig;
 
 
-public class GuiPatternTerm extends GuiMEMonitorable implements IJEIGhostIngredients
+public class GuiPatternTerm extends GuiMEMonitorable
 {
 
 	private static final String BACKGROUND_CRAFTING_MODE = "guis/pattern.png";
@@ -77,7 +67,6 @@ public class GuiPatternTerm extends GuiMEMonitorable implements IJEIGhostIngredi
 	private GuiImgButton divThreeBtn;
 	private GuiImgButton minusOneBtn;
 	private GuiImgButton maxCountBtn;
-	public Map<Target<?>,Object> mapTargetSlot = new HashMap<>();
 
 	public GuiPatternTerm( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
 	{
@@ -285,52 +274,4 @@ public class GuiPatternTerm extends GuiMEMonitorable implements IJEIGhostIngredi
 
 		s.yPos = s.getY() + this.ySize - 78 - offsetPlayerSide;
 	}
-
-	@Override
-	public List<Target<?>> getPhantomTargets(Object ingredient) {
-		if (!(ingredient instanceof ItemStack )) {
-			return Collections.emptyList();
-		}
-		List<Target<?>> targets = new ArrayList<>();
-		for( Slot slot : this.inventorySlots.inventorySlots )
-		{
-			if( slot instanceof SlotFake )
-			{
-				ItemStack itemStack = (ItemStack) ingredient;
-				Target<Object> target = new Target<Object>()
-				{
-					@Override
-					public Rectangle getArea()
-					{
-						return new Rectangle( getGuiLeft() + slot.xPos, getGuiTop() + slot.yPos, 16, 16 );
-					}
-
-					@Override
-					public void accept( Object ingredient )
-					{
-						final PacketInventoryAction p;
-						try
-						{
-							p = new PacketInventoryAction( InventoryAction.PLACE_JEI_GHOST_ITEM, (SlotFake) slot, AEItemStack.fromItemStack( itemStack ) );
-							NetworkHandler.instance().sendToServer( p );
-
-						}
-						catch( IOException e )
-						{
-							e.printStackTrace();
-						}
-					}
-				};
-				targets.add( target );
-				mapTargetSlot.putIfAbsent( target, slot );
-			}
-		}
-		return targets;
-	}
-
-	@Override
-	public Map<Target<?>, Object> getFakeSlotTargetMap()
-	{
-		return mapTargetSlot;
-	}
 }

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

@@ -19,24 +19,8 @@
 package appeng.client.gui.implementations;
 
 
-import java.awt.*;
 import java.io.IOException;
-import java.util.*;
-import java.util.List;
 
-import appeng.client.gui.widgets.GuiCustomSlot;
-import appeng.container.interfaces.IJEIGhostIngredients;
-import appeng.container.slot.IJEITargetSlot;
-import appeng.container.slot.SlotFake;
-import appeng.core.sync.packets.PacketInventoryAction;
-import appeng.fluids.client.gui.widgets.GuiFluidSlot;
-import appeng.fluids.util.AEFluidStack;
-import appeng.helpers.InventoryAction;
-import appeng.util.item.AEItemStack;
-import mezz.jei.api.gui.IGhostIngredientHandler.Target;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.*;
 import org.lwjgl.input.Mouse;
 
 import net.minecraft.client.gui.GuiButton;
@@ -59,9 +43,9 @@ import appeng.parts.automation.PartExportBus;
 import appeng.parts.automation.PartImportBus;
 
 
-public class GuiUpgradeable extends AEBaseGui implements IJEIGhostIngredients
+public class GuiUpgradeable extends AEBaseGui
 {
-	private final Map<Target<?>,Object> mapTargetSlot = new HashMap<>();
+
 	protected final ContainerUpgradeable cvb;
 	protected final IUpgradeableHost bc;
 
@@ -216,108 +200,4 @@ public class GuiUpgradeable extends AEBaseGui implements IJEIGhostIngredients
 			NetworkHandler.instance().sendToServer( new PacketConfigButton( this.schedulingMode.getSetting(), backwards ) );
 		}
 	}
-
-	@Override
-	public List<Target<?>> getPhantomTargets(Object ingredient)
-	{
-		mapTargetSlot.clear();
-
-		FluidStack fluidStack = null;
-		ItemStack itemStack = ItemStack.EMPTY;
-
-		if( ingredient instanceof ItemStack )
-		{
-			itemStack = (ItemStack) ingredient;
-			fluidStack = FluidUtil.getFluidContained( itemStack );
-		}
-		else if( ingredient instanceof FluidStack )
-		{
-			fluidStack = (FluidStack) ingredient;
-		}
-
-		if( !( ingredient instanceof ItemStack ) && !( ingredient instanceof FluidStack ) )
-			return Collections.emptyList();
-
-		List<Target<?>> targets = new ArrayList<>();
-
-		List<IJEITargetSlot> slots = new ArrayList<>();
-		if( this.inventorySlots.inventorySlots.size() > 0 )
-		{
-			for( Slot slot : this.inventorySlots.inventorySlots )
-			{
-				if( slot instanceof SlotFake && ( !itemStack.isEmpty() || this instanceof GuiCellWorkbench && fluidStack != null ) )
-				{
-					slots.add( (IJEITargetSlot) slot );
-				}
-			}
-		}
-		if( this.getGuiSlots().size() > 0 )
-		{
-			for( GuiCustomSlot slot : this.getGuiSlots() )
-			{
-				if( slot instanceof GuiFluidSlot && fluidStack != null )
-				{
-					slots.add( (IJEITargetSlot) slot );
-				}
-			}
-		}
-		for( Object slot : slots )
-		{
-			ItemStack finalItemStack = itemStack;
-			FluidStack finalFluidStack = fluidStack;
-			Target<Object> targetItem = new Target<Object>()
-			{
-				@Override
-				public Rectangle getArea()
-				{
-					if( slot instanceof SlotFake )
-						return new Rectangle( getGuiLeft() + ( (SlotFake) slot ).xPos, getGuiTop() + ( (SlotFake) slot ).yPos, 16, 16 );
-					else
-					{
-						return new Rectangle( getGuiLeft() + ( (GuiFluidSlot) slot ).xPos(), getGuiTop() + ( (GuiFluidSlot) slot ).yPos(), 16, 16 );
-					}
-				}
-
-				@Override
-				public void accept( Object ingredient )
-				{
-					PacketInventoryAction p = null;
-					try
-					{
-						if( slot instanceof SlotFake )
-						{
-							if( finalItemStack.isEmpty() && finalFluidStack != null )
-							{
-								p = new PacketInventoryAction( InventoryAction.PLACE_JEI_GHOST_ITEM, (IJEITargetSlot) slot, AEItemStack.fromItemStack( FluidUtil.getFilledBucket( finalFluidStack ) ) );
-							}
-							else if( !finalItemStack.isEmpty() )
-							{
-								p = new PacketInventoryAction( InventoryAction.PLACE_JEI_GHOST_ITEM, (IJEITargetSlot) slot, AEItemStack.fromItemStack( finalItemStack ) );
-							}
-						}
-						else
-						{
-							if( finalFluidStack == null ) return;
-							p = new PacketInventoryAction( InventoryAction.PLACE_JEI_GHOST_ITEM, (IJEITargetSlot) slot, AEItemStack.fromItemStack( AEFluidStack.fromFluidStack( finalFluidStack ).asItemStackRepresentation() ) );
-						}
-						NetworkHandler.instance().sendToServer( p );
-
-					}
-					catch( IOException e )
-					{
-						e.printStackTrace();
-					}
-				}
-			};
-			targets.add( targetItem );
-			mapTargetSlot.putIfAbsent( targetItem, slot );
-		}
-		return targets;
-	}
-
-	@Override
-	public Map<Target<?>, Object> getFakeSlotTargetMap()
-	{
-		return mapTargetSlot;
-	}
 }

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

@@ -8,14 +8,9 @@ public class BlockPosHighlighter
     private static BlockPos hilightedBlock;
     private static long expireHilight;
 
-
-
-    private static int dimension;
-
-    public static void hilightBlock( BlockPos c, long expireHilight, int dimension ) {
+    public static void hilightBlock( BlockPos c, long expireHilight ) {
         hilightedBlock = c;
         BlockPosHighlighter.expireHilight = expireHilight;
-        BlockPosHighlighter.dimension = dimension;
     }
 
     public static BlockPos getHilightedBlock() {
@@ -26,9 +21,5 @@ public class BlockPosHighlighter
         return expireHilight;
     }
 
-    public static int getDimension()
-    {
-        return dimension;
-    }
 
 }

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

@@ -19,7 +19,6 @@
 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;
@@ -31,7 +30,6 @@ import net.minecraft.util.EnumFacing;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.util.IWideReadableNumberConverter;
 import appeng.util.ReadableNumberConverter;
-import net.minecraftforge.fluids.FluidStack;
 
 
 /**
@@ -145,23 +143,4 @@ public class TesrRenderHelper
 
 	}
 
-	public static void renderFluid2dWithAmount( IAEFluidStack fluidStack, float scale, float spacing )
-	{
-		final ItemStack renderStack = fluidStack.asItemStackRepresentation();
-
-		TesrRenderHelper.renderItem2d( renderStack, scale );
-
-		final long stackSize = fluidStack.getStackSize() / 1000;
-		final String renderedStackSize = NUMBER_CONVERTER.toWideReadableForm( stackSize ) + "B";
-
-		// Render the item count
-		final FontRenderer fr = Minecraft.getMinecraft().fontRenderer;
-		final int width = fr.getStringWidth( renderedStackSize );
-		GlStateManager.translate( 0.0f, spacing, 0 );
-		GlStateManager.scale( 1.0f / 62.0f, 1.0f / 62.0f, 1.0f / 62.0f );
-		GlStateManager.translate( -0.5f * width, 0.0f, 0.5f );
-		fr.drawString( renderedStackSize, 0, 0, 0 );
-
-	}
-
 }

src/main/java/appeng/container/implementations/ContainerCraftingCPU.java

@@ -159,58 +159,56 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH
 	@Override
 	public void detectAndSendChanges()
 	{
-		if( Platform.isServer() && this.getMonitor() != null )
+		if( Platform.isServer() && this.getMonitor() != null && !this.list.isEmpty() )
 		{
-			if( this.getEstimatedTime() >= 0 )
+			try
 			{
-				final long elapsedTime = this.getMonitor().getElapsedTime();
-				final double remainingItems = this.getMonitor().getRemainingItemCount();
-				final double startItems = this.getMonitor().getStartItemCount();
-				final long eta = (long) ( elapsedTime / Math.max( 1d, ( startItems - remainingItems ) ) * remainingItems );
-				this.setEstimatedTime( eta );
-			}
-			if( !this.list.isEmpty() )
-			{
-				try
+				if( this.getEstimatedTime() >= 0 )
 				{
-					final PacketMEInventoryUpdate a = new PacketMEInventoryUpdate( (byte) 0 );
-					final PacketMEInventoryUpdate b = new PacketMEInventoryUpdate( (byte) 1 );
-					final PacketMEInventoryUpdate c = new PacketMEInventoryUpdate( (byte) 2 );
+					final long elapsedTime = this.getMonitor().getElapsedTime();
+					final double remainingItems = this.getMonitor().getRemainingItemCount();
+					final double startItems = this.getMonitor().getStartItemCount();
+					final long eta = (long) ( elapsedTime / Math.max( 1d, ( startItems - remainingItems ) ) * remainingItems );
+					this.setEstimatedTime( eta );
+				}
 
-					for( final IAEItemStack out : this.list )
+				final PacketMEInventoryUpdate a = new PacketMEInventoryUpdate( (byte) 0 );
+				final PacketMEInventoryUpdate b = new PacketMEInventoryUpdate( (byte) 1 );
+				final PacketMEInventoryUpdate c = new PacketMEInventoryUpdate( (byte) 2 );
+
+				for( final IAEItemStack out : this.list )
+				{
+					a.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.STORAGE ) );
+					b.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.ACTIVE ) );
+					c.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.PENDING ) );
+				}
+
+				this.list.resetStatus();
+
+				for( final Object g : this.listeners )
+				{
+					if( g instanceof EntityPlayer )
 					{
-						a.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.STORAGE ) );
-						b.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.ACTIVE ) );
-						c.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.PENDING ) );
-					}
-
-					this.list.resetStatus();
-
-					for( final Object g : this.listeners )
-					{
-						if( g instanceof EntityPlayer )
+						if( !a.isEmpty() )
 						{
-							if( !a.isEmpty() )
-							{
-								NetworkHandler.instance().sendTo( a, (EntityPlayerMP) g );
-							}
+							NetworkHandler.instance().sendTo( a, (EntityPlayerMP) g );
+						}
 
-							if( !b.isEmpty() )
-							{
-								NetworkHandler.instance().sendTo( b, (EntityPlayerMP) g );
-							}
+						if( !b.isEmpty() )
+						{
+							NetworkHandler.instance().sendTo( b, (EntityPlayerMP) g );
+						}
 
-							if( !c.isEmpty() )
-							{
-								NetworkHandler.instance().sendTo( c, (EntityPlayerMP) g );
-							}
+						if( !c.isEmpty() )
+						{
+							NetworkHandler.instance().sendTo( c, (EntityPlayerMP) g );
 						}
 					}
 				}
-				catch( final IOException e )
-				{
-					// :P
-				}
+			}
+			catch( final IOException e )
+			{
+				// :P
 			}
 		}
 		super.detectAndSendChanges();

src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java

@@ -215,48 +215,35 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 			final IItemHandler theSlot = new WrapperFilteredItemHandler( new WrapperRangeItemHandler( inv.server, slot, slot + 1 ), new PatternSlotFilter() );
 			final InventoryAdaptor interfaceSlot = new AdaptorItemHandler( theSlot );
 
-			IItemHandler interfaceHandler = inv.server;
-			boolean canInsert = true;
-
-			switch ( action )
+			switch( action )
 			{
 				case PICKUP_OR_SET_DOWN:
+
 					if( hasItemInHand )
 					{
-						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
+						ItemStack inSlot = theSlot.getStackInSlot( 0 );
+						if( inSlot.isEmpty() )
 						{
-							if( Platform.itemComparisons().isSameItem( interfaceHandler.getStackInSlot( s ), player.inventory.getItemStack() ) )
-							{
-								canInsert = false;
-								break;
-							}
+							player.inventory.setItemStack( interfaceSlot.addItems( player.inventory.getItemStack() ) );
 						}
-						if( canInsert )
+						else
 						{
-							ItemStack inSlot = theSlot.getStackInSlot( 0 );
-							if( inSlot.isEmpty() )
+							inSlot = inSlot.copy();
+							final ItemStack inHand = player.inventory.getItemStack().copy();
+
+							ItemHandlerUtil.setStackInSlot( theSlot, 0, ItemStack.EMPTY );
+							player.inventory.setItemStack( ItemStack.EMPTY );
+
+							player.inventory.setItemStack( interfaceSlot.addItems( inHand.copy() ) );
+
+							if( player.inventory.getItemStack().isEmpty() )
 							{
-								player.inventory.setItemStack( interfaceSlot.addItems( player.inventory.getItemStack() ) );
+								player.inventory.setItemStack( inSlot );
 							}
 							else
 							{
-								inSlot = inSlot.copy();
-								final ItemStack inHand = player.inventory.getItemStack().copy();
-
-								ItemHandlerUtil.setStackInSlot( theSlot, 0, ItemStack.EMPTY );
-								player.inventory.setItemStack( ItemStack.EMPTY );
-
-								player.inventory.setItemStack( interfaceSlot.addItems( inHand.copy() ) );
-
-								if( player.inventory.getItemStack().isEmpty() )
-								{
-									player.inventory.setItemStack( inSlot );
-								}
-								else
-								{
-									player.inventory.setItemStack( inHand );
-									ItemHandlerUtil.setStackInSlot( theSlot, 0, inSlot );
-								}
+								player.inventory.setItemStack( inHand );
+								ItemHandlerUtil.setStackInSlot( theSlot, 0, inSlot );
 							}
 						}
 					}
@@ -267,27 +254,17 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 
 					break;
 				case SPLIT_OR_PLACE_SINGLE:
+
 					if( hasItemInHand )
 					{
-						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
+						ItemStack extra = playerHand.removeItems( 1, ItemStack.EMPTY, null );
+						if( !extra.isEmpty() && !interfaceSlot.containsItems())
 						{
-							if( Platform.itemComparisons().isSameItem( interfaceHandler.getStackInSlot( s ), player.inventory.getItemStack() ) )
-							{
-								canInsert = false;
-								break;
-							}
+							extra = interfaceSlot.addItems( extra );
 						}
-						if( canInsert )
+						if( !extra.isEmpty() )
 						{
-							ItemStack extra = playerHand.removeItems( 1, ItemStack.EMPTY, null );
-							if( !extra.isEmpty() && !interfaceSlot.containsItems() )
-							{
-								extra = interfaceSlot.addItems( extra );
-							}
-							if( !extra.isEmpty() )
-							{
-								playerHand.addItems( extra );
-							}
+							playerHand.addItems( extra );
 						}
 					}
 					else if( !is.isEmpty() )
@@ -403,8 +380,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 		{
 			tag.setLong( "sortBy", inv.sortBy );
 			tag.setString( "un", inv.unlocalizedName );
-			tag.setTag( "pos", NBTUtil.createPosTag( inv.pos ) );
-			tag.setInteger( "dim", inv.dim );
+			tag.setTag("pos", NBTUtil.createPosTag( inv.pos ) );
 		}
 
 		for( int x = 0; x < length; x++ )
@@ -436,7 +412,6 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 		private final IItemHandler client;
 		private final IItemHandler server;
 		private final BlockPos pos;
-		private final int dim;
 
 		public InvTracker( final DualityInterface dual, final IItemHandler patterns, final String unlocalizedName )
 		{
@@ -445,7 +420,6 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 			this.unlocalizedName = unlocalizedName;
 			this.sortBy = dual.getSortValue();
 			this.pos = dual.getLocation().getPos();
-			this.dim = dual.getLocation().getWorld().provider.getDimension();
 		}
 	}
 

src/main/java/appeng/container/implementations/ContainerPatternTerm.java

@@ -23,7 +23,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import appeng.container.slot.*;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -52,6 +51,12 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.container.ContainerNull;
 import appeng.container.guisync.GuiSync;
+import appeng.container.slot.IOptionalSlotHost;
+import appeng.container.slot.OptionalSlotFake;
+import appeng.container.slot.SlotFakeCraftingMatrix;
+import appeng.container.slot.SlotPatternOutputs;
+import appeng.container.slot.SlotPatternTerm;
+import appeng.container.slot.SlotRestrictedInput;
 import appeng.core.sync.packets.PacketPatternSlot;
 import appeng.helpers.IContainerCraftingPacket;
 import appeng.items.storage.ItemViewCell;
@@ -127,28 +132,6 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		this.updateOrderOfOutputSlots();
 	}
 
-	@Override
-	public ItemStack transferStackInSlot( final EntityPlayer p, final int idx )
-	{
-		if( Platform.isClient() )
-		{
-			return ItemStack.EMPTY;
-		}
-		if( this.inventorySlots.get( idx ) instanceof SlotPlayerInv || this.inventorySlots.get( idx ) instanceof SlotPlayerHotBar )
-		{
-			final AppEngSlot clickSlot = ( AppEngSlot ) this.inventorySlots.get( idx ); // require AE SLots!
-			ItemStack itemStack = clickSlot.getStack();
-			if( AEApi.instance().definitions().materials().blankPattern().isSameAs( itemStack ) )
-			{
-				IItemHandler patternInv = this.getPatternTerminal().getInventoryByName( "pattern" );
-				ItemStack remainder = patternInv.insertItem( 0, itemStack, false );
-				clickSlot.putStack( remainder );
-			}
-		}
-		return super.transferStackInSlot( p, idx );
-	}
-
-
 	private void updateOrderOfOutputSlots()
 	{
 		if( !this.isCraftingMode() )

src/main/java/appeng/container/interfaces/IJEIGhostIngredients.java

@@ -1,18 +0,0 @@
-package appeng.container.interfaces;
-
-import mezz.jei.api.gui.IGhostIngredientHandler.Target;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-public interface IJEIGhostIngredients
-{
-    List<Target<?>> getPhantomTargets( Object ingredient );
-
-    default Map<Target<?>, Object> getFakeSlotTargetMap(){
-        return new HashMap<>();
-    }
-
-}

src/main/java/appeng/container/slot/IJEITargetSlot.java

@@ -1,4 +0,0 @@
-package appeng.container.slot;
-
-public interface IJEITargetSlot {
-}

src/main/java/appeng/container/slot/SlotFake.java

@@ -24,7 +24,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
 
 
-public class SlotFake extends AppEngSlot implements IJEITargetSlot
+public class SlotFake extends AppEngSlot
 {
 
 	public SlotFake( final IItemHandler inv, final int idx, final int x, final int y )

src/main/java/appeng/core/features/AEFeature.java

@@ -164,6 +164,7 @@ public enum AEFeature
 	PATTERNS( "Patterns", Constants.CATEGORY_CRAFTING_FEATURES ),
 	CRAFTING_CPU( "CraftingCPU", Constants.CATEGORY_CRAFTING_FEATURES ),
 	CRAFTING_MANAGER_FALLBACK( "CraftingManagerFallback", Constants.CATEGORY_CRAFTING_FEATURES, "Use CraftingManager to find an alternative recipe, after a pattern rejected an ingredient. Should be enabled to avoid issues, but can have a minor performance impact." ),
+	INSANE_BLOCKING_MODE( "InsaneBlockingMode", Constants.CATEGORY_CRAFTING_FEATURES, "Use the default AE2 blocking mode that doesn't work on any machines" ),
 
 	BASIC_CARDS( "BasicCards", Constants.CATEGORY_UPGRADES ),
 	ADVANCED_CARDS( "AdvancedCards", Constants.CATEGORY_UPGRADES ),

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

@@ -20,16 +20,7 @@ package appeng.core.sync.packets;
 
 
 import java.io.IOException;
-import java.util.Collections;
 
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.container.slot.IJEITargetSlot;
-import appeng.container.slot.SlotFake;
-import appeng.core.AELog;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.fluids.client.gui.widgets.GuiFluidSlot;
-import appeng.fluids.container.ContainerFluidConfigurable;
-import appeng.fluids.util.AEFluidStack;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
@@ -49,7 +40,6 @@ import appeng.core.sync.network.INetworkInfo;
 import appeng.helpers.InventoryAction;
 import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
-import net.minecraftforge.fluids.FluidStack;
 
 
 public class PacketInventoryAction extends AppEngPacket
@@ -67,7 +57,6 @@ public class PacketInventoryAction extends AppEngPacket
 		this.slot = stream.readInt();
 		this.id = stream.readLong();
 		final boolean hasItem = stream.readBoolean();
-
 		if( hasItem )
 		{
 			this.slotItem = AEItemStack.fromPacket( stream );
@@ -81,6 +70,7 @@ public class PacketInventoryAction extends AppEngPacket
 	// api
 	public PacketInventoryAction( final InventoryAction action, final int slot, final IAEItemStack slotItem ) throws IOException
 	{
+
 		if( Platform.isClient() )
 		{
 			throw new IllegalStateException( "invalid packet, client cannot post inv actions with stacks." );
@@ -111,36 +101,6 @@ public class PacketInventoryAction extends AppEngPacket
 		this.configureWrite( data );
 	}
 
-	public PacketInventoryAction(final InventoryAction action, final IJEITargetSlot slot, final IAEItemStack slotItem ) throws IOException
-	{
-
-		this.action = action;
-		if (slot instanceof SlotFake)
-		this.slot = ((SlotFake) slot).slotNumber;
-		else this.slot = ((GuiFluidSlot) slot).getId();
-		this.id = 0;
-		this.slotItem = slotItem;
-
-		final ByteBuf data = Unpooled.buffer();
-
-		data.writeInt( this.getPacketID() );
-		data.writeInt( action.ordinal() );
-		data.writeInt( this.slot );
-		data.writeLong( this.id );
-
-		if( slotItem == null )
-		{
-			data.writeBoolean( false );
-		}
-		else
-		{
-			data.writeBoolean( true );
-			slotItem.writeToPacket( data );
-		}
-
-		this.configureWrite( data );
-	}
-
 	// api
 	public PacketInventoryAction( final InventoryAction action, final int slot, final long id )
 	{
@@ -190,48 +150,6 @@ public class PacketInventoryAction extends AppEngPacket
 					}
 				}
 			}
-			else if( this.action == InventoryAction.PLACE_JEI_GHOST_ITEM )
-			{
-				if( sender.openContainer.inventorySlots.get( this.slot ) instanceof SlotFake )
-				{
-					if( this.slotItem != null )
-					{
-						sender.openContainer.inventorySlots.get( this.slot ).putStack( this.slotItem.createItemStack() );
-						if( sender.openContainer.inventorySlots.get( this.slot ).getStack().isEmpty() )
-						{
-							IAEFluidStack aefs = AEFluidStack.fromNBT( this.slotItem.getDefinition().getTagCompound() );
-							if( aefs != null )
-							{
-								FluidStack fluid = aefs.getFluidStack();
-								sender.openContainer.inventorySlots.get( this.slot ).putStack( AEFluidStack.fromFluidStack( fluid ).asItemStackRepresentation() );
-							}
-						}
-					}
-					else sender.openContainer.inventorySlots.get( this.slot ).putStack( ItemStack.EMPTY );
-					try
-					{
-						NetworkHandler.instance().sendTo( new PacketInventoryAction( InventoryAction.UPDATE_HAND, 0, AEItemStack.fromItemStack( ItemStack.EMPTY ) ), sender );
-					}
-					catch( final IOException e )
-					{
-						AELog.debug( e );
-					}
-				}
-
-				if( sender.openContainer instanceof ContainerFluidConfigurable )
-				{
-					if( this.slotItem != null )
-					{
-						IAEFluidStack aefs = AEFluidStack.fromNBT( this.slotItem.getDefinition().getTagCompound() );
-						if( aefs != null )
-						{
-							aefs.setStackSize( 1000 );
-							( (ContainerFluidConfigurable) sender.openContainer ).getFluidConfigInventory().setFluidInSlot( this.slot, aefs );
-							NetworkHandler.instance().sendToServer( new PacketFluidSlot( Collections.singletonMap( this.slot, aefs ) ) );
-						}
-					}
-				}
-			}
 			else
 			{
 				baseContainer.doAction( sender, this.action, this.slot, this.id );

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

@@ -215,7 +215,7 @@ public class PacketJEIRecipe extends AppEngPacket
 										IAEItemStack mostDamaged = null;
 										for( IAEItemStack is : outList )
 										{
-											if( !is.isCraftable() )
+											if( !is.isCraftable() && is.getItem().isDamageable() )
 											{
 												if( mostDamaged == null || mostDamaged.getItemDamage() < is.getItemDamage() )
 												{
@@ -285,7 +285,6 @@ public class PacketJEIRecipe extends AppEngPacket
 				IItemHandler outputSlots = cct.getInventoryByName( "output" );
 				for( int i = 0; i < this.output.length; ++i )
 				{
-					if( this.output[i] == null ) continue;
 					ItemHandlerUtil.setStackInSlot( outputSlots, i, this.output[i] );
 				}
 			}
@@ -304,7 +303,7 @@ public class PacketJEIRecipe extends AppEngPacket
 		{
 			for( ItemStack option : this.recipe[slot] )
 			{
-				if( ItemStack.areItemStacksEqual( is, option ) )
+				if( is.isItemEqual( option ) )
 				{
 					return is;
 				}

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

@@ -28,9 +28,7 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
-import appeng.me.helpers.PlayerSource;
 import appeng.util.inv.ItemListIgnoreCrafting;
-import net.minecraft.util.text.TextComponentString;
 
 
 public class MECraftingInventory implements IMEInventory<IAEItemStack>
@@ -309,15 +307,8 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
 
 				if( result == null || result.getStackSize() != extra.getStackSize() )
 				{
-					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 );
-						else
-							src.player().get().sendStatusMessage( new TextComponentString( "System reported " + extra.getStackSize() + " " + extra.getDefinition().getDisplayName() + " available but could only extract " + result.getStackSize() ), false );
-					}
 					failed = true;
-					if( !src.player().isPresent() ) break;
+					break;
 				}
 			}
 		}

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

@@ -90,13 +90,6 @@ public class GuiFluidLevelEmitter extends GuiUpgradeable
 		this.level.drawTextBox();
 	}
 
-	@Override
-	public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
-	{
-		if( isPointInRegion( 24, 43,89,this.fontRenderer.FONT_HEIGHT,mouseX,mouseY ) ) drawTooltip( mouseX - guiLeft - 7, mouseY - guiTop + 25, "Amount in millibuckets" );
-		super.drawFG( offsetX, offsetY, mouseX, mouseY );
-	}
-
 	@Override
 	protected boolean drawUpgrades()
 	{

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

@@ -4,7 +4,6 @@ package appeng.fluids.client.gui.widgets;
 
 import java.util.Collections;
 
-import appeng.container.slot.IJEITargetSlot;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -24,7 +23,7 @@ import appeng.fluids.util.AEFluidStack;
 import appeng.fluids.util.IAEFluidTank;
 
 
-public class GuiFluidSlot extends GuiCustomSlot implements IJEITargetSlot
+public class GuiFluidSlot extends GuiCustomSlot
 {
 	private final IAEFluidTank fluids;
 	private final int slot;

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

@@ -264,20 +264,19 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 	@Override
 	public void postChange( final IBaseMonitor<IAEFluidStack> monitor, final Iterable<IAEFluidStack> change, final IActionSource source )
 	{
-		if( source == this.source || source.machine().map( machine -> machine == this ).orElse( false ) )
+		try
 		{
-			try
+			if( this.getProxy().isActive() )
 			{
-				if( this.getProxy().isActive() )
-				{
-					this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ), change, this.source );
-				}
-			}
-			catch( final GridAccessException e )
-			{
-				// :(
+				this.getProxy()
+						.getStorage()
+						.postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ), change, this.source );
 			}
 		}
+		catch( final GridAccessException e )
+		{
+			// :(
+		}
 	}
 
 	public MEInventoryHandler<IAEFluidStack> getInternalHandler()

src/main/java/appeng/fluids/util/AEFluidStack.java

@@ -32,6 +32,7 @@ import io.netty.buffer.ByteBuf;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.PacketBuffer;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -216,18 +217,6 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 		return dup;
 	}
 
-	@Override
-	public boolean isItem()
-	{
-		return false;
-	}
-
-	@Override
-	public boolean isFluid()
-	{
-		return true;
-	}
-
 	@Override
 	public IStorageChannel<IAEFluidStack> getChannel()
 	{
@@ -318,17 +307,17 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 	}
 
 	@Override
-	public void writeToPacket( final ByteBuf buffer ) throws IOException
+	public void writeToPacket( final ByteBuf i ) throws IOException
 	{
 		final byte mask = (byte) ( ( this.getType( this.getStackSize() ) << 2 ) | ( this
 				.getType( this.getCountRequestable() ) << 4 ) | ( (byte) ( this.isCraftable() ? 1 : 0 ) << 6 ) | ( this.hasTagCompound() ? 1 : 0 ) << 7 );
 
-		buffer.writeByte( mask );
+		i.writeByte( mask );
 
-		this.writeToStream( buffer );
+		this.writeToStream( i );
 
-		this.putPacketValue( buffer, this.getStackSize() );
-		this.putPacketValue( buffer, this.getCountRequestable() );
+		this.putPacketValue( i, this.getStackSize() );
+		this.putPacketValue( i, this.getCountRequestable() );
 	}
 
 	private void writeToStream( final ByteBuf buffer ) throws IOException

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

@@ -19,22 +19,22 @@
 package appeng.helpers;
 
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
 
 import javax.annotation.Nullable;
 
 import appeng.integration.modules.gregtech.GTCEInventoryAdaptor;
 import appeng.util.*;
-import appeng.util.inv.*;
 import com.google.common.collect.ImmutableSet;
 
-import de.ellpeck.actuallyadditions.api.tile.IPhantomTile;
 import gregtech.api.block.machines.BlockMachine;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.MetaTileEntityHolder;
-import gregtech.api.metatileentity.TieredMetaTileEntity;
-import gregtech.api.metatileentity.WorkableTieredMetaTileEntity;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Items;
@@ -93,6 +93,8 @@ import appeng.api.util.AEPartLocation;
 import appeng.api.util.DimensionalCoord;
 import appeng.api.util.IConfigManager;
 import appeng.capabilities.Capabilities;
+import appeng.core.AEConfig;
+import appeng.core.features.AEFeature;
 import appeng.core.settings.TickRates;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.AENetworkProxy;
@@ -104,6 +106,10 @@ import appeng.parts.automation.StackUpgradeInventory;
 import appeng.parts.automation.UpgradeInventory;
 import appeng.tile.inventory.AppEngInternalAEInventory;
 import appeng.tile.inventory.AppEngInternalInventory;
+import appeng.util.inv.AdaptorItemHandler;
+import appeng.util.inv.IAEAppEngInventory;
+import appeng.util.inv.IInventoryDestination;
+import appeng.util.inv.InvOperation;
 import appeng.util.item.AEItemStack;
 
 import static gregtech.api.block.machines.BlockMachine.getMetaTileEntity;
@@ -142,8 +148,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	private IMEInventory<IAEItemStack> destination;
 	private int isWorking = -1;
 	private final Accessor accessor = new Accessor();
-	private EnumSet<EnumFacing> visitedFaces = EnumSet.noneOf( EnumFacing.class );
-	private EnumMap<EnumFacing,List<ItemStack>> waitingToSendFacing = new EnumMap<>(EnumFacing.class);
 	private GTCEInventoryAdaptor GTad;
 
 	public DualityInterface( final AENetworkProxy networkProxy, final IInterfaceHost ih )
@@ -238,27 +242,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			}
 		}
 		data.setTag( "waitingToSend", waitingToSend );
-
-		NBTTagCompound sidedWaitList = new NBTTagCompound();
-
-		if (this.waitingToSendFacing != null)
-		{
-			for( EnumFacing s : this.iHost.getTargets() )
-			{
-				NBTTagList waitingListSided = new NBTTagList();
-				if (this.waitingToSendFacing.containsKey( s ))
-				{
-					for( final ItemStack is : this.waitingToSendFacing.get( s ) )
-					{
-						final NBTTagCompound item = new NBTTagCompound();
-						is.writeToNBT( item );
-						waitingListSided.appendTag( item );
-					}
-					sidedWaitList.setTag( s.name(), waitingListSided );
-				}
-			}
-		}
-		data.setTag( "sidedWaitList", sidedWaitList );
 	}
 
 	public void readFromNBT( final NBTTagCompound data )
@@ -278,23 +261,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			}
 		}
 
-		this.waitingToSendFacing = null;
-		final NBTTagCompound waitingListSided = data.getCompoundTag("sidedWaitList");
-
-		for (EnumFacing s : EnumFacing.values())
-			if (waitingListSided.hasKey( s.name() )) {
-				NBTTagList w = waitingListSided.getTagList( s.name(), 10 );
-				for( int x = 0; x < w.tagCount(); x++ )
-				{
-					final NBTTagCompound c = w.getCompoundTagAt( x );
-					if( c != null )
-					{
-						final ItemStack is = new ItemStack( c );
-						this.addToSendListFacing( is , EnumFacing.getFront( s.getIndex() ) );
-					}
-				}
-			}
-
 		this.craftingTracker.readFromNBT( data );
 		this.upgrades.readFromNBT( data, "upgrades" );
 		this.config.readFromNBT( data, "config" );
@@ -330,30 +296,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		}
 	}
 
-	private void addToSendListFacing( final ItemStack is, EnumFacing f )
-	{
-		if( is.isEmpty() )
-		{
-			return;
-		}
-		if (this.waitingToSendFacing == null){
-			this.waitingToSendFacing = new EnumMap<>(EnumFacing.class);
-		}
-
-		this.waitingToSendFacing.computeIfAbsent( f, k -> new ArrayList<>() );
-
-		this.waitingToSendFacing.get( f ).add( is );
-
-		try
-		{
-			this.gridProxy.getTick().wakeDevice( this.gridProxy.getNode() );
-		}
-		catch( final GridAccessException e )
-		{
-			// :P
-		}
-	}
-
 	private void readConfig()
 	{
 		this.hasConfig = false;
@@ -451,22 +393,24 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		}
 	}
 
-	private boolean hasWorkToDo() {
-
-		if (hasItemsToSend()){
+	private boolean hasWorkToDo()
+	{
+		if( this.hasItemsToSend() )
+		{
 			return true;
 		}
-
-		if(hasItemsToSendFacing()){
-			return true;
-		}
-
-		for (final IAEItemStack requiredWork : this.requireWork) {
-			if (requiredWork != null) {
-				return true;
+		else
+		{
+			for( final IAEItemStack requiredWork : this.requireWork )
+			{
+				if( requiredWork != null )
+				{
+					return true;
+				}
 			}
+
+			return false;
 		}
-		return false;
 	}
 
 	private void updatePlan( final int slot )
@@ -571,21 +515,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		return this.waitingToSend != null && !this.waitingToSend.isEmpty();
 	}
 
-	private boolean hasItemsToSendFacing()
-	{
-		if (waitingToSendFacing != null)
-		{
-			for( EnumFacing enumFacing : waitingToSendFacing.keySet() )
-			{
-				if( !waitingToSendFacing.get( enumFacing ).isEmpty() )
-				{
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
 	@Override
 	public boolean canInsert( final ItemStack stack )
 	{
@@ -657,21 +586,11 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			return TickRateModulation.SLEEP;
 		}
 
-		//Previous version might have items saved in this list
-		//recover them
 		if( this.hasItemsToSend() )
 		{
 			this.pushItemsOut( this.iHost.getTargets() );
 		}
 
-		if (hasItemsToSendFacing())
-		{
-			for( EnumFacing enumFacing : waitingToSendFacing.keySet() )
-			{
-				this.pushItemsOut( enumFacing );
-			}
-		}
-
 		final boolean couldDoWork = this.updateStorage();
 		return this.hasWorkToDo() ? ( couldDoWork ? TickRateModulation.URGENT : TickRateModulation.SLOWER ) : TickRateModulation.SLEEP;
 	}
@@ -732,47 +651,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		}
 	}
 
-	private void pushItemsOut( final EnumFacing s )
-	{
-		if (!this.waitingToSendFacing.containsKey(s) ||
-				(this.waitingToSendFacing.containsKey(s) && this.waitingToSendFacing.get( s ).isEmpty())) {
-			return;
-		}
-
-		final TileEntity tile = this.iHost.getTileEntity();
-		final World w = tile.getWorld();
-
-		final TileEntity te = w.getTileEntity( tile.getPos().offset( s ) );
-		if( te == null )
-		{
-			return;
-		}
-
-		final Iterator<ItemStack> i = this.waitingToSendFacing.get( s ).iterator();
-		while ( i.hasNext() )
-		{
-			ItemStack whatToSend = i.next();
-			final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
-			if( ad != null )
-			{
-				final ItemStack result = ad.addItems( whatToSend );
-				if( !result.isEmpty() )
-				{
-					whatToSend.setCount( whatToSend.getCount() - ( whatToSend.getCount() - result.getCount() ) );
-				}
-				else
-				{
-					i.remove();
-				}
-			}
-		}
-
-		if( this.waitingToSendFacing.get( s ).isEmpty() )
-		{
-			this.waitingToSendFacing.remove( s );
-		}
-	}
-
 	private boolean updateStorage()
 	{
 		boolean didSomething = false;
@@ -1035,9 +913,13 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		};
 	}
 
-	private boolean invIsBlocked( InventoryAdaptor inv )
+	private static boolean invIsBlocked( InventoryAdaptor inv )
 	{
-		return  (inv.containsItems());
+		if( AEConfig.instance().isFeatureEnabled( AEFeature.INSANE_BLOCKING_MODE ) )
+		{
+			return !inv.simulateRemove( 1, ItemStack.EMPTY, null ).isEmpty();
+		}
+		else return inv.containsItems();
 	}
 
 	private static boolean invIsBlockedGTCE( GTCEInventoryAdaptor inv )
@@ -1048,7 +930,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	@Override
 	public boolean pushPattern( final ICraftingPatternDetails patternDetails, final InventoryCrafting table )
 	{
-		if( this.hasItemsToSend() || this.hasItemsToSendFacing() || !this.gridProxy.isActive() || !this.craftingList.contains( patternDetails ) )
+		if( this.hasItemsToSend() || !this.gridProxy.isActive() || !this.craftingList.contains( patternDetails ) )
 		{
 			return false;
 		}
@@ -1056,12 +938,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		final TileEntity tile = this.iHost.getTileEntity();
 		final World w = tile.getWorld();
 
-		if( this.visitedFaces.isEmpty() )
-		{
-			this.visitedFaces = this.iHost.getTargets();
-		}
-
-		for( final EnumFacing s : visitedFaces )
+		final EnumSet<EnumFacing> possibleDirections = this.iHost.getTargets();
+		for( final EnumFacing s : possibleDirections )
 		{
 			final TileEntity te = w.getTileEntity( tile.getPos().offset( s ) );
 			if( te instanceof IInterfaceHost )
@@ -1070,7 +948,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				{
 					if( ( (IInterfaceHost) te ).getInterfaceDuality().sameGrid( this.gridProxy.getGrid() ) )
 					{
-						visitedFaces.remove( s );
 						continue;
 					}
 				}
@@ -1085,7 +962,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				final ICraftingMachine cm = (ICraftingMachine) te;
 				if( cm.acceptsPlans() )
 				{
-					visitedFaces.remove( s );
 					if( cm.pushPattern( patternDetails, table, s.getOpposite() ) )
 					{
 						return true;
@@ -1099,67 +975,53 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			{
 				if( this.isBlocking() )
 				{
-					IPhantomTile phantomTE = null;
-					if( Loader.isModLoaded( "actuallyadditions" ) && Loader.isModLoaded( "gregtech" ) && te instanceof IPhantomTile )
+					if( te.getBlockType().getRegistryName().getResourceDomain().equals( "gregtech" ) )
 					{
-						phantomTE = ( (IPhantomTile) te );
-						if( phantomTE.hasBoundPosition() )
+						GTad = GTCEInventoryAdaptor.getAdaptor( te, s.getOpposite() );
+						if( invIsBlockedGTCE( GTad ) )
 						{
-							TileEntity phantom = w.getTileEntity( phantomTE.getBoundPosition() );
-							if( phantom instanceof MetaTileEntityHolder && isGTCEblocked( phantom, s ) )
-							{
-								visitedFaces.remove( s );
-								continue;
-							}
-						}
-					}
-
-					else if( Loader.isModLoaded( "gregtech" ) && te instanceof MetaTileEntityHolder )
-					{
-						if( isGTCEblocked( te, s ) )
-						{
-							visitedFaces.remove( s );
 							continue;
 						}
 					}
-
-					else if( invIsBlocked( ad ) )
+					else
 					{
-						visitedFaces.remove( s );
-						continue;
+						if( invIsBlocked( ad ) )
+						{
+							continue;
+						}
 					}
 				}
 
 				if( this.acceptsItems( ad, table ) )
 				{
-					visitedFaces.remove( s );
 					for( int x = 0; x < table.getSizeInventory(); x++ )
 					{
 						final ItemStack is = table.getStackInSlot( x );
 						if( !is.isEmpty() )
 						{
-							addToSendListFacing( is, s );
+							final ItemStack added = ad.addItems( is );
+							this.addToSendList( added );
 						}
 					}
-					pushItemsOut( s );
+					this.pushItemsOut( possibleDirections );
 					return true;
 				}
 			}
-			visitedFaces.remove( s );
 		}
+
 		return false;
 	}
 
 	@Override
 	public boolean isBusy()
 	{
-		boolean busy = false;
-
-		if( this.hasItemsToSend() || hasItemsToSendFacing() )
+		if( this.hasItemsToSend() )
 		{
 			return true;
 		}
 
+		boolean busy = false;
+
 		if( this.isBlocking() )
 		{
 			final EnumSet<EnumFacing> possibleDirections = this.iHost.getTargets();
@@ -1171,38 +1033,27 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			for( final EnumFacing s : possibleDirections )
 			{
 				final TileEntity te = w.getTileEntity( tile.getPos().offset( s ) );
-				IPhantomTile phantomTE = null;
 
 				final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
 				if( ad != null )
 				{
-					if( Loader.isModLoaded( "actuallyadditions") && Loader.isModLoaded( "gregtech" ) && te instanceof IPhantomTile )
+					if( te.getBlockType().getRegistryName().getResourceDomain().equals( "gregtech" ) )
 					{
-						phantomTE = ( (IPhantomTile) te );
-						if( phantomTE.hasBoundPosition() )
-						{
-							TileEntity phantom = w.getTileEntity( phantomTE.getBoundPosition() );
-							if( phantom instanceof MetaTileEntityHolder && !isGTCEblocked( phantom, s ) )
-							{
-								allAreBusy = false;
-								break;
-							}
-						}
-					}
-
-					else if( Loader.isModLoaded( "gregtech" ) && te instanceof MetaTileEntityHolder )
-					{
-						if( !isGTCEblocked( te, s ) )
+						GTad = GTCEInventoryAdaptor.getAdaptor( te, s.getOpposite() );
+						if( !invIsBlockedGTCE( GTad ) )
 						{
 							allAreBusy = false;
 							break;
 						}
 					}
-
-					else if( !invIsBlocked( ad ) )
+					else
 					{
-						allAreBusy = false;
-						break;
+						if( !invIsBlocked( ad ) )
+						{
+							allAreBusy = false;
+							break;
+						}
+
 					}
 				}
 			}
@@ -1211,12 +1062,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		return busy;
 	}
 
-	boolean isGTCEblocked(TileEntity te, EnumFacing s)
-	{
-		GTad = GTCEInventoryAdaptor.getAdaptor( te, s.getOpposite() );
-		return invIsBlockedGTCE( GTad );
-	}
-
 	private boolean sameGrid( final IGrid grid ) throws GridAccessException
 	{
 		return grid == this.gridProxy.getGrid();
@@ -1272,20 +1117,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			}
 		}
 
-		if( this.waitingToSendFacing != null )
-		{
-			for (List<ItemStack> itemList : waitingToSendFacing.values())
-			{
-				for (final ItemStack is : itemList)
-				{
-					if (!is.isEmpty())
-					{
-						drops.add(is);
-					}
-				}
-			}
-		}
-
 		for( final ItemStack is : this.upgrades )
 		{
 			if( !is.isEmpty() )

src/main/java/appeng/helpers/HighlighterHandler.java

@@ -26,11 +26,10 @@ public class HighlighterHandler
             return;
         }
         Minecraft mc = Minecraft.getMinecraft();
-        int dimension = mc.world.provider.getDimension();
         long time = System.currentTimeMillis();
 
-        if (time > BlockPosHighlighter.getExpireHilight() || dimension != BlockPosHighlighter.getDimension()) {
-            BlockPosHighlighter.hilightBlock(null, -1, BlockPosHighlighter.getDimension() );
+        if (time > BlockPosHighlighter.getExpireHilight()) {
+            BlockPosHighlighter.hilightBlock(null, -1);
             return;
         }
 
@@ -62,7 +61,6 @@ public class HighlighterHandler
         tessellator.draw();
 
         GlStateManager.enableTexture2D();
-        GlStateManager.enableDepth();
         GlStateManager.popMatrix();
     }
 

src/main/java/appeng/helpers/InventoryAction.java

@@ -43,6 +43,5 @@ public enum InventoryAction
 	ROLL_UP,
 	ROLL_DOWN,
 	AUTO_CRAFT,
-	PLACE_SINGLE,
-	PLACE_JEI_GHOST_ITEM
+	PLACE_SINGLE
 }

src/main/java/appeng/integration/modules/gregtech/GTCEInventoryAdaptor.java

@@ -1,26 +1,26 @@
-package appeng.integration.modules.gregtech;
-
-import appeng.util.inv.ItemSlot;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
-import net.minecraftforge.items.CapabilityItemHandler;
-import net.minecraftforge.items.IItemHandler;
-
-public abstract class GTCEInventoryAdaptor implements Iterable<ItemSlot>
-{
-    public static GTCEInventoryAdaptor getAdaptor(final TileEntity te, final EnumFacing d)
-    {
-        if (te != null && te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d))
-        {
-            // Attempt getting an IItemHandler for the given side via caps
-            IItemHandler itemHandler = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d);
-            if (itemHandler != null)
-            {
-                return new GTCEItemHandler(itemHandler);
-            }
-        }
-        return null;
-    }
-
-    public abstract boolean canRemoveAllExceptCircuits();
-}
+package appeng.integration.modules.gregtech;
+
+import appeng.util.inv.ItemSlot;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
+import net.minecraftforge.items.CapabilityItemHandler;
+import net.minecraftforge.items.IItemHandler;
+
+public abstract class GTCEInventoryAdaptor implements Iterable<ItemSlot>
+{
+    public static GTCEInventoryAdaptor getAdaptor(final TileEntity te, final EnumFacing d)
+    {
+        if (te != null && te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d))
+        {
+            // Attempt getting an IItemHandler for the given side via caps
+            IItemHandler itemHandler = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d);
+            if (itemHandler != null)
+            {
+                return new GTCEItemHandler(itemHandler);
+            }
+        }
+        return null;
+    }
+
+    public abstract boolean canRemoveAllExceptCircuits();
+}

src/main/java/appeng/integration/modules/gregtech/GTCEItemHandler.java

@@ -1,58 +1,57 @@
-package appeng.integration.modules.gregtech;
-
-import appeng.util.inv.ItemHandlerIterator;
-import appeng.util.inv.ItemSlot;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.items.IItemHandler;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-
-public class GTCEItemHandler extends GTCEInventoryAdaptor
-{
-    ArrayList<Integer> GTCElenses = new ArrayList<>(Arrays.asList(15085,15214,15092,15111,15113,15219,15218,15243,15244,15209,15117,15206,15216,15331,15212,15213,15154,15122,15157,15190,15247));
-    ArrayList<Integer> GTCEmolds = new ArrayList<>(Arrays.asList(32301,32303,32304,32305,32306,32307,32308,32309,32313,32314,32315,32317,32350,32351,32352,32353,32354,32355,32356,32358,32359,32360,32361,32363,32364,32365,32366,32367,32368,32369,32370,32371,32372,32373));
-    Item smallGearExtruderShape = Item.getByNameOrId("contenttweaker:smallgearextrudershape");
-    Item creativePortableTankMold = Item.getByNameOrId("contenttweaker:creativeportabletankmold");
-
-    protected final IItemHandler itemHandler;
-
-    public GTCEItemHandler(IItemHandler itemHandler)
-    {
-        this.itemHandler = itemHandler;
-    }
-
-    boolean isBlockableItem(ItemStack stack)
-    {
-        if ( stack.getItem() == Item.getByNameOrId("gregtech:meta_item_1") ) {
-            int metadata = stack.getItemDamage();
-            if ( metadata == 32766 || GTCElenses.contains(metadata) || GTCEmolds.contains(metadata)) {
-                return false;
-            }
-        }
-        if ( stack.getItem() == smallGearExtruderShape ) return false;
-        if ( stack.getItem() == creativePortableTankMold) return false;
-        return true;
-    }
-
-    @Override
-    public boolean canRemoveAllExceptCircuits()
-    {
-        int slots = this.itemHandler.getSlots();
-        for ( int slot = 0; slot < slots; slot++ ) {
-            ItemStack is = this.itemHandler.getStackInSlot(slot);
-            if ( is.isEmpty() || !isBlockableItem(is) ) continue;
-
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public Iterator<ItemSlot> iterator()
-    {
-        return new ItemHandlerIterator( this.itemHandler );
-    }
-}
+package appeng.integration.modules.gregtech;
+
+import appeng.util.inv.ItemSlot;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.items.IItemHandler;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+
+public class GTCEItemHandler extends GTCEInventoryAdaptor
+{
+    ArrayList<Integer> GTCElenses = new ArrayList<>(Arrays.asList(15085,15214,15092,15111,15113,15219,15218,15243,15244,15209,15117,15206,15216,15331,15212,15213,15154,15122,15157,15190,15247));
+    ArrayList<Integer> GTCEmolds = new ArrayList<>(Arrays.asList(32301,32303,32304,32305,32306,32307,32308,32309,32313,32314,32315,32317,32350,32351,32352,32353,32354,32355,32356,32358,32359,32360,32361,32363,32364,32365,32366,32367,32368,32369,32370,32371,32372,32373));
+    Item smallGearExtruderShape = Item.getByNameOrId("contenttweaker:smallgearextrudershape");
+    Item creativePortableTankMold = Item.getByNameOrId("contenttweaker:creativeportabletankmold");
+
+    protected final IItemHandler itemHandler;
+
+    public GTCEItemHandler(IItemHandler itemHandler)
+    {
+        this.itemHandler = itemHandler;
+    }
+
+    boolean isBlockableItem(ItemStack stack)
+    {
+        if ( stack.getItem() == Item.getByNameOrId("gregtech:meta_item_1") ) {
+            int metadata = stack.getItemDamage();
+            if ( metadata == 32766 || GTCElenses.contains(metadata) || GTCEmolds.contains(metadata)) {
+                return false;
+            }
+        }
+        if ( stack.getItem() == smallGearExtruderShape ) return false;
+        if ( stack.getItem() == creativePortableTankMold) return false;
+        return true;
+    }
+
+    @Override
+    public boolean canRemoveAllExceptCircuits()
+    {
+        int slots = this.itemHandler.getSlots();
+        for ( int slot = 0; slot < slots; slot++ ) {
+            ItemStack is = this.itemHandler.getStackInSlot(slot);
+            if ( is.isEmpty() || !isBlockableItem(is) ) continue;
+
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public Iterator<ItemSlot> iterator()
+    {
+        return null;
+    }
+}

src/main/java/appeng/integration/modules/jei/JEIPlugin.java

@@ -19,8 +19,6 @@
 package appeng.integration.modules.jei;
 
 
-import javax.annotation.Nullable;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -29,11 +27,14 @@ import appeng.client.gui.AEGuiHandler;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 
-import mezz.jei.api.*;
 import mezz.jei.config.Constants;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
+import mezz.jei.api.IJeiRuntime;
+import mezz.jei.api.IModPlugin;
+import mezz.jei.api.IModRegistry;
+import mezz.jei.api.ISubtypeRegistry;
 import mezz.jei.api.recipe.IRecipeCategoryRegistration;
 import mezz.jei.api.recipe.VanillaRecipeCategoryUid;
 
@@ -56,9 +57,6 @@ import appeng.items.parts.ItemFacade;
 @mezz.jei.api.JEIPlugin
 public class JEIPlugin implements IModPlugin
 {
-	public static IJeiRuntime runtime;
-	public static AEGuiHandler aeGuiHandler;
-
 	@Override
 	public void registerItemSubtypes( ISubtypeRegistry subtypeRegistry )
 	{
@@ -97,9 +95,8 @@ public class JEIPlugin implements IModPlugin
 				.addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerPatternTerm.class ),
 						Constants.UNIVERSAL_RECIPE_TRANSFER_UID );
 
-		aeGuiHandler = new AEGuiHandler();
+		AEGuiHandler aeGuiHandler = new AEGuiHandler();
 		registry.addAdvancedGuiHandlers(aeGuiHandler);
-		registry.addGhostIngredientHandler( aeGuiHandler.getGuiContainerClass(), aeGuiHandler);
 	}
 
 	private void registerDescriptions( IDefinitions definitions, IModRegistry registry )
@@ -222,6 +219,5 @@ public class JEIPlugin implements IModPlugin
 	{
 		JEIModule jeiModule = (JEIModule) Integrations.jei();
 		jeiModule.setJei( new JeiRuntimeAdapter( jeiRuntime ) );
-		runtime = jeiRuntime;
 	}
 }

src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java

@@ -27,7 +27,6 @@ import java.util.Map;
 import javax.annotation.Nullable;
 
 import appeng.container.implementations.ContainerPatternTerm;
-import appeng.core.sync.packets.PacketValueConfig;
 import mezz.jei.api.recipe.VanillaRecipeCategoryUid;
 import mezz.jei.transfer.RecipeTransferErrorInternal;
 import mezz.jei.transfer.RecipeTransferErrorTooltip;
@@ -74,7 +73,24 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 	{
 		final String recipeType = recipeLayout.getRecipeCategory().getUid();
 
-		if (recipeType.equals( VanillaRecipeCategoryUid.INFORMATION) || recipeType.equals(VanillaRecipeCategoryUid.FUEL))
+		if (!recipeType.equals( VanillaRecipeCategoryUid.INFORMATION) && !recipeType.equals(VanillaRecipeCategoryUid.FUEL))
+		{
+			if( container instanceof ContainerPatternTerm )
+			{
+				if( !( (ContainerPatternTerm) container ).isCraftingMode() )
+				{
+					if( recipeType.equals( VanillaRecipeCategoryUid.CRAFTING ) )
+					{
+						return new RecipeTransferErrorTooltip( I18n.format( "gui.appliedenergistics2.CraftingPattern" ) );
+					}
+				}
+				else if( !recipeType.equals( VanillaRecipeCategoryUid.CRAFTING ) )
+				{
+					return new RecipeTransferErrorTooltip( I18n.format( "gui.appliedenergistics2.ProcessingPattern" ) );
+				}
+			}
+		}
+		else
 		{
 			return RecipeTransferErrorInternal.INSTANCE;
 		}
@@ -84,30 +100,6 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 			return null;
 		}
 
-		if( container instanceof ContainerPatternTerm )
-		{
-			try
-			{
-				if( !( (ContainerPatternTerm) container ).isCraftingMode() )
-				{
-					if( recipeType.equals( VanillaRecipeCategoryUid.CRAFTING ) )
-					{
-						NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.CraftMode", "1" ) );
-					}
-				}
-				else if( !recipeType.equals( VanillaRecipeCategoryUid.CRAFTING ) )
-				{
-
-					NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.CraftMode", "0" ) );
-				}
-
-			}
-			catch( IOException e )
-			{
-				e.printStackTrace();
-			}
-		}
-
 		Map<Integer, ? extends IGuiIngredient<ItemStack>> ingredients = recipeLayout.getItemStacks().getGuiIngredients();
 
 		final NBTTagCompound recipe = new NBTTagCompound();

src/main/java/appeng/me/GridNode.java

@@ -633,10 +633,10 @@ public class GridNode implements IGridNode, IPathItem
 			this.usedChannels = 0;
 		}
 
-		final int idx = this.connections.indexOf( (IGridConnection) fast );
+		final int idx = this.connections.indexOf( fast );
 		if( idx > 0 )
 		{
-			this.connections.remove( (IGridConnection) fast );
+			this.connections.remove( fast );
 			this.connections.add( 0, (IGridConnection) fast );
 		}
 	}

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

@@ -42,10 +42,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 
-import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
-import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.ObjectRBTreeSet;
-import it.unimi.dsi.fastutil.objects.ObjectSet;
 import net.minecraft.world.World;
 
 import appeng.api.AEApi;
@@ -109,8 +105,8 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	private final Set<ICraftingProvider> craftingProviders = new HashSet<>();
 	private final Map<IGridNode, ICraftingWatcher> craftingWatchers = new HashMap<>();
 	private final IGrid grid;
-	private final Object2ObjectMap<ICraftingPatternDetails, List<ICraftingMedium>> craftingMethods = new Object2ObjectOpenHashMap<>();
-	private final Object2ObjectMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> craftableItems = new Object2ObjectOpenHashMap<>();
+	private final Map<ICraftingPatternDetails, List<ICraftingMedium>> craftingMethods = new HashMap<>();
+	private final Map<IAEItemStack, ImmutableList<ICraftingPatternDetails>> craftableItems = new HashMap<>();
 	private final Set<IAEItemStack> emitableItems = new HashSet<>();
 	private final Map<String, CraftingLinkNexus> craftingLinks = new HashMap<>();
 	private final Multimap<IAEStack, CraftingWatcher> interests = HashMultimap.create();
@@ -164,11 +160,11 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	{
 		if( machine instanceof ICraftingWatcherHost )
 		{
-			final ICraftingWatcher craftingWatcher = this.craftingWatchers.get( gridNode );
+			final ICraftingWatcher craftingWatcher = this.craftingWatchers.get( machine );
 			if( craftingWatcher != null )
 			{
 				craftingWatcher.reset();
-				this.craftingWatchers.remove( gridNode );
+				this.craftingWatchers.remove( machine );
 			}
 		}
 
@@ -274,7 +270,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 			return;
 		}
 
-		final Object2ObjectMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = this.craftableItems;
+		final Map<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = this.craftableItems;
 
 		// erase list.
 		this.craftingMethods.clear();
@@ -291,7 +287,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 			provider.provideCrafting( this );
 		}
 
-		final Object2ObjectMap<IAEItemStack, ObjectSet<ICraftingPatternDetails>> tmpCraft = new Object2ObjectOpenHashMap<>();
+		final Map<IAEItemStack, Set<ICraftingPatternDetails>> tmpCraft = new HashMap<>();
 
 		// new craftables!
 		for( final ICraftingPatternDetails details : this.craftingMethods.keySet() )
@@ -302,11 +298,11 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 				out.reset();
 				out.setCraftable( true );
 
-				ObjectSet<ICraftingPatternDetails> methods = tmpCraft.get( out );
+				Set<ICraftingPatternDetails> methods = tmpCraft.get( out );
 
 				if( methods == null )
 				{
-					tmpCraft.put( out, methods = new ObjectRBTreeSet<>( COMPARATOR ) );
+					tmpCraft.put( out, methods = new TreeSet<>( COMPARATOR ) );
 				}
 
 				methods.add( details );
@@ -314,7 +310,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 		}
 
 		// make them immutable
-		for( final Entry<IAEItemStack, ObjectSet<ICraftingPatternDetails>> e : tmpCraft.entrySet() )
+		for( final Entry<IAEItemStack, Set<ICraftingPatternDetails>> e : tmpCraft.entrySet() )
 		{
 			this.craftableItems.put( e.getKey(), ImmutableList.copyOf( e.getValue() ) );
 		}
@@ -639,11 +635,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 
 	public boolean hasCpu( final ICraftingCPU cpu )
 	{
-		if (cpu instanceof CraftingCPUCluster)
-		{
-			return this.craftingCPUClusters.contains( (CraftingCPUCluster) cpu );
-		}
-		return false;
+		return this.craftingCPUClusters.contains( cpu );
 	}
 
 	public GenericInterestManager<CraftingWatcher> getInterestManager()

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

@@ -30,7 +30,6 @@ import java.util.PriorityQueue;
 import java.util.Queue;
 import java.util.Set;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.Multiset;
 import com.google.common.collect.Sets;
@@ -64,7 +63,7 @@ import appeng.me.energy.EnergyWatcher;
 public class EnergyGridCache implements IEnergyGrid
 {
 
-	private static final double MAX_BUFFER_STORAGE = 800;
+	private static final double MAX_BUFFER_STORAGE = 200;
 	private static final Comparator<IEnergyGridProvider> COMPARATOR_HIGHEST_AMOUNT_STORED_FIRST = ( o1, o2 ) -> Double.compare( o2.getProviderStoredEnergy(),
 			o1.getProviderStoredEnergy() );
 
@@ -77,24 +76,9 @@ public class EnergyGridCache implements IEnergyGrid
 	};
 
 	private final NavigableSet<EnergyThreshold> interests = Sets.newTreeSet();
-
-	// Should only be modified from the add/remove methods below to guard against
-	// concurrent modifications
 	private final double averageLength = 40.0;
 	private final Set<IAEPowerStorage> providers = new LinkedHashSet<>();
-	// Used to track whether an extraction is currently in progress, to fail fast
-	// when something externally
-	// modifies the energy grid.
-	private boolean ongoingExtractOperation = false;
-
-	// Should only be modified from the add/remove methods below to guard against
-	// concurrent modifications
 	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.
-	private boolean ongoingInjectOperation = false;
-
 	private final Multiset<IEnergyGridProvider> energyGridProviders = HashMultiset.create();
 	private final IGrid myGrid;
 	private final HashMap<IGridNode, IEnergyWatcher> watchers = new HashMap<>();
@@ -126,10 +110,6 @@ public class EnergyGridCache implements IEnergyGrid
 	private double lastStoredPower = -1;
 
 	private final GridPowerStorage localStorage = new GridPowerStorage();
-	private Set<IAEPowerStorage> providerToRemove = new HashSet<>();
-	private Set<IAEPowerStorage> requesterToRemove = new HashSet<>();
-	private Set<IAEPowerStorage> providersToAdd = new HashSet<>();
-	private Set<IAEPowerStorage> requesterToAdd = new HashSet<>();
 
 	public EnergyGridCache( final IGrid g )
 	{
@@ -163,32 +143,18 @@ public class EnergyGridCache implements IEnergyGrid
 	{
 		if( ev.storage.isAEPublicPowerStorage() )
 		{
-			switch ( ev.type )
+			switch( ev.type )
 			{
 				case PROVIDE_POWER:
 					if( ev.storage.getPowerFlow() != AccessRestriction.WRITE )
 					{
-						if( !ongoingExtractOperation )
-						{
-							addProvider( ev.storage );
-						}
-						else
-						{
-							this.providersToAdd.add( ev.storage );
-						}
+						this.providers.add( ev.storage );
 					}
 					break;
 				case REQUEST_POWER:
 					if( ev.storage.getPowerFlow() != AccessRestriction.READ )
 					{
-						if( !ongoingInjectOperation )
-						{
-							addRequester( ev.storage );
-						}
-						else
-						{
-							this.requesterToAdd.add( ev.storage );
-						}
+						this.requesters.add( ev.storage );
 					}
 					break;
 			}
@@ -202,23 +168,6 @@ public class EnergyGridCache implements IEnergyGrid
 	@Override
 	public void onUpdateTick()
 	{
-		if (!providerToRemove.isEmpty() && !ongoingExtractOperation) {
-			this.providers.removeIf( p -> providerToRemove.contains( p ) );
-			providerToRemove.clear();
-		}
-		if (!requesterToRemove.isEmpty() && !ongoingInjectOperation) {
-			this.requesters.removeIf( r -> providerToRemove.contains( r ) );
-			requesterToRemove.clear();
-		}
-		if (!providersToAdd.isEmpty() && !ongoingExtractOperation) {
-			this.providers.addAll(providersToAdd);
-			providersToAdd.clear();
-		}
-		if( !requesterToAdd.isEmpty() && !ongoingInjectOperation){
-			this.requesters.addAll(requesterToAdd);
-			requesterToAdd.clear();
-		}
-
 		if( !this.interests.isEmpty() )
 		{
 			final double oldPower = this.lastStoredPower;
@@ -354,30 +303,18 @@ public class EnergyGridCache implements IEnergyGrid
 
 		final Iterator<IAEPowerStorage> it = this.providers.iterator();
 
-		ongoingExtractOperation = true;
-		try
+		while( extractedPower < amt && it.hasNext() )
 		{
-			while ( extractedPower < amt && it.hasNext() )
+			final IAEPowerStorage node = it.next();
+
+			final double req = amt - extractedPower;
+			final double newPower = node.extractAEPower( req, mode, PowerMultiplier.ONE );
+			extractedPower += newPower;
+
+			if( newPower < req && mode == Actionable.MODULATE )
 			{
-				final IAEPowerStorage node = it.next();
-
-				if ( providerToRemove.contains( node )) {
-					it.remove();
-					providerToRemove.remove( node );
-					continue;
-				}
-
-				final double req = amt - extractedPower;
-				final double newPower = node.extractAEPower( req, mode, PowerMultiplier.ONE );
-				extractedPower += newPower;
-
-				if( newPower < req && mode == Actionable.MODULATE )
-				{
-					it.remove();
-				}
+				it.remove();
 			}
-		} finally {
-			ongoingExtractOperation = false;
 		}
 
 		final double result = Math.min( extractedPower, amt );
@@ -403,29 +340,15 @@ public class EnergyGridCache implements IEnergyGrid
 
 		final Iterator<IAEPowerStorage> it = this.requesters.iterator();
 
-		ongoingInjectOperation = true;
-		try
+		while( amt > 0 && it.hasNext() )
 		{
-			while ( amt > 0 && it.hasNext() )
+			final IAEPowerStorage node = it.next();
+			amt = node.injectAEPower( amt, mode );
+
+			if( amt > 0 && mode == Actionable.MODULATE )
 			{
-				final IAEPowerStorage node = it.next();
-
-				if ( requesterToRemove.contains( node )) {
-					it.remove();
-					requesterToRemove.remove( node );
-					continue;
-				}
-
-				amt = node.injectAEPower( amt, mode );
-
-				if( amt > 0 && mode == Actionable.MODULATE )
-				{
-					it.remove();
-				}
+				it.remove();
 			}
-		} finally
-		{
-			ongoingInjectOperation = false;
 		}
 
 		final double overflow = Math.max( 0.0, amt );
@@ -582,22 +505,9 @@ public class EnergyGridCache implements IEnergyGrid
 					this.globalMaxPower -= ps.getAEMaxPower();
 					this.globalAvailablePower -= ps.getAECurrentPower();
 				}
-				if( !ongoingExtractOperation )
-				{
-					removeProvider( ps );
-				}
-				else
-				{
-					this.providerToRemove.add( ps );
-				}
-				if( !ongoingInjectOperation )
-				{
-					removeRequester( ps );
-				}
-				else
-				{
-					this.requesterToRemove.add( ps );
-				}
+
+				this.providers.remove( ps );
+				this.requesters.remove( ps );
 			}
 		}
 
@@ -613,31 +523,6 @@ 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 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 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 )
 	{
@@ -669,26 +554,12 @@ public class EnergyGridCache implements IEnergyGrid
 				if( current > 0 && ps.getPowerFlow() != AccessRestriction.WRITE )
 				{
 					this.globalAvailablePower += current;
-					if( !ongoingExtractOperation )
-					{
-						addProvider( ps );
-					}
-					else
-					{
-						this.providersToAdd.add( ps );
-					}
+					this.providers.add( ps );
 				}
 
 				if( current < max && ps.getPowerFlow() != AccessRestriction.READ )
 				{
-					if( !ongoingInjectOperation )
-					{
-						addRequester( ps );
-					}
-					else
-					{
-						this.requesterToAdd.add( ps );
-					}
+					this.requesters.add( ps );
 				}
 			}
 		}

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

@@ -101,12 +101,12 @@ public class GridStorageCache implements IStorageGrid
 
 		if( machine instanceof IStackWatcherHost )
 		{
-			final IStackWatcher myWatcher = this.watchers.get( node );
+			final IStackWatcher myWatcher = this.watchers.get( machine );
 
 			if( myWatcher != null )
 			{
 				myWatcher.reset();
-				this.watchers.remove( node );
+				this.watchers.remove( machine );
 			}
 		}
 	}

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

@@ -44,8 +44,6 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;
 import appeng.me.storage.ItemWatcher;
-import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
-import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 
 
 public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
@@ -60,7 +58,7 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 	@Nonnull
 	private final IItemList<T> cachedList;
 	@Nonnull
-	private final Object2ObjectMap<IMEMonitorHandlerReceiver<T>, Object> listeners;
+	private final Map<IMEMonitorHandlerReceiver<T>, Object> listeners;
 
 	private boolean sendEvent = false;
 	private boolean hasChanged = false;
@@ -72,7 +70,7 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 		this.myGridCache = cache;
 		this.myChannel = chan;
 		this.cachedList = chan.createList();
-		this.listeners = new Object2ObjectOpenHashMap<>();
+		this.listeners = new HashMap<>();
 	}
 
 	@Override

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

@@ -314,7 +314,7 @@ public class PathGridCache implements IPathingGrid
 		int depth = 0;
 		for( final IGridNode nodes : this.requireChannels )
 		{
-			if( !this.semiOpen.contains( (IPathItem) nodes ) )
+			if( !this.semiOpen.contains( nodes ) )
 			{
 				final IGridBlock gb = nodes.getGridBlock();
 				final EnumSet<GridFlags> flags = gb.getFlags();

src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java

@@ -19,11 +19,14 @@
 package appeng.me.cluster.implementations;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
-import java.util.stream.Collectors;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 
 import net.minecraft.inventory.InventoryCrafting;
@@ -31,6 +34,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 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;
@@ -88,7 +93,6 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 	private final List<TileCraftingTile> storage = new ArrayList<>();
 	private final List<TileCraftingMonitorTile> status = new ArrayList<>();
 	private final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
-	private final Map<ICraftingPatternDetails, Queue<ICraftingMedium>> visitedMediums = new HashMap<>();
 	private ICraftingLink myLastLink;
 	private String myName = "";
 	private boolean isDestroyed = false;
@@ -234,9 +238,8 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 
 	public IAEItemStack injectItems( final IAEItemStack input, final Actionable type, final IActionSource src )
 	{
-		// also stop accepting items when the job is complete, i.e. to prevent re-insertion when pushing out
-		// items during storeItems
-		if (input == null || isComplete) {
+		if( !( input instanceof IAEItemStack ) )
+		{
 			return input;
 		}
 
@@ -294,7 +297,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 				{
 					is.decStackSize( what.getStackSize() );
 
-					this.updateRemainingItemCount( what );
+					this.updateElapsedTime( what );
 					this.markDirty();
 					this.postCraftingStatusChange( what.copy().setStackSize( -what.getStackSize() ) );
 
@@ -433,11 +436,6 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 			AELog.crafting( LOG_MARK_AS_COMPLETE, logStack );
 		}
 
-		// Waiting for can potentially contain items at this point, if the user has a 64xplank->64xbutton processing
-		// recipe for example, but only requested 1xbutton. We just ignore the rest since it will be dumped
-		// back into the network inventory regardless. For this to work it's important that injectItems in this CPU
-		// does not accept any further items if isComplete is true.
-		this.waitingFor.resetStatus();
 		this.remainingItemCount = 0;
 		this.startItemCount = 0;
 		this.lastTime = 0;
@@ -648,22 +646,14 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 			{
 				InventoryCrafting ic = null;
 
-				if (!visitedMediums.containsKey( details ) || visitedMediums.get( details ).isEmpty())
+				for( final ICraftingMedium m : cc.getMediums( e.getKey() ) )
 				{
-					visitedMediums.put( details, new ArrayDeque<>( cc.getMediums( details ).stream().filter( Objects::nonNull ).collect( Collectors.toList()) ) );
-				}
-
-				while (!visitedMediums.get( details ).isEmpty())
-				{
-
-					ICraftingMedium m = visitedMediums.get( details ).poll();
-
 					if( e.getValue().value <= 0 )
 					{
 						continue;
 					}
 
-					if( m != null && !m.isBusy() )
+					if( !m.isBusy() )
 					{
 						if( ic == null )
 						{
@@ -835,7 +825,6 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 
 	private void storeItems()
 	{
-		Preconditions.checkState(isComplete, "CPU should be complete to prevent re-insertion when dumping items");
 		final IGrid g = this.getGrid();
 
 		if( g == null )
@@ -846,24 +835,23 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 		final IStorageGrid sg = g.getCache( IStorageGrid.class );
 		final IMEInventory<IAEItemStack> ii = sg.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
 
-		IItemList<IAEItemStack> itemList = this.inventory.getItemList();
-		for( IAEItemStack is : itemList )
+		for( IAEItemStack is : this.inventory.getItemList() )
 		{
-			this.postChange( is, this.machineSrc );
-			IAEItemStack remainder = ii.injectItems( is.copy(), Actionable.MODULATE, this.machineSrc );
+			is = this.inventory.extractItems( is.copy(), Actionable.MODULATE, this.machineSrc );
 
-			// The network was unable to receive all of the items, i.e. no or not enough storage space left
-			if( remainder != null )
+			if( is != null )
 			{
-				is.setStackSize( remainder.getStackSize() );
+				this.postChange( is, this.machineSrc );
+				is = ii.injectItems( is, Actionable.MODULATE, this.machineSrc );
 			}
-			else
+
+			if( is != null )
 			{
-				is.reset();
+				this.inventory.injectItems( is, Actionable.MODULATE, this.machineSrc );
 			}
 		}
 
-		if( itemList.isEmpty() )
+		if( this.inventory.getItemList().isEmpty() )
 		{
 			this.inventory = new MECraftingInventory();
 		}
@@ -948,13 +936,14 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 	@Override
 	public boolean isBusy()
 	{
+		final Iterator<Entry<ICraftingPatternDetails, TaskProgress>> i = this.tasks.entrySet().iterator();
 
-		this.tasks.entrySet().removeIf(
-				taskProgressEntry -> taskProgressEntry.getValue().value <= 0 );
-
-		if( !this.waitingFor.isEmpty() || !this.tasks.isEmpty() )
+		while( i.hasNext() )
 		{
-			this.updateElapsedTime();
+			if( i.next().getValue().value <= 0 )
+			{
+				i.remove();
+			}
 		}
 
 		return !this.tasks.isEmpty() || !this.waitingFor.isEmpty();
@@ -1346,16 +1335,12 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 		this.remainingItemCount = itemCount;
 	}
 
-	private void updateRemainingItemCount( final IAEItemStack is )
-	{
-		this.remainingItemCount = this.getRemainingItemCount() - is.getStackSize();
-	}
-
-	private void updateElapsedTime()
+	private void updateElapsedTime( final IAEItemStack is )
 	{
 		final long nextStartTime = System.nanoTime();
 		this.elapsedTime = this.getElapsedTime() + nextStartTime - this.lastTime;
 		this.lastTime = nextStartTime;
+		this.remainingItemCount = this.getRemainingItemCount() - is.getStackSize();
 	}
 
 	public long getElapsedTime()

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

@@ -277,7 +277,6 @@ public class BasicCellInventory<T extends IAEStack<T>> extends AbstractCellInven
 		}
 
 		t.setStackSize( stackSize );
-		t.setCraftable( false );
 
 		if( stackSize > 0 )
 		{

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

@@ -218,12 +218,6 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
 	private boolean importStuff( final InventoryAdaptor myAdaptor, final IAEItemStack whatToImport, final IMEMonitor<IAEItemStack> inv, final IEnergySource energy, final FuzzyMode fzMode )
 	{
 		final int toSend = this.calculateMaximumAmountToImport( myAdaptor, whatToImport, inv, fzMode );
-
-		if( toSend == 0 )
-		{
-			return true;
-		}
-
 		final ItemStack newItems;
 
 		if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
@@ -292,17 +286,8 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
 			itemAmountNotStorable = inv.injectItems( AEItemStack.fromItemStack( simResult ), Actionable.SIMULATE, this.source );
 		}
 
-		if( simResult.isEmpty() )
-		{
-			return 0;
-		}
-
 		if( itemAmountNotStorable != null )
 		{
-			if( simResult.getCount() == itemAmountNotStorable.getStackSize() )
-			{
-				return 0;
-			}
 			return (int) Math.min( simResult.getCount() - itemAmountNotStorable.getStackSize(), toSend );
 		}
 

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

@@ -19,10 +19,20 @@
 package appeng.parts.misc;
 
 
-import appeng.api.AEApi;
-import appeng.api.config.Actionable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 import appeng.api.config.Settings;
 import appeng.api.config.StorageFilter;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.items.IItemHandler;
+
+import appeng.api.AEApi;
+import appeng.api.config.Actionable;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.networking.storage.IBaseMonitor;
 import appeng.api.networking.ticking.TickRateModulation;
@@ -36,19 +46,7 @@ import appeng.me.GridAccessException;
 import appeng.me.helpers.IGridProxyable;
 import appeng.me.storage.ITickingMonitor;
 import appeng.util.Platform;
-import appeng.util.inv.ItemHandlerIterator;
-import appeng.util.inv.ItemSlot;
 import appeng.util.item.AEItemStack;
-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 org.apache.commons.lang3.tuple.Pair;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -56,7 +54,7 @@ import java.util.Map;
  */
 class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAEItemStack>, ITickingMonitor
 {
-	private final Object2ObjectMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new Object2ObjectOpenHashMap<>();
+	private final Map<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
 	private IActionSource mySource;
 	private final IItemHandler itemHandler;
 	private final IGridProxyable proxyable;
@@ -78,7 +76,6 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 	@Override
 	public IAEItemStack injectItems( IAEItemStack iox, Actionable type, IActionSource src )
 	{
-
 		ItemStack orgInput = iox.createItemStack();
 		ItemStack remaining = orgInput;
 
@@ -89,10 +86,6 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 		for( int i = 0; i < slotCount && !remaining.isEmpty(); i++ )
 		{
 			remaining = this.itemHandler.insertItem( i, remaining, simulate );
-			if( remaining.isEmpty() )
-			{
-				break;
-			}
 		}
 
 		// At this point, we still have some items left...
@@ -112,7 +105,6 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 			{
 				// meh
 			}
-
 		}
 
 		return AEItemStack.fromItemStack( remaining );
@@ -121,6 +113,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 	@Override
 	public IAEItemStack extractItems( IAEItemStack request, Actionable mode, IActionSource src )
 	{
+
 		ItemStack requestedItemStack = request.createItemStack();
 		int remainingSize = requestedItemStack.getCount();
 
@@ -147,9 +140,16 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 			do
 			{
 				extracted = this.itemHandler.extractItem( i, remainingCurrentSlot, simulate );
-
 				if( !extracted.isEmpty() )
 				{
+					// In order to guard against broken IItemHandler implementations, we'll try to guess if the returned
+					// stack (especially in simulate mode) is the same that was returned by getStackInSlot. This is
+					// obviously not a precise science, but it would catch the previous Forge bug:
+					// https://github.com/MinecraftForge/MinecraftForge/pull/6580
+					if (extracted == stackInInventorySlot) {
+						extracted = extracted.copy();
+					}
+
 					if( extracted.getCount() > remainingCurrentSlot )
 					{
 						// Something broke. It should never return more than we requested...
@@ -159,12 +159,17 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 						extracted.setCount( remainingCurrentSlot );
 					}
 
-					// We're just gonna use the first stack we get our hands on as the template for the rest.
-					// In case some stupid itemhandler (aka forge) returns an internal state we have to do a second
-					// expensive copy again.
+					// Heuristic for simulation: looping in case of simulations is pointless, since the state of the
+					// underlying inventory does not change after a simulated extraction. To still support inventories
+					// that report stacks that are larger than maxStackSize, we use this heuristic
+					if (simulate && extracted.getCount() == extracted.getMaxStackSize()
+								&& remainingCurrentSlot > extracted.getMaxStackSize()) {
+						extracted.setCount(remainingCurrentSlot);
+					}
+
 					if( gathered.isEmpty() )
 					{
-						gathered = extracted.copy();
+						gathered = extracted;
 					}
 					else
 					{
@@ -172,7 +177,8 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 					}
 					remainingCurrentSlot -= extracted.getCount();
 				}
-			} while ( !extracted.isEmpty() && remainingCurrentSlot > 0 );
+			}
+			while( !simulate && !extracted.isEmpty() && remainingCurrentSlot > 0 );
 
 			remainingSize -= stackSizeCurrentSlot - remainingCurrentSlot;
 
@@ -251,7 +257,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 	private void postDifference( Iterable<IAEItemStack> a )
 	{
 		final Iterator<Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object>> i = this.listeners.entrySet().iterator();
-		while ( i.hasNext() )
+		while( i.hasNext() )
 		{
 			final Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object> l = i.next();
 			final IMEMonitorHandlerReceiver<IAEItemStack> key = l.getKey();
@@ -266,9 +272,9 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 		}
 	}
 
-	private static class InventoryCache implements Iterable<ItemSlot>
+	private static class InventoryCache
 	{
-		private IItemList<IAEItemStack> cachedAeStacks = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+		private IAEItemStack[] cachedAeStacks = new IAEItemStack[0];
 		private final IItemHandler itemHandler;
 		private final StorageFilter mode;
 
@@ -280,77 +286,106 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 
 		public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
 		{
-			this.cachedAeStacks.forEach( out::add );
+			Arrays.stream( this.cachedAeStacks ).forEach( out::add );
 			return out;
 		}
 
-		private StorageFilter getMode()
-		{
-			return this.mode;
-		}
-
 		public List<IAEItemStack> update()
 		{
 			final List<IAEItemStack> changes = new ArrayList<>();
+			final int slots = this.itemHandler.getSlots();
 
-			IItemList<IAEItemStack> storage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
-
-			for( final ItemSlot is : this )
+			// Make room for new slots
+			if( slots > this.cachedAeStacks.length )
 			{
-				final ItemStack stackInSlot = !is.isExtractable() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? ItemStack.EMPTY : is.getItemStack();
-				if( !stackInSlot.isEmpty() )
-				{
-					storage.add( AEItemStack.fromItemStack( stackInSlot ) );
-				}
+				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
 			}
 
-			Iterator<IAEItemStack> cachedAeStacksIterator = cachedAeStacks.iterator();
-			while ( cachedAeStacksIterator.hasNext() )
+			for( int slot = 0; slot < slots; slot++ )
 			{
-				IAEItemStack cachedStack = cachedAeStacksIterator.next();
-				IAEItemStack storedStack = storage.findPrecise( cachedStack );
-				if( storedStack == null )
+				// Save the old stuff
+				final IAEItemStack oldAeIS = this.cachedAeStacks[slot];
+				ItemStack newIS = this.itemHandler.getStackInSlot( slot );
+				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && !newIS.isEmpty() )
 				{
-					changes.add( cachedStack.setStackSize( -cachedStack.getStackSize() ) );
-				}
-				else if( cachedStack.getStackSize() != storedStack.getStackSize() )
-				{
-					handleStackSizeChanged( cachedStack, storedStack, changes );
+					if( this.itemHandler.extractItem( slot, 1, true ).isEmpty() )
+					{
+						newIS = ItemStack.EMPTY;
+					}
 				}
+				this.handlePossibleSlotChanges( slot, oldAeIS, newIS, changes );
 			}
 
-			for( IAEItemStack storedStack : storage )
+			// Handle cases where the number of slots actually is lower now than before
+			if( slots < this.cachedAeStacks.length )
 			{
-				if( cachedAeStacks.findPrecise( storedStack ) == null )
+				for( int slot = slots; slot < this.cachedAeStacks.length; slot++ )
 				{
-					cachedAeStacks.add( storedStack );
-					changes.add( storedStack.copy() );
+					final IAEItemStack aeStack = this.cachedAeStacks[slot];
+
+					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, slots );
 			}
 
 			return changes;
 		}
 
-		private void handleStackSizeChanged( IAEItemStack cachedStack, IAEItemStack storedStack, List<IAEItemStack> changes )
+		private void handlePossibleSlotChanges( int slot, IAEItemStack oldAeIS, ItemStack newIS, List<IAEItemStack> changes )
 		{
-			// Still the same item, but amount might have changed
-			final long diff = storedStack.getStackSize() - cachedStack.getStackSize();
-
-			if( diff != 0 )
+			if( oldAeIS != null && oldAeIS.isSameType( newIS ) )
 			{
-				cachedStack.setStackSize( storedStack.getStackSize() );
-
-				final IAEItemStack diffStack = cachedStack.copy();
-				diffStack.setStackSize( diff );
-				changes.add( diffStack );
+				this.handleStackSizeChanged( slot, oldAeIS, newIS, changes );
+			}
+			else
+			{
+				this.handleItemChanged( slot, oldAeIS, newIS, changes );
 			}
 		}
 
-		@Override
-		public Iterator<ItemSlot> iterator()
+		private void handleStackSizeChanged( int slot, IAEItemStack oldAeIS, ItemStack newIS, List<IAEItemStack> changes )
 		{
-			return new ItemHandlerIterator( this.itemHandler );
+			// 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] );
+			}
+		}
 	}
+
 }

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

@@ -1,5 +1,21 @@
 package appeng.parts.misc;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import appeng.api.storage.IStorageChannel;
+
+import appeng.core.AELog;
+import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.NonNullList;
+
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.networking.security.IActionSource;
@@ -7,24 +23,15 @@ import appeng.api.networking.storage.IBaseMonitor;
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.IMEMonitorHandlerReceiver;
-import appeng.api.storage.IStorageChannel;
 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;
-import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
-import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
-import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import net.minecraft.item.ItemStack;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import javax.annotation.Nonnull;
 
 /**
  * Wraps an Item Repository in such a way that it can be used as an IMEInventory for items.
@@ -33,7 +40,7 @@ import java.util.Map;
 
 class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAEItemStack>, ITickingMonitor
 {
-    private final Object2ObjectMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new Object2ObjectOpenHashMap<>();
+    private final Map<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
     private IActionSource mySource;
     private final IItemRepository itemRepository;
     private final IGridProxyable proxyable;
@@ -83,12 +90,13 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
     @Override
     public IAEItemStack extractItems( IAEItemStack request, Actionable mode, IActionSource src )
     {
-        ItemStack requestedItemStack = request.getDefinition();
-        int remainingSize = (int) Math.min( Integer.MAX_VALUE, request.getStackSize() );
+        ItemStack requestedItemStack = request.createItemStack();
+        int remainingSize = requestedItemStack.getCount();
 
         final boolean simulate = ( mode == Actionable.SIMULATE );
 
-        ItemStack extracted = this.itemRepository.extractItem( requestedItemStack, remainingSize, simulate );
+        ItemStack extracted;
+        extracted = this.itemRepository.extractItem( requestedItemStack, remainingSize, simulate );
 
         if( extracted.getCount() > remainingSize )
         {
@@ -112,8 +120,10 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
                     // meh
                 }
             }
+
             return AEItemStack.fromItemStack( extracted );
         }
+
         return null;
     }
 
@@ -144,7 +154,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
     private void postDifference( Iterable<IAEItemStack> a )
     {
         final Iterator<Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object>> i = this.listeners.entrySet().iterator();
-        while ( i.hasNext() )
+        while( i.hasNext() )
         {
             final Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object> l = i.next();
             final IMEMonitorHandlerReceiver<IAEItemStack> key = l.getKey();
@@ -184,7 +194,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
 
     private static class InventoryCache
     {
-        private IItemList<IAEItemStack> cachedAeStacks = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+        private IAEItemStack[] cachedAeStacks = new IAEItemStack[0];
         private final IItemRepository iItemRepository;
 
         public InventoryCache( IItemRepository iItemRepository )
@@ -194,7 +204,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
 
         public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
         {
-            this.cachedAeStacks.forEach( out::add );
+            Arrays.stream( this.cachedAeStacks ).forEach( out::add );
             return out;
         }
 
@@ -202,51 +212,94 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
         {
             final List<IAEItemStack> changes = new ArrayList<>();
 
-            IItemList<IAEItemStack> storage = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
-            this.iItemRepository.getAllItems().stream().map( s -> AEItemStack.fromItemStack( s.itemPrototype ).setStackSize( s.count ) ).forEach( storage::add );
+            List<IAEItemStack> out = this.iItemRepository.getAllItems().stream().map( s -> AEItemStack.fromItemStack( s.itemPrototype ).setStackSize( s.count ) ).collect(Collectors.toList() );
 
-            Iterator<IAEItemStack> cachedAeStacksIterator = cachedAeStacks.iterator();
-            while ( cachedAeStacksIterator.hasNext() )
+            final int size = out.size();
+
+            // Make room for new slots
+            if( size > this.cachedAeStacks.length )
             {
-                IAEItemStack cachedStack = cachedAeStacksIterator.next();
-                IAEItemStack storedStack = storage.findPrecise( cachedStack );
-                if( storedStack == null )
-                {
-                    changes.add( cachedStack.setStackSize( -cachedStack.getStackSize() ) );
-                    cachedAeStacksIterator.remove();
-                }
-                else if( cachedStack.getStackSize() != storedStack.getStackSize() )
-                {
-                    handleStackSizeChanged( cachedStack, storedStack, changes );
-                }
+                this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, size );
             }
 
-            for( IAEItemStack storedStack : storage )
+            for( int x = 0; x < size; x++ )
             {
-                if( cachedAeStacks.findPrecise( storedStack ) == null )
+                // Save the old stuff
+                final IAEItemStack oldAeIS = this.cachedAeStacks[x];
+                final IAEItemStack newIS = out.get( x );
+
+                this.handlePossibleSlotChanges( x, oldAeIS, newIS, changes );
+            }
+
+            // Handle cases where the number of slots actually is lower now than before
+            if( size < this.cachedAeStacks.length )
+            {
+                for( int x = 0; x < this.cachedAeStacks.length; x++ )
                 {
-                    cachedAeStacks.add( storedStack );
-                    changes.add( storedStack.copy() );
+                    final IAEItemStack aeStack = this.cachedAeStacks[x];
+
+                    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 handleStackSizeChanged( IAEItemStack cachedStack, IAEItemStack storedStack, List<IAEItemStack> changes )
+        private void handlePossibleSlotChanges( int slot, IAEItemStack oldAeIS, IAEItemStack newIS, List<IAEItemStack> changes )
         {
-            // Still the same item, but amount might have changed
-            final long diff = storedStack.getStackSize() - cachedStack.getStackSize();
-
-            if( diff != 0 )
+            if( oldAeIS != null && oldAeIS.isSameType( newIS ) )
             {
-                cachedStack.setStackSize( storedStack.getStackSize() );
-
-                final IAEItemStack diffStack = cachedStack.copy();
-                diffStack.setStackSize( diff );
-                changes.add( diffStack );
+                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/PartStorageBus.java

@@ -258,20 +258,20 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	@Override
 	public void postChange( final IBaseMonitor<IAEItemStack> monitor, final Iterable<IAEItemStack> change, final IActionSource source )
 	{
-		if( source == this.mySrc || source.machine().map( machine -> machine == this ).orElse( false ) )
+		try
 		{
-			try
+			if( this.getProxy().isActive() )
 			{
-				if( this.getProxy().isActive() )
-				{
-					this.getProxy().getStorage().postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change, this.mySrc );
-				}
-			}
-			catch( final GridAccessException e )
-			{
-				// :(
+				this.getProxy()
+						.getStorage()
+						.postAlterationOfStoredItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ), change,
+								this.mySrc );
 			}
 		}
+		catch( final GridAccessException e )
+		{
+			// :(
+		}
 	}
 
 	@Override
@@ -401,13 +401,10 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 		}
 
 		// Check via cap for IItemRepository
-		if (ITEM_REPOSITORY_CAPABILITY != null && target.hasCapability( ITEM_REPOSITORY_CAPABILITY, targetSide ))
+		IItemRepository handlerRepo = target.getCapability( ITEM_REPOSITORY_CAPABILITY, targetSide );
+		if( handlerRepo != null )
 		{
-			IItemRepository handlerRepo = target.getCapability( ITEM_REPOSITORY_CAPABILITY, targetSide );
-			if( handlerRepo != null )
-			{
-				return new ItemRepositoryAdapter( handlerRepo, this );
-			}
+			return new ItemRepositoryAdapter( handlerRepo, this );
 		}
 		// Check via cap for IItemHandler
 		IItemHandler handlerExt = target.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, targetSide );
@@ -434,14 +431,11 @@ 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 );
+		final IItemRepository handlerRepo = target.getCapability( ITEM_REPOSITORY_CAPABILITY, targetSide );
 
-			if( handlerRepo != null )
-			{
-				return Objects.hash( target, handlerRepo, handlerRepo.getAllItems().size() );
-			}
+		if( handlerRepo != null )
+		{
+			return Objects.hash( target, handlerRepo, handlerRepo.getAllItems().size() );
 		}
 
 		final IItemHandler itemHandler = target.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, targetSide );

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

@@ -19,12 +19,11 @@
 package appeng.parts.p2p;
 
 
-import java.util.*;
+import java.util.List;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import appeng.me.cache.helpers.TunnelCollection;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.capabilities.Capability;
@@ -43,7 +42,6 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower>
 	private static final IEnergyStorage NULL_ENERGY_STORAGE = new NullEnergyStorage();
 	private final IEnergyStorage inputHandler = new InputEnergyStorage();
 	private final IEnergyStorage outputHandler = new OutputEnergyStorage();
-	private final Queue<PartP2PFEPower> outputs = new ArrayDeque<>();
 
 	public PartP2PFEPower( ItemStack is )
 	{
@@ -110,8 +108,6 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower>
 
 	private class InputEnergyStorage implements IEnergyStorage
 	{
-		private boolean iteratingOutputs;
-
 		@Override
 		public int extractEnergy( int maxExtract, boolean simulate )
 		{
@@ -135,14 +131,8 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower>
 				final int amountPerOutput = maxReceive / outputTunnels;
 				int overflow = amountPerOutput == 0 ? maxReceive : maxReceive % amountPerOutput;
 
-				if (outputs.isEmpty())
+				for( PartP2PFEPower target : PartP2PFEPower.this.getOutputs() )
 				{
-					for ( PartP2PFEPower o : PartP2PFEPower.this.getOutputs())
-					outputs.add( o );
-				}
-
-				while ( !outputs.isEmpty() ) {
-					PartP2PFEPower target = outputs.poll();
 					final IEnergyStorage output = target.getAttachedEnergyStorage();
 					final int toSend = amountPerOutput + overflow;
 					final int received = output.receiveEnergy( toSend, simulate );

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

@@ -21,10 +21,6 @@ package appeng.parts.reporting;
 
 import java.io.IOException;
 
-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;
@@ -35,9 +31,6 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
-import net.minecraftforge.fluids.capability.IFluidHandlerItem;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -77,9 +70,7 @@ import appeng.util.item.AEItemStack;
 public abstract class AbstractPartMonitor extends AbstractPartDisplay implements IPartStorageMonitor, IStackWatcherHost
 {
 	private static final IWideReadableNumberConverter NUMBER_CONVERTER = ReadableNumberConverter.INSTANCE;
-
 	private IAEItemStack configuredItem;
-	private IAEFluidStack configuredFluid;
 	private String lastHumanReadableText;
 	private boolean isLocked;
 	private IStackWatcher myWatcher;
@@ -99,9 +90,6 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 
 		final NBTTagCompound myItem = data.getCompoundTag( "configuredItem" );
 		this.configuredItem = AEItemStack.fromNBT( myItem );
-
-		final NBTTagCompound myFluid = data.getCompoundTag( "configuredFluid" );
-		this.configuredFluid = AEFluidStack.fromNBT( myFluid );
 	}
 
 	@Override
@@ -116,15 +104,8 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 		{
 			this.configuredItem.writeToNBT( myItem );
 		}
-		final NBTTagCompound myFluid = new NBTTagCompound();
-		if( this.configuredFluid != null )
-		{
-			this.configuredFluid.writeToNBT( myFluid );
-		}
 
 		data.setTag( "configuredItem", myItem );
-		data.setTag( "configuredFluid", myFluid );
-
 	}
 
 	@Override
@@ -133,17 +114,11 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 		super.writeToStream( data );
 
 		data.writeBoolean( this.isLocked );
-		//is configured
-		data.writeBoolean( this.configuredItem != null);
-		data.writeBoolean( this.configuredFluid != null);
+		data.writeBoolean( this.configuredItem != null );
 		if( this.configuredItem != null )
 		{
 			this.configuredItem.writeToPacket( data );
 		}
-		else if( this.configuredFluid != null )
-		{
-			this.configuredFluid.writeToPacket( data );
-		}
 	}
 
 	@Override
@@ -156,22 +131,14 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 
 		this.isLocked = isLocked;
 
-		final boolean isItem = data.readBoolean();
-		final boolean isFluid = data.readBoolean();
-		if( isItem )
+		final boolean val = data.readBoolean();
+		if( val )
 		{
 			this.configuredItem = AEItemStack.fromPacket( data );
-			this.configuredFluid = null;
-		}
-		else if( isFluid )
-		{
-			this.configuredFluid = AEFluidStack.fromPacket( data );
-			this.configuredItem = null;
 		}
 		else
 		{
 			this.configuredItem = null;
-			this.configuredFluid = null;
 		}
 
 		return needRedraw;
@@ -198,25 +165,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 		if( !this.isLocked )
 		{
 			final ItemStack eq = player.getHeldItem( hand );
-			FluidStack fluidInTank = null;
-
-			if( eq.hasCapability( CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null ) )
-			{
-				IFluidHandlerItem fluidHandlerItem = ( eq.getCapability( CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null ) );
-				fluidInTank = fluidHandlerItem.drain( Integer.MAX_VALUE, false );
-			}
-
-			if (fluidInTank == null)
-			{
-				this.configuredFluid = null;
-				this.configuredItem = AEItemStack.fromItemStack( eq );
-			}
-			else if( fluidInTank.amount > 0 )
-			{
-				this.configuredFluid = AEFluidStack.fromFluidStack( fluidInTank );
-				this.configuredItem = null;
-			}
-
+			this.configuredItem = AEItemStack.fromItemStack( eq );
 			this.configureWatchers();
 			this.getHost().markForSave();
 			this.getHost().markForUpdate();
@@ -278,16 +227,6 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 				this.updateReportingValue(
 						this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ) );
 			}
-			else if ( this.configuredFluid != null )
-			{
-				if( this.myWatcher != null )
-				{
-					this.myWatcher.add( this.configuredFluid );
-				}
-
-				this.updateReportingValue(
-						this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ) );
-			}
 		}
 		catch( final GridAccessException e )
 		{
@@ -295,12 +234,11 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 		}
 	}
 
-	private <T extends IAEStack<T>> void updateReportingValue ( final IMEMonitor<T> monitor )
+	private void updateReportingValue( final IMEMonitor<IAEItemStack> itemInventory )
 	{
-
-		if( this.configuredItem != null)
+		if( this.configuredItem != null )
 		{
-			final IAEItemStack result = (IAEItemStack) monitor.getStorageList().findPrecise( (T) this.configuredItem );
+			final IAEItemStack result = itemInventory.getStorageList().findPrecise( this.configuredItem );
 			if( result == null )
 			{
 				this.configuredItem.setStackSize( 0 );
@@ -310,18 +248,6 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 				this.configuredItem.setStackSize( result.getStackSize() );
 			}
 		}
-		else if( this.configuredFluid != null)
-		{
-			final IAEFluidStack result = (IAEFluidStack) monitor.getStorageList().findPrecise( (T) this.configuredFluid );
-			if( result == null )
-			{
-				this.configuredFluid.setStackSize( 0 );
-			}
-			else
-			{
-				this.configuredFluid.setStackSize( result.getStackSize() );
-			}
-		}
 	}
 
 	@Override
@@ -334,7 +260,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 			return;
 		}
 
-		IAEStack<?> ais = this.getDisplayed();
+		final IAEItemStack ais = this.getDisplayed();
 
 		if( ais == null )
 		{
@@ -348,10 +274,8 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 
 		TesrRenderHelper.moveToFace( facing );
 		TesrRenderHelper.rotateToFace( facing, this.getSpin() );
-		if (ais instanceof IAEItemStack)
-			TesrRenderHelper.renderItem2dWithAmount( (IAEItemStack) ais, 0.8f, 0.17f );
-		if (ais instanceof IAEFluidStack)
-			TesrRenderHelper.renderFluid2dWithAmount( (IAEFluidStack) ais, 0.8f, 0.17f );
+		TesrRenderHelper.renderItem2dWithAmount( ais, 0.8f, 0.17f );
+
 		GlStateManager.popMatrix();
 
 	}
@@ -363,13 +287,9 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 	}
 
 	@Override
-	public IAEStack<?> getDisplayed()
+	public IAEItemStack getDisplayed()
 	{
-		if (this.configuredItem != null)
 		return this.configuredItem;
-		else if (this.configuredFluid != null)
-			return this.configuredFluid;
-		return null;
 	}
 
 	@Override
@@ -402,26 +322,6 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 			final long stackSize = this.configuredItem.getStackSize();
 			final String humanReadableText = NUMBER_CONVERTER.toWideReadableForm( stackSize );
 
-			if( !humanReadableText.equals( this.lastHumanReadableText ) )
-			{
-				this.lastHumanReadableText = humanReadableText;
-				this.getHost().markForUpdate();
-			}
-		}
-		else if( this.configuredFluid != null )
-		{
-			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";
-
 			if( !humanReadableText.equals( this.lastHumanReadableText ) )
 			{
 				this.lastHumanReadableText = humanReadableText;

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

@@ -19,31 +19,15 @@
 package appeng.parts.reporting;
 
 
-import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 
-import appeng.api.config.Actionable;
-import appeng.api.storage.channels.IFluidStorageChannel;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.storage.data.IAEStack;
-import appeng.core.AELog;
-import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.PacketInventoryAction;
-import appeng.fluids.util.AEFluidStack;
-import appeng.helpers.InventoryAction;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.FluidUtil;
-import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
-import net.minecraftforge.fluids.capability.IFluidHandlerItem;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.PlayerMainInvWrapper;
 
@@ -108,13 +92,6 @@ public class PartConversionMonitor extends AbstractPartMonitor
 		}
 
 		final ItemStack eq = player.getHeldItem( hand );
-		FluidStack fluidInTank = null;
-		if( eq.hasCapability( CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null ) )
-		{
-			IFluidHandlerItem fluidHandlerItem = ( eq.getCapability( CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null ) );
-			fluidInTank = fluidHandlerItem.drain( Integer.MAX_VALUE, false );
-		}
-
 		if( this.isLocked() )
 		{
 			if( eq.isEmpty() )
@@ -126,49 +103,18 @@ public class PartConversionMonitor extends AbstractPartMonitor
 				// wrench it
 				return super.onPartActivate( player, hand, pos );
 			}
-			else if( fluidInTank != null && fluidInTank.amount > 0 )
-			{
-				if( this.getDisplayed() != null && getDisplayed().equals( AEFluidStack.fromFluidStack( fluidInTank ) ) )
-				{
-					this.drainFluidContainer( player, hand );
-				}
-			}
 			else
 			{
 				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 )
+		else if( this.getDisplayed() != null && this.getDisplayed().equals( eq ) )
 		{
-			if( getDisplayed() instanceof IAEItemStack || getDisplayed() == null )
-			{
-				return super.onPartActivate( player, hand, pos );
-			}
-			if( ( (IAEFluidStack) this.getDisplayed() ).equals( AEFluidStack.fromFluidStack( fluidInTank ) ) )
-			{
-				this.drainFluidContainer( player, hand );
-			}
-			else {
-				return super.onPartActivate( player, hand, pos );
-			}
+			this.insertItem( player, hand, false );
 		}
 		else
 		{
-			if( getDisplayed() instanceof IAEFluidStack || getDisplayed() == null )
-			{
-				return super.onPartActivate( player, hand, pos );
-			}
-			if( ( (IAEItemStack) this.getDisplayed() ).equals( eq ) )
-			{
-				this.insertItem( player, hand, false );
-			}
+			return super.onPartActivate( player, hand, pos );
 		}
 
 		return true;
@@ -192,14 +138,9 @@ public class PartConversionMonitor extends AbstractPartMonitor
 			return false;
 		}
 
-		ItemStack eq = player.getHeldItem( hand );
-		if( this.getDisplayed() != null && this.getDisplayed() instanceof IAEItemStack )
+		if( this.getDisplayed() != null )
 		{
-			this.extractItem( player, ( (IAEItemStack) this.getDisplayed() ).getDefinition().getMaxStackSize() );
-		}
-		else if( this.getDisplayed() != null && this.getDisplayed() instanceof IAEFluidStack )
-		{
-			this.fillFluidContainer( player,hand );
+			this.extractItem( player, this.getDisplayed().getDefinition().getMaxStackSize() );
 		}
 
 		return true;
@@ -242,9 +183,9 @@ public class PartConversionMonitor extends AbstractPartMonitor
 
 			if( allItems )
 			{
-				if( this.getDisplayed() != null && this.getDisplayed() instanceof IAEItemStack)
+				if( this.getDisplayed() != null )
 				{
-					final IAEItemStack input = (IAEItemStack) this.getDisplayed().copy();
+					final IAEItemStack input = this.getDisplayed().copy();
 					IItemHandler inv = new PlayerMainInvWrapper( player.inventory );
 
 					for( int x = 0; x < inv.getSlots(); x++ )
@@ -280,9 +221,7 @@ public class PartConversionMonitor extends AbstractPartMonitor
 
 	private void extractItem( final EntityPlayer player, int count )
 	{
-		if (!(this.getDisplayed() instanceof IAEItemStack))
-			return;
-		final IAEItemStack input = (IAEItemStack) this.getDisplayed();
+		final IAEItemStack input = this.getDisplayed();
 		if( input != null )
 		{
 			try
@@ -326,141 +265,6 @@ public class PartConversionMonitor extends AbstractPartMonitor
 		}
 	}
 
-	private void drainFluidContainer( final EntityPlayer player, final EnumHand hand ) {
-		try
-		{
-			final ItemStack held = player.getHeldItem( hand );
-			if( held.getCount() != 1 )
-			{
-				// only support stacksize 1 for now
-				return;
-			}
-
-			final IFluidHandlerItem fh = FluidUtil.getFluidHandler( held );
-			if( fh == null )
-			{
-				// only fluid handlers items
-				return;
-			}
-
-			// See how much we can drain from the item
-			final FluidStack extract = fh.drain( Integer.MAX_VALUE, false );
-			if( extract == null || extract.amount < 1 )
-			{
-				return;
-			}
-
-			// Check if we can push into the system
-			final IEnergySource energy = this.getProxy().getEnergy();
-			final IMEMonitor<IAEFluidStack> cell = this.getProxy()
-					.getStorage()
-					.getInventory(
-							AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) );
-			final IAEFluidStack notStorable = Platform.poweredInsert( energy, cell, AEFluidStack.fromFluidStack( extract ), new PlayerSource( player, this ), Actionable.SIMULATE );
-
-			if( notStorable != null && notStorable.getStackSize() > 0 )
-			{
-				final int toStore = (int) ( extract.amount - notStorable.getStackSize() );
-				final FluidStack storable = fh.drain( toStore, false );
-
-				if( storable == null || storable.amount == 0 )
-				{
-					return;
-				}
-				else
-				{
-					extract.amount = storable.amount;
-				}
-			}
-
-			// Actually drain
-			final FluidStack drained = fh.drain( extract, true );
-			extract.amount = drained.amount;
-
-			final IAEFluidStack notInserted = Platform.poweredInsert( energy, cell, AEFluidStack.fromFluidStack( extract ), new PlayerSource( player, this ) );
-
-			if( notInserted != null && notInserted.getStackSize() > 0 )
-			{
-				AELog.error( "Fluid item [%s] reported a different possible amount to drain than it actually provided.", held.getDisplayName() );
-			}
-
-			player.setHeldItem( hand, fh.getContainer() );
-		}
-		catch( GridAccessException e )
-		{
-			e.printStackTrace();
-		}
-	}
-
-	private void fillFluidContainer( final EntityPlayer player, final EnumHand hand  )
-	{
-		try
-		{
-			final ItemStack held = player.getHeldItem( hand );
-			if( held.getCount() != 1 )
-			{
-				// only support stacksize 1 for now
-				return;
-			}
-
-			final IFluidHandlerItem fh = FluidUtil.getFluidHandler( held );
-			if( fh == null )
-			{
-				// only fluid handlers items
-				return;
-			}
-
-			final IAEFluidStack stack = (IAEFluidStack) this.getDisplayed().copy();
-
-			// Check how much we can store in the item
-			stack.setStackSize( Integer.MAX_VALUE );
-			int amountAllowed = fh.fill( stack.getFluidStack(), false );
-			stack.setStackSize( amountAllowed );
-
-			// Check if we can pull out of the system
-			final IEnergySource energy = this.getProxy().getEnergy();
-			final IMEMonitor<IAEFluidStack> cell = this.getProxy()
-					.getStorage()
-					.getInventory(
-							AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) );
-			final IAEFluidStack canPull = Platform.poweredExtraction( energy, cell, stack, new PlayerSource( player, this ), Actionable.SIMULATE );
-			if( canPull == null || canPull.getStackSize() < 1 )
-			{
-				return;
-			}
-
-			// How much could fit into the container
-			final int canFill = fh.fill( canPull.getFluidStack(), false );
-			if( canFill == 0 )
-			{
-				return;
-			}
-
-			// Now actually pull out of the system
-			stack.setStackSize( canFill );
-			final IAEFluidStack pulled = Platform.poweredExtraction( energy, cell, stack, new PlayerSource( player, this ) );
-			if( pulled == null || pulled.getStackSize() < 1 )
-			{
-				// Something went wrong
-				AELog.error( "Unable to pull fluid out of the ME system even though the simulation said yes " );
-				return;
-			}
-
-			// Actually fill
-			final int used = fh.fill( pulled.getFluidStack(), true );
-
-			if( used != canFill )
-			{
-				AELog.error( "Fluid item [%s] reported a different possible amount than it actually accepted.", held.getDisplayName() );
-			}
-			player.setHeldItem( hand, fh.getContainer() );
-		}
-		catch( GridAccessException e )
-		{
-			e.printStackTrace();
-		}
-	}
-
 	@Override
 	public IPartModel getStaticModels()
 	{

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

@@ -425,7 +425,6 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 						if( extracted != null )
 						{
 							possible = extracted.getStackSize();
-							extracted.setCraftable( false );
 							final IAEStack failed = Platform.poweredInsert( energy, destination, extracted, this.mySrc );
 
 							if( failed != null )

src/main/java/appeng/util/InventoryAdaptor.java

@@ -47,7 +47,7 @@ public abstract class InventoryAdaptor implements Iterable<ItemSlot>
 	{
 		if( te != null )
 		{
-			if( ITEM_REPOSITORY_CAPABILITY != null && te.hasCapability( ITEM_REPOSITORY_CAPABILITY, d ) )
+			if( te.hasCapability( ITEM_REPOSITORY_CAPABILITY, d ) )
 			{
 				IItemRepository itemRepository = te.getCapability( ITEM_REPOSITORY_CAPABILITY, d );
 				if (itemRepository != null){

src/main/java/appeng/util/ReadOnlyCollection.java

@@ -56,6 +56,6 @@ public class ReadOnlyCollection<T> implements IReadOnlyCollection<T>
 	@Override
 	public boolean contains( final Object node )
 	{
-		return this.c.contains( (T) node );
+		return this.c.contains( node );
 	}
 }

src/main/java/appeng/util/UUIDMatcher.java

@@ -48,4 +48,4 @@ public final class UUIDMatcher
 	{
 		return PATTERN.matcher( potential ).matches();
 	}
-}
+}

src/main/java/appeng/util/inv/AdaptorItemRepository.java

@@ -206,4 +206,3 @@ public class AdaptorItemRepository extends InventoryAdaptor
         return null;
     }
 }
-

src/main/java/appeng/util/inv/ItemHandlerIterator.java

@@ -25,7 +25,7 @@ import java.util.NoSuchElementException;
 import net.minecraftforge.items.IItemHandler;
 
 
-public class ItemHandlerIterator implements Iterator<ItemSlot>
+class ItemHandlerIterator implements Iterator<ItemSlot>
 {
 
 	private final IItemHandler itemHandler;
@@ -34,7 +34,7 @@ public class ItemHandlerIterator implements Iterator<ItemSlot>
 
 	private int slot = 0;
 
-	public ItemHandlerIterator( IItemHandler itemHandler )
+	ItemHandlerIterator( IItemHandler itemHandler )
 	{
 		this.itemHandler = itemHandler;
 	}

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

@@ -25,6 +25,7 @@ import java.util.Optional;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import appeng.api.AEApi;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -38,20 +39,16 @@ import appeng.api.config.FuzzyMode;
 import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
-import appeng.core.Api;
 import appeng.util.Platform;
 
 public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemStack {
-    private static final String NBT_STACKSIZE = "Cnt";
-    private static final String NBT_REQUESTABLE = "Req";
-    private static final String NBT_CRAFTABLE = "Craft";
 
     private final AESharedItemStack sharedStack;
     private Optional<OreReference> oreReference;
 
-    @SideOnly(Side.CLIENT)
+    @SideOnly( Side.CLIENT )
     private String displayName;
-    @SideOnly(Side.CLIENT)
+    @SideOnly( Side.CLIENT )
     private List<String> tooltip;
 
     private AEItemStack(final AEItemStack is) {
@@ -79,31 +76,33 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
         return new AEItemStack(AEItemStackRegistry.getRegisteredStack(stack), stack.getCount());
     }
 
-    public static IAEItemStack fromNBT(final NBTTagCompound i) {
-        if (i == null) {
+    public static IAEItemStack fromNBT( final NBTTagCompound i )
+    {
+        if( i == null )
+        {
             return null;
         }
 
-        final ItemStack itemstack = new ItemStack(i);
-        final AEItemStack item = AEItemStack.fromItemStack(itemstack);
-        if (item == null) {
+        final ItemStack itemstack = new ItemStack( i );
+        if( itemstack.isEmpty() )
+        {
             return null;
         }
 
-        item.setStackSize(i.getLong(NBT_STACKSIZE));
-        item.setCountRequestable(i.getLong(NBT_REQUESTABLE));
-        item.setCraftable(i.getBoolean(NBT_CRAFTABLE));
+        final AEItemStack item = AEItemStack.fromItemStack( itemstack );
+        item.setStackSize( i.getLong( "Cnt" ) );
+        item.setCountRequestable( i.getLong( "Req" ) );
+        item.setCraftable( i.getBoolean( "Craft" ) );
         return item;
     }
 
     @Override
-    public void writeToNBT(final NBTTagCompound i) {
-        final NBTTagCompound itemStack = new NBTTagCompound();
-        this.getDefinition().writeToNBT(itemStack);
-
-        i.setLong(NBT_STACKSIZE, this.getStackSize());
-        i.setLong(NBT_REQUESTABLE, this.getCountRequestable());
-        i.setBoolean(NBT_CRAFTABLE, this.isCraftable());
+    public void writeToNBT( final NBTTagCompound i )
+    {
+        this.getDefinition().writeToNBT( i );
+        i.setLong( "Cnt", this.getStackSize() );
+        i.setLong( "Req", this.getCountRequestable() );
+        i.setBoolean( "Craft", this.isCraftable() );
     }
 
     public static AEItemStack fromPacket( final ByteBuf data )
@@ -140,6 +139,13 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
         this.putPacketValue( i, this.getCountRequestable() );
     }
 
+    /**
+     * We're assuming that using capNBT here is safe, because {@link #getDefinition()} should have been created by
+     * {@link ItemStack#copy()}, and then never mutated. Copying an item stack will automatically serialize the
+     * capabilities of the source stack and initialize the target stacks capNBT field using that tag, which we are then
+     * reusing here.
+     */
+
     @Override
     public void add(final IAEItemStack option) {
         if (option == null) {
@@ -164,21 +170,9 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
         return new AEItemStack(this);
     }
 
-    @Override
-    public boolean isItem()
-    {
-        return true;
-    }
-
-    @Override
-    public boolean isFluid()
-    {
-        return false;
-    }
-
     @Override
     public IStorageChannel<IAEItemStack> getChannel() {
-        return Api.INSTANCE.storage().getStorageChannel(IItemStorageChannel.class);
+        return AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class);
     }
 
     @Override
@@ -197,6 +191,11 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
         return this.sharedStack.getItemDamage();
     }
 
+    public Optional<OreReference> getOre()
+    {
+        return this.oreReference;
+    }
+
     @Override
     public boolean sameOre( final IAEItemStack is )
     {
@@ -242,17 +241,12 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
         return false;
     }
 
-    @Override
-    public boolean equals(final ItemStack is) {
-        return this.isSameType(is);
-    }
-
     @Override
     public String toString() {
         return this.getStackSize() + "x" + this.getDefinition().getItem().getRegistryName();
     }
 
-    @SideOnly(Side.CLIENT)
+    @SideOnly( Side.CLIENT )
     public List<String> getToolTip() {
         if (this.tooltip == null) {
             this.tooltip = Platform.getTooltip(this.asItemStackRepresentation());
@@ -260,7 +254,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
         return this.tooltip;
     }
 
-    @SideOnly(Side.CLIENT)
+    @SideOnly( Side.CLIENT )
     public String getDisplayName() {
         if (this.displayName == null) {
             this.displayName = Platform.getItemDisplayName(this.asItemStackRepresentation());
@@ -268,16 +262,11 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
         return this.displayName;
     }
 
-    @SideOnly(Side.CLIENT)
+    @SideOnly( Side.CLIENT )
     public String getModID() {
         return this.getDefinition().getItem().getRegistryName().getResourceDomain();
     }
 
-    public Optional<OreReference> getOre()
-    {
-        return this.oreReference;
-    }
-
     @Override
     public boolean hasTagCompound() {
         return this.getDefinition().hasTagCompound();
@@ -293,21 +282,27 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
         return this.sharedStack.getDefinition();
     }
 
+    public boolean equals(final ItemStack is) {
+        return this.isSameType(is);
+    }
+
     AESharedItemStack getSharedStack() {
         return this.sharedStack;
     }
 
     private boolean fuzzyItemStackComparison(ItemStack a, ItemStack b, FuzzyMode mode) {
-        if (a.getItem() == b.getItem() && a.getItem().isDamageable()) {
-            if (mode == FuzzyMode.IGNORE_ALL) {
-                return true;
-            } else if (mode == FuzzyMode.PERCENT_99) {
-                return a.getItemDamage() > 1 == b.getItemDamage() > 1;
-            } else {
-                final float percentDamageOfA = (float) a.getItemDamage() / a.getMaxDamage();
-                final float percentDamageOfB = (float) b.getItemDamage() / b.getMaxDamage();
+        if (a.getItem() == b.getItem()) {
+            if (a.getItem().isDamageable()) {
+                if (mode == FuzzyMode.IGNORE_ALL) {
+                    return true;
+                } else if (mode == FuzzyMode.PERCENT_99) {
+                    return (a.getItemDamage() > 1) == (b.getItemDamage() > 1);
+                } else {
+                    final float percentDamageOfA = (float) a.getItemDamage() / a.getMaxDamage();
+                    final float percentDamageOfB = (float) b.getItemDamage() / b.getMaxDamage();
 
-                return percentDamageOfA > mode.breakPoint == percentDamageOfB > mode.breakPoint;
+                    return (percentDamageOfA > mode.breakPoint) == (percentDamageOfB > mode.breakPoint);
+                }
             }
         }
 

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

@@ -38,7 +38,7 @@ final class AESharedItemStack {
 
     /**
      * A constructor to explicitly set the damage value and not fetch it from the {@link ItemStack}
-     *
+     * 
      * @param itemStack The {@link ItemStack} to filter
      * @param damage    The damage of the item
      */

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

@@ -28,30 +28,6 @@ public abstract class AEStack<T extends IAEStack<T>> implements IAEStack<T> {
     private long stackSize;
     private long countRequestable;
 
-    protected static long getPacketValue( final byte type, final ByteBuf tag )
-    {
-        if( type == 0 )
-        {
-            long l = tag.readByte();
-            l -= Byte.MIN_VALUE;
-            return l;
-        }
-        else if( type == 1 )
-        {
-            long l = tag.readShort();
-            l -= Short.MIN_VALUE;
-            return l;
-        }
-        else if( type == 2 )
-        {
-            long l = tag.readInt();
-            l -= Integer.MIN_VALUE;
-            return l;
-        }
-
-        return tag.readLong();
-    }
-
     @Override
     public long getStackSize() {
         return this.stackSize;
@@ -125,28 +101,32 @@ public abstract class AEStack<T extends IAEStack<T>> implements IAEStack<T> {
         this.countRequestable -= i;
     }
 
-    protected byte getType( final long num )
-    {
-        if( num <= 255 )
-        {
-            return 0;
-        }
-        else if( num <= 65535 )
-        {
-            return 1;
-        }
-        else if( num <= 4294967295L )
-        {
-            return 2;
-        }
-        else
-        {
-            return 3;
-        }
-    }
-
     protected abstract boolean hasTagCompound();
 
+    protected static long getPacketValue( final byte type, final ByteBuf tag )
+    {
+        if( type == 0 )
+        {
+            long l = tag.readByte();
+            l -= Byte.MIN_VALUE;
+            return l;
+        }
+        else if( type == 1 )
+        {
+            long l = tag.readShort();
+            l -= Short.MIN_VALUE;
+            return l;
+        }
+        else if( type == 2 )
+        {
+            long l = tag.readInt();
+            l -= Integer.MIN_VALUE;
+            return l;
+        }
+
+        return tag.readLong();
+    }
+
     protected void putPacketValue( final ByteBuf tag, final long num )
     {
         if( num <= 255 )
@@ -166,4 +146,24 @@ public abstract class AEStack<T extends IAEStack<T>> implements IAEStack<T> {
             tag.writeLong( num );
         }
     }
+
+    protected byte getType( final long num )
+    {
+        if( num <= 255 )
+        {
+            return 0;
+        }
+        else if( num <= 65535 )
+        {
+            return 1;
+        }
+        else if( num <= 4294967295L )
+        {
+            return 2;
+        }
+        else
+        {
+            return 3;
+        }
+    }
 }

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

@@ -144,29 +144,18 @@ class FuzzyItemVariantList extends ItemVariantList {
      * Keep in mind that the stack order is from most damaged to least damaged, so this lower bound will actually be a
      * higher number than the upper bound.
      */
-    static ItemDamageBound makeLowerBound(final ItemStack stack, final FuzzyMode fuzzy)
-    {
-        Preconditions.checkState( stack.getItem().isDamageable(), "Item#isDamageable() has to be true" );
+    static ItemDamageBound makeLowerBound(final ItemStack stack, final FuzzyMode fuzzy) {
+        Preconditions.checkState(((stack.getMaxDamage() == 0 && stack.getItemDamage() > 0 ) || stack.isItemStackDamageable()), "ItemStack#isDamageable() has to be true");
 
         int damage;
-        if( fuzzy == FuzzyMode.IGNORE_ALL )
-        {
-            if( stack.getMaxDamage() == 0 )
-            {
-                damage = stack.getItemDamage();
-            }
-            else
-            {
-                damage = stack.getMaxDamage();
-            }
-        }
-        else
-        {
-            final int breakpoint = fuzzy.calculateBreakPoint( stack.getMaxDamage() );
+        if (fuzzy == FuzzyMode.IGNORE_ALL) {
+            damage = stack.getMaxDamage();
+        } else {
+            final int breakpoint = fuzzy.calculateBreakPoint(stack.getMaxDamage());
             damage = stack.getItemDamage() <= breakpoint ? breakpoint : stack.getMaxDamage();
         }
 
-        return new ItemDamageBound( damage );
+        return new ItemDamageBound(damage);
     }
 
     /*
@@ -174,7 +163,7 @@ class FuzzyItemVariantList extends ItemVariantList {
      * lower number than the lower bound. It also is exclusive.
      */
     static ItemDamageBound makeUpperBound(final ItemStack stack, final FuzzyMode fuzzy) {
-        Preconditions.checkState(stack.getItem().isDamageable(), "Item#isDamageable() has to be true");
+        Preconditions.checkState(((stack.getMaxDamage() == 0 && stack.getItemDamage() > 0 ) || stack.isItemStackDamageable()), "ItemStack#isDamageable() has to be true");
 
         int damage;
         if (fuzzy == FuzzyMode.IGNORE_ALL) {

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

@@ -1,87 +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.util.item;
-
-
-import java.util.Collection;
-
-import appeng.api.AEApi;
-import appeng.api.config.FuzzyMode;
-import appeng.api.storage.channels.IItemStorageChannel;
-import appeng.api.storage.data.IAEItemStack;
-import appeng.api.storage.data.IItemContainer;
-
-
-public class ItemModList implements IItemContainer<IAEItemStack>
-{
-
-	private final IItemContainer<IAEItemStack> backingStore;
-	private final IItemContainer<IAEItemStack> overrides = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
-
-	public ItemModList( final IItemContainer<IAEItemStack> backend )
-	{
-		this.backingStore = backend;
-	}
-
-	@Override
-	public void add( final IAEItemStack option )
-	{
-		IAEItemStack over = this.overrides.findPrecise( option );
-		if( over == null )
-		{
-			over = this.backingStore.findPrecise( option );
-			if( over == null )
-			{
-				this.overrides.add( option );
-			}
-			else
-			{
-				option.add( over );
-				this.overrides.add( option );
-			}
-		}
-		else
-		{
-			this.overrides.add( option );
-		}
-	}
-
-	@Override
-	public IAEItemStack findPrecise( final IAEItemStack i )
-	{
-		final IAEItemStack over = this.overrides.findPrecise( i );
-		if( over == null )
-		{
-			return this.backingStore.findPrecise( i );
-		}
-		return over;
-	}
-
-	@Override
-	public Collection<IAEItemStack> findFuzzy( final IAEItemStack input, final FuzzyMode fuzzy )
-	{
-		return this.overrides.findFuzzy( input, fuzzy );
-	}
-
-	@Override
-	public boolean isEmpty()
-	{
-		return this.overrides.isEmpty() && this.backingStore.isEmpty();
-	}
-}

src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals_fluid.json

@@ -4,8 +4,8 @@
             "type": "forge:and",
             "values": [
                 {
-                    "type": "appliedenergistics2:part_exists",
-                    "part": "part.terminal"
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:part:part.terminal"
                 },
                 {
                     "type": "appliedenergistics2:material_exists",

src/test/java/appeng/util/EnumCyclerTest.java

@@ -0,0 +1,91 @@
+package appeng.util;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.EnumSet;
+
+import org.junit.jupiter.api.Test;
+
+class EnumCyclerTest {
+
+    @Test
+    void testRotateEnumForwardWithOnlySomeValidOptions() {
+        EnumSet<RotateTestEnum> validOptions = EnumSet.of(RotateTestEnum.A, RotateTestEnum.C, RotateTestEnum.E);
+        assertThat(EnumCycler.rotateEnum(RotateTestEnum.A, false, validOptions)).isEqualTo(RotateTestEnum.C);
+        assertThat(EnumCycler.rotateEnum(RotateTestEnum.C, false, validOptions)).isEqualTo(RotateTestEnum.E);
+        assertThat(EnumCycler.rotateEnum(RotateTestEnum.E, false, validOptions)).isEqualTo(RotateTestEnum.A);
+    }
+
+    @Test
+    void testRotateEnumBackwardsWithOnlySomeValidOptions() {
+        EnumSet<RotateTestEnum> validOptions = EnumSet.of(RotateTestEnum.A, RotateTestEnum.C, RotateTestEnum.E);
+        assertThat(EnumCycler.rotateEnum(RotateTestEnum.A, true, validOptions)).isEqualTo(RotateTestEnum.E);
+        assertThat(EnumCycler.rotateEnum(RotateTestEnum.C, true, validOptions)).isEqualTo(RotateTestEnum.A);
+        assertThat(EnumCycler.rotateEnum(RotateTestEnum.E, true, validOptions)).isEqualTo(RotateTestEnum.C);
+    }
+
+    /**
+     * When there are no valid options, the function should reject the arguments.
+     */
+    @Test
+    void testRotateEnumNoValidOptions() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            EnumCycler.rotateEnum(TestEnum.A, false, EnumSet.noneOf(TestEnum.class));
+        });
+    }
+
+    /**
+     * When the current enum literal is not part of the valid options, it should just skip to the next valid option
+     * instead.
+     */
+    @Test
+    void testRotateEnumCurrentIsNotAValidOption() {
+        assertThat(EnumCycler.rotateEnum(TestEnum.B, false, EnumSet.of(TestEnum.A))).isEqualTo(TestEnum.A);
+        assertThat(EnumCycler.rotateEnum(TestEnum.B, true, EnumSet.of(TestEnum.A))).isEqualTo(TestEnum.A);
+    }
+
+    /**
+     * When there's only one valid option, it should just rotate back to it.
+     */
+    @Test
+    void testRotateEnumOnlyOneValidOption() {
+        assertThat(EnumCycler.rotateEnum(TestEnum.A, false, EnumSet.of(TestEnum.A))).isEqualTo(TestEnum.A);
+        assertThat(EnumCycler.rotateEnum(TestEnum.A, true, EnumSet.of(TestEnum.A))).isEqualTo(TestEnum.A);
+    }
+
+    @Test
+    void testNext() {
+        assertThat(EnumCycler.next(TestEnum.A)).isEqualTo(TestEnum.B);
+        assertThat(EnumCycler.next(TestEnum.B)).isEqualTo(TestEnum.C);
+        assertThat(EnumCycler.next(TestEnum.C)).isEqualTo(TestEnum.A);
+        assertThat(EnumCycler.next(SingleLiteralEnum.A)).isEqualTo(SingleLiteralEnum.A);
+    }
+
+    @Test
+    void testPrev() {
+        assertThat(EnumCycler.prev(TestEnum.A)).isEqualTo(TestEnum.C);
+        assertThat(EnumCycler.prev(TestEnum.B)).isEqualTo(TestEnum.A);
+        assertThat(EnumCycler.prev(TestEnum.C)).isEqualTo(TestEnum.B);
+        assertThat(EnumCycler.prev(SingleLiteralEnum.A)).isEqualTo(SingleLiteralEnum.A);
+    }
+
+    enum TestEnum {
+        A,
+        B,
+        C
+    }
+
+    enum RotateTestEnum {
+        A,
+        B,
+        C,
+        D,
+        E
+    }
+
+    enum SingleLiteralEnum {
+        A
+    }
+
+}

src/test/java/appeng/util/UUIDMatcherTest.java

@@ -1,61 +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.util;
-
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-
-/**
- * Tests for {@link UUIDMatcher}
- */
-public final class UUIDMatcherTest
-{
-	private static final String IS_UUID = "03ba29a1-d6bd-32ba-90b2-375e4d65abc9";
-	private static final String NO_UUID = "no";
-	private static final String INVALID_UUID = "g3ba29a1-d6bd-32ba-90b2-375e4d65abc9";
-
-	private final UUIDMatcher matcher;
-
-	public UUIDMatcherTest()
-	{
-		this.matcher = new UUIDMatcher();
-	}
-
-	@Test
-	public void testUUID_shouldPass()
-	{
-		assertTrue( this.matcher.isUUID( IS_UUID ) );
-	}
-
-	@Test
-	public void testNoUUD_shouldPass()
-	{
-		assertFalse( this.matcher.isUUID( NO_UUID ) );
-	}
-
-	@Test
-	public void testInvalidUUID_shouldPass()
-	{
-		assertFalse( this.matcher.isUUID( INVALID_UUID ) );
-	}
-}

src/test/java/appeng/util/WideReadableNumberConverterTest.java

@@ -21,7 +21,7 @@ package appeng.util;
 
 import static org.junit.Assert.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 
 /**

src/test/java/appeng/util/helpers/P2PHelperTest.java

@@ -22,7 +22,7 @@ package appeng.util.helpers;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import appeng.api.util.AEColor;
 

src/test/java/appeng/util/item/AESharedItemStackTest.java

@@ -0,0 +1,78 @@
+package appeng.util.item;
+
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+import com.google.common.testing.EqualsTester;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.util.registry.Bootstrap;
+import net.minecraft.util.text.StringTextComponent;
+
+class AESharedItemStackTest {
+
+    @BeforeAll
+    static void bootstrap() {
+        Bootstrap.register();
+    }
+
+    // Test stack -> Name for debugging the tests
+    final Map<AESharedItemStack, String> stacks = new IdentityHashMap<>();
+
+    AESharedItemStackTest() {
+        TestItemWithCaps TEST_ITEM = new TestItemWithCaps();
+
+        ItemStack nameTag1 = new ItemStack(TEST_ITEM);
+        stacks.put(new AESharedItemStack(nameTag1), "no-nbt");
+
+        // NBT
+        ItemStack nameTag2 = new ItemStack(TEST_ITEM);
+        nameTag2.setDisplayName(new StringTextComponent("Hello World"));
+        stacks.put(new AESharedItemStack(nameTag2), "nbt1");
+
+        // Different NBT
+        ItemStack nameTag3 = new ItemStack(TEST_ITEM);
+        nameTag3.setDisplayName(new StringTextComponent("ABCDEFGH"));
+        stacks.put(new AESharedItemStack(nameTag3), "nbt2");
+
+        // NBT + Cap
+        CompoundNBT capNbt = new CompoundNBT();
+        capNbt.putInt("Parent", 1);
+        ItemStack nameTag4 = new ItemStack(TEST_ITEM, 1, capNbt);
+        nameTag4.setDisplayName(new StringTextComponent("Hello World"));
+        stacks.put(new AESharedItemStack(nameTag4), "nbt1+cap1");
+
+        // NBT + Different Cap
+        CompoundNBT capNbt2 = new CompoundNBT();
+        capNbt2.putInt("Parent", 123);
+        ItemStack nameTag5 = new ItemStack(TEST_ITEM, 1, capNbt2);
+        nameTag5.setDisplayName(new StringTextComponent("Hello World"));
+        stacks.put(new AESharedItemStack(nameTag5), "nbt1+cap2");
+    }
+
+    /**
+     * Tests equality between shared item stacks.
+     */
+    @Test
+    void testEquals() {
+        EqualsTester tester = new EqualsTester();
+        for (AESharedItemStack stack : stacks.keySet()) {
+            // Add the stack, and a pristine copy of the stack
+            tester.addEqualityGroup(stack, new AESharedItemStack(stack.getDefinition().copy()));
+        }
+
+        // Test that using the same item stack instance makes two separate shared stacks equal
+        ItemStack itemStack = new ItemStack(Items.CRAFTING_TABLE);
+        tester.addEqualityGroup(
+                new AESharedItemStack(itemStack),
+                new AESharedItemStack(itemStack));
+
+        tester.testEquals();
+    }
+
+}

src/test/java/appeng/util/item/FuzzyItemVariantListTest.java

@@ -0,0 +1,157 @@
+package appeng.util.item;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+
+import appeng.api.config.FuzzyMode;
+
+public class FuzzyItemVariantListTest {
+
+    @Test
+    void testOrderForDamagedItems() {
+        // Diamond Sword @ 100% durability
+        ItemStack undamagedSword = new ItemStack(Items.DIAMOND_SWORD);
+        AESharedItemStack undamagedStack = new AESharedItemStack(undamagedSword);
+
+        // Unenchanted Diamond Sword @ 0% durability
+        ItemStack damagedSword = new ItemStack(Items.DIAMOND_SWORD);
+        damagedSword.setDamage(damagedSword.getMaxDamage());
+        AESharedItemStack damagedStack = new AESharedItemStack(damagedSword);
+
+        // Create a list of stacks and sort by their natural order
+        AESharedItemStack[] stacks = new AESharedItemStack[] {
+                damagedStack, undamagedStack
+        };
+        Arrays.sort(stacks, FuzzyItemVariantList.COMPARATOR);
+        assertThat(stacks).containsExactly(damagedStack, undamagedStack);
+    }
+
+    @Nested
+    class Bounds {
+        final ItemStack stack = new ItemStack(Items.DIAMOND_SWORD);
+        final ItemStack damagedStack;
+
+        {
+            damagedStack = stack.copy();
+            damagedStack.setDamage(damagedStack.getMaxDamage());
+        }
+
+        @Test
+        void testIgnoreAll() {
+            DamageBounds bounds = new DamageBounds(stack, FuzzyMode.IGNORE_ALL);
+            assertEquals(stack.getMaxDamage(), bounds.lower.itemDamage);
+            assertEquals(-1, bounds.upper.itemDamage);
+        }
+
+        /**
+         * PERCENT_99 with an undamaged item should select only undamaged items, which translates to a damage range of
+         * [0, -1).
+         */
+        @Test
+        void test99PercentDurabilityWithUndamagedItem() {
+            DamageBounds bounds = new DamageBounds(stack, FuzzyMode.PERCENT_99);
+            assertEquals(0, bounds.lower.itemDamage);
+            assertEquals(-1, bounds.upper.itemDamage);
+        }
+
+        /**
+         * PERCENT_99 with a damaged item should select only damaged items, which translates to a damage range of
+         * [maxDmg, 0).
+         */
+        @Test
+        void test99PercentDurabilityWithDamagedItem() {
+            DamageBounds bounds = new DamageBounds(damagedStack, FuzzyMode.PERCENT_99);
+            assertEquals(stack.getMaxDamage(), bounds.lower.itemDamage);
+            assertEquals(0, bounds.upper.itemDamage);
+        }
+
+        /**
+         * PERCENT_75 with an undamaged item should select items that have 75% or more durability, which should
+         * translate to a damage range of [0.25*maxDmg, -1).
+         */
+        @Test
+        void test75PercentWithUndamagedItem() {
+            DamageBounds bounds = new DamageBounds(stack, FuzzyMode.PERCENT_75);
+            assertEquals((int) (0.25 * stack.getMaxDamage()), bounds.lower.itemDamage);
+            assertEquals(-1, bounds.upper.itemDamage);
+        }
+
+        /**
+         * PERCENT_75 with a damaged item should select items that have less than 75% durability, which should translate
+         * to a damage range of [maxDmg, 0.25*maxDmg).
+         */
+        @Test
+        void test75PercentWithDamagedItem() {
+            DamageBounds bounds = new DamageBounds(damagedStack, FuzzyMode.PERCENT_75);
+            assertEquals(stack.getMaxDamage(), bounds.lower.itemDamage);
+            assertEquals((int) (0.25 * stack.getMaxDamage()), bounds.upper.itemDamage);
+        }
+
+        /**
+         * PERCENT_50 with an undamaged item should select items that have 50% or more durability, which should
+         * translate to a damage range of [0.50*maxDmg, -1).
+         */
+        @Test
+        void test50PercentWithUndamagedItem() {
+            DamageBounds bounds = new DamageBounds(stack, FuzzyMode.PERCENT_50);
+            assertEquals((int) (0.50 * stack.getMaxDamage()), bounds.lower.itemDamage);
+            assertEquals(-1, bounds.upper.itemDamage);
+        }
+
+        /**
+         * PERCENT_50 with a damaged item should select items that have less than 50% durability, which should translate
+         * to a damage range of [maxDmg, 0.50*maxDmg).
+         */
+        @Test
+        void test50PercentWithDamagedItem() {
+            DamageBounds bounds = new DamageBounds(damagedStack, FuzzyMode.PERCENT_50);
+            assertEquals(stack.getMaxDamage(), bounds.lower.itemDamage);
+            assertEquals((int) (0.50 * stack.getMaxDamage()), bounds.upper.itemDamage);
+        }
+
+        /**
+         * PERCENT_25 with an undamaged item should select items that have 25% or more durability, which should
+         * translate to a damage range of [0.75*maxDmg, -1).
+         */
+        @Test
+        void test25PercentWithUndamagedItem() {
+            DamageBounds bounds = new DamageBounds(stack, FuzzyMode.PERCENT_25);
+            assertEquals((int) (0.75 * stack.getMaxDamage()), bounds.lower.itemDamage);
+            assertEquals(-1, bounds.upper.itemDamage);
+        }
+
+        /**
+         * PERCENT_25 with a damaged item should select items that have less than 25% durability, which should translate
+         * to a damage range of [maxDmg, 0.75*maxDmg).
+         */
+        @Test
+        void test25PercentWithDamagedItem() {
+            DamageBounds bounds = new DamageBounds(damagedStack, FuzzyMode.PERCENT_25);
+            assertEquals(stack.getMaxDamage(), bounds.lower.itemDamage);
+            assertEquals((int) (0.75 * stack.getMaxDamage()), bounds.upper.itemDamage);
+        }
+
+    }
+
+    private static class DamageBounds {
+        final FuzzyItemVariantList.ItemDamageBound lower;
+        final FuzzyItemVariantList.ItemDamageBound upper;
+
+        public DamageBounds(ItemStack stack, FuzzyMode mode) {
+            lower = FuzzyItemVariantList.makeLowerBound(stack, mode);
+            upper = FuzzyItemVariantList.makeUpperBound(stack, mode);
+
+            // This may be counter intuitive, but the map is sorted in descending order of item damage
+            assertThat(lower.itemDamage).isGreaterThan(upper.itemDamage);
+        }
+    }
+
+}

src/test/java/appeng/util/item/ItemListTest.java

@@ -0,0 +1,452 @@
+package appeng.util.item;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterators;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.util.text.StringTextComponent;
+
+import appeng.api.config.FuzzyMode;
+import appeng.api.storage.data.IAEItemStack;
+
+public class ItemListTest {
+
+    ItemList itemList = new ItemList();
+
+    /**
+     * add should merge item stacks by adding stored/requestable counts, and setting craftable if it wasn't set before.
+     */
+    @Test
+    public void testAddMergesAllStackProperties() {
+        itemList.add(diamondSword(100, 1, 0, false));
+        assertPreciseStackProperties(diamondSwordFilter(100), 1, 0, false);
+
+        itemList.add(diamondSword(100, 0, 1, false));
+        assertPreciseStackProperties(diamondSwordFilter(100), 1, 1, false);
+
+        itemList.add(diamondSword(100, 0, 0, true));
+        assertPreciseStackProperties(diamondSwordFilter(100), 1, 1, true);
+    }
+
+    /**
+     * addStorage only considers {@link IAEItemStack#getStackSize()} and ignores other properties when merging stacks,
+     * but inherits all properties when it's adding a new item.
+     */
+    @Test
+    public void testAddStorageForNewItem() {
+        // TODO: This might actually be incorrect, given how addrequestable et al behave
+        itemList.addStorage(diamondSword(100, 1, 1, true));
+        assertPreciseStackProperties(diamondSwordFilter(100), 1, 1, true);
+    }
+
+    @Test
+    public void testAddStorageForExistingItem() {
+        itemList.addStorage(diamondSword(100, 1, 0, false));
+        itemList.addStorage(diamondSword(100, 1, 2, true));
+        assertPreciseStackProperties(diamondSwordFilter(100), 2, 0, false);
+    }
+
+    /**
+     * addRequestable only considers {@link IAEItemStack#getCountRequestable()} and sets the stored amount to 0 and
+     * craftable to false when adding an item.
+     */
+    @Test
+    public void testAddRequestableForNewItem() {
+        itemList.addRequestable(diamondSword(100, 1, 2, true));
+        assertPreciseStackProperties(diamondSwordFilter(100), 0, 2, false);
+    }
+
+    /**
+     * addRequestable only considers {@link IAEItemStack#getCountRequestable()} when merging into an existing item.
+     */
+    @Test
+    public void testAddRequestableForExistingItem() {
+        itemList.addRequestable(diamondSword(100, 0, 1, false));
+        itemList.addRequestable(diamondSword(100, 2, 1, true));
+        assertPreciseStackProperties(diamondSwordFilter(100), 0, 2, false);
+    }
+
+    /**
+     * addCraftable only considers {@link IAEItemStack#isCraftable()} and sets the stored and requestable amounts to 0
+     * when adding an item.
+     */
+    @Test
+    public void testAddCraftingForNewItem() {
+        itemList.addCrafting(diamondSword(100, 1, 2, true));
+        // TODO: I think it is unintended that the requestable amount is used
+        assertPreciseStackProperties(diamondSwordFilter(100), 0, 2, true);
+    }
+
+    /**
+     * addRequestable only considers {@link IAEItemStack#getCountRequestable()} when merging into an existing item.
+     */
+    @Test
+    public void testAddCraftingForExistingItem() {
+        itemList.addCrafting(diamondSword(100, 0, 0, false));
+        itemList.addCrafting(diamondSword(100, 1, 2, true));
+        assertPreciseStackProperties(diamondSwordFilter(100), 0, 0, true);
+    }
+
+    /**
+     * an empty craftable stack still creates an entry in the list
+     */
+    @Test
+    public void testAddEmptyStackThatIsCraftable() {
+        itemList.add(diamondSword(100, 0, 0, true));
+        assertPreciseStackProperties(diamondSwordFilter(100), 0, 0, true);
+    }
+
+    /**
+     * check that craftable isn't accidentally reset to false when merging stacks
+     */
+    @Test
+    public void testAddDoesNotResetCraftableBackToFalse() {
+        itemList.add(diamondSword(100, 0, 0, true));
+        itemList.add(diamondSword(100, 1, 0, false));
+        assertPreciseStackProperties(diamondSwordFilter(100), 1, 0, true);
+    }
+
+    /**
+     * stacks for the same item, but different damage values should not be merged
+     */
+    @Test
+    public void testAddDoesNotMergeAcrossDamageValues() {
+        itemList.add(diamondSword(100, 1, 0, false));
+        itemList.add(diamondSword(99, 1, 0, false));
+        assertPreciseStackProperties(diamondSwordFilter(100), 1, 0, false);
+        assertPreciseStackProperties(diamondSwordFilter(99), 1, 0, false);
+    }
+
+    private void assertPreciseStackProperties(IAEItemStack stack, long stored, long requestable, boolean craftable) {
+        IAEItemStack storedStack = itemList.findPrecise(stack);
+        assertEquals(stored, storedStack.getStackSize(), "stored amount");
+        assertEquals(requestable, storedStack.getCountRequestable(), "requestable amount");
+        assertEquals(craftable, storedStack.isCraftable(), "craftable");
+    }
+
+    /**
+     * Even if the stack has no stored or requestable amounts, it should be returned by the item list if it is
+     * craftable.
+     */
+    @Test
+    public void testSizeAndIterateForEmptyButCraftableStack() {
+        itemList.add(diamondSword(100, 0, 0, true));
+        assertListContent(diamondSword(100, 0, 0, true));
+    }
+
+    /**
+     * If the stack is not craftable, an empty stack is actually ignored.
+     */
+    @Test
+    public void testEmptyStackIsIgnored() {
+        itemList.add(diamondSword(100, 0, 0, false));
+        assertListContent();
+    }
+
+    @Test
+    public void testResetStatus() {
+        itemList.add(diamondSword(100, 1, 0, false));
+        itemList.add(nameTag(1, 0, false));
+        assertEquals(2, itemList.size());
+
+        itemList.resetStatus();
+
+        assertListContent(); // The list should now be empty
+    }
+
+    /**
+     * Tests that iteration across multiple items and variations of those items works.
+     */
+    @Test
+    public void testIterateAcrossMultipleItems() {
+        // Add damaged variants of the same item, including NBT variants
+        AEItemStack sword1 = diamondSword(100, 1, 0, false);
+        itemList.add(sword1);
+        AEItemStack sword2 = diamondSword(50, 1, 0, false);
+        itemList.add(sword2);
+        AEItemStack sword3 = diamondSword(25, 1, 0, false);
+        itemList.add(sword3);
+        AEItemStack sword4 = diamondSword(100, "master sword", 1, 0, false);
+        itemList.add(sword4);
+        // And a non-damagable item with different NBT
+        AEItemStack nameTag1 = nameTag(1, 0, false);
+        itemList.add(nameTag1);
+        AEItemStack nameTag2 = nameTag("bob", 1, 0, false);
+        itemList.add(nameTag2);
+
+        assertListContent(sword1, sword2, sword3, sword4, nameTag1, nameTag2);
+    }
+
+    @Test
+    void testConcurrentModificationByAddingItemType() {
+        AEItemStack sword = diamondSword(100, 1, 0, false);
+        itemList.add(sword);
+        AEItemStack nameTag = nameTag(1, 0, false);
+        itemList.add(nameTag);
+        AEItemStack craftingTable = AEItemStack.fromItemStack(new ItemStack(Items.CRAFTING_TABLE));
+
+        assertThrows(ConcurrentModificationException.class, () -> {
+            Iterator<IAEItemStack> it = itemList.iterator();
+            itemList.add(craftingTable);
+            assertThat(Iterators.toArray(it, IAEItemStack.class)).containsOnly(sword, nameTag);
+        });
+    }
+
+    /**
+     * Regression test for broken iterators that mutated state in {@see Iterator#hasNext}. This was the case for both
+     * the top-level and sub-iterator.
+     */
+    @Test
+    public void testIteratorHasNextDoesNotSkipItems() {
+        itemList.add(diamondSword(100, 1, 0, false));
+        itemList.add(diamondSword(50, 1, 0, false));
+
+        Iterator<IAEItemStack> it = itemList.iterator();
+        assertTrue(it.hasNext());
+        assertTrue(it.hasNext());
+        assertTrue(it.hasNext());
+    }
+
+    @Test
+    public void testGetFirstItemForEmptyList() {
+        assertNull(itemList.getFirstItem());
+    }
+
+    @Test
+    public void testGetFirstItem() {
+        AEItemStack itemStack = diamondSword(100, 1, 0, false);
+        itemList.add(itemStack);
+        // The order is no longer well defined w.r.t. the hashmap
+        assertEquals(itemStack, itemList.getFirstItem());
+    }
+
+    @Nested
+    class FindFuzzyDamageableItems {
+
+        // Swords to cover all durability values
+        AEItemStack swordAbove100 = diamondSword(101, 1, 0, false);
+        AEItemStack[] swords = new AEItemStack[101];
+        // Filters for inverting the filter as needed
+        AEItemStack undamagedFilter = diamondSwordFilter(100);
+        AEItemStack damagedFilter = diamondSwordFilter(0);
+
+        @BeforeEach
+        void addItems() {
+            itemList.add(swordAbove100);
+            for (int i = 0; i <= 100; i++) {
+                swords[i] = diamondSword(i, 1, 0, false);
+                assertEquals(i, getDurabilityPercent(swords[i]));
+                itemList.add(swords[i]);
+            }
+        }
+
+        @Test
+        public void testIgnoreAllWithUndamagedFilter() {
+            assertReturnedDurabilities(undamagedFilter, FuzzyMode.IGNORE_ALL, 0, 100, false);
+        }
+
+        @Test
+        public void testIgnoreAllWithDamagedFilter() {
+            assertReturnedDurabilities(damagedFilter, FuzzyMode.IGNORE_ALL, 0, 100, false);
+        }
+
+        @Test
+        public void testPercent99WithUndamagedFilter() {
+            assertReturnedDurabilities(undamagedFilter, FuzzyMode.PERCENT_99, 100, 100, false);
+        }
+
+        @Test
+        public void testPercent99WithDamagedFilter() {
+            assertReturnedDurabilities(damagedFilter, FuzzyMode.PERCENT_99, 0, 99, false);
+        }
+
+        @Test
+        public void testPercent75WithUndamagedFilter() {
+            assertReturnedDurabilities(undamagedFilter, FuzzyMode.PERCENT_75, 75, 100, false);
+        }
+
+        @Test
+        public void testPercent75WithDamagedFilter() {
+            assertReturnedDurabilities(damagedFilter, FuzzyMode.PERCENT_75, 0, 74, false);
+        }
+
+        @Test
+        public void testPercent50WithUndamagedFilter() {
+            assertReturnedDurabilities(undamagedFilter, FuzzyMode.PERCENT_50, 50, 100, false);
+        }
+
+        @Test
+        public void testPercent50WithDamagedFilter() {
+            assertReturnedDurabilities(damagedFilter, FuzzyMode.PERCENT_50, 0, 49, false);
+        }
+
+        @Test
+        public void testPercent25WithUndamagedFilter() {
+            assertReturnedDurabilities(undamagedFilter, FuzzyMode.PERCENT_25, 25, 100, false);
+        }
+
+        @Test
+        public void testPercent25WithDamagedFilter() {
+            assertReturnedDurabilities(damagedFilter, FuzzyMode.PERCENT_25, 0, 24, false);
+        }
+
+        private void assertReturnedDurabilities(IAEItemStack filter, FuzzyMode fuzzyMode, int minDurabilityInclusive,
+                int maxDurabilityInclusive, boolean above100) {
+            Collection<IAEItemStack> items = itemList.findFuzzy(filter, fuzzyMode);
+
+            // Build a list of the durabilities that got returned
+            List<Integer> durabilities = items.stream().map(this::getDurabilityPercent)
+                    .sorted()
+                    .collect(Collectors.toList());
+
+            // Build a sorted list of the durabilities we expect
+            List<Integer> expectedDurabilities = new ArrayList<>();
+            for (int i = minDurabilityInclusive; i <= maxDurabilityInclusive; i++) {
+                expectedDurabilities.add(getDurabilityPercent(swords[i]));
+            }
+            if (above100) {
+                expectedDurabilities.add(getDurabilityPercent(swordAbove100));
+            }
+            expectedDurabilities.sort(Integer::compare);
+
+            assertEquals(expectedDurabilities, durabilities);
+        }
+
+        private int getDurabilityPercent(IAEItemStack stack) {
+            if (stack == swordAbove100) {
+                return 101;
+            }
+            return (int) ((1.0f - (stack.getItemDamage() / (float) stack.getDefinition().getMaxDamage())) * 100);
+        }
+    }
+
+    @Test
+    void testFindFuzzyForNormalItems() {
+        AEItemStack item1 = nameTag(null, 1, 0, false);
+        itemList.add(item1);
+        AEItemStack item2 = nameTag("name1", 1, 0, false);
+        itemList.add(item2);
+        AEItemStack item3 = nameTag("name2", 1, 0, false);
+        itemList.add(item3);
+        // Add another item to ensure this is not returned
+        itemList.add(AEItemStack.fromItemStack(new ItemStack(Items.CRAFTING_TABLE)));
+
+        for (FuzzyMode fuzzyMode : FuzzyMode.values()) {
+            Collection<IAEItemStack> result = itemList.findFuzzy(nameTag(null, 0, 0, false), fuzzyMode);
+            assertThat(result).containsOnly(item1, item2, item3);
+        }
+    }
+
+    /**
+     * Tests how ItemList behaves w.r.t. null arguments, given that {@link AEItemStack#fromItemStack(ItemStack)} can
+     * return null for an empty stack, this sometimes leaks into method parameters. As such, methods should behave as if
+     * an empty item stack was passed.
+     */
+    @Nested
+    class NullArguments {
+        @BeforeEach
+        void addItem() {
+            itemList.add(diamondSword(100, 1, 0, false));
+        }
+
+        @Test
+        void testFindFuzzy() {
+            assertThat(itemList.findFuzzy(null, FuzzyMode.PERCENT_99)).isEmpty();
+        }
+
+        @Test
+        void testFindPrecise() {
+            assertThat(itemList.findPrecise(null)).isNull();
+        }
+
+        @Test
+        void testAdd() {
+            assertThat(itemList.size()).isEqualTo(1);
+            itemList.add(null);
+            assertThat(itemList.size()).isEqualTo(1);
+        }
+
+        @Test
+        void testAddStorage() {
+            assertThat(itemList.size()).isEqualTo(1);
+            itemList.addStorage(null);
+            assertThat(itemList.size()).isEqualTo(1);
+        }
+
+        @Test
+        void testAddRequestable() {
+            assertThat(itemList.size()).isEqualTo(1);
+            itemList.addRequestable(null);
+            assertThat(itemList.size()).isEqualTo(1);
+        }
+
+        @Test
+        void testAddCrafting() {
+            assertThat(itemList.size()).isEqualTo(1);
+            itemList.addCrafting(null);
+            assertThat(itemList.size()).isEqualTo(1);
+        }
+    }
+
+    private void assertListContent(AEItemStack... stacks) {
+        assertEquals(stacks.length == 0, itemList.isEmpty(), "isEmpty");
+        assertEquals(stacks.length, itemList.size());
+        assertEquals(ImmutableSet.copyOf(stacks), ImmutableSet.copyOf(itemList));
+    }
+
+    private AEItemStack diamondSwordFilter(int durabilityPercent) {
+        return diamondSword(durabilityPercent, 0, 0, false);
+    }
+
+    private AEItemStack diamondSword(int durabilityPercent, long stored, long requestable, boolean craftable) {
+        return diamondSword(durabilityPercent, null, stored, requestable, craftable);
+    }
+
+    private AEItemStack diamondSword(int durabilityPercent, String customName, long stored, long requestable,
+            boolean craftable) {
+        ItemStack is = new ItemStack(Items.DIAMOND_SWORD);
+        if (customName != null) {
+            is.setDisplayName(new StringTextComponent(customName));
+        }
+        int damage = (int) ((100 - durabilityPercent) / 100.0f * is.getMaxDamage());
+        is.setDamage(damage);
+        AEItemStack ais = AEItemStack.fromItemStack(is);
+        ais.setStackSize(stored);
+        ais.setCountRequestable(requestable);
+        ais.setCraftable(craftable);
+        return ais;
+    }
+
+    // customName can be used to create items that differ in NBT
+    private AEItemStack nameTag(long stored, long requestable, boolean craftable) {
+        return nameTag(null, stored, requestable, craftable);
+    }
+
+    private AEItemStack nameTag(String customName, long stored, long requestable, boolean craftable) {
+        ItemStack is = new ItemStack(Items.NAME_TAG);
+        if (customName != null) {
+            is.setDisplayName(new StringTextComponent(customName));
+        }
+        AEItemStack ais = AEItemStack.fromItemStack(is);
+        ais.setStackSize(stored);
+        ais.setCountRequestable(requestable);
+        ais.setCraftable(craftable);
+        return ais;
+    }
+
+}

src/test/java/appeng/util/item/TestItemWithCaps.java

@@ -0,0 +1,60 @@
+package appeng.util.item;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.nbt.IntNBT;
+import net.minecraft.util.Direction;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.ICapabilityProvider;
+import net.minecraftforge.common.util.INBTSerializable;
+import net.minecraftforge.common.util.LazyOptional;
+
+public class TestItemWithCaps extends Item {
+    public TestItemWithCaps() {
+        super(new Properties());
+        setRegistryName("appliedenergistics2:test_item");
+    }
+
+    @Nullable
+    @Override
+    public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable CompoundNBT nbt) {
+        if (nbt == null) {
+            return null;
+        } else {
+            return new CapabilityProvider();
+        }
+    }
+
+    /**
+     * Simple capability provider that just has a single counter value to produce different NBT.
+     */
+    public static class CapabilityProvider implements ICapabilityProvider, INBTSerializable<IntNBT> {
+        private int counter;
+
+        @Nonnull
+        @Override
+        public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
+            return LazyOptional.empty();
+        }
+
+        @Nonnull
+        @Override
+        public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap) {
+            return LazyOptional.empty();
+        }
+
+        @Override
+        public IntNBT serializeNBT() {
+            return IntNBT.valueOf(counter);
+        }
+
+        @Override
+        public void deserializeNBT(IntNBT nbt) {
+            counter = nbt.getInt();
+        }
+    }
+}