fix phantom slots not accepting jei ingredients

Author: brachy84

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

@@ -14,6 +14,7 @@
 import com.cleanroommc.modularui.core.mixins.early.minecraft.GuiScreenAccessor;
 import com.cleanroommc.modularui.drawable.GuiDraw;
 import com.cleanroommc.modularui.drawable.Stencil;
+import com.cleanroommc.modularui.integration.jei.ModularUIJeiPlugin;
 import com.cleanroommc.modularui.network.ModularNetwork;
 import com.cleanroommc.modularui.overlay.OverlayManager;
 import com.cleanroommc.modularui.overlay.OverlayStack;
@@ -49,13 +50,15 @@
 import net.minecraftforge.client.event.GuiOpenEvent;
 import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.Optional;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import mezz.jei.gui.ghost.GhostIngredientDrag;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnmodifiableView;
@@ -67,6 +70,7 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 @ApiStatus.Internal
@@ -245,6 +249,11 @@ private static boolean doAction(@Nullable ModularScreen muiScreen, Predicate<Mod
         return OverlayStack.interact(action, true) || (muiScreen != null && action.test(muiScreen));
     }
 
+    private static void foreach(@Nullable ModularScreen muiScreen, Consumer<ModularScreen> action) {
+        OverlayStack.foreach(action, true);
+        if (muiScreen != null) action.accept(muiScreen);
+    }
+
     private static boolean handleMouseInput(int button, @Nullable ModularScreen muiScreen, GuiScreen mcScreen) throws IOException {
         GameSettings gameSettings = Minecraft.getMinecraft().gameSettings;
         GuiScreenAccessor acc = (GuiScreenAccessor) mcScreen;
@@ -261,6 +270,18 @@ private static boolean handleMouseInput(int button, @Nullable ModularScreen muiS
             acc.setEventButton(button);
             acc.setLastMouseEvent(Minecraft.getSystemTime());
             if (muiScreen != null && muiScreen.onMouseInputPre(button, true)) return true;
+            if (ModularUI.Mods.JEI.isLoaded()) {
+                GhostIngredientDrag<?> drag = ModularUIJeiPlugin.getGhostDrag();
+                if (drag != null) {
+                    if (!RecipeViewerGhostHandler.checkRecipeViewerGhostDrag(muiScreen, button, drag)) {
+                        // no target found -> tell jei to drop the ghost ingredient
+                        // stop all further interaction since dropping the ingredient counts as an interaction
+                        ModularUIJeiPlugin.getGhostDragManager().stopDrag();
+                    }
+                    // in both cases we want to stop further click processing
+                    return true;
+                }
+            }
             return doAction(muiScreen, ms -> ms.onMousePressed(button));
         }
         if (button != -1) {
@@ -284,6 +305,17 @@ private static boolean handleMouseInput(int button, @Nullable ModularScreen muiS
         return false;
     }
 
+    /**
+     * We need to have a separate class for this since {@link Optional.Method} does not remove its contained lambdas.
+     * So we have this class which must only be loaded when recipe viewer mod is loaded.
+     */
+    private static class RecipeViewerGhostHandler {
+
+        private static boolean checkRecipeViewerGhostDrag(ModularScreen muiScreen, int button, GhostIngredientDrag<?> drag) {
+            return doAction(muiScreen, ms -> ms.checkRecipeViewerGhostDrag(button, drag));
+        }
+    }
+
     /**
      * This replicates vanilla behavior while also injecting custom behavior for consistency
      */

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

@@ -33,6 +33,7 @@
 import com.cleanroommc.neverenoughanimations.NEAConfig;
 
 import net.minecraft.client.Minecraft;
+import net.minecraftforge.fml.common.Optional;
 
 import mezz.jei.gui.ghost.GhostIngredientDrag;
 import org.jetbrains.annotations.ApiStatus;
@@ -318,8 +319,6 @@ public boolean onMousePressed(int mouseButton) {
                     closeIfOpen();
                     result = true;
                 }
-            } else if (checkRecipeViewerGhostIngredient(mouseButton)) {
-                return true;
             } else {
                 for (LocatedWidget widget : this.hovering) {
                     if (widget.getElement() == null || !widget.getElement().isValid()) continue;
@@ -380,32 +379,26 @@ public boolean onMousePressed(int mouseButton) {
         });
     }
 
-    private boolean checkRecipeViewerGhostIngredient(int mouseButton) {
-        if (ModularUI.Mods.JEI.isLoaded() && ModularUIJeiPlugin.getGhostDrag() != null) {
-            // try inserting ghost ingredient
-            GhostIngredientDrag<?> drag = ModularUIJeiPlugin.getGhostDrag();
-            for (LocatedWidget widget : this.hovering) {
-                if (widget.getElement() instanceof RecipeViewerGhostIngredientSlot<?> ghostSlot && RecipeViewerGhostIngredientSlot.insertGhostIngredient(drag, ghostSlot)) {
-                    ModularUIJeiPlugin.getGhostDragManager().stopDrag();
-                    this.mouse.pressed(widget, mouseButton);
-                    this.mouse.doRelease = false;
-                    getContext().removeFocus();
-                    return true;
-                }
-                // we can't really predict if the interactable would stop further interaction
-                // so we assume worst
-                if (widget.getElement() instanceof Interactable || !widget.getElement().canClickThrough()) {
-                    break;
-                }
+    @Optional.Method(modid = ModularUI.ModIds.JEI)
+    boolean checkRecipeViewerGhostIngredient(int mouseButton, GhostIngredientDrag<?> drag) {
+        if (this.hovering.isEmpty()) return false;
+        // try inserting ghost ingredient
+        for (LocatedWidget widget : this.hovering) {
+            if (widget.getElement() instanceof RecipeViewerGhostIngredientSlot<?> ghostSlot && RecipeViewerGhostIngredientSlot.insertGhostIngredient(drag, ghostSlot)) {
+                ModularUIJeiPlugin.getGhostDragManager().stopDrag();
+                this.mouse.pressed(widget, mouseButton);
+                this.mouse.doRelease = false;
+                getContext().removeFocus();
+                return true;
+            }
+            // we can't really predict if the interactable would stop further interaction
+            // so we assume worst
+            if (widget.getElement() instanceof Interactable || !widget.getElement().canClickThrough()) {
+                break;
             }
-            // no target found -> tell jei to drop the ghost ingredient
-            // stop all further interaction since dropping the ingredient counts as an interaction
-            ModularUIJeiPlugin.getGhostDragManager().stopDrag();
-            this.mouse.pressed(LocatedWidget.EMPTY, mouseButton);
-            this.mouse.doRelease = false;
-            getContext().removeFocus();
-            return true;
         }
+        this.mouse.pressed(LocatedWidget.EMPTY, mouseButton);
+        this.mouse.doRelease = false;
         return false;
     }
 

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

@@ -22,13 +22,15 @@
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.common.Optional;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
+import mezz.jei.gui.ghost.GhostIngredientDrag;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.MustBeInvokedByOverriders;
 import org.jetbrains.annotations.NotNull;
@@ -381,6 +383,17 @@ public boolean onMousePressed(int mouseButton) {
         return false;
     }
 
+    @Optional.Method(modid = ModularUI.ModIds.JEI)
+    boolean checkRecipeViewerGhostDrag(int mouseButton, GhostIngredientDrag<?> drag) {
+        for (ModularPanel panel : this.panelManager.getOpenPanels()) {
+            if (panel.checkRecipeViewerGhostIngredient(mouseButton, drag)) {
+                return true;
+            }
+        }
+        getContext().removeFocus();
+        return false;
+    }
+
     /**
      * Called when a mouse button is released. Tries to invoke
      * {@link com.cleanroommc.modularui.api.widget.Interactable#onMouseRelease(int) Interactable#onMouseRelease(int)} on every widget under