gui fixes

Author: SoLegendary

Diff for: src/main/java/com/solegendary/reignofnether/hud/Button.java

@@ -161,10 +161,12 @@ public void render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY
         int xyDiff = (DEFAULT_ICON_SIZE - iconSize) / 2;
 
         if (this.frameResource != null) {
+            guiGraphics.pose().translate(0,0,1);
             MyRenderer.renderIconFrameWithBg(guiGraphics, this.frameResource, x + xyDiff, y + xyDiff, iconFrameSize, 0x64000000);
         }
 
         if (bgIconResource != null) {
+            guiGraphics.pose().translate(0,0,1);
             MyRenderer.renderIcon(
                     guiGraphics,
                     bgIconResource,
@@ -175,6 +177,7 @@ public void render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY
         }
         // item/unit icon
         if (iconResource != null) {
+            guiGraphics.pose().translate(0,0,1);
             MyRenderer.renderIcon(
                     guiGraphics,
                     iconResource,
@@ -186,6 +189,7 @@ public void render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY
         if (this.hotkey != null) {
             String hotkeyStr = hotkey.buttonLabel;
             hotkeyStr = hotkeyStr.substring(0,Math.min(3, hotkeyStr.length()));
+            guiGraphics.pose().translate(0,0,1);
             guiGraphics.drawCenteredString( MC.font,
                     hotkeyStr,
                     x + iconSize + 8 - (hotkeyStr.length() * 4),
@@ -202,6 +206,7 @@ public void render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY
 
             if (frameResource != null) {
                 ResourceLocation iconFrameSelectedResource = new ResourceLocation(ReignOfNether.MOD_ID, "textures/hud/icon_frame_selected.png");
+                guiGraphics.pose().translate(0,0,1);
                 MyRenderer.renderIcon(
                         guiGraphics,
                         iconFrameSelectedResource,
@@ -212,6 +217,7 @@ public void render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY
         }
         // light up on hover
         if (isEnabled.get() && isMouseOver(mouseX, mouseY)) {
+            guiGraphics.pose().translate(0,0,1);
             guiGraphics.fill( // x1,y1, x2,y2,
                     x + xyDiff, y + xyDiff,
                     x + xyDiff + iconFrameSize,
@@ -224,6 +230,7 @@ public void render(GuiGraphics guiGraphics, int x, int y, int mouseX, int mouseY
             if (!isEnabled.get())
                 greyHeightPx = 0;
 
+            guiGraphics.pose().translate(0,0,1);
             guiGraphics.fill( // x1,y1, x2,y2,
                     x + xyDiff,
                     y + xyDiff + greyHeightPx,

Diff for: src/main/java/com/solegendary/reignofnether/mixin/ForgeGuiMixin.java

@@ -1,11 +1,13 @@
 package com.solegendary.reignofnether.mixin;
 
+import com.mojang.blaze3d.platform.Window;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.solegendary.reignofnether.orthoview.OrthoviewClientEvents;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.entity.ItemRenderer;
+import net.minecraft.util.Mth;
 import net.minecraftforge.client.event.CustomizeGuiOverlayEvent;
 import net.minecraftforge.client.gui.overlay.ForgeGui;
 import net.minecraftforge.common.MinecraftForge;
@@ -35,11 +37,14 @@ protected void renderChat(int width, int height, GuiGraphics guiGraphics, Callba
         ci.cancel();
 
         this.minecraft.getProfiler().push("chat");
-        CustomizeGuiOverlayEvent.Chat event = new CustomizeGuiOverlayEvent.Chat(this.minecraft.getWindow(), guiGraphics, this.minecraft.getFrameTime(), 0, height - 48);
+        Window window = this.minecraft.getWindow();
+        CustomizeGuiOverlayEvent.Chat event = new CustomizeGuiOverlayEvent.Chat(window, guiGraphics, this.minecraft.getFrameTime(), 0, height - 40);
         MinecraftForge.EVENT_BUS.post(event);
         guiGraphics.pose().pushPose();
-        guiGraphics.pose().translate(event.getPosX(), event.getPosY() - 50, 0.0);
-        this.chat.render(guiGraphics, this.tickCount, 0, 0);
+        guiGraphics.pose().translate((double)event.getPosX(), (double)(event.getPosY() - height - 15) / this.chat.getScale(), 0.0);
+        int mouseX = Mth.floor(this.minecraft.mouseHandler.xpos() * (double)window.getGuiScaledWidth() / (double)window.getScreenWidth());
+        int mouseY = Mth.floor(this.minecraft.mouseHandler.ypos() * (double)window.getGuiScaledHeight() / (double)window.getScreenHeight());
+        this.chat.render(guiGraphics, this.tickCount, mouseX, mouseY);
         guiGraphics.pose().popPose();
         this.minecraft.getProfiler().pop();
     }