|
1 | 1 | --- ../src-base/minecraft/net/minecraft/client/Minecraft.java |
2 | 2 | +++ ../src-work/minecraft/net/minecraft/client/Minecraft.java |
3 | | -@@ -9,6 +9,9 @@ |
4 | | - import com.google.common.util.concurrent.ListenableFutureTask; |
5 | | - import com.mojang.authlib.minecraft.MinecraftSessionService; |
6 | | - import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; |
7 | | -+import cpw.mods.fml.client.FMLClientHandler; |
8 | | -+import cpw.mods.fml.common.FMLCommonHandler; |
9 | | -+import cpw.mods.fml.common.StartupQuery; |
10 | | - import cpw.mods.fml.relauncher.Side; |
11 | | - import cpw.mods.fml.relauncher.SideOnly; |
12 | | - import io.netty.util.concurrent.GenericFutureListener; |
13 | | -@@ -169,6 +172,8 @@ |
14 | | - import org.lwjgl.opengl.PixelFormat; |
15 | | - import org.lwjgl.util.glu.GLU; |
16 | | - |
17 | | -+import com.google.common.collect.MapDifference; |
18 | | -+ |
19 | | - @SideOnly(Side.CLIENT) |
20 | | - public class Minecraft implements IPlayerUsage |
21 | | - { |
22 | | -@@ -344,21 +349,23 @@ |
23 | | - File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt"); |
24 | | - System.out.println(p_71377_1_.func_71502_e()); |
25 | | - |
26 | | -+ int retVal; |
27 | | - if (p_71377_1_.func_71497_f() != null) |
28 | | - { |
29 | | - System.out.println("#@!@# Game crashed! Crash report saved to: #@!@# " + p_71377_1_.func_71497_f()); |
30 | | -- System.exit(-1); |
31 | | -+ retVal = -1; |
32 | | - } |
33 | | - else if (p_71377_1_.func_147149_a(file2)) |
34 | | - { |
35 | | - System.out.println("#@!@# Game crashed! Crash report saved to: #@!@# " + file2.getAbsolutePath()); |
36 | | -- System.exit(-1); |
37 | | -+ retVal = -1; |
38 | | - } |
39 | | - else |
40 | | - { |
41 | | - System.out.println("#@?@# Game crashed! Crash report could not be saved. #@?@#"); |
42 | | -- System.exit(-2); |
43 | | -+ retVal = -2; |
44 | | - } |
45 | | -+ FMLCommonHandler.instance().handleExit(retVal); |
46 | | - } |
47 | | - |
48 | | - public void func_71367_a(String p_71367_1_, int p_71367_2_) |
49 | | -@@ -471,7 +478,7 @@ |
| 3 | +@@ -410,7 +410,7 @@ |
50 | 4 | this.field_110451_am = new SimpleReloadableResourceManager(this.field_110452_an); |
51 | 5 | this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab); |
52 | 6 | this.field_110451_am.func_110542_a(this.field_135017_as); |
53 | 7 | - this.func_110436_a(); |
54 | | -+ FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am); |
| 8 | ++ cpw.mods.fml.client.FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am); |
55 | 9 | this.field_71446_o = new TextureManager(this.field_110451_am); |
56 | 10 | this.field_110451_am.func_110542_a(this.field_71446_o); |
57 | | - this.field_152350_aA = new SkinManager(this.field_71446_o, new File(this.field_110446_Y, "skins"), this.field_152355_az); |
58 | | -@@ -532,12 +539,13 @@ |
59 | | - this.field_71446_o.func_130088_a(TextureMap.field_110576_c, new TextureMap(1, "textures/items")); |
60 | | - GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d); |
| 11 | + this.func_180510_a(this.field_71446_o); |
| 12 | +@@ -482,12 +482,13 @@ |
| 13 | + this.field_71458_u = new GuiAchievement(this); |
| 14 | + GlStateManager.func_179083_b(0, 0, this.field_71443_c, this.field_71440_d); |
61 | 15 | this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o); |
62 | | -+ FMLClientHandler.instance().finishMinecraftLoading(); |
| 16 | ++ cpw.mods.fml.client.FMLClientHandler.instance().finishMinecraftLoading(); |
63 | 17 | this.func_71361_d("Post startup"); |
64 | 18 | this.field_71456_v = new GuiIngame(this); |
65 | 19 |
|
66 | 20 | if (this.field_71475_ae != null) |
67 | 21 | { |
68 | 22 | - this.func_147108_a(new GuiConnecting(new GuiMainMenu(), this, this.field_71475_ae, this.field_71477_af)); |
69 | | -+ FMLClientHandler.instance().connectToServerAtStartup(this.field_71475_ae, this.field_71477_af); |
| 23 | ++ cpw.mods.fml.client.FMLClientHandler.instance().connectToServerAtStartup(this.field_71475_ae, this.field_71477_af); |
70 | 24 | } |
71 | 25 | else |
72 | 26 | { |
73 | | -@@ -553,6 +561,7 @@ |
| 27 | +@@ -503,6 +504,7 @@ |
74 | 28 | this.func_71352_k(); |
75 | 29 | } |
76 | 30 |
|
77 | | -+ FMLClientHandler.instance().onInitializationComplete(); |
| 31 | ++ cpw.mods.fml.client.FMLClientHandler.instance().onInitializationComplete(); |
78 | 32 | try |
79 | 33 | { |
80 | 34 | Display.setVSyncEnabled(this.field_71474_y.field_74352_v); |
81 | | -@@ -971,9 +980,11 @@ |
| 35 | +@@ -681,21 +683,23 @@ |
| 36 | + File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt"); |
| 37 | + Bootstrap.func_179870_a(p_71377_1_.func_71502_e()); |
| 38 | + |
| 39 | ++ int retVal; |
| 40 | + if (p_71377_1_.func_71497_f() != null) |
| 41 | + { |
| 42 | + Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + p_71377_1_.func_71497_f()); |
| 43 | +- System.exit(-1); |
| 44 | ++ retVal = -1; |
| 45 | + } |
| 46 | + else if (p_71377_1_.func_147149_a(file2)) |
| 47 | + { |
| 48 | + Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + file2.getAbsolutePath()); |
| 49 | +- System.exit(-1); |
| 50 | ++ retVal = -1; |
| 51 | + } |
| 52 | + else |
| 53 | + { |
| 54 | + Bootstrap.func_179870_a("#@?@# Game crashed! Crash report could not be saved. #@?@#"); |
| 55 | +- System.exit(-2); |
| 56 | ++ retVal = -2; |
| 57 | + } |
| 58 | ++ cpw.mods.fml.common.FMLCommonHandler.instance().handleExit(retVal); |
| 59 | + } |
| 60 | + |
| 61 | + public boolean func_152349_b() |
| 62 | +@@ -1034,9 +1038,11 @@ |
82 | 63 |
|
83 | 64 | if (!this.field_71454_w) |
84 | 65 | { |
85 | | -+ FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_74281_c); |
| 66 | ++ cpw.mods.fml.common.FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_74281_c); |
86 | 67 | this.field_71424_I.func_76318_c("gameRenderer"); |
87 | 68 | this.field_71460_t.func_78480_b(this.field_71428_T.field_74281_c); |
88 | 69 | this.field_71424_I.func_76319_b(); |
89 | | -+ FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_74281_c); |
| 70 | ++ cpw.mods.fml.common.FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_74281_c); |
90 | 71 | } |
91 | 72 |
|
92 | | - GL11.glFlush(); |
93 | | -@@ -1555,6 +1566,8 @@ |
| 73 | + this.field_71424_I.func_76319_b(); |
| 74 | +@@ -1591,6 +1597,8 @@ |
94 | 75 | --this.field_71467_ac; |
95 | 76 | } |
96 | 77 |
|
97 | | -+ FMLCommonHandler.instance().onPreClientTick(); |
| 78 | ++ cpw.mods.fml.common.FMLCommonHandler.instance().onPreClientTick(); |
98 | 79 | + |
99 | 80 | this.field_71424_I.func_76320_a("gui"); |
100 | 81 |
|
101 | 82 | if (!this.field_71445_n) |
102 | | -@@ -1699,6 +1712,7 @@ |
| 83 | +@@ -1744,6 +1752,7 @@ |
103 | 84 | this.field_71462_r.func_146274_d(); |
104 | 85 | } |
105 | 86 | } |
106 | | -+ FMLCommonHandler.instance().fireMouseInput(); |
| 87 | ++ cpw.mods.fml.common.FMLCommonHandler.instance().fireMouseInput(); |
107 | 88 | } |
108 | 89 |
|
109 | 90 | if (this.field_71429_W > 0) |
110 | | -@@ -1836,6 +1850,7 @@ |
| 91 | +@@ -1920,6 +1929,7 @@ |
111 | 92 | } |
112 | 93 | } |
113 | 94 | } |
114 | | -+ FMLCommonHandler.instance().fireKeyInput(); |
| 95 | ++ cpw.mods.fml.common.FMLCommonHandler.instance().fireKeyInput(); |
115 | 96 | } |
116 | 97 |
|
117 | | - for (j = 0; j < 9; ++j) |
118 | | -@@ -2026,12 +2041,15 @@ |
| 98 | + for (i = 0; i < 9; ++i) |
| 99 | +@@ -2120,12 +2130,15 @@ |
119 | 100 | this.field_71453_ak.func_74428_b(); |
120 | 101 | } |
121 | 102 |
|
122 | | -+ FMLCommonHandler.instance().onPostClientTick(); |
| 103 | ++ cpw.mods.fml.common.FMLCommonHandler.instance().onPostClientTick(); |
123 | 104 | + |
124 | 105 | this.field_71424_I.func_76319_b(); |
125 | 106 | this.field_71423_H = func_71386_F(); |
126 | 107 | } |
127 | 108 |
|
128 | 109 | public void func_71371_a(String p_71371_1_, String p_71371_2_, WorldSettings p_71371_3_) |
129 | 110 | { |
130 | | -+ FMLClientHandler.instance().startIntegratedServer(p_71371_1_, p_71371_2_, p_71371_3_); |
| 111 | ++ cpw.mods.fml.client.FMLClientHandler.instance().startIntegratedServer(p_71371_1_, p_71371_2_, p_71371_3_); |
131 | 112 | this.func_71403_a((WorldClient)null); |
132 | 113 | System.gc(); |
133 | 114 | ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false); |
134 | | -@@ -2067,6 +2085,12 @@ |
| 115 | +@@ -2161,6 +2174,12 @@ |
135 | 116 |
|
136 | 117 | while (!this.field_71437_Z.func_71200_ad()) |
137 | 118 | { |
138 | | -+ if (!StartupQuery.check()) |
| 119 | ++ if (!cpw.mods.fml.common.StartupQuery.check()) |
139 | 120 | + { |
140 | 121 | + func_71403_a(null); |
141 | 122 | + func_147108_a(null); |
|
144 | 125 | String s2 = this.field_71437_Z.func_71195_b_(); |
145 | 126 |
|
146 | 127 | if (s2 != null) |
147 | | -@@ -2142,6 +2166,7 @@ |
148 | | - this.field_110448_aq.func_148529_f(); |
| 128 | +@@ -2186,7 +2205,7 @@ |
| 129 | + SocketAddress socketaddress = this.field_71437_Z.func_147137_ag().func_151270_a(); |
| 130 | + NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress); |
| 131 | + networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null)); |
| 132 | +- networkmanager.func_179290_a(new C00Handshake(47, socketaddress.toString(), 0, EnumConnectionState.LOGIN)); |
| 133 | ++ networkmanager.func_179290_a(new C00Handshake(47, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true)); |
| 134 | + networkmanager.func_179290_a(new C00PacketLoginStart(this.func_110432_I().func_148256_e())); |
| 135 | + this.field_71453_ak = networkmanager; |
| 136 | + } |
| 137 | +@@ -2237,6 +2256,7 @@ |
| 138 | + |
149 | 139 | this.func_71351_a((ServerData)null); |
150 | 140 | this.field_71455_al = false; |
151 | | -+ FMLClientHandler.instance().handleClientWorldClosing(this.field_71441_e); |
| 141 | ++ cpw.mods.fml.client.FMLClientHandler.instance().handleClientWorldClosing(this.field_71441_e); |
152 | 142 | } |
153 | 143 |
|
154 | 144 | this.field_147127_av.func_147690_c(); |
0 commit comments