Use custom IDrawable overlay.

Fix being able to insert items into an object holder while research is in progress.

Author: Zorbatron

src/main/java/gregtech/api/mui/drawable/DrawableColorOverlay.java

@@ -0,0 +1,30 @@
+package gregtech.api.mui.drawable;
+
+import com.cleanroommc.modularui.api.drawable.IDrawable;
+import com.cleanroommc.modularui.drawable.GuiDraw;
+import com.cleanroommc.modularui.screen.viewport.GuiContext;
+import com.cleanroommc.modularui.theme.WidgetTheme;
+
+import java.util.function.Supplier;
+
+public class DrawableColorOverlay implements IDrawable {
+
+    private final Supplier<Boolean> drawOverlay;
+    private final Supplier<Integer> OVERLAY_COLOR;
+
+    public DrawableColorOverlay(Supplier<Boolean> drawOverlay, Supplier<Integer> color) {
+        this.drawOverlay = drawOverlay;
+        this.OVERLAY_COLOR = color;
+    }
+
+    public DrawableColorOverlay(Supplier<Boolean> drawOverlay) {
+        this(drawOverlay, () -> 0x80404040);
+    }
+
+    @Override
+    public void draw(GuiContext context, int x, int y, int width, int height, WidgetTheme widgetTheme) {
+        if (drawOverlay.get()) {
+            GuiDraw.drawRect(x, y, width, height, OVERLAY_COLOR.get());
+        }
+    }
+}

src/main/java/gregtech/api/mui/widget/BlockableSlotWidget.java

@@ -9,7 +9,7 @@
 import gregtech.api.metatileentity.multiblock.MultiblockControllerBase;
 import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController;
 import gregtech.api.mui.GTGuis;
-import gregtech.api.mui.widget.BlockableSlotWidget;
+import gregtech.api.mui.drawable.DrawableColorOverlay;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.ItemStackHashStrategy;
 import gregtech.client.renderer.texture.Textures;
@@ -26,8 +26,10 @@
 import com.cleanroommc.modularui.api.drawable.IKey;
 import com.cleanroommc.modularui.factory.PosGuiData;
 import com.cleanroommc.modularui.screen.ModularPanel;
+import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import com.cleanroommc.modularui.value.sync.SyncHandlers;
+import com.cleanroommc.modularui.widgets.ItemSlot;
 import com.cleanroommc.modularui.widgets.SlotGroupWidget;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -78,9 +80,17 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager)
         return GTGuis.createPanel(this, 176, 18 + 18 + 94)
                 .child(IKey.lang(getMetaFullName()).asWidget().pos(5, 5))
                 .child(SlotGroupWidget.playerInventory().left(7).bottom(7))
-                .child(new BlockableSlotWidget()
-                        .setIsBlocked(this::isSlotBlocked)
-                        .slot(SyncHandlers.itemSlot(machineHandler, 0).slotGroup("item_inv"))
+                .child(new ItemSlot() {
+
+                    // Don't draw tooltip if the slot is blocked
+                    @Override
+                    public void drawForeground(ModularGuiContext context) {
+                        if (!isSlotBlocked()) super.drawForeground(context);
+                    }
+                }
+                        .slot(SyncHandlers.itemSlot(machineHandler, 0)
+                                .slotGroup("item_inv"))
+                        .overlay(new DrawableColorOverlay(this::isSlotBlocked))
                         .left(79).top(18));
     }
 

src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMachineHatch.java

@@ -14,7 +14,7 @@
 import gregtech.api.metatileentity.multiblock.MultiblockControllerBase;
 import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.mui.GTGuis;
-import gregtech.api.mui.widget.BlockableSlotWidget;
+import gregtech.api.mui.drawable.DrawableColorOverlay;
 import gregtech.client.renderer.texture.Textures;
 import gregtech.client.renderer.texture.cube.SimpleOverlayRenderer;
 
@@ -35,6 +35,7 @@
 import com.cleanroommc.modularui.screen.ModularPanel;
 import com.cleanroommc.modularui.value.sync.PanelSyncManager;
 import com.cleanroommc.modularui.value.sync.SyncHandlers;
+import com.cleanroommc.modularui.widgets.ItemSlot;
 import com.cleanroommc.modularui.widgets.SlotGroupWidget;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -75,17 +76,19 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager)
                 .child(GTGuiTextures.PROGRESS_BAR_RESEARCH_STATION_BASE.asWidget()
                         .left(46).top(18)
                         .size(84, 60))
-                .child(new BlockableSlotWidget()
-                        .setIsBlocked(this::isSlotBlocked)
+                .child(new ItemSlot()
                         .slot(SyncHandlers.itemSlot(heldItems, 0)
-                                .slotGroup("item_inv"))
+                                .slotGroup("item_inv")
+                                .filter(itemStack -> !isSlotBlocked()))
                         .background(GTGuiTextures.SLOT, GTGuiTextures.RESEARCH_STATION_OVERLAY)
+                        .overlay(new DrawableColorOverlay(this::isSlotBlocked))
                         .left(79).top(39))
-                .child(new BlockableSlotWidget()
-                        .setIsBlocked(this::isSlotBlocked)
+                .child(new ItemSlot()
                         .slot(SyncHandlers.itemSlot(heldItems, 1)
-                                .slotGroup("item_inv"))
+                                .slotGroup("item_inv")
+                                .filter(itemStack -> !isSlotBlocked()))
                         .background(GTGuiTextures.SLOT, GTGuiTextures.DATA_ORB_OVERLAY)
+                        .overlay(new DrawableColorOverlay(this::isSlotBlocked))
                         .left(15).top(39));
     }