Fix the crafting station input slots having both overlays at the same time

Zorbatron · Zorbatron · commit caf3334ccc27 · 2025-09-02T16:05:18.000-04:00
diff --git a/src/main/java/gregtech/api/util/JEIUtil.java b/src/main/java/gregtech/api/util/JEIUtil.java
@@ -0,0 +1,16 @@
+package gregtech.api.util;
+
+import com.cleanroommc.modularui.integration.jei.JeiGhostIngredientSlot;
+import com.cleanroommc.modularui.integration.jei.ModularUIJeiPlugin;
+
+public class JEIUtil {
+
+    /**
+     * Check if the player is currently hovering over a valid ingredient for this slot. <br/>
+     * Will always return false is JEI is not installed.
+     */
+    public static boolean hoveringOverIngredient(JeiGhostIngredientSlot<?> jeiGhostIngredientSlot) {
+        if (!Mods.JustEnoughItems.isModLoaded()) return false;
+        return ModularUIJeiPlugin.hoveringOverIngredient(jeiGhostIngredientSlot);
+    }
+}
diff --git a/src/main/java/gregtech/client/utils/RenderUtil.java b/src/main/java/gregtech/client/utils/RenderUtil.java
@@ -1,7 +1,7 @@
 package gregtech.client.utils;
 
 import gregtech.api.gui.resources.TextureArea;
-import gregtech.api.util.Mods;
+import gregtech.api.util.JEIUtil;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
@@ -31,7 +31,6 @@
 import com.cleanroommc.modularui.api.widget.IWidget;
 import com.cleanroommc.modularui.drawable.GuiDraw;
 import com.cleanroommc.modularui.integration.jei.JeiGhostIngredientSlot;
-import com.cleanroommc.modularui.integration.jei.ModularUIJeiPlugin;
 import com.cleanroommc.modularui.theme.WidgetSlotTheme;
 import com.cleanroommc.modularui.theme.WidgetTheme;
 import com.cleanroommc.modularui.utils.Color;
