diff --git a/src/main/java/codechicken/nei/ItemsGrid.java b/src/main/java/codechicken/nei/ItemsGrid.java index ef0f7578..141cede7 100644 --- a/src/main/java/codechicken/nei/ItemsGrid.java +++ b/src/main/java/codechicken/nei/ItemsGrid.java @@ -345,7 +345,7 @@ public class ItemsGrid { } else { tooltipYOffset = mousey + 3 + (recipeTooltipLines * 10); } - GL11.glTranslatef(mousex, tooltipYOffset, 100); + GL11.glTranslatef(mousex, tooltipYOffset, 500); final GuiContainer gui; if (mc.currentScreen instanceof GuiRecipe) { @@ -455,6 +455,9 @@ public class ItemsGrid { drawSlotOutlines(mousex, mousey); drawItems(); } + } + + public void postDrawTooltips(int mousex, int mousey) { if (NEIClientConfig.showRecipeTooltips() && showRecipeTooltips) { try { drawRecipeTooltip(mousex, mousey); diff --git a/src/main/java/codechicken/nei/LayoutManager.java b/src/main/java/codechicken/nei/LayoutManager.java index 162e99be..df198060 100644 --- a/src/main/java/codechicken/nei/LayoutManager.java +++ b/src/main/java/codechicken/nei/LayoutManager.java @@ -280,6 +280,13 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH } } + @Override + public void postRenderTooltips(GuiContainer gui, int mousex, int mousey) { + if (!isHidden() && isEnabled()) { + for (Widget widget : drawWidgets) widget.postDrawTooltips(mousex, mousey); + } + } + @Override public List handleTooltip(GuiContainer gui, int mousex, int mousey, List currenttip) { if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) { diff --git a/src/main/java/codechicken/nei/PanelWidget.java b/src/main/java/codechicken/nei/PanelWidget.java index b018cef9..d55797c8 100644 --- a/src/main/java/codechicken/nei/PanelWidget.java +++ b/src/main/java/codechicken/nei/PanelWidget.java @@ -190,6 +190,11 @@ public abstract class PanelWidget extends Widget { } } + @Override + public void postDrawTooltips(int mx, int my) { + grid.postDrawTooltips(mx, my); + } + @Override public void mouseDragged(int mousex, int mousey, int button, long heldTime) { if (mouseDownSlot >= 0 && draggedStack == null diff --git a/src/main/java/codechicken/nei/Widget.java b/src/main/java/codechicken/nei/Widget.java index 7dc978d8..a39b344e 100644 --- a/src/main/java/codechicken/nei/Widget.java +++ b/src/main/java/codechicken/nei/Widget.java @@ -14,6 +14,8 @@ public abstract class Widget { public void postDraw(int mx, int my) {} + public void postDrawTooltips(int mx, int my) {} + public boolean handleClick(int mx, int my, int button) { return true; } diff --git a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java index 31185ae2..0fc60c89 100644 --- a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java +++ b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java @@ -514,6 +514,8 @@ public class GuiContainerManager { if (tooltip.size() > 0) tooltip.set(0, tooltip.get(0) + GuiDraw.TOOLTIP_LINESPACE); // add space after 'title' drawPagedTooltip(font, mousex + 12, mousey - 12, tooltip); + + for (IContainerDrawHandler drawHandler : drawHandlers) drawHandler.postRenderTooltips(window, mousex, mousey); } private static int tooltipPage; diff --git a/src/main/java/codechicken/nei/guihook/IContainerDrawHandler.java b/src/main/java/codechicken/nei/guihook/IContainerDrawHandler.java index 503cdc0f..41993ae0 100644 --- a/src/main/java/codechicken/nei/guihook/IContainerDrawHandler.java +++ b/src/main/java/codechicken/nei/guihook/IContainerDrawHandler.java @@ -30,6 +30,16 @@ public interface IContainerDrawHandler { */ public void postRenderObjects(GuiContainer gui, int mousex, int mousey); + /** + * Use this to draw things that should be drawn just after vanilla slot tooltips, on top of buttons and other + * usually always-on-top widgets. + * + * @param gui An instance of the currentscreen + * @param mousex The x position of the mouse in pixels from left + * @param mousey The y position of the mouse in pixels from top + */ + default void postRenderTooltips(GuiContainer gui, int mousex, int mousey) {} + /** * Render something over a slot before the item in the slot. *