Checking in pre3 work

fml/build.gradle

@@ -29,8 +29,8 @@ repositories {
 }
 
 minecraft {
-    version = '1.7.9'
+    version = '1.7.10-pre3'
-    mcpVersion = '9.04'
+    mcpVersion = '9.05'
     fmlDir = projectDir.getAbsolutePath();
     mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
     tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker'

fml/conf/mcp.cfg

@@ -38,8 +38,8 @@ DirNatives = %(DirJars)s/bin/natives
 Client     = %(DirJars)s/bin/minecraft.jar
 Server     = %(DirJars)s/minecraft_server.jar
 LWJGL      = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
-MD5Client  = 7a304554fdea879a799efe6eaedd8c95
+MD5Client  = 595007b790548806f66762507203b896
-MD5Server  = c48168f463e935262ea65b702f175153
+MD5Server  = a1de2db50b0d8bfac45be3e01e54bddf
 
 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@@ -129,7 +129,7 @@ LogFile           = %(DirLogs)s/mcp.log
 LogFileErr        = %(DirLogs)s/mcperr.log
 UpdateUrl         = http://mcp.ocean-labs.de/files/mcprolling_{version}/
 IgnoreUpdate      = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
-RGIndex           = 145000
+RGIndex           = 154000
 ParamIndex        = 45000
 
 [ASTYLE]

fml/conf/patches/minecraft_ff/net.minecraft.server.dedicated.DedicatedServer.java.patch

@@ -1,13 +0,0 @@
-diff -r -U 3 minecraft_server\net\minecraft\server\dedicated\DedicatedServer.java minecraft_server_patched\net\minecraft\server\dedicated\DedicatedServer.java
---- minecraft_server\net\minecraft\server\dedicated\DedicatedServer.java
-+++ minecraft_server_patched\net\minecraft\server\dedicated\DedicatedServer.java
-@@ -261,7 +261,7 @@
-       System.exit(0);
-    }
- 
--   protected void func_71190_q() {
-+   public void func_71190_q() {
-       super.func_71190_q();
-       this.func_71333_ah();
-    }
-

fml/conf/patches/minecraft_ff/net.minecraft.server.integrated.IntegratedServer.java.patch

@@ -1,12 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\server\integrated\IntegratedServer.java minecraft_patched\net\minecraft\server\integrated\IntegratedServer.java
---- minecraft\net\minecraft\server\integrated\IntegratedServer.java
-+++ minecraft_patched\net\minecraft\server\integrated\IntegratedServer.java
-@@ -95,7 +95,7 @@
-       return true;
-    }
- 
--   protected void func_71217_p() {
-+   public void func_71217_p() {
-       boolean var1 = this.field_71348_o;
-       this.field_71348_o = Minecraft.func_71410_x().func_147114_u() != null && Minecraft.func_71410_x().func_147113_T();
-       if(!var1 && this.field_71348_o) {

fml/conf/version.cfg

@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 9.04
+MCPVersion = 9.05
-ClientVersion = 1.7.9
+ClientVersion = 1.7.10-pre3
-ServerVersion = 1.7.9
+ServerVersion = 1.7.10-pre3

fml/jsons/1.7.10-pre3-dev.json

@@ -0,0 +1,195 @@
+{
+  "id": "@minecraft_version@-@project@@version@",
+  "time": "@timestamp@",
+  "releaseTime": "1960-01-01T00:00:00-0700",
+  "type": "release",
+  "minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
+  "libraries": [
+    {
+      "name": "net.minecraft:launchwrapper:1.9",
+      "comment" : "Important for FML, we add this"
+    },
+    {
+      "name": "org.ow2.asm:asm-debug-all:4.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2",
+      "comment" : "Important for FML, we add this"
+    },
+    {
+      "name": "org.scala-lang:scala-library:2.10.2",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2",
+      "comment" : "Important for FML, we add this"
+    },
+    {
+      "name": "org.scala-lang:scala-compiler:2.10.2",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2",
+      "comment" : "Important for FML, we add this"
+    },
+    {
+      "name": "net.sf.jopt-simple:jopt-simple:4.5",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "lzma:lzma:0.0.1"
+    },
+    {
+      "name": "com.mojang:realms:1.2"
+    },
+    {
+      "name": "org.apache.commons:commons-compress:1.8.1"
+    },
+    {
+      "name": "org.apache.httpcomponents:httpclient:4.3.3"
+    },
+    {
+      "name": "commons-logging:commons-logging:1.1.3"
+    },
+    {
+      "name": "org.apache.httpcomponents:httpcore:4.3.2"
+    },
+    {
+      "name": "java3d:vecmath:1.3.1"
+    },
+    {
+      "name": "net.sf.trove4j:trove4j:3.0.3"
+    },
+    {
+      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
+    },
+    {
+      "name": "net.sf.jopt-simple:jopt-simple:4.5"
+    },
+    {
+      "name": "com.paulscode:codecjorbis:20101023"
+    },
+    {
+      "name": "com.paulscode:codecwav:20101023"
+    },
+    {
+      "name": "com.paulscode:libraryjavasound:20101123"
+    },
+    {
+      "name": "com.paulscode:librarylwjglopenal:20100824"
+    },
+    {
+      "name": "com.paulscode:soundsystem:20120107"
+    },
+    {
+      "name": "io.netty:netty-all:4.0.10.Final"
+    },
+    {
+      "name": "com.google.guava:guava:15.0"
+    },
+    {
+      "name": "org.apache.commons:commons-lang3:3.1"
+    },
+    {
+      "name": "commons-io:commons-io:2.4"
+    },
+    {
+      "name": "commons-codec:commons-codec:1.9"
+    },
+    {
+      "name": "net.java.jinput:jinput:2.0.5"
+    },
+    {
+      "name": "net.java.jutils:jutils:1.0.0"
+    },
+    {
+      "name": "com.google.code.gson:gson:2.2.4"
+    },
+    {
+      "name": "com.mojang:authlib:1.5.13"
+    },
+    {
+      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
+    },
+    {
+      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "net.java.jinput:jinput-platform:2.0.5",
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "tv.twitch:twitch:5.16"
+    },
+    {
+      "name": "tv.twitch:twitch-platform:5.16",
+      "rules": [
+        {
+          "action": "allow"
+        },
+        {
+          "action": "disallow",
+          "os": {
+            "name": "linux"
+          }
+        }
+      ],
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows-${arch}",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "tv.twitch:twitch-external-platform:4.5",
+      "rules": [
+        {
+          "action": "allow",
+          "os": {
+            "name": "windows"
+          }
+        }
+      ],
+      "natives": {
+        "windows": "natives-windows-${arch}"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    }
+  ],
+  "mainClass": "net.minecraft.launchwrapper.Launch",
+  "minimumLauncherVersion": 13,
+  "assets": "1.7.4"
+}

fml/jsons/1.7.10-pre3.json

@@ -0,0 +1,165 @@
+{
+  "id": "1.7.10-pre3",
+  "time": "2014-05-14T17:29:23+02:00",
+  "releaseTime": "2014-05-14T17:29:23+02:00",
+  "type": "snapshot",
+  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}",
+  "minimumLauncherVersion": 13,
+  "assets": "1.7.4",
+  "libraries": [
+    {
+      "name": "com.mojang:realms:1.2.1"
+    },
+    {
+      "name": "org.apache.commons:commons-compress:1.8.1"
+    },
+    {
+      "name": "org.apache.httpcomponents:httpclient:4.3.3"
+    },
+    {
+      "name": "commons-logging:commons-logging:1.1.3"
+    },
+    {
+      "name": "org.apache.httpcomponents:httpcore:4.3.2"
+    },
+    {
+      "name": "java3d:vecmath:1.3.1"
+    },
+    {
+      "name": "net.sf.trove4j:trove4j:3.0.3"
+    },
+    {
+      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
+    },
+    {
+      "name": "net.sf.jopt-simple:jopt-simple:4.5"
+    },
+    {
+      "name": "com.paulscode:codecjorbis:20101023"
+    },
+    {
+      "name": "com.paulscode:codecwav:20101023"
+    },
+    {
+      "name": "com.paulscode:libraryjavasound:20101123"
+    },
+    {
+      "name": "com.paulscode:librarylwjglopenal:20100824"
+    },
+    {
+      "name": "com.paulscode:soundsystem:20120107"
+    },
+    {
+      "name": "io.netty:netty-all:4.0.10.Final"
+    },
+    {
+      "name": "com.google.guava:guava:15.0"
+    },
+    {
+      "name": "org.apache.commons:commons-lang3:3.1"
+    },
+    {
+      "name": "commons-io:commons-io:2.4"
+    },
+    {
+      "name": "commons-codec:commons-codec:1.9"
+    },
+    {
+      "name": "net.java.jinput:jinput:2.0.5"
+    },
+    {
+      "name": "net.java.jutils:jutils:1.0.0"
+    },
+    {
+      "name": "com.google.code.gson:gson:2.2.4"
+    },
+    {
+      "name": "com.mojang:authlib:1.5.13"
+    },
+    {
+      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
+    },
+    {
+      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "net.java.jinput:jinput-platform:2.0.5",
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "tv.twitch:twitch:5.16"
+    },
+    {
+      "name": "tv.twitch:twitch-platform:5.16",
+      "rules": [
+        {
+          "action": "allow"
+        },
+        {
+          "action": "disallow",
+          "os": {
+            "name": "linux"
+          }
+        }
+      ],
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows-${arch}",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "tv.twitch:twitch-external-platform:4.5",
+      "rules": [
+        {
+          "action": "allow",
+          "os": {
+            "name": "windows"
+          }
+        }
+      ],
+      "natives": {
+        "windows": "natives-windows-${arch}"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    }
+  ],
+  "mainClass": "net.minecraft.client.main.Main"
+}

fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch

@@ -14,9 +14,9 @@
  import java.util.Date;
 +import java.util.List;
  import java.util.Random;
- import java.util.concurrent.atomic.AtomicInteger;
  import net.minecraft.client.Minecraft;
-@@ -35,6 +38,9 @@
+ import net.minecraft.client.renderer.OpenGlHelper;
+@@ -29,6 +32,9 @@
  import org.lwjgl.opengl.GLContext;
  import org.lwjgl.util.glu.Project;
  
@@ -26,40 +26,22 @@
  @SideOnly(Side.CLIENT)
  public class GuiMainMenu extends GuiScreen implements GuiYesNoCallback
  {
-@@ -67,6 +73,8 @@
+@@ -190,7 +196,13 @@
-     private GuiButton field_130023_H;
-     private static final String __OBFID = "CL_00001154";
- 
-+    private GuiButton fmlModButton = null;
-+
-     public GuiMainMenu()
-     {
-         this.field_146972_A = field_96138_a;
-@@ -267,13 +275,22 @@
-     private void func_130022_h()
-     {
-         this.field_130023_H.field_146125_m = true;
-+        fmlModButton.field_146120_f = 98;
-+        fmlModButton.field_146128_h = this.field_146294_l / 2 + 2;
-     }
- 
-     private void func_73969_a(int p_73969_1_, int p_73969_2_)
      {
          this.field_146292_n.add(new GuiButton(1, this.field_146294_l / 2 - 100, p_73969_1_, I18n.func_135052_a("menu.singleplayer", new Object[0])));
          this.field_146292_n.add(new GuiButton(2, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 1, I18n.func_135052_a("menu.multiplayer", new Object[0])));
--        this.field_146292_n.add(this.field_130023_H = new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0])));
+-        this.field_146292_n.add(new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0])));
-+        //If Minecraft Realms is enabled, halve the size of both buttons and set them next to eachother.
++        GuiButton realmsButton = new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0]));
-+        fmlModButton = new GuiButton(6, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, "Mods");
++        GuiButton fmlModButton = new GuiButton(6, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, "Mods");
++        fmlModButton.field_146128_h = this.field_146294_l / 2 + 2;
++        realmsButton.field_146120_f = 98;
++        fmlModButton.field_146120_f = 98;
++        this.field_146292_n.add(realmsButton);
 +        this.field_146292_n.add(fmlModButton);
