Fix certain slots not having an overlay due to the theme not being a WidgetSlotTheme

Author: Zorbatron

src/main/java/gregtech/client/utils/RenderUtil.java

@@ -33,6 +33,8 @@
 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;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.opengl.GL11;
@@ -744,22 +746,25 @@ public static boolean handleJeiGhostOverlay(@NotNull IWidget slot) {
      * 
      * @param slot the slot to draw the overlay above
      */
-    public static void drawSlotOverlay(@NotNull IWidget slot, @NotNull WidgetSlotTheme slotTheme) {
+    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, slotTheme.getSlotHoverColor());
+        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);
+
     /**
      * 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 slotTheme the theme to get the slot overlay color from
+     * @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 handleSlotOverlays(@NotNull IWidget slot, @NotNull WidgetSlotTheme slotTheme) {
+    public static void handleSlotOverlay(@NotNull IWidget slot, @NotNull WidgetTheme widgetTheme) {
         if (!handleJeiGhostOverlay(slot) && slot.isHovering()) {
-            drawSlotOverlay(slot, slotTheme);
+            drawSlotOverlay(slot, widgetTheme instanceof WidgetSlotTheme slotTheme ? slotTheme.getSlotHoverColor() :
+                    defaultSlotHoverColor);
         }
     }
 }

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.handleSlotOverlays(this, widgetTheme);
+        RenderUtil.handleSlotOverlay(this, widgetTheme);
     }
 
     @Override

src/main/java/gregtech/common/mui/widget/workbench/CraftingInputSlot.java

@@ -16,7 +16,6 @@
 import com.cleanroommc.modularui.network.NetworkUtils;
 import com.cleanroommc.modularui.screen.RichTooltip;
 import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
-import com.cleanroommc.modularui.theme.WidgetSlotTheme;
 import com.cleanroommc.modularui.theme.WidgetTheme;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import com.cleanroommc.modularui.value.sync.SyncHandler;
@@ -111,9 +110,7 @@ public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
             RenderUtil.renderItem(itemstack, 1, 1, 16, 16);
         }
 
-        if (widgetTheme instanceof WidgetSlotTheme slotTheme) {
-            RenderUtil.handleSlotOverlays(this, slotTheme);
-        }
+        RenderUtil.handleSlotOverlay(this, widgetTheme);
     }
 
     @Override

src/main/java/gregtech/common/mui/widget/workbench/CraftingOutputSlot.java

@@ -21,7 +21,6 @@
 import com.cleanroommc.modularui.network.NetworkUtils;
 import com.cleanroommc.modularui.screen.RichTooltip;
 import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
-import com.cleanroommc.modularui.theme.WidgetSlotTheme;
 import com.cleanroommc.modularui.theme.WidgetTheme;
 import com.cleanroommc.modularui.utils.MouseData;
 import com.cleanroommc.modularui.value.sync.IntSyncValue;
@@ -74,12 +73,8 @@ public boolean isValidSyncHandler(SyncHandler syncHandler) {
     public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
         ItemStack itemstack = this.syncHandler.getOutputStack();
         if (itemstack.isEmpty()) return;
-
         RenderUtil.renderItem(itemstack, 1, 1, 16, 16);
-
-        if (isHovering() && widgetTheme instanceof WidgetSlotTheme slotTheme) {
-            RenderUtil.drawSlotOverlay(this, slotTheme);
-        }
+        RenderUtil.handleSlotOverlay(this, widgetTheme);
     }
 
     @Override

src/main/java/gregtech/common/mui/widget/workbench/RecipeMemorySlot.java

@@ -13,7 +13,6 @@
 import com.cleanroommc.modularui.integration.jei.JeiIngredientProvider;
 import com.cleanroommc.modularui.screen.RichTooltip;
 import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
-import com.cleanroommc.modularui.theme.WidgetSlotTheme;
 import com.cleanroommc.modularui.theme.WidgetTheme;
 import com.cleanroommc.modularui.utils.MouseData;
 import com.cleanroommc.modularui.widget.Widget;
@@ -61,9 +60,7 @@ public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
             GlStateManager.enableDepth();
         }
 
-        if (isHovering() && widgetTheme instanceof WidgetSlotTheme slotTheme) {
-            RenderUtil.drawSlotOverlay(this, slotTheme);
-        }
+        RenderUtil.handleSlotOverlay(this, widgetTheme);
     }
 
     @Override