fix zLevel not being reset (fixes skyhanni and NEU)

Polyfrost · Dec 25, 2023 · 675c7ba · 675c7ba
1 parent eb81162
commit 675c7ba
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 27 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 mod_name = EvergreenHUD
 mod_id = evergreenhud
-mod_version = 2.1.2
+mod_version = 2.1.3
 mod_archives_name=EvergreenHUD
 
 # Gradle Configuration -- DO NOT TOUCH THESE VALUES.

diff --git a/src/main/kotlin/org/polyfrost/evergreenhud/hud/Armour.kt b/src/main/kotlin/org/polyfrost/evergreenhud/hud/Armour.kt
@@ -252,21 +252,25 @@ class Armour: Config(Mod("ArmourHud", ModType.HUD), "evergreenhud/armour.json",
                 RenderHelper.enableGUIStandardItemLighting()
                 UGraphics.GL.translate(animationIconX[i]?.get() ?: iconX.toFloat(), animationItemY[i]?.get() ?: itemY.toFloat(), 0f)
                 mc.renderItem.zLevel = 200f
-                mc.renderItem.renderItemAndEffectIntoGUI(stack, 0, 0)
-                mc.renderItem.renderItemOverlayIntoGUI(mc.fontRendererObj, stack, 0, 0, "")
-                RenderHelper.disableStandardItemLighting()
-                UGraphics.GL.popMatrix()
-                UGraphics.GL.pushMatrix()
-                UGraphics.GL.translate(animationTextX[i]?.get() ?: textX.toFloat(), (animationItemY[i]?.get() ?: itemY.toFloat()) + mc.fontRendererObj.FONT_HEIGHT / 2f, 0f)
-                TextRenderer.drawScaledString(
-                    text,
-                    0f,
-                    0f,
-                    textColor.rgb,
-                    TextRenderer.TextType.toType(textType),
-                    1f
-                )
-                UGraphics.GL.popMatrix()
+                try {
+                    mc.renderItem.renderItemAndEffectIntoGUI(stack, 0, 0)
+                    mc.renderItem.renderItemOverlayIntoGUI(mc.fontRendererObj, stack, 0, 0, "")
+                    RenderHelper.disableStandardItemLighting()
+                    UGraphics.GL.popMatrix()
+                    UGraphics.GL.pushMatrix()
+                    UGraphics.GL.translate(animationTextX[i]?.get() ?: textX.toFloat(), (animationItemY[i]?.get() ?: itemY.toFloat()) + mc.fontRendererObj.FONT_HEIGHT / 2f, 0f)
+                    TextRenderer.drawScaledString(
+                        text,
+                        0f,
+                        0f,
+                        textColor.rgb,
+                        TextRenderer.TextType.toType(textType),
+                        1f
+                    )
+                    UGraphics.GL.popMatrix()
+                } finally {
+                    mc.renderItem.zLevel = 0f
+                }
                 index++
                 if (!type) preWidth += offset.toInt() + textWidth + if (textWidth > 0) iconPadding else 0
             }

diff --git a/src/main/kotlin/org/polyfrost/evergreenhud/hud/BedwarsResource.kt b/src/main/kotlin/org/polyfrost/evergreenhud/hud/BedwarsResource.kt
@@ -204,17 +204,21 @@ class BedwarsResource : Config(Mod("Bedwars Resource", ModType.HUD), "evergreenh
 
                 RenderHelper.enableGUIStandardItemLighting()
                 mc.renderItem.zLevel = 200f
-                mc.renderItem.renderItemAndEffectIntoGUI(item, iconX, itemY.toInt())
-                mc.renderItem.renderItemOverlayIntoGUI(mc.fontRendererObj, item, 0, 0, "")
-                RenderHelper.disableStandardItemLighting()
-                TextRenderer.drawScaledString(
-                    text,
-                    textX.toFloat(),
-                    itemY.toFloat() + mc.fontRendererObj.FONT_HEIGHT / 2f,
-                    textColor.rgb,
-                    TextRenderer.TextType.toType(textType),
-                    1f
-                )
+                try {
+                    mc.renderItem.renderItemAndEffectIntoGUI(item, iconX, itemY.toInt())
+                    mc.renderItem.renderItemOverlayIntoGUI(mc.fontRendererObj, item, 0, 0, "")
+                    RenderHelper.disableStandardItemLighting()
+                    TextRenderer.drawScaledString(
+                        text,
+                        textX.toFloat(),
+                        itemY.toFloat() + mc.fontRendererObj.FONT_HEIGHT / 2f,
+                        textColor.rgb,
+                        TextRenderer.TextType.toType(textType),
+                        1f
+                    )
+                } finally {
+                    mc.renderItem.zLevel = 0f
+                }
                 size++
                 if (!type) lastWidth += offset.toInt() + textWidth + iconPadding
             }