wip

fix substitution crafting, for real this time
wip 2


wip. still has NBT issues


fix semantic changes


fix interface with free slots on interface terminal


Auto stash before cherry pick of "fix interface with free slots on interface terminal"

CHANGES.md

@@ -0,0 +1,47 @@
+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.properties

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

gradle/scripts/dependencies.gradle

@@ -19,11 +19,6 @@
 repositories {
     mavenLocal()
 
-    maven {
-        name = "storagedrawers"
-        url = "https://dl.bintray.com/jaquadro/dev/"
-    }
-
     maven {
         name "Mobius"
         url "http://mobiusstrip.eu/maven"
@@ -39,6 +34,11 @@ 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,11 +59,6 @@ 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/"
@@ -85,8 +80,7 @@ configurations {
 }
 
 dependencies {
-    deobfCompile "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12.2-5.4.2:api"
-    deobfCompile "gregtechce:gregtech:1.12.2:1.12.0.662"
+    compileOnly "gregtechce:gregtech:1.12.2:1.15.1.735"
 
     // installable runtime dependencies
     mods "mcp.mobius.waila:Hwyla:${hwyla_version}"
@@ -103,11 +97,10 @@ 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/Upgrades.java

@@ -46,7 +46,8 @@ public enum Upgrades
 	 */
 	FUZZY( 1 ),
 	SPEED( 1 ),
-	INVERTER( 1 );
+	INVERTER( 1 ),
+	PATTERN_EXPANSION(1);
 
 	private final int tier;
 	private final Map<ItemStack, Integer> supportedMax = new HashMap<>();

src/api/java/appeng/api/definitions/IMaterials.java

@@ -89,6 +89,8 @@ public interface IMaterials
 
 	IItemDefinition cardCapacity();
 
+	IItemDefinition cardPatternExpansion();
+
 	IItemDefinition cardFuzzy();
 
 	IItemDefinition cardInverter();

src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java

@@ -31,6 +31,9 @@ import net.minecraft.world.World;
 import appeng.api.implementations.ICraftingPatternItem;
 import appeng.api.storage.data.IAEItemStack;
 
+import java.util.Collections;
+import java.util.List;
+
 
 /**
  * do not implement provided by {@link ICraftingPatternItem}
@@ -84,6 +87,11 @@ public interface ICraftingPatternDetails
 	 */
 	boolean canSubstitute();
 
+	default List<IAEItemStack> getSubstituteInputs( int slot )
+	{
+		return Collections.emptyList();
+	}
+
 	/**
 	 * Allow using this INSTANCE of the pattern details to preform the crafting action with performance enhancements.
 	 *

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

@@ -112,4 +112,13 @@ public interface IAEItemStack extends IAEStack<IAEItemStack>
 	 * @return definition stack
 	 */
 	ItemStack getDefinition();
+
+	/**
+	 * 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
+	 */
+	boolean equals(ItemStack is);
+
 }

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

@@ -0,0 +1,143 @@
+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,8 +25,11 @@ 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;
@@ -36,10 +39,7 @@ 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.MouseEvent;
-import net.minecraftforge.client.event.RenderLivingEvent;
-import net.minecraftforge.client.event.RenderWorldLastEvent;
-import net.minecraftforge.client.event.TextureStitchEvent;
+import net.minecraftforge.client.event.*;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.ForgeModContainer;
 import net.minecraftforge.common.MinecraftForge;
@@ -75,6 +75,7 @@ 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
@@ -315,6 +316,28 @@ 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,6 +19,7 @@
 package appeng.client.gui;
 
 
+import java.awt.*;
 import java.io.IOException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
@@ -31,10 +32,15 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import appeng.container.slot.*;
 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 org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
@@ -69,17 +75,7 @@ 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;
@@ -90,6 +86,9 @@ 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
@@ -104,6 +103,28 @@ 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 )
@@ -186,6 +207,65 @@ 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 )
@@ -318,7 +398,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 		{
 			slot.drawBackground( ox, oy );
 		}
-
 	}
 
 	@Override
@@ -378,6 +457,43 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 				}
 			}
 		}
+		else if( slot instanceof SlotDisconnected )
+		{
+			this.drag_click.add( slot );
+			if( this.drag_click.size() > 1 )
+			{
+				if( !itemstack.isEmpty() )
+				{
+					for( final Slot dr : this.drag_click )
+					{
+						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 );
+						}
+					}
+				}
+
+				else if( isShiftKeyDown() )
+				{
+					for( final Slot dr : this.drag_click )
+					{
+						InventoryAction action = null;
+						if( !slot.getStack().isEmpty() )
+						{
+							action = InventoryAction.SHIFT_CLICK;
+						}
+						if( action != null )
+						{
+							final PacketInventoryAction p = new PacketInventoryAction( action, dr.getSlotIndex(), ( (SlotDisconnected) slot ).getSlot().getId() );
+							NetworkHandler.instance().sendToServer( p );
+						}
+					}
+				}
+			}
+		}
+
 		else
 		{
 			super.mouseClickMove( x, y, c, d );
@@ -390,18 +506,56 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 	{
 		final EntityPlayer player = Minecraft.getMinecraft().player;
 
-		if( slot instanceof SlotFake )
+		if( this.isJeiGhostItem && isDraggingJeiGhostItem)
 		{
-			final InventoryAction action = mouseButton == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
+			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;
 
 			if( this.drag_click.size() > 1 )
 			{
 				return;
 			}
 
-			final PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
+			PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
 			NetworkHandler.instance().sendToServer( p );
-
 			return;
 		}
 
@@ -471,15 +625,24 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 
 		if( slot instanceof SlotDisconnected )
 		{
+			if( this.drag_click.size() > 1 )
+			{
+				return;
+			}
+
 			InventoryAction action = null;
 
-			switch( clickType )
+			switch ( clickType )
 			{
 				case PICKUP: // pickup / set-down.
-					if (slot.getStack().isEmpty() && !player.inventory.getItemStack().isEmpty())
+					if( slot.getStack().isEmpty() && !player.inventory.getItemStack().isEmpty() )
+					{
 						action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
-					if (!slot.getStack().isEmpty() && player.inventory.getItemStack().getCount() <= 1)
+					}
+					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;
@@ -512,14 +675,13 @@ 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;
 					}
@@ -586,9 +748,7 @@ 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 );
 					}
@@ -599,6 +759,11 @@ 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 );
 	}
 
@@ -1026,4 +1191,5 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 	{
 		return false;
 	}
+
 }

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

@@ -2,26 +2,23 @@ package appeng.client.gui;
 
 import javax.annotation.Nullable;
 import appeng.api.storage.data.IAEItemStack;
-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 appeng.client.gui.implementations.*;
+import appeng.container.interfaces.IJEIGhostIngredients;
+import appeng.container.slot.SlotFake;
+import appeng.fluids.client.gui.widgets.GuiFluidSlot;
 import mezz.jei.api.gui.IAdvancedGuiHandler;
-import net.minecraft.client.renderer.RenderItem;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
+import mezz.jei.api.gui.IGhostIngredientHandler;
+import net.minecraft.client.gui.GuiScreen;
+import org.lwjgl.input.Mouse;
 
 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>
+public class AEGuiHandler implements IAdvancedGuiHandler<AEBaseGui>, IGhostIngredientHandler<AEBaseGui>
 {
-
     @Override
     public Class<AEBaseGui> getGuiContainerClass()
     {
@@ -39,8 +36,8 @@ public class AEGuiHandler implements IAdvancedGuiHandler<AEBaseGui>
     @Override
     public Object getIngredientUnderMouse( AEBaseGui guiContainer, int mouseX, int mouseY )
     {
-        List<IAEItemStack> visual = new ArrayList<>();
-        int guiSlotIdx = 0;
+        List<IAEItemStack> visual;
+        int guiSlotIdx;
         Object result = null;
         if( guiContainer instanceof GuiCraftConfirm )
         {
@@ -94,4 +91,54 @@ public class AEGuiHandler implements IAdvancedGuiHandler<AEBaseGui>
         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/GuiInterface.java

@@ -50,7 +50,7 @@ public class GuiInterface extends GuiUpgradeable
 	public GuiInterface( final InventoryPlayer inventoryPlayer, final IInterfaceHost te )
 	{
 		super( new ContainerInterface( inventoryPlayer, te ) );
-		this.ySize = 211;
+		this.ySize = 256;
 	}
 
 	@Override
@@ -62,8 +62,7 @@ public class GuiInterface extends GuiUpgradeable
 		this.BlockMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 8, Settings.BLOCK, YesNo.NO );
 		this.buttonList.add( this.BlockMode );
 
-		this.interfaceMode = new GuiToggleButton( this.guiLeft - 18, this.guiTop + 26, 84, 85, GuiText.InterfaceTerminal
-				.getLocal(), GuiText.InterfaceTerminalHint.getLocal() );
+		this.interfaceMode = new GuiToggleButton( this.guiLeft - 18, this.guiTop + 26, 84, 85, GuiText.InterfaceTerminal.getLocal(), GuiText.InterfaceTerminalHint.getLocal() );
 		this.buttonList.add( this.interfaceMode );
 	}
 
@@ -86,13 +85,20 @@ public class GuiInterface extends GuiUpgradeable
 		this.fontRenderer.drawString( GuiText.StoredItems.getLocal(), 8, 6 + 60 + 7, 4210752 );
 		this.fontRenderer.drawString( GuiText.Patterns.getLocal(), 8, 6 + 73 + 7, 4210752 );
 
-		this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
 	}
 
 	@Override
 	protected String getBackground()
 	{
-		return "guis/interface.png";
+		int upgrades = ( (ContainerInterface) this.cvb ).getPatternUpgrades();
+		if( upgrades == 0 )
+		{
+			return "guis/newinterface.png";
+		}
+		else
+		{
+			return "guis/newinterface" + upgrades + ".png";
+		}
 	}
 
 	@Override
@@ -117,4 +123,5 @@ public class GuiInterface extends GuiUpgradeable
 			NetworkHandler.instance().sendToServer( new PacketConfigButton( this.BlockMode.getSetting(), backwards ) );
 		}
 	}
+
 }

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

@@ -24,7 +24,13 @@ import java.util.*;
 
 import appeng.api.config.ActionItems;
 import appeng.api.config.Settings;
+import appeng.api.config.Upgrades;
 import appeng.client.gui.widgets.GuiImgButton;
+import appeng.core.worlddata.IWorldPlayerMapping;
+import appeng.helpers.DualityInterface;
+import appeng.parts.misc.PartInterface;
+import appeng.tile.inventory.AppEngInternalInventory;
+import appeng.tile.misc.TileInterface;
 import appeng.util.BlockPosUtils;
 import com.google.common.collect.HashMultimap;
 
@@ -49,6 +55,8 @@ 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;
@@ -66,8 +74,10 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	private final HashMultimap<String, ClientDCInternalInv> byName = HashMultimap.create();
 	private final HashMap<ClientDCInternalInv,BlockPos> blockPosHashMap = new HashMap<>();
 	private final HashMap<GuiButton,ClientDCInternalInv> guiButtonHashMap = new HashMap<>();
+	private final Map<ClientDCInternalInv,Integer> numUpgradesMap = 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<>();
 
@@ -77,6 +87,7 @@ 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 )
 	{
@@ -86,7 +97,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 		final GuiScrollbar scrollbar = new GuiScrollbar();
 		this.setScrollBar( scrollbar );
 		this.xSize = 208;
-		this.ySize = 256;
+		this.ySize = 255;
 	}
 
 	@Override
@@ -94,7 +105,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	{
 		super.initGui();
 
-		this.getScrollBar().setLeft( 190 );
+		this.getScrollBar().setLeft( 189 );
 		this.getScrollBar().setHeight( 106 );
 		this.getScrollBar().setTop( 51 );
 
@@ -123,50 +134,51 @@ 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 )
 	{
 		this.buttonList.clear();
 
 		this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.InterfaceTerminal.getLocal() ), 8, 6, 4210752 );
-		this.fontRenderer.drawString( GuiText.inventory.getLocal(), offsetX, this.ySize - 96 + 3, 4210752 );
+		this.fontRenderer.drawString( GuiText.inventory.getLocal(), this.offsetX + 2, this.ySize - 96 + 3, 4210752 );
 
-		final int ex = this.getScrollBar().getCurrentScroll();
+		final int currentScroll = this.getScrollBar().getCurrentScroll();
 
-		this.guiButtonNextAssembler = new GuiImgButton(guiLeft + 123, guiTop + 25,Settings.ACTIONS, ActionItems.FREE_MOLECULAR_SLOT_SHORTCUT);
+		this.guiButtonNextAssembler = new GuiImgButton( guiLeft + 123, guiTop + 25, Settings.ACTIONS, ActionItems.FREE_MOLECULAR_SLOT_SHORTCUT );
 		this.buttonList.add( guiButtonNextAssembler );
 
-		guiButtonHide = new GuiImgButton( guiLeft + 141, guiTop + 25,Settings.ACTIONS, this.partInterfaceTerminal.onlyInterfacesWithFreeSlots ?
-																							ActionItems.TOGGLE_SHOW_FULL_INTERFACES_OFF :
-																							ActionItems.TOGGLE_SHOW_FULL_INTERFACES_ON);
+		guiButtonHide = new GuiImgButton( guiLeft + 141, guiTop + 25, Settings.ACTIONS, this.partInterfaceTerminal.onlyInterfacesWithFreeSlots ? ActionItems.TOGGLE_SHOW_FULL_INTERFACES_OFF : ActionItems.TOGGLE_SHOW_FULL_INTERFACES_ON );
 		this.buttonList.add( guiButtonHide );
 
 		this.inventorySlots.inventorySlots.removeIf( slot -> slot instanceof SlotDisconnected );
 
-		int offset = 51;
-		for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
+		int offset = 52;
+		int linesDraw = 0;
+		for( int x = 0; x < LINES_ON_PAGE && linesDraw < LINES_ON_PAGE && currentScroll + x < this.lines.size(); x++ )
 		{
-			final Object lineObj = this.lines.get( ex + x );
+			final Object lineObj = this.lines.get( currentScroll + x );
 			if( lineObj instanceof ClientDCInternalInv )
 			{
 				final ClientDCInternalInv inv = (ClientDCInternalInv) lineObj;
-				for( int z = 0; z < inv.getInventory().getSlots(); z++ )
-				{
-					this.inventorySlots.inventorySlots.add( new SlotDisconnected( inv, z, z * 18 + 22, 1 + offset ) );
-				}
 
-				GuiButton guiButton = new GuiImgButton(guiLeft + 4, guiTop + offset + 1, Settings.ACTIONS, ActionItems.HIGHLIGHT_INTERFACE);
-				guiButtonHashMap.put( guiButton , inv);
+				GuiButton guiButton = new GuiImgButton( guiLeft + 4, guiTop + offset, Settings.ACTIONS, ActionItems.HIGHLIGHT_INTERFACE );
+				guiButtonHashMap.put( guiButton, inv );
 				this.buttonList.add( guiButton );
+				int extraLines = numUpgradesMap.get( inv );
 
+				for( int row = 0; row < 1 + extraLines && linesDraw < LINES_ON_PAGE ; ++row )
+				{
+					for( int z = 0; z < 9 ; z++ )
+					{
+						this.inventorySlots.inventorySlots.add( new SlotDisconnected( inv, z + ( row * 9 ), ( z * 18 + 22 ), offset ) );
+						if( this.matchedStacks.contains( inv.getInventory().getStackInSlot( z + ( row * 9 ) ) ) )
+						{
+							drawRect( z * 18 + 22, offset, z * 18 + 22 + 16, offset + 16, 0x2A00FF00 );
+						}
+					}
+					linesDraw++;
+					offset += 18;
+				}
 			}
 			else if( lineObj instanceof String )
 			{
@@ -177,15 +189,19 @@ public class GuiInterfaceTerminal extends AEBaseGui
 					name = name + " (" + rows + ')';
 				}
 
-				while( name.length() > 2 && this.fontRenderer.getStringWidth( name ) > 155 )
+				while ( name.length() > 2 && this.fontRenderer.getStringWidth( name ) > 155 )
 				{
 					name = name.substring( 0, name.length() - 1 );
 				}
-
-				this.fontRenderer.drawString( name, 22, 6 + offset, 4210752 );
+				this.fontRenderer.drawString( name, this.offsetX + 2, 5 + offset, 4210752 );
+				linesDraw++;
+				offset += 18;
 			}
-			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
@@ -217,8 +233,17 @@ public class GuiInterfaceTerminal extends AEBaseGui
 		{
 			BlockPos blockPos = blockPosHashMap.get( guiButtonHashMap.get( this.selectedButton ) );
 			BlockPos blockPos2 = mc.player.getPosition();
-			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 );
+			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 );
+			}
 			mc.player.closeScreen();
 		}
 
@@ -252,19 +277,28 @@ public class GuiInterfaceTerminal extends AEBaseGui
 
 		int offset = 51;
 		final int ex = this.getScrollBar().getCurrentScroll();
-
-		for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
+		int linesDraw = 0;
+		for( int x = 0; x < LINES_ON_PAGE && linesDraw < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
 		{
 			final Object lineObj = this.lines.get( ex + x );
 			if( lineObj instanceof ClientDCInternalInv )
 			{
-				final ClientDCInternalInv inv = (ClientDCInternalInv) lineObj;
-
 				GlStateManager.color( 1, 1, 1, 1 );
-				final int width = inv.getInventory().getSlots() * 18;
-				this.drawTexturedModalRect( offsetX + 20, offsetY + offset, 20, 173, width, 18 );
+				final int width = 9 * 18;
+
+				int extraLines = numUpgradesMap.get( lineObj );
+
+				for( int row = 0; row < 1 + extraLines && linesDraw < LINES_ON_PAGE; ++row )
+				{
+					this.drawTexturedModalRect( offsetX + 20, offsetY + offset , 20, 173, width, 18 );
+					offset += 18;
+					linesDraw++;
+				}
+			}
+			else {
+				offset += 18;
+				linesDraw++;
 			}
-			offset += 18;
 		}
 
 		if( this.searchFieldInputs != null )
@@ -324,6 +358,8 @@ 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" ));
+					numUpgradesMap.put( current, invData.getInteger("numUpgrades"));
 
 					for( int x = 0; x < current.getInventory().getSlots(); x++ )
 					{
@@ -358,6 +394,7 @@ 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();
@@ -376,37 +413,41 @@ 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 )
 			{
+				int slot = 0;
 				for( final ItemStack itemStack : entry.getInventory() )
 				{
-					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 )
-					{
+					if (slot > 8 + numUpgradesMap.get(entry) * 9) {
 						break;
 					}
-				}
-			} 
-
-			// 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()){
+					if( !searchFieldInputs.isEmpty() && !searchFieldOutputs.isEmpty() ) {
+						if (this.itemStackMatchesSearchTerm(itemStack, searchFieldInputs, 0) || this.itemStackMatchesSearchTerm(itemStack, searchFieldOutputs, 1)) {
+							found = true;
+							matchedStacks.add(itemStack);
+						}
+					}
+					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())
 						interfaceHasFreeSlots = true;
-						break;
-					}
+					slot++;
 				}
 			}
-
 			// 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 )))
 			{
@@ -445,7 +486,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 			this.lines.addAll( clientInventories );
 		}
 
-		this.getScrollBar().setRange( 0, this.lines.size() - LINES_ON_PAGE, 2 );
+		this.getScrollBar().setRange( 0, this.lines.size() - 1, 1 );
 	}
 
 	private boolean itemStackMatchesSearchTerm( final ItemStack itemStack, final String searchTerm,int pass )
@@ -535,7 +576,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 
 		if( o == null )
 		{
-			this.byId.put( id, o = new ClientDCInternalInv( 9, id, sortBy, string ) );
+			this.byId.put( id, o = new ClientDCInternalInv( DualityInterface.NUMBER_OF_PATTERN_SLOTS, id, sortBy, string ) );
 			this.refreshList = true;
 		}
 

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

@@ -19,11 +19,21 @@
 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;
