Fix AetherLoadingScreen trying to draw trivia message out of window. (Fixes taken from PR by Low-power, which currently can't be merged because of a file conflict so I'm implementing the fixes manually).

This commit is contained in:
bconlon 2020-11-27 14:49:49 -08:00
parent 6fec640108
commit 50faf61ae0
2 changed files with 1 additions and 6 deletions

View file

@ -75,8 +75,6 @@ public class ClientProxy extends CommonProxy {
treasureChestRenderID = RenderingRegistry.getNextAvailableRenderId();
aetherFlowerRenderID = RenderingRegistry.getNextAvailableRenderId();
Minecraft.getMinecraft().loadingScreen = new AetherLoadingScreen(Minecraft.getMinecraft());
EntityRenderer previousRenderer = Minecraft.getMinecraft().entityRenderer;
Minecraft.getMinecraft().entityRenderer = new AetherEntityRenderer(Minecraft.getMinecraft(), previousRenderer, Minecraft.getMinecraft().getResourceManager());

View file

@ -20,8 +20,6 @@ public class AetherLoadingScreen extends LoadingScreenRenderer {
private Minecraft mc;
private String currentlyDisplayedText = "";
private String currentDisplayedTrivia = "";
private long systemTime = Minecraft.getSystemTime();
@ -116,9 +114,8 @@ public class AetherLoadingScreen extends LoadingScreenRenderer {
GL11.glEnable(GL11.GL_BLEND);
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
this.mc.fontRenderer.drawStringWithShadow(this.currentlyDisplayedText, (l - this.mc.fontRenderer.getStringWidth(this.currentlyDisplayedText)) / 2, i1 / 2 - 4 - 16, 16777215);
this.mc.fontRenderer.drawStringWithShadow(this.message, (l - this.mc.fontRenderer.getStringWidth(this.message)) / 2, i1 / 2 - 4 + 8, 16777215);
this.mc.fontRenderer.drawStringWithShadow(this.currentDisplayedTrivia, (k - this.mc.fontRenderer.getStringWidth(this.currentDisplayedTrivia)) / 2, l - 16, 0xffff99);
this.mc.fontRenderer.drawStringWithShadow(this.currentDisplayedTrivia, (l - this.mc.fontRenderer.getStringWidth(this.currentDisplayedTrivia)) / 2, i1 - 16, 0xffff99);
}
this.framebuffer.unbindFramebuffer();