Merge branch 'rr-interfaces' into AE2-Omnifactory

remove GTCE-specific handler and adaptor

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

@@ -32,12 +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;
@@ -72,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;
@@ -110,6 +103,22 @@ 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()
 	{
@@ -198,35 +207,65 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 				this.drawTooltip( (ITooltip) c, mouseX, mouseY );
 			}
 		}
-		/*
-		if ( isPointInRegion( -guiLeft,-guiTop, mc.displayWidth, mc.displayHeight, mouseX,mouseY)){
-			Object o = runtime.getBookmarkOverlay().getIngredientUnderMouse();
-			if (o != null) {
-				List<IGhostIngredientHandler.Target<Object>> hoveredIngredientTargets = aeGuiHandler.getTargets( this, o, false );
-				if (hoveredIngredientTargets.size() > 0 )
+		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 )
 				{
-					GlStateManager.disableLighting();
-					GlStateManager.disableDepth();
-					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 );
-					aeGuiHandler.getTargets( this, o, true );
+					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 )
@@ -359,7 +398,6 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 		{
 			slot.drawBackground( ox, oy );
 		}
-
 	}
 
 	@Override
@@ -468,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;
 		}
 
@@ -599,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;
 					}
@@ -673,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 );
 					}
@@ -686,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 );
 	}
 
@@ -1113,4 +1191,5 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 	{
 		return false;
 	}
+
 }

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

@@ -9,6 +9,7 @@ import appeng.fluids.client.gui.widgets.GuiFluidSlot;
 import mezz.jei.api.gui.IAdvancedGuiHandler;
 import mezz.jei.api.gui.IGhostIngredientHandler;
 import net.minecraft.client.gui.GuiScreen;
+import org.lwjgl.input.Mouse;
 
 import java.awt.*;
 import java.util.ArrayList;
@@ -101,7 +102,7 @@ public class AEGuiHandler implements IAdvancedGuiHandler<AEBaseGui>, IGhostIngre
             List<Target<?>> phantomTargets = g.getPhantomTargets( ingredient );
             targets.addAll( (List<Target<I>>) (Object) phantomTargets );
         }
-        if( doStart && GuiScreen.isShiftKeyDown()  )
+        if( doStart && GuiScreen.isShiftKeyDown() && Mouse.isButtonDown( 0 ) )
         {
             if( gui instanceof GuiUpgradeable || gui instanceof GuiPatternTerm )
             {

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

@@ -26,7 +26,6 @@ import java.util.List;
 
 import appeng.client.gui.widgets.GuiCustomSlot;
 import appeng.container.interfaces.IJEIGhostIngredients;
-import appeng.container.slot.AppEngSlot;
 import appeng.container.slot.IJEITargetSlot;
 import appeng.container.slot.SlotFake;
 import appeng.core.sync.packets.PacketInventoryAction;

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

@@ -22,16 +22,16 @@ package appeng.core.sync.packets;
 import java.io.IOException;
 
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.client.gui.implementations.GuiUpgradeable;
-import appeng.client.gui.widgets.GuiCustomSlot;
 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;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
@@ -193,9 +193,11 @@ public class PacketInventoryAction extends AppEngPacket
 			{
 				if( sender.openContainer.inventorySlots.get( this.slot ) instanceof SlotFake )
 				{
-					if( this.slotItem != null ) {
-						sender.openContainer.inventorySlots.get( this.slot ).putStack( this.slotItem.asItemStackRepresentation() );
-						if (sender.openContainer.inventorySlots.get( this.slot ).getStack().isEmpty()){
+					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 )
 							{
@@ -205,26 +207,24 @@ public class PacketInventoryAction extends AppEngPacket
 						}
 					}
 					else sender.openContainer.inventorySlots.get( this.slot ).putStack( ItemStack.EMPTY );
-				}
-				if( Minecraft.getMinecraft().currentScreen instanceof GuiUpgradeable )
-				{
-					GuiUpgradeable cs = ( (GuiUpgradeable) Minecraft.getMinecraft().currentScreen );
-					if( cs.getGuiSlots().size() > 0 )
+					try
 					{
-						GuiCustomSlot ct = cs.getGuiSlots().get( this.slot );
-						GuiFluidSlot gfs = (GuiFluidSlot) ct;
-						if( this.slotItem != null )
+						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 )
 						{
-							IAEFluidStack aefs = AEFluidStack.fromNBT( this.slotItem.getDefinition().getTagCompound() );
-							if( aefs != null )
-							{
-								FluidStack fluid = aefs.getFluidStack();
-								gfs.setFluidStack( AEFluidStack.fromFluidStack( fluid ) );
-							}
-						}
-						else
-						{
-							gfs.setFluidStack( null );
+							( (ContainerFluidConfigurable) sender.openContainer ).getFluidConfigInventory().setFluidInSlot( this.slot, aefs );
 						}
 					}
 				}

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

@@ -19,18 +19,13 @@
 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 java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 
-import appeng.integration.modules.gregtech.GTCEInventoryAdaptor;
 import appeng.util.*;
+import appeng.util.inv.*;
 import com.google.common.collect.ImmutableSet;
 
 import gregtech.api.block.machines.BlockMachine;
@@ -93,8 +88,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 +99,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;
@@ -117,8 +106,6 @@ import static gregtech.api.block.machines.BlockMachine.getMetaTileEntity;
 
 public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost
 {
-	private int[] failedCraftTriesSlot = {0,0,0,0,0,0,0,0,0};
-
 	public static final int NUMBER_OF_STORAGE_SLOTS = 9;
 	public static final int NUMBER_OF_CONFIG_SLOTS = 9;
 	public static final int NUMBER_OF_PATTERN_SLOTS = 9;
@@ -148,7 +135,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	private IMEInventory<IAEItemStack> destination;
 	private int isWorking = -1;
 	private final Accessor accessor = new Accessor();
-	private GTCEInventoryAdaptor GTad;
+	private EnumSet<EnumFacing> visitedFaces = EnumSet.noneOf( EnumFacing.class );
+	private EnumMap<EnumFacing,List<ItemStack>> waitingToSendFacing = new EnumMap<>(EnumFacing.class);
 
 	public DualityInterface( final AENetworkProxy networkProxy, final IInterfaceHost ih )
 	{
@@ -242,6 +230,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,6 +270,23 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			}
 		}
 
+		this.waitingToSendFacing = null;
+		final NBTTagCompound waitingListSided = data.getCompoundTag("sidedWaitList");
+
+		for (EnumFacing s : EnumFacing.values())
+			if (waitingListSided.hasKey( s.name() )) {
+				NBTTagList w = waitingListSided.getTagList( s.name(), 10 );
+				for( int x = 0; x < w.tagCount(); x++ )
+				{
+					final NBTTagCompound c = w.getCompoundTagAt( x );
+					if( c != null )
+					{
+						final ItemStack is = new ItemStack( c );
+						this.addToSendListFacing( is , EnumFacing.getFront( s.getIndex() ) );
+					}
+				}
+			}
+
 		this.craftingTracker.readFromNBT( data );
 		this.upgrades.readFromNBT( data, "upgrades" );
 		this.config.readFromNBT( data, "config" );
@@ -296,6 +322,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;
@@ -393,24 +443,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 +563,21 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		return this.waitingToSend != null && !this.waitingToSend.isEmpty();
 	}
 
+	private boolean hasItemsToSendFacing()
+	{
+		if (waitingToSendFacing != null)
+		{
+			for( EnumFacing enumFacing : waitingToSendFacing.keySet() )
+			{
+				if( !waitingToSendFacing.get( enumFacing ).isEmpty() )
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 	@Override
 	public boolean canInsert( final ItemStack stack )
 	{
@@ -586,11 +649,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 +724,47 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		}
 	}
 
+	private void pushItemsOut( final EnumFacing s )
+	{
+		if( this.waitingToSendFacing.get(s) == null || 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.get( s ).clear();
+		}
+	}
+
 	private boolean updateStorage()
 	{
 		boolean didSomething = false;
@@ -770,17 +884,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			if( this.getInstalledUpgrades( Upgrades.CRAFTING ) > 0 && itemStack != null )
 			{
-				if (this.failedCraftTriesSlot[x] <= 0)
-				{
-					boolean crafted = this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(),
+				return this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(),
 						this.gridProxy.getGrid(), this.gridProxy.getCrafting(), this.mySource );
-
-					if (crafted) this.failedCraftTriesSlot[x] = 0;
-					else{
-						this.failedCraftTriesSlot[x] += 2;
-					}
-				}
-				this.failedCraftTriesSlot[x] -= 1;
 			}
 		}
 		catch( final GridAccessException e )
@@ -913,24 +1018,28 @@ 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 ) )
+		final Iterator<ICraftingPatternDetails> i = this.craftingList.iterator();
+		ICraftingPatternDetails patt = i.next();
+		for ( ItemSlot itemSlot : inv)
 		{
-			return !inv.simulateRemove( 1, ItemStack.EMPTY, null ).isEmpty();
+			if (itemSlot.getItemStack().isEmpty()){
+				continue;
+			}
+			for ( IAEItemStack iaeItemStack : patt.getCondensedInputs()){
+				if (iaeItemStack.isSameType( itemSlot.getItemStack() )){
+					return true;
+				}
+			}
 		}
-		else return inv.containsItems();
-	}
-
-	private static boolean invIsBlockedGTCE( GTCEInventoryAdaptor inv )
-	{
-		return ( !inv.canRemoveAllExceptCircuits() );
+		return false;
 	}
 
 	@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 +1047,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 +1061,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				{
 					if( ( (IInterfaceHost) te ).getInterfaceDuality().sameGrid( this.gridProxy.getGrid() ) )
 					{
+						visitedFaces.remove( s );
 						continue;
 					}
 				}
@@ -964,8 +1078,10 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				{
 					if( cm.pushPattern( patternDetails, table, s.getOpposite() ) )
 					{
+						visitedFaces.remove( s );
 						return true;
 					}
+					visitedFaces.remove( s );
 					continue;
 				}
 			}
@@ -973,55 +1089,45 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
 			if( ad != null )
 			{
+				boolean isDrawer = te.getBlockType().getRegistryName().getResourceDomain().equals( "storagedrawers" );
 				if( this.isBlocking() )
 				{
-					if( te.getBlockType().getRegistryName().getResourceDomain().equals( "gregtech" ) )
+					if( invIsBlocked( ad ) )
 					{
-						GTad = GTCEInventoryAdaptor.getAdaptor( te, s.getOpposite() );
-						if( invIsBlockedGTCE( GTad ) )
-						{
-							continue;
-						}
-					}
-					else
-					{
-						if( invIsBlocked( ad ) )
-						{
-							continue;
-						}
+						continue;
 					}
 				}
 
-				if( this.acceptsItems( ad, table ) )
+				if( this.acceptsItems( ad, patternDetails, isDrawer ) )
 				{
 					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 );
 						}
+						pushItemsOut( s );
 					}
-					this.pushItemsOut( possibleDirections );
+					visitedFaces.remove( 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();
@@ -1037,23 +1143,10 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
 				if( ad != null )
 				{
-					if( te.getBlockType().getRegistryName().getResourceDomain().equals( "gregtech" ) )
+					if( !invIsBlocked( ad ) )
 					{
-						GTad = GTCEInventoryAdaptor.getAdaptor( te, s.getOpposite() );
-						if( !invIsBlockedGTCE( GTad ) )
-						{
-							allAreBusy = false;
-							break;
-						}
-					}
-					else
-					{
-						if( !invIsBlocked( ad ) )
-						{
-							allAreBusy = false;
-							break;
-						}
-
+						allAreBusy = false;
+						break;
 					}
 				}
 			}
@@ -1072,23 +1165,85 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		return this.cm.getSetting( Settings.BLOCK ) == YesNo.YES;
 	}
 
-	private boolean acceptsItems( final InventoryAdaptor ad, final InventoryCrafting table )
+	private boolean acceptsItems( final InventoryAdaptor ad, final ICraftingPatternDetails patternDetails, boolean isDrawer )
 	{
-		for( int x = 0; x < table.getSizeInventory(); x++ )
+		List<ItemStack> patternedStacks = Arrays.stream( patternDetails.getCondensedInputs() ).map( IAEItemStack::createItemStack ).collect( Collectors.toList() );
+		List<ItemSlot> copiedItemSlots = new ArrayList<>();
+
+		if( patternedStacks.size() == 1 )
 		{
-			final ItemStack is = table.getStackInSlot( x );
-			if( is.isEmpty() )
-			{
-				continue;
-			}
-
-			if( !ad.simulateAdd( is.copy() ).isEmpty() )
-			{
-				return false;
-			}
+			return ad.simulateAdd( patternedStacks.get( 0 ) ).isEmpty();
 		}
+		else
+		{
+			Iterator<ItemSlot> adit = ad.iterator();
+			while ( adit.hasNext() )
+			{
+				ItemSlot is = adit.next();
+				//skip storage drawers slot 0 to avoid voiding items due to broken itemhandler implementation
+				if( isDrawer && is.getSlot() == 0 ) is = adit.next();
 
-		return true;
+				//some inventory may expose their special slots ( for upgrades, etc )
+				//if its empty AND we cant fit any of the items in the recipes, skip it.
+				if( is.getItemStack().isEmpty() )
+				{
+					boolean validInputSlotForIngredients = false;
+					for( IAEItemStack aeItemStack : patternDetails.getCondensedInputs() )
+					{
+						if( is.insertItem( aeItemStack.getDefinition() ).isEmpty() )
+						{
+							validInputSlotForIngredients = true;
+							break;
+						}
+					}
+					if( validInputSlotForIngredients )
+					{
+						copiedItemSlots.add( is.copy() );
+					}
+				}
+				else if( !is.getItemStack().isEmpty() && is.getItemStack().getCount() < is.getSlotLimit() )
+				{
+					copiedItemSlots.add( is.copy() );
+				}
+			}
+			Iterator<ItemSlot> copiedItemSlotIterator = copiedItemSlots.iterator();
+			while ( copiedItemSlotIterator.hasNext() )
+			{
+				ItemSlot copiedItemSlot = copiedItemSlotIterator.next();
+
+				Iterator<ItemStack> psi = patternedStacks.iterator();
+				while ( psi.hasNext() )
+				{
+					ItemStack patternedStack = psi.next();
+					ItemStack remainder = copiedItemSlot.insertItem( patternedStack );
+
+					if( !remainder.isEmpty() )
+					{
+						patternedStack.setCount( patternedStack.getCount() - ( patternedStack.getCount() - remainder.getCount() ) );
+						if( copiedItemSlot.getSlotLimit() == copiedItemSlot.getItemStack().getCount() )
+						{
+							copiedItemSlotIterator.remove();
+							break;
+						}
+					}
+					else
+					{
+						if( copiedItemSlot.getSlotLimit() == copiedItemSlot.getItemStack().getCount() )
+						{
+							copiedItemSlotIterator.remove();
+						}
+						psi.remove();
+						break;
+					}
+				}
+
+				if( patternedStacks.size() == 0 )
+				{
+					return true;
+				}
+			}
+			return false;
+		}
 	}
 
 	@Override

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

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

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

@@ -19,13 +19,9 @@
 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 com.google.common.collect.ImmutableList;
 
@@ -34,8 +30,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 +87,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;
@@ -646,14 +641,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 )
 						{

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

@@ -70,8 +70,6 @@ import appeng.util.item.AEItemStack;
 
 public class PartExportBus extends PartSharedItemBus implements ICraftingRequester
 {
-	private final int[] failedCraftTriesSlot = {0,0,0,0,0,0,0,0,0};
-
 	public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/export_bus_base" );
 
 	@PartModels
@@ -142,7 +140,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 
 			if( destination != null )
 			{
-				int x = 0;
+				int x;
 
 				for( x = 0; x < this.availableSlots() && this.itemToSend > 0; x++ )
 				{
@@ -153,16 +151,8 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 					if( ais == null || this.itemToSend <= 0 ) continue;
 
 					if ( this.craftOnly() ) {
-						if (this.failedCraftTriesSlot[x] <= 0) {
-
-							this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
-									this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething;
-
-							if (this.didSomething) this.failedCraftTriesSlot[x] = 0;
-							else this.failedCraftTriesSlot[x] += 2;
-						}
-						this.failedCraftTriesSlot[x] -= 1;
-						continue;
+						this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
+								this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething;
 					}
 
 					final long before = this.itemToSend;
@@ -185,15 +175,8 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
 
 					if( this.itemToSend == before && this.isCraftingEnabled() )
 					{
-						if (this.failedCraftTriesSlot[x] <= 0) {
-
-							this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
+						this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
 									this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething;
-
-							if (this.didSomething) this.failedCraftTriesSlot[x] = 0;
-							else this.failedCraftTriesSlot[x] += 2;
-						}
-						this.failedCraftTriesSlot[x] -= 1;
 					}
 				}
 

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

@@ -142,14 +142,6 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 				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 +151,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
 					{
@@ -178,7 +165,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;
 

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

@@ -20,13 +20,10 @@ package appeng.util;
 
 
 import appeng.util.inv.*;
-import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.CapabilityInject;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 
@@ -40,23 +37,12 @@ import appeng.api.config.FuzzyMode;
  */
 public abstract class InventoryAdaptor implements Iterable<ItemSlot>
 {
-	@CapabilityInject( IItemRepository.class)
-	public static Capability<IItemRepository> ITEM_REPOSITORY_CAPABILITY = null;
-
 	public static InventoryAdaptor getAdaptor( final TileEntity te, final EnumFacing d )
 	{
 		if( te != null )
 		{
-			if( ITEM_REPOSITORY_CAPABILITY != null && te.hasCapability( ITEM_REPOSITORY_CAPABILITY, d ) )
+			if( te.hasCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d ) )
 			{
-				IItemRepository itemRepository = te.getCapability( ITEM_REPOSITORY_CAPABILITY, d );
-				if (itemRepository != null){
-					return new AdaptorItemRepository( itemRepository );
-				}
-			}
-			else if( 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 )

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

@@ -1,208 +0,0 @@
-package appeng.util.inv;
-
-import appeng.api.config.FuzzyMode;
-import appeng.util.InventoryAdaptor;
-
-import appeng.util.Platform;
-import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
-import net.minecraft.item.ItemStack;
-
-import java.util.Iterator;
-
-
-public class AdaptorItemRepository extends InventoryAdaptor
-{
-    protected final IItemRepository itemRepository;
-
-    public AdaptorItemRepository( IItemRepository itemRepository )
-    {
-        this.itemRepository = itemRepository;
-    }
-
-    @Override
-    public ItemStack removeItems( int amount, ItemStack filter, IInventoryDestination destination )
-    {
-        ItemStack rv = ItemStack.EMPTY;
-        ItemStack extracted = ItemStack.EMPTY;
-
-        if( !filter.isEmpty() )
-        {
-            extracted = this.itemRepository.extractItem( filter, amount, true );
-        }
-        else
-        {
-            for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() )
-            {
-                extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true );
-                if( !extracted.isEmpty() )
-                {
-                    break;
-                }
-            }
-        }
-
-        if( destination != null )
-        {
-
-            if( extracted.isEmpty() || !destination.canInsert( extracted ) )
-            {
-                return rv;
-            }
-
-        }
-
-        extracted = this.itemRepository.extractItem( filter, amount, false );
-
-        return extracted;
-    }
-
-    @Override
-    public ItemStack simulateRemove( int amount, ItemStack filter, IInventoryDestination destination )
-    {
-        ItemStack rv = ItemStack.EMPTY;
-        ItemStack extracted = ItemStack.EMPTY;
-
-        if( !filter.isEmpty() )
-        {
-            extracted = this.itemRepository.extractItem( filter, amount, true );
-        }
-        else
-        {
-            for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() )
-            {
-                extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true );
-                if( !extracted.isEmpty() )
-                {
-                    break;
-                }
-            }
-        }
-
-        if( destination != null )
-        {
-
-            if( extracted.isEmpty() || !destination.canInsert( extracted ) )
-            {
-                return rv;
-            }
-
-        }
-
-        return extracted;
-    }
-
-    @Override
-    public ItemStack removeSimilarItems( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
-    {
-        ItemStack rv = ItemStack.EMPTY;
-        ItemStack extracted = ItemStack.EMPTY;
-
-        for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() )
-        {
-            if( Platform.itemComparisons().isFuzzyEqualItem( record.itemPrototype, filter, fuzzyMode ) )
-            {
-                extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true );
-            }
-
-            if( !extracted.isEmpty() )
-            {
-                break;
-            }
-        }
-
-        if( destination != null )
-        {
-
-            if( extracted.isEmpty() || !destination.canInsert( extracted ) )
-            {
-                return rv;
-            }
-
-        }
-
-        extracted = this.itemRepository.extractItem( extracted, amount, false );
-
-        return extracted;
-    }
-
-    @Override
-    public ItemStack simulateSimilarRemove( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
-    {
-        ItemStack rv = ItemStack.EMPTY;
-        ItemStack extracted = ItemStack.EMPTY;
-
-        for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() )
-        {
-            if( Platform.itemComparisons().isFuzzyEqualItem( record.itemPrototype, filter, fuzzyMode ) )
-            {
-                extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true );
-            }
-
-            if( !extracted.isEmpty() )
-            {
-                break;
-            }
-        }
-
-        if( destination != null )
-        {
-
-            if( extracted.isEmpty() || !destination.canInsert( extracted ) )
-            {
-                return rv;
-            }
-
-        }
-
-        return extracted;
-    }
-
-    @Override
-    public ItemStack addItems( ItemStack toBeAdded )
-    {
-        return this.addItems( toBeAdded, false );
-    }
-
-    protected ItemStack addItems( final ItemStack itemsToAdd, final boolean simulate )
-    {
-        if( itemsToAdd.isEmpty() )
-        {
-            return ItemStack.EMPTY;
-        }
-
-        ItemStack left = itemsToAdd.copy();
-
-        left = this.itemRepository.insertItem( left, simulate );
-
-        if( left.isEmpty() )
-        {
-            return ItemStack.EMPTY;
-        }
-
-        return left;
-    }
-
-    @Override
-    public ItemStack simulateAdd( ItemStack toBeSimulated )
-    {
-        return this.addItems( toBeSimulated, true );
-    }
-
-    @Override
-    public boolean containsItems()
-    {
-        return !this.itemRepository.getAllItems().isEmpty();
-    }
-
-    @Override
-    public boolean hasSlots()
-    {
-        return true;
-    }
-
-    @Override
-    public Iterator<ItemSlot> iterator()
-    {
-        return null;
-    }
-}

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

