diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index f6b06227c0..4dd92cefad 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -194,7 +194,19 @@ if (!itemstack.func_190926_b() && this.field_71442_b.func_187101_a(this.field_71439_g, this.field_71441_e, enumhand) == EnumActionResult.SUCCESS) { this.field_71460_t.field_78516_c.func_187460_a(enumhand); -@@ -1676,6 +1698,8 @@ +@@ -1630,6 +1652,11 @@ + } + + Display.setFullscreen(this.field_71431_Q); ++ if (!this.field_71431_Q) //Forge: Fix MC-68754, Screen is not resizeable after exiting fullscreen due to LWJGL bug https://github.com/LWJGL/lwjgl/issues/142 which is fixed, but not in the version MC ships ++ { ++ Display.setResizable(false); ++ Display.setResizable(true); ++ } + Display.setVSyncEnabled(this.field_71474_y.field_74352_v); + this.func_175601_h(); + } +@@ -1676,6 +1703,8 @@ --this.field_71467_ac; } @@ -203,7 +215,7 @@ this.field_71424_I.func_76320_a("gui"); if (!this.field_71445_n) -@@ -1788,6 +1812,7 @@ +@@ -1788,6 +1817,7 @@ this.field_71457_ai = 0; this.field_71441_e.func_72897_h(this.field_71439_g); } @@ -211,7 +223,7 @@ } this.field_71424_I.func_76318_c("gameRenderer"); -@@ -1877,6 +1902,7 @@ +@@ -1877,6 +1907,7 @@ } this.field_71424_I.func_76319_b(); @@ -219,7 +231,7 @@ this.field_71423_H = func_71386_F(); } -@@ -1982,6 +2008,7 @@ +@@ -1982,6 +2013,7 @@ } } } @@ -227,7 +239,7 @@ } this.func_184117_aA(); -@@ -2239,6 +2266,8 @@ +@@ -2239,6 +2271,8 @@ { while (Mouse.next()) { @@ -236,7 +248,7 @@ int i = Mouse.getEventButton(); KeyBinding.func_74510_a(i - 100, Mouse.getEventButtonState()); -@@ -2304,6 +2333,7 @@ +@@ -2304,6 +2338,7 @@ public void func_71371_a(String p_71371_1_, String p_71371_2_, @Nullable WorldSettings p_71371_3_) { @@ -244,7 +256,7 @@ this.func_71403_a((WorldClient)null); System.gc(); ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false); -@@ -2346,6 +2376,12 @@ +@@ -2346,6 +2381,12 @@ while (!this.field_71437_Z.func_71200_ad()) { @@ -257,7 +269,7 @@ String s = this.field_71437_Z.func_71195_b_(); if (s != null) -@@ -2371,8 +2407,14 @@ +@@ -2371,8 +2412,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)); @@ -274,7 +286,7 @@ this.field_71453_ak = networkmanager; } -@@ -2383,6 +2425,8 @@ +@@ -2383,6 +2430,8 @@ public void func_71353_a(@Nullable WorldClient p_71353_1_, String p_71353_2_) { @@ -283,7 +295,7 @@ if (p_71353_1_ == null) { NetHandlerPlayClient nethandlerplayclient = this.func_147114_u(); -@@ -2395,6 +2439,18 @@ +@@ -2395,6 +2444,18 @@ if (this.field_71437_Z != null && this.field_71437_Z.func_175578_N()) { this.field_71437_Z.func_71263_m(); @@ -302,7 +314,7 @@ } this.field_71437_Z = null; -@@ -2418,6 +2474,7 @@ +@@ -2418,6 +2479,7 @@ this.field_71456_v.func_181029_i(); this.func_71351_a((ServerData)null); this.field_71455_al = false; @@ -310,7 +322,7 @@ } this.field_147127_av.func_147690_c(); -@@ -2535,159 +2592,8 @@ +@@ -2535,159 +2597,8 @@ { if (this.field_71476_x != null && this.field_71476_x.field_72313_a != RayTraceResult.Type.MISS) { @@ -472,7 +484,7 @@ } } -@@ -3009,18 +2915,8 @@ +@@ -3009,18 +2920,8 @@ public static int func_71369_N() { @@ -493,7 +505,7 @@ } public boolean func_70002_Q() -@@ -3181,11 +3077,11 @@ +@@ -3181,11 +3082,11 @@ { if (Keyboard.getEventKeyState()) { @@ -507,7 +519,7 @@ { this.field_71456_v.func_146158_b().func_146227_a(ScreenShotHelper.func_148260_a(this.field_71412_D, this.field_71443_c, this.field_71440_d, this.field_147124_at)); } -@@ -3199,6 +3095,7 @@ +@@ -3199,6 +3100,7 @@ } } } @@ -515,7 +527,7 @@ } } } -@@ -3328,6 +3225,12 @@ +@@ -3328,6 +3230,12 @@ return this.field_184127_aH; } @@ -528,7 +540,7 @@ public boolean func_189648_am() { return this.field_71439_g != null && this.field_71439_g.func_175140_cp() || this.field_71474_y.field_178879_v; -@@ -3342,4 +3245,9 @@ +@@ -3342,4 +3250,9 @@ { return this.field_193035_aW; }