From 42dde94c25cc63ec18943247118a4df4c878fd6d Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 26 Sep 2016 15:08:21 -0700 Subject: [PATCH] Fix some items disappearing when highlighted in the item list --- src/main/java/mezz/jei/gui/ItemListOverlay.java | 2 -- .../java/mezz/jei/gui/ingredients/GuiIngredientFast.java | 9 ++++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/mezz/jei/gui/ItemListOverlay.java b/src/main/java/mezz/jei/gui/ItemListOverlay.java index d6261f5eb..8905e696c 100644 --- a/src/main/java/mezz/jei/gui/ItemListOverlay.java +++ b/src/main/java/mezz/jei/gui/ItemListOverlay.java @@ -346,9 +346,7 @@ public void drawScreen(Minecraft minecraft, int mouseX, int mouseY) { } if (hovered != null) { - RenderHelper.enableGUIStandardItemLighting(); hovered.drawHovered(minecraft); - RenderHelper.disableStandardItemLighting(); } GlStateManager.enableAlpha(); diff --git a/src/main/java/mezz/jei/gui/ingredients/GuiIngredientFast.java b/src/main/java/mezz/jei/gui/ingredients/GuiIngredientFast.java index d0c514eda..a871d3c8a 100644 --- a/src/main/java/mezz/jei/gui/ingredients/GuiIngredientFast.java +++ b/src/main/java/mezz/jei/gui/ingredients/GuiIngredientFast.java @@ -20,6 +20,7 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemModelMesher; import net.minecraft.client.renderer.RenderItem; @@ -217,14 +218,20 @@ public void drawHovered(Minecraft minecraft) { drawHighlight(); } + /** + * Matches the highlight code in {@link GuiContainer#drawScreen(int, int, float)} + */ public void drawHighlight() { if (ingredient == null) { return; } + GlStateManager.disableLighting(); GlStateManager.disableDepth(); + GlStateManager.colorMask(true, true, true, false); Gui.drawRect(area.x, area.y, area.x + area.width, area.y + area.height, 0x7FFFFFFF); - GlStateManager.color(1f, 1f, 1f, 1f); + GlStateManager.colorMask(true, true, true, true); + GlStateManager.enableLighting(); GlStateManager.enableDepth(); }