@@ -40,7 +50,7 @@ import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketValueConfig;
 
 
-public class GuiPatternTerm extends GuiMEMonitorable
+public class GuiPatternTerm extends GuiMEMonitorable implements IJEIGhostIngredients
 {
 
 	private static final String BACKGROUND_CRAFTING_MODE = "guis/pattern.png";
@@ -67,6 +77,7 @@ public class GuiPatternTerm extends GuiMEMonitorable
 	private GuiImgButton divThreeBtn;
 	private GuiImgButton minusOneBtn;
 	private GuiImgButton maxCountBtn;
+	public Map<Target<?>,Object> mapTargetSlot = new HashMap<>();
 
 	public GuiPatternTerm( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
 	{
@@ -274,4 +285,52 @@ public class GuiPatternTerm extends GuiMEMonitorable
 
 		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,8 +19,24 @@
 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;
@@ -43,9 +59,9 @@ import appeng.parts.automation.PartExportBus;
 import appeng.parts.automation.PartImportBus;
 
 
-public class GuiUpgradeable extends AEBaseGui
+public class GuiUpgradeable extends AEBaseGui implements IJEIGhostIngredients
 {
-
+	private final Map<Target<?>,Object> mapTargetSlot = new HashMap<>();
 	protected final ContainerUpgradeable cvb;
 	protected final IUpgradeableHost bc;
 
@@ -200,4 +216,108 @@ public class GuiUpgradeable extends AEBaseGui
 			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/me/ClientDCInternalInv.java

@@ -37,7 +37,7 @@ public class ClientDCInternalInv implements Comparable<ClientDCInternalInv>
 
 	public ClientDCInternalInv( final int size, final long id, final long sortBy, final String unlocalizedName )
 	{
-		this.inventory = new AppEngInternalInventory( null, size );
+		this.inventory = new AppEngInternalInventory( null, size, 1 );
 		this.unlocalizedName = unlocalizedName;
 		this.id = id;
 		this.sortBy = sortBy;

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

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

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

@@ -19,6 +19,7 @@
 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;
@@ -30,6 +31,7 @@ import net.minecraft.util.EnumFacing;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.util.IWideReadableNumberConverter;
 import appeng.util.ReadableNumberConverter;
+import net.minecraftforge.fluids.FluidStack;
 
 
 /**
@@ -143,4 +145,23 @@ 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,56 +159,58 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH
 	@Override
 	public void detectAndSendChanges()
 	{
-		if( Platform.isServer() && this.getMonitor() != null && !this.list.isEmpty() )
+		if( Platform.isServer() && this.getMonitor() != null )
 		{
-			try
+			if( this.getEstimatedTime() >= 0 )
 			{
-				if( this.getEstimatedTime() >= 0 )
+				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
 				{
-					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 );
-				}
+					final PacketMEInventoryUpdate a = new PacketMEInventoryUpdate( (byte) 0 );
+					final PacketMEInventoryUpdate b = new PacketMEInventoryUpdate( (byte) 1 );
+					final PacketMEInventoryUpdate c = new PacketMEInventoryUpdate( (byte) 2 );
 
-				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 )
+					for( final IAEItemStack out : this.list )
 					{
-						if( !a.isEmpty() )
-						{
-							NetworkHandler.instance().sendTo( a, (EntityPlayerMP) g );
-						}
+						a.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.STORAGE ) );
+						b.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.ACTIVE ) );
+						c.appendItem( this.getMonitor().getItemStack( out, CraftingItemList.PENDING ) );
+					}
 
-						if( !b.isEmpty() )
-						{
-							NetworkHandler.instance().sendTo( b, (EntityPlayerMP) g );
-						}
+					this.list.resetStatus();
 
-						if( !c.isEmpty() )
+					for( final Object g : this.listeners )
+					{
+						if( g instanceof EntityPlayer )
 						{
-							NetworkHandler.instance().sendTo( c, (EntityPlayerMP) g );
+							if( !a.isEmpty() )
+							{
+								NetworkHandler.instance().sendTo( a, (EntityPlayerMP) g );
+							}
+
+							if( !b.isEmpty() )
+							{
+								NetworkHandler.instance().sendTo( b, (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/ContainerInterface.java

@@ -19,6 +19,9 @@
 package appeng.container.implementations;
 
 
+import appeng.api.config.Upgrades;
+import appeng.container.slot.*;
+import appeng.util.Platform;
 import net.minecraft.entity.player.InventoryPlayer;
 
 import appeng.api.config.SecurityPermissions;
@@ -26,14 +29,11 @@ import appeng.api.config.Settings;
 import appeng.api.config.YesNo;
 import appeng.api.util.IConfigManager;
 import appeng.container.guisync.GuiSync;
-import appeng.container.slot.SlotFake;
-import appeng.container.slot.SlotNormal;
-import appeng.container.slot.SlotRestrictedInput;
 import appeng.helpers.DualityInterface;
 import appeng.helpers.IInterfaceHost;
 
 
-public class ContainerInterface extends ContainerUpgradeable
+public class ContainerInterface extends ContainerUpgradeable implements IOptionalSlotHost
 {
 
 	private final DualityInterface myDuality;
@@ -44,16 +44,22 @@ public class ContainerInterface extends ContainerUpgradeable
 	@GuiSync( 4 )
 	public YesNo iTermMode = YesNo.YES;
 
+	@GuiSync( 7 )
+	public int patternExpansions = 0;
+
 	public ContainerInterface( final InventoryPlayer ip, final IInterfaceHost te )
 	{
 		super( ip, te.getInterfaceDuality().getHost() );
 
 		this.myDuality = te.getInterfaceDuality();
 
-		for( int x = 0; x < DualityInterface.NUMBER_OF_PATTERN_SLOTS; x++ )
+		for (int row = 0 ; row < 4 ; ++row)
 		{
-			this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, this.myDuality
-					.getPatterns(), x, 8 + 18 * x, 90 + 7, this.getInventoryPlayer() ).setStackLimit( 1 ) );
+			for( int x = 0; x < 9; x++ )
+			{
+				this.addSlotToContainer( new OptionalSlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, this.myDuality
+						.getPatterns(), this, x + row * 9, 8 + 18 * x, 97 + ( 18 * row ), row, this.getInventoryPlayer() ).setStackLimit( 1 ) );
+			}
 		}
 
 		for( int x = 0; x < DualityInterface.NUMBER_OF_CONFIG_SLOTS; x++ )
@@ -70,7 +76,7 @@ public class ContainerInterface extends ContainerUpgradeable
 	@Override
 	protected int getHeight()
 	{
-		return 211;
+		return 256;
 	}
 
 	@Override
@@ -82,16 +88,35 @@ public class ContainerInterface extends ContainerUpgradeable
 	@Override
 	public int availableUpgrades()
 	{
-		return 1;
+		return 4;
+	}
+
+	@Override
+	public boolean isSlotEnabled( final int idx )
+	{
+		return myDuality.getInstalledUpgrades(Upgrades.PATTERN_EXPANSION) >= idx;
 	}
 
 	@Override
 	public void detectAndSendChanges()
 	{
 		this.verifyPermissions( SecurityPermissions.BUILD, false );
+
+		if (patternExpansions != getPatternUpgrades())
+		{
+			patternExpansions = getPatternUpgrades();
+			this.myDuality.dropExcessPatterns();
+		}
 		super.detectAndSendChanges();
 	}
 
+	@Override
+	public void onUpdate( final String field, final Object oldValue, final Object newValue ) {
+		super.onUpdate(field, oldValue, newValue);
+		if ( Platform.isClient() && field.equals("patternExpansions"))
+			this.myDuality.dropExcessPatterns();
+	}
+
 	@Override
 	protected void loadSettingsFromHost( final IConfigManager cm )
 	{
@@ -118,4 +143,9 @@ public class ContainerInterface extends ContainerUpgradeable
 	{
 		this.iTermMode = iTermMode;
 	}
+
+	public int getPatternUpgrades()
+	{
+		return this.myDuality.getInstalledUpgrades( Upgrades.PATTERN_EXPANSION );
+	}
 }

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

@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import appeng.api.config.Upgrades;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -215,35 +216,48 @@ 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 );
 
-			switch( action )
+			IItemHandler interfaceHandler = inv.server;
+			boolean canInsert = true;
+
+			switch ( action )
 			{
 				case PICKUP_OR_SET_DOWN:
-
 					if( hasItemInHand )
 					{
-						ItemStack inSlot = theSlot.getStackInSlot( 0 );
-						if( inSlot.isEmpty() )
+						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
 						{
-							player.inventory.setItemStack( interfaceSlot.addItems( player.inventory.getItemStack() ) );
-						}
-						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() )
+							if( Platform.itemComparisons().isSameItem( interfaceHandler.getStackInSlot( s ), player.inventory.getItemStack() ) )
 							{
-								player.inventory.setItemStack( inSlot );
+								canInsert = false;
+								break;
+							}
+						}
+						if( canInsert )
+						{
+							ItemStack inSlot = theSlot.getStackInSlot( 0 );
+							if( inSlot.isEmpty() )
+							{
+								player.inventory.setItemStack( interfaceSlot.addItems( player.inventory.getItemStack() ) );
 							}
 							else
 							{
-								player.inventory.setItemStack( inHand );
-								ItemHandlerUtil.setStackInSlot( theSlot, 0, inSlot );
+								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 );
+								}
 							}
 						}
 					}
@@ -254,17 +268,27 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 
 					break;
 				case SPLIT_OR_PLACE_SINGLE:
-
 					if( hasItemInHand )
 					{
-						ItemStack extra = playerHand.removeItems( 1, ItemStack.EMPTY, null );
-						if( !extra.isEmpty() && !interfaceSlot.containsItems())
+						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
 						{
-							extra = interfaceSlot.addItems( extra );
+							if( Platform.itemComparisons().isSameItem( interfaceHandler.getStackInSlot( s ), player.inventory.getItemStack() ) )
+							{
+								canInsert = false;
+								break;
+							}
 						}
-						if( !extra.isEmpty() )
+						if( canInsert )
 						{
-							playerHand.addItems( extra );
+							ItemStack extra = playerHand.removeItems( 1, ItemStack.EMPTY, null );
+							if( !extra.isEmpty() && !interfaceSlot.containsItems() )
+							{
+								extra = interfaceSlot.addItems( extra );
+							}
+							if( !extra.isEmpty() )
+							{
+								playerHand.addItems( extra );
+							}
 						}
 					}
 					else if( !is.isEmpty() )
@@ -380,7 +404,9 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 		{
 			tag.setLong( "sortBy", inv.sortBy );
 			tag.setString( "un", inv.unlocalizedName );
-			tag.setTag("pos", NBTUtil.createPosTag( inv.pos ) );
+			tag.setTag( "pos", NBTUtil.createPosTag( inv.pos ) );
+			tag.setInteger( "dim", inv.dim );
+			tag.setInteger( "numUpgrades", inv.numUpgrades );
 		}
 
 		for( int x = 0; x < length; x++ )
@@ -412,6 +438,8 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 		private final IItemHandler client;
 		private final IItemHandler server;
 		private final BlockPos pos;
+		private final int dim;
+		private final int numUpgrades;
 
 		public InvTracker( final DualityInterface dual, final IItemHandler patterns, final String unlocalizedName )
 		{
@@ -420,6 +448,8 @@ 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();
+			this.numUpgrades = dual.getInstalledUpgrades( Upgrades.PATTERN_EXPANSION);
 		}
 	}
 

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

@@ -23,6 +23,7 @@ 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;
@@ -51,12 +52,6 @@ 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;
@@ -132,6 +127,28 @@ 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

@@ -0,0 +1,18 @@
+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/AppEngSlot.java

@@ -157,7 +157,7 @@ public class AppEngSlot extends Slot
 	{
 		if( this.isSlotEnabled() )
 		{
-			return !this.itemHandler.extractItem( this.index, 1, true ).isEmpty();
+			return !this.itemHandler.extractItem( this.index, Integer.MAX_VALUE, true ).isEmpty();
 		}
 		return false;
 	}

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

@@ -0,0 +1,4 @@
+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
+public class SlotFake extends AppEngSlot implements IJEITargetSlot
 {
 
 	public SlotFake( final IItemHandler inv, final int idx, final int x, final int y )

src/main/java/appeng/core/Registration.java

@@ -363,6 +363,8 @@ final class Registration
 		// Interface
 		Upgrades.CRAFTING.registerItem( parts.iface(), 1 );
 		Upgrades.CRAFTING.registerItem( blocks.iface(), 1 );
+		Upgrades.PATTERN_EXPANSION.registerItem( parts.iface(), 3 );
+		Upgrades.PATTERN_EXPANSION.registerItem( blocks.iface(), 3 );
 
 		// IO Port!
 		Upgrades.SPEED.registerItem( blocks.iOPort(), 3 );

src/main/java/appeng/core/api/ApiStorage.java

@@ -175,7 +175,7 @@ public class ApiStorage implements IStorageHelper
 		@Override
 		public int transferFactor()
 		{
-			return 125;
+			return 1000;
 		}
 
 		@Override

src/main/java/appeng/core/api/definitions/ApiBlocks.java

@@ -616,7 +616,12 @@ public final class ApiBlocks implements IBlocks
 
 	private static IBlockDefinition makeStairs( String registryName, FeatureFactory registry, IBlockDefinition block )
 	{
-		return registry.block( registryName, () -> new BlockStairCommon( block.maybeBlock().get(), block.identifier() ) )
+		if( !block.maybeBlock().isPresent() )
+		{
+			return new BlockDefinition( registryName, null, null );
+		}
+
+		IBlockDefinition stairs = registry.block( registryName, () -> new BlockStairCommon( block.maybeBlock().get(), block.identifier() ) )
 				.features( AEFeature.DECORATIVE_BLOCKS )
 				.rendering( new BlockRenderingCustomizer()
 				{
@@ -629,6 +634,10 @@ public final class ApiBlocks implements IBlocks
 					}
 				} )
 				.build();
+
+		Verify.verify(stairs.maybeBlock().isPresent());
+
+		return stairs;
 	}
 
 	@Override

src/main/java/appeng/core/api/definitions/ApiMaterials.java

@@ -86,6 +86,7 @@ public final class ApiMaterials implements IMaterials
 	private final IItemDefinition cardRedstone;
 	private final IItemDefinition cardSpeed;
 	private final IItemDefinition cardCapacity;
+	private final IItemDefinition cardPatternExpansion;
 	private final IItemDefinition cardFuzzy;
 	private final IItemDefinition cardInverter;
 	private final IItemDefinition cardCrafting;
@@ -204,6 +205,7 @@ public final class ApiMaterials implements IMaterials
 		this.cardRedstone = new DamagedItemDefinition( "material.card.redstone", materials.createMaterial( MaterialType.CARD_REDSTONE ) );
 		this.cardSpeed = new DamagedItemDefinition( "material.card.acceleration", materials.createMaterial( MaterialType.CARD_SPEED ) );
 		this.cardCapacity = new DamagedItemDefinition( "material.card.capacity", materials.createMaterial( MaterialType.CARD_CAPACITY ) );
+		this.cardPatternExpansion = new DamagedItemDefinition( "material.card.pattern.expansion", materials.createMaterial(MaterialType.CARD_PATTERN_EXPANSION) );
 		this.cardFuzzy = new DamagedItemDefinition( "material.card.fuzzy", materials.createMaterial( MaterialType.CARD_FUZZY ) );
 		this.cardInverter = new DamagedItemDefinition( "material.card.inverter", materials.createMaterial( MaterialType.CARD_INVERTER ) );
 		this.cardCrafting = new DamagedItemDefinition( "material.card.crafting", materials.createMaterial( MaterialType.CARD_CRAFTING ) );
@@ -424,6 +426,9 @@ public final class ApiMaterials implements IMaterials
 		return this.cardCapacity;
 	}
 
+	@Override
+	public IItemDefinition cardPatternExpansion(){ return this.cardPatternExpansion;}
+
 	@Override
 	public IItemDefinition cardFuzzy()
 	{

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

@@ -164,7 +164,6 @@ 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,7 +20,16 @@ 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;
 
@@ -40,6 +49,7 @@ 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
@@ -57,6 +67,7 @@ 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 );
@@ -70,7 +81,6 @@ 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." );
@@ -101,6 +111,36 @@ 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 )
 	{
@@ -150,6 +190,48 @@ 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

@@ -29,6 +29,7 @@ import java.util.Iterator;
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.data.IItemList;
 import appeng.container.implementations.ContainerPatternTerm;
+import gregtech.common.items.MetaTool;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
@@ -171,6 +172,11 @@ public class PacketJEIRecipe extends AppEngPacket
 					// already the correct item?
 					ItemStack newItem = this.canUseInSlot( x, currentItem );
 
+					if ( !cct.useRealItems() && this.recipe[x] != null ) {
+						if (this.recipe[x].length > 0 )
+						currentItem.setCount( recipe[x][0].getCount() );
+					}
+
 					// put away old item
 					if( newItem != currentItem && security.hasPermission( player, SecurityPermissions.INJECT ) )
 					{
@@ -206,23 +212,21 @@ public class PacketJEIRecipe extends AppEngPacket
 									out = Platform.poweredExtraction( energy, storage, request, cct.getActionSource() );
 									if( out == null )
 									{
-										Collection<IAEItemStack> outList = inv.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).getStorageList().findFuzzy( request, FuzzyMode.IGNORE_ALL );
-										IAEItemStack mostDamaged = null;
-										for( IAEItemStack is : outList )
+										if( request.getItem().isDamageable() || ( Platform.isModLoaded( "gregtech" ) && request.getItem() instanceof MetaTool ) )
 										{
-											if( !is.isCraftable() )
+											Collection<IAEItemStack> outList = inv.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).getStorageList().findFuzzy( request, FuzzyMode.IGNORE_ALL );
+											for( IAEItemStack is : outList )
 											{
-												if( mostDamaged == null || mostDamaged.getItemDamage() < is.getItemDamage() )
+												if( is.getDefinition().getMetadata() == request.getDefinition().getMetadata() )
 												{
-													mostDamaged = is;
+													out = Platform.poweredExtraction( energy, storage, is.copy().setStackSize( 1 ), cct.getActionSource() );
+												}
+												if( out != null )
+												{
+													break;
 												}
 											}
 										}
-										if( mostDamaged != null )
-										{
-											mostDamaged.setStackSize( 1 );
-											out = Platform.poweredExtraction( energy, storage, mostDamaged, cct.getActionSource() );
-										}
 									}
 								}
 								else
@@ -280,6 +284,7 @@ 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] );
 				}
 			}
@@ -298,7 +303,7 @@ public class PacketJEIRecipe extends AppEngPacket
 		{
 			for( ItemStack option : this.recipe[slot] )
 			{
-				if( is.isItemEqual( option ) )
+				if( ItemStack.areItemStacksEqual( is, option ) )
 				{
 					return is;
 				}

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

@@ -130,7 +130,12 @@ public class CraftingTreeNode
 
 			if( this.parent.details.canSubstitute() )
 			{
-				itemList = inventoryList.findFuzzy( this.what, FuzzyMode.IGNORE_ALL );
+				final List<IAEItemStack> substitutes = this.parent.details.getSubstituteInputs(this.slot);
+				itemList = new ArrayList<>(substitutes.size());
+
+				for (IAEItemStack stack : substitutes) {
+					itemList.addAll(inventoryList.findFuzzy(stack, FuzzyMode.IGNORE_ALL));
+				}
 			}
 			else
 			{

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

@@ -305,7 +305,7 @@ public class CraftingTreeProcess
 
 	void getPlan( final IItemList<IAEItemStack> plan )
 	{
-		for( IAEItemStack i : this.details.getOutputs() )
+		for( IAEItemStack i : this.details.getCondensedOutputs() )
 		{
 			i = i.copy();
 			i.setCountRequestable( i.getStackSize() * this.crafts );

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

@@ -28,7 +28,9 @@ 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>
@@ -307,8 +309,15 @@ 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;
-					break;
+					if( !src.player().isPresent() ) break;
 				}
 			}
 		}

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

@@ -90,6 +90,13 @@ 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,6 +4,7 @@ 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;
@@ -23,7 +24,7 @@ import appeng.fluids.util.AEFluidStack;
 import appeng.fluids.util.IAEFluidTank;
 
 
-public class GuiFluidSlot extends GuiCustomSlot
+public class GuiFluidSlot extends GuiCustomSlot implements IJEITargetSlot
 {
 	private final IAEFluidTank fluids;
 	private final int slot;

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

@@ -446,7 +446,11 @@ public class ContainerFluidTerminal extends AEBaseContainer implements IConfigMa
 
 			if( notInserted != null && notInserted.getStackSize() > 0 )
 			{
-				AELog.error( "Fluid item [%s] reported a different possible amount to drain than it actually provided.", held.getDisplayName() );
+				IAEFluidStack spill = this.monitor.injectItems( notInserted, Actionable.MODULATE, this.getActionSource() );
+				if( spill != null && spill.getStackSize() > 0 )
+				{
+					fh.fill( spill.getFluidStack(), true );
+				}
 			}
 
 			player.inventory.setItemStack( fh.getContainer() );

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

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

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

@@ -19,24 +19,23 @@
 package appeng.helpers;
 
 
-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 java.util.*;
 
 import javax.annotation.Nullable;
 
+import appeng.api.definitions.IItemDefinition;
 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 net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
 import net.minecraft.init.Items;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
@@ -93,8 +92,6 @@ 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;
@@ -106,10 +103,6 @@ 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;
@@ -121,7 +114,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 
 	public static final int NUMBER_OF_STORAGE_SLOTS = 9;
 	public static final int NUMBER_OF_CONFIG_SLOTS = 9;
-	public static final int NUMBER_OF_PATTERN_SLOTS = 9;
+	public static final int NUMBER_OF_PATTERN_SLOTS = 36;
 
 	private static final Collection<Block> BAD_BLOCKS = new HashSet<>( 100 );
 	private final IAEItemStack[] requireWork = { null, null, null, null, null, null, null, null, null };
@@ -148,6 +141,8 @@ 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 )
@@ -155,7 +150,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		this.gridProxy = networkProxy;
 		this.gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL );
 
-		this.upgrades = new StackUpgradeInventory( this.gridProxy.getMachineRepresentation(), this, 1 );
+		this.upgrades = new StackUpgradeInventory( this.gridProxy.getMachineRepresentation(), this, 4);
 		this.cm.registerSetting( Settings.BLOCK, YesNo.NO );
 		this.cm.registerSetting( Settings.INTERFACE_TERMINAL, YesNo.YES );
 
@@ -183,7 +178,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			return;
 		}
-
 		if( inv == this.config )
 		{
 			this.readConfig();
@@ -242,6 +236,27 @@ 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 )
@@ -261,9 +276,44 @@ 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 );
+
+		// fix upgrade slot size mismatch
+		NBTTagCompound up = data.getCompoundTag( "upgrades" );
+		if( up.hasKey( "Size" ) && up.getInteger( "Size" ) != this.upgrades.getSlots() )
+		{
+			up.setInteger( "Size", this.upgrades.getSlots() );
+			this.upgrades.writeToNBT( up, "upgrades" );
+		}
+
 		this.upgrades.readFromNBT( data, "upgrades" );
 		this.config.readFromNBT( data, "config" );
+
+		NBTTagCompound pa = data.getCompoundTag( "patterns" );
+		if( pa.hasKey( "Size" ) && pa.getInteger( "Size" ) != this.patterns.getSlots() )
+		{
+			pa.setInteger( "Size", this.patterns.getSlots() );
+			this.upgrades.writeToNBT( pa, "patterns" );
+		}
+
 		this.patterns.readFromNBT( data, "patterns" );
 		this.storage.readFromNBT( data, "storage" );
 		this.priority = data.getInteger( "priority" );
@@ -296,6 +346,30 @@ 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;
@@ -342,9 +416,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 
 	private void updateCraftingList()
 	{
-		final Boolean[] accountedFor = { false, false, false, false, false, false, false, false, false }; // 9...
-
-		assert ( accountedFor.length == this.patterns.getSlots() );
+		final Boolean[] accountedFor = new Boolean[this.patterns.getSlots()];
+		Arrays.fill( accountedFor, false );
 
 		if( !this.gridProxy.isReady() )
 		{
@@ -359,7 +432,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				final ICraftingPatternDetails details = i.next();
 				boolean found = false;
 
-				for( int x = 0; x < accountedFor.length; x++ )
+				for( int x = 0; x < accountedFor.length ; x++ )
 				{
 					final ItemStack is = this.patterns.getStackInSlot( x );
 					if( details.getPattern() == is )
@@ -375,7 +448,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			}
 		}
 
-		for( int x = 0; x < accountedFor.length; x++ )
+		for( int x = 0; x < accountedFor.length ; x++ )
 		{
 			if( !accountedFor[x] )
 			{
@@ -393,24 +466,22 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		}
 	}
 
-	private boolean hasWorkToDo()
-	{
-		if( this.hasItemsToSend() )
-		{
+	private boolean hasWorkToDo() {
+
+		if (hasItemsToSend()){
 			return true;
 		}
-		else
-		{
-			for( final IAEItemStack requiredWork : this.requireWork )
-			{
-				if( requiredWork != null )
-				{
-					return true;
-				}
-			}
 
-			return false;
+		if(hasItemsToSendFacing()){
+			return true;
 		}
+
+		for (final IAEItemStack requiredWork : this.requireWork) {
+			if (requiredWork != null) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 	private void updatePlan( final int slot )
@@ -515,6 +586,45 @@ 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;
+	}
+
+	public void dropExcessPatterns()
+	{
+		IItemHandler patterns = getPatterns();
+
+		List<ItemStack> dropList = new ArrayList<>();
+		for( int invSlot = 0; invSlot < patterns.getSlots(); invSlot++ )
+		{
+			if( invSlot >= 9 + ( this.getInstalledUpgrades( Upgrades.PATTERN_EXPANSION ) ) * 9 )
+			{
+				ItemStack is = patterns.getStackInSlot( invSlot );
+				if( is.isEmpty() ) continue;
+				dropList.add( patterns.extractItem( invSlot, Integer.MAX_VALUE, false ) );
+			}
+		}
+		if( dropList.size() > 1 )
+		{
+			World world = this.getLocation().getWorld();
+			BlockPos blockPos = this.getLocation().getPos();
+			Platform.spawnDrops( world, blockPos, dropList );
+		}
+
+		this.gridProxy.setIdlePowerUsage( Math.pow( 4, ( this.getInstalledUpgrades( Upgrades.PATTERN_EXPANSION ) ) ) );
+	}
+
 	@Override
 	public boolean canInsert( final ItemStack stack )
 	{
@@ -586,11 +696,21 @@ 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;
 	}
@@ -651,6 +771,47 @@ 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;
@@ -913,13 +1074,9 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		};
 	}
 
-	private static boolean invIsBlocked( InventoryAdaptor inv )
+	private boolean invIsBlocked( InventoryAdaptor inv )
 	{
-		if( AEConfig.instance().isFeatureEnabled( AEFeature.INSANE_BLOCKING_MODE ) )
-		{
-			return !inv.simulateRemove( 1, ItemStack.EMPTY, null ).isEmpty();
-		}
-		else return inv.containsItems();
+		return  (inv.containsItems());
 	}
 
 	private static boolean invIsBlockedGTCE( GTCEInventoryAdaptor inv )
@@ -930,7 +1087,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	@Override
 	public boolean pushPattern( final ICraftingPatternDetails patternDetails, final InventoryCrafting table )
 	{
-		if( this.hasItemsToSend() || !this.gridProxy.isActive() || !this.craftingList.contains( patternDetails ) )
+		if( this.hasItemsToSend() || this.hasItemsToSendFacing() || !this.gridProxy.isActive() || !this.craftingList.contains( patternDetails ) )
 		{
 			return false;
 		}
@@ -938,8 +1095,12 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		final TileEntity tile = this.iHost.getTileEntity();
 		final World w = tile.getWorld();
 
-		final EnumSet<EnumFacing> possibleDirections = this.iHost.getTargets();
-		for( final EnumFacing s : possibleDirections )
+		if( this.visitedFaces.isEmpty() )
+		{
+			this.visitedFaces = this.iHost.getTargets();
+		}
+
+		for( final EnumFacing s : visitedFaces )
 		{
 			final TileEntity te = w.getTileEntity( tile.getPos().offset( s ) );
 			if( te instanceof IInterfaceHost )
@@ -948,6 +1109,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				{
 					if( ( (IInterfaceHost) te ).getInterfaceDuality().sameGrid( this.gridProxy.getGrid() ) )
 					{
+						visitedFaces.remove( s );
 						continue;
 					}
 				}
@@ -962,6 +1124,7 @@ 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;
@@ -975,53 +1138,67 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			{
 				if( this.isBlocking() )
 				{
-					if( te.getBlockType().getRegistryName().getResourceDomain().equals( "gregtech" ) )
+					IPhantomTile phantomTE = null;
+					if( Loader.isModLoaded( "actuallyadditions" ) && Loader.isModLoaded( "gregtech" ) && te instanceof IPhantomTile )
 					{
-						GTad = GTCEInventoryAdaptor.getAdaptor( te, s.getOpposite() );
-						if( invIsBlockedGTCE( GTad ) )
+						phantomTE = ( (IPhantomTile) te );
+						if( phantomTE.hasBoundPosition() )
 						{
+							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
+
+					else if( invIsBlocked( ad ) )
 					{
-						if( invIsBlocked( ad ) )
-						{
-							continue;
-						}
+						visitedFaces.remove( s );
+						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() )
 						{
-							final ItemStack added = ad.addItems( is );
-							this.addToSendList( added );
+							addToSendListFacing( is, s );
 						}
 					}
-					this.pushItemsOut( possibleDirections );
+					pushItemsOut( s );
 					return true;
 				}
 			}
+			visitedFaces.remove( s );
 		}
-
 		return false;
 	}
 
 	@Override
 	public boolean isBusy()
 	{
-		if( this.hasItemsToSend() )
+		boolean busy = false;
+
+		if( this.hasItemsToSend() || hasItemsToSendFacing() )
 		{
 			return true;
 		}
 
-		boolean busy = false;
-
 		if( this.isBlocking() )
 		{
 			final EnumSet<EnumFacing> possibleDirections = this.iHost.getTargets();
@@ -1033,27 +1210,38 @@ 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( te.getBlockType().getRegistryName().getResourceDomain().equals( "gregtech" ) )
+					if( Loader.isModLoaded( "actuallyadditions") && Loader.isModLoaded( "gregtech" ) && te instanceof IPhantomTile )
 					{
-						GTad = GTCEInventoryAdaptor.getAdaptor( te, s.getOpposite() );
-						if( !invIsBlockedGTCE( GTad ) )
+						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 ) )
 						{
 							allAreBusy = false;
 							break;
 						}
 					}
-					else
-					{
-						if( !invIsBlocked( ad ) )
-						{
-							allAreBusy = false;
-							break;
-						}
 
+					else if( !invIsBlocked( ad ) )
+					{
+						allAreBusy = false;
+						break;
 					}
 				}
 			}
@@ -1062,6 +1250,12 @@ 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();
@@ -1117,6 +1311,20 @@ 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,10 +26,11 @@ public class HighlighterHandler
             return;
         }
         Minecraft mc = Minecraft.getMinecraft();
+        int dimension = mc.world.provider.getDimension();
         long time = System.currentTimeMillis();
 
-        if (time > BlockPosHighlighter.getExpireHilight()) {
-            BlockPosHighlighter.hilightBlock(null, -1);
+        if (time > BlockPosHighlighter.getExpireHilight() || dimension != BlockPosHighlighter.getDimension()) {
+            BlockPosHighlighter.hilightBlock(null, -1, BlockPosHighlighter.getDimension() );
             return;
         }
 
@@ -61,6 +62,7 @@ public class HighlighterHandler
         tessellator.draw();
 
         GlStateManager.enableTexture2D();
+        GlStateManager.enableDepth();
         GlStateManager.popMatrix();
     }
 

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

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

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

@@ -19,21 +19,18 @@
 package appeng.helpers;
 
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringJoiner;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.NonNullList;
 import net.minecraft.world.World;
 
 import appeng.api.AEApi;
@@ -46,11 +43,17 @@ import appeng.core.AELog;
 import appeng.core.features.AEFeature;
 import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
+import net.minecraftforge.common.crafting.IShapedRecipe;
 
 
 public class PatternHelper implements ICraftingPatternDetails, Comparable<PatternHelper>
 {
 
+	private static final int CRAFTING_GRID_DIMENSION = 3;
+	private static final int ALL_INPUT_LIMIT = CRAFTING_GRID_DIMENSION * CRAFTING_GRID_DIMENSION;
+	private static final int CRAFTING_OUTPUT_LIMIT = 1;
+	private static final int PROCESSING_OUTPUT_LIMIT = 3;
+
 	private final ItemStack patternItem;
 	private final InventoryCrafting crafting = new InventoryCrafting( new ContainerNull(), 3, 3 );
 	private final InventoryCrafting testFrame = new InventoryCrafting( new ContainerNull(), 3, 3 );
@@ -60,6 +63,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 	private final IAEItemStack[] condensedOutputs;
 	private final IAEItemStack[] inputs;
 	private final IAEItemStack[] outputs;
+	private final Map<Integer, List<IAEItemStack>> substituteInputs;
 	private final boolean isCrafting;
 	private final boolean canSubstitute;
 	private final Set<TestLookup> failCache = new HashSet<>();
@@ -143,9 +147,11 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 				}
 			}
 		}
+		final int outputLength = this.isCrafting ? CRAFTING_OUTPUT_LIMIT : PROCESSING_OUTPUT_LIMIT;
 
-		this.outputs = out.toArray( new IAEItemStack[out.size()] );
-		this.inputs = in.toArray( new IAEItemStack[in.size()] );
+		this.inputs = in.toArray(new IAEItemStack[ALL_INPUT_LIMIT]);
+		this.outputs = out.toArray(new IAEItemStack[outputLength]);
+		this.substituteInputs = new HashMap<>(ALL_INPUT_LIMIT);
 
 		final Map<IAEItemStack, IAEItemStack> tmpOutputs = new HashMap<>();
 
@@ -257,6 +263,14 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 
 		this.testFrame.setInventorySlotContents( slotIndex, i );
 
+		// If we cannot substitute, the items must match exactly
+		if (!canSubstitute && slotIndex < inputs.length) {
+			if (!inputs[slotIndex].isSameType(i)) {
+				this.markItemAs(slotIndex, i, TestStatus.DECLINE);
+				return false;
+			}
+		}
+
 		if( this.standardRecipe.matches( this.testFrame, w ) )
 		{
 			final ItemStack testOutput = this.standardRecipe.getCraftingResult( this.testFrame );
@@ -268,25 +282,6 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 				return true;
 			}
 		}
-		else if( AEConfig.instance().isFeatureEnabled( AEFeature.CRAFTING_MANAGER_FALLBACK ) )
-		{
-			final ItemStack testOutput = CraftingManager.findMatchingResult( this.testFrame, w );
-
-			if( Platform.itemComparisons().isSameItem( this.correctOutput, testOutput ) )
-			{
-				this.testFrame.setInventorySlotContents( slotIndex, this.crafting.getStackInSlot( slotIndex ) );
-				this.markItemAs( slotIndex, i, TestStatus.ACCEPT );
-
-				if( AELog.isCraftingDebugLogEnabled() )
-				{
-					this.warnAboutCraftingManager( true );
-				}
-
-				return true;
-			}
-
-			this.warnAboutCraftingManager( false );
-		}
 
 		this.markItemAs( slotIndex, i, TestStatus.DECLINE );
 		return false;
@@ -328,6 +323,97 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 		return this.canSubstitute;
 	}
 
+	@Override
+	public List<IAEItemStack> getSubstituteInputs(int slot) {
+		if (this.inputs[slot] == null) {
+			return Collections.emptyList();
+		}
+
+		return this.substituteInputs.computeIfAbsent(slot, value -> {
+			ItemStack[] matchingStacks = getRecipeIngredient(slot).getMatchingStacks();
+			List<IAEItemStack> itemList = new ArrayList<>(matchingStacks.length + 1);
+			for (ItemStack matchingStack : matchingStacks) {
+				itemList.add(AEItemStack.fromItemStack(matchingStack));
+			}
+
+			// Ensure that the specific item put in by the user is at the beginning,
+			// so that it takes precedence over substitutions
+			itemList.add(0, this.inputs[slot]);
+			return itemList;
+		});
+	}
+
+	/**
+	 * Gets the {@link Ingredient} from the actual used recipe for a given slot-index into {@link #getInputs()}.
+	 * <p/>
+	 * Conversion is needed for two reasons: our sparse ingredients are always organized in a 3x3 grid, while Vanilla's
+	 * ingredient list will be condensed to the actual recipe's grid size. In addition, in our 3x3 grid, the user can
+	 * shift the actual recipe input to the right and down.
+	 */
+	private Ingredient getRecipeIngredient(int slot) {
+
+		if (standardRecipe instanceof IShapedRecipe ) {
+			IShapedRecipe shapedRecipe = (IShapedRecipe) standardRecipe;
+
+			return getShapedRecipeIngredient(slot, shapedRecipe.getRecipeWidth());
+		} else {
+			return getShapelessRecipeIngredient(slot);
+		}
+	}
+
+	private Ingredient getShapedRecipeIngredient(int slot, int recipeWidth) {
+		// Compute the offset of the user's input vs. crafting grid origin
+		// Which is >0 if they have empty rows above or to the left of their input
+		int topOffset = 0;
+		if (inputs[0] == null && inputs[1] == null && inputs[2] == null) {
+			topOffset++; // First row is fully empty
+			if (inputs[3] == null && inputs[4] == null && inputs[5] == null) {
+				topOffset++; // Second row is fully empty
+			}
+		}
+		int leftOffset = 0;
+		if (inputs[0] == null && inputs[3] == null && inputs[6] == null) {
+			leftOffset++; // First column is fully empty
+			if (inputs[1] == null && inputs[4] == null && inputs[7] == null) {
+				leftOffset++; // Second column is fully empty
+			}
+		}
+
+		// Compute the x,y of the slot, as-if the recipe was anchored to 0,0
+		int slotX = slot % CRAFTING_GRID_DIMENSION - leftOffset;
+		int slotY = slot / CRAFTING_GRID_DIMENSION - topOffset;
+
+		// Compute the index into the recipe's ingredient list now
+		int ingredientIndex = slotY * recipeWidth + slotX;
+
+		NonNullList<Ingredient> ingredients = standardRecipe.getIngredients();
+
+		if (ingredientIndex < 0 || ingredientIndex > ingredients.size()) {
+			return Ingredient.EMPTY;
+		}
+
+		return ingredients.get(ingredientIndex);
+	}
+
+	private Ingredient getShapelessRecipeIngredient(int slot) {
+		// We map the list of *filled* sparse inputs to the shapeless (ergo unordered)
+		// ingredients. While these do not actually correspond to each other,
+		// since both lists have the same length, the mapping is at least stable.
+		int ingredientIndex = 0;
+		for (int i = 0; i < slot; i++) {
+			if (inputs[i] != null) {
+				ingredientIndex++;
+			}
+		}
+
+		NonNullList<Ingredient> ingredients = standardRecipe.getIngredients();
+		if (ingredientIndex < ingredients.size()) {
+			return ingredients.get(ingredientIndex);
+		}
+
+		return Ingredient.EMPTY;
+	}
+	
 	@Override
 	public ItemStack getOutput( final InventoryCrafting craftingInv, final World w )
 	{
@@ -406,24 +492,6 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 		return this.pattern.hashCode();
 	}
 
-	private void warnAboutCraftingManager( boolean foundAlternative )
-	{
-		final String foundAlternativeRecipe = foundAlternative ? "Found alternative recipe." : "NOT FOUND, please report.";
-
-		final StringJoiner joinActualInputs = new StringJoiner( ", " );
-		for( int j = 0; j < this.testFrame.getSizeInventory(); j++ )
-		{
-			final ItemStack stack = this.testFrame.getStackInSlot( j );
-			if( !stack.isEmpty() )
-			{
-				joinActualInputs.add( stack.toString() );
-			}
-		}
-
-		AELog.warn( "Using CraftingManager fallback: Recipe <%s> for output <%s> rejected inputs [%s]. %s",
-				this.standardRecipe.getRegistryName(), this.standardRecipe.getRecipeOutput(), joinActualInputs, foundAlternativeRecipe );
-	}
-
 	@Override
 	public boolean equals( final Object obj )
 	{

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,57 +1,58 @@
-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;
-    }
-}
+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 );
+    }
+}

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

@@ -19,6 +19,8 @@
 package appeng.integration.modules.jei;
 
 
+import javax.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -27,14 +29,11 @@ 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;
 
@@ -57,6 +56,9 @@ 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 )
 	{
@@ -95,8 +97,9 @@ public class JEIPlugin implements IModPlugin
 				.addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerPatternTerm.class ),
 						Constants.UNIVERSAL_RECIPE_TRANSFER_UID );
 
