From d870fcb1829da8a4fe47e95cecfaa4b8427a69d0 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Tue, 19 Nov 2013 06:11:20 -0800 Subject: [PATCH] Fix Emerald Pipe Button Tooltip Closes #1322 --- .../transport/pipes/PipeItemsEmerald.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/common/buildcraft/transport/pipes/PipeItemsEmerald.java b/common/buildcraft/transport/pipes/PipeItemsEmerald.java index dcc7fb20..2c13ee40 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmerald.java @@ -40,15 +40,12 @@ import buildcraft.transport.PipeIconProvider; public class PipeItemsEmerald extends PipeItemsWood implements IClientState, IGuiReturnHandler { public static enum ButtonState implements IMultiButtonState { - BLOCKING("gui.pipes.emerald.blocking"), NONBLOCKING("gui.pipes.emerald.nonblocking"); + BLOCKING("gui.pipes.emerald.blocking"), NONBLOCKING("gui.pipes.emerald.nonblocking"); private final String label; - private final ToolTip tip; private ButtonState(String label) { this.label = label; - tip = new ToolTip(); - tip.add(new ToolTipLine(label + ".tip")); } @Override @@ -65,8 +62,14 @@ public class PipeItemsEmerald extends PipeItemsWood implements IClientState, IGu public ToolTip getToolTip() { return this.tip; } + private final ToolTip tip = new ToolTip(500) { + @Override + public void refresh() { + clear(); + tip.add(new ToolTipLine(StringUtils.localize(label + ".tip"))); + } + }; } - private final MultiButtonController stateController = MultiButtonController.getController(ButtonState.BLOCKING.ordinal(), ButtonState.values()); private final SimpleInventory filters = new SimpleInventory(9, "Filters", 1); private int currentFilter = 0; @@ -108,7 +111,7 @@ public class PipeItemsEmerald extends PipeItemsWood implements IClientState, IGu /* ISELECTIVEINVENTORY */ // non blocking mode is not implemented for ISelectiveInventory yet if (inventory instanceof ISelectiveInventory) { - ItemStack[] stacks = ((ISelectiveInventory) inventory).extractItem(new ItemStack[] { getCurrentFilter() }, false, doRemove, from, (int) powerHandler.getEnergyStored()); + ItemStack[] stacks = ((ISelectiveInventory) inventory).extractItem(new ItemStack[]{getCurrentFilter()}, false, doRemove, from, (int) powerHandler.getEnergyStored()); if (doRemove) { for (ItemStack stack : stacks) { if (stack != null) { @@ -168,7 +171,7 @@ public class PipeItemsEmerald extends PipeItemsWood implements IClientState, IGu } if (result != null) { - return new ItemStack[] { result }; + return new ItemStack[]{result}; } }