-+
-+        field_130023_H = new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online"));
-+        field_130023_H.field_146120_f = 98;
-+        field_130023_H.field_146128_h = this.field_146294_l / 2 - 100;
-+        this.field_146292_n.add(field_130023_H);
-         this.field_130023_H.field_146125_m = false;
      }
  
-@@ -322,6 +339,11 @@
+     private void func_73972_b(int p_73972_1_, int p_73972_2_)
+@@ -238,6 +250,11 @@
              this.field_146297_k.func_71400_g();
          }
  
@@ -71,7 +53,7 @@
          if (p_146284_1_.field_146127_k == 11)
          {
              this.field_146297_k.func_71371_a("Demo_World", "Demo_World", DemoWorldServer.field_73071_a);
-@@ -585,7 +607,15 @@
+@@ -481,7 +498,15 @@
              s = s + " Demo";
          }
  

fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch

@@ -7,7 +7,7 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.io.BufferedReader;
-@@ -46,6 +47,7 @@
+@@ -48,6 +49,7 @@
      private boolean field_71338_p;
      private WorldSettings.GameType field_71337_q;
      private boolean field_71335_s;
@@ -15,7 +15,7 @@
      private static final String __OBFID = "CL_00001784";
  
      public DedicatedServer(File p_i1508_1_)