-		AEGuiHandler aeGuiHandler = new AEGuiHandler();
+		aeGuiHandler = new AEGuiHandler();
 		registry.addAdvancedGuiHandlers(aeGuiHandler);
+		registry.addGhostIngredientHandler( aeGuiHandler.getGuiContainerClass(), aeGuiHandler);
 	}
 
 	private void registerDescriptions( IDefinitions definitions, IModRegistry registry )
@@ -219,5 +222,6 @@ 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,6 +27,7 @@ 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;
@@ -73,24 +74,7 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 	{
 		final String recipeType = recipeLayout.getRecipeCategory().getUid();
 
-		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
+		if (recipeType.equals( VanillaRecipeCategoryUid.INFORMATION) || recipeType.equals(VanillaRecipeCategoryUid.FUEL))
 		{
 			return RecipeTransferErrorInternal.INSTANCE;
 		}
@@ -100,6 +84,30 @@ 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/items/materials/ItemMaterial.java

@@ -164,6 +164,8 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent,
 				return Upgrades.INVERTER;
 			case CARD_CRAFTING:
 				return Upgrades.CRAFTING;
+			case CARD_PATTERN_EXPANSION:
+				return Upgrades.PATTERN_EXPANSION;
 			default:
 				return null;
 		}

src/main/java/appeng/items/materials/MaterialType.java

