From c15c3d2db212f2fb73e6063aa5ff3cc2b5a7a4f5 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sun, 26 Feb 2023 15:37:56 +0100 Subject: Start fixing gui rendering logic. --- src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt | 19 +++++++++++++++++-- .../java/at/hannibal2/skyhanni/utils/RenderUtils.kt | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/utils') diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt index dc0683b27..13366c969 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt @@ -5,7 +5,9 @@ import io.github.moulberry.notenoughupdates.NEUManager import io.github.moulberry.notenoughupdates.NotEnoughUpdates import io.github.moulberry.notenoughupdates.util.ItemResolutionQuery import io.github.moulberry.notenoughupdates.util.Utils +import net.minecraft.client.Minecraft import net.minecraft.client.renderer.GlStateManager +import net.minecraft.client.renderer.RenderHelper import net.minecraft.init.Items import net.minecraft.item.ItemStack @@ -79,8 +81,21 @@ object NEUItems { } val scale = if (isSkull) 0.8f else 0.6f - GlStateManager.scale(scale, scale, 1f) - Utils.drawItemStack(this, 0, 0) + GlStateManager.scale(scale, scale, 0f) + drawItemStack(this) GlStateManager.popMatrix() } + + private fun drawItemStack(stack: ItemStack) { + val itemRender = Minecraft.getMinecraft().renderItem + + Utils.disableCustomDungColours = true + RenderHelper.enableGUIStandardItemLighting() + Utils.hasEffectOverride = true + itemRender.renderItemAndEffectIntoGUI(stack, 0, 0) + itemRender.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, stack, 0, 0, null) + Utils.hasEffectOverride = false + RenderHelper.disableStandardItemLighting() + Utils.disableCustomDungColours = false + } } \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt index cec4cfb3c..6d99f23a1 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt @@ -39,6 +39,7 @@ object RenderUtils { GlStateManager.color(1f, 1f, 1f, 1f) GlStateManager.pushMatrix() + // TODO don't use z GlStateManager.translate(0f, 0f, 110 + Minecraft.getMinecraft().renderItem.zLevel) Gui.drawRect( this.xDisplayPosition, -- cgit