upstream/NotEnoughItems
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/NotEnoughItems.git synced 2026-10-26 14:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #301 from ganymedes01/patch-3

Browse Source 
Fix shift-clicking recipes with items that don't stack
This commit is contained in:
Chicken-Bones committed 2015-11-18 22:15:44 +10:00
2 parents aaa4cc123c 9d37aeb07f
commit 285e7c528a
1 file changed
+9 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/codechicken/nei/recipe/DefaultOverlayHandler.java
+9 -3
View File
@@ -112,7 +112,7 @@ public class DefaultOverlayHandler implements IOverlayHandler
continue;
ItemStack stack = slot.getStack();
if(!InventoryUtils.canStack(stack, pstack))
if(!canStack(stack, pstack))
continue;
FastTransferManager.clickSlot(gui, slot.slotNumber);
@@ -225,7 +225,7 @@ public class DefaultOverlayHandler implements IOverlayHandler
for(int j = 0; j < ingredStacks.size(); j++)
{
DistributedIngred istack = ingredStacks.get(j);
if(!InventoryUtils.canStack(pstack, istack.stack) || istack.invAmount-istack.distributed < pstack.stackSize)
if(!canStack(pstack, istack.stack) || istack.invAmount-istack.distributed < pstack.stackSize)
continue;
int relsize = (istack.invAmount-istack.invAmount/istack.recipeAmount*istack.distributed)/pstack.stackSize;
@@ -308,8 +308,14 @@ public class DefaultOverlayHandler implements IOverlayHandler
public DistributedIngred findIngred(List<DistributedIngred> ingredStacks, ItemStack pstack)
{
for(DistributedIngred istack : ingredStacks)
if(InventoryUtils.canStack(pstack, istack.stack))
if(canStack(pstack, istack.stack))
return istack;
return null;
}
protected boolean canStack(ItemStack stack1, ItemStack stack2) {
if (stack1 == null || stack2 == null)
return true;
return stack1.getItem() == stack2.getItem() && stack1.getItemDamage() == stack2.getItemDamage() && ItemStack.areItemStackTagsEqual(stack2, stack1);
}
}