From a73fd60d1fad2260c819420348c22ea6a754f46b Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 12 Sep 2014 01:55:49 -0700 Subject: [PATCH] Replace Worktable's book with a small X --- lang | 2 +- .../factory/gadgets/TileWorktable.java | 12 +++-- .../factory/gui/ContainerWorktable.java | 4 ++ .../forestry/factory/gui/GuiWorktable.java | 47 ++++++------------ .../forestry/textures/gui/worktable.png | Bin 2120 -> 1540 bytes 5 files changed, 29 insertions(+), 36 deletions(-) diff --git a/lang b/lang index 4204c1c2b..6a0217f4a 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 4204c1c2bbc668447f0914f79469d390e730637e +Subproject commit 6a0217f4ae1594a1e82ca61303242b1161cdd724 diff --git a/src/main/java/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/gadgets/TileWorktable.java index a507e0b5c..6ae55cde3 100755 --- a/src/main/java/forestry/factory/gadgets/TileWorktable.java +++ b/src/main/java/forestry/factory/gadgets/TileWorktable.java @@ -193,6 +193,7 @@ public class TileWorktable extends TileBase implements ICrafter { private LinkedList recipes = new LinkedList(); private long lastUpdate; + public final int capacity = 9; public long getLastUpdate() { return lastUpdate; @@ -204,10 +205,13 @@ public class TileWorktable extends TileBase implements ICrafter { recipe.updateLastUse(world); Recipe memory = getMemorized(crafting, world); - if (memory != null) - recipes.remove(memory); + if (memory != null) { + int index = recipes.indexOf(memory); + recipes.set(index, recipe); + return; + } - if (recipes.size() < 8) { + if (recipes.size() < capacity) { recipes.add(recipe); return; } @@ -413,7 +417,7 @@ public class TileWorktable extends TileBase implements ICrafter { } public void chooseRecipe(int recipeIndex) { - if (recipeIndex == 9) { + if (recipeIndex >= memorized.capacity) { for (int slot = 0; slot < craftingInventory.getSizeInventory(); slot++) { craftingInventory.setInventorySlotContents(slot, null); } diff --git a/src/main/java/forestry/factory/gui/ContainerWorktable.java b/src/main/java/forestry/factory/gui/ContainerWorktable.java index 15d74c5a1..62a190aec 100755 --- a/src/main/java/forestry/factory/gui/ContainerWorktable.java +++ b/src/main/java/forestry/factory/gui/ContainerWorktable.java @@ -115,6 +115,10 @@ public class ContainerWorktable extends ContainerForestry implements IContainerC tile.setRecipe(craftMatrix); } + public void clearRecipe() { + sendRecipeClick(0, tile.getMemory().capacity); + } + public void sendRecipeClick(int mouseButton, int recipeIndex) { PacketPayload payload = new PacketPayload(2, 0, 0); payload.intPayload[0] = mouseButton; diff --git a/src/main/java/forestry/factory/gui/GuiWorktable.java b/src/main/java/forestry/factory/gui/GuiWorktable.java index e14044014..b1b8495d7 100755 --- a/src/main/java/forestry/factory/gui/GuiWorktable.java +++ b/src/main/java/forestry/factory/gui/GuiWorktable.java @@ -82,36 +82,21 @@ public class GuiWorktable extends GuiForestryTitled { } } - private class BookSlot extends Widget { + private class ClearWorktable extends Widget { - private final ItemStack BOOK = new ItemStack(Items.book); - - public BookSlot(WidgetManager manager, int xPos, int yPos) { + public ClearWorktable(WidgetManager manager, int xPos, int yPos) { super(manager, xPos, yPos); + width = 7; + height = 7; } @Override public void draw(int startX, int startY) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - RenderHelper.enableGUIStandardItemLighting(); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - manager.gui.drawItemStack(BOOK, startX + xPos, startY + yPos); - - GL11.glPopAttrib(); - } - - @Override - protected String getLegacyTooltip(EntityPlayer player) { - return StringUtil.localize("gui.worktable.clear"); } @Override public void handleMouseClick(int mouseX, int mouseY, int mouseButton) { - container.sendRecipeClick(mouseButton, 9); + container.clearRecipe(); } } private final TileWorktable worktable; @@ -125,18 +110,18 @@ public class GuiWorktable extends GuiForestryTitled { this.tile = tile; container = (ContainerWorktable) inventorySlots; - widgetManager.add(new BookSlot(widgetManager, 128, 38)); + final int spacing = 18; + int slot = 0; + for (int y = 0; y < 3; y++) { + int yPos = 20 + (y * spacing); + for (int x = 0; x < 3; x++) { + int xPos = 110 + (x * spacing); + widgetManager.add(new MemorizedSlot(widgetManager, xPos, yPos, slot)); + slot += 1; + } + } - widgetManager.add(new MemorizedSlot(widgetManager, 146, 20, 0)); - widgetManager.add(new MemorizedSlot(widgetManager, 146, 38, 1)); - widgetManager.add(new MemorizedSlot(widgetManager, 146, 56, 2)); - - widgetManager.add(new MemorizedSlot(widgetManager, 128, 56, 3)); - widgetManager.add(new MemorizedSlot(widgetManager, 110, 56, 4)); - - widgetManager.add(new MemorizedSlot(widgetManager, 110, 38, 5)); - widgetManager.add(new MemorizedSlot(widgetManager, 110, 20, 6)); - widgetManager.add(new MemorizedSlot(widgetManager, 128, 20, 7)); + widgetManager.add(new ClearWorktable(widgetManager, 66, 19)); } } diff --git a/src/main/resources/assets/forestry/textures/gui/worktable.png b/src/main/resources/assets/forestry/textures/gui/worktable.png index dd59d8ff065dc9920cc371e2b667aac73ab42af4..48d18d27eff4aff141740d414ac964da60de650f 100755 GIT binary patch literal 1540 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 aBlZgjyU4cSk+2T{fc*|fM)@}X@BRh54ODpm