@@ -118,7 +118,10 @@ public enum MaterialType
 	FLUID_CELL1K_PART( 54, "material_fluid_cell1k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
 	FLUID_CELL4K_PART( 55, "material_fluid_cell4k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
 	FLUID_CELL16K_PART( 56, "material_fluid_cell16k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
-	FLUID_CELL64K_PART( 57, "material_fluid_cell64k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) );
+	FLUID_CELL64K_PART( 57, "material_fluid_cell64k_part", EnumSet.of( AEFeature.STORAGE_CELLS ) ),
+
+	CARD_PATTERN_EXPANSION( 58, "material_card_pattern_expansion", EnumSet.of( AEFeature.ADVANCED_CARDS ) );
+
 
 	private final Set<AEFeature> features;
 	private final ModelResourceLocation model;

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

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

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

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

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

@@ -42,6 +42,10 @@ 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;
@@ -105,8 +109,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 Map<ICraftingPatternDetails, List<ICraftingMedium>> craftingMethods = new HashMap<>();
-	private final Map<IAEItemStack, ImmutableList<ICraftingPatternDetails>> craftableItems = new HashMap<>();
+	private final Object2ObjectMap<ICraftingPatternDetails, List<ICraftingMedium>> craftingMethods = new Object2ObjectOpenHashMap<>();
+	private final Object2ObjectMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> craftableItems = new Object2ObjectOpenHashMap<>();
 	private final Set<IAEItemStack> emitableItems = new HashSet<>();
 	private final Map<String, CraftingLinkNexus> craftingLinks = new HashMap<>();
 	private final Multimap<IAEStack, CraftingWatcher> interests = HashMultimap.create();
@@ -160,11 +164,11 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	{
 		if( machine instanceof ICraftingWatcherHost )
 		{
-			final ICraftingWatcher craftingWatcher = this.craftingWatchers.get( machine );
+			final ICraftingWatcher craftingWatcher = this.craftingWatchers.get( gridNode );
 			if( craftingWatcher != null )
 			{
 				craftingWatcher.reset();
-				this.craftingWatchers.remove( machine );
+				this.craftingWatchers.remove( gridNode );
 			}
 		}
 
@@ -270,7 +274,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 			return;
 		}
 
-		final Map<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = this.craftableItems;
+		final Object2ObjectMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = this.craftableItems;
 
 		// erase list.
 		this.craftingMethods.clear();
@@ -287,22 +291,22 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 			provider.provideCrafting( this );
 		}
 
-		final Map<IAEItemStack, Set<ICraftingPatternDetails>> tmpCraft = new HashMap<>();
+		final Object2ObjectMap<IAEItemStack, ObjectSet<ICraftingPatternDetails>> tmpCraft = new Object2ObjectOpenHashMap<>();
 
 		// new craftables!
 		for( final ICraftingPatternDetails details : this.craftingMethods.keySet() )
 		{
-			for( IAEItemStack out : details.getOutputs() )
+			for( IAEItemStack out : details.getCondensedOutputs() )
 			{
 				out = out.copy();
 				out.reset();
 				out.setCraftable( true );
 
-				Set<ICraftingPatternDetails> methods = tmpCraft.get( out );
+				ObjectSet<ICraftingPatternDetails> methods = tmpCraft.get( out );
 
 				if( methods == null )
 				{
-					tmpCraft.put( out, methods = new TreeSet<>( COMPARATOR ) );
+					tmpCraft.put( out, methods = new ObjectRBTreeSet<>( COMPARATOR ) );
 				}
 
 				methods.add( details );
@@ -310,7 +314,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 		}
 
 		// make them immutable
-		for( final Entry<IAEItemStack, Set<ICraftingPatternDetails>> e : tmpCraft.entrySet() )
+		for( final Entry<IAEItemStack, ObjectSet<ICraftingPatternDetails>> e : tmpCraft.entrySet() )
 		{
 			this.craftableItems.put( e.getKey(), ImmutableList.copyOf( e.getValue() ) );
 		}
@@ -635,7 +639,11 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 
 	public boolean hasCpu( final ICraftingCPU cpu )
 	{
-		return this.craftingCPUClusters.contains( cpu );
+		if (cpu instanceof CraftingCPUCluster)
+		{
+			return this.craftingCPUClusters.contains( (CraftingCPUCluster) cpu );
+		}
+		return false;
 	}
 
 	public GenericInterestManager<CraftingWatcher> getInterestManager()

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

@@ -30,6 +30,7 @@ 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;
@@ -63,7 +64,7 @@ import appeng.me.energy.EnergyWatcher;
 public class EnergyGridCache implements IEnergyGrid
 {
 
-	private static final double MAX_BUFFER_STORAGE = 200;
+	private static final double MAX_BUFFER_STORAGE = 800;
 	private static final Comparator<IEnergyGridProvider> COMPARATOR_HIGHEST_AMOUNT_STORED_FIRST = ( o1, o2 ) -> Double.compare( o2.getProviderStoredEnergy(),
 			o1.getProviderStoredEnergy() );
 
@@ -76,9 +77,24 @@ 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<>();
@@ -110,6 +126,10 @@ 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 )
 	{
@@ -143,18 +163,32 @@ public class EnergyGridCache implements IEnergyGrid
 	{
 		if( ev.storage.isAEPublicPowerStorage() )
 		{
-			switch( ev.type )
+			switch ( ev.type )
 			{
 				case PROVIDE_POWER:
 					if( ev.storage.getPowerFlow() != AccessRestriction.WRITE )
 					{
-						this.providers.add( ev.storage );
+						if( !ongoingExtractOperation )
+						{
+							addProvider( ev.storage );
+						}
+						else
+						{
+							this.providersToAdd.add( ev.storage );
+						}
 					}
 					break;
 				case REQUEST_POWER:
 					if( ev.storage.getPowerFlow() != AccessRestriction.READ )
 					{
-						this.requesters.add( ev.storage );
+						if( !ongoingInjectOperation )
+						{
+							addRequester( ev.storage );
+						}
+						else
+						{
+							this.requesterToAdd.add( ev.storage );
+						}
 					}
 					break;
 			}
@@ -168,6 +202,23 @@ 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;
@@ -303,18 +354,30 @@ public class EnergyGridCache implements IEnergyGrid
 
 		final Iterator<IAEPowerStorage> it = this.providers.iterator();
 
-		while( extractedPower < amt && it.hasNext() )
+		ongoingExtractOperation = true;
+		try
 		{
-			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 )
+			while ( extractedPower < amt && it.hasNext() )
 			{
-				it.remove();
+				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();
+				}
 			}
+		} finally {
+			ongoingExtractOperation = false;
 		}
 
 		final double result = Math.min( extractedPower, amt );
@@ -340,15 +403,29 @@ public class EnergyGridCache implements IEnergyGrid
 
 		final Iterator<IAEPowerStorage> it = this.requesters.iterator();
 
-		while( amt > 0 && it.hasNext() )
+		ongoingInjectOperation = true;
+		try
 		{
-			final IAEPowerStorage node = it.next();
-			amt = node.injectAEPower( amt, mode );
-
-			if( amt > 0 && mode == Actionable.MODULATE )
+			while ( amt > 0 && it.hasNext() )
 			{
-				it.remove();
+				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();
+				}
 			}
+		} finally
+		{
+			ongoingInjectOperation = false;
 		}
 
 		final double overflow = Math.max( 0.0, amt );
@@ -428,7 +505,7 @@ public class EnergyGridCache implements IEnergyGrid
 	@Override
 	public double getStoredPower()
 	{
-		if( this.availableTicksSinceUpdate > 90 )
+		if( this.availableTicksSinceUpdate > 2 )
 		{
 			this.refreshPower();
 		}
@@ -505,9 +582,22 @@ public class EnergyGridCache implements IEnergyGrid
 					this.globalMaxPower -= ps.getAEMaxPower();
 					this.globalAvailablePower -= ps.getAECurrentPower();
 				}
-
-				this.providers.remove( ps );
-				this.requesters.remove( ps );
+				if( !ongoingExtractOperation )
+				{
+					removeProvider( ps );
+				}
+				else
+				{
+					this.providerToRemove.add( ps );
+				}
+				if( !ongoingInjectOperation )
+				{
+					removeRequester( ps );
+				}
+				else
+				{
+					this.requesterToRemove.add( ps );
+				}
 			}
 		}
 
@@ -523,6 +613,31 @@ 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 )
 	{
@@ -554,12 +669,26 @@ public class EnergyGridCache implements IEnergyGrid
 				if( current > 0 && ps.getPowerFlow() != AccessRestriction.WRITE )
 				{
 					this.globalAvailablePower += current;
-					this.providers.add( ps );
+					if( !ongoingExtractOperation )
+					{
+						addProvider( ps );
+					}
+					else
+					{
+						this.providersToAdd.add( ps );
+					}
 				}
 
 				if( current < max && ps.getPowerFlow() != AccessRestriction.READ )
 				{
-					this.requesters.add( ps );
+					if( !ongoingInjectOperation )
+					{
+						addRequester( ps );
+					}
+					else
+					{
+						this.requesterToAdd.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( machine );
+			final IStackWatcher myWatcher = this.watchers.get( node );
 
 			if( myWatcher != null )
 			{
 				myWatcher.reset();
-				this.watchers.remove( machine );
+				this.watchers.remove( node );
 			}
 		}
 	}

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

@@ -44,6 +44,8 @@ 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>
@@ -58,7 +60,7 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 	@Nonnull
 	private final IItemList<T> cachedList;
 	@Nonnull
-	private final Map<IMEMonitorHandlerReceiver<T>, Object> listeners;
+	private final Object2ObjectMap<IMEMonitorHandlerReceiver<T>, Object> listeners;
 
 	private boolean sendEvent = false;
 	private boolean hasChanged = false;
@@ -70,7 +72,7 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 		this.myGridCache = cache;
 		this.myChannel = chan;
 		this.cachedList = chan.createList();
-		this.listeners = new HashMap<>();
+		this.listeners = new Object2ObjectOpenHashMap<>();
 	}
 
 	@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( nodes ) )
+			if( !this.semiOpen.contains( (IPathItem) nodes ) )
 			{
 				final IGridBlock gb = nodes.getGridBlock();
 				final EnumSet<GridFlags> flags = gb.getFlags();

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

@@ -100,50 +100,36 @@ public class TickManagerCache implements ITickManager
 				this.upcomingTicks.poll();
 
 				final int diff = (int) ( this.currentTick - tt.getLastTick() );
+				final TickRateModulation mod = tt.getGridTickable().tickingRequest( tt.getNode(), diff );
 
-				if( tt.getGridTickable() instanceof PartLevelEmitter )
+				switch ( mod )
 				{
-					laterTicker.put( tt.getNode(), tt );
-				} else
-				{
-
-					final TickRateModulation mod = tt.getGridTickable().tickingRequest( tt.getNode(), diff );
-
-					switch ( mod )
-					{
-						case FASTER:
-							tt.setCurrentRate( tt.getCurrentRate() - 2 );
-							break;
-						case IDLE:
-							tt.setCurrentRate( tt.getRequest().maxTickRate );
-							break;
-						case SAME:
-							break;
-						case SLEEP:
-							this.sleepDevice( tt.getNode() );
-							break;
-						case SLOWER:
-							tt.setCurrentRate( tt.getCurrentRate() + 1 );
-							break;
-						case URGENT:
-							tt.setCurrentRate( 0 );
-							break;
-						default:
-							break;
-					}
+					case FASTER:
+						tt.setCurrentRate( tt.getCurrentRate() - 2 );
+						break;
+					case IDLE:
+						tt.setCurrentRate( tt.getRequest().maxTickRate );
+						break;
+					case SAME:
+						break;
+					case SLEEP:
+						this.sleepDevice( tt.getNode() );
+						break;
+					case SLOWER:
+						tt.setCurrentRate( tt.getCurrentRate() + 1 );
+						break;
+					case URGENT:
+						tt.setCurrentRate( 0 );
+						break;
+					default:
+						break;
 				}
+
 				if( this.awake.containsKey( tt.getNode() ) )
 				{
 					this.addToQueue( tt );
 				}
 			}
-			Iterator<Map.Entry<IGridNode, TickTracker>> ltIterator = laterTicker.entrySet().iterator();
-			while ( ltIterator.hasNext() )
-			{
-				Map.Entry<IGridNode, TickTracker> tickTracker = ltIterator.next();
-				tickTracker.getValue().getGridTickable().tickingRequest( tickTracker.getKey(), 1 );
-				ltIterator.remove();
-			}
 		}
 		catch( final Throwable t )
 		{
@@ -152,6 +138,7 @@ public class TickManagerCache implements ITickManager
 			tt.addEntityCrashInfo( crashreportcategory );
 			throw new ReportedException( crashreport );
 		}
+		PartLevelEmitter.wipeCache();
 	}
 
 	private void addToQueue( final TickTracker tt )

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

@@ -19,14 +19,13 @@
 package appeng.me.cluster.implementations;
 
 
-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.*;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
+import appeng.api.config.Upgrades;
+import appeng.helpers.DualityInterface;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 
 import net.minecraft.inventory.InventoryCrafting;