@@ -55,6 +55,8 @@ class ItemHandlerIterator implements Iterator<ItemSlot>
 		this.itemSlot.setExtractable( !this.itemHandler.extractItem( this.slot, 1, true ).isEmpty() );
 		this.itemSlot.setItemStack( this.itemHandler.getStackInSlot( this.slot ) );
 		this.itemSlot.setSlot( this.slot );
+		this.itemSlot.setSlotLimit( this.itemHandler.getSlotLimit( this.slot ) );
+		this.itemSlot.setItemHandler( this.itemHandler );
 		this.slot++;
 		return this.itemSlot;
 	}

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

@@ -23,6 +23,7 @@ import net.minecraft.item.ItemStack;
 
 import appeng.api.storage.data.IAEItemStack;
 import appeng.util.item.AEItemStack;
+import net.minecraftforge.items.IItemHandler;
 
 
 public class ItemSlot
@@ -34,6 +35,25 @@ public class ItemSlot
 	private IAEItemStack aeItemStack;
 	private ItemStack itemStack;
 
+	public void setItemHandler( IItemHandler itemHandler )
+	{
+		this.itemHandler = itemHandler;
+	}
+
+	private IItemHandler itemHandler;
+
+	public int getSlotLimit()
+	{
+		return slotLimit;
+	}
+
+	public void setSlotLimit( int slotLimit )
+	{
+		this.slotLimit = slotLimit;
+	}
+
+	private int slotLimit;
+
 	public ItemStack getItemStack()
 	{
 		return this.itemStack
@@ -77,4 +97,19 @@ public class ItemSlot
 	{
 		this.slot = slot;
 	}
+
+	public ItemSlot copy()
+	{
+		ItemSlot copy = new ItemSlot();
+		copy.setSlot( this.slot );
+		copy.setSlotLimit( this.slotLimit );
+		copy.setItemStack( this.getItemStack() );
+		copy.setExtractable( this.isExtractable );
+		copy.setItemHandler( this.itemHandler );
+		return copy;
+	}
+
+	public ItemStack insertItem( ItemStack sourceItemStack){
+		return this.itemHandler.insertItem( this.slot, sourceItemStack , true );
+	}
 }