From d3bd68dab59d7db4cb8cae7cf11cefbd2ac4912d Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sun, 16 Jul 2023 09:00:35 +0100 Subject: [PATCH] Attempt to fix CME when opening recipes immediately after load (#403) --- src/main/java/codechicken/nei/ItemsGrid.java | 4 ++++ .../java/codechicken/nei/api/ShortcutInputHandler.java | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/src/main/java/codechicken/nei/ItemsGrid.java b/src/main/java/codechicken/nei/ItemsGrid.java index 12cdeb6d..99e1090a 100644 --- a/src/main/java/codechicken/nei/ItemsGrid.java +++ b/src/main/java/codechicken/nei/ItemsGrid.java @@ -279,6 +279,10 @@ public class ItemsGrid { } private void drawRecipeTooltip(int mousex, int mousey, List itemTooltip) { + if (!NEIClientConfig.isLoaded()) { + return; + } + final Minecraft mc = Minecraft.getMinecraft(); ItemPanelSlot focused = getSlotMouseOver(mousex, mousey); if (focused == null) { diff --git a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java index 1758b933..2cf5d8aa 100644 --- a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java +++ b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java @@ -20,6 +20,10 @@ public abstract class ShortcutInputHandler { public static boolean handleKeyEvent(ItemStack stackover) { + if (!NEIClientConfig.isLoaded()) { + return false; + } + if (NEIClientConfig.isKeyHashDown("gui.overlay_hide")) { return hideOverlayRecipe(); } @@ -67,6 +71,10 @@ public abstract class ShortcutInputHandler { public static boolean handleMouseClick(ItemStack stackover) { + if (!NEIClientConfig.isLoaded()) { + return false; + } + if (stackover != null) { final int button = Mouse.getEventButton(); stackover = stackover.copy();