From 2c966ad656221e09855451860d4ddca3b29c1dfd Mon Sep 17 00:00:00 2001 From: alexbegt Date: Sun, 2 Apr 2017 16:17:22 -0400 Subject: [PATCH] Clean up some checks to use isEmpty(), which is the same as checking the count is equal to 0. --- .../slimeknights/mantle/inventory/BaseContainer.java | 4 ++-- .../mantle/inventory/ContainerMultiModule.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/slimeknights/mantle/inventory/BaseContainer.java b/src/main/java/slimeknights/mantle/inventory/BaseContainer.java index 01bfd43..ef6517f 100644 --- a/src/main/java/slimeknights/mantle/inventory/BaseContainer.java +++ b/src/main/java/slimeknights/mantle/inventory/BaseContainer.java @@ -216,7 +216,7 @@ public abstract class BaseContainer extends Container { return ItemStack.EMPTY; } - if(itemstack1.getCount() == 0) { + if(itemstack1.isEmpty()) { slot.putStack(ItemStack.EMPTY); } else { @@ -327,7 +327,7 @@ public abstract class BaseContainer extends Container { slot.onSlotChanged(); flag1 = true; - if(stack.getCount() == 0) { + if(stack.isEmpty()) { break; } } diff --git a/src/main/java/slimeknights/mantle/inventory/ContainerMultiModule.java b/src/main/java/slimeknights/mantle/inventory/ContainerMultiModule.java index 019c622..14aa344 100644 --- a/src/main/java/slimeknights/mantle/inventory/ContainerMultiModule.java +++ b/src/main/java/slimeknights/mantle/inventory/ContainerMultiModule.java @@ -187,7 +187,7 @@ public class ContainerMultiModule extends Bas slot.putStack(stack); slot.onTake(player, stack); - if(slot.getHasStack() && slot.getStack().getCount() == 0) { + if(slot.getHasStack() && slot.getStack().isEmpty()) { slot.putStack(ItemStack.EMPTY); } @@ -195,7 +195,7 @@ public class ContainerMultiModule extends Bas } protected boolean moveToTileInventory(ItemStack itemstack) { - if(itemstack.isEmpty() || itemstack.getCount() == 0) { + if(itemstack.isEmpty()) { return false; } @@ -207,7 +207,7 @@ public class ContainerMultiModule extends Bas } protected boolean moveToPlayerInventory(ItemStack itemstack) { - if(itemstack.isEmpty() || itemstack.getCount() == 0) { + if(itemstack.isEmpty()) { return false; } @@ -216,7 +216,7 @@ public class ContainerMultiModule extends Bas } protected boolean moveToAnyContainer(ItemStack itemstack, Collection containers) { - if(itemstack.isEmpty() || itemstack.getCount() == 0) { + if(itemstack.isEmpty()) { return false; } @@ -236,7 +236,7 @@ public class ContainerMultiModule extends Bas protected boolean refillAnyContainer(ItemStack itemstack, Collection containers) { - if(itemstack.isEmpty() || itemstack.getCount() == 0) { + if(itemstack.isEmpty()) { return false; }