From 7e16217021f4a38a291f954f5687d462f1bf7e7c Mon Sep 17 00:00:00 2001
From: Adrian <kontakt@asie.pl>
Date: Tue, 9 Jun 2015 08:09:33 +0200
Subject: [PATCH] make AWBs only accept recipe-relevant items again, restore
 Java 6 compat, fix #2765

---
 common/buildcraft/BuildCraftMod.java            | 17 ++++-------------
 .../buildcraft/factory/TileAutoWorkbench.java   | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/common/buildcraft/BuildCraftMod.java b/common/buildcraft/BuildCraftMod.java
index 14a9a67d..77b76763 100644
--- a/common/buildcraft/BuildCraftMod.java
+++ b/common/buildcraft/BuildCraftMod.java
@@ -11,7 +11,7 @@ package buildcraft;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -116,7 +116,7 @@ public class BuildCraftMod {
 	}
 
 	static class PacketSender implements Runnable {
-		private Queue<SendRequest> packets = new ConcurrentLinkedDeque<SendRequest>();
+		private Queue<SendRequest> packets = new ConcurrentLinkedQueue<SendRequest>();
 
 		@Override
 		public void run() {
@@ -131,7 +131,8 @@ public class BuildCraftMod {
 					SendRequest r = packets.remove();
 					S3FPacketCustomPayload packetCustomPayload = new S3FPacketCustomPayload();
 					net.minecraft.network.Packet p = r.source.channels.get(Side.SERVER).generatePacketFrom(r.packet);
-					for (EntityPlayerMP player : (List<EntityPlayerMP>) MinecraftServer.getServer().getConfigurationManager().playerEntityList) {
+					List<EntityPlayerMP> playerList = MinecraftServer.getServer().getConfigurationManager().playerEntityList;
+					for (EntityPlayerMP player : playerList.toArray(new EntityPlayerMP[playerList.size()])) {
 						if (r.isValid(player)) {
 							NetHandlerPlayServer handler = player.playerNetServerHandler;
 							if (handler == null) {
@@ -183,16 +184,6 @@ public class BuildCraftMod {
 		sender.add(new PlayerSendRequest(this, packet, entityplayer));
 	}
 
-	/* public void sendToAll(Packet packet) {
-		try {
-			channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET)
-					.set(FMLOutboundHandler.OutboundTarget.ALL);
-			channels.get(Side.SERVER).writeOutbound(packet);
-		} catch (Throwable t) {
-			BCLog.logger.log(Level.WARN, "sendToAll crash", t);
-		}
-	} */
-
 	public void sendToServer(Packet packet) {
 		try {
 			channels.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(OutboundTarget.TOSERVER);
diff --git a/common/buildcraft/factory/TileAutoWorkbench.java b/common/buildcraft/factory/TileAutoWorkbench.java
index 99ac5d0c..fb398331 100644
--- a/common/buildcraft/factory/TileAutoWorkbench.java
+++ b/common/buildcraft/factory/TileAutoWorkbench.java
@@ -428,7 +428,20 @@ public class TileAutoWorkbench extends TileBuildCraft implements ISidedInventory
 
 	@Override
 	public boolean canInsertItem(int slot, ItemStack stack, int side) {
-		return slot < 9;
+		if (slot >= 9) {
+			return false;
+		}
+		ItemStack slotStack = inv.getStackInSlot(slot);
+		if (StackHelper.canStacksMerge(stack, slotStack)) {
+			return true;
+		}
+		for (int i = 0; i < 9; i++) {
+			ItemStack inputStack = craftMatrix.getStackInSlot(i);
+			if (inputStack != null && StackHelper.isMatchingItem(inputStack, stack, true, false)) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 	@Override