From 2b49428aa009c37c7ce81968a133bd80ded27607 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sun, 12 Apr 2015 21:18:48 +0200 Subject: [PATCH] render EIO tooltips above NEI --- src/main/java/crazypants/gui/GuiContainerBase.java | 4 ++-- src/main/java/crazypants/gui/ToolTipManager.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/crazypants/gui/GuiContainerBase.java b/src/main/java/crazypants/gui/GuiContainerBase.java index 2038f65a..51358ab4 100644 --- a/src/main/java/crazypants/gui/GuiContainerBase.java +++ b/src/main/java/crazypants/gui/GuiContainerBase.java @@ -194,8 +194,6 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe GL11.glEnable(GL11.GL_DEPTH_TEST); GL11.glPopMatrix(); } - - ttMan.drawTooltips(this, realMx, realMy); } @Override @@ -227,6 +225,8 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe renderToolTip(stack, par1, par2); } } + + ttMan.drawTooltips(this, par1, par2); } // copied from super with hate diff --git a/src/main/java/crazypants/gui/ToolTipManager.java b/src/main/java/crazypants/gui/ToolTipManager.java index 63efe208..ba19321e 100644 --- a/src/main/java/crazypants/gui/ToolTipManager.java +++ b/src/main/java/crazypants/gui/ToolTipManager.java @@ -36,7 +36,7 @@ public class ToolTipManager { for (GuiToolTip toolTip : toolTips) { toolTip.onTick(mouseX - renderer.getGuiLeft(), mouseY - renderer.getGuiTop()); if(toolTip.shouldDraw()) { - drawTooltip(toolTip, mouseX - renderer.getGuiLeft(), mouseY - renderer.getGuiTop(), renderer); + drawTooltip(toolTip, mouseX, mouseY, renderer); } } } @@ -50,13 +50,13 @@ public class ToolTipManager { List formatted = new ArrayList(list.size()); for (int i = 0; i < list.size(); i++) { if(i == 0) { - formatted.add("\u00a7" + Integer.toHexString(15) + list.get(i)); + formatted.add("\u00a7f" + list.get(i)); } else { formatted.add("\u00a77" + list.get(i)); } } - if(mouseX > (renderer.getXSize() / 2)) { + if(mouseX > renderer.getGuiLeft() + renderer.getXSize() / 2) { int maxWidth = 0; Iterator iterator = formatted.iterator(); while (iterator.hasNext()) {