Fix incorrect usage of item stack checking

I have no idea how they worked without issue for this long :D
This commit is contained in:
modmuss50 2018-06-25 12:34:13 +01:00
parent 96d78c11a8
commit d4a43d24a1
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
10 changed files with 21 additions and 21 deletions

View file

@ -71,7 +71,7 @@ public class TileElectricFurnace extends TilePowerAcceptor
if (canSmelt()) {
final ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(getStackInSlot(input1));
if (getStackInSlot(output) == ItemStack.EMPTY) {
if (getStackInSlot(output).isEmpty()) {
setInventorySlotContents(output, itemstack.copy());
} else if (getStackInSlot(output).isItemEqual(itemstack)) {
getStackInSlot(output).grow(itemstack.getCount());
@ -85,14 +85,14 @@ public class TileElectricFurnace extends TilePowerAcceptor
}
public boolean canSmelt() {
if (getStackInSlot(input1) == ItemStack.EMPTY) {
if (getStackInSlot(input1).isEmpty()) {
return false;
}
final ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(getStackInSlot(input1));
if (itemstack.isEmpty()) {
return false;
}
if (getStackInSlot(output) == ItemStack.EMPTY) {
if (getStackInSlot(output).isEmpty()) {
return true;
}
if (!getStackInSlot(output).isItemEqual(itemstack)) {

View file

@ -90,11 +90,11 @@ public class TileRecycler extends TilePowerAcceptor
}
public boolean canRecycle() {
return getStackInSlot(0) != ItemStack.EMPTY && hasSlotGotSpace(1);
return !getStackInSlot(0) .isEmpty() && hasSlotGotSpace(1);
}
public boolean hasSlotGotSpace(int slot) {
if (getStackInSlot(slot) == ItemStack.EMPTY) {
if (getStackInSlot(slot).isEmpty()) {
return true;
} else if (getStackInSlot(slot).getCount() < getStackInSlot(slot).getMaxStackSize()) {
return true;

View file

@ -136,7 +136,7 @@ public class TileRollingMachine extends TilePowerAcceptor
currentRecipeOutput = RollingMachineRecipe.instance.findMatchingRecipeOutput(craftMatrix, world);
if (!currentRecipeOutput.isEmpty()) {
boolean hasCrafted = false;
if (inventory.getStackInSlot(outputSlot) == ItemStack.EMPTY) {
if (inventory.getStackInSlot(outputSlot).isEmpty()) {
inventory.setInventorySlotContents(outputSlot, currentRecipeOutput);
tickTime = 0;
hasCrafted = true;