From 04caed5baaa2f4256fd031ad8eafe7a818aa60de Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 31 May 2015 03:12:52 -0700 Subject: [PATCH] Cleanup --- .../forestry/core/gui/slots/SlotForestry.java | 22 ------------------- .../forestry/core/gui/slots/SlotLocked.java | 4 ++-- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/src/main/java/forestry/core/gui/slots/SlotForestry.java b/src/main/java/forestry/core/gui/slots/SlotForestry.java index 4fb9ebab3..efd0dd5ec 100755 --- a/src/main/java/forestry/core/gui/slots/SlotForestry.java +++ b/src/main/java/forestry/core/gui/slots/SlotForestry.java @@ -21,7 +21,6 @@ import forestry.core.gui.tooltips.ToolTip; public class SlotForestry extends Slot implements IToolTipProvider { private boolean isPhantom; - private boolean isInfinite; private boolean canAdjustPhantom = true; private boolean canShift = true; private int stackLimit; @@ -35,11 +34,6 @@ public class SlotForestry extends Slot implements IToolTipProvider { this.stackLimit = -1; } - public SlotForestry setInfinite() { - this.isInfinite = true; - return this; - } - public SlotForestry setPhantom() { isPhantom = true; return this; @@ -93,22 +87,6 @@ public class SlotForestry extends Slot implements IToolTipProvider { } } - @Override - public ItemStack decrStackSize(int i) { - if (!isInfinite) { - return super.decrStackSize(i); - } - - ItemStack stack = inventory.getStackInSlot(getSlotIndex()); - if (stack == null) { - return null; - } - - ItemStack result = stack.copy(); - result.stackSize = i; - return result; - } - /** * @param toolTips the tooltips to set */ diff --git a/src/main/java/forestry/core/gui/slots/SlotLocked.java b/src/main/java/forestry/core/gui/slots/SlotLocked.java index 8cb1d7a31..118c8466f 100755 --- a/src/main/java/forestry/core/gui/slots/SlotLocked.java +++ b/src/main/java/forestry/core/gui/slots/SlotLocked.java @@ -16,8 +16,8 @@ import net.minecraft.item.ItemStack; public class SlotLocked extends SlotForestry { - public SlotLocked(IInventory par1iInventory, int par2, int par3, int par4) { - super(par1iInventory, par2, par3, par4); + public SlotLocked(IInventory inventory, int slotIndex, int xPos, int yPos) { + super(inventory, slotIndex, xPos, yPos); setCanAdjustPhantom(false); blockShift(); setPhantom();