mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 04:32:15 +00:00
107 lines
3.6 KiB
Diff
107 lines
3.6 KiB
Diff
--- ../src-base/minecraft/net/minecraft/client/Minecraft.java
|
|
+++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
|
|
@@ -15,7 +15,9 @@
|
|
import java.text.DecimalFormat;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
+
|
|
import javax.swing.JPanel;
|
|
+
|
|
import net.minecraft.src.AchievementList;
|
|
import net.minecraft.src.AnvilSaveConverter;
|
|
import net.minecraft.src.AxisAlignedBB;
|
|
@@ -118,6 +120,7 @@
|
|
import net.minecraft.src.WorldInfo;
|
|
import net.minecraft.src.WorldRenderer;
|
|
import net.minecraft.src.WorldSettings;
|
|
+
|
|
import org.lwjgl.LWJGLException;
|
|
import org.lwjgl.Sys;
|
|
import org.lwjgl.input.Keyboard;
|
|
@@ -130,6 +133,12 @@
|
|
import org.lwjgl.opengl.GLContext;
|
|
import org.lwjgl.opengl.PixelFormat;
|
|
import org.lwjgl.util.glu.GLU;
|
|
+
|
|
+import cpw.mods.fml.client.FMLClientHandler;
|
|
+import cpw.mods.fml.common.FMLCommonHandler;
|
|
+import cpw.mods.fml.common.Side;
|
|
+import cpw.mods.fml.relauncher.ArgsWrapper;
|
|
+import cpw.mods.fml.relauncher.FMLRelauncher;
|
|
|
|
@SideOnly(Side.CLIENT)
|
|
public abstract class Minecraft implements Runnable, IPlayerUsage
|
|
@@ -312,7 +321,7 @@
|
|
this.func_71357_I();
|
|
this.field_71466_p = new FontRenderer(this.field_71474_y, "/font/default.png", this.field_71446_o, false);
|
|
this.field_71464_q = new FontRenderer(this.field_71474_y, "/font/alternate.png", this.field_71446_o, false);
|
|
-
|
|
+ FMLClientHandler.instance().beginMinecraftLoading(this);
|
|
if (this.field_71474_y.field_74363_ab != null)
|
|
{
|
|
StringTranslate.func_74808_a().func_74810_a(this.field_71474_y.field_74363_ab);
|
|
@@ -357,6 +366,8 @@
|
|
GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d);
|
|
this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
|
|
|
|
+ FMLClientHandler.instance().finishMinecraftLoading();
|
|
+
|
|
try
|
|
{
|
|
this.field_71430_V = new ThreadDownloadResources(this.field_71412_D, this);
|
|
@@ -385,6 +396,7 @@
|
|
{
|
|
this.func_71352_k();
|
|
}
|
|
+ FMLClientHandler.instance().onInitializationComplete();
|
|
}
|
|
|
|
private void func_71357_I() throws LWJGLException
|
|
@@ -743,9 +755,11 @@
|
|
|
|
if (!this.field_71454_w)
|
|
{
|
|
+ FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_74281_c);
|
|
this.field_71424_I.func_76318_c("gameRenderer");
|
|
this.field_71460_t.func_78480_b(this.field_71428_T.field_74281_c);
|
|
this.field_71424_I.func_76319_b();
|
|
+ FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_74281_c);
|
|
}
|
|
|
|
GL11.glFlush();
|
|
@@ -1271,11 +1285,13 @@
|
|
|
|
public void func_71407_l()
|
|
{
|
|
+ FMLCommonHandler.instance().rescheduleTicks(Side.CLIENT);
|
|
if (this.field_71467_ac > 0)
|
|
{
|
|
--this.field_71467_ac;
|
|
}
|
|
|
|
+ FMLCommonHandler.instance().onPreClientTick();
|
|
this.field_71424_I.func_76320_a("stats");
|
|
this.field_71413_E.func_77449_e();
|
|
this.field_71424_I.func_76318_c("gui");
|
|
@@ -1672,6 +1688,7 @@
|
|
this.field_71453_ak.func_74428_b();
|
|
}
|
|
|
|
+ FMLCommonHandler.instance().onPostClientTick();
|
|
this.field_71424_I.func_76319_b();
|
|
this.field_71423_H = func_71386_F();
|
|
}
|
|
@@ -1926,6 +1943,12 @@
|
|
|
|
public static void main(String[] p_main_0_)
|
|
{
|
|
+ FMLRelauncher.handleClientRelaunch(new ArgsWrapper(p_main_0_));
|
|
+ }
|
|
+
|
|
+ public static void fmlReentry(ArgsWrapper wrapper)
|
|
+ {
|
|
+ String[] p_main_0_ = wrapper.args;
|
|
HashMap var1 = new HashMap();
|
|
boolean var2 = false;
|
|
boolean var3 = true;
|