From e6eeb031080c819781fe468dd155d4b8973d40ca Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Mon, 25 May 2015 14:32:35 -0700 Subject: [PATCH] Finish loading screen before going fullscreen. Closes MinecraftForge/FML#662 (cherry picked from commit 19d7e16fa6a28c5665de1ed6e50d8699e865bff2) Conflicts: fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch --- .../net/minecraft/client/Minecraft.java.patch | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch index 64fd52fa6..c5e5abb79 100644 --- a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -79,7 +79,7 @@ this.field_71417_B = new MouseHelper(); this.func_71361_d("Pre startup"); GL11.glEnable(GL11.GL_TEXTURE_2D); -@@ -524,27 +535,35 @@ +@@ -524,30 +535,39 @@ GL11.glLoadIdentity(); GL11.glMatrixMode(GL11.GL_MODELVIEW); this.func_71361_d("Startup"); @@ -117,14 +117,10 @@ this.field_152354_ay = null; this.field_71461_s = new LoadingScreenRenderer(this); -@@ -553,6 +572,7 @@ - this.func_71352_k(); - } - + FMLClientHandler.instance().onInitializationComplete(); - try + if (this.field_71474_y.field_74353_u && !this.field_71431_Q) { - Display.setVSyncEnabled(this.field_71474_y.field_74352_v); + this.func_71352_k(); @@ -970,9 +990,11 @@ if (!this.field_71454_w)