@@ -34,8 +33,6 @@ 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;
@@ -93,6 +90,7 @@ 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;
@@ -238,8 +236,9 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 
 	public IAEItemStack injectItems( final IAEItemStack input, final Actionable type, final IActionSource src )
 	{
-		if( !( input instanceof IAEItemStack ) )
-		{
+		// 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) {
 			return input;
 		}
 
@@ -297,7 +296,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 				{
 					is.decStackSize( what.getStackSize() );
 
-					this.updateElapsedTime( what );
+					this.updateRemainingItemCount( what );
 					this.markDirty();
 					this.postCraftingStatusChange( what.copy().setStackSize( -what.getStackSize() ) );
 
@@ -436,6 +435,11 @@ 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;
@@ -490,22 +494,87 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 		return null;
 	}
 
-	private boolean canCraft( final ICraftingPatternDetails details, final IAEItemStack[] condensedInputs )
+	private boolean canCraft(final ICraftingPatternDetails details, final IAEItemStack[] condensedInputs)
 	{
-		for( IAEItemStack g : condensedInputs )
+		if( !details.isCraftable() )
 		{
+			// Processing patterns are relatively easy
+			for ( IAEItemStack input : condensedInputs )
+			{
+				final IAEItemStack ais = this.inventory.extractItems( input.copy(), Actionable.SIMULATE,
+						this.machineSrc );
 
-			if( details.isCraftable() )
+				if( ais == null || ais.getStackSize() < input.getStackSize() )
+				{
+					return false;
+				}
+			}
+		}
+		else if( details.canSubstitute() )
+		{
+			// When substitutions are allowed, we have to keep track of which items we've reserved
+			IAEItemStack[] inputs = details.getInputs();
+			Map<IAEItemStack, Integer> consumedCount = new HashMap<>();
+			for ( int i = 0; i < inputs.length; i++ )
+			{
+				List<IAEItemStack> substitutes = details.getSubstituteInputs( i );
+				if( substitutes.isEmpty() )
+				{
+					continue;
+				}
+
+				boolean found = false;
+				for ( IAEItemStack substitute : substitutes )
+				{
+					for ( IAEItemStack fuzz : this.inventory.getItemList().findFuzzy( substitute, FuzzyMode.IGNORE_ALL ) )
+					{
+						int alreadyConsumed = consumedCount.getOrDefault( fuzz, 0 );
+						if( fuzz.getStackSize() - alreadyConsumed <= 0 )
+						{
+							continue; // Already fully consumed by a previous slot of this recipe
+						}
+
+						fuzz = fuzz.copy();
+						fuzz.setStackSize( 1 ); // We're iterating over non condensed inputs which means there's 1 of each needed
+						final IAEItemStack ais = this.inventory.extractItems( fuzz, Actionable.SIMULATE,
+								this.machineSrc );
+
+						if( ais != null && ais.getStackSize() > 0 )
+						{
+							// Mark 1 of the stack as consumed
+							consumedCount.merge( fuzz, 1, Integer::sum );
+							found = true;
+							break;
+						}
+					}
+					if( found )
+					{
+						break;
+					}
+				}
+
+				if( !found )
+				{
+					return false;
+				}
+			}
+
+		}
+		else
+		{
+			// When no substitutions can occur, we can simply check that all items are accounted since
+			// each type of item should only occur once
+			for ( IAEItemStack g : condensedInputs )
 			{
 				boolean found = false;
 
-				for( IAEItemStack fuzz : this.inventory.getItemList().findFuzzy( g, FuzzyMode.IGNORE_ALL ) )
+				for ( IAEItemStack fuzz : this.inventory.getItemList().findFuzzy( g, FuzzyMode.IGNORE_ALL ) )
 				{
 					fuzz = fuzz.copy();
 					fuzz.setStackSize( g.getStackSize() );
 					final IAEItemStack ais = this.inventory.extractItems( fuzz, Actionable.SIMULATE, this.machineSrc );
 
-					if (ais != null && ais.getStackSize() == g.getStackSize())
+					if( ais != null && ais.getStackSize() >= g.getStackSize() )
 					{
 						found = true;
 						break;
@@ -522,15 +591,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 					return false;
 				}
 			}
-			else
-			{
-				final IAEItemStack ais = this.inventory.extractItems( g.copy(), Actionable.SIMULATE, this.machineSrc );
 
-				if (ais == null || ais.getStackSize() < g.getStackSize())
-				{
-					return false;
-				}
-			}
 		}
 
 		return true;
@@ -646,14 +707,22 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 			{
 				InventoryCrafting ic = null;
 
-				for( final ICraftingMedium m : cc.getMediums( e.getKey() ) )
+				if (!visitedMediums.containsKey( details ) || visitedMediums.get( details ).isEmpty())
 				{
+					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.isBusy() )
+					if( m != null && !m.isBusy() )
 					{
 						if( ic == null )
 						{
@@ -677,71 +746,67 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 							ic = new InventoryCrafting( new ContainerNull(), 3, 3 );
 							boolean found = false;
 
-							for( int x = 0; x < input.length; x++ )
-							{
-								if( input[x] != null )
-								{
+							for (int x = 0; x < input.length; x++) {
+								if (input[x] != null) {
 									found = false;
 
-									if( details.isCraftable() )
-									{
+									if (details.isCraftable()) {
 										final Collection<IAEItemStack> itemList;
 
-										if( details.canSubstitute() )
-										{
-											itemList = this.inventory.getItemList().findFuzzy( input[x], FuzzyMode.IGNORE_ALL );
-										}
-										else
-										{
-											itemList = new ArrayList<>( 1 );
+										if (details.canSubstitute()) {
+											final List<IAEItemStack> substitutes = details.getSubstituteInputs(x);
+											itemList = new ArrayList<>(substitutes.size());
 
-											final IAEItemStack item = this.inventory.getItemList().findPrecise( input[x] );
+											for (IAEItemStack stack : substitutes) {
+												itemList.addAll(this.inventory.getItemList().findFuzzy(stack,
+														FuzzyMode.IGNORE_ALL));
+											}
+										} else {
+											itemList = new ArrayList<>(1);
 
-											if( item != null )
-											{
-												itemList.add( item );
+											final IAEItemStack item = this.inventory.getItemList()
+													.findPrecise(input[x]);
+
+											if (item != null) {
+												itemList.add(item);
 											}
 										}
 
-										for( IAEItemStack fuzz : itemList )
-										{
+										for (IAEItemStack fuzz : itemList) {
 											fuzz = fuzz.copy();
-											fuzz.setStackSize( input[x].getStackSize() );
+											fuzz.setStackSize(input[x].getStackSize());
 
-											if( details.isValidItemForSlot( x, fuzz.createItemStack(), this.getWorld() ) )
-											{
-												final IAEItemStack ais = this.inventory.extractItems( fuzz, Actionable.MODULATE, this.machineSrc );
-												final ItemStack is = ais == null ? ItemStack.EMPTY : ais.createItemStack();
+											if (details.isValidItemForSlot(x, fuzz.createItemStack(),
+													this.getWorld())) {
+												final IAEItemStack ais = this.inventory.extractItems(fuzz,
+														Actionable.MODULATE, this.machineSrc);
+												final ItemStack is = ais == null ? ItemStack.EMPTY
+														: ais.createItemStack();
 
-												if( !is.isEmpty() )
-												{
-													this.postChange( AEItemStack.fromItemStack( is ), this.machineSrc );
-													ic.setInventorySlotContents( x, is );
+												if (!is.isEmpty()) {
+													this.postChange(AEItemStack.fromItemStack(is), this.machineSrc);
+													ic.setInventorySlotContents(x, is);
 													found = true;
 													break;
 												}
 											}
 										}
-									}
-									else
-									{
-										final IAEItemStack ais = this.inventory.extractItems( input[x].copy(), Actionable.MODULATE, this.machineSrc );
+									} else {
+										final IAEItemStack ais = this.inventory.extractItems(input[x].copy(),
+												Actionable.MODULATE, this.machineSrc);
 										final ItemStack is = ais == null ? ItemStack.EMPTY : ais.createItemStack();
 
-										if( !is.isEmpty() )
-										{
-											this.postChange( input[x], this.machineSrc );
-											ic.setInventorySlotContents( x, is );
-											if( is.getCount() == input[x].getStackSize() )
-											{
+										if (!is.isEmpty()) {
+											this.postChange(input[x], this.machineSrc);
+											ic.setInventorySlotContents(x, is);
+											if (is.getCount() == input[x].getStackSize()) {
 												found = true;
 												continue;
 											}
 										}
 									}
 
-									if( !found )
-									{
+									if (!found) {
 										break;
 									}
 								}
@@ -825,6 +890,7 @@ 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 )
@@ -835,23 +901,24 @@ 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 ) );
 
-		for( IAEItemStack is : this.inventory.getItemList() )
+		IItemList<IAEItemStack> itemList = this.inventory.getItemList();
+		for( IAEItemStack is : itemList )
 		{
-			is = this.inventory.extractItems( is.copy(), Actionable.MODULATE, this.machineSrc );
+			this.postChange( is, this.machineSrc );
+			IAEItemStack remainder = ii.injectItems( is.copy(), Actionable.MODULATE, this.machineSrc );
 
-			if( is != null )
+			// The network was unable to receive all of the items, i.e. no or not enough storage space left
+			if( remainder != null )
 			{
-				this.postChange( is, this.machineSrc );
-				is = ii.injectItems( is, Actionable.MODULATE, this.machineSrc );
+				is.setStackSize( remainder.getStackSize() );
 			}
-
-			if( is != null )
+			else
 			{
-				this.inventory.injectItems( is, Actionable.MODULATE, this.machineSrc );
+				is.reset();
 			}
 		}
 
-		if( this.inventory.getItemList().isEmpty() )
+		if( itemList.isEmpty() )
 		{
 			this.inventory = new MECraftingInventory();
 		}
@@ -936,14 +1003,13 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 	@Override
 	public boolean isBusy()
 	{
-		final Iterator<Entry<ICraftingPatternDetails, TaskProgress>> i = this.tasks.entrySet().iterator();
 
-		while( i.hasNext() )
+		this.tasks.entrySet().removeIf(
+				taskProgressEntry -> taskProgressEntry.getValue().value <= 0 );
+
+		if( !this.waitingFor.isEmpty() || !this.tasks.isEmpty() )
 		{
-			if( i.next().getValue().value <= 0 )
-			{
-				i.remove();
-			}
+			this.updateElapsedTime();
 		}
 
 		return !this.tasks.isEmpty() || !this.waitingFor.isEmpty();
@@ -1335,12 +1401,16 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 		this.remainingItemCount = itemCount;
 	}
 
-	private void updateElapsedTime( final IAEItemStack is )
+	private void updateRemainingItemCount( final IAEItemStack is )
+	{
+		this.remainingItemCount = this.getRemainingItemCount() - is.getStackSize();
+	}
+
+	private void updateElapsedTime()
 	{
 		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/AbstractCellInventory.java

@@ -151,7 +151,7 @@ public abstract class AbstractCellInventory<T extends IAEStack<T>> implements IC
 		}
 
 		// clean any old crusty stuff...
-		for( ; x < oldStoredItems && x < this.maxItemTypes; x++ )
+		for( ; x >= oldStoredItems && x < this.maxItemTypes; x++ )
 		{
 			this.tagCompound.removeTag( ITEM_SLOT_KEYS[x] );
 			this.tagCompound.removeTag( ITEM_SLOT_COUNT_KEYS[x] );

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

@@ -277,6 +277,7 @@ 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,6 +218,12 @@ 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 )
@@ -286,8 +292,17 @@ 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/automation/PartLevelEmitter.java

@@ -19,15 +19,14 @@
 package appeng.parts.automation;
 
 
-import javax.annotation.Nonnull;
-
-import java.util.Collection;
 import java.util.Random;
 
-import appeng.api.networking.IGridNode;
-import appeng.api.networking.ticking.IGridTickable;
-import appeng.api.networking.ticking.TickRateModulation;
-import appeng.api.networking.ticking.TickingRequest;
+import appeng.me.Grid;
+import appeng.me.GridNode;
+import appeng.util.item.AEItemStack;
+import it.unimi.dsi.fastutil.objects.Object2LongMap;
+import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
@@ -88,7 +87,7 @@ import appeng.util.Platform;
 import appeng.util.inv.InvOperation;
 
 
-public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherHost, IStackWatcherHost, ICraftingWatcherHost, IMEMonitorHandlerReceiver<IAEItemStack>, ICraftingProvider, IGridTickable
+public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherHost, IStackWatcherHost, ICraftingWatcherHost, IMEMonitorHandlerReceiver<IAEItemStack>, ICraftingProvider
 {
 
 	@PartModels
@@ -124,7 +123,9 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	private double centerX;
 	private double centerY;
 	private double centerZ;
-	private IBaseMonitor<IAEItemStack> changedMonitor;
+	static Object2LongMap<Grid> gridItemCount = new Object2LongOpenHashMap<>();
+	static Object2ObjectOpenHashMap<Grid, Object2LongMap<AEItemStack>> fuzzyAEItemStackCount = new Object2ObjectOpenHashMap<>();
+	static Object2ObjectOpenHashMap<Grid, Object2LongMap<AEItemStack>> preciseAEItemStackCount = new Object2ObjectOpenHashMap<>();
 
 	@Reflected
 	public PartLevelEmitter( final ItemStack is )
@@ -322,40 +323,91 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	}
 
 	private void updateReportingValue( final IMEMonitor<IAEItemStack> monitor )
+	{
+		updateReportingValue( monitor,null );
+	}
+
+	private void updateReportingValue( final IMEMonitor<IAEItemStack> monitor, Iterable<IAEItemStack> change )
 	{
 		final IAEItemStack myStack = this.config.getAEStackInSlot( 0 );
 
-		if( myStack == null )
+		GridNode node = (GridNode) (this.getGridNode());
+
+		if( node != null )
 		{
-			this.lastReportedValue = 0;
-			for( final IAEItemStack st : monitor.getStorageList() )
+
+			final Grid g = node.getInternalGrid();
+
+			if( myStack == null )
 			{
-				this.lastReportedValue += st.getStackSize();
+				if( change != null )
+				{
+					if( gridItemCount.containsKey( g ) )
+					{
+						change.forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
+					}
+				}
+				gridItemCount.computeIfAbsent( g, ( aLong ) -> {
+					this.lastReportedValue = 0;
+					monitor.getStorageList().forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
+					return ( lastReportedValue );
+				} );
+				this.lastReportedValue = gridItemCount.get( g );
 			}
-		}
-		else if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
-		{
-			this.lastReportedValue = 0;
-			final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE );
-			final Collection<IAEItemStack> fuzzyList = monitor.getStorageList().findFuzzy( myStack, fzMode );
-			for( final IAEItemStack st : fuzzyList )
+
+			else if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
 			{
-				this.lastReportedValue += st.getStackSize();
-			}
-		}
-		else
-		{
-			final IAEItemStack r = monitor.getStorageList().findPrecise( myStack );
-			if( r == null )
-			{
-				this.lastReportedValue = 0;
+				final FuzzyMode fzMode = (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE );
+				if( change != null )
+				{
+					if( fuzzyAEItemStackCount.containsKey( g ) )
+					{
+						change.forEach( iaeItemStack -> {
+							if( iaeItemStack.sameOre( myStack ) ) lastReportedValue += iaeItemStack.getStackSize();
+						} );
+					}
+				}
+
+				fuzzyAEItemStackCount.computeIfAbsent( g, ( grid -> new Object2LongOpenHashMap<>() ) );
+				fuzzyAEItemStackCount.get( g ).computeIfAbsent( (AEItemStack) myStack, ( aLong -> {
+					this.lastReportedValue = 0;
+					monitor.getStorageList().findFuzzy( myStack, fzMode ).forEach( iaeItemStack -> lastReportedValue += iaeItemStack.getStackSize() );
+					return ( lastReportedValue );
+				} ) );
+
+				this.lastReportedValue = fuzzyAEItemStackCount.get( g ).get( myStack );
+				if( this.lastReportedValue == 0 )
+				{
+					fuzzyAEItemStackCount.get( g ).remove( myStack );
+					fuzzyAEItemStackCount.trim();
+				}
 			}
 			else
 			{
-				this.lastReportedValue = r.getStackSize();
+				if( change != null )
+				{
+					if( preciseAEItemStackCount.containsKey( g ) )
+					{
+						change.forEach( iaeItemStack -> {
+							if( iaeItemStack.isSameType( myStack ) ) lastReportedValue += iaeItemStack.getStackSize();
+						} );
+					}
+				}
+				preciseAEItemStackCount.computeIfAbsent( g, ( grid -> new Object2LongOpenHashMap<>() ) );
+				preciseAEItemStackCount.get( g ).computeIfAbsent( (AEItemStack) myStack, ( aLong -> {
+					this.lastReportedValue = 0;
+					IAEItemStack precise = monitor.getStorageList().findPrecise( myStack );
+					if( precise != null ) lastReportedValue = precise.getStackSize();
+					return ( lastReportedValue );
+				} ) );
+				this.lastReportedValue = preciseAEItemStackCount.get( g ).get( myStack );
+				if( this.lastReportedValue == 0 )
+				{
+					preciseAEItemStackCount.get( g ).remove( myStack );
+					preciseAEItemStackCount.trim();
+				}
 			}
 		}
-
 		this.updateState();
 	}
 
@@ -407,7 +459,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 	@Override
 	public void postChange( final IBaseMonitor<IAEItemStack> monitor, final Iterable<IAEItemStack> change, final IActionSource actionSource )
 	{
-		this.changedMonitor = monitor;
+		this.updateReportingValue( (IMEMonitor<IAEItemStack>) monitor, change );
 	}
 
 	@Override
@@ -584,21 +636,9 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
 		}
 	}
 
-	@Nonnull
-	@Override
-	public TickingRequest getTickingRequest( @Nonnull IGridNode node )
-	{
-		return new TickingRequest( 1,1,false,false );
-	}
-
-	@Nonnull
-	@Override
-	public TickRateModulation tickingRequest( @Nonnull IGridNode node, int ticksSinceLastCall )
-	{
-		if (this.changedMonitor != null)
-		{
-			this.updateReportingValue((IMEMonitor<IAEItemStack>) changedMonitor);
-		}
-		return TickRateModulation.URGENT;
+	public static void wipeCache(){
+		fuzzyAEItemStackCount.clear();
+		preciseAEItemStackCount.clear();
+		gridItemCount.clear();
 	}
 }

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

@@ -19,10 +19,20 @@
 package appeng.parts.automation;
 
 
+import javax.annotation.Nonnull;
+import appeng.api.AEApi;
+import appeng.container.slot.SlotRestrictedInput;
+import appeng.core.Api;
+import appeng.helpers.DualityInterface;
+import appeng.util.inv.ItemHandlerIterator;
+import net.minecraft.client.Minecraft;
 import net.minecraft.init.Items;
+import net.minecraft.inventory.Slot;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
 
 import appeng.api.config.Upgrades;
@@ -33,6 +43,9 @@ import appeng.util.inv.IAEAppEngInventory;
 import appeng.util.inv.InvOperation;
 import appeng.util.inv.filter.IAEItemFilter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 public abstract class UpgradeInventory extends AppEngInternalInventory implements IAEAppEngInventory
 {
@@ -45,6 +58,7 @@ public abstract class UpgradeInventory extends AppEngInternalInventory implement
 	private int capacityUpgrades = 0;
 	private int inverterUpgrades = 0;
 	private int craftingUpgrades = 0;
+	private int patternExpansionUpgrades = 0;
 
 	public UpgradeInventory( final IAEAppEngInventory parent, final int s )
 	{
@@ -81,6 +95,8 @@ public abstract class UpgradeInventory extends AppEngInternalInventory implement
 				return this.inverterUpgrades;
 			case CRAFTING:
 				return this.craftingUpgrades;
+			case PATTERN_EXPANSION:
+				return this.patternExpansionUpgrades;
 			default:
 				return 0;
 		}
@@ -91,7 +107,7 @@ public abstract class UpgradeInventory extends AppEngInternalInventory implement
 	private void updateUpgradeInfo()
 	{
 		this.cached = true;
-		this.inverterUpgrades = this.capacityUpgrades = this.redstoneUpgrades = this.speedUpgrades = this.fuzzyUpgrades = this.craftingUpgrades = 0;
+		this.patternExpansionUpgrades = this.inverterUpgrades = this.capacityUpgrades = this.redstoneUpgrades = this.speedUpgrades = this.fuzzyUpgrades = this.craftingUpgrades = 0;
 
 		for( final ItemStack is : this )
 		{
@@ -121,6 +137,9 @@ public abstract class UpgradeInventory extends AppEngInternalInventory implement
 				case CRAFTING:
 					this.craftingUpgrades++;
 					break;
+				case PATTERN_EXPANSION:
+					this.patternExpansionUpgrades++;
+					break;
 				default:
 					break;
 			}
@@ -132,6 +151,7 @@ public abstract class UpgradeInventory extends AppEngInternalInventory implement
 		this.speedUpgrades = Math.min( this.speedUpgrades, this.getMaxInstalled( Upgrades.SPEED ) );
 		this.inverterUpgrades = Math.min( this.inverterUpgrades, this.getMaxInstalled( Upgrades.INVERTER ) );
 		this.craftingUpgrades = Math.min( this.craftingUpgrades, this.getMaxInstalled( Upgrades.CRAFTING ) );
+		this.patternExpansionUpgrades = Math.min( this.patternExpansionUpgrades, this.getMaxInstalled( Upgrades.PATTERN_EXPANSION ) );
 	}
 
 	@Override
@@ -160,6 +180,13 @@ public abstract class UpgradeInventory extends AppEngInternalInventory implement
 		}
 	}
 
+	@Nonnull
+	@Override
+	public ItemStack extractItem( int slot, int amount, boolean simulate )
+	{
+		return super.extractItem( slot, amount, simulate );
+	}
+
 	private class UpgradeInvFilter implements IAEItemFilter
 	{
 

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

@@ -19,20 +19,11 @@
 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 appeng.api.config.Settings;
-import appeng.api.config.StorageFilter;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.items.IItemHandler;
-
+import javax.annotation.Nullable;
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
+import appeng.api.config.Settings;
+import appeng.api.config.StorageFilter;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.networking.storage.IBaseMonitor;
 import appeng.api.networking.ticking.TickRateModulation;
@@ -45,8 +36,17 @@ import appeng.core.AELog;
 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 com.google.common.primitives.Ints;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.ItemHandlerHelper;
+
+import java.util.*;
 
 
 /**
@@ -54,13 +54,15 @@ import appeng.util.item.AEItemStack;
  */
 class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAEItemStack>, ITickingMonitor
 {
-	private final Map<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
+	private final Object2ObjectMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new Object2ObjectOpenHashMap<>();
 	private IActionSource mySource;
 	private final IItemHandler itemHandler;
 	private final IGridProxyable proxyable;
 	private final InventoryCache cache;
 	private StorageFilter mode;
 
+	private ItemStack stackCache = null;
+
 	ItemHandlerAdapter( IItemHandler itemHandler, IGridProxyable proxy )
 	{
 		this.itemHandler = itemHandler;
@@ -76,16 +78,28 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 	@Override
 	public IAEItemStack injectItems( IAEItemStack iox, Actionable type, IActionSource src )
 	{
-		ItemStack orgInput = iox.createItemStack();
-		ItemStack remaining = orgInput;
+		// Try to reuse the cached stack
+		@Nullable ItemStack currentCached = stackCache;
+		stackCache = null;
 
-		int slotCount = this.itemHandler.getSlots();
-		boolean simulate = ( type == Actionable.SIMULATE );
-
-		// This uses a brute force approach and tries to jam it in every slot the inventory exposes.
-		for( int i = 0; i < slotCount && !remaining.isEmpty(); i++ )
+		ItemStack orgInput;
+		if( currentCached != null && iox.isSameType( currentCached ) )
 		{
-			remaining = this.itemHandler.insertItem( i, remaining, simulate );
+			// Cache is suitable, just update the count
+			orgInput = currentCached;
+			currentCached.setCount( Ints.saturatedCast( iox.getStackSize() ) );
+		}
+		else
+		{
+			// We need a new stack :-(
+			orgInput = iox.createItemStack();
+		}
+		ItemStack remaining = ItemHandlerHelper.insertItem( this.itemHandler, orgInput, type == Actionable.SIMULATE );
+
+		// Store the stack in the cache for next time.
+		if (!remaining.isEmpty() && remaining != orgInput)
+		{
+			stackCache = remaining;
 		}
 
 		// At this point, we still have some items left...
@@ -105,6 +119,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 			{
 				// meh
 			}
+
 		}
 
 		return AEItemStack.fromItemStack( remaining );
@@ -113,9 +128,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();
+		int remainingSize = Ints.saturatedCast(request.getStackSize());
 
 		// Use this to gather the requested items
 		ItemStack gathered = ItemStack.EMPTY;
@@ -126,7 +139,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 		{
 			ItemStack stackInInventorySlot = this.itemHandler.getStackInSlot( i );
 
-			if( !Platform.itemComparisons().isSameItem( stackInInventorySlot, requestedItemStack ) )
+			if (!request.isSameType(stackInInventorySlot))
 			{
 				continue;
 			}
@@ -140,16 +153,9 @@ 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,17 +165,12 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 						extracted.setCount( remainingCurrentSlot );
 					}
 
-					// 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);
-					}
-
+					// 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.
 					if( gathered.isEmpty() )
 					{
-						gathered = extracted;
+						gathered = extracted.copy();
 					}
 					else
 					{
@@ -177,8 +178,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 					}
 					remainingCurrentSlot -= extracted.getCount();
 				}
-			}
-			while( !simulate && !extracted.isEmpty() && remainingCurrentSlot > 0 );
+			} while ( !extracted.isEmpty() && remainingCurrentSlot > 0 );
 
 			remainingSize -= stackSizeCurrentSlot - remainingCurrentSlot;
 
@@ -257,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();
@@ -272,7 +272,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 		}
 	}
 
-	private static class InventoryCache
+	private static class InventoryCache implements Iterable<ItemSlot>
 	{
 		private IAEItemStack[] cachedAeStacks = new IAEItemStack[0];
 		private final IItemHandler itemHandler;
@@ -290,6 +290,11 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 			return out;
 		}
 
+		private StorageFilter getMode()
+		{
+			return this.mode;
+		}
+
 		public List<IAEItemStack> update()
 		{
 			final List<IAEItemStack> changes = new ArrayList<>();
@@ -301,21 +306,14 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 				this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, slots );
 			}
 
-			for( int slot = 0; slot < slots; slot++ )
+			for( final ItemSlot is : this )
 			{
 				// Save the old stuff
-				final IAEItemStack oldAeIS = this.cachedAeStacks[slot];
-				ItemStack newIS = this.itemHandler.getStackInSlot( slot );
-				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && !newIS.isEmpty() )
-				{
-					if( this.itemHandler.extractItem( slot, 1, true ).isEmpty() )
-					{
-						newIS = ItemStack.EMPTY;
-					}
-				}
-				this.handlePossibleSlotChanges( slot, oldAeIS, newIS, changes );
-			}
+				final IAEItemStack oldAeIS = this.cachedAeStacks[is.getSlot()];
+				final ItemStack newIS = !is.isExtractable() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? ItemStack.EMPTY : is.getItemStack();
 
+				this.handlePossibleSlotChanges( is.getSlot(), oldAeIS, newIS, changes );
+			}
 			// Handle cases where the number of slots actually is lower now than before
 			if( slots < this.cachedAeStacks.length )
 			{
@@ -386,6 +384,12 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 				changes.add( this.cachedAeStacks[slot] );
 			}
 		}
-	}
 
+		@Override
+		public Iterator<ItemSlot> iterator()
+		{
+			return new ItemHandlerIterator( this.itemHandler );
+		}
+
+	}
 }

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

@@ -1,21 +1,6 @@
 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 javax.annotation.Nullable;
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.networking.security.IActionSource;
@@ -23,15 +8,24 @@ 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.google.common.primitives.Ints;
+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.*;
+import java.util.stream.Collectors;
 
-import javax.annotation.Nonnull;
 
 /**
  * Wraps an Item Repository in such a way that it can be used as an IMEInventory for items.
@@ -40,12 +34,13 @@ import javax.annotation.Nonnull;
 
 class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAEItemStack>, ITickingMonitor
 {
-    private final Map<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
+    private final Object2ObjectMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new Object2ObjectOpenHashMap<>();
     private IActionSource mySource;
     private final IItemRepository itemRepository;
     private final IGridProxyable proxyable;
     private final InventoryCache cache;
 
+    private ItemStack stackCache;
 
     ItemRepositoryAdapter( IItemRepository itemRepository, IGridProxyable proxy )
     {
@@ -57,12 +52,29 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
     @Override
     public IAEItemStack injectItems( IAEItemStack iox, Actionable type, IActionSource src )
     {
-        ItemStack orgInput = iox.createItemStack();
-        ItemStack remaining = orgInput;
+        // Try to reuse the cached stack
+        @Nullable ItemStack currentCached = stackCache;
+        stackCache = null;
 
-        boolean simulate = ( type == Actionable.SIMULATE );
+        ItemStack orgInput;
+        if( currentCached != null && iox.isSameType( currentCached ) )
+        {
+            // Cache is suitable, just update the count
+            orgInput = currentCached;
+            currentCached.setCount( Ints.saturatedCast( iox.getStackSize() ) );
+        }
+        else
+        {
+            // We need a new stack :-(
+            orgInput = iox.createItemStack();
+        }
+        ItemStack remaining = this.itemRepository.insertItem( orgInput, type == Actionable.SIMULATE );
 
-        remaining = this.itemRepository.insertItem( remaining, simulate );
+        // Store the stack in the cache for next time.
+        if (!remaining.isEmpty() && remaining != orgInput)
+        {
+            stackCache = remaining;
+        }
 
         // At this point, we still have some items left...
         if( remaining == orgInput )
@@ -90,13 +102,11 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
     @Override
     public IAEItemStack extractItems( IAEItemStack request, Actionable mode, IActionSource src )
     {
-        ItemStack requestedItemStack = request.createItemStack();
-        int remainingSize = requestedItemStack.getCount();
+        int remainingSize = Ints.saturatedCast(request.getStackSize());
 
         final boolean simulate = ( mode == Actionable.SIMULATE );
 
-        ItemStack extracted;
-        extracted = this.itemRepository.extractItem( requestedItemStack, remainingSize, simulate );
+        ItemStack extracted = this.itemRepository.extractItem( request.getDefinition(), remainingSize, simulate );
 
         if( extracted.getCount() > remainingSize )
         {
@@ -120,10 +130,8 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
                     // meh
                 }
             }
-
             return AEItemStack.fromItemStack( extracted );
         }
-
         return null;
     }
 
@@ -154,7 +162,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();
@@ -212,7 +220,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
         {
             final List<IAEItemStack> changes = new ArrayList<>();
 
-            List<IAEItemStack> out = this.iItemRepository.getAllItems().stream().map( s -> AEItemStack.fromItemStack( s.itemPrototype ).setStackSize( s.count ) ).collect(Collectors.toList() );
+            List<IAEItemStack> out = this.iItemRepository.getAllItems().stream().map( s -> AEItemStack.fromItemStack( s.itemPrototype ).setStackSize( s.count ) ).collect( Collectors.toList() );
 
             final int size = out.size();
 
@@ -301,5 +309,6 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
                 changes.add( this.cachedAeStacks[slot] );
             }
         }
+
     }
 }

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

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

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

@@ -19,11 +19,12 @@
 package appeng.parts.p2p;
 
 
-import java.util.List;
+import java.util.*;
 
 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;
@@ -42,6 +43,7 @@ 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 )
 	{
@@ -108,6 +110,8 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower>
 
 	private class InputEnergyStorage implements IEnergyStorage
 	{
+		private boolean iteratingOutputs;
+
 		@Override
 		public int extractEnergy( int maxExtract, boolean simulate )
 		{
@@ -131,8 +135,14 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower>
 				final int amountPerOutput = maxReceive / outputTunnels;
 				int overflow = amountPerOutput == 0 ? maxReceive : maxReceive % amountPerOutput;
 
-				for( PartP2PFEPower target : PartP2PFEPower.this.getOutputs() )
+				if (outputs.isEmpty())
 				{
+					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,6 +21,10 @@ 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;
@@ -31,6 +35,9 @@ 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;
 
@@ -70,7 +77,9 @@ 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;
@@ -90,6 +99,9 @@ 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
@@ -104,8 +116,15 @@ 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
@@ -114,11 +133,17 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 		super.writeToStream( data );
 
 		data.writeBoolean( this.isLocked );
-		data.writeBoolean( this.configuredItem != null );
+		//is configured
+		data.writeBoolean( this.configuredItem != null);
+		data.writeBoolean( this.configuredFluid != null);
 		if( this.configuredItem != null )
 		{
 			this.configuredItem.writeToPacket( data );
 		}
+		else if( this.configuredFluid != null )
+		{
+			this.configuredFluid.writeToPacket( data );
+		}
 	}
 
 	@Override
@@ -131,14 +156,22 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 
 		this.isLocked = isLocked;
 
-		final boolean val = data.readBoolean();
-		if( val )
+		final boolean isItem = data.readBoolean();
+		final boolean isFluid = data.readBoolean();
+		if( isItem )
 		{
 			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;
@@ -165,7 +198,25 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 		if( !this.isLocked )
 		{
 			final ItemStack eq = player.getHeldItem( hand );
-			this.configuredItem = AEItemStack.fromItemStack( eq );
+			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.configureWatchers();
 			this.getHost().markForSave();
 			this.getHost().markForUpdate();
@@ -227,6 +278,16 @@ 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 )
 		{
@@ -234,11 +295,12 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 		}
 	}
 
-	private void updateReportingValue( final IMEMonitor<IAEItemStack> itemInventory )
+	private <T extends IAEStack<T>> void updateReportingValue ( final IMEMonitor<T> monitor )
 	{
-		if( this.configuredItem != null )
+
+		if( this.configuredItem != null)
 		{
-			final IAEItemStack result = itemInventory.getStorageList().findPrecise( this.configuredItem );
+			final IAEItemStack result = (IAEItemStack) monitor.getStorageList().findPrecise( (T) this.configuredItem );
 			if( result == null )
 			{
 				this.configuredItem.setStackSize( 0 );
@@ -248,6 +310,18 @@ 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
@@ -260,7 +334,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 			return;
 		}
 
-		final IAEItemStack ais = this.getDisplayed();
+		IAEStack<?> ais = this.getDisplayed();
 
 		if( ais == null )
 		{
@@ -274,8 +348,10 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 
 		TesrRenderHelper.moveToFace( facing );
 		TesrRenderHelper.rotateToFace( facing, this.getSpin() );
-		TesrRenderHelper.renderItem2dWithAmount( ais, 0.8f, 0.17f );
-
+		if (ais instanceof IAEItemStack)
+			TesrRenderHelper.renderItem2dWithAmount( (IAEItemStack) ais, 0.8f, 0.17f );
+		if (ais instanceof IAEFluidStack)
+			TesrRenderHelper.renderFluid2dWithAmount( (IAEFluidStack) ais, 0.8f, 0.17f );
 		GlStateManager.popMatrix();
 
 	}
@@ -287,9 +363,13 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
 	}
 
 	@Override
-	public IAEItemStack getDisplayed()
+	public IAEStack<?> getDisplayed()
 	{
+		if (this.configuredItem != null)
 		return this.configuredItem;
+		else if (this.configuredFluid != null)
+			return this.configuredFluid;
+		return null;
 	}
 
 	@Override
@@ -322,6 +402,26 @@ 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,15 +19,31 @@
 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;
 
@@ -92,6 +108,13 @@ 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() )
@@ -103,18 +126,49 @@ 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 );
 			}
+
 		}
-		else if( this.getDisplayed() != null && this.getDisplayed().equals( eq ) )
+
+		//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 )
 		{
-			this.insertItem( player, hand, false );
+			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 );
+			}
 		}
 		else
 		{
-			return super.onPartActivate( player, hand, pos );
+			if( getDisplayed() instanceof IAEFluidStack || getDisplayed() == null )
+			{
+				return super.onPartActivate( player, hand, pos );
+			}
+			if( ( (IAEItemStack) this.getDisplayed() ).equals( eq ) )
+			{
+				this.insertItem( player, hand, false );
+			}
 		}
 
 		return true;
@@ -138,9 +192,14 @@ public class PartConversionMonitor extends AbstractPartMonitor
 			return false;
 		}
 
-		if( this.getDisplayed() != null )
+		ItemStack eq = player.getHeldItem( hand );
+		if( this.getDisplayed() != null && this.getDisplayed() instanceof IAEItemStack )
 		{
-			this.extractItem( player, this.getDisplayed().getDefinition().getMaxStackSize() );
+			this.extractItem( player, ( (IAEItemStack) this.getDisplayed() ).getDefinition().getMaxStackSize() );
+		}
+		else if( this.getDisplayed() != null && this.getDisplayed() instanceof IAEFluidStack )
+		{
+			this.fillFluidContainer( player,hand );
 		}
 
 		return true;
@@ -183,9 +242,9 @@ public class PartConversionMonitor extends AbstractPartMonitor
 
 			if( allItems )
 			{
-				if( this.getDisplayed() != null )
+				if( this.getDisplayed() != null && this.getDisplayed() instanceof IAEItemStack)
 				{
-					final IAEItemStack input = this.getDisplayed().copy();
+					final IAEItemStack input = (IAEItemStack) this.getDisplayed().copy();
 					IItemHandler inv = new PlayerMainInvWrapper( player.inventory );
 
 					for( int x = 0; x < inv.getSlots(); x++ )
@@ -221,7 +280,9 @@ public class PartConversionMonitor extends AbstractPartMonitor
 
 	private void extractItem( final EntityPlayer player, int count )
 	{
-		final IAEItemStack input = this.getDisplayed();
+		if (!(this.getDisplayed() instanceof IAEItemStack))
+			return;
+		final IAEItemStack input = (IAEItemStack) this.getDisplayed();
 		if( input != null )
 		{
 			try
@@ -265,6 +326,141 @@ 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/recipes/factories/conditions/PartExists.java

@@ -0,0 +1,36 @@
+package appeng.recipes.factories.conditions;
+
+import appeng.core.Api;
+import appeng.core.AppEng;
+import com.google.gson.JsonObject;
+import net.minecraft.util.JsonUtils;
+import net.minecraftforge.common.crafting.IConditionFactory;
+import net.minecraftforge.common.crafting.JsonContext;
+
+import java.util.function.BooleanSupplier;
+
+public class PartExists implements IConditionFactory {
+
+    private static final String JSON_MATERIAL_KEY = "part";
+
+    @Override
+    public BooleanSupplier parse(JsonContext jsonContext, JsonObject jsonObject )
+    {
+        final boolean result;
+
+        if( JsonUtils.isString( jsonObject, JSON_MATERIAL_KEY ) )
+        {
+            final String part = JsonUtils.getString( jsonObject, JSON_MATERIAL_KEY );
+            final Object item = Api.INSTANCE.registries().recipes().resolveItem( AppEng.MOD_ID, part );
+
+            result = item != null;
+        }
+        else
+        {
+            result = false;
+        }
+
+        return () -> result;
+
+    }
+}

src/main/java/appeng/tile/inventory/AppEngInternalInventory.java

@@ -206,7 +206,7 @@ public class AppEngInternalInventory extends ItemStackHandler implements Iterabl
 		this.enableClientEvents = enableClientEvents;
 	}
 
-	private IAEAppEngInventory getTileEntity()
+	public IAEAppEngInventory getTileEntity()
 	{
 		return this.te;
 	}

src/main/java/appeng/tile/misc/TileInterface.java

@@ -164,6 +164,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
 
 		super.onReady();
 		this.duality.initialize();
+		this.getProxy().setIdlePowerUsage( Math.pow( 4, ( this.getInstalledUpgrades( Upgrades.PATTERN_EXPANSION ) ) ) );
 	}
 
 	@Override

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

@@ -425,6 +425,7 @@ 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( te.hasCapability( ITEM_REPOSITORY_CAPABILITY, d ) )
+			if( ITEM_REPOSITORY_CAPABILITY != null && te.hasCapability( ITEM_REPOSITORY_CAPABILITY, d ) )
 			{
 				IItemRepository itemRepository = te.getCapability( ITEM_REPOSITORY_CAPABILITY, d );
 				if (itemRepository != null){

src/main/java/appeng/util/Platform.java

@@ -1246,18 +1246,20 @@ public class Platform
 				if( itemToAdd < input.getStackSize() )
 				{
 					final long original = input.getStackSize();
+					final T leftover = input.copy();
 					final T split = input.copy();
-					split.decStackSize( itemToAdd );
-					input.setStackSize( itemToAdd );
-					split.add( cell.injectItems( input, Actionable.MODULATE, src ) );
+
+					leftover.decStackSize(itemToAdd);
+					split.setStackSize(itemToAdd);
+					leftover.add(cell.injectItems(split, Actionable.MODULATE, src));
 
 					src.player().ifPresent( player ->
 					{
-						final long diff = original - split.getStackSize();
+						final long diff = original - leftover.getStackSize();
 						Stats.ItemsInserted.addToPlayer( player, (int) diff );
 					} );
 
-					return split;
+					return leftover;
 				}
 
 				final T ret = cell.injectItems( input, Actionable.MODULATE, src );

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( node );
+		return this.c.contains( (T) node );
 	}
 }

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

@@ -206,3 +206,4 @@ 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;
 
 
-class ItemHandlerIterator implements Iterator<ItemSlot>
+public class ItemHandlerIterator implements Iterator<ItemSlot>
 {
 
 	private final IItemHandler itemHandler;
@@ -34,7 +34,7 @@ class ItemHandlerIterator implements Iterator<ItemSlot>
 
 	private int slot = 0;
 
-	ItemHandlerIterator( IItemHandler itemHandler )
+	public ItemHandlerIterator( IItemHandler itemHandler )
 	{
 		this.itemHandler = itemHandler;
 	}
@@ -52,7 +52,7 @@ class ItemHandlerIterator implements Iterator<ItemSlot>
 		{
 			throw new NoSuchElementException();
 		}
-		this.itemSlot.setExtractable( !this.itemHandler.extractItem( this.slot, 1, true ).isEmpty() );
+		this.itemSlot.setExtractable( !this.itemHandler.extractItem( this.slot, Integer.MAX_VALUE, true ).isEmpty() );
 		this.itemSlot.setItemStack( this.itemHandler.getStackInSlot( this.slot ) );
 		this.itemSlot.setSlot( this.slot );
 		this.slot++;

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
+ * Copyright (c) 2013 - 2020, 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
@@ -18,7 +18,6 @@
 
 package appeng.util.item;
 
-
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -27,347 +26,294 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import io.netty.buffer.ByteBuf;
-
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.items.ItemHandlerHelper;
 
-import appeng.api.AEApi;
 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";
 
-public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemStack
-{
-	private AESharedItemStack sharedStack;
-	private Optional<OreReference> oreReference;
+    private final AESharedItemStack sharedStack;
+    private Optional<OreReference> oreReference;
 
-	@SideOnly( Side.CLIENT )
-	private String displayName;
-	@SideOnly( Side.CLIENT )
-	private List<String> tooltip;
-	@SideOnly( Side.CLIENT )
-	private ResourceLocation uniqueID;
+    @SideOnly(Side.CLIENT)
+    private String displayName;
+    @SideOnly(Side.CLIENT)
+    private List<String> tooltip;
 
-	private AEItemStack( final AEItemStack is )
-	{
-		this.setStackSize( is.getStackSize() );
-		this.setCraftable( is.isCraftable() );
-		this.setCountRequestable( is.getCountRequestable() );
-		this.sharedStack = is.sharedStack;
-		this.oreReference = is.oreReference;
-	}
+    private AEItemStack(final AEItemStack is) {
+        this.setStackSize(is.getStackSize());
+        this.setCraftable(is.isCraftable());
+        this.setCountRequestable(is.getCountRequestable());
+        this.sharedStack = is.sharedStack;
+        this.oreReference = is.oreReference;
+    }
 
-	private AEItemStack( final AESharedItemStack is, long size )
-	{
-		this.sharedStack = is;
-		this.setStackSize( size );
-		this.setCraftable( false );
-		this.setCountRequestable( 0 );
-		this.oreReference = OreHelper.INSTANCE.getOre( is.getDefinition() );
-	}
+    private AEItemStack(final AESharedItemStack is, long size) {
+        this.sharedStack = is;
+        this.setStackSize(size);
+        this.setCraftable(false);
+        this.setCountRequestable(0);
+        this.oreReference = OreHelper.INSTANCE.getOre( is.getDefinition() );
+    }
 
-	@Nullable
-	public static AEItemStack fromItemStack( @Nonnull final ItemStack stack )
-	{
-		if( stack.isEmpty() )
-		{
-			return null;
-		}
+    @Nullable
+    public static AEItemStack fromItemStack(@Nonnull final ItemStack stack) {
+        if (stack.isEmpty()) {
+            return null;
+        }
 
-		return new AEItemStack( AEItemStackRegistry.getRegisteredStack( stack ), stack.getCount() );
-	}
+        return new AEItemStack(AEItemStackRegistry.getRegisteredStack(stack), stack.getCount());
+    }
 
-	public static IAEItemStack fromNBT( final NBTTagCompound i )
-	{
-		if( i == null )
-		{
-			return null;
-		}
+    public static IAEItemStack fromNBT( final NBTTagCompound i )
+    {
+        if( i == null )
+        {
+            return null;
+        }
 
-		final ItemStack itemstack = new ItemStack( i );
-		if( itemstack.isEmpty() )
-		{
-			return null;
-		}
+        final ItemStack itemstack = new ItemStack( i );
+        if( itemstack.isEmpty() )
+        {
+            return null;
+        }
 
-		final AEItemStack item = AEItemStack.fromItemStack( itemstack );
-		item.setStackSize( i.getLong( "Cnt" ) );
-		item.setCountRequestable( i.getLong( "Req" ) );
-		item.setCraftable( i.getBoolean( "Craft" ) );
-		return item;
-	}
+        final AEItemStack item = AEItemStack.fromItemStack( itemstack );
 
-	@Override
-	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() );
-	}
+        item.setStackSize(i.getLong(NBT_STACKSIZE));
+        item.setCountRequestable(i.getLong(NBT_REQUESTABLE));
+        item.setCraftable(i.getBoolean(NBT_CRAFTABLE));
+        return item;
+    }
 
-	public static AEItemStack fromPacket( final ByteBuf data )
-	{
-		final byte mask = data.readByte();
-		final byte stackType = (byte) ( ( mask & 0x0C ) >> 2 );
-		final byte countReqType = (byte) ( ( mask & 0x30 ) >> 4 );
-		final boolean isCraftable = ( mask & 0x40 ) > 0;
+    @Override
+    public void writeToNBT(final NBTTagCompound i) {
+        this.getDefinition().writeToNBT( i );
 
-		final ItemStack itemstack = new ItemStack( ByteBufUtils.readTag( data ) );
-		final long stackSize = getPacketValue( stackType, data );
-		final long countRequestable = getPacketValue( countReqType, data );
+        i.setLong(NBT_STACKSIZE, this.getStackSize());
+        i.setLong(NBT_REQUESTABLE, this.getCountRequestable());
+        i.setBoolean(NBT_CRAFTABLE, this.isCraftable());
+    }
 
-		if( itemstack.isEmpty() )
-		{
-			return null;
-		}
+    public static AEItemStack fromPacket( final ByteBuf data )
+    {
+        final byte mask = data.readByte();
+        final byte stackType = (byte) ( ( mask & 0x0C ) >> 2 );
+        final byte countReqType = (byte) ( ( mask & 0x30 ) >> 4 );
+        final boolean isCraftable = ( mask & 0x40 ) > 0;
 
-		final AEItemStack item = new AEItemStack( AEItemStackRegistry.getRegisteredStack( itemstack ), stackSize );
-		item.setCountRequestable( countRequestable );
-		item.setCraftable( isCraftable );
-		return item;
-	}
+        final ItemStack itemstack = new ItemStack( ByteBufUtils.readTag( data ) );
+        final long stackSize = getPacketValue( stackType, data );
+        final long countRequestable = getPacketValue( countReqType, data );
 
-	@Override
-	public void writeToPacket( final ByteBuf i )
-	{
-		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 );
+        if( itemstack.isEmpty() )
+        {
+            return null;
+        }
 
-		i.writeByte( mask );
-		ByteBufUtils.writeTag( i, this.getDefinition().serializeNBT() );
-		this.putPacketValue( i, this.getStackSize() );
-		this.putPacketValue( i, this.getCountRequestable() );
-	}
+        final AEItemStack item = new AEItemStack( AEItemStackRegistry.getRegisteredStack( itemstack ), stackSize );
+        item.setCountRequestable( countRequestable );
+        item.setCraftable( isCraftable );
+        return item;
+    }
 
-	@Override
-	public void add( final IAEItemStack option )
-	{
-		if( option == null )
-		{
-			return;
-		}
+    @Override
+    public void writeToPacket( final ByteBuf i )
+    {
+        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 );
 
-		this.incStackSize( option.getStackSize() );
-		this.setCountRequestable( this.getCountRequestable() + option.getCountRequestable() );
-		this.setCraftable( this.isCraftable() || option.isCraftable() );
-	}
+        i.writeByte( mask );
+        ByteBufUtils.writeTag( i, this.getDefinition().serializeNBT() );
+        this.putPacketValue( i, this.getStackSize() );
+        this.putPacketValue( i, this.getCountRequestable() );
+    }
 
-	@Override
-	public boolean fuzzyComparison( final IAEItemStack other, final FuzzyMode mode )
-	{
-		if( mode == FuzzyMode.IGNORE_ALL && OreHelper.INSTANCE.sameOre( this, other ) )
-		{
-			return true;
-		}
+    @Override
+    public void add(final IAEItemStack option) {
+        if (option == null) {
+            return;
+        }
 
-		final ItemStack itemStack = this.getDefinition();
-		final ItemStack otherStack = other.getDefinition();
+        this.incStackSize(option.getStackSize());
+        this.setCountRequestable(this.getCountRequestable() + option.getCountRequestable());
+        this.setCraftable(this.isCraftable() || option.isCraftable());
+    }
 
-		return this.fuzzyItemStackComparison( itemStack, otherStack, mode );
-	}
+    @Override
+    public boolean fuzzyComparison(final IAEItemStack other, final FuzzyMode mode) {
+        final ItemStack itemStack = this.getDefinition();
+        final ItemStack otherStack = other.getDefinition();
 
-	@Override
-	public IAEItemStack copy()
-	{
-		return new AEItemStack( this );
-	}
+        return this.fuzzyItemStackComparison(itemStack, otherStack, mode);
+    }
 
-	@Override
-	public boolean isItem()
-	{
-		return true;
-	}
+    @Override
+    public IAEItemStack copy() {
+        return new AEItemStack(this);
+    }
 
-	@Override
-	public boolean isFluid()
-	{
-		return false;
-	}
+    @Override
+    public boolean isItem()
+    {
+        return true;
+    }
 
-	@Override
-	public IStorageChannel<IAEItemStack> getChannel()
-	{
-		return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class );
-	}
+    @Override
+    public boolean isFluid()
+    {
+        return false;
+    }
 
-	@Override
-	public ItemStack createItemStack()
-	{
-		return ItemHandlerHelper.copyStackWithSize( this.getDefinition(), (int) Math.min( Integer.MAX_VALUE, this.getStackSize() ) );
-	}
+    @Override
+    public IStorageChannel<IAEItemStack> getChannel() {
+        return Api.INSTANCE.storage().getStorageChannel(IItemStorageChannel.class);
+    }
 
-	@Override
-	public Item getItem()
-	{
-		return this.getDefinition().getItem();
-	}
+    @Override
+    public ItemStack createItemStack() {
+        return ItemHandlerHelper.copyStackWithSize(this.getDefinition(),
+                (int) Math.min(Integer.MAX_VALUE, this.getStackSize()));
+    }
 
-	@Override
-	public int getItemDamage()
-	{
-		return this.sharedStack.getItemDamage();
-	}
+    @Override
+    public Item getItem() {
+        return this.getDefinition().getItem();
+    }
 
-	@Override
-	public boolean sameOre( final IAEItemStack is )
-	{
-		return OreHelper.INSTANCE.sameOre( this, is );
-	}
+    @Override
+    public int getItemDamage() {
+        return this.sharedStack.getItemDamage();
+    }
 
-	@Override
-	public boolean isSameType( final IAEItemStack otherStack )
-	{
-		if( otherStack == null )
-		{
-			return false;
-		}
+    @Override
+    public boolean sameOre( final IAEItemStack is )
+    {
+        return OreHelper.INSTANCE.sameOre( this, is );
+    }
 
-		return Objects.equals( this.sharedStack, ( (AEItemStack) otherStack ).sharedStack );
-	}
+    @Override
+    public boolean isSameType(final IAEItemStack otherStack) {
+        if (otherStack == null) {
+            return false;
+        }
 
-	@Override
-	public boolean isSameType( final ItemStack otherStack )
-	{
-		if( otherStack.isEmpty() )
-		{
-			return false;
-		}
-		int oldSize = otherStack.getCount();
+        return Objects.equals(this.sharedStack, ((AEItemStack) otherStack).sharedStack);
+    }
 
-		otherStack.setCount( 1 );
-		boolean ret = ItemStack.areItemStacksEqual( this.getDefinition(), otherStack );
-		otherStack.setCount( oldSize );
+    @Override
+    public boolean isSameType(final ItemStack otherStack) {
+        if (otherStack.isEmpty()) {
+            return false;
+        }
+        int oldSize = otherStack.getCount();
 
-		return ret;
-	}
+        otherStack.setCount(1);
+        boolean ret = ItemStack.areItemStacksEqual(this.getDefinition(), otherStack);
+        otherStack.setCount(oldSize);
 
-	@Override
-	public int hashCode()
-	{
-		return this.sharedStack.hashCode();
-	}
+        return ret;
+    }
 
-	@Override
-	public boolean equals( final Object ia )
-	{
-		if( ia instanceof AEItemStack )
-		{
-			return this.isSameType( (AEItemStack) ia );
-		}
-		else if( ia instanceof ItemStack )
-		{
-			return this.isSameType( (ItemStack) ia );
-		}
-		return false;
-	}
+    @Override
+    public int hashCode() {
+        return this.sharedStack.hashCode();
+    }
 
-	@Override
-	public String toString()
-	{
-		return this.getStackSize() + "x" + this.getDefinition().getItem().getUnlocalizedName() + "@" + this.getDefinition().getItemDamage();
-	}
+    @Override
+    public boolean equals(final Object ia) {
+        if (ia instanceof AEItemStack) {
+            return this.isSameType((AEItemStack) ia);
+        } else if (ia instanceof ItemStack) {
+            // this actually breaks the equals contract (being equals to unrelated classes)
+            return equals((ItemStack) ia);
+        }
+        return false;
+    }
 
-	@SideOnly( Side.CLIENT )
-	public List<String> getToolTip()
-	{
-		if( this.tooltip == null )
-		{
-			this.tooltip = Platform.getTooltip( this.asItemStackRepresentation() );
-		}
-		return this.tooltip;
-	}
+    @Override
+    public boolean equals(final ItemStack is) {
+        return this.isSameType(is);
+    }
 
-	@SideOnly( Side.CLIENT )
-	public String getDisplayName()
-	{
-		if( this.displayName == null )
-		{
-			this.displayName = Platform.getItemDisplayName( this.asItemStackRepresentation() );
-		}
-		return this.displayName;
-	}
+    @Override
+    public String toString() {
+        return this.getStackSize() + "x" + this.getDefinition().getItem().getRegistryName();
+    }
 
-	@SideOnly( Side.CLIENT )
-	public String getModID()
-	{
-		if( this.uniqueID == null )
-		{
-			this.uniqueID = Item.REGISTRY.getNameForObject( this.getDefinition().getItem() );
-		}
+    @SideOnly(Side.CLIENT)
+    public List<String> getToolTip() {
+        if (this.tooltip == null) {
+            this.tooltip = Platform.getTooltip(this.asItemStackRepresentation());
+        }
+        return this.tooltip;
+    }
 
-		if( this.uniqueID == null )
-		{
-			return "** Null";
-		}
+    @SideOnly(Side.CLIENT)
+    public String getDisplayName() {
+        if (this.displayName == null) {
+            this.displayName = Platform.getItemDisplayName(this.asItemStackRepresentation());
+        }
+        return this.displayName;
+    }
 
-		return this.uniqueID.getResourceDomain() == null ? "** Null" : this.uniqueID.getResourceDomain();
-	}
+    @SideOnly(Side.CLIENT)
+    public String getModID() {
+        return this.getDefinition().getItem().getRegistryName().getResourceDomain();
+    }
 
-	public Optional<OreReference> getOre()
-	{
-		return this.oreReference;
-	}
+    public Optional<OreReference> getOre()
+    {
+        return this.oreReference;
+    }
 
-	@Override
-	public boolean hasTagCompound()
-	{
-		return this.getDefinition().hasTagCompound();
-	}
+    @Override
+    public boolean hasTagCompound() {
+        return this.getDefinition().hasTagCompound();
+    }
 
-	@Override
-	public ItemStack asItemStackRepresentation()
-	{
-		return this.getDefinition().copy();
-	}
+    @Override
+    public ItemStack asItemStackRepresentation() {
+        return this.getDefinition().copy();
+    }
 
-	@Override
-	public ItemStack getDefinition()
-	{
-		return this.sharedStack.getDefinition();
-	}
+    @Override
+    public ItemStack getDefinition() {
+        return this.sharedStack.getDefinition();
+    }
 
-	AESharedItemStack getSharedStack()
-	{
-		return this.sharedStack;
-	}
+    AESharedItemStack getSharedStack() {
+        return this.sharedStack;
+    }
 
-	private boolean fuzzyItemStackComparison( ItemStack a, ItemStack b, FuzzyMode mode )
-	{
-		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() / (float) a.getMaxDamage();
-					final float percentDamageOfB = (float) b.getItemDamage() / (float) b.getMaxDamage();
+    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();
 
-					return ( percentDamageOfA > mode.breakPoint ) == ( percentDamageOfB > mode.breakPoint );
-				}
-			}
-
-			return a.getMetadata() == b.getMetadata();
-		}
-
-		return false;
-	}
+                return percentDamageOfA > mode.breakPoint == percentDamageOfB > mode.breakPoint;
+            }
+        }
 
+        return false;
+    }
 }

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

@@ -23,7 +23,6 @@
 
 package appeng.util.item;
 
-
 import java.lang.ref.WeakReference;
 import java.util.WeakHashMap;
 
@@ -31,56 +30,34 @@ import javax.annotation.Nonnull;
 
 import net.minecraft.item.ItemStack;
 
-import appeng.util.Platform;
+public final class AEItemStackRegistry {
+    private static final WeakHashMap<AESharedItemStack, WeakReference<AESharedItemStack>> REGISTRY = new WeakHashMap<>();
 
+    private AEItemStackRegistry() {
+    }
 
-public final class AEItemStackRegistry
-{
-	private static final WeakHashMap<AESharedItemStack, WeakReference<AESharedItemStack>> SERVER_REGISTRY = new WeakHashMap<>();
-	private static final WeakHashMap<AESharedItemStack, WeakReference<AESharedItemStack>> CLIENT_REGISTRY = new WeakHashMap<>();
+    static synchronized AESharedItemStack getRegisteredStack(final @Nonnull ItemStack itemStack) {
+        if (itemStack.isEmpty()) {
+            throw new IllegalArgumentException("stack cannot be empty");
+        }
 
-	private AEItemStackRegistry()
-	{
-	}
+        int oldStackSize = itemStack.getCount();
+        itemStack.setCount(1);
 
-	private static WeakHashMap<AESharedItemStack, WeakReference<AESharedItemStack>> registry()
-	{
-		if( Platform.isClient() )
-		{
-			return CLIENT_REGISTRY;
-		}
-		else
-		{
-			return SERVER_REGISTRY;
-		}
-	}
+        AESharedItemStack search = new AESharedItemStack(itemStack);
+        WeakReference<AESharedItemStack> weak = REGISTRY.get(search);
+        AESharedItemStack ret = null;
 
-	static synchronized AESharedItemStack getRegisteredStack( final @Nonnull ItemStack itemStack )
-	{
-		if( itemStack.isEmpty() )
-		{
-			throw new IllegalArgumentException( "stack cannot be empty" );
-		}
+        if (weak != null) {
+            ret = weak.get();
+        }
 
-		int oldStackSize = itemStack.getCount();
-		itemStack.setCount( 1 );
+        if (ret == null) {
+            ret = new AESharedItemStack(itemStack.copy());
+            REGISTRY.put(ret, new WeakReference<>(ret));
+        }
+        itemStack.setCount(oldStackSize);
 
-		AESharedItemStack search = new AESharedItemStack( itemStack );
-		WeakReference<AESharedItemStack> weak = registry().get( search );
-		AESharedItemStack ret = null;
-
-		if( weak != null )
-		{
-			ret = weak.get();
-		}
-
-		if( ret == null )
-		{
-			ret = new AESharedItemStack( itemStack.copy() );
-			registry().put( ret, new WeakReference<>( ret ) );
-		}
-		itemStack.setCount( oldStackSize );
-
-		return ret;
-	}
+        return ret;
+    }
 }

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

@@ -18,263 +18,76 @@
 
 package appeng.util.item;
 
-
 import java.util.Objects;
 
 import com.google.common.base.Preconditions;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 
-import appeng.api.config.FuzzyMode;
+final class AESharedItemStack {
 
+    private final ItemStack itemStack;
+    private final int itemId;
+    private final int itemDamage;
+    private final int hashCode;
 
-final class AESharedItemStack implements Comparable<AESharedItemStack>
-{
-	private static final NBTTagCompound LOW_TAG = new NBTTagCompound();
-	private static final NBTTagCompound HIGH_TAG = new NBTTagCompound();
+    public AESharedItemStack(final ItemStack itemStack) {
+        this(itemStack, itemStack.getItemDamage());
+    }
 
-	private final ItemStack itemStack;
-	private final int itemId;
-	private final int itemDamage;
-	private final int hashCode;
+    /**
+     * 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
+     */
+    private AESharedItemStack(ItemStack itemStack, int damage) {
+        this.itemStack = itemStack;
+        this.itemId = Item.getIdFromItem(itemStack.getItem());
+        this.itemDamage = damage;
 
-	public AESharedItemStack( final ItemStack itemStack )
-	{
-		this.itemStack = itemStack;
-		this.itemId = Item.getIdFromItem( itemStack.getItem() );
-		this.itemDamage = itemStack.getItemDamage();
-		this.hashCode = this.makeHashCode();
-	}
+        // Ensure this is always called last.
+        this.hashCode = this.makeHashCode();
+    }
 
-	Bounds getBounds( final FuzzyMode fuzzy, final boolean ignoreMeta )
-	{
-		return new Bounds( this.itemStack, fuzzy, ignoreMeta );
-	}
+    ItemStack getDefinition() {
+        return this.itemStack;
+    }
 
-	ItemStack getDefinition()
-	{
-		return this.itemStack;
-	}
+    int getItemDamage() {
+        return this.itemDamage;
+    }
 
-	int getItemDamage()
-	{
-		return this.itemDamage;
-	}
+    @Override
+    public int hashCode() {
+        return this.hashCode;
+    }
 
-	int getItemID()
-	{
-		return this.itemId;
-	}
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof AESharedItemStack)) {
+            return false;
+        }
 
