Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use ItemStack sensitive version of hasContainerItem

Browse source
This commit is contained in:
Raul Tambre 2014-06-13 22:12:56 +03:00
parent b1076d8556
commit d8d42a3d17
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/core/gui/slots/SlotWorkbench.java
View file

@ -19,7 +19,7 @@ public class SlotWorkbench extends SlotBase {
@Override @Override
public boolean isItemValid(ItemStack stack) { public boolean isItemValid(ItemStack stack) {
return stack != null && stack.isStackable() && !stack.getItem().hasContainerItem(); return stack != null && stack.isStackable() && !stack.getItem().hasContainerItem(stack);
} }
@Override @Override

2
common/buildcraft/core/inventory/InvUtils.java
View file

@ -211,7 +211,7 @@ public final class InvUtils {
public static ItemStack consumeItem(ItemStack stack) { public static ItemStack consumeItem(ItemStack stack) {
if (stack.stackSize == 1) { if (stack.stackSize == 1) {
if (stack.getItem().hasContainerItem()) { if (stack.getItem().hasContainerItem(stack)) {
return stack.getItem().getContainerItem(stack); return stack.getItem().getContainerItem(stack);
} else { } else {
return null; return null;

4
common/buildcraft/factory/TileAutoWorkbench.java
View file

@ -155,7 +155,7 @@ public class TileAutoWorkbench extends TileBuildCraft implements ISidedInventory
if (!stack.isStackable()) { if (!stack.isStackable()) {
return null; return null;
} }
if (stack.getItem().hasContainerItem()) { if (stack.getItem().hasContainerItem(stack)) {
return null; return null;
} }
} }
@ -278,7 +278,7 @@ public class TileAutoWorkbench extends TileBuildCraft implements ISidedInventory
if (!stack.isStackable()) { if (!stack.isStackable()) {
return false; return false;
} }
if (stack.getItem().hasContainerItem()) { if (stack.getItem().hasContainerItem(stack)) {
return false; return false;
} }
if (getStackInSlot(slot) == null) { if (getStackInSlot(slot) == null) {