diff --git a/fml/patches/minecraft/net/minecraft/client/GameSettings.java.patch b/fml/patches/minecraft/net/minecraft/client/GameSettings.java.patch
index 9e45a8e6d..b18ae2ecb 100644
--- a/fml/patches/minecraft/net/minecraft/client/GameSettings.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/GameSettings.java.patch
@@ -11,7 +11,7 @@
  
      public void func_74303_b()
      {
-+    	if (FMLClientHandler.instance().isLoading()) return;
++        if (FMLClientHandler.instance().isLoading()) return;
          try
          {
              PrintWriter var1 = new PrintWriter(new FileWriter(this.field_74354_ai));
diff --git a/fml/patches/minecraft/net/minecraft/client/IntegratedServerListenThread.java.patch b/fml/patches/minecraft/net/minecraft/client/IntegratedServerListenThread.java.patch
index cfc66d26b..674f1c890 100644
--- a/fml/patches/minecraft/net/minecraft/client/IntegratedServerListenThread.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/IntegratedServerListenThread.java.patch
@@ -8,7 +8,7 @@
 +
  import java.io.IOException;
  import java.net.InetAddress;
- import net.minecraft.server.MinecraftServer;
+ import net.minecraft.entity.player.EntityPlayerMP;
 @@ -63,7 +65,7 @@
              }
          }
diff --git a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
index a20d91c60..d3531fcbf 100644
--- a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
@@ -1,30 +1,39 @@
 --- ../src-base/minecraft/net/minecraft/client/Minecraft.java
 +++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
-@@ -61,6 +61,12 @@
- import org.lwjgl.opengl.GLContext;
- import org.lwjgl.opengl.PixelFormat;
- import org.lwjgl.util.glu.GLU;
-+
-+import com.google.common.collect.MapDifference;
-+
+@@ -1,7 +1,14 @@
+ package net.minecraft.client;
+ 
 +import cpw.mods.fml.client.FMLClientHandler;
 +import cpw.mods.fml.common.FMLCommonHandler;
-+import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
++import cpw.mods.fml.common.registry.GameRegistry;
++import cpw.mods.fml.common.registry.ItemData;
 +import cpw.mods.fml.relauncher.ArgsWrapper;
 +import cpw.mods.fml.relauncher.FMLRelauncher;
++
+ import java.awt.BorderLayout;
+ import java.awt.Canvas;
+ import java.awt.Color;
+@@ -104,6 +111,8 @@
+ import org.lwjgl.opengl.PixelFormat;
+ import org.lwjgl.util.glu.GLU;
  
++import com.google.common.collect.MapDifference;
++
  @SideOnly(Side.CLIENT)
  public abstract class Minecraft implements Runnable, IPlayerUsage
-@@ -243,7 +249,7 @@
-         this.func_71357_I();
+ {
+@@ -286,6 +295,8 @@
          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);
-@@ -288,6 +294,8 @@
+@@ -330,6 +341,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);
  
@@ -33,15 +42,16 @@
          try
          {
              this.field_71430_V = new ThreadDownloadResources(this.field_71412_D, this);
-@@ -316,6 +324,7 @@
+@@ -358,6 +371,8 @@
          {
              this.func_71352_k();
          }
++
 +        FMLClientHandler.instance().onInitializationComplete();
      }
  
      private void func_71357_I() throws LWJGLException
-@@ -674,9 +683,11 @@
+@@ -716,9 +731,11 @@
  
              if (!this.field_71454_w)
              {
@@ -53,35 +63,40 @@
              }
  
              GL11.glFlush();
-@@ -1206,11 +1217,13 @@
+@@ -1248,10 +1265,14 @@
  
      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");
-@@ -1666,6 +1679,7 @@
+@@ -1708,6 +1729,8 @@
              this.field_71453_ak.func_74428_b();
          }
  
 +        FMLCommonHandler.instance().onPostClientTick();
++
          this.field_71424_I.func_76319_b();
          this.field_71423_H = func_71386_F();
      }
-@@ -1777,8 +1799,23 @@
+@@ -1746,8 +1769,27 @@
          }
  
          this.field_71413_E.func_77450_a(StatList.field_75936_f, 1);
++
 +        GameRegistry.initializeServerGate(2);
++
          this.field_71437_Z = new IntegratedServer(this, p_71371_1_, p_71371_2_, p_71371_3_);
          this.field_71437_Z.func_71256_s();
++
 +        MapDifference<Integer, ItemData> idDifferences = GameRegistry.gateWorldLoadingForValidation();
 +        if (idDifferences!=null)
 +        {
@@ -94,12 +109,13 @@
 +        }
 +
 +    }
++
 +    public void continueWorldLoading()
 +    {
          this.field_71455_al = true;
          this.field_71461_s.func_73720_a(StatCollector.func_74838_a("menu.loadingLevel"));
  
-@@ -1993,6 +2030,12 @@
+@@ -1962,6 +2004,12 @@
  
      public static void main(String[] p_main_0_)
      {