-	@Override
-	public int hashCode()
-	{
-		return this.hashCode;
-	}
+        final AESharedItemStack other = (AESharedItemStack) obj;
+        Preconditions.checkState(this.itemStack.getCount() == 1, "ItemStack#getCount() has to be 1");
+        Preconditions.checkArgument(other.getDefinition().getCount() == 1, "ItemStack#getCount() has to be 1");
 
-	@Override
-	public boolean equals( final Object obj )
-	{
-		if( obj instanceof AESharedItemStack )
-		{
-			final AESharedItemStack other = (AESharedItemStack) obj;
+        if (this.itemStack == other.itemStack) {
+            return true;
+        }
+        return ItemStack.areItemStacksEqual(this.itemStack, other.itemStack);
+    }
 
-			Preconditions.checkState( this.itemStack.getCount() == 1, "ItemStack#getCount() has to be 1" );
-			Preconditions.checkArgument( other.getDefinition().getCount() == 1, "ItemStack#getCount() has to be 1" );
+    private int makeHashCode() {
+        return Objects.hash(
+                this.itemId,
+                this.itemDamage,
+                this.itemStack.hasTagCompound() ? this.itemStack.getTagCompound() : 0);
+    }
 
-			if( this.itemStack == other.itemStack )
-			{
-				return true;
-			}
-			return ItemStack.areItemStacksEqual( this.itemStack, other.itemStack );
-		}
-		return false;
-	}
-
-	@Override
-	public int compareTo( final AESharedItemStack b )
-	{
-		Preconditions.checkState( this.itemStack.getCount() == 1, "ItemStack#getCount() has to be 1" );
-		Preconditions.checkArgument( b.getDefinition().getCount() == 1, "ItemStack#getCount() has to be 1" );
-
-		if( this.itemStack == b.getDefinition() )
-		{
-			return 0;
-		}
-
-		final int id = this.itemId - b.itemId;
-		if( id != 0 )
-		{
-			return id;
-		}
-
-		final int damageValue = this.itemDamage - b.itemDamage;
-		if( damageValue != 0 )
-		{
-			return damageValue;
-		}
-
-		final int nbt = this.compareNBT( b.getDefinition() );
-		if( nbt != 0 )
-		{
-			return nbt;
-		}
-
-		if( !this.itemStack.areCapsCompatible( b.getDefinition() ) )
-		{
-			return System.identityHashCode( this.itemStack ) - System.identityHashCode( b.getDefinition() );
-		}
-		return 0;
-	}
-
-	private int compareNBT( final ItemStack b )
-	{
-		if( this.itemStack.getTagCompound() == b.getTagCompound() )
-		{
-			return 0;
-		}
-		if( this.itemStack.getTagCompound() == LOW_TAG || b.getTagCompound() == HIGH_TAG )
-		{
-			return -1;
-		}
-		if( this.itemStack.getTagCompound() == HIGH_TAG || b.getTagCompound() == LOW_TAG )
-		{
-			return 1;
-		}
-		return System.identityHashCode( this.itemStack.getTagCompound() ) - System.identityHashCode( b.getTagCompound() );
-	}
-
-	private int makeHashCode()
-	{
-		return Objects.hash( this.itemId, this.itemDamage, this.itemStack.hasTagCompound() ? this.itemStack.getTagCompound() : 0 );
-	}
-
-	/**
-	 * Creates the lower and upper bounds for a specific shared itemstack.
-	 */
-	public static final class Bounds
-	{
-		/**
-		 * Bounds enforced by {@link ItemStack#isEmpty()}
-		 */
-		private static final int MIN_DAMAGE_VALUE = 0;
-		private static final int MAX_DAMAGE_VALUE = 65535;
-
-		private final AESharedItemStack lower;
-		private final AESharedItemStack upper;
-
-		public Bounds( final ItemStack stack, final FuzzyMode fuzzy, final boolean ignoreMeta )
-		{
-			Preconditions.checkState( !stack.isEmpty(), "ItemStack#isEmpty() has to be false" );
-			Preconditions.checkState( stack.getCount() == 1, "ItemStack#getCount() has to be 1" );
-
-			final NBTTagCompound tag = stack.hasTagCompound() ? stack.getTagCompound() : null;
-
-			this.lower = this.makeLowerBound( stack, tag, fuzzy, ignoreMeta );
-			this.upper = this.makeUpperBound( stack, tag, fuzzy, ignoreMeta );
-		}
-
-		public AESharedItemStack lower()
-		{
-			return this.lower;
-		}
-
-		public AESharedItemStack upper()
-		{
-			return this.upper;
-		}
-
-		private AESharedItemStack makeLowerBound( final ItemStack itemStack, final NBTTagCompound tag, final FuzzyMode fuzzy, final boolean ignoreMeta )
-		{
-			final ItemStack newDef = itemStack.copy();
-
-			if( ignoreMeta )
-			{
-				newDef.setItemDamage( MIN_DAMAGE_VALUE );
-				newDef.setTagCompound( tag );
-			}
-			else
-			{
-				if( newDef.getItem().isDamageable() )
-				{
-					if (itemStack.getMaxDamage() == 0)
-					{
-						newDef.setItemDamage(itemStack.getItemDamage() );
-					}
-					else if ( fuzzy == FuzzyMode.IGNORE_ALL )
-					{
-						newDef.setItemDamage( MIN_DAMAGE_VALUE );
-					}
-					else if( fuzzy == FuzzyMode.PERCENT_99 )
-					{
-						if( itemStack.getItemDamage() == MIN_DAMAGE_VALUE )
-						{
-							newDef.setItemDamage( MIN_DAMAGE_VALUE );
-						}
-						else
-						{
-							newDef.setItemDamage( MIN_DAMAGE_VALUE + 1 );
-						}
-					}
-					else
-					{
-						final int breakpoint = fuzzy.calculateBreakPoint( itemStack.getMaxDamage() );
-						final int damage = breakpoint <= itemStack.getItemDamage() ? breakpoint : 0;
-						newDef.setItemDamage( damage );
-					}
-				}
-				newDef.setTagCompound( LOW_TAG );
-			}
-
-			return new AESharedItemStack( newDef );
-		}
-
-		private AESharedItemStack makeUpperBound( final ItemStack itemStack, final NBTTagCompound tag, final FuzzyMode fuzzy, final boolean ignoreMeta )
-		{
-			final ItemStack newDef = itemStack.copy();
-
-			if( ignoreMeta )
-			{
-				newDef.setItemDamage( MAX_DAMAGE_VALUE );
-				newDef.setTagCompound( tag );
-			}
-			else
-			{
-				if( newDef.getItem().isDamageable() )
-				{
-					if (itemStack.getMaxDamage() == 0)
-					{
-						newDef.setItemDamage(itemStack.getItemDamage() );
-					}
-					else if ( fuzzy == FuzzyMode.IGNORE_ALL )
-					{
-						newDef.setItemDamage( itemStack.getMaxDamage() + 1 );
-					}
-					else if( fuzzy == FuzzyMode.PERCENT_99 )
-					{
-						if( itemStack.getItemDamage() == MIN_DAMAGE_VALUE )
-						{
-							newDef.setItemDamage( MIN_DAMAGE_VALUE );
-						}
-						else
-						{
-							newDef.setItemDamage( itemStack.getMaxDamage() + 1 );
-						}
-					}
-					else
-					{
-						final int breakpoint = fuzzy.calculateBreakPoint( itemStack.getMaxDamage() );
-						final int damage = itemStack.getItemDamage() < breakpoint ? breakpoint - 1 : itemStack.getMaxDamage() + 1;
-						newDef.setItemDamage( damage );
-					}
-				}
-				newDef.setTagCompound( HIGH_TAG );
-			}
-
-			return new AESharedItemStack( newDef );
-		}
-
-	}
 }

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

