Merge branch 'repackage' of github.com:cpw/FML into repackage

Conflicts:
	common/cpw/mods/fml/common/registry/GameData.java

fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch

@@ -1,12 +1,13 @@
 --- ../src-base/minecraft/net/minecraft/client/Minecraft.java
 +++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
-@@ -1,7 +1,14 @@
+@@ -1,7 +1,15 @@
  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.asm.SideOnly;
++import cpw.mods.fml.common.registry.GameData;
 +import cpw.mods.fml.common.registry.GameRegistry;
 +import cpw.mods.fml.common.registry.ItemData;
 +import cpw.mods.fml.relauncher.ArgsWrapper;
@@ -15,7 +16,7 @@
  import java.awt.BorderLayout;
  import java.awt.Canvas;
  import java.awt.Color;
-@@ -120,6 +127,8 @@
+@@ -120,6 +128,8 @@
  import org.lwjgl.opengl.PixelFormat;
  import org.lwjgl.util.glu.GLU;
  
@@ -24,7 +25,7 @@
  @SideOnly(Side.CLIENT)
  public abstract class Minecraft implements Runnable, IPlayerUsage
  {
-@@ -302,6 +311,8 @@
+@@ -302,6 +312,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);
  
@@ -33,7 +34,7 @@
          if (this.field_71474_y.field_74363_ab != null)
          {
              StringTranslate.func_74808_a().func_74810_a(this.field_71474_y.field_74363_ab);
-@@ -346,6 +357,8 @@
+@@ -346,6 +358,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);
  
@@ -42,7 +43,7 @@
          try
          {
              this.field_71430_V = new ThreadDownloadResources(this.field_71412_D, this);
-@@ -374,6 +387,8 @@
+@@ -374,6 +388,8 @@
          {
              this.func_71352_k();
          }
@@ -51,7 +52,7 @@
      }
  
      private void func_71357_I() throws LWJGLException
-@@ -732,9 +747,11 @@
+@@ -732,9 +748,11 @@
  
              if (!this.field_71454_w)
              {
@@ -63,7 +64,7 @@
              }
  
              GL11.glFlush();
-@@ -1264,10 +1281,14 @@
+@@ -1264,10 +1282,14 @@
  
      public void func_71407_l()
      {
@@ -78,7 +79,7 @@
  
          this.field_71424_I.func_76320_a("stats");
          this.field_71413_E.func_77449_e();
-@@ -1724,6 +1745,8 @@
+@@ -1724,6 +1746,8 @@
              this.field_71453_ak.func_74428_b();
          }
  
@@ -87,24 +88,24 @@
          this.field_71424_I.func_76319_b();
          this.field_71423_H = func_71386_F();
      }
-@@ -1762,8 +1785,27 @@
+@@ -1762,8 +1786,27 @@
          }
  
          this.field_71413_E.func_77450_a(StatList.field_75936_f, 1);
 +
-+        GameRegistry.initializeServerGate(2);
++        GameData.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();
++        MapDifference<Integer, ItemData> idDifferences = GameData.gateWorldLoadingForValidation();
 +        if (idDifferences!=null)
 +        {
 +            FMLClientHandler.instance().warnIDMismatch(idDifferences, true);
 +        }
 +        else
 +        {
-+            GameRegistry.releaseGate(true);
++            GameData.releaseGate(true);
 +            continueWorldLoading();
 +        }
 +
@@ -115,7 +116,7 @@
          this.field_71455_al = true;
          this.field_71461_s.func_73720_a(StatCollector.func_74838_a("menu.loadingLevel"));
  
-@@ -1978,6 +2020,12 @@
+@@ -1978,6 +2021,12 @@
  
      public static void main(String[] p_main_0_)
      {

fml/patches/minecraft/net/minecraft/item/Item.java.patch

@@ -4,7 +4,7 @@
  
  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.GameData;
 +
  import java.util.List;
  import java.util.Random;
@@ -14,7 +14,7 @@
  
          field_77698_e[256 + p_i3659_1_] = this;
 +
-+        GameRegistry.newItemAdded(this);
++        GameData.newItemAdded(this);
      }
  
      public Item func_77665_c(int p_77665_1_)