-@@ -110,6 +112,8 @@
+@@ -112,6 +114,8 @@
              field_155771_h.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
          }
  
@@ -23,30 +23,30 @@
 +
          field_155771_h.info("Loading properties");
          this.field_71340_o = new PropertyManager(new File("server.properties"));
- 
+         this.field_154332_n = new ServerEula(new File("eula.txt"));
-@@ -192,6 +196,7 @@
+@@ -203,6 +207,7 @@
-         }
-         else
-         {
-+            FMLCommonHandler.instance().onServerStarted();
-             this.func_152361_a(new DedicatedPlayerList(this));
-             long j = System.nanoTime();
- 
-@@ -237,6 +242,7 @@
-             this.func_71191_d((this.func_71207_Z() + 8) / 16 * 16);
-             this.func_71191_d(MathHelper.func_76125_a(this.func_71207_Z(), 64, 256));
-             this.field_71340_o.func_73667_a("max-build-height", Integer.valueOf(this.func_71207_Z()));
-+            if (!FMLCommonHandler.instance().handleServerAboutToStart(this)) { return false; }
-             field_155771_h.info("Preparing level \"" + this.func_71270_I() + "\"");
-             this.func_71247_a(this.func_71270_I(), this.func_71270_I(), k, worldtype, s2);
-             long i1 = System.nanoTime() - j;
-@@ -257,7 +263,8 @@
-                 this.field_71339_n.func_72602_a();
              }