@@ -18,169 +18,152 @@
 
 package appeng.util.item;
 
-
+import appeng.api.storage.data.IAEStack;
 import io.netty.buffer.ByteBuf;
 
-import appeng.api.storage.data.IAEStack;
 
+public abstract class AEStack<T extends IAEStack<T>> implements IAEStack<T> {
 
-public abstract class AEStack<StackType extends IAEStack<StackType>> implements IAEStack<StackType>
-{
+    private boolean isCraftable;
+    private long stackSize;
+    private long countRequestable;
 
-	private boolean isCraftable;
-	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;
+        }
 
-	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();
+    }
 
-		return tag.readLong();
-	}
+    @Override
+    public long getStackSize() {
+        return this.stackSize;
+    }
 
-	@Override
-	public long getStackSize()
-	{
-		return this.stackSize;
-	}
+    @Override
+    public T setStackSize(final long ss) {
+        this.stackSize = ss;
+        return (T) this;
+    }
 
-	@Override
-	public StackType setStackSize( final long ss )
-	{
-		this.stackSize = ss;
-		return (StackType) this;
-	}
+    @Override
+    public long getCountRequestable() {
+        return this.countRequestable;
+    }
 
-	@Override
-	public long getCountRequestable()
-	{
-		return this.countRequestable;
-	}
+    @Override
+    public T setCountRequestable(final long countRequestable) {
+        this.countRequestable = countRequestable;
+        return (T) this;
+    }
 
-	@Override
-	public StackType setCountRequestable( final long countRequestable )
-	{
-		this.countRequestable = countRequestable;
-		return (StackType) this;
-	}
+    @Override
+    public boolean isCraftable() {
+        return this.isCraftable;
+    }
 
-	@Override
-	public boolean isCraftable()
-	{
-		return this.isCraftable;
-	}
+    @Override
+    public T setCraftable(final boolean isCraftable) {
+        this.isCraftable = isCraftable;
+        return (T) this;
+    }
 
-	@Override
-	public StackType setCraftable( final boolean isCraftable )
-	{
-		this.isCraftable = isCraftable;
-		return (StackType) this;
-	}
+    @Override
+    public T reset() {
+        this.stackSize = 0;
+        this.setCountRequestable(0);
+        this.setCraftable(false);
+        return (T) this;
+    }
 
-	@Override
-	public StackType reset()
-	{
-		this.stackSize = 0;
-		// priority = Integer.MIN_VALUE;
-		this.setCountRequestable( 0 );
-		this.setCraftable( false );
-		return (StackType) this;
-	}
+    @Override
+    public T empty() {
+        final T dup = this.copy();
+        dup.reset();
+        return dup;
+    }
 
-	@Override
-	public StackType empty()
-	{
-		final StackType dup = this.copy();
-		dup.reset();
-		return dup;
-	}
+    @Override
+    public boolean isMeaningful() {
+        return this.stackSize != 0 || this.countRequestable > 0 || this.isCraftable;
+    }
 
-	@Override
-	public boolean isMeaningful()
-	{
-		return this.stackSize != 0 || this.countRequestable > 0 || this.isCraftable;
-	}
+    @Override
+    public void incStackSize(final long i) {
+        this.stackSize += i;
+    }
 
-	@Override
-	public void incStackSize( final long i )
-	{
-		this.stackSize += i;
-	}
+    @Override
+    public void decStackSize(final long i) {
+        this.stackSize -= i;
+    }
 
-	@Override
-	public void decStackSize( final long i )
-	{
-		this.stackSize -= i;
-	}
+    @Override
+    public void incCountRequestable(final long i) {
+        this.countRequestable += i;
+    }
 
-	@Override
-	public void incCountRequestable( final long i )
-	{
-		this.countRequestable += i;
-	}
+    @Override
+    public void decCountRequestable(final long i) {
+        this.countRequestable -= i;
+    }
 
-	@Override
-	public void decCountRequestable( final long i )
-	{
-		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 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 abstract boolean hasTagCompound();
-
-	protected void putPacketValue( final ByteBuf tag, final long num )
-	{
-		if( num <= 255 )
-		{
-			tag.writeByte( (byte) ( num + Byte.MIN_VALUE ) );
-		}
-		else if( num <= 65535 )
-		{
-			tag.writeShort( (short) ( num + Short.MIN_VALUE ) );
-		}
-		else if( num <= 4294967295L )
-		{
-			tag.writeInt( (int) ( num + Integer.MIN_VALUE ) );
-		}
-		else
-		{
-			tag.writeLong( num );
-		}
-	}
+    protected void putPacketValue( final ByteBuf tag, final long num )
+    {
+        if( num <= 255 )
+        {
+            tag.writeByte( (byte) ( num + Byte.MIN_VALUE ) );
+        }
+        else if( num <= 65535 )
+        {
+            tag.writeShort( (short) ( num + Short.MIN_VALUE ) );
+        }
+        else if( num <= 4294967295L )
+        {
+            tag.writeInt( (int) ( num + Integer.MIN_VALUE ) );
+        }
+        else
+        {
+            tag.writeLong( num );
+        }
+    }
 }

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

