From 5753046eace5292c0e9dedf13b2e12e2665abe0b Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Thu, 16 Apr 2015 23:28:35 +0200 Subject: [PATCH] make ArrowButton class more generic, give add and minus buttons hover effects --- .../conduit/gui/BaseSettingsPanel.java | 14 +++--- .../enderio/conduit/gui/LiquidSettings.java | 7 ++- .../conduit/gui/item/ItemSettings.java | 18 +++----- .../crazypants/enderio/gui/ArrowButton.java | 32 ------------- .../enderio/gui/MultiIconButtonEIO.java | 45 +++++++++++++++++++ .../machine/spawner/GuiPoweredSpawner.java | 7 ++- .../machine/transceiver/gui/FilterTab.java | 7 ++- .../machine/vacuum/GuiVacuumChest.java | 12 +++-- 8 files changed, 72 insertions(+), 70 deletions(-) delete mode 100644 src/main/java/crazypants/enderio/gui/ArrowButton.java create mode 100644 src/main/java/crazypants/enderio/gui/MultiIconButtonEIO.java diff --git a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java index 149a1db9..bd9295e4 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java @@ -11,10 +11,9 @@ import org.lwjgl.opengl.GL11; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.packet.PacketConnectionMode; -import crazypants.enderio.gui.ArrowButton; import crazypants.enderio.gui.ITabPanel; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; import crazypants.util.Lang; @@ -29,8 +28,8 @@ public class BaseSettingsPanel implements ITabPanel { protected final IConduit con; protected final String typeName; - protected IconButtonEIO leftArrow; - protected IconButtonEIO rightArrow; + protected MultiIconButtonEIO leftArrow; + protected MultiIconButtonEIO rightArrow; protected String modeLabel; protected int left = 0; @@ -54,12 +53,10 @@ public class BaseSettingsPanel implements ITabPanel { int x = gap * 3 + fr.getStringWidth(modeLabel); int y = 8;// + fr.FONT_HEIGHT; - leftArrow = new ArrowButton(gui, PREV_MODE_B, x, y, false); - leftArrow.setSize(8, 16); + leftArrow = MultiIconButtonEIO.createLeftArrowButton(gui, PREV_MODE_B, x, y); x += leftArrow.getWidth() + gap + getLongestModeStringWidth() + gap; - rightArrow = new ArrowButton(gui, NEXT_MODE_B, x, y, true); - rightArrow.setSize(8, 16); + rightArrow = MultiIconButtonEIO.createRightArrowButton(gui, NEXT_MODE_B, x, y); customTop = top + gap * 5 + fr.FONT_HEIGHT * 2; customTop -= 16; @@ -89,6 +86,7 @@ public class BaseSettingsPanel implements ITabPanel { public void deactivate() { } + @Override public void mouseClicked(int x, int y, int par3) { } diff --git a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java index 935ac157..e92bcacd 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java @@ -20,10 +20,10 @@ import crazypants.enderio.conduit.liquid.EnderLiquidConduit; import crazypants.enderio.conduit.liquid.FluidFilter; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.packet.PacketExtractMode; -import crazypants.enderio.gui.ArrowButton; import crazypants.enderio.gui.ColorButton; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.RedstoneControlMode; @@ -59,7 +59,7 @@ public class LiquidSettings extends BaseSettingsPanel { private GuiToolTip[] filterToolTips; private boolean inOutShowIn = true; - private IconButtonEIO inOutNextB; + private MultiIconButtonEIO inOutNextB; private IconButtonEIO whiteListB; protected LiquidSettings(final GuiExternalConnection gui, IConduit con) { @@ -73,8 +73,7 @@ public class LiquidSettings extends BaseSettingsPanel { int x = gui.getXSize() - 20; int y = customTop; - inOutNextB = new ArrowButton(gui, NEXT_FILTER_ID, x, y, true); - inOutNextB.setSize(8, 16); + inOutNextB = MultiIconButtonEIO.createRightArrowButton(gui, NEXT_FILTER_ID, x, y); x = filterX - 20; y = filterY + 1; diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index fd7d92c9..f4eceec2 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -21,10 +21,9 @@ import crazypants.enderio.conduit.item.filter.ModItemFilter; import crazypants.enderio.conduit.item.filter.PowerItemFilter; import crazypants.enderio.conduit.packet.PacketExtractMode; import crazypants.enderio.conduit.packet.PacketItemConduitFilter; -import crazypants.enderio.gui.ArrowButton; import crazypants.enderio.gui.ColorButton; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.IRedstoneModeControlable; @@ -55,13 +54,13 @@ public class ItemSettings extends BaseSettingsPanel { private String inputHeading; private String outputHeading; - private final IconButtonEIO nextFilterB; + private final MultiIconButtonEIO nextFilterB; private final ToggleButtonEIO loopB; private final ToggleButtonEIO roundRobinB; - private final IconButtonEIO priUpB; - private final IconButtonEIO priDownB; + private final MultiIconButtonEIO priUpB; + private final MultiIconButtonEIO priDownB; private final RedstoneModeButton rsB; private final ColorButton colorB; @@ -91,8 +90,7 @@ public class ItemSettings extends BaseSettingsPanel { int x = 52; int y = customTop; - nextFilterB = new ArrowButton(gui, NEXT_FILTER_ID, x, y, true); - nextFilterB.setSize(8, 16); + nextFilterB = MultiIconButtonEIO.createRightArrowButton(gui, NEXT_FILTER_ID, x, y); x = 66; channelB = new ColorButton(gui, ID_CHANNEL, x, y); @@ -143,12 +141,10 @@ public class ItemSettings extends BaseSettingsPanel { priorityTooltip = new GuiToolTip(new Rectangle(priLeft + 9, y, priWidth, 16), Lang.localize("gui.conduit.item.priority")); x = priLeft + priWidth + 9; - priUpB = new IconButtonEIO(gui, ID_PRIORITY_UP, x, y, IconEIO.ADD_BUT); - priUpB.setSize(8, 8); + priUpB = MultiIconButtonEIO.createAddButton(gui, ID_PRIORITY_UP, x, y); y += 8; - priDownB = new IconButtonEIO(gui, ID_PRIORITY_DOWN, x, y, IconEIO.MINUS_BUT); - priDownB.setSize(8, 8); + priDownB = MultiIconButtonEIO.createMinusButton(gui, ID_PRIORITY_DOWN, x, y); gui.getContainer().addFilterListener(new FilterChangeListener() { @Override diff --git a/src/main/java/crazypants/enderio/gui/ArrowButton.java b/src/main/java/crazypants/enderio/gui/ArrowButton.java deleted file mode 100644 index 9b5cdc33..00000000 --- a/src/main/java/crazypants/enderio/gui/ArrowButton.java +++ /dev/null @@ -1,32 +0,0 @@ -package crazypants.enderio.gui; - -import crazypants.gui.IGuiScreen; - -public class ArrowButton extends IconButtonEIO { - - private final IconEIO unpressed, pressed, hover; - - public ArrowButton(IGuiScreen gui, int id, int x, int y, boolean right) { - super(gui, id, x, y, null); - if(right) { - unpressed = IconEIO.RIGHT_ARROW; - pressed = IconEIO.RIGHT_ARROW_PRESSED; - hover = IconEIO.RIGHT_ARROW_HOVER; - } else { - unpressed = IconEIO.LEFT_ARROW; - pressed = IconEIO.LEFT_ARROW_PRESSED; - hover = IconEIO.LEFT_ARROW_HOVER; - } - } - - @Override - protected IconEIO getIconForHoverState(int hoverState) { - if(hoverState == 0) { - return pressed; - } - if(hoverState == 2) { - return hover; - } - return unpressed; - } -} \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/gui/MultiIconButtonEIO.java b/src/main/java/crazypants/enderio/gui/MultiIconButtonEIO.java new file mode 100644 index 00000000..e0a89183 --- /dev/null +++ b/src/main/java/crazypants/enderio/gui/MultiIconButtonEIO.java @@ -0,0 +1,45 @@ +package crazypants.enderio.gui; + +import crazypants.gui.IGuiScreen; + +public class MultiIconButtonEIO extends IconButtonEIO { + + private final IconEIO unpressed; + private final IconEIO pressed; + private final IconEIO hover; + + public MultiIconButtonEIO(IGuiScreen gui, int id, int x, int y, IconEIO unpressed, IconEIO pressed, IconEIO hover) { + super(gui, id, x, y, null); + this.unpressed = unpressed; + this.pressed = pressed; + this.hover = hover; + setSize((int)unpressed.width, (int)unpressed.height); + } + + @Override + protected IconEIO getIconForHoverState(int hoverState) { + if(hoverState == 0) { + return pressed; + } + if(hoverState == 2) { + return hover; + } + return unpressed; + } + + public static MultiIconButtonEIO createRightArrowButton(IGuiScreen gui, int id, int x, int y) { + return new MultiIconButtonEIO(gui, id, x, y, IconEIO.RIGHT_ARROW, IconEIO.RIGHT_ARROW_PRESSED, IconEIO.RIGHT_ARROW_HOVER); + } + + public static MultiIconButtonEIO createLeftArrowButton(IGuiScreen gui, int id, int x, int y) { + return new MultiIconButtonEIO(gui, id, x, y, IconEIO.LEFT_ARROW, IconEIO.LEFT_ARROW_PRESSED, IconEIO.LEFT_ARROW_HOVER); + } + + public static MultiIconButtonEIO createAddButton(IGuiScreen gui, int id, int x, int y) { + return new MultiIconButtonEIO(gui, id, x, y, IconEIO.ADD_BUT, IconEIO.ADD_BUT_PRESSED, IconEIO.ADD_BUT_HOVER); + } + + public static MultiIconButtonEIO createMinusButton(IGuiScreen gui, int id, int x, int y) { + return new MultiIconButtonEIO(gui, id, x, y, IconEIO.MINUS_BUT, IconEIO.MINUS_BUT_PRESSED, IconEIO.MINUS_BUT_HOVER); + } +} diff --git a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java index fa79d964..1db1cede 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java @@ -8,8 +8,7 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import crazypants.enderio.gui.ArrowButton; -import crazypants.enderio.gui.IconButtonEIO; +import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; @@ -18,12 +17,12 @@ import crazypants.util.Lang; public class GuiPoweredSpawner extends GuiPoweredMachineBase { - private IconButtonEIO modeB; + private final MultiIconButtonEIO modeB; public GuiPoweredSpawner(InventoryPlayer par1InventoryPlayer, TilePoweredSpawner te) { super(te, new ContainerPoweredSpawner(par1InventoryPlayer, te)); - modeB = new ArrowButton(this, 8888, 115, 10, true); + modeB = MultiIconButtonEIO.createRightArrowButton(this, 8888, 115, 10); modeB.setSize(10, 16); } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java index 2a8715d9..29a433dc 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java @@ -11,10 +11,9 @@ import org.lwjgl.opengl.GL11; import crazypants.enderio.conduit.gui.item.BasicItemFilterGui; import crazypants.enderio.conduit.gui.item.IItemFilterContainer; import crazypants.enderio.conduit.item.filter.ItemFilter; -import crazypants.enderio.gui.ArrowButton; import crazypants.enderio.gui.ITabPanel; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.machine.transceiver.PacketItemFilter; import crazypants.enderio.machine.transceiver.TileTransceiver; import crazypants.enderio.network.PacketHandler; @@ -29,7 +28,7 @@ public class FilterTab implements ITabPanel { private final BasicItemFilterGui sendGui; private final BasicItemFilterGui recGui; - private final IconButtonEIO sendRecB; + private final MultiIconButtonEIO sendRecB; boolean showSend = true; @@ -41,7 +40,7 @@ public class FilterTab implements ITabPanel { recGui = new BasicItemFilterGui(parent, new FilterContainer(parent.getTransciever(), false), false, container.getFilterOffset().x, container.getFilterOffset().y, 20); - sendRecB = new ArrowButton(parent, 8888, container.getFilterOffset().x + 79, container.getFilterOffset().y - 20, true); + sendRecB = MultiIconButtonEIO.createRightArrowButton(parent, 8888, container.getFilterOffset().x + 79, container.getFilterOffset().y - 20); sendRecB.setSize(10, 16); } diff --git a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java index 43215be8..35b73110 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/GuiVacuumChest.java @@ -3,8 +3,8 @@ package crazypants.enderio.machine.vacuum; import org.lwjgl.opengl.GL11; import crazypants.enderio.conduit.item.filter.ItemFilter; -import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.gui.MultiIconButtonEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.network.PacketHandler; @@ -41,8 +41,8 @@ public class GuiVacuumChest extends GuiContainerBase { private final TileVacuumChest te; private final GuiToolTip rangeTooltip; - private final IconButtonEIO rangeUpB; - private final IconButtonEIO rangeDownB; + private final MultiIconButtonEIO rangeUpB; + private final MultiIconButtonEIO rangeDownB; private final ToggleButtonEIO whiteListB; private final ToggleButtonEIO useMetaB; private final RedstoneModeButton rsB; @@ -63,12 +63,10 @@ public class GuiVacuumChest extends GuiContainerBase { rangeTooltip = new GuiToolTip(new Rectangle(x, y, RANGE_WIDTH, 16), Lang.localize("gui.vacuum.range")); x += RANGE_WIDTH; - rangeUpB = new IconButtonEIO(this, ID_RANGE_UP, x, y, IconEIO.ADD_BUT); - rangeUpB.setSize(8, 8); + rangeUpB = MultiIconButtonEIO.createAddButton(this, ID_RANGE_UP, x, y); y += 8; - rangeDownB = new IconButtonEIO(this, ID_RANGE_DOWN, x, y, IconEIO.MINUS_BUT); - rangeDownB.setSize(8, 8); + rangeDownB = MultiIconButtonEIO.createMinusButton(this, ID_RANGE_DOWN, x, y); x = xSize - 16 - 7; y = 104;