+             else
+             {
++                FMLCommonHandler.instance().onServerStarted();
+                 this.func_152361_a(new DedicatedPlayerList(this));
+                 long j = System.nanoTime();
  
--            return true;
+@@ -248,6 +253,7 @@
-+            allowPlayerLogins = true;
+                 this.func_71191_d((this.func_71207_Z() + 8) / 16 * 16);
-+            return FMLCommonHandler.instance().handleServerStarting(this);
+                 this.func_71191_d(MathHelper.func_76125_a(this.func_71207_Z(), 64, 256));
+                 this.field_71340_o.func_73667_a("max-build-height", Integer.valueOf(this.func_71207_Z()));
++                if (!FMLCommonHandler.instance().handleServerAboutToStart(this)) { return false; }
+                 field_155771_h.info("Preparing level \"" + this.func_71270_I() + "\"");
+                 this.func_71247_a(this.func_71270_I(), this.func_71270_I(), k, worldtype, s2);
+                 long i1 = System.nanoTime() - j;
+@@ -268,7 +274,8 @@
+                     this.field_71339_n.func_72602_a();
+                 }
+ 
+-                return true;
++                allowPlayerLogins = true;
++                return FMLCommonHandler.instance().handleServerStarting(this);
+             }
          }
      }
- 

fml/patches/minecraft/net/minecraft/util/ObjectIntIdentityMap.java.patch