@@ -47,6 +46,7 @@
 public class RenderUtil {
 
     private static final Deque<int[]> scissorFrameStack = new ArrayDeque<>();
+    public static final int defaultSlotHoverColor = Color.withAlpha(Color.WHITE.main, 0x60);
 
     public static void useScissor(int x, int y, int width, int height, Runnable codeBlock) {
         pushScissorFrame(x, y, width, height);
@@ -720,51 +720,39 @@ public void put(int element, float @NotNull... data) {
         return getTextureMap().getMissingSprite();
     }
 
-    /**
-     * Draws the green overlay when a valid ingredient for the slot is hovered over in JEI
-     * 
-     * @param slot the slot to draw the overlay on
-     * @return true if the overlay was drawn, false if not
-     */
-    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-    public static boolean handleJeiGhostOverlay(@NotNull IWidget slot) {
-        if (!Mods.JustEnoughItems.isModLoaded()) return false;
-        if (!(slot instanceof JeiGhostIngredientSlot<?>ingredientSlot)) return false;
-
-        if (ModularUIJeiPlugin.hoveringOverIngredient(ingredientSlot)) {
-            GlStateManager.colorMask(true, true, true, false);
-            ingredientSlot.drawHighlight(slot.getArea(), slot.isHovering());
-            GlStateManager.colorMask(true, true, true, true);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Draws a gray-ish overlay over the slot 1px inwards from each side. Intended for item slots.
-     * 
-     * @param slot the slot to draw the overlay above
-     */
     public static void drawSlotOverlay(@NotNull IWidget slot, int overlayColor) {
         GlStateManager.colorMask(true, true, true, false);
         GuiDraw.drawRect(1, 1, slot.getArea().w() - 2, slot.getArea().h() - 2, overlayColor);
         GlStateManager.colorMask(true, true, true, true);
     }
 
-    private static final int defaultSlotHoverColor = Color.withAlpha(Color.WHITE.main, 0x60);
+    public static void drawSlotOverlay(@NotNull IWidget slot, WidgetTheme widgetTheme) {
+        drawSlotOverlay(slot, widgetTheme instanceof WidgetSlotTheme slotTheme ? slotTheme.getSlotHoverColor() :
+                defaultSlotHoverColor);
+    }
 
-    /**
-     * Handles drawing the green JEI overlay when dragging an item, and if no item is being dragged, the overlay when
-     * mousing over the slot.
-     * 
-     * @param slot        the slot to draw the overlay above
-     * @param widgetTheme the theme to attempt to get the slot overlay color from
-     */
     public static void handleSlotOverlay(@NotNull IWidget slot, @NotNull WidgetTheme widgetTheme) {
-        if (!handleJeiGhostOverlay(slot) && slot.isHovering()) {
-            drawSlotOverlay(slot, widgetTheme instanceof WidgetSlotTheme slotTheme ? slotTheme.getSlotHoverColor() :
-                    defaultSlotHoverColor);
+        if (slot.isHovering()) {
+            drawSlotOverlay(slot, widgetTheme);
         }
     }
+
+    public static <
+            T extends IWidget & JeiGhostIngredientSlot<?>> void drawJEIGhostSlotOverlay(@NotNull T jeiGhostIngredientSlot) {
+        GlStateManager.colorMask(true, true, true, false);
+        jeiGhostIngredientSlot.drawHighlight(jeiGhostIngredientSlot.getArea(), jeiGhostIngredientSlot.isHovering());
+        GlStateManager.colorMask(true, true, true, true);
+    }
+
+    public static <
+            T extends IWidget & JeiGhostIngredientSlot<?>> boolean handleJEIGhostSlotOverlay(@NotNull T jeiGhostIngredientSlot,
+                                                                                             @NotNull WidgetTheme widgetTheme) {
+        if (JEIUtil.hoveringOverIngredient(jeiGhostIngredientSlot)) {
+            drawJEIGhostSlotOverlay(jeiGhostIngredientSlot);
+            return true;
+        }
+
+        handleSlotOverlay(jeiGhostIngredientSlot, widgetTheme);
+        return false;
+    }
 }
diff --git a/src/main/java/gregtech/common/mui/widget/GTFluidSlot.java b/src/main/java/gregtech/common/mui/widget/GTFluidSlot.java
@@ -115,7 +115,7 @@ public void draw(ModularGuiContext context, WidgetSlotTheme widgetTheme) {
             this.textRenderer.draw(amount);
         }
 
-        RenderUtil.handleSlotOverlay(this, widgetTheme);
+        RenderUtil.handleJEIGhostSlotOverlay(this, widgetTheme);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/mui/widget/workbench/CraftingInputSlot.java b/src/main/java/gregtech/common/mui/widget/workbench/CraftingInputSlot.java
@@ -1,6 +1,7 @@
 package gregtech.common.mui.widget.workbench;
 
 import gregtech.api.util.GTUtility;
+import gregtech.api.util.JEIUtil;
 import gregtech.client.utils.RenderUtil;
 import gregtech.common.metatileentities.storage.CraftingRecipeLogic;
 
@@ -102,15 +103,21 @@ public void onMouseDrag(int mouseButton, long timeSinceClick) {
     @Override
     public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
         ItemStack itemstack = this.syncHandler.getStack();
+        boolean jeiIngredientBeingHovered = JEIUtil.hoveringOverIngredient(this);
+
         if (!itemstack.isEmpty()) {
-            if (!this.hasIngredients) {
+            if (!jeiIngredientBeingHovered && !this.hasIngredients) {
                 RenderUtil.renderRect(0, 0, 18, 18, 200, 0x80FF0000);
             }
 
             RenderUtil.renderItem(itemstack, 1, 1, 16, 16);
         }
 
-        RenderUtil.handleSlotOverlay(this, widgetTheme);
+        if (jeiIngredientBeingHovered) {
+            RenderUtil.drawJEIGhostSlotOverlay(this);
+        } else {
+            RenderUtil.handleSlotOverlay(this, widgetTheme);
+        }
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/mui/widget/workbench/CraftingOutputSlot.java b/src/main/java/gregtech/common/mui/widget/workbench/CraftingOutputSlot.java
@@ -72,7 +72,6 @@ public boolean isValidSyncHandler(SyncHandler syncHandler) {
     @Override
     public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
         ItemStack itemstack = this.syncHandler.getOutputStack();
-        if (itemstack.isEmpty()) return;
         RenderUtil.renderItem(itemstack, 1, 1, 16, 16);
         RenderUtil.handleSlotOverlay(this, widgetTheme);
     }
diff --git a/src/main/java/gregtech/common/mui/widget/workbench/RecipeMemorySlot.java b/src/main/java/gregtech/common/mui/widget/workbench/RecipeMemorySlot.java
@@ -45,19 +45,20 @@ public RecipeMemorySlot(CraftingRecipeMemory memory, int index) {
 
     @Override
     public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
-        ItemStack itemstack = this.memory.getRecipeOutputAtIndex(this.index);
-        if (itemstack.isEmpty()) return;
-
-        int cachedCount = itemstack.getCount();
-        itemstack.setCount(1); // required to not render the amount overlay
-        RenderUtil.renderItem(itemstack, 1, 1, 16, 16);
-        itemstack.setCount(cachedCount);
-
-        // noinspection DataFlowIssue
-        if (this.memory.getRecipeAtIndex(this.index).isRecipeLocked()) {
-            GlStateManager.disableDepth();
-            GTGuiTextures.RECIPE_LOCK.draw(context, 10, 1, 8, 8, widgetTheme);
-            GlStateManager.enableDepth();
+        ItemStack itemStack = this.memory.getRecipeOutputAtIndex(this.index);
+
+        if (!itemStack.isEmpty()) {
+            int cachedCount = itemStack.getCount();
+            itemStack.setCount(1); // required to not render the amount overlay
+            RenderUtil.renderItem(itemStack, 1, 1, 16, 16);
+            itemStack.setCount(cachedCount);
+
+            // noinspection DataFlowIssue
+            if (this.memory.getRecipeAtIndex(this.index).isRecipeLocked()) {
+                GlStateManager.disableDepth();
+                GTGuiTextures.RECIPE_LOCK.draw(context, 10, 1, 8, 8, widgetTheme);
+                GlStateManager.enableDepth();
+            }
         }
 
         RenderUtil.handleSlotOverlay(this, widgetTheme);

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public void draw(ModularGuiContext context, WidgetSlotTheme widgetTheme) {`
`115`	`115`	`this.textRenderer.draw(amount);`
`116`	`116`	`}`
`117`	`117`
`118`		`- RenderUtil.handleSlotOverlay(this, widgetTheme);`
	`118`	`+ RenderUtil.handleJEIGhostSlotOverlay(this, widgetTheme);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,6 @@ public boolean isValidSyncHandler(SyncHandler syncHandler) {`
`72`	`72`	`@Override`
`73`	`73`	`public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {`
`74`	`74`	`ItemStack itemstack = this.syncHandler.getOutputStack();`
`75`		`- if (itemstack.isEmpty()) return;`
`76`	`75`	`RenderUtil.renderItem(itemstack, 1, 1, 16, 16);`
`77`	`76`	`RenderUtil.handleSlotOverlay(this, widgetTheme);`
`78`	`77`	`}`