From d7a3b347b87bfba87af2c224fc2f93d1abea5168 Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Wed, 18 Mar 2015 00:02:31 +0100 Subject: [PATCH] Added output slots to farming station * Added 2 output slots to farming station to prevent overflow from shearing leaves * Resized GUI to make space * Solves #2096 --- .../enderio/textures/gui/farmStation.png | Bin 4397 -> 5431 bytes .../machine/farm/FarmStationContainer.java | 46 +++++++++---- .../enderio/machine/farm/GuiFarmStation.java | 16 +++-- .../enderio/machine/farm/TileFarmStation.java | 62 ++++++++++++------ 4 files changed, 88 insertions(+), 36 deletions(-) diff --git a/resources/assets/enderio/textures/gui/farmStation.png b/resources/assets/enderio/textures/gui/farmStation.png index 84a0c754886f545cc711351aa10b19e996e13811..e978b6069a8d8e38cf2ab3b9b0f4070b8f1b8ade 100644 GIT binary patch delta 5101 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
z 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 kKUE}TS1Q6(Bfbko { super.initGui(); int x = getGuiLeft() + 36; - int y = getGuiTop() + 36; + int y = getGuiTop() + 43; buttonList.add(createLockButton(TileFarmStation.minSupSlot + 0, x, y)); buttonList.add(createLockButton(TileFarmStation.minSupSlot + 1, x + 52, y)); @@ -70,10 +70,10 @@ public class GuiFarmStation extends GuiPoweredMachineBase { FontRenderer fr = Minecraft.getMinecraft().fontRenderer; GL11.glEnable(GL11.GL_BLEND); - fr.drawString("SW", sx + 55, sy + 41, ColorUtil.getARGB(1f,1f,0.35f,1f), true); - fr.drawString("NW", sx + 55, sy + 59, ColorUtil.getARGB(1f,1f,0.35f,1f), true); - fr.drawString("SE", sx + 73, sy + 41, ColorUtil.getARGB(1f,1f,0.35f,1f), true); - fr.drawString("NE", sx + 73, sy + 59, ColorUtil.getARGB(1f,1f,0.35f,1f), true); + fr.drawString("SW", sx + 55, sy + 48, ColorUtil.getARGB(1f,1f,0.35f,1f), true); + fr.drawString("NW", sx + 55, sy + 66, ColorUtil.getARGB(1f,1f,0.35f,1f), true); + fr.drawString("SE", sx + 73, sy + 48, ColorUtil.getARGB(1f,1f,0.35f,1f), true); + fr.drawString("NE", sx + 73, sy + 66, ColorUtil.getARGB(1f,1f,0.35f,1f), true); GL11.glDisable(GL11.GL_BLEND); RenderUtil.bindTexture("enderio:textures/gui/farmStation.png"); @@ -97,4 +97,10 @@ public class GuiFarmStation extends GuiPoweredMachineBase { protected String getPowerOutputLabel() { return Lang.localize("farm.gui.baseUse"); } + + @Override + protected int getPowerHeight() { + return super.getPowerHeight() + 3; + } + } diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index aeb4c81e..297318fb 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -49,12 +49,24 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } }, - AXE { @Override - boolean match(ItemStack item) { return item.getItem().getHarvestLevel(item, "axe") >= 0; }}, - TREETAP { @Override - boolean match(ItemStack item) { return item.getItem().getClass() == RubberTreeFarmerIC2.treeTap; }}, - SHEARS { @Override - boolean match(ItemStack item) { return item.getItem() instanceof ItemShears; }}; + AXE { + @Override + boolean match(ItemStack item) { + return item.getItem().getHarvestLevel(item, "axe") >= 0; + } + }, + TREETAP { + @Override + boolean match(ItemStack item) { + return item.getItem().getClass() == RubberTreeFarmerIC2.treeTap; + } + }, + SHEARS { + @Override + boolean match(ItemStack item) { + return item.getItem() instanceof ItemShears; + } + }; public final boolean itemMatches(ItemStack item) { if (item == null) { @@ -99,11 +111,11 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { public String notification = ""; public boolean sendNotification = false; - + private boolean wasActive; public TileFarmStation() { - super(new SlotDefinition(7, 4, 1)); + super(new SlotDefinition(7, 6, 1)); } public int getFarmSize() { @@ -306,19 +318,19 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { return false; } if(i <= maxToolSlot) { - if (ToolType.isTool(stack)) { - int otherSlot = i == minToolSlot ? maxToolSlot : minToolSlot; - if (inventory[otherSlot] == null) { - return true; - } else { // let's make sure there's not one of this type in here already - for (ToolType type : ToolType.values()) { - if (type.itemMatches(inventory[otherSlot]) && type.itemMatches(stack)) { - return false; - } + if (ToolType.isTool(stack)) { + int otherSlot = i == minToolSlot ? maxToolSlot : minToolSlot; + if (inventory[otherSlot] == null) { + return true; + } else { // let's make sure there's not one of this type in here already + for (ToolType type : ToolType.values()) { + if (type.itemMatches(inventory[otherSlot]) && type.itemMatches(stack)) { + return false; } - return true; } + return true; } + } return false; } return (inventory[i] != null || !isSlotLocked(i)) && FarmersCommune.instance.canPlant(stack); @@ -643,13 +655,23 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } int slotLayoutVersion = nbtRoot.getInteger("slotLayoutVersion"); if (slotLayoutVersion < 1) { - for (int i = inventory.length - 2; i >= 2; i--) { + // update from v0 (2+4+4+1) to v1 (3+4+4+1) by moving in+out+cap one back + for (int i = (3+4+4+1) - 2; i >= 2; i--) { if (inventory[i+1] == null) { // Should always be true, but better safe than deleting items inventory[i+1] = inventory[i]; inventory[i] = null; } } + slotLayoutVersion = 1; + } + if (slotLayoutVersion < 2) { + // update from v1 (3+4+4+1) to v2 (3+4+6+1) by moving cap to new position + if (inventory[(3+4+6+1)-1] == null) { + inventory[(3+4+6+1)-1] = inventory[(3+4+4+1)-1]; + inventory[(3+4+4+1)-3] = null; + } + slotLayoutVersion = 2; } } @@ -673,7 +695,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } nbtRoot.setIntArray("lockedSlots", locked); } - nbtRoot.setInteger("slotLayoutVersion", 1); + nbtRoot.setInteger("slotLayoutVersion", 2); } }