From 5f7664e55d9f2eff8c7742c32ee09598bf3023be Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 17 May 2016 16:18:49 +0200 Subject: [PATCH] Fixed being able to pick up from pattern result slot --- CHANGELOG.md | 1 + .../java/refinedstorage/container/ContainerGrid.java | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c555b5176..4458ac4b7 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Fixed race condition with crafting tasks - Fixed pressing escape in crafting settings GUI not going back to grid GUI - Fixed losing autoselection in Grid when clicking on slot with autoselection mode +- Fixed being able to pick up from pattern result slot - Added a max crafting quantity per request cap (hardcoded to 100) **Features** diff --git a/src/main/java/refinedstorage/container/ContainerGrid.java b/src/main/java/refinedstorage/container/ContainerGrid.java index fd251d865..e04bc11f4 100755 --- a/src/main/java/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/refinedstorage/container/ContainerGrid.java @@ -21,6 +21,7 @@ import java.util.List; public class ContainerGrid extends ContainerBase { private List craftingSlots = new ArrayList(); private SlotGridCraftingResult craftingResultSlot; + private SlotDisabled patternResultSlot; private IGrid grid; public ContainerGrid(EntityPlayer player, IGrid grid) { @@ -65,7 +66,7 @@ public class ContainerGrid extends ContainerBase { } } - addSlotToContainer(new SlotDisabled(((TileGrid) grid).getCraftingResultInventory(), 0, 116 + 4, 120 + 4)); + addSlotToContainer(patternResultSlot = new SlotDisabled(((TileGrid) grid).getCraftingResultInventory(), 0, 116 + 4, 120 + 4)); addSlotToContainer(new SlotFiltered(((TileGrid) grid).getPatternsInventory(), 0, 152, 104, new BasicItemValidator(RefinedStorageItems.PATTERN))); addSlotToContainer(new SlotOutput(((TileGrid) grid).getPatternsInventory(), 1, 152, 144)); @@ -126,6 +127,10 @@ public class ContainerGrid extends ContainerBase { @Override public boolean canMergeSlot(ItemStack stack, Slot slot) { - return slot != craftingResultSlot && super.canMergeSlot(stack, slot); + if (slot == craftingResultSlot || slot == patternResultSlot) { + return false; + } + + return super.canMergeSlot(stack, slot); } }