From ac194dc37882ae1cb6c57ae65f1fce714dee9401 Mon Sep 17 00:00:00 2001 From: RainWarrior Date: Sun, 5 Jun 2016 09:29:56 +0300 Subject: [PATCH] Pass the GL context back from the splash screen during the EntityRenderer init. --- .../net/minecraft/client/Minecraft.java.patch | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index 94d8906c7..4fd4b012f 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -39,7 +39,7 @@ this.func_71361_d("Pre startup"); GlStateManager.func_179098_w(); GlStateManager.func_179103_j(7425); -@@ -485,19 +486,23 @@ +@@ -485,19 +486,24 @@ GlStateManager.func_179096_D(); GlStateManager.func_179128_n(5888); this.func_71361_d("Startup"); @@ -61,13 +61,15 @@ this.field_175620_Y = new ItemRenderer(this); this.field_110451_am.func_110542_a(this.field_175621_X); + bar.step("Loading Entity Renderer"); ++ net.minecraftforge.fml.client.SplashProgress.pause(); this.field_71460_t = new EntityRenderer(this, this.field_110451_am); this.field_110451_am.func_110542_a(this.field_71460_t); this.field_175618_aM = new BlockRendererDispatcher(this.field_175617_aL.func_174954_c(), this.field_184127_aH); -@@ -507,23 +512,26 @@ +@@ -507,23 +513,27 @@ this.field_71458_u = new GuiAchievement(this); GlStateManager.func_179083_b(0, 0, this.field_71443_c, this.field_71440_d); this.field_71452_i = new ParticleManager(this.field_71441_e, this.field_71446_o); ++ net.minecraftforge.fml.client.SplashProgress.resume(); + net.minecraftforge.fml.common.ProgressManager.pop(bar); + net.minecraftforge.fml.client.FMLClientHandler.instance().finishMinecraftLoading(); this.func_71361_d("Post startup"); @@ -94,7 +96,7 @@ if (this.field_71474_y.field_74353_u && !this.field_71431_Q) { this.func_71352_k(); -@@ -695,21 +703,23 @@ +@@ -695,21 +705,23 @@ File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt"); Bootstrap.func_179870_a(p_71377_1_.func_71502_e()); @@ -121,7 +123,7 @@ } public boolean func_152349_b() -@@ -902,11 +912,6 @@ +@@ -902,11 +914,6 @@ public void func_147108_a(@Nullable GuiScreen p_147108_1_) { @@ -133,7 +135,7 @@ if (p_147108_1_ == null && this.field_71441_e == null) { p_147108_1_ = new GuiMainMenu(); -@@ -916,6 +921,17 @@ +@@ -916,6 +923,17 @@ p_147108_1_ = new GuiGameOver((ITextComponent)null); } @@ -151,7 +153,7 @@ if (p_147108_1_ instanceof GuiMainMenu || p_147108_1_ instanceof GuiMultiplayer) { this.field_71474_y.field_74330_P = false; -@@ -1054,9 +1070,11 @@ +@@ -1054,9 +1072,11 @@ if (!this.field_71454_w) { @@ -163,7 +165,7 @@ } this.field_71424_I.func_76319_b(); -@@ -1396,9 +1414,9 @@ +@@ -1396,9 +1416,9 @@ { BlockPos blockpos = this.field_71476_x.func_178782_a(); @@ -175,7 +177,7 @@ this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND); } } -@@ -1432,7 +1450,7 @@ +@@ -1432,7 +1452,7 @@ case BLOCK: BlockPos blockpos = this.field_71476_x.func_178782_a(); @@ -184,7 +186,7 @@ { this.field_71442_b.func_180511_b(blockpos, this.field_71476_x.field_178784_b); break; -@@ -1447,6 +1465,7 @@ +@@ -1447,6 +1467,7 @@ } this.field_71439_g.func_184821_cY(); @@ -192,7 +194,7 @@ } this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND); -@@ -1476,7 +1495,6 @@ +@@ -1476,7 +1497,6 @@ switch (this.field_71476_x.field_72313_a) { case ENTITY: @@ -200,7 +202,7 @@ if (this.field_71442_b.func_187102_a(this.field_71439_g, this.field_71476_x.field_72308_g, this.field_71476_x, this.field_71439_g.func_184586_b(enumhand), enumhand) == EnumActionResult.SUCCESS) { return; -@@ -1519,7 +1537,7 @@ +@@ -1519,7 +1539,7 @@ } ItemStack itemstack1 = this.field_71439_g.func_184586_b(enumhand); @@ -209,7 +211,7 @@ if (itemstack1 != null && this.field_71442_b.func_187101_a(this.field_71439_g, this.field_71441_e, itemstack1, enumhand) == EnumActionResult.SUCCESS) { this.field_71460_t.field_78516_c.func_187460_a(enumhand); -@@ -1626,6 +1644,8 @@ +@@ -1626,6 +1646,8 @@ --this.field_71467_ac; } @@ -218,7 +220,7 @@ this.field_71424_I.func_76320_a("gui"); if (!this.field_71445_n) -@@ -1737,6 +1757,7 @@ +@@ -1737,6 +1759,7 @@ this.field_71457_ai = 0; this.field_71441_e.func_72897_h(this.field_71439_g); } @@ -226,7 +228,7 @@ } this.field_71424_I.func_76318_c("gameRenderer"); -@@ -1824,6 +1845,7 @@ +@@ -1824,6 +1847,7 @@ this.field_71453_ak.func_74428_b(); } @@ -234,7 +236,7 @@ this.field_71424_I.func_76319_b(); this.field_71423_H = func_71386_F(); } -@@ -1930,6 +1952,7 @@ +@@ -1930,6 +1954,7 @@ } } } @@ -242,7 +244,7 @@ } this.func_184117_aA(); -@@ -2169,6 +2192,8 @@ +@@ -2169,6 +2194,8 @@ { while (Mouse.next()) { @@ -251,7 +253,7 @@ int i = Mouse.getEventButton(); KeyBinding.func_74510_a(i - 100, Mouse.getEventButtonState()); -@@ -2234,6 +2259,7 @@ +@@ -2234,6 +2261,7 @@ public void func_71371_a(String p_71371_1_, String p_71371_2_, @Nullable WorldSettings p_71371_3_) { @@ -259,7 +261,7 @@ this.func_71403_a((WorldClient)null); System.gc(); ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false); -@@ -2276,6 +2302,12 @@ +@@ -2276,6 +2304,12 @@ while (!this.field_71437_Z.func_71200_ad()) { @@ -272,7 +274,7 @@ String s = this.field_71437_Z.func_71195_b_(); if (s != null) -@@ -2301,8 +2333,14 @@ +@@ -2301,8 +2335,14 @@ SocketAddress socketaddress = this.field_71437_Z.func_147137_ag().func_151270_a(); NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress); networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null)); @@ -289,7 +291,7 @@ this.field_71453_ak = networkmanager; } -@@ -2313,6 +2351,8 @@ +@@ -2313,6 +2353,8 @@ public void func_71353_a(@Nullable WorldClient p_71353_1_, String p_71353_2_) { @@ -298,7 +300,7 @@ if (p_71353_1_ == null) { NetHandlerPlayClient nethandlerplayclient = this.func_147114_u(); -@@ -2325,6 +2365,18 @@ +@@ -2325,6 +2367,18 @@ if (this.field_71437_Z != null && this.field_71437_Z.func_175578_N()) { this.field_71437_Z.func_71263_m(); @@ -317,7 +319,7 @@ } this.field_71437_Z = null; -@@ -2348,6 +2400,7 @@ +@@ -2348,6 +2402,7 @@ this.field_71456_v.func_181029_i(); this.func_71351_a((ServerData)null); this.field_71455_al = false; @@ -325,7 +327,7 @@ } this.field_147127_av.func_147690_c(); -@@ -2464,159 +2517,8 @@ +@@ -2464,159 +2519,8 @@ { if (this.field_71476_x != null && this.field_71476_x.field_72313_a != RayTraceResult.Type.MISS) { @@ -487,7 +489,7 @@ } } -@@ -2912,18 +2814,8 @@ +@@ -2912,18 +2816,8 @@ public static int func_71369_N() { @@ -508,7 +510,7 @@ } public boolean func_70002_Q() -@@ -3060,15 +2952,16 @@ +@@ -3060,15 +2954,16 @@ { if (Keyboard.getEventKeyState()) { @@ -527,7 +529,7 @@ } } } -@@ -3195,4 +3088,10 @@ +@@ -3195,4 +3090,10 @@ { return this.field_184127_aH; }