@@ -1,37 +0,0 @@
---- ../src-base/minecraft/net/minecraft/util/ObjectIntIdentityMap.java
-+++ ../src-work/minecraft/net/minecraft/util/ObjectIntIdentityMap.java
-@@ -2,20 +2,21 @@
- 
- import com.google.common.base.Predicates;
- import com.google.common.collect.Iterators;
--import gnu.trove.map.hash.TIntIntHashMap;
- import java.util.ArrayList;
-+import java.util.IdentityHashMap;
- import java.util.Iterator;
- import java.util.List;
-+import java.util.Map;
- 
- public class ObjectIntIdentityMap implements IObjectIntIterable
- {
--    protected TIntIntHashMap field_148749_a = new TIntIntHashMap(256, 0.5F, -1, -1);
-+    protected Map<Object, Integer> field_148749_a = new IdentityHashMap<Object, Integer>(512);
-     protected List field_148748_b = new ArrayList();
-     private static final String __OBFID = "CL_00001203";
- 
-     public void func_148746_a(Object p_148746_1_, int p_148746_2_)
-     {
--        this.field_148749_a.put(System.identityHashCode(p_148746_1_), p_148746_2_);
-+        this.field_148749_a.put(p_148746_1_, p_148746_2_);
- 
-         while (this.field_148748_b.size() <= p_148746_2_)
-         {
-@@ -27,7 +28,8 @@
- 
-     public int func_148747_b(Object p_148747_1_)
-     {
--        return this.field_148749_a.get(System.identityHashCode(p_148747_1_));
-+        Integer ret = this.field_148749_a.get(p_148747_1_);
-+        return ret != null ? ret : -1;
-     }
- 
-     public Object func_148745_a(int p_148745_1_)

fml/patches/minecraft/net/minecraft/world/World.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/world/World.java
 +++ ../src-work/minecraft/net/minecraft/world/World.java
-@@ -1799,14 +1799,14 @@
+@@ -1800,14 +1800,14 @@
              }
          }
  
@@ -17,7 +17,16 @@
          this.field_72984_F.func_76318_c("pendingBlockEntities");
  
          if (!this.field_147484_a.isEmpty())
-@@ -3597,7 +3597,7 @@
+@@ -3069,7 +3069,7 @@
+         return entity1;
+     }
+ 
+-    public abstract Entity func_73045_a(int var1);
++    public abstract Entity func_73045_a(int p_73045_1_);
+ 
+     @SideOnly(Side.CLIENT)
+     public List func_72910_y()
+@@ -3598,7 +3598,7 @@
      @SideOnly(Side.CLIENT)
      public double func_72919_O()
      {

fml/src/main/java/cpw/mods/fml/common/Loader.java

@@ -177,7 +177,7 @@ public class Loader
     private Loader()
     {
         modClassLoader = new ModClassLoader(getClass().getClassLoader());
-        String actualMCVersion = "1.7.9";
+        String actualMCVersion = "1.7.10-pre3";
         if (!mccversion.equals(actualMCVersion))
         {
             FMLLog.severe("This version of FML is built for Minecraft %s, we have detected Minecraft %s in your minecraft jar file", mccversion, actualMCVersion);