From 4d3930cd1d0cb022c0f4908fd8bbc2df55cb21fd Mon Sep 17 00:00:00 2001 From: Daniel She Date: Thu, 14 Feb 2019 14:38:18 +0100 Subject: REI Update v2.3 (#35) * Fixes #33 * Fixes #32 * Fix #29 * Highlight Cursor * Fix #15 * Remove Unwanted Imports * Making it actually v2.3 * LOLCATS & Upside Down Lanuage + Credits Screen * better credits * Better Config * Better Config Button Handling + Campfire text using container sub-colour * Better Plugin Handling * Split ItemRegisterer out from ClientHelper * Option to disable default plugin. --- .../shedaniel/rei/gui/widget/ItemSlotWidget.java | 35 +++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java') diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java index 96682565b..b747559d4 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/ItemSlotWidget.java @@ -1,6 +1,7 @@ package me.shedaniel.rei.gui.widget; import com.google.common.collect.Lists; +import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.client.ClientHelper; import me.shedaniel.rei.client.GuiHelper; import net.minecraft.client.MinecraftClient; @@ -23,7 +24,7 @@ public class ItemSlotWidget extends Drawable implements HighlightableWidget { private static final Identifier RECIPE_GUI = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png"); private List itemList = new LinkedList<>(); - private boolean drawBackground, showToolTips, clickToMoreRecipes; + private boolean drawBackground, showToolTips, clickToMoreRecipes, drawHighlightedBackground; private int x, y; public ItemSlotWidget(int x, int y, ItemStack itemStack, boolean drawBackground, boolean showToolTips) { @@ -37,6 +38,11 @@ public class ItemSlotWidget extends Drawable implements HighlightableWidget { this.x = x; this.y = y; this.clickToMoreRecipes = false; + this.drawHighlightedBackground = true; + } + + public void setDrawHighlightedBackground(boolean drawHighlightedBackground) { + this.drawHighlightedBackground = drawHighlightedBackground; } public ItemSlotWidget(int x, int y, List itemList, boolean drawBackground, boolean showToolTips, boolean clickToMoreRecipes) { @@ -60,15 +66,24 @@ public class ItemSlotWidget extends Drawable implements HighlightableWidget { MinecraftClient.getInstance().getTextureManager().bindTexture(RECIPE_GUI); drawTexturedRect(this.x - 1, this.y - 1, 0, 222, 18, 18); } - if (itemStack.isEmpty()) - return; - GuiLighting.enableForItems(); - ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer(); - itemRenderer.zOffset = 200.0F; - itemRenderer.renderGuiItem(itemStack, x, y); - itemRenderer.renderGuiItemOverlay(MinecraftClient.getInstance().fontRenderer, itemStack, x, y, getItemCountOverlay(itemStack)); - itemRenderer.zOffset = 0.0F; - if (isHighlighted(mouseX, mouseY) && showToolTips) + if (drawHighlightedBackground && isHighlighted(mouseX, mouseY)) { + GlStateManager.disableLighting(); + GlStateManager.disableDepthTest(); + GlStateManager.colorMask(true, true, true, false); + drawGradientRect(x, y, x + 16, y + 16, -2130706433, -2130706433); + GlStateManager.colorMask(true, true, true, true); + GlStateManager.enableLighting(); + GlStateManager.enableDepthTest(); + } + if (!itemStack.isEmpty()) { + GuiLighting.enableForItems(); + ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer(); + itemRenderer.zOffset = 200.0F; + itemRenderer.renderGuiItem(itemStack, x, y); + itemRenderer.renderGuiItemOverlay(MinecraftClient.getInstance().fontRenderer, itemStack, x, y, getItemCountOverlay(itemStack)); + itemRenderer.zOffset = 0.0F; + } + if (!itemStack.isEmpty() && isHighlighted(mouseX, mouseY) && showToolTips) drawToolTip(itemStack); } -- cgit