diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java index 7e1a4803..7daa8bcc 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java @@ -163,7 +163,7 @@ public class BasicItemFilterGui implements IItemFilterGui { } @Override - public void deactivate() { + public void deactivate() { useNbtB.detach(); useMetaB.detach(); useOreDictB.detach(); diff --git a/src/main/java/crazypants/enderio/gui/IconButtonEIO.java b/src/main/java/crazypants/enderio/gui/IconButtonEIO.java index f43a904e..747c6172 100644 --- a/src/main/java/crazypants/enderio/gui/IconButtonEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconButtonEIO.java @@ -23,7 +23,6 @@ public class IconButtonEIO extends GuiButton { private int xOrigin; private int yOrigin; - protected boolean isOnGui; protected IGuiScreen gui; protected String[] toolTipText; @@ -52,11 +51,11 @@ public class IconButtonEIO extends GuiButton { } protected void setToolTip(GuiToolTip newToolTip) { - if (isOnGui && toolTip != null) { + if (toolTip != null) { gui.removeToolTip(toolTip); } toolTip = newToolTip; - if (isOnGui && toolTip != null) { + if (toolTip != null) { gui.addToolTip(toolTip); } } @@ -66,23 +65,17 @@ public class IconButtonEIO extends GuiButton { } public void onGuiInit() { - if(!isOnGui) { - gui.addButton(this); - if(toolTip != null) { - gui.addToolTip(toolTip); - } - isOnGui = true; + gui.addButton(this); + if(toolTip != null) { + gui.addToolTip(toolTip); } xPosition = xOrigin + gui.getGuiLeft(); yPosition = yOrigin + gui.getGuiTop(); } public void detach() { - if(isOnGui) { - gui.removeToolTip(toolTip); - gui.removeButton(this); - isOnGui = false; - } + gui.removeToolTip(toolTip); + gui.removeButton(this); } public void setSize(int width, int height) {