packager: only allow inserting items which are either already in the packager or important to the recipe; stamper: add container item support

common/buildcraft/silicon/TilePackager.java

@@ -475,7 +475,26 @@ public class TilePackager extends TileBuildCraft implements ISidedInventory {
 	@Override
 	public boolean canInsertItem(int slot, ItemStack stack, int side) {
 		if (side >= 2) {
-			return slot < 9;
+			if (slot >= 9) {
+				return false;
+			}
+			ItemStack slotStack = inventoryPublic.getStackInSlot(slot);
+			if (StackHelper.canStacksMerge(stack, slotStack)) {
+				return true;
+			}
+
+			for (int i = 0; i < 9; i++) {
+				if (isPatternSlotSet(i)) {
+					ItemStack inputStack = inventoryPattern.getStackInSlot(i);
+					if (inputStack == null) {
+						return true;
+					}
+					if (StackHelper.isMatchingItem(inputStack, stack, true, false)) {
+						return true;
+					}
+				}
+			}
+			return false;
 		} else {
 			return slot == 9;
 		}

common/buildcraft/silicon/TileStampingTable.java

@@ -3,6 +3,7 @@ package buildcraft.silicon;
 import java.lang.ref.WeakReference;
 
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.inventory.SlotCrafting;
@@ -11,12 +12,10 @@ import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.WorldServer;
 import cpw.mods.fml.common.FMLCommonHandler;
-import net.minecraftforge.common.util.ForgeDirection;
 
-import buildcraft.api.core.IInvSlot;
 import buildcraft.api.tiles.IHasWork;
 import buildcraft.core.lib.gui.ContainerDummy;
-import buildcraft.core.lib.inventory.InventoryIterator;
+import buildcraft.core.lib.inventory.InvUtils;
 import buildcraft.core.lib.inventory.StackHelper;
 import buildcraft.core.lib.utils.CraftingUtils;
 import buildcraft.core.lib.utils.NBTUtils;
@@ -31,21 +30,11 @@ public class TileStampingTable extends TileLaserTableBase implements IHasWork, I
         }
 
         private IRecipe findRecipe() {
-            for (IInvSlot slot : InventoryIterator.getIterable(this, ForgeDirection.UP)) {
-                ItemStack stack = slot.getStackInSlot();
-                if (stack == null) {
-                    continue;
-                }
-                if (stack.getItem().hasContainerItem(stack)) {
-                    return null;
-                }
-            }
-
             return CraftingUtils.findMatchingRecipe(this, worldObj);
         }
     }
 
-    private static final int[] SLOTS = Utils.createSlotArray(0, 2);
+    private static final int[] SLOTS = Utils.createSlotArray(0, 5);
     private SlotCrafting craftSlot;
     private final LocalInventoryCrafting crafting = new LocalInventoryCrafting();
 
@@ -113,6 +102,39 @@ public class TileStampingTable extends TileLaserTableBase implements IHasWork, I
 
             craftSlot.onPickupFromSlot(getInternalPlayer().get(), result);
 
+            IInventory playerInv = getInternalPlayer().get().inventory;
+
+            for (int i = 0; i < playerInv.getSizeInventory(); i++) {
+                if (playerInv.getStackInSlot(i) != null) {
+                    ItemStack output = playerInv.getStackInSlot(i);
+
+                    for (int j = 2; j < 5; j++) {
+                        ItemStack target = getStackInSlot(j);
+
+                        if (target == null) {
+                            setInventorySlotContents(j, output);
+                            output.stackSize = 0;
+                            break;
+                        } else {
+                            output.stackSize -= StackHelper.mergeStacks(output, input, true);
+                            if (output.stackSize == 0) {
+                                break;
+                            }
+                        }
+                    }
+
+                    if (output.stackSize > 0) {
+                        output.stackSize -= Utils.addToRandomInventoryAround(worldObj, xCoord, yCoord, zCoord, output);
+                    }
+
+                    if (output.stackSize > 0) {
+                        InvUtils.dropItems(worldObj, output, xCoord, yCoord + 1, zCoord);
+                    }
+
+                    playerInv.setInventorySlotContents(i, null);
+                }
+            }
+
             if (resultInto == null) {
                 setInventorySlotContents(1, result);
             } else {
@@ -154,7 +176,7 @@ public class TileStampingTable extends TileLaserTableBase implements IHasWork, I
 
     @Override
     public int getSizeInventory() {
-        return 2;
+        return 5;
     }
 
     @Override
@@ -184,6 +206,6 @@ public class TileStampingTable extends TileLaserTableBase implements IHasWork, I
 
     @Override
     public boolean canExtractItem(int slot, ItemStack stack, int side) {
-        return slot == 1;
+        return slot >= 1;
     }
 }

common/buildcraft/silicon/gui/ContainerStampingTable.java

@@ -28,15 +28,18 @@ public class ContainerStampingTable extends BuildCraftContainer {
 
 		addSlot(new SlotValidated(table, 0, 15, 18));
 		addSlot(new SlotOutput(table, 1, 143, 18));
+		addSlot(new SlotOutput(table, 2, 111, 45));
+		addSlot(new SlotOutput(table, 3, 129, 45));
+		addSlot(new SlotOutput(table, 4, 147, 45));
 
 		for (int y = 0; y < 3; y++) {
 			for (int x = 0; x < 9; x++) {
-				addSlotToContainer(new Slot(playerInventory, x + y * 9 + 9, 8 + x * 18, 50 + y * 18));
+				addSlotToContainer(new Slot(playerInventory, x + y * 9 + 9, 8 + x * 18, 69 + y * 18));
 			}
 		}
 
 		for (int x = 0; x < 9; x++) {
-			addSlotToContainer(new Slot(playerInventory, x, 8 + x * 18, 108));
+			addSlotToContainer(new Slot(playerInventory, x, 8 + x * 18, 127));
 		}
 	}
 

common/buildcraft/silicon/gui/GuiStampingTable.java

@@ -27,7 +27,7 @@ public class GuiStampingTable extends GuiLaserTable {
 		super(playerInventory, new ContainerStampingTable(playerInventory, table), table, TEXTURE);
 		this.integrationTable = table;
 		xSize = 176;
-		ySize = 132;
+		ySize = 151;
 	}
 
 	@Override

common/buildcraft/silicon/gui/SlotPackager.java

@@ -20,7 +20,7 @@ public class SlotPackager extends SlotPhantom {
 
 	@Override
 	public boolean isItemValid(ItemStack stack) {
-		return stack != null && !stack.getItem().hasContainerItem(stack);
+		return stack != null;
 	}
 
 	@Override