improve jei ghost slot interaction

Author: brachy84

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

@@ -2,37 +2,24 @@
 
 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 mezz.jei.gui.GuiEventHandler;
 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.
+ * Prevent JEI to draw any tooltips when the cursor has a mui draggable element.
  */
 @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();
+            ci.cancel(); // TODO fix JEI ghost dragging ingredient z layer
         }
     }
 }

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

@@ -0,0 +1,33 @@
+package com.cleanroommc.modularui.core.mixins.late.jei;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import mezz.jei.gui.GuiScreenHelper;
+import mezz.jei.gui.overlay.IngredientGrid;
+import mezz.jei.gui.overlay.IngredientGridWithNavigation;
+import net.minecraft.client.Minecraft;
+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;
+
+/**
+ * Prevent JEI from displaying the "delete" tooltip when above exclusion zones
+ */
+@Mixin(value = IngredientGridWithNavigation.class, remap = false)
+public abstract class IngredientGridMixin {
+
+    @Shadow
+    @Final
+    private GuiScreenHelper guiScreenHelper;
+
+    @WrapOperation(method = "drawTooltips",
+                   at = @At(value = "INVOKE",
+                            target = "Lmezz/jei/gui/overlay/IngredientGrid;drawTooltips(Lnet/minecraft/client/Minecraft;II)V"))
+    private void considerExclusions(IngredientGrid instance, Minecraft minecraft, int mouseX, int mouseY,
+                                    Operation<Void> original) {
+        if (!guiScreenHelper.isInGuiExclusionArea(mouseX, mouseY)) {
+            original.call(instance, minecraft, mouseX, mouseY);
+        }
+    }
+}

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

@@ -30,7 +30,10 @@
 import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.IFluidTank;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
+import net.minecraftforge.fluids.capability.IFluidHandlerItem;
+import net.minecraftforge.fluids.capability.IFluidTankProperties;
 
+import mezz.jei.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.input.Keyboard;
@@ -162,6 +165,7 @@ public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
 
     @Override
     public void drawOverlay(ModularGuiContext context, WidgetTheme widgetTheme) {
+        super.drawOverlay(context, widgetTheme);
         if (ModularUI.Mods.JEI.isLoaded() && (ModularUIJeiPlugin.draggingValidIngredient(this) || ModularUIJeiPlugin.hoveringOverIngredient(this))) {
             GlStateManager.colorMask(true, true, true, false);
             drawHighlight(getArea(), isHovering());
@@ -276,7 +280,7 @@ public FluidSlot syncHandler(FluidSlotSyncHandler syncHandler) {
         return this;
     }
 
-    /* === Jei ghost slot === */
+    /* === Recipe viewer ghost slot === */
 
     @Override
     public void setGhostIngredient(@NotNull FluidStack ingredient) {
@@ -287,7 +291,17 @@ public void setGhostIngredient(@NotNull FluidStack ingredient) {
 
     @Override
     public @Nullable FluidStack castGhostIngredientIfValid(@NotNull Object ingredient) {
-        return areAncestorsEnabled() && this.syncHandler.isPhantom() && ingredient instanceof FluidStack fluidStack ? fluidStack : null;
+        if (!this.syncHandler.isPhantom() || !areAncestorsEnabled()) return null;
+        if (ingredient instanceof FluidStack fluidStack) return fluidStack; // is fluid stack
+
+        // turn into an item and check if it contains exactly one fluid
+        ItemStack stack = Internal.getIngredientRegistry().getIngredientHelper(ingredient).getCheatItemStack(ingredient);
+        if (stack.isEmpty()) return null;
+        IFluidHandlerItem fluidHandlerItem = stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null);
+        if (fluidHandlerItem == null) return null;
+        IFluidTankProperties[] fluidTanks = fluidHandlerItem.getTankProperties();
+        if (fluidTanks.length != 1 || fluidTanks[0].getContents() == null) return null;
+        return fluidTanks[0].getContents().copy();
     }
 
     @Override

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

@@ -74,17 +74,9 @@ public void setGhostIngredient(@NotNull ItemStack ingredient) {
 
     @Override
     public @Nullable ItemStack castGhostIngredientIfValid(@NotNull Object ingredient) {
-        if (areAncestorsEnabled() && this.syncHandler.isPhantom()) {
-            if (ingredient instanceof EnchantmentData enchantmentData) {
-                ingredient = Internal.getIngredientRegistry().getIngredientHelper(enchantmentData).getCheatItemStack(enchantmentData);
-            }
-
-            if (ingredient instanceof ItemStack itemStack) {
-                return this.syncHandler.isItemValid(itemStack) ? itemStack : null;
-            }
-        }
-
-        return null;
+        if (!this.syncHandler.isPhantom() || !areAncestorsEnabled()) return null;
+        ItemStack itemStack = Internal.getIngredientRegistry().getIngredientHelper(ingredient).getCheatItemStack(ingredient);
+        return this.syncHandler.isItemValid(itemStack) ? itemStack : null;
     }
 
     @Override

src/main/resources/mixin.modularui.jei.json

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