Merge pull request #2300 from MatthiasMann/render_tooltips_above_nei

render EIO tooltips above NEI
This commit is contained in:
tterrag1098 committed 2015-04-12 22:45:08 -04:00
commit fa2b38ec9a
2 files changed
+5 -5

No files matched your search

@@ -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
@@ -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<String> formatted = new ArrayList<String>(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()) {