Skip to content

Fix JEI Highlight for Custom MUI2 Widgets #2812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TechLord22 merged 3 commits into from
May 21, 2025
+24 −4
Merged

Fix JEI Highlight for Custom MUI2 Widgets #2812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1f78b0
actually check to draw jei ghost highlight
ghzdude May 20, 2025
fa727b0
move highlight draw to RenderUtil
ghzdude May 20, 2025
1f7c852
use instanceof cast instead of generic
ghzdude May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/main/java/gregtech/client/utils/RenderUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package gregtech.client.utils;

import gregtech.api.gui.resources.TextureArea;
import gregtech.api.util.Mods;

import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
Expand All @@ -27,6 +28,9 @@

import codechicken.lib.vec.Matrix4;
import com.cleanroommc.modularui.api.MCHelper;
import com.cleanroommc.modularui.api.widget.IWidget;
import com.cleanroommc.modularui.integration.jei.JeiGhostIngredientSlot;
import com.cleanroommc.modularui.integration.jei.ModularUIJeiPlugin;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.lwjgl.opengl.GL11;
Expand Down Expand Up @@ -711,4 +715,15 @@ public void put(int element, float @NotNull... data) {
public static @NotNull TextureAtlasSprite getMissingSprite() {
return getTextureMap().getMissingSprite();
}

public static void handleJeiGhostHighlight(IWidget slot) {
if (!Mods.JustEnoughItems.isModLoaded()) return;
if (!(slot instanceof JeiGhostIngredientSlot<?>ingredientSlot)) return;
if (ModularUIJeiPlugin.hasDraggingGhostIngredient() ||
ModularUIJeiPlugin.hoveringOverIngredient(ingredientSlot)) {
GlStateManager.colorMask(true, true, true, false);
ingredientSlot.drawHighlight(slot.getArea(), slot.isHovering());
GlStateManager.colorMask(true, true, true, true);
}
}
}
3 changes: 3 additions & 0 deletions src/main/java/gregtech/common/mui/widget/GTFluidSlot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import gregtech.api.util.FluidTooltipUtil;
import gregtech.api.util.GTUtility;
import gregtech.api.util.LocalizationUtils;
import gregtech.client.utils.RenderUtil;
import gregtech.client.utils.TooltipHelper;

import net.minecraft.client.renderer.GlStateManager;
Expand Down Expand Up @@ -137,6 +138,8 @@ public void draw(ModularGuiContext context, WidgetSlotTheme widgetTheme) {
GuiDraw.drawRect(1, 1, getArea().w() - 2, getArea().h() - 2, widgetTheme.getSlotHoverColor());
GlStateManager.colorMask(true, true, true, true);
}

RenderUtil.handleJeiGhostHighlight(this);
}

@Override
Expand Down
10 changes: 6 additions & 4 deletions src/main/java/gregtech/common/mui/widget/workbench/CraftingInputSlot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,15 @@ public void onMouseDrag(int mouseButton, long timeSinceClick) {
@Override
public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
ItemStack itemstack = this.syncHandler.getStack();
if (itemstack.isEmpty()) return;
if (!itemstack.isEmpty()) {
if (!this.hasIngredients) {
RenderUtil.renderRect(0, 0, 18, 18, 200, 0x80FF0000);
}

if (!this.hasIngredients) {
RenderUtil.renderRect(0, 0, 18, 18, 200, 0x80FF0000);
RenderUtil.renderItem(itemstack, 1, 1, 16, 16);
}

RenderUtil.renderItem(itemstack, 1, 1, 16, 16);
RenderUtil.handleJeiGhostHighlight(this);
}

@Override
Expand Down
Loading