more jei stuff

Author: brachy84

src/main/java/com/cleanroommc/modularui/core/mixins/late/jei/GuiEventHandlerMixin.java

@@ -0,0 +1,38 @@
+package com.cleanroommc.modularui.core.mixins.late.jei;
+
+import com.cleanroommc.modularui.api.IMuiScreen;
+
+import mezz.jei.gui.GuiEventHandler;
+
+import mezz.jei.gui.GuiScreenHelper;
+
+import net.minecraftforge.client.event.GuiScreenEvent;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+/**
+ * Modifies JEI to not draw tooltips when the cursor has a mui draggable element or the mouse is inside an exclusion area.
+ */
+@Mixin(value = GuiEventHandler.class, remap = false)
+public class GuiEventHandlerMixin {
+
+    @Shadow
+    @Final
+    private GuiScreenHelper guiScreenHelper;
+
+    @Inject(method = "onDrawScreenEventPost", at = @At(value = "INVOKE", target = "Lmezz/jei/gui/overlay/IngredientListOverlay;drawTooltips(Lnet/minecraft/client/Minecraft;II)V"), cancellable = true)
+    public void onDrawScreenEventPost(GuiScreenEvent.DrawScreenEvent.Post event, CallbackInfo ci) {
+        if (event.getGui() instanceof IMuiScreen muiScreen && muiScreen.getScreen().getContext().hasDraggable()) {
+            ci.cancel();
+            return;
+        }
+        if (guiScreenHelper.isInGuiExclusionArea(event.getMouseX(), event.getMouseY())) {
+            ci.cancel();
+        }
+    }
+}

src/main/java/com/cleanroommc/modularui/core/mixins/late/jei/IngredientGridMixin.java

@@ -325,7 +325,7 @@ public boolean onMousePressed(int mouseButton) {
                     animateClose();
                     result = true;
                 }
-            } else if (checkJeiGhostIngredient(mouseButton)) {
+            } else if (checkRecipeViewerGhostIngredient(mouseButton)) {
                 return true;
             } else {
                 for (LocatedWidget widget : this.hovering) {
@@ -386,7 +386,7 @@ public boolean onMousePressed(int mouseButton) {
         });
     }
 
-    private boolean checkJeiGhostIngredient(int mouseButton) {
+    private boolean checkRecipeViewerGhostIngredient(int mouseButton) {
         if (ModularUI.Mods.JEI.isLoaded() && ModularUIJeiPlugin.getGhostDrag() != null) {
             // try inserting ghost ingredient
             GhostIngredientDrag<?> drag = ModularUIJeiPlugin.getGhostDrag();

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

@@ -157,7 +157,6 @@ public List<RecipeViewerGhostIngredientSlot<?>> getRecipeViewerGhostIngredientSl
 
     @ApiStatus.Internal
     public List<Rectangle> getAllRecipeViewerExclusionAreas() {
-        this.recipeViewerExclusionWidgets.removeIf(widget -> !widget.isValid());
         List<Rectangle> areas = new ArrayList<>(this.recipeViewerExclusionAreas);
         for (Iterator<IWidget> iterator = this.recipeViewerExclusionWidgets.iterator(); iterator.hasNext(); ) {
             IWidget widget = iterator.next();

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

@@ -7,7 +7,7 @@
   "client": [],
   "mixins": [
     "GhostIngredientDragManagerAccessor",
-    "IngredientGridMixin",
+    "GuiEventHandlerMixin",
     "IngredientListOverlayAccessor"
   ]
-}
+}