Fix overlay text input and tooltip rendering

src/main/java/com/cleanroommc/modularui/ClientProxy.java

@@ -9,6 +9,7 @@
 import com.cleanroommc.modularui.holoui.HoloScreenEntity;
 import com.cleanroommc.modularui.holoui.ScreenEntityRender;
 import com.cleanroommc.modularui.network.ModularNetwork;
+import com.cleanroommc.modularui.overlay.OverlayInputHandler;
 import com.cleanroommc.modularui.screen.ClientScreenHandler;
 import com.cleanroommc.modularui.test.TestItem;
 import com.cleanroommc.modularui.theme.ThemeManager;
@@ -66,6 +67,9 @@ void preInit(FMLPreInitializationEvent event) {
         // registered to both buses since handled events are not bound to a single bus
         FMLCommonHandler.instance().bus().register(clientScreenHandler);
         MinecraftForge.EVENT_BUS.register(clientScreenHandler);
+        if (ModularUI.Mods.LWJGL3IFY.isLoaded()) {
+            OverlayInputHandler.register();
+        }
         AnimatorManager.init();
 
         if (ModularUIConfig.enableTestGuis) {

src/main/java/com/cleanroommc/modularui/overlay/OverlayInputHandler.java

@@ -0,0 +1,32 @@
+package com.cleanroommc.modularui.overlay;
+
+import com.cleanroommc.modularui.ModularUI;
+
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import me.eigenraven.lwjgl3ify.api.InputEvents;
+import org.jetbrains.annotations.ApiStatus;
+
+@ApiStatus.Internal
+@SideOnly(Side.CLIENT)
+@Optional.Interface(modid = ModularUI.ModIds.LWJGL3IFY, iface = "me.eigenraven.lwjgl3ify.api.InputEvents$KeyboardListener")
+public class OverlayInputHandler implements InputEvents.KeyboardListener {
+
+    @Optional.Method(modid = ModularUI.ModIds.LWJGL3IFY)
+    public static void register() {
+        InputEvents.addKeyboardListener(new OverlayInputHandler());
+    }
+
+    @Override
+    @Optional.Method(modid = ModularUI.ModIds.LWJGL3IFY)
+    public void onTextEvent(InputEvents.TextEvent event) {
+        OverlayStack.interact(screen -> {
+            if (screen.getContext().getFocusedWidget() == null) {
+                return false;
+            }
+            screen.onTextEvent(event);
+            return true;
+        }, true);
+    }
+}

src/main/java/com/cleanroommc/modularui/overlay/OverlayStack.java

@@ -9,6 +9,7 @@
 import com.cleanroommc.modularui.utils.GlStateManager;
 
 import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.RenderHelper;
 import net.minecraftforge.common.MinecraftForge;
 
 import org.jetbrains.annotations.ApiStatus;
@@ -71,6 +72,24 @@ public static void draw(int mouseX, int mouseY, float partialTicks) {
             fallback = screen;
         }
         ClientScreenHandler.drawDebugScreen(hovered, fallback);
+        drawTooltips();
+    }
+
+    private static void drawTooltips() {
+        GlStateManager.disableRescaleNormal();
+        RenderHelper.disableStandardItemLighting();
+        GlStateManager.disableLighting();
+        GlStateManager.disableDepth();
+        GlStateManager.disableAlpha();
+
+        for (ModularScreen screen : overlay) {
+            screen.getContext().drawQueuedForeground();
+        }
+
+        GlStateManager.enableRescaleNormal();
+        GlStateManager.enableLighting();
+        RenderHelper.enableStandardItemLighting();
+        GlStateManager.enableAlpha();
     }
 
     public static void open(ModularScreen screen) {

src/main/java/com/cleanroommc/modularui/screen/ModularScreen.java

@@ -344,6 +344,9 @@ public void drawForeground() {
         }
         this.context.drawDraggable();
         this.context.popViewport(null);
+        if (!isOverlay()) {
+            this.context.drawQueuedForeground();
+        }
 
         GlStateManager.enableRescaleNormal();
         GlStateManager.enableLighting();

src/main/java/com/cleanroommc/modularui/screen/viewport/DeferredRenderQueue.java

@@ -0,0 +1,21 @@
+package com.cleanroommc.modularui.screen.viewport;
+
+import java.util.ArrayList;
+import java.util.List;
+
+final class DeferredRenderQueue {
+
+    private final List<Runnable> renderCalls = new ArrayList<>();
+
+    void queue(Runnable renderCall) {
+        this.renderCalls.add(renderCall);
+    }
+
+    void drawQueued() {
+        try {
+            this.renderCalls.forEach(Runnable::run);
+        } finally {
+            this.renderCalls.clear();
+        }
+    }
+}

src/main/java/com/cleanroommc/modularui/screen/viewport/ModularGuiContext.java

@@ -55,6 +55,7 @@ public class ModularGuiContext extends GuiContext {
     private int lastDragX, lastDragY;
 
     public List<Consumer<ModularGuiContext>> postRenderCallbacks = new ArrayList<>();
+    private final DeferredRenderQueue foregroundRenderQueue = new DeferredRenderQueue();
 
     private UISettings settings;
 
@@ -81,6 +82,16 @@ public ModularScreen getScreen() {
         return screen;
     }
 
+    @ApiStatus.Internal
+    public void queueForegroundRender(Runnable renderCall) {
+        this.foregroundRenderQueue.queue(renderCall);
+    }
+
+    @ApiStatus.Internal
+    public void drawQueuedForeground() {
+        this.foregroundRenderQueue.drawQueued();
+    }
+
     /**
      * @return the screen that was open before when this screen was opened or null of none was open
      */

src/main/java/com/cleanroommc/modularui/widget/Widget.java

@@ -203,7 +203,7 @@ public void drawOverlay(ModularGuiContext context, WidgetThemeEntry<?> widgetThe
     public void drawForeground(ModularGuiContext context) {
         RichTooltip tooltip = getTooltip();
         if (tooltip != null && isHoveringFor(tooltip.getShowUpTimer()) && !context.hasDraggable()) {
-            tooltip.draw(context);
+            context.queueForegroundRender(() -> tooltip.draw(context));
         }
     }
 

src/main/java/com/cleanroommc/modularui/widgets/RichTextWidget.java

@@ -46,7 +46,7 @@ public void drawForeground(ModularGuiContext context) {
             hoverable.onHover();
             RichTooltip tooltip = hoverable.getTooltip();
             if (tooltip != null) {
-                tooltip.draw(context);
+                context.queueForegroundRender(() -> tooltip.draw(context));
             }
         }
     }

src/main/java/com/cleanroommc/modularui/widgets/slot/ItemSlot.java

@@ -111,7 +111,7 @@ protected void drawOverlay() {
     public void drawForeground(ModularGuiContext context) {
         RichTooltip tooltip = getTooltip();
         if (tooltip != null && isHoveringFor(tooltip.getShowUpTimer()) && !context.hasDraggable()) {
-            tooltip.draw(getContext(), getSlot().getStack());
+            context.queueForegroundRender(() -> tooltip.draw(context, getSlot().getStack()));
         }
     }