From 5cf2af569f9456b4d8e83fa1a411a891af7e2fb7 Mon Sep 17 00:00:00 2001 From: its_meow Date: Tue, 16 Jul 2019 15:41:21 -0400 Subject: [PATCH] [1.14.x] Fix text positioning issues caused by scaling loading screen (#5932) --- .../java/net/minecraftforge/fml/client/EarlyLoaderGUI.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/client/EarlyLoaderGUI.java b/src/main/java/net/minecraftforge/fml/client/EarlyLoaderGUI.java index 5814d2f78..21c266480 100644 --- a/src/main/java/net/minecraftforge/fml/client/EarlyLoaderGUI.java +++ b/src/main/java/net/minecraftforge/fml/client/EarlyLoaderGUI.java @@ -79,7 +79,7 @@ public class EarlyLoaderGUI { final float fade = MathHelper.clamp((4000.0f - (float) pair.getLeft() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f); if (fade <0.01f) continue; StartupMessageManager.Message msg = pair.getRight(); - renderMessage(msg.getText(), msg.getTypeColour(), i, fade); + renderMessage(msg.getText(), msg.getTypeColour(), ((window.getScaledHeight() - 15) / 10) - i + 1, fade); } renderMemoryInfo(); } @@ -96,7 +96,7 @@ public class EarlyLoaderGUI { memorycolour[2] = ((i) & 0xFF) / 255.0f; memorycolour[1] = ((i >> 8 ) & 0xFF) / 255.0f; memorycolour[0] = ((i >> 16 ) & 0xFF) / 255.0f; - renderMessage(memory, memorycolour, 21, 1.0f); + renderMessage(memory, memorycolour, 1, 1.0f); } void renderMessage(final String message, final float[] colour, int line, float alpha) { @@ -110,7 +110,7 @@ public class EarlyLoaderGUI { GlStateManager.blendFunc(GlStateManager.SourceFactor.CONSTANT_ALPHA, GlStateManager.DestFactor.ONE_MINUS_CONSTANT_ALPHA); GlStateManager.color3f(colour[0],colour[1],colour[2]); GlStateManager.pushMatrix(); - GlStateManager.translatef(10, window.getScaledHeight() - 15 - line * 10, 0); + GlStateManager.translatef(10, line * 10, 0); GlStateManager.scalef(1, 1, 0); GlStateManager.drawArrays(GL11.GL_QUADS, 0, quads * 4); GlStateManager.popMatrix();