@@ -0,0 +1,192 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2021, TeamAppliedEnergistics, 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 java.util.Comparator;
+import java.util.Map;
+
+import appeng.util.Platform;
+import com.google.common.base.Preconditions;
+
+import gregtech.common.items.MetaTool;
+import net.minecraft.item.ItemStack;
+
+import it.unimi.dsi.fastutil.objects.Object2ObjectAVLTreeMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap;
+
+import appeng.api.config.FuzzyMode;
+import appeng.api.storage.data.IAEItemStack;
+
+/**
+ * This variant list is optimized for damageable items, and supports selecting durability ranges with
+ * {@link #findFuzzy(IAEItemStack, FuzzyMode)}.
+ */
+class FuzzyItemVariantList extends ItemVariantList {
+
+    static final SharedStackComparator COMPARATOR = new SharedStackComparator();
+
+    // NOTE: We only use Object as they key here so we can pass our special DamageBounds to the subMap method.
+    // We NEVER put any keys in this map that are not AESharedItemStacks.
+    private final Object2ObjectSortedMap<Object, IAEItemStack> records = new Object2ObjectAVLTreeMap<>(COMPARATOR);
+
+    @Override
+    public Collection<IAEItemStack> findFuzzy(final IAEItemStack filter, final FuzzyMode fuzzy) {
+        ItemStack itemStack = filter.getDefinition();
+
+        ItemDamageBound lowerBound = makeLowerBound(itemStack, fuzzy);
+        ItemDamageBound upperBound = makeUpperBound(itemStack, fuzzy);
+        Preconditions.checkState(lowerBound.itemDamage > upperBound.itemDamage);
+
+        return this.records.subMap(lowerBound, upperBound).values();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    Map<AESharedItemStack, IAEItemStack> getRecords() {
+        // We ensure on our end that we NEVER use anything but AESharedItemStack as the key in this map
+        return (Map<AESharedItemStack, IAEItemStack>) (Object) this.records;
+    }
+
+    static class ItemDamageBound {
+        final int itemDamage;
+
+        public ItemDamageBound(int itemDamage) {
+            this.itemDamage = itemDamage;
+        }
+    }
+
+    /**
+     * This comparator creates a strict and total ordering over all {@link AESharedItemStack} of the same item. To
+     * support selecting ranges of durability, it is defined for type {@link Object} and also accepts
+     * {@link ItemDamageBound} as an argument to compare against.
+     */
+    static class SharedStackComparator implements Comparator<Object> {
+        @Override
+        public int compare(Object a, Object b) {
+            // Either argument can either be a damage bound or a shared item stack
+            // Since we never put damage bounds into the map as keys, only one
+            // of the two arguments can possibly be a bound
+            ItemDamageBound boundA = null;
+            AESharedItemStack stackA = null;
+            int itemDamageA;
+            if (a instanceof ItemDamageBound) {
+                boundA = (ItemDamageBound) a;
+                itemDamageA = boundA.itemDamage;
+            } else {
+                stackA = (AESharedItemStack) a;
+                itemDamageA = stackA.getItemDamage();
+            }
+            ItemDamageBound boundB = null;
+            AESharedItemStack stackB = null;
+            int itemDamageB;
+            if (b instanceof ItemDamageBound) {
+                boundB = (ItemDamageBound) b;
+                itemDamageB = boundB.itemDamage;
+            } else {
+                stackB = (AESharedItemStack) b;
+                itemDamageB = stackB.getItemDamage();
+            }
+
+            // When either argument is a damage bound, we just compare the damage values because it is used
+            // only to get a certain damage range out of the map.
+            if (boundA != null || boundB != null) {
+                return Integer.compare(itemDamageB, itemDamageA);
+            }
+
+            ItemStack itemStackA = stackA.getDefinition();
+            ItemStack itemStackB = stackB.getDefinition();
+            Preconditions.checkState(itemStackA.getCount() == 1, "ItemStack#getCount() has to be 1");
+            Preconditions.checkArgument(itemStackB.getCount() == 1, "ItemStack#getCount() has to be 1");
+
+            if (itemStackA == itemStackB) {
+                return 0;
+            }
+
+            // Damaged items are sorted before undamaged items
+            final int damageValue = Integer.compare(itemDamageB, itemDamageA);
+            if (damageValue != 0) {
+                return damageValue;
+            }
+
+            // As a final tie breaker, order by the object identity of the item stack
+            // While this will order seemingly at random, we only need the order of
+            // damage values to be predictable, while still having to satisfy the
+            // complete order requirements of the sorted map
+            return Long.compare(System.identityHashCode(itemStackA), System.identityHashCode(itemStackB));
+        }
+    }
+
+    /**
+     * Minecraft reverses the damage values. So anything with a damage of 0 is undamaged and increases the more damaged
+     * the item is.
+     * <p>
+     * Further the used subMap follows [MAX_DAMAGE, MIN_DAMAGE), so to include undamaged items, we have to start with a
+     * lower damage value than 0, while it is fine to use {@link ItemStack#getMaxDamage()} for the upper bound.
+     */
+    private static final int MIN_DAMAGE_VALUE = -1;
+
+    /*
+     * 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" );
+
+        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() );
+            damage = stack.getItemDamage() <= breakpoint ? breakpoint : stack.getMaxDamage();
+        }
+
+        return new ItemDamageBound( damage );
+    }
+
+    /*
+     * Keep in mind that the stack order is from most damaged to least damaged, so this upper bound will actually be a
+     * 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");
+
+        int damage;
+        if (fuzzy == FuzzyMode.IGNORE_ALL) {
+            damage = MIN_DAMAGE_VALUE;
+        } else {
+            final int breakpoint = fuzzy.calculateBreakPoint(stack.getMaxDamage());
+            damage = stack.getItemDamage() <= breakpoint ? MIN_DAMAGE_VALUE : breakpoint;
+        }
+
+        return new ItemDamageBound(damage);
+    }
+
+}

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
+ * Copyright (c) 2013 - 2020, 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
@@ -18,212 +18,198 @@
 
 package appeng.util.item;
 
-
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.ConcurrentModificationException;
 import java.util.Iterator;
-import java.util.NavigableMap;
-import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.NoSuchElementException;
+import java.util.concurrent.atomic.AtomicInteger;
 
-import net.minecraftforge.oredict.OreDictionary;
+import appeng.util.Platform;
+import gregtech.common.items.MetaTool;
+import net.minecraft.item.Item;
+
+import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
+import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
 
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
-import appeng.util.item.AESharedItemStack.Bounds;
 
+public final class ItemList implements IItemList<IAEItemStack> {
 
-public final class ItemList implements IItemList<IAEItemStack>
-{
+    private final Reference2ObjectMap<Item, ItemVariantList> records = new Reference2ObjectOpenHashMap<>();
+    /**
+     * We increment this version field everytime an attempt to mutate this item list (or potentially one of its
+     * sub-lists) is made. Iterators will copy the version when they are created and compare it against the current
+     * version whenever they advance to trigger a {@link ConcurrentModificationException}.
+     */
+    private final AtomicInteger version = new AtomicInteger(0);
 
-	private final NavigableMap<AESharedItemStack, IAEItemStack> records = new ConcurrentSkipListMap<>();
+    @Override
+    public IAEItemStack findPrecise(final IAEItemStack itemStack) {
+        if (itemStack == null) {
+            return null;
+        }
 
-	@Override
-	public void add( final IAEItemStack option )
-	{
-		if( option == null )
-		{
-			return;
-		}
+        ItemVariantList record = this.records.get(itemStack.getItem());
+        return record != null ? record.findPrecise(itemStack) : null;
+    }
 
-		final IAEItemStack st = this.records.get( ( (AEItemStack) option ).getSharedStack() );
+    @Override
+    public Collection<IAEItemStack> findFuzzy(final IAEItemStack filter, final FuzzyMode fuzzy) {
+        if (filter == null) {
+            return Collections.emptyList();
+        }
 
-		if( st != null )
-		{
-			st.add( option );
-			return;
-		}
+        ItemVariantList record = this.records.get(filter.getItem());
+        return record != null ? record.findFuzzy(filter, fuzzy) : Collections.emptyList();
+    }
 
-		final IAEItemStack opt = option.copy();
+    @Override
+    public boolean isEmpty() {
+        return !this.iterator().hasNext();
+    }
 
-		this.putItemRecord( opt );
-	}
+    @Override
+    public void add(final IAEItemStack itemStack) {
+        version.incrementAndGet();
 
-	@Override
-	public IAEItemStack findPrecise( final IAEItemStack itemStack )
-	{
-		if( itemStack == null )
-		{
-			return null;
-		}
+        if (itemStack == null) {
+            return;
+        }
 
-		return this.records.get( ( (AEItemStack) itemStack ).getSharedStack() );
-	}
+        this.getOrCreateRecord(itemStack.getItem()).add(itemStack);
+    }
 
-	@Override
-	public Collection<IAEItemStack> findFuzzy( final IAEItemStack filter, final FuzzyMode fuzzy )
-	{
-		if( filter == null )
-		{
-			return Collections.emptyList();
-		}
+    @Override
+    public void addStorage(final IAEItemStack itemStack) {
+        version.incrementAndGet();
 
-		final AEItemStack ais = (AEItemStack) filter;
+        if (itemStack == null) {
+            return;
+        }
 
-		return ais.getOre().map( or ->
-		{
-			if( or.getAEEquivalents().size() == 1 )
-			{
-				final IAEItemStack is = or.getAEEquivalents().get( 0 );
+        this.getOrCreateRecord(itemStack.getItem()).addStorage(itemStack);
+    }
 
-				return this.findFuzzyDamage( is, fuzzy, is.getItemDamage() == OreDictionary.WILDCARD_VALUE );
-			}
-			else
-			{
-				final Collection<IAEItemStack> output = new ArrayList<>();
+    @Override
+    public void addCrafting(final IAEItemStack itemStack) {
+        version.incrementAndGet();
 
-				for( final IAEItemStack is : or.getAEEquivalents() )
-				{
-					output.addAll( this.findFuzzyDamage( is, fuzzy, is.getItemDamage() == OreDictionary.WILDCARD_VALUE ) );
-				}
+        if (itemStack == null) {
+            return;
+        }
 
-				return output;
-			}
-		} ).orElse( this.findFuzzyDamage( ais, fuzzy, false ) );
-	}
+        this.getOrCreateRecord(itemStack.getItem()).addCrafting(itemStack);
+    }
 
-	@Override
-	public boolean isEmpty()
-	{
-		return !this.iterator().hasNext();
-	}
+    @Override
+    public void addRequestable(final IAEItemStack itemStack) {
+        version.incrementAndGet();
 
-	@Override
-	public void addStorage( final IAEItemStack option )
-	{
-		if( option == null )
-		{
-			return;
-		}
+        if (itemStack == null) {
+            return;
+        }
 
-		final IAEItemStack st = this.records.get( ( (AEItemStack) option ).getSharedStack() );
+        this.getOrCreateRecord(itemStack.getItem()).addRequestable(itemStack);
+    }
 
-		if( st != null )
-		{
-			st.incStackSize( option.getStackSize() );
-			return;
-		}
+    @Override
+    public IAEItemStack getFirstItem() {
+        for (final IAEItemStack stackType : this) {
+            return stackType;
+        }
 
-		final IAEItemStack opt = option.copy();
+        return null;
+    }
 
-		this.putItemRecord( opt );
-	}
+    @Override
+    public int size() {
+        int size = 0;
+        for (ItemVariantList entry : records.values()) {
+            size += entry.size();
+        }
 
-	/*
-	 * public void clean() { Iterator<StackType> i = iterator(); while (i.hasNext()) { StackType AEI =
-	 * i.next(); if ( !AEI.isMeaningful() ) i.remove(); } }
-	 */
+        return size;
+    }
 
-	@Override
-	public void addCrafting( final IAEItemStack option )
-	{
-		if( option == null )
-		{
-			return;
-		}
+    @Override
+    public Iterator<IAEItemStack> iterator() {
+        return new ChainedIterator(this.records.values().iterator(), version);
+    }
 
-		final IAEItemStack st = this.records.get( ( (AEItemStack) option ).getSharedStack() );
+    @Override
+    public void resetStatus() {
+        for (final IAEItemStack i : this) {
+            i.reset();
+        }
+    }
 
-		if( st != null )
-		{
-			st.setCraftable( true );
-			return;
-		}
+    private ItemVariantList getOrCreateRecord(Item item) {
+        return this.records.computeIfAbsent(item, this::makeRecordMap);
+    }
 
-		final IAEItemStack opt = option.copy();
-		opt.setStackSize( 0 );
-		opt.setCraftable( true );
+    private ItemVariantList makeRecordMap(Item item) {
+        if (item.isDamageable() ) {
+            return new FuzzyItemVariantList();
+        } else {
+            return new NormalItemVariantList();
+        }
+    }
 
-		this.putItemRecord( opt );
-	}
+    /**
+     * Iterates over multiple item lists as if they were one list.
+     */
+    private static class ChainedIterator implements Iterator<IAEItemStack> {
 
-	@Override
-	public void addRequestable( final IAEItemStack option )
-	{
-		if( option == null )
-		{
-			return;
-		}
+        private final AtomicInteger parentVersion;
+        private final int version;
+        private final Iterator<ItemVariantList> parent;
+        private Iterator<IAEItemStack> next;
 
-		final IAEItemStack st = this.records.get( ( (AEItemStack) option ).getSharedStack() );
+        public ChainedIterator(Iterator<ItemVariantList> iterator, AtomicInteger parentVersion) {
+            this.parent = iterator;
+            this.parentVersion = parentVersion;
+            this.version = parentVersion.get();
+            this.ensureItems();
+        }
 
-		if( st != null )
-		{
-			st.setCountRequestable( st.getCountRequestable() + option.getCountRequestable() );
-			return;
-		}
+        @Override
+        public boolean hasNext() {
+            return next != null && next.hasNext();
+        }
 
-		final IAEItemStack opt = option.copy();
-		opt.setStackSize( 0 );
-		opt.setCraftable( false );
-		opt.setCountRequestable( option.getCountRequestable() );
+        @Override
+        public IAEItemStack next() {
+            if (this.next == null) {
+                throw new NoSuchElementException();
+            }
+            if (this.version != this.parentVersion.get()) {
+                throw new ConcurrentModificationException();
+            }
 
-		this.putItemRecord( opt );
-	}
+            IAEItemStack result = this.next.next();
+            this.ensureItems();
+            return result;
+        }
 
-	@Override
-	public IAEItemStack getFirstItem()
-	{
-		for( final IAEItemStack stackType : this )
-		{
-			return stackType;
-		}
+        private void ensureItems() {
+            if (hasNext()) {
+                return; // Still items left in the current one
+            }
 
-		return null;
-	}
+            // Find the next iterator willing to return some items...
+            while (this.parent.hasNext()) {
+                this.next = this.parent.next().iterator();
 
-	@Override
-	public int size()
-	{
-		return this.records.size();
-	}
+                if (this.next.hasNext()) {
+                    return; // Found one!
+                }
+            }
 
-	@Override
-	public Iterator<IAEItemStack> iterator()
-	{
-		return new MeaningfulItemIterator<>( this.records.values().iterator() );
-	}
-
-	@Override
-	public void resetStatus()
-	{
-		for( final IAEItemStack i : this )
-		{
-			i.reset();
-		}
-	}
-
-	private IAEItemStack putItemRecord( final IAEItemStack itemStack )
-	{
-		return this.records.put( ( (AEItemStack) itemStack ).getSharedStack(), itemStack );
-	}
-
-	private Collection<IAEItemStack> findFuzzyDamage( final IAEItemStack filter, final FuzzyMode fuzzy, final boolean ignoreMeta )
-	{
-		final AEItemStack itemStack = (AEItemStack) filter;
-		final Bounds bounds = itemStack.getSharedStack().getBounds( fuzzy, ignoreMeta );
-
-		return this.records.subMap( bounds.lower(), true, bounds.upper(), true ).descendingMap().values();
-	}
+            // No more items
+            this.next = null;
+        }
+    }
 }

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

@@ -0,0 +1,118 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2021, TeamAppliedEnergistics, 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 java.util.Iterator;
+import java.util.Map;
+
+import appeng.api.config.FuzzyMode;
+import appeng.api.storage.data.IAEItemStack;
+
+/**
+ * Stores variants of a single type of {@link net.minecraft.item.Item}, i.e. versions with different durability, or
+ * different NBT or capabilities.
+ */
+abstract class ItemVariantList {
+
+    public void add(final IAEItemStack option) {
+        final IAEItemStack st = this.getRecords().get(((AEItemStack) option).getSharedStack());
+
+        if (st != null) {
+            st.add(option);
+            return;
+        }
+
+        final IAEItemStack opt = option.copy();
+
+        this.putItemRecord(opt);
+    }
+
+    public IAEItemStack findPrecise(final IAEItemStack itemStack) {
+        return this.getRecords().get(((AEItemStack) itemStack).getSharedStack());
+    }
+
+    public void addStorage(final IAEItemStack option) {
+        final IAEItemStack st = this.getRecords().get(((AEItemStack) option).getSharedStack());
+
+        if (st != null) {
+            st.incStackSize(option.getStackSize());
+            return;
+        }
+
+        final IAEItemStack opt = option.copy();
+
+        this.putItemRecord(opt);
+    }
+
+    public void addCrafting(final IAEItemStack option) {
+        final IAEItemStack st = this.getRecords().get(((AEItemStack) option).getSharedStack());
+
+        if (st != null) {
+            st.setCraftable(true);
+            return;
+        }
+
+        final IAEItemStack opt = option.copy();
+        opt.setStackSize(0);
+        opt.setCraftable(true);
+
+        this.putItemRecord(opt);
+    }
+
+    public void addRequestable(final IAEItemStack option) {
+        final IAEItemStack st = this.getRecords().get(((AEItemStack) option).getSharedStack());
+
+        if (st != null) {
+            st.setCountRequestable(st.getCountRequestable() + option.getCountRequestable());
+            return;
+        }
+
+        final IAEItemStack opt = option.copy();
+        opt.setStackSize(0);
+        opt.setCraftable(false);
+        opt.setCountRequestable(option.getCountRequestable());
+
+        this.putItemRecord(opt);
+    }
+
+    public int size() {
+        int size = 0;
+        for (IAEItemStack entry : getRecords().values()) {
+            if (entry.isMeaningful()) {
+                size++;
+            }
+        }
+
+        return size;
+    }
+
+    public Iterator<IAEItemStack> iterator() {
+        return new MeaningfulItemIterator<>(this.getRecords().values());
+    }
+
+    private void putItemRecord(final IAEItemStack itemStack) {
+        this.getRecords().put(((AEItemStack) itemStack).getSharedStack(), itemStack);
+    }
+
+    abstract Map<AESharedItemStack, IAEItemStack> getRecords();
+
+    public abstract Collection<IAEItemStack> findFuzzy(final IAEItemStack filter, final FuzzyMode fuzzy);
+
+}

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
+ * Copyright (c) 2021, TeamAppliedEnergistics, 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
@@ -18,59 +18,53 @@
 
 package appeng.util.item;
 
-
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 import appeng.api.storage.data.IAEItemStack;
 
+/**
+ * This iterator will only return items from a collection that are meaningful (w.r.t.
+ * {@link IAEItemStack#isMeaningful()}. Items that are not meaningful are automatically removed from the collection as
+ * it is being iterated.
+ */
+public class MeaningfulItemIterator<T extends IAEItemStack> implements Iterator<T> {
+    private final Iterator<T> parent;
+    private T next;
 
-public class MeaningfulItemIterator<T extends IAEItemStack> implements Iterator<T>
-{
+    public MeaningfulItemIterator(final Collection<T> collection) {
+        this.parent = collection.iterator();
+        this.next = seekNext();
+    }
 
-	private final Iterator<T> parent;
-	private T next;
+    @Override
+    public boolean hasNext() {
+        return this.next != null;
+    }
 
-	public MeaningfulItemIterator( final Iterator<T> iterator )
-	{
-		this.parent = iterator;
-	}
+    @Override
+    public T next() {
+        if (this.next == null) {
+            throw new NoSuchElementException();
+        }
 
-	@Override
-	public boolean hasNext()
-	{
-		while( this.parent.hasNext() )
-		{
-			this.next = this.parent.next();
+        T result = this.next;
+        this.next = this.seekNext();
+        return result;
+    }
 
-			if( this.next.isMeaningful() )
-			{
-				return true;
-			}
-			else
-			{
-				this.parent.remove(); // self cleaning :3
-			}
-		}
+    private T seekNext() {
+        while (this.parent.hasNext()) {
+            T item = this.parent.next();
 
-		this.next = null;
-		return false;
-	}
+            if (item.isMeaningful()) {
+                return item;
+            } else {
+                this.parent.remove();
+            }
+        }
 
-	@Override
-	public T next()
-	{
-		if( this.next == null )
-		{
-			throw new NoSuchElementException();
-		}
-
-		return this.next;
-	}
-
-	@Override
-	public void remove()
-	{
-		this.parent.remove();
-	}
+        return null;
+    }
 }

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

@@ -0,0 +1,51 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2021, TeamAppliedEnergistics, 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 java.util.Map;
+
+import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
+import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
+
+import appeng.api.config.FuzzyMode;
+import appeng.api.storage.data.IAEItemStack;
+
+/**
+ * This variant list is optimized for items that cannot be damaged and thus do not support querying durability ranges
+ * via {@link #findFuzzy(IAEItemStack, FuzzyMode)}.
+ */
+class NormalItemVariantList extends ItemVariantList {
+
+    private final Reference2ObjectMap<AESharedItemStack, IAEItemStack> records = new Reference2ObjectOpenHashMap<>();
+
+    @Override
+    Map<AESharedItemStack, IAEItemStack> getRecords() {
+        return this.records;
+    }
+
+    /**
+     * For items that do not support durability, we just return all variants to a fuzzy search.
+     */
+    @Override
+    public Collection<IAEItemStack> findFuzzy(IAEItemStack filter, FuzzyMode fuzzy) {
+        return this.getRecords().values();
+    }
+
+}

src/main/resources/assets/appliedenergistics2/advancements/main/cable_glass.json

@@ -1,4 +1,25 @@
 {
+    "conditions": [
+        {
+            "type": "forge:and",
+            "values": [
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:charger"
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 7
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:part",
+                    "data": 16
+                }
+            ]
+        }
+    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:part",
@@ -25,4 +46,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/charged_quartz.json

@@ -1,4 +1,11 @@
 {
+    "conditions": [
+        {
+            "type": "minecraft:item_exists",
+            "item": "appliedenergistics2:material",
+            "data": 1
+        }
+    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:material",
@@ -25,4 +32,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/charger.json

@@ -1,4 +1,20 @@
 {
+    "conditions": [
+        {
+            "type": "forge:and",
+            "values": [
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:charger"
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 1
+                }
+            ]
+        }
+    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:charger"
@@ -23,4 +39,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/compass.json

@@ -1,4 +1,10 @@
 {
+    "conditions": [
+        {
+            "type": "minecraft:item_exists",
+            "item": "appliedenergistics2:sky_compass"
+        }
+    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:sky_compass"
@@ -23,4 +29,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/controller.json

@@ -1,4 +1,35 @@
 {
+    "conditions": [
+        {
+            "type": "forge:and",
+            "values": [
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 13
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 14
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 15
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 19
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:controller"
+                }
+            ]
+        }
+    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:controller"
@@ -23,4 +54,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/crafting_cpu.json

@@ -1,4 +1,61 @@
 {
+    "conditions": [
+        {
+            "type": "forge:and",
+            "values": [
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:crafting_storage_1k"
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:crafting_storage_4k"
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:crafting_storage_16k"
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:crafting_storage_64k"
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 13
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 14
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 15
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 19
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:controller"
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:part",
+                    "data": 360
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:part",
+                    "data": 340
+                }
+            ]
+        }
+    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:crafting_storage_64k"
@@ -61,4 +118,4 @@
             "c64k"
         ]
     ]
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/crafting_terminal.json

@@ -1,4 +1,40 @@
 {
+    "conditions": [
+        {
+            "type": "forge:and",
+            "values": [
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 13
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 14
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 15
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 19
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:controller"
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:part",
+                    "data": 360
+                }
+            ]
+        }
+    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:part",
@@ -25,4 +61,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/facade.json

@@ -1,7 +1,33 @@
 {
+    "conditions": [
+        {
+            "type": "forge:and",
+            "values": [
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:charger"
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 7
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:part",
+                    "data": 16
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:facade"
+                }
+            ]
+        }
+    ],
     "display": {
         "icon": {
-            "item": "appliedenergistics2:facade"
+            "item": "appliedenergistics2:facade",
+            "nbt": "{item:\"minecraft:stone\"}"
         },
         "title": {
             "translate": "achievement.ae2.Facade"
@@ -23,4 +49,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/fluix.json

@@ -1,4 +1,20 @@
 {
+    "conditions": [
+        {
+            "type": "forge:and",
+            "values": [
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:charger"
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 7
+                }
+            ]
+        }
+    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:material",
@@ -25,4 +41,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/growth_accelerator.json

@@ -1,4 +1,24 @@
 {
+    "conditions": [
+        {
+            "type": "forge:and",
+            "values": [
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:charger"
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 7
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:quartz_growth_accelerator"
+                }
+            ]
+        }
+    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:quartz_growth_accelerator"
@@ -23,4 +43,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/interface.json

@@ -1,4 +1,29 @@
 {
+    "conditions": [
+        {
+            "type": "forge:and",
+            "values": [
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:charger"
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:material",
+                    "data": 7
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:part",
+                    "data": 16
+                },
+                {
+                    "type": "minecraft:item_exists",
+                    "item": "appliedenergistics2:interface"
+                }
+            ]
+        }
+    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:interface"
@@ -23,4 +48,4 @@
             }
         }
     }
-}
+}

src/main/resources/assets/appliedenergistics2/advancements/main/ioport.json

@@ -1,4 +1,50 @@
 {
+    "conditions": [
+        {
+            "type": "minecraft:item_exists",
+            "item": "appliedenergistics2:storage_cell_1k"
+        },
+        {
+            "type": "minecraft:item_exists",
+            "item": "appliedenergistics2:storage_cell_4k"
+        },
+        {
+            "type": "minecraft:item_exists",
+            "item": "appliedenergistics2:storage_cell_16k"
+        },
+        {
+            "type": "minecraft:item_exists",
+            "item": "appliedenergistics2:storage_cell_64k"
+        },
+        {
+            "type": "minecraft:item_exists",
+            "item": "appliedenergistics2:material",
+            "data": 13
+        },
+        {
+            "type": "minecraft:item_exists",
+            "item": "appliedenergistics2:material",
+            "data": 14
+        },
+        {
+            "type": "minecraft:item_exists",
+            "item": "appliedenergistics2:material",
+            "data": 15
+        },
+        {
+            "type": "minecraft:item_exists",
+            "item": "appliedenergistics2:material",
+            "data": 19
+        },
+        {
+            "type": "minecraft:item_exists",
+            "item": "appliedenergistics2:controller"
+        },
+        {
+            "type": "minecraft:item_exists",
+            "item": "appliedenergistics2:io_port"
+        }
+    ],
     "display": {
         "icon": {
             "item": "appliedenergistics2:io_port"
@@ -23,4 +69,4 @@
             }
         }
     }
-}
+}