diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 13926ec2..26b7830b 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -882,8 +882,9 @@ enderio.gui.travelAccessable.ok=Authorise enderio.gui.telepad.configure.travel=Travel Settings enderio.gui.telepad.configure.telepad=Telepad Settings -//Spawn Gurad +//Spawn Gurad [sic] enderio.gui.spawnGurad.showRange=Show Range +enderio.gui.spawnGurad.hideRange=Hide Range enderio.gui.spawnGurad.range=Range: //conduits diff --git a/resources/assets/enderio/textures/gui/widgetsv2.png b/resources/assets/enderio/textures/gui/widgetsv2.png index faddc3bc..ddd09f9e 100644 Binary files a/resources/assets/enderio/textures/gui/widgetsv2.png and b/resources/assets/enderio/textures/gui/widgetsv2.png differ diff --git a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java index 8fa2c9dd..149a1db9 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java @@ -11,6 +11,7 @@ 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; @@ -53,11 +54,11 @@ public class BaseSettingsPanel implements ITabPanel { int x = gap * 3 + fr.getStringWidth(modeLabel); int y = 8;// + fr.FONT_HEIGHT; - leftArrow = new IconButtonEIO(gui, PREV_MODE_B, x, y, IconEIO.LEFT_ARROW); + leftArrow = new ArrowButton(gui, PREV_MODE_B, x, y, false); leftArrow.setSize(8, 16); x += leftArrow.getWidth() + gap + getLongestModeStringWidth() + gap; - rightArrow = new IconButtonEIO(gui, NEXT_MODE_B, x, y, IconEIO.RIGHT_ARROW); + rightArrow = new ArrowButton(gui, NEXT_MODE_B, x, y, true); rightArrow.setSize(8, 16); customTop = top + gap * 5 + fr.FONT_HEIGHT * 2; @@ -76,7 +77,6 @@ public class BaseSettingsPanel implements ITabPanel { leftArrow.onGuiInit(); rightArrow.onGuiInit(); - FontRenderer fr = gui.getFontRenderer(); connectionModeChanged(con.getConnectionMode(gui.getDir())); initCustomOptions(); diff --git a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java index d2c1a6f7..935ac157 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java @@ -20,6 +20,7 @@ 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; @@ -72,7 +73,7 @@ public class LiquidSettings extends BaseSettingsPanel { int x = gui.getXSize() - 20; int y = customTop; - inOutNextB = new IconButtonEIO(gui, NEXT_FILTER_ID, x, y, IconEIO.RIGHT_ARROW); + inOutNextB = new ArrowButton(gui, NEXT_FILTER_ID, x, y, true); inOutNextB.setSize(8, 16); x = filterX - 20; 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 db0daaf1..fd7d92c9 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -21,6 +21,7 @@ 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; @@ -90,7 +91,7 @@ public class ItemSettings extends BaseSettingsPanel { int x = 52; int y = customTop; - nextFilterB = new IconButtonEIO(gui, NEXT_FILTER_ID, x, y, IconEIO.RIGHT_ARROW); + nextFilterB = new ArrowButton(gui, NEXT_FILTER_ID, x, y, true); nextFilterB.setSize(8, 16); x = 66; diff --git a/src/main/java/crazypants/enderio/gui/ArrowButton.java b/src/main/java/crazypants/enderio/gui/ArrowButton.java new file mode 100644 index 00000000..9b5cdc33 --- /dev/null +++ b/src/main/java/crazypants/enderio/gui/ArrowButton.java @@ -0,0 +1,32 @@ +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/IconButtonEIO.java b/src/main/java/crazypants/enderio/gui/IconButtonEIO.java index 921c3c8c..e92d2a5a 100644 --- a/src/main/java/crazypants/enderio/gui/IconButtonEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconButtonEIO.java @@ -25,7 +25,7 @@ public class IconButtonEIO extends GuiButton { protected IGuiScreen gui; - protected GuiToolTip toolTip; + private GuiToolTip toolTip; private int marginY = 0; private int marginX = 0; @@ -41,13 +41,17 @@ public class IconButtonEIO extends GuiButton { public void setToolTip(String... tooltipText) { if(toolTip == null) { - toolTip = new GuiToolTip(new Rectangle(xOrigin, yOrigin, width, height), tooltipText); + toolTip = new GuiToolTip(getBounds(), tooltipText); //gui.addToolTip(toolTip); } else { toolTip.setToolTipText(tooltipText); } } - + + public final Rectangle getBounds() { + return new Rectangle(xOrigin, yOrigin, getWidth(), getHeight()); + } + public void onGuiInit() { gui.addButton(this); if(toolTip != null) { @@ -102,6 +106,10 @@ public class IconButtonEIO extends GuiButton { public void setIcon(IconEIO icon) { this.icon = icon; } + + public GuiToolTip getToolTip() { + return toolTip; + } /** * Override this to handle mouse clicks with other buttons than the left diff --git a/src/main/java/crazypants/enderio/gui/IconEIO.java b/src/main/java/crazypants/enderio/gui/IconEIO.java index 822d9161..71d6f8bd 100644 --- a/src/main/java/crazypants/enderio/gui/IconEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconEIO.java @@ -11,11 +11,13 @@ public final class IconEIO { public static final IconEIO TICK = new IconEIO(0, 192); public static final IconEIO MINUS = new IconEIO(16, 192); - public static final IconEIO PUBLIC = new IconEIO(32, 192); - public static final IconEIO PRIVATE = new IconEIO(48, 192); + public static final IconEIO LOCK_UNLOCKED = new IconEIO(32, 192); + public static final IconEIO LOCK_LOCKED = new IconEIO(48, 192); public static final IconEIO CROSS = new IconEIO(64, 192); public static final IconEIO PLUS = new IconEIO(80, 192); public static final IconEIO ARROWS = new IconEIO(176, 192); + public static final IconEIO ADD = new IconEIO(112, 240); + public static final IconEIO SUBTRACT = new IconEIO(96, 240); public static final IconEIO BUTTON = new IconEIO(0, 208); public static final IconEIO BUTTON_HIGHLIGHT = new IconEIO(16, 208); @@ -50,8 +52,15 @@ public final class IconEIO { public static final IconEIO ACTIVE_TAB = new IconEIO(205, 0, 19, 24); public static final IconEIO INACTIVE_TAB = new IconEIO(237, 0, 19, 24); - public static final IconEIO RIGHT_ARROW = new IconEIO(192, 48, 16, 32); - public static final IconEIO LEFT_ARROW = new IconEIO(208, 48, 16, 32); + public static final IconEIO LEFT_ARROW = new IconEIO(224, 32, 8, 16); + public static final IconEIO LEFT_ARROW_PRESSED = new IconEIO(240, 32, 8, 16); + public static final IconEIO LEFT_ARROW_HOVER = new IconEIO(224, 48, 8, 16); + public static final IconEIO LEFT_ARROW_HOVER_PRESSED = new IconEIO(240, 48, 8, 16); + + public static final IconEIO RIGHT_ARROW = new IconEIO(232, 32, 8, 16); + public static final IconEIO RIGHT_ARROW_PRESSED = new IconEIO(248, 32, 8, 16); + public static final IconEIO RIGHT_ARROW_HOVER = new IconEIO(232, 48, 8, 16); + public static final IconEIO RIGHT_ARROW_HOVER_PRESSED = new IconEIO(248, 48, 8, 16); public static final IconEIO REDSTONE_MODE_WITHOUT_SIGNAL = new IconEIO(64, 224); public static final IconEIO REDSTONE_MODE_WITH_SIGNAL = new IconEIO(80, 224); @@ -75,13 +84,12 @@ public final class IconEIO { @Deprecated public static final IconEIO OUTPUT_OLD = new IconEIO(128, 180 + 32, 30, 14); - public static final IconEIO INPUT = new IconEIO(224, 64, 16, 8); - public static final IconEIO OUTPUT = new IconEIO(240, 64, 16, 8); - public static final IconEIO INPUT_OUTPUT = new IconEIO(224, 48, 32, 16); - public static final IconEIO DISABLED = new IconEIO(48, 240); - - public static final IconEIO LOOP = new IconEIO(224, 96); - public static final IconEIO LOOP_OFF = new IconEIO(240, 96); + public static final IconEIO INPUT = new IconEIO(32, 176, 16, 8); + public static final IconEIO OUTPUT = new IconEIO(48, 176, 16, 8); + public static final IconEIO INPUT_OUTPUT = new IconEIO(32, 176, 32, 8); + public static final IconEIO DISABLED = new IconEIO(64, 176); + public static final IconEIO LOOP = new IconEIO(80, 176); + public static final IconEIO LOOP_OFF = new IconEIO(96, 176); public static final IconEIO ROUND_ROBIN = new IconEIO(64, 240); public static final IconEIO ROUND_ROBIN_OFF = new IconEIO(80, 240); @@ -94,7 +102,14 @@ public final class IconEIO { public static final IconEIO RECIPE_BUTTON = new IconEIO(80, 208); public static final IconEIO ADD_BUT = new IconEIO(208, 32, 8, 8); + public static final IconEIO ADD_BUT_PRESSED = new IconEIO(216, 32, 8, 8); + public static final IconEIO ADD_BUT_HOVER = new IconEIO(208, 48, 8, 8); + public static final IconEIO ADD_BUT_HOVER_PRESSED = new IconEIO(216, 48, 8, 8); + public static final IconEIO MINUS_BUT = new IconEIO(208, 40, 8, 8); + public static final IconEIO MINUS_BUT_PRESSED = new IconEIO(216, 40, 8, 8); + public static final IconEIO MINUS_BUT_HOVER = new IconEIO(208, 56, 8, 8); + public static final IconEIO MINUS_BUT_HOVER_PRESSED = new IconEIO(216, 56, 8, 8); public static final IconEIO SOUND = new IconEIO(176, 208); @@ -114,9 +129,6 @@ public final class IconEIO { public static final IconEIO ITEM_STACK = new IconEIO(144, 208); public static final IconEIO ITEM_SINGLE = new IconEIO(160, 208); - - public static final IconEIO FARM_UNLOCK = new IconEIO(128, 240); - public static final IconEIO FARM_LOCK = new IconEIO(144, 240); public static final IconEIO SUN = new IconEIO(160, 240); public static final IconEIO RAIN = new IconEIO(176, 240); diff --git a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java index bae07cd9..dce74f51 100644 --- a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java @@ -40,7 +40,7 @@ public class GuiFarmStation extends GuiPoweredMachineBase { } private IconButtonEIO createLockButton(int slot, int x, int y) { - return new ToggleButtonEIO(this, LOCK_ID+slot, x, y, IconEIO.FARM_UNLOCK, IconEIO.FARM_LOCK).setSelected(getTileEntity().isSlotLocked(slot)); + return new ToggleButtonEIO(this, LOCK_ID + slot, x, y, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED).setSelected(getTileEntity().isSlotLocked(slot)); } @Override diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java index f9fd6896..e4f060bb 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java @@ -98,7 +98,7 @@ public class GuiHyperCube extends GuiContainerBase { addButton.setToolTip(Lang.localize("gui.trans.addChannel")); addButton.enabled = false; - privateButton = new ToggleButtonEIO(this, PRIVATE_BUTTON_ID, 118, 12, IconEIO.PUBLIC, IconEIO.PRIVATE); + privateButton = new ToggleButtonEIO(this, PRIVATE_BUTTON_ID, 118, 12, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED); privateButton.setSelectedToolTip(Lang.localize("gui.trans.privateChannel")); privateButton.setUnselectedToolTip(Lang.localize("gui.trans.publicChannel")); diff --git a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java index 0cc0808a..f78f84c6 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/attractor/GuiAttractor.java @@ -1,15 +1,19 @@ package crazypants.enderio.machine.obelisk.attractor; import java.awt.Color; +import java.util.List; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.google.common.collect.Lists; + import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; +import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; import crazypants.util.Lang; @@ -18,17 +22,22 @@ public class GuiAttractor extends GuiPoweredMachineBase { private static final int RANGE_ID = 8738924; - private ToggleButtonEIO showRangeB; + private final ToggleButtonEIO showRangeB; public GuiAttractor(InventoryPlayer par1InventoryPlayer, TileAttractor te) { super(te, new ContainerAttractor(par1InventoryPlayer, te)); int x = getXSize() - 5 - BUTTON_SIZE; - showRangeB = new ToggleButtonEIO(this, RANGE_ID, x, 44, IconEIO.ADD_BUT, IconEIO.ADD_BUT); + showRangeB = new ToggleButtonEIO(this, RANGE_ID, x, 44, IconEIO.PLUS, IconEIO.MINUS); showRangeB.setSize(BUTTON_SIZE, BUTTON_SIZE); - showRangeB.setToolTip(Lang.localize("gui.spawnGurad.showRange")); + addToolTip(new GuiToolTip(showRangeB.getBounds(), "null") { + @Override + public List getToolTipText() { + return Lists.newArrayList(Lang.localize(showRangeB.isSelected() ? "gui.spawnGurad.hideRange" : "gui.spawnGurad.showRange")); + } + }); } - + @Override public void initGui() { super.initGui(); diff --git a/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java index a8dce824..5a48e0b5 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/aversion/GuiAversionObelisk.java @@ -1,15 +1,19 @@ package crazypants.enderio.machine.obelisk.aversion; import java.awt.Color; +import java.util.List; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import com.google.common.collect.Lists; + import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; +import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; import crazypants.util.Lang; @@ -17,20 +21,25 @@ import crazypants.util.Lang; public class GuiAversionObelisk extends GuiPoweredMachineBase { ToggleButtonEIO showRangeB; - + private static final int RANGE_ID = 8738924; - + public GuiAversionObelisk(InventoryPlayer par1InventoryPlayer, TileAversionObelisk te) { super(te, new ContainerAversionObelisk(par1InventoryPlayer, te)); - + int x = getXSize() - 5 - BUTTON_SIZE; - showRangeB = new ToggleButtonEIO(this, RANGE_ID, x, 44, IconEIO.ADD_BUT, IconEIO.ADD_BUT); + showRangeB = new ToggleButtonEIO(this, RANGE_ID, x, 44, IconEIO.PLUS, IconEIO.MINUS); showRangeB.setSize(BUTTON_SIZE, BUTTON_SIZE); - showRangeB.setToolTip(Lang.localize("gui.spawnGurad.showRange")); + addToolTip(new GuiToolTip(showRangeB.getBounds(), "null") { + @Override + public List getToolTipText() { + return Lists.newArrayList(Lang.localize(showRangeB.isSelected() ? "gui.spawnGurad.hideRange" : "gui.spawnGurad.showRange")); + } + }); } - + @Override - public void initGui() { + public void initGui() { super.initGui(); showRangeB.onGuiInit(); showRangeB.setSelected(getTileEntity().isShowingRange()); @@ -44,23 +53,24 @@ public class GuiAversionObelisk extends GuiPoweredMachineBase public GuiPoweredSpawner(InventoryPlayer par1InventoryPlayer, TilePoweredSpawner te) { super(te, new ContainerPoweredSpawner(par1InventoryPlayer, te)); - modeB = new IconButtonEIO(this, 8888, 115, 10, IconEIO.RIGHT_ARROW); + modeB = new ArrowButton(this, 8888, 115, 10, true); modeB.setSize(10, 16); } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java index 605b6331..11d0347a 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java @@ -60,7 +60,7 @@ public class ChannelTab implements ITabPanel { addButton.setToolTip(Lang.localize("gui.trans.addChannel")); addButton.enabled = false; - privateButton = new ToggleButtonEIO(parent, PRIVATE_BUTTON_ID, 118, 12, IconEIO.PUBLIC, IconEIO.PRIVATE); + privateButton = new ToggleButtonEIO(parent, PRIVATE_BUTTON_ID, 118, 12, IconEIO.LOCK_UNLOCKED, IconEIO.LOCK_LOCKED); privateButton.setSelectedToolTip(Lang.localize("gui.trans.privateChannel")); privateButton.setUnselectedToolTip(Lang.localize("gui.trans.publicChannel")); 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 ad938433..2a8715d9 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java @@ -11,6 +11,7 @@ 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; @@ -40,7 +41,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 IconButtonEIO(parent, 8888, container.getFilterOffset().x + 79, container.getFilterOffset().y - 20, IconEIO.RIGHT_ARROW); + sendRecB = new ArrowButton(parent, 8888, container.getFilterOffset().x + 79, container.getFilterOffset().y - 20, true); sendRecB.setSize(10, 16); } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java index 5a2ed8fc..caa95829 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiChannelList.java @@ -68,7 +68,7 @@ public class GuiChannelList extends GuiScrollableList { int col = ColorUtil.getRGB(Color.white); parent.drawString(parent.getFontRenderer(), c.getName(), xPosition + margin, yPosition + margin / 2, col); if(!c.isPublic()) { - IconEIO.PRIVATE.renderIcon(xPosition + width - 18, yPosition - 3, 16, 15, 0, true); + IconEIO.LOCK_LOCKED.renderIcon(xPosition + width - 18, yPosition - 3, 16, 15, 0, true); } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java index ec5d05a4..89cc288c 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java @@ -180,7 +180,7 @@ public class GuiTelePad extends GuiContainerBase implements IToggleableGui { TextFieldEIO f = textFields.get(i); fnt.drawString(text[i], f.xPosition - (fnt.getStringWidth(text[i]) / 2) - 10, f.yPosition + ((f.height - fnt.FONT_HEIGHT) / 2) + 1, 0x000000); if(!f.getCanLoseFocus()) { - IconEIO.FARM_LOCK.renderIcon(f.xPosition + f.width - 2, f.yPosition - 2, true); + IconEIO.LOCK_LOCKED.renderIcon(f.xPosition + f.width - 2, f.yPosition - 2, true); } }