dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix picking up from crafting result slot

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-04-30 09:34:28 +02:00
parent 674881d3e5
commit f0c7b10069
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/refinedstorage/container/ContainerGrid.java
View File

@@ -20,7 +20,7 @@ import java.util.List;
public class ContainerGrid extends ContainerBase { public class ContainerGrid extends ContainerBase {
private List<Slot> craftingSlots = new ArrayList<Slot>(); private List<Slot> craftingSlots = new ArrayList<Slot>();
private SlotGridCraftingResult craftingResultSlot;
private IGrid grid; private IGrid grid;
public ContainerGrid(EntityPlayer player, IGrid grid) { public ContainerGrid(EntityPlayer player, IGrid grid) {
@@ -49,7 +49,7 @@ public class ContainerGrid extends ContainerBase {
} }
} }
addSlotToContainer(new SlotGridCraftingResult(this, player, ((TileGrid) grid).getCraftingInventory(), ((TileGrid) grid).getCraftingResultInventory(), (TileGrid) grid, 0, 133 + 4, 120 + 4)); addSlotToContainer(craftingResultSlot = new SlotGridCraftingResult(this, player, ((TileGrid) grid).getCraftingInventory(), ((TileGrid) grid).getCraftingResultInventory(), (TileGrid) grid, 0, 133 + 4, 120 + 4));
} else if (grid.getType() == EnumGridType.PATTERN) { } else if (grid.getType() == EnumGridType.PATTERN) {
int x = 8; int x = 8;
int y = 106; int y = 106;
@@ -123,4 +123,9 @@ public class ContainerGrid extends ContainerBase {
return super.func_184996_a(id, clickedButton, clickType, player); return super.func_184996_a(id, clickedButton, clickType, player);
} }
@Override
public boolean canMergeSlot(ItemStack stack, Slot slot) {
return slot != craftingResultSlot;
}
} }