Update for MC 1.6.4

Make final transformers actually work on methods as well.
Format the log messages through MessageFormat. Thanks CovertJaguar for the pointer. Closes #282
2013-09-20 16:25:12 -04:00 · 2013-09-19 12:59:12 -07:00 · 2013-09-19 08:23:56 -04:00 · 2013-09-18 15:21:56 -07:00 · 2013-09-18 18:01:04 -04:00 · 2013-09-18 17:02:41 -04:00
415 changed files with 53671 additions and 41171 deletions
@@ -1,7 +1,10 @@
 * text eol=lf
 *.bat text eol=crlf
-*.patch text
+*.patch text eol=lf
 *.png binary
 *.exe binary
 *.dll binary
-*.zip binary
+*.zip binary
+*.pyd binary
+*.cfg text eol=lf
+*.py text eol=lf
@@ -8,3 +8,13 @@
 fmlbranding.properties
 /fernflower.zip
 /commands.py.bck
+/mcp*.zip
+/mcp
+/eclipse
+/deobfuscation_data*.zip
+/binpatch
+/mcp_data/
+/map_client.txt
+/*.lzma
+**/*.lzma
+/installer_base.jar
@@ -0,0 +1,69 @@
+{
+  "id": "FML152",
+  "time": "2013-03-20T12:00:00-04:00",
+  "releaseTime": "2013-03-20T12:00:00-04:00",
+  "type": "release",
+  "minecraftArguments": "${auth_player_name} ${auth_session} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
+    "libraries": [
+    {
+      "name": "cpw.mods:fml:5.2"
+    },
+    {
+      "name": "net.minecraft:launchwrapper:1.3"
+    },
+    {
+      "name": "net.sf.jopt-simple:jopt-simple:4.5"
+    },
+    {
+      "name": "argo:argo:2.25_fixed"
+    },
+    {
+      "name": "org.ow2.asm:asm-all:4.1"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0"
+    },
+    {
+      "name": "net.java.jinput:jinput:2.0.5"
+    },
+    {
+      "name": "org.bouncycastle:bcprov-jdk15on:1.47"
+    },
+    {
+      "name": "com.google.guava:guava:14.0"
+    },
+    {
+      "name": "net.java.jutils:jutils:1.0.0"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
+      "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/"
+        ]
+      }
+    }
+  ],
+  "mainClass": "net.minecraft.launchwrapper.Launch"
+}
@@ -1,7 +1,7 @@
-This minecraft mod, Forge Mod Loader, including all parts herein, is licensed
-under the GNU LGPL v2.1 or later.
+This minecraft mod, Forge Mod Loader, including all parts herein except as noted below,
+is licensed under the GNU LGPL v2.1 or later.

-Homepage: https://github.com/cpw/FML
+Homepage: https://github.com/MinecraftForge/FML

 This software includes portions from the Apache Maven project at
 http://maven.apache.org/ specifically the ComparableVersion.java code. It is
@@ -9,6 +9,30 @@ included based on guidelines at
 http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html
 with notices intact. The only change is a non-functional change of package name.

+This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating
+binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/
+authored by genman, heikok, pivot.
+The only changes are to replace some Trove collection types with standard Java collections, and repackaged.
+
+
+=== MCP Data ===
+This software includes data from the Minecraft Coder Pack (MCP), with kind permission
+from them. The license to MCP data is not transitive - distribution of this data by
+third parties requires independent licensing from the MCP team. This data is not
+redistributable without permission from the MCP team.
+
+=== Sharing ===
+I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of
+the minecraft modding community. All contributions to these parts should be licensed under the same additional grant.
+
+-- Runtime patcher --
+License is granted to redistribute the runtime patcher code (common/cpw/mods/fml/patcher and subdirectories) under
+any alternative open source license as classified by the OSI (http://opensource.org/licenses)
+
+-- ASM transformers --
+License is granted to redistribute the ASM transformer code (common/cpw/mods/fml/common/asm/ and subdirectories)
+under any alternative open source license as classified by the OSI (http://opensource.org/licenses)
+
 ========

                  GNU LESSER GENERAL PUBLIC LICENSE
@@ -9,27 +9,14 @@
     ====================================================================== -->
 <project name="FML" default="jenkinsbuild">
  <description>The Forge Mod Loader</description>
-  <macrodef name="side">
-    <attribute name="prop" />
-    <attribute name="src" />
-    <attribute name="side" />
-    <sequential>
-      <property name="@{prop}" value="${@{side}.@{src}}" />
-      <condition property="is.client">
-        <equals arg1="@{side}" arg2="client" />
-      </condition>
-      <condition property="is.server">
-        <equals arg1="@{side}" arg2="server" />
-      </condition>
-    </sequential>
-  </macrodef>
  <target name="writeversion" depends="buildenvsetup">
    <exec executable="${python.exe}" dir="${basedir}" failonerror="true">
      <arg value="${basedir}/getversion.py" />
      <arg value="${mcp.home}" />
    </exec>
    <propertyfile file="fmlversion.properties">
-      <entry key="fmlbuild.build.number" type="int" value="${version.build}"/>
+      <entry key="fmlbuild.build.number" type="int" value="${version.build}" />
+      <entry key="fmlbuild.deobfuscation.hash" type="string" value="${deobf.checksum}" />
    </propertyfile>
  </target>

@@ -38,21 +25,27 @@
      <format pattern="yyMMddHHmmss" property="timestamp" />
    </tstamp>
    <property environment="env" />
-    <property file="fmlbuild.properties" />
    <property name="modname" value="fml" />
-    <condition property="dev.home" value="${env.WORKSPACE}" else="${default.dev.home}">
+    <condition property="mcp.home" value="${env.WORKSPACE}/mcp" else="${basedir}/mcp">
      <isset property="env.WORKSPACE" />
    </condition>
-    <condition property="mcp.home" value="${env.WORKSPACE}/mcpworkspace" else="${default.mcp.home}">
-      <isset property="env.WORKSPACE" />
-    </condition>
-    <condition property="python.exe" value="${mcp.home}/runtime/bin/python/python_mcp" else="python">
+    <property name="fml.python.dir" location="${basedir}/python" />
+    <property name="fml.lzma.dir" location="${basedir}/lzmabin" />
+    <condition property="python.exe" value="${fml.python.dir}/python_fml" else="python">
      <os family="Windows" />
    </condition>
+    <condition property="lzma.exe" value="${fml.lzma.dir}/xz.exe" else="xz">
+      <os family="Windows" />
+    </condition>
+    <condition property="mcp.exists">
+      <available file="${mcp.home}/runtime/commands.py" />
+    </condition>
+    <condition property="signature.exists">
+      <available file="${env.JENKINS_HOME}/fmlsigned.properties" />
+    </condition>
    <property name="mcp.obfoutput" location="${mcp.home}/reobf" />
    <property name="client.mcp.obfoutput" location="${mcp.obfoutput}/minecraft" />
    <property name="mcp.srcdir" location="${mcp.home}/src" />
-    <property name="common.mcp.srcdir" location="${mcp.srcdir}/common" />
    <property name="client.mcp.srcdir" location="${mcp.srcdir}/minecraft" />
    <property name="clean.mcp.srcdir" location="${mcp.home}/src-base" />
    <property name="patch.mcp.srcdir" location="${mcp.home}/src-work" />
@@ -65,6 +58,7 @@
    <condition property="version.build" value="${env.BUILD_NUMBER}" else="1">
      <isset property="env.BUILD_NUMBER" />
    </condition>
+    <available file="eclipse" property="eclipse.exists" />
  </target>

  <target name="makeversion" depends="buildenvsetup">
@@ -74,18 +68,26 @@
    <property name="version.major" value="${fmlbuild.major.number}" />
    <property name="version.minor" value="${fmlbuild.minor.number}" />
    <property name="version.rev" value="${fmlbuild.revision.number}" />
+    <property name="version.minecraft" value="${fmlbuild.mcversion}" />
+    <property name="version.branch" value="${fmlbuild.branch}" />
    <property name="version" value="${version.major}.${version.minor}.${version.rev}.${version.build}" />
  </target>

-  <target name="clean" depends="buildenvsetup">
+  <target name="makeclean" depends="buildenvsetup" if="mcp.exists">
    <exec executable="${python.exe}" dir="${mcp.home}">
      <arg value="${mcp.home}/runtime/cleanup.py" />
      <arg value="-f" />
    </exec>
+  </target>
+
+  <target name="clean" depends="buildenvsetup,makeclean" if="mcp.exists">
    <exec executable="${python.exe}" dir="${mcp.home}">
-      <arg value="${mcp.home}/runtime/decompile.py" />
-      <arg value="-d" />
-      <arg value="-n" />
+      <arg value="${basedir}/decompile.py" />
+      <arg value="--mcp-dir" />
+      <arg value="${mcp.home}" />
+      <arg value="--fml-dir" />
+      <arg value="${basedir}" />
+      <arg value="--gen-conf" />
    </exec>
  </target>

@@ -93,20 +95,20 @@
    <exec executable="${python.exe}" dir="${mcp.home}" failonerror="true">
      <arg value="${mcp.home}/runtime/reobfuscate.py" />
    </exec>
-  	<fail message="Reobfuscation failed">
-  		<condition>
-  	        <not>
-  	        	<and>
-  	        	  <available file="${mcp.home}/temp/client.md5"/>
-                  <available file="${mcp.home}/temp/client_reobf.md5"/>
-  	        	</and>
-  	        </not>
-  		</condition>
-  	</fail>
+    <fail message="Reobfuscation failed">
+      <condition>
+        <not>
+          <and>
+            <available file="${mcp.home}/temp/client.md5" />
+            <available file="${mcp.home}/temp/client_reobf.md5" />
+          </and>
+        </not>
+      </condition>
+    </fail>
    <exec executable="${python.exe}" dir="${mcp.home}">
-      <arg value="${basedir}/generatechangedfilelist.py"/>
-      <arg value="${mcp.home}"/>
-      <arg value="${basedir}/difflist.txt"/>
+      <arg value="${basedir}/generatechangedfilelist.py" />
+      <arg value="${mcp.home}" />
+      <arg value="${basedir}/difflist.txt" />
    </exec>
  </target>

@@ -114,13 +116,13 @@
    <exec executable="${python.exe}" dir="${mcp.home}" failonerror="true">
      <arg value="${mcp.home}/runtime/recompile.py" />
    </exec>
-  	<fail message="Compilation failed">
-  		<condition>
-  	        <not>
-        	  <available file="${mcp.home}/bin/minecraft/net/minecraft/client/Minecraft.class"/>
-  	        </not>
-  		</condition>
-  	</fail>
+    <fail message="Compilation failed">
+      <condition>
+        <not>
+          <available file="${mcp.home}/bin/minecraft/net/minecraft/client/Minecraft.class" />
+        </not>
+      </condition>
+    </fail>
  </target>

  <target name="merge-client" depends="buildenvsetup">
@@ -129,25 +131,49 @@
    </copy>
  </target>

-  <target name="merge-common">
-    <copy todir="${common.mcp.srcdir}" overwrite="true" verbose="true">
+  <target name="merge-common" depends="buildenvsetup,build-deobf-data">
+    <copy todir="${client.mcp.srcdir}" overwrite="true" verbose="true">
      <fileset dir="${common.src.dir}" includes="**/*.java" />
+      <fileset dir="${basedir}" includes="deobfuscation_data-${version.minecraft}.lzma"/>
    </copy>
  </target>

  <target name="merge-source" depends="buildenvsetup,merge-client,merge-common" />

-  <target name="build-client" depends="buildenvsetup,merge-client,merge-common,reobfuscate,makeversion"/>
+  <target name="build-universal" depends="buildenvsetup,merge-client,merge-common,reobfuscate,makeversion,makebinpatches">
+    <condition property="universal.jarname" value="${modname}-universal-${version.minecraft}-${version}" else="${modname}-universal-${version.minecraft}-${version}-${version.branch}">
+      <equals arg1="${version.branch}" arg2="master" />
+    </condition>

-  <target name="extract-built-jar">
-    <side prop="output" src="mcp.obfoutput" side="${side}" />
-    <property name="jarname" value="${modname}-${side}-${version}" />
    <mkdir dir="${basedir}/target" />
-    <zip destfile="${basedir}/target/${jarname}.zip">
-      <fileset dir="${output}" includes="**/*.class" />
-      <zipfileset dir="${basedir}" includes="fmlversion.properties"/>
+    <path id="server.classpath">
+      <pathelement path="${mcp.home}/jars/libraries/net/minecraft/launchwrapper/1.3/launchwrapper-1.3.jar"/>
+      <pathelement path="${mcp.home}/jars/libraries/org/ow2/asm/asm-all/4.1/asm-all-4.1.jar"/>
+      <pathelement path="${mcp.home}/jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
+      <pathelement path="${mcp.home}/jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar"/>
+      <pathelement path="${mcp.home}/jars/libraries/org/scala-lang/scala-library/2.10.2/scala-library-2.10.2.jar"/>
+      <pathelement path="${mcp.home}/jars/libraries/org/scala-lang/scala-compiler/2.10.2/scala-compiler-2.10.2.jar"/>
+      <pathelement path="${mcp.home}/jars/minecraft_server.${version.minecraft}.jar"/>
+    </path>
+    <manifestclasspath property="server.jar.classpath" jarfile="${mcp.home}/jars/minecraft_server.jar">
+      <classpath refid="server.classpath" />
+    </manifestclasspath>
+    <jar destfile="${basedir}/target/${universal.jarname}.jar" duplicate="preserve">
+      <manifest>
+        <attribute name="Main-Class" value="cpw.mods.fml.relauncher.ServerLaunchWrapper" />
+        <attribute name="Class-Path" value="${server.jar.classpath}" />
+      </manifest>
+      <fileset dir="${client.mcp.obfoutput}" includes="**/*.class" excludes="*.class,net/minecraft/**/*.class" />
+    </jar>
+    <antcall target="signjar" />
+    <zip update="true" destfile="${basedir}/target/${universal.jarname}.jar">
+      <fileset dir="${basedir}" includes="binpatches.pack.lzma,deobfuscation_data-${version.minecraft}.lzma"/>
+      <fileset dir="${client.mcp.obfoutput}" includes="*.class" />
+      <zipfileset dir="${basedir}" includes="fmlversion.properties" />
      <zipfileset dir="${basedir}" includes="LICENSE-fml.txt" />
-      <zipfileset dir="${basedir}" includes="install/CREDITS-fml.txt" fullpath="CREDITS-fml.txt"/>
+      <zipfileset dir="${common.src.dir}" includes="mcpmod.info" />
+      <zipfileset dir="${client.src.dir}" includes="mcplogo.png" />
+      <zipfileset dir="${basedir}" includes="install/CREDITS-fml.txt" fullpath="CREDITS-fml.txt" />
      <zipfileset dir="${common.src.dir}" includes="*.cfg" />
      <mappedresources>
        <concat>
@@ -167,43 +193,39 @@
    </zip>
  </target>

-  <target name="build-universal" depends="build-client">
-    <property name="universal.jarname" value="${modname}-universal-${version}" />
-    <mkdir dir="${basedir}/target" />
-    <jar destfile="${basedir}/target/${universal.jarname}.zip" duplicate="preserve">
-      <manifest>
-        <attribute name="Main-Class" value="net.minecraft.server.MinecraftServer"/>
-        <attribute name="Class-Path" value="minecraft_server.jar"/>
-      </manifest>
-      <fileset dir="${client.mcp.obfoutput}" includes="**/*.class" />
-      <zipfileset dir="${basedir}" includes="fmlversion.properties"/>
-      <zipfileset dir="${basedir}" includes="LICENSE-fml.txt" />
-        <zipfileset dir="${common.src.dir}" includes="mcpmod.info" />
-        <zipfileset dir="${client.src.dir}" includes="mcp.png" />
-      <zipfileset dir="${basedir}" includes="install/CREDITS-fml.txt" fullpath="CREDITS-fml.txt"/>
-      <zipfileset dir="${common.src.dir}" includes="*.cfg" />
-      <mappedresources>
-        <concat>
-          <fileset dir="${basedir}/install" includes="README.txt" />
-          <filterchain>
-            <replacetokens>
-              <token key="MAJOR" value="${version.major}" />
-              <token key="MINOR" value="${version.minor}" />
-              <token key="REV" value="${version.rev}" />
-              <token key="BUILD" value="${version.build}" />
-              <token key="MCVERSION" value="${version.minecraft}" />
-            </replacetokens>
-          </filterchain>
-        </concat>
-        <mergemapper to="README-fml.txt" />
-      </mappedresources>
+  <target name="build-installer" depends="build-universal">
+    <condition property="version.fullname" value="${version.minecraft}-${version}" else="${version.minecraft}-${version}-${version.branch}">
+      <equals arg1="${version.branch}" arg2="master" />
+    </condition>
+    <tstamp>
+      <format property="current.time" pattern="yyyy-MM-dd'T'HH:mm:ssZ" />
+    </tstamp>
+
+    <delete file="${basedir}/installer_base.jar" />
+    <delete file="${basedir}/install_profile.json" />
+    <get src="http://files.minecraftforge.net/installer/forge-installer-1.3-shrunk.jar" dest="${basedir}/installer_base.jar" />
+    <copy file="${basedir}/jsons/${version.minecraft}-rel.json" tofile="${basedir}/install_profile.json" />
+    <copy file="${basedir}/installer_base.jar" tofile="${basedir}/target/${modname}-installer-${version.fullname}.jar" />
+    <replace file="${basedir}/install_profile.json">
+      <replaceFilter token="@version@" value="${version}" />
+      <replaceFilter token="@minecraft_version@" value="${version.minecraft}" />
+      <replaceFilter token="@timestamp@" value="${current.time}" />
+      <replaceFilter token="@universal_jar@" value="${modname}-universal-${version.fullname}.jar" />
+    </replace>
+    <jar destfile="${basedir}/target/${modname}-installer-${version.fullname}.jar" update="true">
+      <zipfileset dir="${basedir}" includes="install_profile.json" />
+      <zipfileset dir="${basedir}/jsons" includes="big_logo.png" />
+      <zipfileset dir="${basedir}/target" includes="${modname}-universal-${version.fullname}.jar" />
    </jar>
+    <delete file="${basedir}/install_profile.json" />
  </target>

  <target name="build-source-pack" depends="makeversion">
-    <property name="srcpack.jarname" value="${modname}-src-${version}" />
+    <property name="srcpack.jarname" value="${modname}-src-${version.minecraft}-${version}-${version.branch}" />
    <zip destfile="${basedir}/target/${srcpack.jarname}.zip">
-      <zipfileset dir="${basedir}" includes="LICENSE-fml.txt,difflist.txt,commands.patch,mcp_merge.cfg" prefix="fml" />
+      <zipfileset dir="${basedir}" includes="LICENSE-fml.txt,difflist.txt,commands.patch,mcp_merge.cfg,mc_versions.cfg" prefix="fml" />
+      <zipfileset dir="${basedir}/jsons" includes="${version.minecraft}-dev.json" fullpath="fml/fml.json"/>
+      <zipfileset dir="${basedir}" includes="deobfuscation_data-${version.minecraft}.lzma" prefix="fml/common" />
      <zipfileset dir="${common.src.dir}" includes="**/*.java" prefix="fml/common" />
      <zipfileset dir="${client.src.dir}" includes="**/*.java" prefix="fml/client" />
      <zipfileset dir="${client.src.dir}" includes="mcp.png" prefix="fml/client" />
@@ -212,6 +234,7 @@
      <zipfileset dir="${common.src.dir}" includes="mcpmod.info" prefix="fml/common" />
      <zipfileset dir="${patch.src.dir}" includes="**/*.patch" prefix="fml/patches" />
      <zipfileset dir="${fml.conf.dir}" prefix="fml/conf" />
+      <zipfileset dir="${fml.python.dir}" prefix="fml/python" />
      <mappedresources>
        <concat>
          <fileset dir="${basedir}/install" includes="README.txt" />
@@ -231,9 +254,29 @@
    </zip>
  </target>

-  <target name="build" depends="buildenvsetup,merge-client,merge-common,build-client,build-universal,build-source-pack" />
+  <target name="build-deobf-data" depends="makeversion">
+    <mkdir dir="build-tmp-deobf" />
+    <copy todir="build-tmp-deobf">
+      <mappedresources>
+        <fileset dir="${mcp.home}/conf" includes="packaged.srg" />
+        <globmapper from="packaged.srg" to="deobfuscation_data-${version.minecraft}" />
+      </mappedresources>
+    </copy>
+    <exec executable="${lzma.exe}">
+      <arg line="--format=lzma"/>
+      <arg line="build-tmp-deobf/deobfuscation_data-${version.minecraft}"/>
+      <arg line="-v"/>
+    </exec>
+    <copy todir="${basedir}">
+      <fileset dir="build-tmp-deobf" includes="*.lzma" />
+    </copy>
+    <antcall target="writeversion" />
+    <delete dir="build-tmp-deobf" />
+  </target>

-  <target name="jenkinsbuild" depends="buildenvsetup,jenkinsfmldecompile,patch,build"/>
+  <target name="build" depends="buildenvsetup,build-deobf-data,merge-client,merge-common,build-universal,build-installer,build-source-pack" />
+
+  <target name="jenkinsbuild" depends="buildenvsetup,jenkinsfmldecompile,patch,build" />

  <target name="patch" depends="buildenvsetup">
    <exec executable="${python.exe}" dir="${basedir}">
@@ -252,120 +295,179 @@
    </condition>
    <fail if="do.not.continue">You have decided not to continue. This script will stop now.</fail>
    <echo>Preparing the MCP environment at ${mcp.home}</echo>
-  	<antcall target="fmldecompile"/>
+    <antcall target="fmldecompile" />
    <echo>Moving old patched sources at ${patch.mcp.srcdir} out of the way</echo>
    <move todir="${mcp.home}/src-work${timestamp}" failonerror="false" verbose="true">
-      <fileset dir="${patch.mcp.srcdir}"/>
+      <fileset dir="${patch.mcp.srcdir}" />
    </move>
    <echo>Deleting old patch references at ${clean.mcp.srcdir}</echo>
-    <delete dir="${clean.mcp.srcdir}" failonerror="false"/>
+    <delete dir="${clean.mcp.srcdir}" failonerror="false" />
    <echo>Creating new patch references at ${clean.mcp.srcdir}</echo>
    <copy todir="${clean.mcp.srcdir}">
-      <fileset dir="${mcp.srcdir}"/>
+      <fileset dir="${mcp.srcdir}" />
    </copy>
-    <antcall target="cleanargo"/>
-    <antcall target="patch"/>
+    <antcall target="cleanargo" />
+    <antcall target="patch" />
    <echo>Creating clean patched references at ${patch.mcp.srcdir}</echo>
    <copy todir="${patch.mcp.srcdir}">
-      <fileset dir="${mcp.srcdir}"/>
+      <fileset dir="${mcp.srcdir}" />
    </copy>
-    <antcall target="writeversion"/>
-    <echo>Setup complete! You should now be able to open ${basedir}/eclipse as a workspace in eclipse and import/refresh the FML-Server and FML-Client projects</echo>
+    <antcall target="writeversion" />
+    <delete>
+      <fileset dir="${basedir}" includes="deobfuscation_data-*.lzma" />
+    </delete>
+    <antcall target="build-deobf-data" />
+    <copy todir="${common.src.dir}">
+      <fileset dir="${basedir}" includes="deobfuscation_data-*.lzma" />
+    </copy>
+    <antcall target="makeeclipse" />
+    <echo>Setup complete! You should now be able to open ${basedir}/eclipse as a workspace in eclipse and import/refresh the FML project</echo>
  </target>

-  <target name="fmldecompile" depends="buildenvsetup">
-    <exec executable="${python.exe}" dir="${mcp.home}">
-      <arg value="${mcp.home}/runtime/cleanup.py" />
-      <arg value="-f" />
-    </exec>
+  <target name="fmldecompile" depends="buildenvsetup,makeclean">
    <exec executable="${python.exe}" dir="${basedir}">
      <arg value="${basedir}/decompile.py" />
+      <arg value="--mcp-dir" />
      <arg value="${mcp.home}" />
+      <arg value="--fml-dir" />
      <arg value="${basedir}" />
+      <arg value="--gen-conf" />
    </exec>
  </target>

-  <target name="jenkinsfmldecompile" depends="buildenvsetup">
-    <exec executable="${python.exe}" dir="${mcp.home}">
-      <arg value="${mcp.home}/runtime/cleanup.py" />
-      <arg value="-f" />
-    </exec>
+  <target name="jenkinsfmldecompile" depends="buildenvsetup,makeclean">
    <exec executable="${python.exe}" dir="${basedir}">
      <arg value="${basedir}/decompile.py" />
+      <arg value="--mcp-dir" />
      <arg value="${mcp.home}" />
+      <arg value="--fml-dir" />
      <arg value="${basedir}" />
-      <arg value="-no_gen_conf" />
    </exec>
  </target>

  <target name="repatch" depends="buildenvsetup,checkpatches">
    <echo>Moving old patched sources at ${mcp.home}/src-work out of the way</echo>
    <move todir="${mcp.home}/src-work${timestamp}" failonerror="false" verbose="true">
-      <fileset dir="${patch.mcp.srcdir}"/>
+      <fileset dir="${patch.mcp.srcdir}" />
    </move>
-    <delete dir="${mcp.srcdir}"/>
+    <delete dir="${mcp.srcdir}" />
    <copy todir="${mcp.srcdir}">
-      <fileset dir="${clean.mcp.srcdir}"/>
+      <fileset dir="${clean.mcp.srcdir}" />
    </copy>

-    <antcall target="cleanargo"/>
+    <antcall target="cleanargo" />

-    <antcall target="patch"/>
+    <antcall target="patch" />
    <copy todir="${patch.mcp.srcdir}">
-      <fileset dir="${mcp.srcdir}"/>
+      <fileset dir="${mcp.srcdir}" />
    </copy>
  </target>

  <target name="repatchclean" depends="buildenvsetup">
-    <delete dir="${mcp.srcdir}"/>
+    <delete dir="${mcp.srcdir}" />
    <copy todir="${mcp.srcdir}">
-      <fileset dir="${clean.mcp.srcdir}"/>
+      <fileset dir="${clean.mcp.srcdir}" />
    </copy>

-    <antcall target="cleanargo"/>
+    <antcall target="cleanargo" />

-    <antcall target="patch"/>
+    <antcall target="patch" />
  </target>

  <target name="cleanargo" depends="buildenvsetup">
-    <delete dir="${client.mcp.srcdir}/argo"/>
+    <delete dir="${client.mcp.srcdir}/argo" />
+    <delete dir="${client.mcp.srcdir}/org" />
  </target>

  <target name="checkpatches" depends="buildenvsetup">
    <uptodate property="checkUptodate.uptodate">
      <srcfiles dir="${patch.mcp.srcdir}" includes="**/*.java">
-      	<present targetdir="${patch.src.dir}">
-      		<globmapper from="*.java" to="*.java.patch"/>
-      	</present>
+        <present targetdir="${patch.src.dir}">
+          <globmapper from="*.java" to="*.java.patch" />
+        </present>
      </srcfiles>
-      <globmapper from="*.java" to="${patch.src.dir}/*.java.patch"/>
+      <globmapper from="*.java" to="${patch.src.dir}/*.java.patch" />
    </uptodate>
-  	<fail unless="checkUptodate.uptodate">
-  		A patch is out of date. Update your patches!
-  	</fail>
+    <fail unless="checkUptodate.uptodate">
+        A patch is out of date. Update your patches!
+    </fail>
  </target>

  <target name="updatepatches" depends="buildenvsetup">
    <exec executable="${python.exe}" dir="${basedir}">
      <arg value="${basedir}/update_patches.py" />
-      <arg value="${mcp.home}"/>
-      <arg value="${basedir}"/>
+      <arg value="${mcp.home}" />
+      <arg value="${basedir}" />
    </exec>
  </target>

+  <target name="makeeclipse" depends="buildenvsetup" unless="eclipse.exists">
+    <echo>
+      Extracting fresh eclipse workspace to ${basedir}/eclipse
+    </echo>
+    <unzip src="${basedir}/eclipse-workspace-dev.zip" dest="${basedir}" />
+  </target>
+
  <target name="makerenamedsource" depends="buildenvsetup,repatch,merge-client,merge-common,reobfuscate">
    <copy todir="${tmp.mcp.srcdir}">
-      <fileset dir="${mcp.srcdir}"/>
+      <fileset dir="${mcp.srcdir}" />
    </copy>
    <exec executable="${python.exe}" dir="${mcp.home}">
      <arg value="${mcp.home}/runtime/updatenames.py" />
      <arg value="-f" />
    </exec>
    <copy todir="${renamed.mcp.srcdir}">
-      <fileset dir="${mcp.srcdir}"/>
+      <fileset dir="${mcp.srcdir}" />
    </copy>
    <move todir="${mcp.srcdir}">
-      <fileset dir="${tmp.mcp.srcdir}"/>
+      <fileset dir="${tmp.mcp.srcdir}" />
    </move>
  </target>
+  <target name="signjar" depends="buildenvsetup,makeversion" if="signature.exists">
+    <condition property="universal.jarname" value="${modname}-universal-${version.minecraft}-${version}" else="${modname}-universal-${version.minecraft}-${version}-${version.branch}">
+      <equals arg1="${version.branch}" arg2="master" />
+    </condition>
+    <property file="${env.JENKINS_HOME}/fmlsigned.properties" prefix="sign" />
+    <echo>${env.JENKINS_HOME} ${universal.jarname} ${sign.KEYPASS}</echo>
+    <signjar alias="FML" jar="${basedir}/target/${universal.jarname}.zip" keypass="${sign.KEYPASS}" keystore="${env.JENKINS_HOME}/${sign.KEYSTORE}" storepass="${sign.STOREPASS}" verbose="true" />
+  </target>
+  <target name="makebinpatches" depends="buildenvsetup,makeversion">
+    <path id="diffset.libs">
+      <pathelement path="${mcp.home}/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar"/>
+      <pathelement path="${mcp.home}/jars/libraries/org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1.jar"/>
+      <pathelement path="${mcp.home}/jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
+      <pathelement path="${mcp.obfoutput}/minecraft"/>
+    </path>
+    <delete dir="${basedir}/binpatch" verbose="true"/>
+    <java classname="cpw.mods.fml.common.patcher.GenDiffSet" classpathref="diffset.libs">
+      <arg path="${mcp.home}/jars/versions/${version.minecraft}/${version.minecraft}.jar.backup"/>
+      <arg path="${mcp.obfoutput}/minecraft"/>
+      <arg path="${basedir}/deobfuscation_data-${version.minecraft}.lzma"/>
+      <arg path="${basedir}/binpatch/client"/>
+      <arg value="false"/>
+    </java>
+    <java classname="cpw.mods.fml.common.patcher.GenDiffSet"  classpathref="diffset.libs">
+      <arg path="${mcp.home}/jars/minecraft_server.${version.minecraft}.jar.backup"/>
+      <arg path="${mcp.obfoutput}/minecraft"/>
+      <arg path="${basedir}/deobfuscation_data-${version.minecraft}.lzma"/>
+      <arg path="${basedir}/binpatch/server"/>
+      <arg value="true"/>
+    </java>
+    <mkdir dir="binpatch-tmp"/>
+    <zip destfile="binpatch-tmp/binpatches.jar" basedir="${basedir}">
+      <include name="binpatch/**/*.binpatch"/>
+    </zip>
+    <apply executable="pack200">
+      <arg line="--no-gzip"/>
+      <arg line="binpatch-tmp/binpatches.pack"/>
+      <fileset dir="binpatch-tmp" includes="binpatches.jar"/>
+    </apply>
+    <apply executable="${lzma.exe}">
+      <arg line="--format=lzma"/>
+      <arg line="-v"/>
+      <fileset dir="binpatch-tmp" includes="binpatches.pack"/>
+    </apply>
+    <move file="binpatch-tmp/binpatches.pack.lzma" todir="${basedir}"/>
+    <delete dir="binpatch-tmp" failonerror="false"/>
+  </target>
 </project>
@@ -1,10 +1,22 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.client;

+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiErrorScreen;
 import cpw.mods.fml.common.IFMLHandledException;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
-import net.minecraft.src.FontRenderer;
-import net.minecraft.src.GuiErrorScreen;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;

 /**
 * If a mod throws this exception during loading, it will be called back to render
@@ -12,32 +12,46 @@
 */
 package cpw.mods.fml.client;

+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.logging.Level;
 import java.util.logging.Logger;

 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.multiplayer.GuiConnecting;
+import net.minecraft.client.multiplayer.NetClientHandler;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.resources.FileResourcePack;
+import net.minecraft.client.resources.FolderResourcePack;
+import net.minecraft.client.resources.ReloadableResourceManager;
+import net.minecraft.client.resources.ResourcePack;
+import net.minecraft.client.resources.SimpleReloadableResourceManager;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.network.INetworkManager;
+import net.minecraft.network.packet.NetHandler;
+import net.minecraft.network.packet.Packet;
+import net.minecraft.network.packet.Packet131MapData;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.src.CrashReport;
-import net.minecraft.src.Entity;
-import net.minecraft.src.EntityLiving;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.GuiScreen;
-import net.minecraft.src.NetClientHandler;
-import net.minecraft.src.NetHandler;
-import net.minecraft.src.Packet;
-import net.minecraft.src.Packet131MapData;
-import net.minecraft.src.Render;
-import net.minecraft.src.RenderManager;
-import net.minecraft.src.World;
-import net.minecraft.src.WorldClient;
+import net.minecraft.world.World;

 import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.MapDifference;
+import com.google.common.collect.MapDifference.ValueDifference;
+import com.google.common.collect.Maps;

 import cpw.mods.fml.client.modloader.ModLoaderClientHelper;
 import cpw.mods.fml.client.registry.KeyBindingRegistry;
@@ -54,21 +68,25 @@ import cpw.mods.fml.common.MissingModsException;
 import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.ModMetadata;
 import cpw.mods.fml.common.ObfuscationReflectionHelper;
-import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.WrongMinecraftVersionException;
 import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket;
 import cpw.mods.fml.common.network.EntitySpawnPacket;
 import cpw.mods.fml.common.network.ModMissingPacket;
 import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
+import cpw.mods.fml.common.registry.GameData;
+import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
 import cpw.mods.fml.common.registry.IThrowableEntity;
+import cpw.mods.fml.common.registry.ItemData;
 import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.common.toposort.ModSortingException;
+import cpw.mods.fml.relauncher.Side;


 /**
 * Handles primary communication from hooked code into the system
 *
- * The FML entry point is {@link #beginMinecraftLoading(Minecraft)} called from
+ * The FML entry point is {@link #beginMinecraftLoading(Minecraft, List)} called from
 * {@link Minecraft}
 *
 * Obfuscated code should focus on this class and other members of the "server"
@@ -104,7 +122,9 @@ public class FMLClientHandler implements IFMLSidedHandler

    private MissingModsException modsMissing;

-    private boolean loading;
+    private ModSortingException modSorting;
+
+    private boolean loading = true;

    private WrongMinecraftVersionException wrongMC;

@@ -112,13 +132,27 @@ public class FMLClientHandler implements IFMLSidedHandler

 	private DuplicateModsFoundException dupesFound;

+    private boolean serverShouldBeKilledQuietly;
+
+    private List<ResourcePack> resourcePackList;
+
+    private ReloadableResourceManager resourceManager;
+
+    private Map<String, ResourcePack> resourcePackMap;
+
    /**
     * Called to start the whole game off
     *
     * @param minecraft The minecraft instance being launched
+     * @param resourcePackList The resource pack list we will populate with mods
+     * @param resourceManager The resource manager
     */
-    public void beginMinecraftLoading(Minecraft minecraft)
+    public void beginMinecraftLoading(Minecraft minecraft, List resourcePackList, ReloadableResourceManager resourceManager)
    {
+        client = minecraft;
+        this.resourcePackList = resourcePackList;
+        this.resourceManager = resourceManager;
+        this.resourcePackMap = Maps.newHashMap();
        if (minecraft.func_71355_q())
        {
            FMLLog.severe("DEMO MODE DETECTED, FML will not work. Finishing now.");
@@ -126,10 +160,7 @@ public class FMLClientHandler implements IFMLSidedHandler
            return;
        }

-        loading = true;
-        client = minecraft;
-        ObfuscationReflectionHelper.detectObfuscation(World.class);
-        TextureFXManager.instance().setClient(client);
+//        TextureFXManager.instance().setClient(client);
        FMLCommonHandler.instance().beginLoading(this);
        new ModLoaderClientHelper(client);
        try
@@ -161,6 +192,10 @@ public class FMLClientHandler implements IFMLSidedHandler
        {
            modsMissing = missing;
        }
+        catch (ModSortingException sorting)
+        {
+            modSorting = sorting;
+        }
        catch (CustomModLoadingErrorDisplayException custom)
        {
            FMLLog.log(Level.SEVERE, custom, "A custom exception was thrown by a mod, the game will now halt");
@@ -187,7 +222,7 @@ public class FMLClientHandler implements IFMLSidedHandler
    @SuppressWarnings("deprecation")
    public void finishMinecraftLoading()
    {
-        if (modsMissing != null || wrongMC != null || customError!=null || dupesFound!=null)
+        if (modsMissing != null || wrongMC != null || customError!=null || dupesFound!=null || modSorting!=null)
        {
            return;
        }
@@ -206,7 +241,8 @@ public class FMLClientHandler implements IFMLSidedHandler
            haltGame("There was a severe problem during mod loading that has caused the game to fail", le);
            return;
        }
-        LanguageRegistry.reloadLanguageTable();
+        // Reload resources
+        client.func_110436_a();
        RenderingRegistry.instance().loadEntityRenderers((Map<Class<? extends Entity>, Render>)RenderManager.field_78727_a.field_78729_o);

        loading = false;
@@ -227,13 +263,19 @@ public class FMLClientHandler implements IFMLSidedHandler
        {
        	client.func_71373_a(new GuiDupesFound(dupesFound));
        }
-        else if (customError != null)
+        else if (modSorting != null)
+        {
+            client.func_71373_a(new GuiSortingProblem(modSorting));
+        }
+		else if (customError != null)
        {
            client.func_71373_a(new GuiCustomModLoadingErrorScreen(customError));
        }
        else
        {
-            TextureFXManager.instance().loadTextures(client.field_71418_C.func_77292_e());
+            // Force renderengine to reload and re-initialize all textures
+//            client.field_71446_o.func_78352_b();
+//            TextureFXManager.instance().loadTextures(client.field_71418_C.func_77292_e());
        }
    }
    /**
@@ -289,7 +331,7 @@ public class FMLClientHandler implements IFMLSidedHandler
        {
            return Arrays.asList(String.format("Optifine %s",optifineContainer.getVersion()));
        } else {
-            return Collections.emptyList();
+            return ImmutableList.<String>of();
        }
    }

@@ -328,6 +370,7 @@ public class FMLClientHandler implements IFMLSidedHandler
            else
            {
                entity = (Entity)(cls.getConstructor(World.class).newInstance(wc));
+                int offset = packet.entityId - entity.field_70157_k;
                entity.field_70157_k = packet.entityId;
                entity.func_70012_b(packet.scaledX, packet.scaledY, packet.scaledZ, packet.scaledYaw, packet.scaledPitch);
                if (entity instanceof EntityLiving)
@@ -335,6 +378,14 @@ public class FMLClientHandler implements IFMLSidedHandler
                    ((EntityLiving)entity).field_70759_as = packet.scaledHeadYaw;
                }

+                Entity parts[] = entity.func_70021_al();
+                if (parts != null)
+                {
+                    for (int j = 0; j < parts.length; j++)
+                    {
+                        parts[j].field_70157_k += offset;
+                    }
+                }
            }

            entity.field_70118_ct = packet.rawX;
@@ -347,18 +398,6 @@ public class FMLClientHandler implements IFMLSidedHandler
                ((IThrowableEntity)entity).setThrower(thrower);
            }

-
-            Entity parts[] = entity.func_70021_al();
-            if (parts != null)
-            {
-                int i = packet.entityId - entity.field_70157_k;
-                for (int j = 0; j < parts.length; j++)
-                {
-                    parts[j].field_70157_k += i;
-                }
-            }
-
-
            if (packet.metadata != null)
            {
                entity.func_70096_w().func_75687_a((List)packet.metadata);
@@ -403,6 +442,7 @@ public class FMLClientHandler implements IFMLSidedHandler
    @Override
    public void beginServerLoading(MinecraftServer server)
    {
+        serverShouldBeKilledQuietly = false;
        // NOOP
    }

@@ -458,4 +498,118 @@ public class FMLClientHandler implements IFMLSidedHandler
    {
        return NetClientHandler.getConnectionCompatibilityLevel();
    }
+
+    public void warnIDMismatch(MapDifference<Integer, ItemData> idDifferences, boolean mayContinue)
+    {
+        GuiIdMismatchScreen mismatch = new GuiIdMismatchScreen(idDifferences, mayContinue);
+        client.func_71373_a(mismatch);
+    }
+
+    public void callbackIdDifferenceResponse(boolean response)
+    {
+        if (response)
+        {
+            serverShouldBeKilledQuietly = false;
+            GameData.releaseGate(true);
+            client.continueWorldLoading();
+        }
+        else
+        {
+            serverShouldBeKilledQuietly = true;
+            GameData.releaseGate(false);
+            // Reset and clear the client state
+            client.func_71403_a((WorldClient)null);
+            client.func_71373_a(null);
+        }
+    }
+
+    @Override
+    public boolean shouldServerShouldBeKilledQuietly()
+    {
+        return serverShouldBeKilledQuietly;
+    }
+
+    @Override
+    public void disconnectIDMismatch(MapDifference<Integer, ItemData> s, NetHandler toKill, INetworkManager mgr)
+    {
+        boolean criticalMismatch = !s.entriesOnlyOnLeft().isEmpty();
+        for (Entry<Integer, ValueDifference<ItemData>> mismatch : s.entriesDiffering().entrySet())
+        {
+            ValueDifference<ItemData> vd = mismatch.getValue();
+            if (!vd.leftValue().mayDifferByOrdinal(vd.rightValue()))
+            {
+                criticalMismatch = true;
+            }
+        }
+
+        if (!criticalMismatch)
+        {
+            // We'll carry on with this connection, and just log a message instead
+            return;
+        }
+        // Nuke the connection
+        ((NetClientHandler)toKill).func_72553_e();
+        // Stop GuiConnecting
+        GuiConnecting.forceTermination((GuiConnecting)client.field_71462_r);
+        // pulse the network manager queue to clear cruft
+        mgr.func_74428_b();
+        // Nuke the world client
+        client.func_71403_a((WorldClient)null);
+        // Show error screen
+        warnIDMismatch(s, false);
+    }
+
+    /**
+     * Is this GUI type open?
+     *
+     * @param gui The type of GUI to test for
+     * @return if a GUI of this type is open
+     */
+    public boolean isGUIOpen(Class<? extends GuiScreen> gui)
+    {
+        return client.field_71462_r != null && client.field_71462_r.getClass().equals(gui);
+    }
+
+
+    @Override
+    public void addModAsResource(ModContainer container)
+    {
+        Class<?> resourcePackType = container.getCustomResourcePackClass();
+        if (resourcePackType != null)
+        {
+            try
+            {
+                ResourcePack pack = (ResourcePack) resourcePackType.getConstructor(ModContainer.class).newInstance(container);
+                resourcePackList.add(pack);
+                resourcePackMap.put(container.getModId(), pack);
+            }
+            catch (NoSuchMethodException e)
+            {
+                FMLLog.log(Level.SEVERE, "The container %s (type %s) returned an invalid class for it's resource pack.", container.getName(), container.getClass().getName());
+                return;
+            }
+            catch (Exception e)
+            {
+                FMLLog.log(Level.SEVERE, e, "An unexpected exception occurred constructing the custom resource pack for %s", container.getName());
+                throw Throwables.propagate(e);
+            }
+        }
+    }
+
+    @Override
+    public void updateResourcePackList()
+    {
+        client.func_110436_a();
+    }
+
+    public ResourcePack getResourcePackFor(String modId)
+    {
+        return resourcePackMap.get(modId);
+    }
+
+    @Override
+    public String getCurrentLanguage()
+    {
+        return client.func_135016_M().func_135041_c().func_135034_a();
+    }
 }
@@ -0,0 +1,62 @@
+package cpw.mods.fml.client;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.Level;
+
+import javax.imageio.ImageIO;
+
+import com.google.common.base.Charsets;
+
+import cpw.mods.fml.common.FMLLog;
+import cpw.mods.fml.common.ModContainer;
+
+import net.minecraft.client.resources.FileResourcePack;
+
+public class FMLFileResourcePack extends FileResourcePack {
+
+    private ModContainer container;
+
+    public FMLFileResourcePack(ModContainer container)
+    {
+        super(container.getSource());
+        this.container = container;
+    }
+
+    @Override
+    public String func_130077_b()
+    {
+        return "FMLFileResourcePack:"+container.getName();
+    }
+    @Override
+    protected InputStream func_110591_a(String resourceName) throws IOException
+    {
+        try
+        {
+            return super.func_110591_a(resourceName);
+        }
+        catch (IOException ioe)
+        {
+            if ("pack.mcmeta".equals(resourceName))
+            {
+                FMLLog.log(container.getName(), Level.WARNING, "Mod %s is missing a pack.mcmeta file, things may not work well", container.getName());
+                return new ByteArrayInputStream(("{\n" +
+                        " \"pack\": {\n"+
+                        "   \"description\": \"dummy FML pack for "+container.getName()+"\",\n"+
+                        "   \"pack_format\": 1\n"+
+                        "}\n" +
+                        "}").getBytes(Charsets.UTF_8));
+            }
+            else throw ioe;
+        }
+    }
+
+    @Override
+    public BufferedImage func_110586_a() throws IOException
+    {
+        return ImageIO.read(func_110591_a(container.getMetadata().logoFile));
+    }
+}
@@ -0,0 +1,62 @@
+package cpw.mods.fml.client;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.Level;
+
+import javax.imageio.ImageIO;
+
+import net.minecraft.client.resources.FolderResourcePack;
+
+import com.google.common.base.Charsets;
+
+import cpw.mods.fml.common.FMLLog;
+import cpw.mods.fml.common.ModContainer;
+
+public class FMLFolderResourcePack extends FolderResourcePack {
+
+    private ModContainer container;
+
+    public FMLFolderResourcePack(ModContainer container)
+    {
+        super(container.getSource());
+        this.container = container;
+    }
+
+    @Override
+    public String func_130077_b()
+    {
+        return "FMLFileResourcePack:"+container.getName();
+    }
+    @Override
+    protected InputStream func_110591_a(String resourceName) throws IOException
+    {
+        try
+        {
+            return super.func_110591_a(resourceName);
+        }
+        catch (IOException ioe)
+        {
+            if ("pack.mcmeta".equals(resourceName))
+            {
+                FMLLog.log(container.getName(), Level.WARNING, "Mod %s is missing a pack.mcmeta file, things may not work well", container.getName());
+                return new ByteArrayInputStream(("{\n" +
+                        " \"pack\": {\n"+
+                        "   \"description\": \"dummy FML pack for "+container.getName()+"\",\n"+
+                        "   \"pack_format\": 1\n"+
+                        "}\n" +
+                        "}").getBytes(Charsets.UTF_8));
+            }
+            else throw ioe;
+        }
+    }
+
+    @Override
+    public BufferedImage func_110586_a() throws IOException
+    {
+        return ImageIO.read(func_110591_a(container.getMetadata().logoFile));
+    }
+
+}
@@ -1,69 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package cpw.mods.fml.client;
-
-import java.awt.Dimension;
-import java.util.List;
-import java.util.logging.Logger;
-
-import net.minecraft.src.RenderEngine;
-import net.minecraft.src.TextureFX;
-import net.minecraft.src.ITexturePack;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
-
-public class FMLTextureFX extends TextureFX implements ITextureFX
-{
-    public int tileSizeBase = 16;
-    public int tileSizeSquare = 256;
-    public int tileSizeMask = 15;
-    public int tileSizeSquareMask = 255;
-    public boolean errored = false;
-    protected Logger log = FMLLog.getLogger();
-
-    public FMLTextureFX(int icon)
-    {
-        super(icon);
-    }
-
-    @Override public void setErrored(boolean err){ errored = err; }
-    @Override public boolean getErrored(){ return errored; }
-    @Override
-    public void onTexturePackChanged(RenderEngine engine, ITexturePack texturepack, Dimension dimensions)
-    {
-        onTextureDimensionsUpdate(dimensions.width, dimensions.height);
-    }
-    @Override
-    public void onTextureDimensionsUpdate(int width, int height)
-    {
-        tileSizeBase = width >> 4;
-        tileSizeSquare = tileSizeBase * tileSizeBase;
-        tileSizeMask = tileSizeBase - 1;
-        tileSizeSquareMask = tileSizeSquare - 1;
-        setErrored(false);
-        setup();
-    }
-
-    protected void setup()
-    {
-        field_76852_a = new byte[tileSizeSquare << 2];
-    }
-
-    public boolean unregister(RenderEngine engine, List<TextureFX> effects)
-    {
-        effects.remove(this);
-        return true;
-    }
-}
@@ -1,14 +1,27 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.client;

+import net.minecraft.client.gui.GuiErrorScreen;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.WrongMinecraftVersionException;
-import net.minecraft.src.GuiErrorScreen;

 public class GuiCustomModLoadingErrorScreen extends GuiErrorScreen
 {
    private CustomModLoadingErrorDisplayException customException;
    public GuiCustomModLoadingErrorScreen(CustomModLoadingErrorDisplayException customException)
    {
+        super(null,null);
        this.customException = customException;
    }
    @Override
@@ -1,13 +1,26 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.client;

 import java.io.File;
 import java.util.Map.Entry;

+import net.minecraft.client.gui.GuiErrorScreen;
+
 import cpw.mods.fml.common.DuplicateModsFoundException;
 import cpw.mods.fml.common.MissingModsException;
 import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.versioning.ArtifactVersion;
-import net.minecraft.src.GuiErrorScreen;

 public class GuiDupesFound extends GuiErrorScreen
 {
@@ -16,6 +29,7 @@ public class GuiDupesFound extends GuiErrorScreen

    public GuiDupesFound(DuplicateModsFoundException dupes)
    {
+        super(null,null);
        this.dupes = dupes;
    }

@@ -0,0 +1,108 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
+package cpw.mods.fml.client;
+
+import java.util.List;
+import java.util.Map.Entry;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiYesNo;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.StringTranslate;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.MapDifference;
+import com.google.common.collect.MapDifference.ValueDifference;
+
+import cpw.mods.fml.common.registry.ItemData;
+import cpw.mods.fml.common.versioning.ArtifactVersion;
+
+public class GuiIdMismatchScreen extends GuiYesNo {
+    private List<String> missingIds = Lists.newArrayList();
+    private List<String> mismatchedIds = Lists.newArrayList();
+    private boolean allowContinue;
+
+    public GuiIdMismatchScreen(MapDifference<Integer, ItemData> idDifferences, boolean allowContinue)
+    {
+        super(null,"ID mismatch", "Should I continue?", 1);
+        field_73942_a = this;
+        for (Entry<Integer, ItemData> entry : idDifferences.entriesOnlyOnLeft().entrySet())
+        {
+            missingIds.add(String.format("ID %d from Mod %s is missing", entry.getValue().getItemId(), entry.getValue().getModId(), entry.getValue().getItemType()));
+        }
+        for (Entry<Integer, ValueDifference<ItemData>> entry : idDifferences.entriesDiffering().entrySet())
+        {
+            ItemData world = entry.getValue().leftValue();
+            ItemData game = entry.getValue().rightValue();
+            mismatchedIds.add(String.format("ID %d is mismatched between world and game", world.getItemId()));
+        }
+        this.allowContinue = allowContinue;
+    }
+
+    @Override
+    public void func_73878_a(boolean choice, int p_73878_2_)
+    {
+        FMLClientHandler.instance().callbackIdDifferenceResponse(choice);
+    }
+
+    @Override
+    public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
+    {
+        this.func_73873_v_();
+        if (!allowContinue && field_73887_h.size() == 2)
+        {
+            field_73887_h.remove(0);
+        }
+        int offset = Math.max(85 - (missingIds.size() + mismatchedIds.size()) * 10, 30);
+        this.func_73732_a(this.field_73886_k, "Forge Mod Loader has found ID mismatches", this.field_73880_f / 2, 10, 0xFFFFFF);
+        this.func_73732_a(this.field_73886_k, "Complete details are in the log file", this.field_73880_f / 2, 20, 0xFFFFFF);
+        int maxLines = 20;
+        for (String s: missingIds) {
+            this.func_73732_a(this.field_73886_k, s, this.field_73880_f / 2, offset, 0xEEEEEE);
+            offset += 10;
+            maxLines --;
+            if (maxLines < 0) break;
+            if (offset >= this.field_73881_g - 30) break;
+        }
+        if (maxLines > 0 && offset < this.field_73881_g - 30)
+        {
+            for (String s: mismatchedIds) {
+                this.func_73732_a(this.field_73886_k, s, this.field_73880_f / 2, offset, 0xEEEEEE);
+                offset += 10;
+                maxLines --;
+                if (maxLines < 0) break;
+                if (offset >= this.field_73881_g - 30) break;
+            }
+        }
+        if (allowContinue)
+        {
+            this.func_73732_a(this.field_73886_k, "Do you wish to continue loading?", this.field_73880_f / 2, this.field_73881_g - 30, 0xFFFFFF);
+        }
+        else
+        {
+            this.func_73732_a(this.field_73886_k, "You cannot connect to this server", this.field_73880_f / 2, this.field_73881_g - 30, 0xFFFFFF);
+        }
+        // super.super. Grrr
+        for (int var4 = 0; var4 < this.field_73887_h.size(); ++var4)
+        {
+            GuiButton var5 = (GuiButton)this.field_73887_h.get(var4);
+            var5.field_73743_d = this.field_73881_g - 20;
+            if (!allowContinue)
+            {
+                var5.field_73746_c = this.field_73880_f / 2 - 75;
+                var5.field_73744_e = I18n.func_135053_a("gui.done");
+            }
+            var5.func_73737_a(this.field_73882_e, p_73863_1_, p_73863_2_);
+        }
+    }
+}
@@ -15,15 +15,27 @@
 package cpw.mods.fml.client;

 import java.awt.Dimension;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;

+import javax.imageio.ImageIO;
+
 import net.minecraft.client.Minecraft;
-import net.minecraft.src.FontRenderer;
-import net.minecraft.src.GuiButton;
-import net.minecraft.src.GuiScreen;
-import net.minecraft.src.GuiSmallButton;
-import net.minecraft.src.StringTranslate;
-import net.minecraft.src.Tessellator;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiSmallButton;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.renderer.texture.SimpleTexture;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureObject;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.resources.ResourcePack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StringTranslate;

 import org.lwjgl.opengl.GL11;

@@ -54,7 +66,7 @@ public class GuiModList extends GuiScreen
        this.mods=new ArrayList<ModContainer>();
        FMLClientHandler.instance().addSpecialModEntries(mods);
        for (ModContainer mod : Loader.instance().getModList()) {
-            if (mod.getMetadata()!=null && !Strings.isNullOrEmpty(mod.getMetadata().parent)) {
+            if (mod.getMetadata()!=null && mod.getMetadata().parentMod==null && !Strings.isNullOrEmpty(mod.getMetadata().parent)) {
                String parentMod = mod.getMetadata().parent;
                ModContainer parentContainer = Loader.instance().getIndexedModList().get(parentMod);
                if (parentContainer != null)
@@ -64,6 +76,10 @@ public class GuiModList extends GuiScreen
                    continue;
                }
            }
+            else if (mod.getMetadata()!=null && mod.getMetadata().parentMod!=null)
+            {
+            	 continue;
+            }
            mods.add(mod);
        }
    }
@@ -76,8 +92,7 @@ public class GuiModList extends GuiScreen
            listWidth=Math.max(listWidth,getFontRenderer().func_78256_a(mod.getVersion()) + 10);
        }
        listWidth=Math.min(listWidth, 150);
-        StringTranslate translations = StringTranslate.func_74808_a();
-        this.field_73887_h.add(new GuiSmallButton(6, this.field_73880_f / 2 - 75, this.field_73881_g - 38, translations.func_74805_b("gui.done")));
+        this.field_73887_h.add(new GuiSmallButton(6, this.field_73880_f / 2 - 75, this.field_73881_g - 38, I18n.func_135053_a("gui.done")));
        this.modList=new GuiSlotModList(this, mods, listWidth);
        this.modList.registerScrollButtons(this.field_73887_h, 7, 8);
    }
@@ -98,7 +113,7 @@ public class GuiModList extends GuiScreen

    public int drawLine(String line, int offset, int shifty)
    {
-        this.field_73886_k.func_78276_b(line, offset, shifty, 0xd7edea);
+        int r = this.field_73886_k.func_78276_b(line, offset, shifty, 0xd7edea);
        return shifty + 10;
    }

@@ -112,35 +127,74 @@ public class GuiModList extends GuiScreen
            GL11.glEnable(GL11.GL_BLEND);
            if (!selectedMod.getMetadata().autogenerated) {
                int shifty = 35;
-                if (!selectedMod.getMetadata().logoFile.isEmpty())
+                String logoFile = selectedMod.getMetadata().logoFile;
+                if (!logoFile.isEmpty())
                {
-                    int texture = this.field_73882_e.field_71446_o.func_78341_b(selectedMod.getMetadata().logoFile);
                    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-                    this.field_73882_e.field_71446_o.func_78342_b(texture);
-                    Dimension dim = TextureFXManager.instance().getTextureDimensions(texture);
-                    int top = 32;
-                    Tessellator tess = Tessellator.field_78398_a;
-                    tess.func_78382_b();
-                    tess.func_78374_a(offset,             top + dim.height, field_73735_i, 0, 1);
-                    tess.func_78374_a(offset + dim.width, top + dim.height, field_73735_i, 1, 1);
-                    tess.func_78374_a(offset + dim.width, top,              field_73735_i, 1, 0);
-                    tess.func_78374_a(offset,             top,              field_73735_i, 0, 0);
-                    tess.func_78381_a();
+                    TextureManager tm = field_73882_e.func_110434_K();
+                    ResourcePack pack = FMLClientHandler.instance().getResourcePackFor(selectedMod.getModId());
+                    try
+                    {
+                        BufferedImage logo = null;
+                        if (pack!=null)
+                        {
+                            logo = pack.func_110586_a();
+                        }
+                        else
+                        {
+                            InputStream logoResource = getClass().getResourceAsStream(logoFile);
+                            if (logoResource != null)
+                            {
+                                logo = ImageIO.read(logoResource);
+                            }
+                        }
+                        if (logo != null)
+                        {
+                            ResourceLocation rl = tm.func_110578_a("modlogo", new DynamicTexture(logo));
+                            this.field_73882_e.field_71446_o.func_110577_a(rl);
+                            Dimension dim = new Dimension(logo.getWidth(), logo.getHeight());
+                            double scaleX = dim.width / 200.0;
+                            double scaleY = dim.height / 65.0;
+                            double scale = 1.0;
+                            if (scaleX > 1 || scaleY > 1)
+                            {
+                                scale = 1.0 / Math.max(scaleX, scaleY);
+                            }
+                            dim.width *= scale;
+                            dim.height *= scale;
+                            int top = 32;
+                            Tessellator tess = Tessellator.field_78398_a;
+                            tess.func_78382_b();
+                            tess.func_78374_a(offset,             top + dim.height, field_73735_i, 0, 1);
+                            tess.func_78374_a(offset + dim.width, top + dim.height, field_73735_i, 1, 1);
+                            tess.func_78374_a(offset + dim.width, top,              field_73735_i, 1, 0);
+                            tess.func_78374_a(offset,             top,              field_73735_i, 0, 0);
+                            tess.func_78381_a();

-                    shifty += 65;
+                            shifty += 65;
+                        }
+                    }
+                    catch (IOException e)
+                    {
+                        ;
+                    }
                }
                this.field_73886_k.func_78261_a(selectedMod.getMetadata().name, offset, shifty, 0xFFFFFF);
                shifty += 12;

                shifty = drawLine(String.format("Version: %s (%s)", selectedMod.getDisplayVersion(), selectedMod.getVersion()), offset, shifty);
-                shifty = drawLine(String.format("Mod State: %s", Loader.instance().getModState(selectedMod)), offset, shifty);
+                shifty = drawLine(String.format("Mod ID: '%s' Mod State: %s", selectedMod.getModId(), Loader.instance().getModState(selectedMod)), offset, shifty);
                if (!selectedMod.getMetadata().credits.isEmpty()) {
                   shifty = drawLine(String.format("Credits: %s", selectedMod.getMetadata().credits), offset, shifty);
                }
                shifty = drawLine(String.format("Authors: %s", selectedMod.getMetadata().getAuthorList()), offset, shifty);
                shifty = drawLine(String.format("URL: %s", selectedMod.getMetadata().url), offset, shifty);
                shifty = drawLine(selectedMod.getMetadata().childMods.isEmpty() ? "No child mods for this mod" : String.format("Child mods: %s", selectedMod.getMetadata().getChildModList()), offset, shifty);
-                this.getFontRenderer().func_78279_b(selectedMod.getMetadata().description, offset, shifty + 10, this.field_73880_f - offset - 20, 0xDDDDDD);
+                int rightSide = this.field_73880_f - offset - 20;
+                if (rightSide > 20)
+                {
+                    this.getFontRenderer().func_78279_b(selectedMod.getMetadata().description, offset, shifty + 10, rightSide, 0xDDDDDD);
+                }
            } else {
                offset = ( this.listWidth + this.field_73880_f ) / 2;
                this.func_73732_a(this.field_73886_k, selectedMod.getName(), offset, 35, 0xFFFFFF);
@@ -1,8 +1,21 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.client;

+import net.minecraft.client.gui.GuiErrorScreen;
 import cpw.mods.fml.common.MissingModsException;
 import cpw.mods.fml.common.versioning.ArtifactVersion;
-import net.minecraft.src.GuiErrorScreen;
+import cpw.mods.fml.common.versioning.DefaultArtifactVersion;

 public class GuiModsMissing extends GuiErrorScreen
 {
@@ -11,6 +24,7 @@ public class GuiModsMissing extends GuiErrorScreen

    public GuiModsMissing(MissingModsException modsMissing)
    {
+        super(null,null);
        this.modsMissing = modsMissing;
    }

@@ -31,6 +45,15 @@ public class GuiModsMissing extends GuiErrorScreen
        for (ArtifactVersion v : modsMissing.missingMods)
        {
            offset+=10;
+            if (v instanceof DefaultArtifactVersion)
+            {
+                DefaultArtifactVersion dav =  (DefaultArtifactVersion)v;
+                if (dav.getRange() != null && dav.getRange().isUnboundedAbove())
+                {
+                    this.func_73732_a(this.field_73886_k, String.format("%s : minimum version required is %s", v.getLabel(), dav.getRange().getLowerBoundString()), this.field_73880_f / 2, offset, 0xEEEEEE);
+                    continue;
+                }
+            }
            this.func_73732_a(this.field_73886_k, String.format("%s : %s", v.getLabel(), v.getRangeString()), this.field_73880_f / 2, offset, 0xEEEEEE);
        }
        offset+=20;
@@ -1,9 +1,22 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.client;

-import net.minecraft.src.GuiButton;
-import net.minecraft.src.GuiScreen;
-import net.minecraft.src.GuiSmallButton;
-import net.minecraft.src.StringTranslate;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiSmallButton;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.StringTranslate;
 import cpw.mods.fml.common.network.ModMissingPacket;
 import cpw.mods.fml.common.versioning.ArtifactVersion;

@@ -19,8 +32,7 @@ public class GuiModsMissingForServer extends GuiScreen
    @Override
    public void func_73866_w_()
    {
-        StringTranslate translations = StringTranslate.func_74808_a();
-        this.field_73887_h.add(new GuiSmallButton(1, this.field_73880_f / 2 - 75, this.field_73881_g - 38, translations.func_74805_b("gui.done")));
+        this.field_73887_h.add(new GuiSmallButton(1, this.field_73880_f / 2 - 75, this.field_73881_g - 38, I18n.func_135053_a("gui.done")));
    }

    @Override
@@ -1,10 +1,23 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.client;

 import java.util.List;

 import net.minecraft.client.Minecraft;
-import net.minecraft.src.GuiButton;
-import net.minecraft.src.Tessellator;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.renderer.Tessellator;

 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
@@ -252,7 +265,7 @@ public abstract class GuiScrollingList
        GL11.glDisable(GL11.GL_LIGHTING);
        GL11.glDisable(GL11.GL_FOG);
        Tessellator var18 = Tessellator.field_78398_a;
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.client.field_71446_o.func_78341_b("/gui/background.png"));
+        this.client.field_71446_o.func_110577_a(Gui.field_110325_k);
        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
        float var17 = 32.0F;
        var18.func_78382_b();
@@ -385,7 +398,7 @@ public abstract class GuiScrollingList
    private void overlayBackground(int p_22239_1_, int p_22239_2_, int p_22239_3_, int p_22239_4_)
    {
        Tessellator var5 = Tessellator.field_78398_a;
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.client.field_71446_o.func_78341_b("/gui/background.png"));
+        this.client.field_71446_o.func_110577_a(Gui.field_110325_k);
        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
        float var6 = 32.0F;
        var5.func_78382_b();
@@ -1,22 +1,21 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
 */

 package cpw.mods.fml.client;

 import java.util.ArrayList;

-import net.minecraft.src.Tessellator;
+import net.minecraft.client.renderer.Tessellator;
+
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.LoaderState.ModState;
 import cpw.mods.fml.common.ModContainer;
@@ -0,0 +1,48 @@
+package cpw.mods.fml.client;
+
+import cpw.mods.fml.common.ModContainer;
+import cpw.mods.fml.common.toposort.ModSortingException;
+import cpw.mods.fml.common.toposort.ModSortingException.SortingExceptionData;
+import cpw.mods.fml.common.versioning.ArtifactVersion;
+import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
+import net.minecraft.client.gui.GuiScreen;
+
+public class GuiSortingProblem extends GuiScreen {
+    private ModSortingException modSorting;
+    private SortingExceptionData<ModContainer> failedList;
+
+    public GuiSortingProblem(ModSortingException modSorting)
+    {
+        this.modSorting = modSorting;
+        this.failedList = modSorting.getExceptionData();
+    }
+
+    @Override
+    public void func_73866_w_()
+    {
+        super.func_73866_w_();
+    }
+
+    @Override
+    public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
+    {
+        this.func_73873_v_();
+        int offset = Math.max(85 - (failedList.getVisitedNodes().size() + 3) * 10, 10);
+        this.func_73732_a(this.field_73886_k, "Forge Mod Loader has found a problem with your minecraft installation", this.field_73880_f / 2, offset, 0xFFFFFF);
+        offset+=10;
+        this.func_73732_a(this.field_73886_k, "A mod sorting cycle was detected and loading cannot continue", this.field_73880_f / 2, offset, 0xFFFFFF);
+        offset+=10;
+        this.func_73732_a(this.field_73886_k, String.format("The first mod in the cycle is %s", failedList.getFirstBadNode()), this.field_73880_f / 2, offset, 0xFFFFFF);
+        offset+=10;
+        this.func_73732_a(this.field_73886_k, "The remainder of the cycle involves these mods", this.field_73880_f / 2, offset, 0xFFFFFF);
+        offset+=5;
+        for (ModContainer mc : failedList.getVisitedNodes())
+        {
+            offset+=10;
+            this.func_73732_a(this.field_73886_k, String.format("%s : before: %s, after: %s", mc.toString(), mc.getDependants(), mc.getDependencies()), this.field_73880_f / 2, offset, 0xEEEEEE);
+        }
+        offset+=20;
+        this.func_73732_a(this.field_73886_k, "The file 'ForgeModLoader-client-0.log' contains more information", this.field_73880_f / 2, offset, 0xFFFFFF);
+    }
+
+}
@@ -1,16 +1,28 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.client;

+import net.minecraft.client.gui.GuiErrorScreen;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.WrongMinecraftVersionException;
 import cpw.mods.fml.common.versioning.ArtifactVersion;
-import net.minecraft.src.GuiErrorScreen;
-import net.minecraft.src.GuiScreen;

 public class GuiWrongMinecraft extends GuiErrorScreen
 {
    private WrongMinecraftVersionException wrongMC;
    public GuiWrongMinecraft(WrongMinecraftVersionException wrongMC)
    {
+        super(null,null);
        this.wrongMC = wrongMC;
    }
    @Override
@@ -1,31 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package cpw.mods.fml.client;
-
-import java.awt.Dimension;
-
-import net.minecraft.src.RenderEngine;
-import net.minecraft.src.ITexturePack;
-
-public interface ITextureFX
-{
-    public void onTexturePackChanged(RenderEngine engine, ITexturePack texturepack, Dimension dimensions);
-
-    public void onTextureDimensionsUpdate(int width, int height);
-    
-    public void setErrored(boolean errored);
-    
-    public boolean getErrored();
-}
@@ -1,44 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package cpw.mods.fml.client;
-
-import net.minecraft.src.TextureFX;
-
-class OverrideInfo
-{
-    public String texture;
-    public String override;
-    public int index;
-    public int imageIndex;
-    public TextureFX textureFX;
-    public boolean added;
-    
-    @Override
-    public boolean equals(Object obj)
-    {
-        try {
-            OverrideInfo inf=(OverrideInfo) obj;
-            return index==inf.index && imageIndex==inf.imageIndex;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-    
-    @Override
-    public int hashCode()
-    {
-        return index+imageIndex;
-    }
-}
@@ -1,138 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package cpw.mods.fml.client;
-
-import java.util.BitSet;
-import java.util.HashMap;
-import java.util.logging.Level;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
-
-/**
- * @author cpw
- *
- */
-public class SpriteHelper
-{
-    private static HashMap<String, BitSet> spriteInfo = new HashMap<String, BitSet>();
-
-    private static void initMCSpriteMaps() {
-        BitSet slots =
-                SpriteHelper.toBitSet(
-                "0000000000000000" +
-                "0000000000110000" +
-                "0000000000100000" +
-                "0000000001100000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000011111" +
-                "0000000000000000" +
-                "0000000001111100" +
-                "0000000001111000" +
-                "0000000000000000");
-        spriteInfo.put("/terrain.png", slots);
-
-        slots = SpriteHelper.toBitSet(
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0111100000000000" +
-                "1111100010000000" +
-                "0000101110000000" +
-                "0111000000000000" +
-                "1100001100001111" +
-                "0000000000001111" +
-                "0000000000000000");
-        spriteInfo.put("/gui/items.png", slots);
-    }
-    /**
-     * Register a sprite map for ModTextureStatic, to allow for other mods to override
-     * your sprite page.
-     *
-     *
-     */
-    public static void registerSpriteMapForFile(String file, String spriteMap) {
-        if (spriteInfo.size() == 0) {
-            initMCSpriteMaps();
-        }
-        if (spriteInfo.containsKey(file)) {
-            FMLCommonHandler.instance().getFMLLogger().finer(String.format("Duplicate attempt to register a sprite file %s for overriding -- ignoring",file));
-            return;
-        }
-        spriteInfo.put(file, toBitSet(spriteMap));
-    }
-
-    public static int getUniqueSpriteIndex(String path)
-    {
-        if (!spriteInfo.containsKey("/terrain.png"))
-        {
-            initMCSpriteMaps();
-        }
-
-        BitSet slots = spriteInfo.get(path);
-
-        if (slots == null)
-        {
-            Exception ex = new Exception(String.format("Invalid getUniqueSpriteIndex call for texture: %s", path));
-            FMLLog.log(Level.SEVERE, ex, "A critical error has been detected with sprite overrides");
-            FMLCommonHandler.instance().raiseException(ex,"Invalid request to getUniqueSpriteIndex",true);
-        }
-
-        int ret = getFreeSlot(slots);
-
-        if (ret == -1)
-        {
-            Exception ex = new Exception(String.format("No more sprite indicies left for: %s", path));
-            FMLLog.log(Level.SEVERE, ex, "There are no sprite indicies left for %s", path);
-            FMLCommonHandler.instance().raiseException(ex,"No more sprite indicies left", true);
-        }
-        return ret;
-    }
-
-    public static BitSet toBitSet(String data)
-    {
-        BitSet ret = new BitSet(data.length());
-        for (int x = 0; x < data.length(); x++)
-        {
-            ret.set(x, data.charAt(x) == '1');
-        }
-        return ret;
-    }
-
-    public static int getFreeSlot(BitSet slots)
-    {
-        int next=slots.nextSetBit(0);
-        slots.clear(next);
-        return next;
-    }
-
-    public static int freeSlotCount(String textureToOverride)
-    {
-        return spriteInfo.get(textureToOverride).cardinality();
-    }
-
-}
@@ -1,323 +1,142 @@
-package cpw.mods.fml.client;
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */

-import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D;
-import static org.lwjgl.opengl.GL11.GL_TEXTURE_BINDING_2D;
+package cpw.mods.fml.client;

 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;

 import javax.imageio.ImageIO;

-import net.minecraft.client.Minecraft;
-import net.minecraft.src.ModTextureStatic;
-import net.minecraft.src.RenderEngine;
-import net.minecraft.src.TextureFX;
-import net.minecraft.src.ITexturePack;
+import org.lwjgl.opengl.ContextCapabilities;
+import org.lwjgl.opengl.GLContext;

-import org.lwjgl.opengl.GL11;
-
-import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;

-import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.ModContainer;
+
+import net.minecraft.client.Minecraft;

 public class TextureFXManager
 {
    private static final TextureFXManager INSTANCE = new TextureFXManager();

-    private class TextureProperties
-    {
-        private int textureId;
-        private Dimension dim;
-    }
-
-    private Map<Integer,TextureProperties> textureProperties = Maps.newHashMap();
-    private Multimap<String, OverrideInfo> overrideInfo = ArrayListMultimap.create();
-    private HashSet<OverrideInfo> animationSet = new HashSet<OverrideInfo>();
-
-    private List<TextureFX> addedTextureFX = new ArrayList<TextureFX>();
-
    private Minecraft client;

+    private Map<Integer,TextureHolder> texturesById = Maps.newHashMap();
+    private Map<String, TextureHolder> texturesByName = Maps.newHashMap();
+
+//    private TextureHelper helper;
+
    void setClient(Minecraft client)
    {
        this.client = client;
    }
-
-    public boolean onUpdateTextureEffect(TextureFX effect)
-    {
-        ITextureFX ifx = (effect instanceof ITextureFX ? ((ITextureFX)effect) : null);
-
-        if (ifx != null && ifx.getErrored())
-        {
-            return false;
-        }
-
-        String name = effect.getClass().getSimpleName();
-        client.field_71424_I.func_76320_a(name);
-        try
-        {
-            if (!FMLClientHandler.instance().hasOptifine())
-            {
-                effect.func_76846_a();
-            }
-        }
-        catch (Exception e)
-        {
-            FMLLog.warning("Texture FX %s has failed to animate. Likely caused by a texture pack change that they did not respond correctly to", name);
-            if (ifx != null)
-            {
-                ifx.setErrored(true);
-            }
-            client.field_71424_I.func_76319_b();
-            return false;
-        }
-        client.field_71424_I.func_76319_b();
-
-        if (ifx != null)
-        {
-            Dimension dim = getTextureDimensions(effect);
-            int target = ((dim.width >> 4) * (dim.height >> 4)) << 2;
-            if (effect.field_76852_a.length != target)
-            {
-                FMLLog.warning("Detected a texture FX sizing discrepancy in %s (%d, %d)", name, effect.field_76852_a.length, target);
-                ifx.setErrored(true);
-                return false;
-            }
-        }
-        return true;
-    }
-
-    //Quick and dirty image scaling, no smoothing or fanciness, meant for speed as it will be called every tick.
-    public void scaleTextureFXData(byte[] data, ByteBuffer buf, int target, int length)
-    {
-        int sWidth = (int)Math.sqrt(data.length / 4);
-        int factor = target / sWidth;
-        byte[] tmp = new byte[4];
-
-        buf.clear();
-
-        if (factor > 1)
-        {
-            for (int y = 0; y < sWidth; y++)
-            {
-                int sRowOff = sWidth * y;
-                int tRowOff = target * y * factor;
-                for (int x = 0; x < sWidth; x++)
-                {
-                    int sPos = (x + sRowOff) * 4;
-                    tmp[0] = data[sPos + 0];
-                    tmp[1] = data[sPos + 1];
-                    tmp[2] = data[sPos + 2];
-                    tmp[3] = data[sPos + 3];
-
-                    int tPosTop = (x * factor) + tRowOff;
-                    for (int y2 = 0; y2 < factor; y2++)
-                    {
-                        buf.position((tPosTop + (y2 * target)) * 4);
-                        for (int x2 = 0; x2 < factor; x2++)
-                        {
-                            buf.put(tmp);
-                        }
-                    }
-                }
-            }
-        }
-
-        buf.position(0).limit(length);
-    }
-
-    public void onPreRegisterEffect(TextureFX effect)
-    {
-        Dimension dim = getTextureDimensions(effect);
-        if (effect instanceof ITextureFX)
-        {
-            ((ITextureFX)effect).onTextureDimensionsUpdate(dim.width, dim.height);
-        }
-    }
-
-
-    public int getEffectTexture(TextureFX effect)
-    {
-        Integer id = effectTextures.get(effect);
-        if (id != null)
-        {
-            return id;
-        }
-
-        int old = GL11.glGetInteger(GL_TEXTURE_BINDING_2D);
-
-        effect.func_76845_a(client.field_71446_o);
-
-        id = GL11.glGetInteger(GL_TEXTURE_BINDING_2D);
-
-        GL11.glBindTexture(GL_TEXTURE_2D, old);
-
-        effectTextures.put(effect, id);
-
-        return id;
-    }
-
-    public void onTexturePackChange(RenderEngine engine, ITexturePack texturepack, List<TextureFX> effects)
-    {
-        pruneOldTextureFX(texturepack, effects);
-
-        for (TextureFX tex : effects)
-        {
-            if (tex instanceof ITextureFX)
-            {
-                ((ITextureFX)tex).onTexturePackChanged(engine, texturepack, getTextureDimensions(tex));
-            }
-        }
-
-        loadTextures(texturepack);
-    }
-
-    private HashMap<Integer, Dimension> textureDims = new HashMap<Integer, Dimension>();
-    private IdentityHashMap<TextureFX, Integer> effectTextures = new IdentityHashMap<TextureFX, Integer>();
-    private ITexturePack earlyTexturePack;
-    public void setTextureDimensions(int id, int width, int height, List<TextureFX> effects)
-    {
-        Dimension dim = new Dimension(width, height);
-        textureDims.put(id, dim);
-
-        for (TextureFX tex : effects)
-        {
-            if (getEffectTexture(tex) == id && tex instanceof ITextureFX)
-            {
-                ((ITextureFX)tex).onTextureDimensionsUpdate(width, height);
-            }
-        }
-    }
-
-    public Dimension getTextureDimensions(TextureFX effect)
-    {
-        return getTextureDimensions(getEffectTexture(effect));
-    }
-
-    public Dimension getTextureDimensions(int id)
-    {
-        return textureDims.get(id);
-    }
-
-    public void addAnimation(TextureFX anim)
-    {
-        OverrideInfo info=new OverrideInfo();
-        info.index=anim.field_76850_b;
-        info.imageIndex=anim.field_76847_f;
-        info.textureFX=anim;
-        if (animationSet.contains(info)) {
-            animationSet.remove(info);
-        }
-        animationSet.add(info);
-    }
-
-
-    public void loadTextures(ITexturePack texturePack)
-    {
-        registerTextureOverrides(client.field_71446_o);
-    }
-
-
-    public void registerTextureOverrides(RenderEngine renderer) {
-        for (OverrideInfo animationOverride : animationSet) {
-            renderer.func_78355_a(animationOverride.textureFX);
-            addedTextureFX.add(animationOverride.textureFX);
-            FMLCommonHandler.instance().getFMLLogger().finer(String.format("Registered texture override %d (%d) on %s (%d)", animationOverride.index, animationOverride.textureFX.field_76850_b, animationOverride.textureFX.getClass().getSimpleName(), animationOverride.textureFX.field_76847_f));
-        }
-
-        for (String fileToOverride : overrideInfo.keySet()) {
-            for (OverrideInfo override : overrideInfo.get(fileToOverride)) {
-                try
-                {
-                    BufferedImage image=loadImageFromTexturePack(renderer, override.override);
-                    ModTextureStatic mts=new ModTextureStatic(override.index, 1, override.texture, image);
-                    renderer.func_78355_a(mts);
-                    addedTextureFX.add(mts);
-                    FMLCommonHandler.instance().getFMLLogger().finer(String.format("Registered texture override %d (%d) on %s (%d)", override.index, mts.field_76850_b, override.texture, mts.field_76847_f));
-                }
-                catch (IOException e)
-                {
-                    FMLCommonHandler.instance().getFMLLogger().throwing("FMLClientHandler", "registerTextureOverrides", e);
-                }
-            }
-        }
-    }
-
-    protected void registerAnimatedTexturesFor(ModContainer mod)
-    {
-    }
-
-    public void onEarlyTexturePackLoad(ITexturePack fallback)
-    {
-        if (client==null) {
-            // We're far too early- let's wait
-            this.earlyTexturePack = fallback;
-        } else {
-            loadTextures(fallback);
-        }
-    }
-
-
-    public void pruneOldTextureFX(ITexturePack var1, List<TextureFX> effects)
-    {
-        ListIterator<TextureFX> li = addedTextureFX.listIterator();
-        while (li.hasNext())
-        {
-            TextureFX tex = li.next();
-            if (tex instanceof FMLTextureFX)
-            {
-                if (((FMLTextureFX)tex).unregister(client.field_71446_o, effects))
-                {
-                    li.remove();
-                }
-            }
-            else
-            {
-                effects.remove(tex);
-                li.remove();
-            }
-        }
-    }
-    public void addNewTextureOverride(String textureToOverride, String overridingTexturePath, int location) {
-        OverrideInfo info = new OverrideInfo();
-        info.index = location;
-        info.override = overridingTexturePath;
-        info.texture = textureToOverride;
-        overrideInfo.put(textureToOverride, info);
-        FMLLog.fine("Overriding %s @ %d with %s. %d slots remaining",textureToOverride, location, overridingTexturePath, SpriteHelper.freeSlotCount(textureToOverride));
-    }
-
-    public BufferedImage loadImageFromTexturePack(RenderEngine renderEngine, String path) throws IOException
-    {
-        InputStream image=client.field_71418_C.func_77292_e().func_77532_a(path);
-        if (image==null) {
-            throw new RuntimeException(String.format("The requested image path %s is not found",path));
-        }
-        BufferedImage result=ImageIO.read(image);
-        if (result==null)
-        {
-            throw new RuntimeException(String.format("The requested image path %s appears to be corrupted",path));
-        }
-        return result;
-    }
-
+//    public BufferedImage loadImageFromTexturePack(RenderEngine renderEngine, String path) throws IOException
+//    {
+//        InputStream image=client.field_71418_C.func_77292_e().func_77532_a(path);
+//        if (image==null) {
+//            throw new RuntimeException(String.format("The requested image path %s is not found",path));
+//        }
+//        BufferedImage result=ImageIO.read(image);
+//        if (result==null)
+//        {
+//            throw new RuntimeException(String.format("The requested image path %s appears to be corrupted",path));
+//        }
+//        return result;
+//    }
+//
    public static TextureFXManager instance()
    {
        return INSTANCE;
    }

+    public void fixTransparency(BufferedImage loadedImage, String textureName)
+    {
+        if (textureName.matches("^/mob/.*_eyes.*.png$"))
+        {
+            for (int x = 0; x < loadedImage.getWidth(); x++) {
+                for (int y = 0; y < loadedImage.getHeight(); y++) {
+                    int argb = loadedImage.getRGB(x, y);
+                    if ((argb & 0xff000000) == 0 && argb != 0) {
+                        loadedImage.setRGB(x, y, 0);
+                    }
+                }
+            }
+        }
+    }
+    public void bindTextureToName(String name, int index)
+    {
+        TextureHolder holder = new TextureHolder();
+        holder.textureId = index;
+        holder.textureName = name;
+        texturesById.put(index,holder);
+        texturesByName.put(name,holder);
+    }
+
+    public void setTextureDimensions(int index, int j, int k)
+    {
+        TextureHolder holder = texturesById.get(index);
+        if (holder == null)
+        {
+            return;
+        }
+        holder.x = j;
+        holder.y = k;
+    }
+
+    private class TextureHolder {
+        private int textureId;
+        private String textureName;
+        private int x;
+        private int y;
+    }
+
+    public Dimension getTextureDimensions(String texture)
+    {
+        return texturesByName.containsKey(texture) ? new Dimension(texturesByName.get(texture).x, texturesByName.get(texture).y) : new Dimension(1,1);
+    }
+
+
+//    public TextureHelper getHelper()
+//    {
+//        if (helper == null)
+//        {
+//            ContextCapabilities capabilities = GLContext.getCapabilities();
+//            boolean has43 = false;
+//            try
+//            {
+//                has43 = capabilities.getClass().getField("GL_ARB_copy_image").getBoolean(capabilities);
+//            }
+//            catch (Exception e)
+//            {
+//                //e.printStackTrace();
+//                // NOOP - LWJGL needs updating
+//                FMLLog.info("Forge Mod Loader has detected an older LWJGL version, new advanced texture animation features are disabled");
+//            }
+////            if (has43 && Boolean.parseBoolean(System.getProperty("fml.useGL43","true")))
+////            {
+////                FMLLog.info("Using the new OpenGL 4.3 advanced capability for animations");
+////                helper = new OpenGL43TextureHelper();
+////            }
+////            else
+//            {
+//                FMLLog.info("Not using advanced OpenGL 4.3 advanced capability for animations : OpenGL 4.3 is %s", has43 ? "available" : "not available");
+////                helper = new CopySubimageTextureHelper();
+//            }
+//        }
+//        return helper;
+//    }
 }
@@ -1,23 +1,21 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
 */

 package cpw.mods.fml.client.modloader;

+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.src.BaseMod;
-import net.minecraft.src.Block;
-import net.minecraft.src.IBlockAccess;
-import net.minecraft.src.RenderBlocks;
+import net.minecraft.world.IBlockAccess;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;

 /**
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.client.modloader;

 import java.util.Collection;
@@ -7,19 +19,20 @@ import java.util.Map.Entry;
 import java.util.logging.Level;

 import net.minecraft.client.Minecraft;
+import net.minecraft.network.INetworkManager;
+import net.minecraft.network.packet.NetHandler;
+import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.src.BaseMod;
-import net.minecraft.src.Entity;
-import net.minecraft.src.EntityClientPlayerMP;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.KeyBinding;
-import net.minecraft.src.NetClientHandler;
-import net.minecraft.src.NetHandler;
-import net.minecraft.src.INetworkManager;
-import net.minecraft.src.Packet250CustomPayload;
-import net.minecraft.src.Render;
-import net.minecraft.src.RenderManager;
+import net.minecraft.client.*;
+import net.minecraft.client.entity.EntityClientPlayerMP;
+import net.minecraft.client.multiplayer.NetClientHandler;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;

-import com.google.common.base.Equivalences;
+import com.google.common.base.Equivalence;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.Iterables;
@@ -56,38 +69,38 @@ public class ModLoaderClientHelper implements IModLoaderSidedHelper

    public static void handleFinishLoadingFor(ModLoaderModContainer mc, Minecraft game)
    {
-        FMLLog.finer("Handling post startup activities for ModLoader mod %s", mc.getModId());
+        FMLLog.log(mc.getModId(), Level.FINE, "Handling post startup activities for ModLoader mod %s", mc.getModId());
        BaseMod mod = (BaseMod) mc.getMod();

        Map<Class<? extends Entity>, Render> renderers = Maps.newHashMap(RenderManager.field_78727_a.field_78729_o);

        try
        {
-            FMLLog.finest("Requesting renderers from basemod %s", mc.getModId());
+            FMLLog.log(mc.getModId(), Level.FINEST, "Requesting renderers from basemod %s", mc.getModId());
            mod.addRenderer(renderers);
-            FMLLog.finest("Received %d renderers from basemod %s", renderers.size(), mc.getModId());
+            FMLLog.log(mc.getModId(), Level.FINEST, "Received %d renderers from basemod %s", renderers.size(), mc.getModId());
        }
        catch (Exception e)
        {
-            FMLLog.log(Level.SEVERE, e, "A severe problem was detected with the mod %s during the addRenderer call. Continuing, but expect odd results", mc.getModId());
+            FMLLog.log(mc.getModId(), Level.SEVERE, e, "A severe problem was detected with the mod %s during the addRenderer call. Continuing, but expect odd results", mc.getModId());
        }

-        MapDifference<Class<? extends Entity>, Render> difference = Maps.difference(RenderManager.field_78727_a.field_78729_o, renderers, Equivalences.identity());
+        MapDifference<Class<? extends Entity>, Render> difference = Maps.difference(RenderManager.field_78727_a.field_78729_o, renderers, Equivalence.identity());

        for ( Entry<Class<? extends Entity>, Render> e : difference.entriesOnlyOnLeft().entrySet())
        {
-            FMLLog.warning("The mod %s attempted to remove an entity renderer %s from the entity map. This will be ignored.", mc.getModId(), e.getKey().getName());
+            FMLLog.log(mc.getModId(), Level.WARNING, "The mod %s attempted to remove an entity renderer %s from the entity map. This will be ignored.", mc.getModId(), e.getKey().getName());
        }

        for (Entry<Class<? extends Entity>, Render> e : difference.entriesOnlyOnRight().entrySet())
        {
-            FMLLog.finest("Registering ModLoader entity renderer %s as instance of %s", e.getKey().getName(), e.getValue().getClass().getName());
+            FMLLog.log(mc.getModId(), Level.FINEST, "Registering ModLoader entity renderer %s as instance of %s", e.getKey().getName(), e.getValue().getClass().getName());
            RenderingRegistry.registerEntityRenderingHandler(e.getKey(), e.getValue());
        }

        for (Entry<Class<? extends Entity>, ValueDifference<Render>> e : difference.entriesDiffering().entrySet())
        {
-            FMLLog.finest("Registering ModLoader entity rendering override for %s as instance of %s", e.getKey().getName(), e.getValue().rightValue().getClass().getName());
+            FMLLog.log(mc.getModId(), Level.FINEST, "Registering ModLoader entity rendering override for %s as instance of %s", e.getKey().getName(), e.getValue().rightValue().getClass().getName());
            RenderingRegistry.registerEntityRenderingHandler(e.getKey(), e.getValue().rightValue());
        }

@@ -97,7 +110,7 @@ public class ModLoaderClientHelper implements IModLoaderSidedHelper
        }
        catch (Exception e)
        {
-            FMLLog.log(Level.SEVERE, e, "A severe problem was detected with the mod %s during the registerAnimation call. Continuing, but expect odd results", mc.getModId());
+            FMLLog.log(mc.getModId(), Level.SEVERE, e, "A severe problem was detected with the mod %s during the registerAnimation call. Continuing, but expect odd results", mc.getModId());
        }
    }

@@ -1,15 +1,13 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
 */

 package cpw.mods.fml.client.modloader;
@@ -23,7 +21,7 @@ import org.lwjgl.input.Mouse;
 import com.google.common.collect.ObjectArrays;
 import com.google.common.primitives.Booleans;

-import net.minecraft.src.KeyBinding;
+import net.minecraft.client.settings.KeyBinding;
 import cpw.mods.fml.client.registry.KeyBindingRegistry;
 import cpw.mods.fml.common.TickType;
 import cpw.mods.fml.common.modloader.ModLoaderModContainer;
@@ -1,9 +1,21 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.client.registry;

-import net.minecraft.src.TileEntity;
-import net.minecraft.src.TileEntityRenderer;
-import net.minecraft.src.TileEntitySpecialRenderer;
 import cpw.mods.fml.common.registry.GameRegistry;
+import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.tileentity.TileEntity;

 public class ClientRegistry
 {
@@ -1,8 +1,20 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.client.registry;

-import net.minecraft.src.Block;
-import net.minecraft.src.IBlockAccess;
-import net.minecraft.src.RenderBlocks;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.world.IBlockAccess;

 public interface ISimpleBlockRenderingHandler
 {
@@ -1,11 +1,23 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.client.registry;

 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.Set;

-import net.minecraft.src.GameSettings;
-import net.minecraft.src.KeyBinding;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.KeyBinding;

 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
@@ -14,9 +26,9 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;

 import cpw.mods.fml.common.ITickHandler;
-import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.TickType;
 import cpw.mods.fml.common.registry.TickRegistry;
+import cpw.mods.fml.relauncher.Side;

 public class KeyBindingRegistry
 {
@@ -160,6 +172,10 @@ public class KeyBindingRegistry

    private Set<KeyHandler> keyHandlers = Sets.newLinkedHashSet();

+    /**
+     * Deprecated as it should not be used by client code
+     * @return
+     */
    @Deprecated
    public static KeyBindingRegistry instance()
    {
@@ -1,22 +1,30 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.client.registry;

 import java.util.List;
 import java.util.Map;

-import net.minecraft.src.Block;
-import net.minecraft.src.Entity;
-import net.minecraft.src.IBlockAccess;
-import net.minecraft.src.Render;
-import net.minecraft.src.RenderBiped;
-import net.minecraft.src.RenderBlocks;
-import net.minecraft.src.RenderManager;
-import net.minecraft.src.RenderPlayer;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.entity.*;
+import net.minecraft.entity.Entity;
+import net.minecraft.world.IBlockAccess;

 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.ObjectArrays;

-import cpw.mods.fml.client.SpriteHelper;
 import cpw.mods.fml.client.TextureFXManager;

 /**
@@ -27,7 +35,7 @@ public class RenderingRegistry
 {
    private static final RenderingRegistry INSTANCE = new RenderingRegistry();

-    private int nextRenderId = 36;
+    private int nextRenderId = 40;

    private Map<Integer, ISimpleBlockRenderingHandler> blockRenderers = Maps.newHashMap();

@@ -40,9 +48,8 @@ public class RenderingRegistry
     */
    public static int addNewArmourRendererPrefix(String armor)
    {
-        RenderPlayer.field_77110_j = ObjectArrays.concat(RenderPlayer.field_77110_j, armor);
-        RenderBiped.field_82424_k = RenderPlayer.field_77110_j;
-        return RenderPlayer.field_77110_j.length - 1;
+        RenderBiped.field_82424_k = ObjectArrays.concat(RenderBiped.field_82424_k, armor);
+        return RenderBiped.field_82424_k.length - 1;
    }

    /**
@@ -93,11 +100,10 @@ public class RenderingRegistry
     * @param fileToOverride
     * @param fileToAdd
     */
+    @Deprecated
    public static int addTextureOverride(String fileToOverride, String fileToAdd)
    {
-        int idx = SpriteHelper.getUniqueSpriteIndex(fileToOverride);
-        addTextureOverride(fileToOverride, fileToAdd, idx);
-        return idx;
+        return -1;
    }

    /**
@@ -109,7 +115,7 @@ public class RenderingRegistry
     */
    public static void addTextureOverride(String path, String overlayPath, int index)
    {
-        TextureFXManager.instance().addNewTextureOverride(path, overlayPath, index);
+//        TextureFXManager.instance().addNewTextureOverride(path, overlayPath, index);
    }

    /**
@@ -117,9 +123,10 @@ public class RenderingRegistry
     *
     * @param path
     */
+    @Deprecated
    public static int getUniqueTextureIndex(String path)
    {
-        return SpriteHelper.getUniqueSpriteIndex(path);
+        return -1;
    }

    @Deprecated public static RenderingRegistry instance()
@@ -12,17 +12,35 @@
 */
 package net.minecraft.src;

-import static cpw.mods.fml.common.Side.CLIENT;
+import static cpw.mods.fml.relauncher.Side.CLIENT;

 import java.util.Map;
 import java.util.Random;

-import net.minecraft.client.Minecraft;
+import net.minecraft.block.Block;
+import net.minecraft.client.*;
+import net.minecraft.client.entity.EntityClientPlayerMP;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.multiplayer.NetClientHandler;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.INetworkManager;
+import net.minecraft.network.NetServerHandler;
+import net.minecraft.network.packet.NetHandler;
+import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.TickType;
-import cpw.mods.fml.common.asm.SideOnly;
+import cpw.mods.fml.relauncher.SideOnly;

 public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModProxy
 {
@@ -312,6 +330,8 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
    }
    /**
     * Called client side to receive a custom payload for this mod
+     * 
+     * NOTE: this method is not provided in Risugami's implementation of BaseMod!
     *
     * @param packet
     */
@@ -338,7 +358,9 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
        return false;

    }
-
+    /*
+     * NOTE: this method is not provided in Risugami's implementation of BaseMod!
+     */
    @Override
    public void serverConnect(NetHandler handler) {

@@ -350,6 +372,9 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr

    }

+    /*
+     * NOTE: this method is not provided in Risugami's implementation of BaseMod!
+     */
    @Override
    public void serverDisconnect() {

@@ -393,6 +418,8 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
    }
    /**
     * Called when a new client logs in.
+     * 
+     * NOTE: this method is not provided in Risugami's implementation of BaseMod!
     *
     * @param player
     */
@@ -403,6 +430,8 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr

    /**
     * Called when a client logs out of the server.
+     * 
+     * NOTE: this method is not provided in Risugami's implementation of BaseMod!
     */
    @Override
    public void onClientLogout(INetworkManager mgr)
@@ -419,6 +448,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
        return null;
    }

+    @SideOnly(CLIENT)
    public void clientCustomPayload(NetClientHandler handler, Packet250CustomPayload packet)
    {

@@ -1,20 +1,19 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
 */

 package net.minecraft.src;

 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.EntityRenderer;

 public class EntityRendererProxy extends EntityRenderer
 {
@@ -1,15 +1,13 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Contributors:
+ *     cpw - implementation
 */

 package net.minecraft.src;
@@ -19,6 +17,10 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;

+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.world.IBlockAccess;
+
 import cpw.mods.fml.client.TextureFXManager;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.FMLLog;
@@ -34,12 +36,14 @@ public class FMLRenderAccessLibrary
 {
    public static Logger getLogger()
    {
-        return FMLLog.getLogger();
+        Logger l = Logger.getLogger("FMLRenderAccessLibrary");
+        l.setParent(FMLLog.getLogger());
+        return l;
    }

    public static void log(Level level, String message)
    {
-        FMLLog.log(level, message);
+        FMLLog.log("FMLRenderAccessLibrary", level, message);
    }

    public static void log(Level level, String message, Throwable throwable)
@@ -47,31 +51,6 @@ public class FMLRenderAccessLibrary
        FMLLog.log(level, throwable, message);
    }

-    public static void setTextureDimensions(int textureId, int width, int height, List<TextureFX> textureFXList)
-    {
-        TextureFXManager.instance().setTextureDimensions(textureId, width, height, textureFXList);
-    }
-
-    public static void preRegisterEffect(TextureFX textureFX)
-    {
-        TextureFXManager.instance().onPreRegisterEffect(textureFX);
-    }
-
-    public static boolean onUpdateTextureEffect(TextureFX textureFX)
-    {
-        return TextureFXManager.instance().onUpdateTextureEffect(textureFX);
-    }
-
-    public static Dimension getTextureDimensions(TextureFX textureFX)
-    {
-        return TextureFXManager.instance().getTextureDimensions(textureFX);
-    }
-
-    public static void onTexturePackChange(RenderEngine engine, ITexturePack texturePack, List<TextureFX> textureFXList)
-    {
-        TextureFXManager.instance().onTexturePackChange(engine, texturePack, textureFXList);
-    }
-
    @SuppressWarnings("deprecation")
    public static boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelId)
    {
@@ -89,4 +68,9 @@ public class FMLRenderAccessLibrary
    {
        return RenderingRegistry.instance().renderItemAsFull3DBlock(modelId);
    }
+
+//    public static void doTextureCopy(Texture atlas, Texture source, int targetX, int targetY)
+//    {
+//        TextureFXManager.instance().getHelper().doTextureCopy(atlas, source, targetX, targetY);
+//    }
 }
@@ -12,7 +12,7 @@
 */
 package net.minecraft.src;

-import static cpw.mods.fml.common.Side.CLIENT;
+import static cpw.mods.fml.relauncher.Side.CLIENT;

 import java.awt.image.BufferedImage;
 import java.util.Collections;
@@ -20,10 +20,40 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;

-import net.minecraft.client.Minecraft;
-import net.minecraft.server.MinecraftServer;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockDispenser;
+import net.minecraft.client.*;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.multiplayer.NetClientHandler;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.command.ICommand;
+import net.minecraft.dispenser.IBehaviorDispenseItem;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.NetServerHandler;
+import net.minecraft.network.packet.Packet;
+import net.minecraft.network.packet.Packet1Login;
+import net.minecraft.network.packet.Packet250CustomPayload;
+import net.minecraft.server.*;
+import net.minecraft.stats.Achievement;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldType;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraft.world.chunk.IChunkProvider;
 import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.client.SpriteHelper;
 import cpw.mods.fml.client.TextureFXManager;
 import cpw.mods.fml.client.modloader.ModLoaderClientHelper;
 import cpw.mods.fml.client.modloader.ModLoaderKeyBindingHandler;
@@ -34,7 +64,6 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ObfuscationReflectionHelper;
-import cpw.mods.fml.common.asm.SideOnly;
 import cpw.mods.fml.common.modloader.ModLoaderHelper;
 import cpw.mods.fml.common.modloader.ModLoaderModContainer;
 import cpw.mods.fml.common.network.NetworkRegistry;
@@ -43,6 +72,7 @@ import cpw.mods.fml.common.network.Player;
 import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
+import cpw.mods.fml.relauncher.SideOnly;
 import cpw.mods.fml.server.FMLServerHandler;

 public class ModLoader
@@ -87,12 +117,6 @@ public class ModLoader
    {
    }

-    @SideOnly(CLIENT)
-    public static void addAnimation(TextureFX anim)
-    {
-        TextureFXManager.instance().addAnimation(anim);
-    }
-
    /**
     * Adds a new prefix to the armor texture list
     *
@@ -197,6 +221,7 @@ public class ModLoader
     * @param fileToAdd The new image
     * @return The 'icon index' in the main image that the new image will be applied to
     */
+    @Deprecated
    @SideOnly(CLIENT)
    public static int addOverride(String fileToOverride, String fileToAdd)
    {
@@ -492,10 +517,11 @@ public class ModLoader
        return EntityRegistry.findGlobalUniqueEntityId();
    }

+    @Deprecated
    @SideOnly(CLIENT)
    public static int getUniqueSpriteIndex(String path)
    {
-        return SpriteHelper.getUniqueSpriteIndex(path);
+        return -1;
    }

    /**
@@ -514,7 +540,7 @@ public class ModLoader
    @SideOnly(CLIENT)
    public static boolean isGUIOpen(Class<? extends GuiScreen> gui)
    {
-        return FMLClientHandler.instance().getClient().field_71462_r != null && FMLClientHandler.instance().getClient().field_71462_r.equals(gui);
+        return FMLClientHandler.instance().isGUIOpen(gui);
    }

    /**
@@ -537,11 +563,11 @@ public class ModLoader
    {
    }

-    @SideOnly(CLIENT)
-    public static BufferedImage loadImage(RenderEngine renderEngine, String path) throws Exception
-    {
-        return TextureFXManager.instance().loadImageFromTexturePack(renderEngine, path);
-    }
+//    @SideOnly(CLIENT)
+//    public static BufferedImage loadImage(RenderEngine renderEngine, String path) throws Exception
+//    {
+//        return TextureFXManager.instance().loadImageFromTexturePack(renderEngine, path);
+//    }

    /**
     * Call in from elsewhere. Unimplemented here.
@@ -589,17 +615,18 @@ public class ModLoader
        return keys;
    }

-    @Deprecated
-    @SideOnly(CLIENT)
-    public static void registerAllTextureOverrides(RenderEngine cache)
-    {
-    }
+//    @Deprecated
+//    @SideOnly(CLIENT)
+//    public static void registerAllTextureOverrides(RenderEngine cache)
+//    {
+//    }

    /**
     * Register a new block
     *
     * @param block
     */
+    @SuppressWarnings("deprecation")
    public static void registerBlock(Block block)
    {
        GameRegistry.registerBlock(block);
@@ -611,6 +638,7 @@ public class ModLoader
     * @param block
     * @param itemclass
     */
+    @SuppressWarnings("deprecation")
    public static void registerBlock(Block block, Class<? extends ItemBlock> itemclass)
    {
        GameRegistry.registerBlock(block, itemclass);
@@ -783,14 +811,12 @@ public class ModLoader
    @Deprecated
    public static void serverChat(String text)
    {
-        //TODO
    }

    @Deprecated
    @SideOnly(CLIENT)
    public static void serverLogin(NetClientHandler handler, Packet1Login loginPacket)
    {
-        //TODO
    }

    public static void serverSendPacket(NetServerHandler handler, Packet packet)
@@ -1,139 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package net.minecraft.src;
-
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.ImageObserver;
-
-import org.lwjgl.opengl.GL11;
-
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.client.FMLTextureFX;
-
-/**
- * A texture override for animations, it takes a vertical image of
- * texture frames and constantly rotates them in the texture.
- */
-public class ModTextureAnimation extends FMLTextureFX
-{
-    private final int tickRate;
-    private byte[][] images;
-    private int index = 0;
-    private int ticks = 0;
-
-    private String targetTex = null;
-    private BufferedImage imgData = null;
-
-    public ModTextureAnimation(int icon, int target, BufferedImage image, int tickCount)
-    {
-        this(icon, 1, target, image, tickCount);
-    }
-
-    public ModTextureAnimation(int icon, int size, int target, BufferedImage image, int tickCount)
-    {
-        this(icon, size, (target == 0 ? "/terrain.png" : "/gui/items.png"), image, tickCount);
-    }
-
-    public ModTextureAnimation(int icon, int size, String target, BufferedImage image, int tickCount)
-    {
-        super(icon);
-        RenderEngine re = FMLClientHandler.instance().getClient().field_71446_o;
-
-        targetTex = target;
-        field_76849_e = size;
-        field_76847_f = re.func_78341_b(target);
-
-        tickRate = tickCount;
-        ticks = tickCount;
-        imgData = image;
-    }
-
-    @Override
-    public void setup()
-    {
-        super.setup();
-
-        int sWidth  = imgData.getWidth();
-        int sHeight = imgData.getHeight();
-        int tWidth  = tileSizeBase;
-        int tHeight = tileSizeBase;
-
-
-        int frames = (int)Math.floor((double)(sHeight / sWidth));
-
-        if (frames < 1)
-        {
-            throw new IllegalArgumentException(String.format("Attempted to create a TextureAnimation with no complete frames: %dx%d", sWidth, sHeight));
-        }
-        else
-        {
-            images = new byte[frames][];
-            BufferedImage image = imgData;
-
-            if (sWidth != tWidth)
-            {
-                BufferedImage b = new BufferedImage(tWidth, tHeight * frames, 6);
-                Graphics2D g = b.createGraphics();
-                g.drawImage(imgData, 0, 0, tWidth, tHeight * frames, 0, 0, sWidth, sHeight, (ImageObserver)null);
-                g.dispose();
-                image = b;
-            }
-
-            for (int frame = 0; frame < frames; frame++)
-            {
-                int[] pixels = new int[tileSizeSquare];
-                image.getRGB(0, tHeight * frame, tWidth, tHeight, pixels, 0, tWidth);
-                images[frame] = new byte[tileSizeSquare << 2];
-
-                for (int i = 0; i < pixels.length; i++)
-                {
-                    int i4 = i * 4;
-                    images[frame][i4 + 0] = (byte)(pixels[i] >> 16 & 255);
-                    images[frame][i4 + 1] = (byte)(pixels[i] >> 8  & 255);
-                    images[frame][i4 + 2] = (byte)(pixels[i] >> 0  & 255);
-                    images[frame][i4 + 3] = (byte)(pixels[i] >> 24 & 255);
-                }
-            }
-        }
-    }
-
-    public void func_76846_a()
-    {
-        if (++ticks >= tickRate)
-        {
-            if (++index >= images.length)
-            {
-                index = 0;
-            }
-
-            field_76852_a = images[index];
-            ticks = 0;
-        }
-    }
-
-    public void func_76845_a(RenderEngine renderEngine)
-    {
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, field_76847_f);
-    }
-
-    // TODO: REMOVE THIS - just for you dan200
-    @Deprecated
-    public void func_783_a()
-    {
-        func_76846_a();
-    }
-
-}
@@ -1,181 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package net.minecraft.src;
-
-import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D;
-
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.ImageObserver;
-
-import org.lwjgl.opengl.GL11;
-
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.client.FMLTextureFX;
-
-public class ModTextureStatic extends FMLTextureFX
-{
-    private boolean oldanaglyph = false;
-    private int[] pixels = null;
-    private String targetTex = null;
-    private int storedSize;
-    private BufferedImage overrideData = null;
-    private int needApply = 2;
-
-
-    public ModTextureStatic(int icon, int target, BufferedImage image)
-    {
-        this(icon, 1, target, image);
-    }
-
-    public ModTextureStatic(int icon, int size, int target, BufferedImage image)
-    {
-        this(icon, size, (target == 0 ? "/terrain.png" : "/gui/items.png"), image);
-    }
-
-    public ModTextureStatic(int icon, int size, String target, BufferedImage image)
-    {
-        super(icon);
-        RenderEngine re = FMLClientHandler.instance().getClient().field_71446_o;
-
-        targetTex = target;
-        storedSize = size;
-        field_76849_e = size;
-        field_76847_f = re.func_78341_b(target);
-        overrideData = image;
-    }
-
-    @Override
-    public void setup()
-    {
-        super.setup();
-        int sWidth  = overrideData.getWidth();
-        int sHeight = overrideData.getHeight();
-
-        pixels = new int[tileSizeSquare];
-        if (tileSizeBase == sWidth && tileSizeBase == sHeight)
-        {
-            overrideData.getRGB(0, 0, sWidth, sHeight, pixels, 0, sWidth);
-        }
-        else
-        {
-            BufferedImage tmp = new BufferedImage(tileSizeBase, tileSizeBase, 6);
-            Graphics2D gfx = tmp.createGraphics();
-            gfx.drawImage(overrideData, 0, 0, tileSizeBase, tileSizeBase, 0, 0, sWidth, sHeight, (ImageObserver)null);
-            tmp.getRGB(0, 0, tileSizeBase, tileSizeBase, pixels, 0, tileSizeBase);
-            gfx.dispose();
-        }
-
-        update();
-    }
-
-    @Override
-    public void func_76846_a()
-    {
-        if (oldanaglyph != field_76851_c)
-        {
-            update();
-        }
-        // This makes it so we only apply the texture to the target texture when we need to,
-        //due to the fact that update is called when the Effect is first registered, we actually
-        //need to wait for the next one.
-        field_76849_e = (needApply == 0 ? 0 : storedSize);
-        if (needApply > 0)
-        {
-            needApply--;
-        }
-    }
-
-    @Override
-    public void func_76845_a(RenderEngine p_76845_1_)
-    {
-        GL11.glBindTexture(GL_TEXTURE_2D, p_76845_1_.func_78341_b(targetTex));
-    }
-
-    public void update()
-    {
-        needApply = 2;
-        for (int idx = 0; idx < pixels.length; idx++)
-        {
-            int i = idx * 4;
-            int a = pixels[idx] >> 24 & 255;
-            int r = pixels[idx] >> 16 & 255;
-            int g = pixels[idx] >> 8 & 255;
-            int b = pixels[idx] >> 0 & 255;
-
-            if (field_76851_c)
-            {
-                r = g = b = (r + g + b) / 3;
-            }
-
-            field_76852_a[i + 0] = (byte)r;
-            field_76852_a[i + 1] = (byte)g;
-            field_76852_a[i + 2] = (byte)b;
-            field_76852_a[i + 3] = (byte)a;
-        }
-
-        oldanaglyph = field_76851_c;
-    }
-
-    //Implementation of http://scale2x.sourceforge.net/algorithm.html
-    public static BufferedImage scale2x(BufferedImage image)
-    {
-        int w = image.getWidth();
-        int h = image.getHeight();
-        BufferedImage tmp = new BufferedImage(w * 2, h * 2, 2);
-
-        for (int x = 0; x < h; ++x)
-        {
-            int x2 = x * 2;
-            for (int y = 0; y < w; ++y)
-            {
-                int y2 = y * 2;
-                int E = image.getRGB(y, x);
-                int D = (x == 0     ? E : image.getRGB(y,     x - 1));
-                int B = (y == 0     ? E : image.getRGB(y - 1, x    ));
-                int H = (y >= w - 1 ? E : image.getRGB(y + 1, x    ));
-                int F = (x >= h - 1 ? E : image.getRGB(y,     x + 1));
-
-                int e0, e1, e2, e3;
-
-                if (B != H && D != F)
-                {
-                    e0 = D == B ? D : E;
-                    e1 = B == F ? F : E;
-                    e2 = D == H ? D : E;
-                    e3 = H == F ? F : E;
-                }
-                else
-                {
-                    e0 = e1 = e2 = e3 = E;
-                }
-
-                tmp.setRGB(y2,     x2,     e0);
-                tmp.setRGB(y2 + 1, x2,     e1);
-                tmp.setRGB(y2,     x2 + 1, e2);
-                tmp.setRGB(y2 + 1, x2 + 1, e3);
-            }
-        }
-
-        return tmp;
-    }
-
-
-    @Override
-    public String toString()
-    {
-        return String.format("ModTextureStatic %s @ %d", targetTex, field_76850_b);
-    }
-}
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package net.minecraft.src;

 /**
@@ -1,175 +1,90 @@
 --- commands.py
 +++ commands.py
-@@ -58,6 +58,8 @@
+@@ -141,6 +141,8 @@
+             fieldnames = csvreader.fieldnames
+     return set(fieldnames)
 
+def commands_sanity_check():
+    print '    Commands patch applied successfully'
 
- def reallyrmtree(path):
-+    if os.path.isfile(os.path.join(path, 'asm-all-4.0.jar')): #Check if asm exists, indicating the libs folder, if so, don't delete it
-+        return
-     if not sys.platform.startswith('win'):
-         if os.path.exists(path):
-             shutil.rmtree(path)
-@@ -584,6 +586,9 @@
-         self.has_astyle_cfg = False
-         if os.path.isfile(self.astyleconf):
-             self.has_astyle_cfg = True
-+            
-+        #FML Entries
-+        self.srcshared = os.path.normpath(os.path.join(self.dirsrc, 'common'))
- 
-     def creatergcfg(self, reobf=False, keep_lvt=False, keep_generics=False, rg_update=False):
-         """Create the files necessary for RetroGuard"""
-@@ -781,13 +786,16 @@
-         testlk = {CLIENT: self.testclient, SERVER: self.testserver}
- 
-         if not os.path.exists(os.path.join(srclk[side], os.path.normpath(testlk[side] + '.java'))):
-            return False
-+            if not os.path.exists(os.path.join(self.srcshared, os.path.normpath(testlk[side] + '.java'))):
-+                return False
-         return True
- 
-     def checkbins(self, side):
+ class Commands(object):
+     """Contains the commands and initialisation for a full mcp run"""
+@@ -952,6 +954,8 @@
         binlk = {CLIENT: self.binclient, SERVER: self.binserver}
         testlk = {CLIENT: self.testclient, SERVER: self.testserver}
 
-+        if side == SERVER:
+        if side == SERVER and not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
 +            return self.checkbins(CLIENT)
         if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
             return False
         return True
-@@ -1029,6 +1037,10 @@
+@@ -1283,23 +1287,34 @@
+         pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver}
         pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
         pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
- 
-+        if side == SERVER: #Disable server because FML recombines it into client
-+            self.logger.info('Server side recompiling skipped, this is normal')
-+            return
 +        
+        if side == SERVER: #Warn about server because FML recombines it into client
+            self.logger.info('Server side recompiling might be skipped, this is normal, do not complain to FML/Forge team about server side.')
+ 
         if not os.path.exists(pathbinlk[side]):
             os.makedirs(pathbinlk[side])
 
-@@ -1041,6 +1053,7 @@
+         # HINT: We create the list of source directories based on the list of packages
+         # on windows we just pass wildcards, otherwise we pass the full file list
+-        if self.osname == 'win':
+        if self.osname == 'win' and False == True: #FML: Disable for windows we write to file now
+             all_files = False
+             append_pattern = True
+         else:
             all_files = True
             append_pattern = False
         pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=append_pattern, all_files=all_files)
-+        pkglist = pkglist + filterdirs(self.srcshared, '*.java', append_pattern=append_pattern, all_files=all_files) #FML, Add Common folder
-         dirs = ' '.join(pkglist)
+        from tempfile import NamedTemporaryFile
+         if self.cmdrecompscala: # Compile scala before java as scala scans java files, but not vice-versa
+             pkglistscala = pkglist[:]
+             pkglistscala.extend(filterdirs(pathsrclk[side], '*.scala', append_pattern=append_pattern, all_files=all_files))
+-            dirs = ' '.join(pkglistscala)
+            f = NamedTemporaryFile(mode='wb', suffix='.txt', prefix ='scala_src_path_', delete=False) #FML: We write to a temporary file just in case the command is to long
+            for line in pkglistscala:
+                if os.sep == '\\':
+                    f.write('"%s"\n' % os.path.abspath(line).replace(os.sep, os.sep + os.sep))
+                else:
+                    f.write('"%s"\n' % os.path.abspath(line))
+            f.close()
+            dirs = '@"%s"' % f.name
+             classpath = os.pathsep.join(cplk[side])
+             forkcmd = self.cmdrecompscala.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side], pkgs=dirs)
+             try:
+@@ -1319,7 +1334,15 @@
+                 self.logger.error('================================')
+                 self.logger.error('')
+                 raise
+-        dirs = ' '.join(pkglist)
+            os.unlink(f.name)
+        f = NamedTemporaryFile(mode='wb', suffix='.txt', prefix ='java_src_path_', delete=False) #FML: We write to a temporary file just in case the command is to long
+        for line in pkglist:
+            if os.sep == '\\':
+                f.write('"%s"\n' % os.path.abspath(line).replace('\\', '\\\\'))
+            else:
+                f.write('"%s"\n' % os.path.abspath(line))
+        f.close()
+        dirs = '@"%s"' % f.name
         classpath = os.pathsep.join(cplk[side])
         forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side],
-@@ -1062,7 +1075,7 @@
+                                         pkgs=dirs)
+@@ -1338,9 +1361,10 @@
+             self.logger.error('==================')
+             self.logger.error('')
             raise
+        os.unlink(f.name)
 
-     def startserver(self):
+     def startserver(self, mainclass, extraargs):
 -        classpath = [self.binserver] + self.cpathserver
-+        classpath = [self.binclient, self.srcshared] + self.cpathserver
+        classpath = [self.binclient, self.srcclient] + self.cpathserver + self.cpathclient
         classpath = [os.path.join('..', p) for p in classpath]
         classpath = os.pathsep.join(classpath)
         os.chdir(self.dirjars)
-@@ -1070,7 +1083,7 @@
-         self.runmc(forkcmd)
- 
-     def startclient(self):
-        classpath = [self.binclient] + self.cpathclient
-+        classpath = [self.binclient, self.srcshared] + self.cpathclient
-         classpath = [os.path.join('..', p) for p in classpath]
-         classpath = os.pathsep.join(classpath)
-         natives = os.path.join('..', self.dirnatives)
-@@ -1197,20 +1210,20 @@
-         with open(self.csvmethods, 'rb') as fh:
-             methodsreader = csv.DictReader(fh)
-             for row in methodsreader:
-                if int(row['side']) == side:
-+                if int(row['side']) == side or int(row['side']) == 2:
-                     if row['name'] != row['searge']:
-                         names['methods'][row['searge']] = row['name']
-         with open(self.csvfields, 'rb') as fh:
-             fieldsreader = csv.DictReader(fh)
-             for row in fieldsreader:
-                if int(row['side']) == side:
-+                if int(row['side']) == side or int(row['side']) == 2:
-                     if row['name'] != row['searge']:
-                         names['fields'][row['searge']] = row['name']
-         if self.has_param_csv:
-             with open(self.csvparams, 'rb') as fh:
-                 paramsreader = csv.DictReader(fh)
-                 for row in paramsreader:
-                    if int(row['side']) == side:
-+                    if int(row['side']) == side or int(row['side']) == 2:
-                         names['params'][row['param']] = row['name']
- 
-         regexps = {
-@@ -1240,6 +1253,11 @@
- 
-         # HINT: We pathwalk the sources
-         for path, _, filelist in os.walk(pathsrclk[side], followlinks=True):
-+            for cur_file in fnmatch.filter(filelist, '*.java'):
-+                updatefile(os.path.normpath(os.path.join(path, cur_file)))
-+                
-+        # FML, copy of the above, for the common folder
-+        for path, _, filelist in os.walk(self.srcshared, followlinks=True):
-             for cur_file in fnmatch.filter(filelist, '*.java'):
-                 updatefile(os.path.normpath(os.path.join(path, cur_file)))
-         return True
-@@ -1322,12 +1340,14 @@
-         pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
- 
-         strip_comments(pathsrclk[side])
-+        strip_comments(self.srcshared)
- 
-     def process_cleanup(self, side):
-         """Do lots of random cleanups including stripping comments, trailing whitespace and extra blank lines"""
-         pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
- 
-         src_cleanup(pathsrclk[side], fix_imports=True, fix_unicode=True, fix_charval=True, fix_pi=True, fix_round=False)
-+        src_cleanup(self.srcshared, fix_imports=True, fix_unicode=True, fix_charval=True, fix_pi=True, fix_round=False)
- 
-     def process_javadoc(self, side):
-         """Add CSV descriptions to methods and fields as javadoc"""
-@@ -1336,6 +1356,21 @@
-         if not self.has_doc_csv:
-             self.logger.warning('!! javadoc disabled due to no csvs !!')
-             return False
-+            
-+        #FML Recall this function on the common folder
-+        #Potential bug: If this is called without a subsiquent rename call, will cause double comments
-+        if pathsrclk[side] != self.srcshared:
-+            if side == CLIENT:
-+                tmp = self.srcclient
-+                self.srcclient = self.srcshared
-+                self.process_javadoc(side)
-+                self.srcclient = tmp
-+            else:
-+                tmp = self.srcserver
-+                self.srcserver = self.srcshared
-+                self.process_javadoc(side)
-+                self.srcserver = tmp
-+                
- 
-         #HINT: We read the relevant CSVs
-         methodsreader = csv.DictReader(open(self.csvmethods, 'r'))
-@@ -1344,13 +1379,13 @@
-         methods = {}
-         for row in methodsreader:
-             #HINT: Only include methods that have a non-empty description
-            if int(row['side']) == side and row['desc']:
-+            if (int(row['side']) == side or int(row['side']) == 2) and row['desc']:
-                 methods[row['searge']] = row['desc'].replace('*/', '* /')
- 
-         fields = {}
-         for row in fieldsreader:
-             #HINT: Only include fields that have a non-empty description
-            if int(row['side']) == side and row['desc']:
-+            if (int(row['side']) == side or int(row['side']) == 2) and row['desc']:
-                 fields[row['searge']] = row['desc'].replace('*/', '* /')
- 
-         regexps = {
-@@ -1422,12 +1457,13 @@
- 
-         # HINT: We create the list of source directories based on the list of packages
-         pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=True)
-+        pkglist = pkglist + filterdirs(self.srcshared, '*.java', append_pattern=True) #FML, Add Common folder
-         dirs = ' '.join(pkglist)
-         forkcmd = self.cmdastyle.format(classes=dirs, conffile=self.astyleconf)
+@@ -1705,7 +1729,7 @@
         self.runcmd(forkcmd)
         return True
 
@@ -178,7 +93,7 @@
         if not reobf:
             md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
         else:
-@@ -1442,6 +1478,9 @@
+@@ -1720,6 +1744,9 @@
                     class_path = ''
                 else:
                     class_path += '/'
@@ -188,7 +103,7 @@
                 for class_file in fnmatch.filter(filelist, '*.class'):
                     class_name = class_path + os.path.splitext(class_file)[0]
                     bin_file = os.path.normpath(os.path.join(path, class_file))
-@@ -1594,6 +1633,9 @@
+@@ -1892,6 +1919,9 @@
                 sys.exit(1)
 
         for entry in newfiles:
@@ -198,7 +113,7 @@
             if entry[3] == 'U':
                 self.logger.info('Retrieving file from server : %s', entry[0])
                 cur_file = os.path.normpath(entry[0])
-@@ -1614,6 +1656,9 @@
+@@ -1912,6 +1942,9 @@
         md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
         outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
         src = {CLIENT: self.srcclient, SERVER: self.srcserver}
@@ -208,28 +123,3 @@
 
         # HINT: We need a table for the old md5 and the new ones
         md5table = {}
-@@ -1646,6 +1691,7 @@
-         # HINT: We extract the source files for the modified class files
-         for in_class in trgclasses:
-             src_file = os.path.normpath(os.path.join(src[side], in_class + '.java'))
-+            cmn_file = os.path.normpath(os.path.join(self.srcshared, in_class + '.java'))
-             dest_file = os.path.normpath(os.path.join(outpathlk[side], in_class + '.java'))
-             if os.path.isfile(src_file):
-                 if not os.path.exists(os.path.dirname(dest_file)):
-@@ -1655,4 +1701,15 @@
-                     self.logger.info('> Outputted %s to %s', in_class.ljust(35), outpathlk[side])
-                 except IOError:
-                     self.logger.error('* File %s copy failed', in_class)
-
-+            elif os.path.isfile(cmn_file):
-+                if not os.path.exists(os.path.dirname(dest_file)):
-+                    os.makedirs(os.path.dirname(dest_file))
-+                try:
-+                    shutil.copyfile(cmn_file, dest_file)
-+                    self.logger.info('> Outputted %s to %s', in_class.ljust(35), outpathlk[side])
-+                except IOError:
-+                    self.logger.error('* File %s copy failed', in_class)
-+
-+def commands_sanity_check():
-+    print 'Commands patch applied successfully'
-+    
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import java.lang.annotation.ElementType;
@@ -1,8 +1,20 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 /**
 * A marker interface for retrieving a proxy to a bukkit plugin.
- * Fields associated with {@link BukkitPluginRef} annotations should be should probably
+ * Fields associated with {@link BukkitPluginRef} annotations should
 * declare this type and cast down if the target is available (not null)
 * @author cpw
 *
@@ -0,0 +1,68 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
+package cpw.mods.fml.common;
+
+import java.nio.ByteBuffer;
+import java.security.MessageDigest;
+import java.security.cert.Certificate;
+
+public class CertificateHelper {
+
+    private static final String HEXES = "0123456789abcdef";
+
+    public static String getFingerprint(Certificate certificate)
+    {
+        if (certificate == null)
+        {
+            return "NO VALID CERTIFICATE FOUND";
+        }
+        try
+        {
+            MessageDigest md = MessageDigest.getInstance("SHA-1");
+            byte[] der = certificate.getEncoded();
+            md.update(der);
+            byte[] digest = md.digest();
+            return hexify(digest);
+        }
+        catch (Exception e)
+        {
+            return null;
+        }
+    }
+
+    public static String getFingerprint(ByteBuffer buffer)
+    {
+        try
+        {
+            MessageDigest digest = MessageDigest.getInstance("SHA-1");
+            digest.update(buffer);
+            byte[] chksum = digest.digest();
+            return hexify(chksum);
+        }
+        catch (Exception e)
+        {
+            return null;
+        }
+    }
+
+    private static String hexify(byte[] chksum)
+    {
+        final StringBuilder hex = new StringBuilder( 2 * chksum.length );
+        for ( final byte b : chksum ) {
+          hex.append(HEXES.charAt((b & 0xF0) >> 4))
+             .append(HEXES.charAt((b & 0x0F)));
+        }
+        return hex.toString();
+    }
+
+}
@@ -1,8 +1,22 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import java.io.File;
+import java.security.cert.Certificate;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;

 import com.google.common.eventbus.EventBus;
@@ -15,12 +29,17 @@ public class DummyModContainer implements ModContainer
 {
    private ModMetadata md;
    private ArtifactVersion processedVersion;
+    private String label;

    public DummyModContainer(ModMetadata md)
    {
        this.md = md;
    }

+    public DummyModContainer(String label)
+    {
+        this.label = label;
+    }
    public DummyModContainer()
    {
    }
@@ -138,4 +157,27 @@ public class DummyModContainer implements ModContainer
    {
        return Loader.instance().getMinecraftModContainer().getStaticVersionRange();
    }
+
+    @Override
+    public Certificate getSigningCertificate()
+    {
+        return null;
+    }
+
+    @Override
+    public String toString()
+    {
+        return md != null ? getModId() : "Dummy Container ("+label+") @" + System.identityHashCode(this);
+    }
+
+    @Override
+    public Map<String, String> getCustomModProperties()
+    {
+        return EMPTY_PROPERTIES;
+    }
+    @Override
+    public Class<?> getCustomResourcePackClass()
+    {
+        return null;
+    }
 }
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import java.io.File;
@@ -1,16 +1,15 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Contributors:
+ *     cpw - implementation
 */
+
 package cpw.mods.fml.common;

 import java.util.EnumSet;
@@ -18,30 +17,34 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.logging.Level;
 import java.util.logging.Logger;

+import net.minecraft.crash.CrashReport;
+import net.minecraft.crash.CrashReportCategory;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.INetworkManager;
+import net.minecraft.network.packet.NetHandler;
+import net.minecraft.network.packet.Packet131MapData;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.src.CrashReport;
-import net.minecraft.src.CrashReportCategory;
-import net.minecraft.src.DedicatedServer;
-import net.minecraft.src.Entity;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.EntityPlayerMP;
-import net.minecraft.src.NBTBase;
-import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.NetHandler;
-import net.minecraft.src.Packet131MapData;
-import net.minecraft.src.SaveHandler;
-import net.minecraft.src.ServerListenThread;
-import net.minecraft.src.ThreadMinecraftServer;
-import net.minecraft.src.World;
-import net.minecraft.src.WorldInfo;
+import net.minecraft.server.ServerListenThread;
+import net.minecraft.server.ThreadMinecraftServer;
+import net.minecraft.server.dedicated.DedicatedServer;
+import net.minecraft.world.World;
+import net.minecraft.world.storage.SaveHandler;
+import net.minecraft.world.storage.WorldInfo;

+import com.google.common.base.Joiner;
 import com.google.common.base.Objects;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
 import com.google.common.collect.Lists;
+import com.google.common.collect.MapDifference;
 import com.google.common.collect.MapMaker;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -49,7 +52,9 @@ import com.google.common.collect.Sets;
 import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket;
 import cpw.mods.fml.common.network.EntitySpawnPacket;
 import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
+import cpw.mods.fml.common.registry.ItemData;
 import cpw.mods.fml.common.registry.TickRegistry;
+import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.server.FMLServerHandler;


@@ -90,10 +95,10 @@ public class FMLCommonHandler
    public void beginLoading(IFMLSidedHandler handler)
    {
        sidedDelegate = handler;
-        FMLLog.info("Attempting early MinecraftForge initialization");
+        FMLLog.log("MinecraftForge", Level.INFO, "Attempting early MinecraftForge initialization");
        callForgeMethod("initialize");
        callForgeMethod("registerCrashCallable");
-        FMLLog.info("Completed early MinecraftForge initialization");
+        FMLLog.log("MinecraftForge", Level.INFO, "Completed early MinecraftForge initialization");
    }

    public void rescheduleTicks(Side side)
@@ -111,7 +116,7 @@ public class FMLCommonHandler
        for (IScheduledTickHandler ticker : scheduledTicks)
        {
            EnumSet<TickType> ticksToRun = EnumSet.copyOf(Objects.firstNonNull(ticker.ticks(), EnumSet.noneOf(TickType.class)));
-            ticksToRun.removeAll(EnumSet.complementOf(ticks));
+            ticksToRun.retainAll(ticks);
            if (!ticksToRun.isEmpty())
            {
                ticker.tickStart(ticksToRun, data);
@@ -130,7 +135,7 @@ public class FMLCommonHandler
        for (IScheduledTickHandler ticker : scheduledTicks)
        {
            EnumSet<TickType> ticksToRun = EnumSet.copyOf(Objects.firstNonNull(ticker.ticks(), EnumSet.noneOf(TickType.class)));
-            ticksToRun.removeAll(EnumSet.complementOf(ticks));
+            ticksToRun.retainAll(ticks);
            if (!ticksToRun.isEmpty())
            {
                ticker.tickEnd(ticksToRun, data);
@@ -187,7 +192,7 @@ public class FMLCommonHandler
     */
    public void raiseException(Throwable exception, String message, boolean stopGame)
    {
-        FMLCommonHandler.instance().getFMLLogger().throwing("FMLHandler", "raiseException", exception);
+        FMLLog.log(Level.SEVERE, exception, "Something raised an exception. The message was '%s'. 'stopGame' is %b", message, stopGame);
        if (stopGame)
        {
            getSidedDelegate().haltGame(message,exception);
@@ -240,12 +245,9 @@ public class FMLCommonHandler
            {
            	brd.addAll(sidedDelegate.getAdditionalBrandingInformation());
            }
-            try {
-                Properties props=new Properties();
-                props.load(getClass().getClassLoader().getResourceAsStream("fmlbranding.properties"));
-                brd.add(props.getProperty("fmlbranding"));
-            } catch (Exception ex) {
-                // Ignore - no branding file found
+            if (Loader.instance().getFMLBrandingProperties().containsKey("fmlbranding"))
+            {
+                brd.add(Loader.instance().getFMLBrandingProperties().get("fmlbranding"));
            }
            int tModCount = Loader.instance().getModList().size();
            int aModCount = Loader.instance().getActiveModList().size();
@@ -302,9 +304,14 @@ public class FMLCommonHandler
        }
    }

-    public void handleServerStarting(MinecraftServer server)
+    public boolean handleServerAboutToStart(MinecraftServer server)
    {
-        Loader.instance().serverStarting(server);
+        return Loader.instance().serverAboutToStart(server);
+    }
+
+    public boolean handleServerStarting(MinecraftServer server)
+    {
+        return Loader.instance().serverStarting(server);
    }

    public void handleServerStarted()
@@ -441,4 +448,58 @@ public class FMLCommonHandler
            }
        }
    }
+
+    public boolean shouldServerBeKilledQuietly()
+    {
+        if (sidedDelegate == null)
+        {
+            return false;
+        }
+        return sidedDelegate.shouldServerShouldBeKilledQuietly();
+    }
+
+    public void disconnectIDMismatch(MapDifference<Integer, ItemData> serverDifference, NetHandler toKill, INetworkManager network)
+    {
+        sidedDelegate.disconnectIDMismatch(serverDifference, toKill, network);
+    }
+
+    public void handleServerStopped()
+    {
+        MinecraftServer server = getMinecraftServerInstance();
+        Loader.instance().serverStopped();
+        // FORCE the internal server to stop: hello optifine workaround!
+        if (server!=null) ObfuscationReflectionHelper.setPrivateValue(MinecraftServer.class, server, false, "field_71316_v", "u", "serverStopped");
+    }
+
+    public String getModName()
+    {
+        List<String> modNames = Lists.newArrayListWithExpectedSize(3);
+        modNames.add("fml");
+        if (!noForge)
+        {
+            modNames.add("forge");
+        }
+
+        if (Loader.instance().getFMLBrandingProperties().containsKey("snooperbranding"))
+        {
+            modNames.add(Loader.instance().getFMLBrandingProperties().get("snooperbranding"));
+        }
+        return Joiner.on(',').join(modNames);
+    }
+
+    public void addModToResourcePack(ModContainer container)
+    {
+        sidedDelegate.addModAsResource(container);
+    }
+
+    public void updateResourcePackList()
+    {
+        sidedDelegate.updateResourcePackList();
+    }
+
+    public String getCurrentLanguage()
+    {
+        
+        return sidedDelegate.getCurrentLanguage();
+    }
 }
@@ -1,35 +1,39 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Contributors:
+ *     cpw - implementation
 */

 package cpw.mods.fml.common;

+import java.io.File;
+import java.security.cert.Certificate;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
+import java.util.logging.Level;

-import net.minecraft.src.NBTBase;
-import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.NBTTagList;
-import net.minecraft.src.NBTTagString;
-import net.minecraft.src.SaveHandler;
-import net.minecraft.src.WorldInfo;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.world.storage.SaveHandler;
+import net.minecraft.world.storage.WorldInfo;

-import com.google.common.collect.MapMaker;
-import com.google.common.collect.Sets;
 import com.google.common.eventbus.EventBus;

+import cpw.mods.fml.client.FMLFileResourcePack;
+import cpw.mods.fml.client.FMLFolderResourcePack;
+import cpw.mods.fml.common.asm.FMLSanityChecker;
+import cpw.mods.fml.common.registry.GameData;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.ItemData;
+
 /**
 * @author cpw
 *
@@ -50,8 +54,8 @@ public class FMLDummyContainer extends DummyModContainer implements WorldAccessC
                    "to cooperate and provide a good modding environment. " +
                    "The mod loading system is compatible with ModLoader, all your ModLoader " +
                    "mods should work.";
-        meta.url="https://github.com/cpw/FML/wiki";
-        meta.updateUrl="https://github.com/cpw/FML/wiki";
+        meta.url="https://github.com/MinecraftForge/FML/wiki";
+        meta.updateUrl="https://github.com/MinecraftForge/FML/wiki";
        meta.screenshots=new String[0];
        meta.logoFile="";
    }
@@ -75,6 +79,9 @@ public class FMLDummyContainer extends DummyModContainer implements WorldAccessC
            list.func_74742_a(mod);
        }
        fmlData.func_74782_a("ModList", list);
+        NBTTagList itemList = new NBTTagList();
+        GameData.writeItemData(itemList);
+        fmlData.func_74782_a("ModItemData", itemList);
        return fmlData;
    }

@@ -92,14 +99,43 @@ public class FMLDummyContainer extends DummyModContainer implements WorldAccessC
                ModContainer container = Loader.instance().getIndexedModList().get(modId);
                if (container == null)
                {
-                    FMLLog.severe("This world was saved with mod %s which appears to be missing, things may not work well", modId);
+                    FMLLog.log("fml.ModTracker", Level.SEVERE, "This world was saved with mod %s which appears to be missing, things may not work well", modId);
                    continue;
                }
                if (!modVersion.equals(container.getVersion()))
                {
-                    FMLLog.info("This world was saved with mod %s version %s and it is now at version %s, things may not work well", modId, modVersion, container.getVersion());
+                    FMLLog.log("fml.ModTracker", Level.INFO, "This world was saved with mod %s version %s and it is now at version %s, things may not work well", modId, modVersion, container.getVersion());
                }
            }
        }
+        if (tag.func_74764_b("ModItemData"))
+        {
+            NBTTagList modList = tag.func_74761_m("ModItemData");
+            Set<ItemData> worldSaveItems = GameData.buildWorldItemData(modList);
+            GameData.validateWorldSave(worldSaveItems);
+        }
+        else
+        {
+            GameData.validateWorldSave(null);
+        }
+    }
+
+
+    @Override
+    public Certificate getSigningCertificate()
+    {
+        Certificate[] certificates = getClass().getProtectionDomain().getCodeSource().getCertificates();
+        return certificates != null ? certificates[0] : null;
+    }
+
+    @Override
+    public File getSource()
+    {
+        return FMLSanityChecker.fmlLocation;
+    }
+    @Override
+    public Class<?> getCustomResourcePackClass()
+    {
+        return getSource().isDirectory() ? FMLFolderResourcePack.class : FMLFileResourcePack.class;
    }
 }
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import java.util.logging.Level;
@@ -7,11 +19,21 @@ public class FMLLog
 {
    private static cpw.mods.fml.relauncher.FMLRelaunchLog coreLog = cpw.mods.fml.relauncher.FMLRelaunchLog.log;

+    public static void log(String logChannel, Level level, String format, Object... data)
+    {
+        coreLog.log(logChannel, level, format, data);
+    }
+
    public static void log(Level level, String format, Object... data)
    {
        coreLog.log(level, format, data);
    }

+    public static void log(String logChannel, Level level, Throwable ex, String format, Object... data)
+    {
+        coreLog.log(logChannel, level, ex, format, data);
+    }
+
    public static void log(Level level, Throwable ex, String format, Object... data)
    {
        coreLog.log(level, ex, format, data);
@@ -50,4 +72,9 @@ public class FMLLog
    {
        return coreLog.getLogger();
    }
+
+    public static void makeLog(String logChannel)
+    {
+        coreLog.makeLog(logChannel);
+    }
 }
@@ -18,6 +18,7 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.security.cert.Certificate;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -29,11 +30,18 @@ import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;

 import com.google.common.base.Function;
+import com.google.common.base.Predicates;
 import com.google.common.base.Strings;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableBiMap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList.Builder;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.SetMultimap;
@@ -41,6 +49,7 @@ import com.google.common.collect.Sets;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;

+import cpw.mods.fml.common.Mod.CustomProperty;
 import cpw.mods.fml.common.Mod.Instance;
 import cpw.mods.fml.common.Mod.Metadata;
 import cpw.mods.fml.common.discovery.ASMDataTable;
@@ -49,10 +58,13 @@ import cpw.mods.fml.common.event.FMLConstructionEvent;
 import cpw.mods.fml.common.event.FMLEvent;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent;
+import cpw.mods.fml.common.event.FMLFingerprintViolationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
 import cpw.mods.fml.common.event.FMLServerStartedEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
+import cpw.mods.fml.common.event.FMLServerStoppedEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import cpw.mods.fml.common.event.FMLStateEvent;
 import cpw.mods.fml.common.network.FMLNetworkHandler;
@@ -74,31 +86,47 @@ public class FMLModContainer implements ModContainer
    private boolean overridesMetadata;
    private EventBus eventBus;
    private LoadController controller;
-    private Multimap<Class<? extends Annotation>, Object> annotations;
    private DefaultArtifactVersion processedVersion;
    private boolean isNetworkMod;

+    @SuppressWarnings("deprecation")
    private static final BiMap<Class<? extends FMLEvent>, Class<? extends Annotation>> modAnnotationTypes = ImmutableBiMap.<Class<? extends FMLEvent>, Class<? extends Annotation>>builder()
        .put(FMLPreInitializationEvent.class, Mod.PreInit.class)
        .put(FMLInitializationEvent.class, Mod.Init.class)
        .put(FMLPostInitializationEvent.class, Mod.PostInit.class)
+        .put(FMLServerAboutToStartEvent.class, Mod.ServerAboutToStart.class)
        .put(FMLServerStartingEvent.class, Mod.ServerStarting.class)
        .put(FMLServerStartedEvent.class, Mod.ServerStarted.class)
        .put(FMLServerStoppingEvent.class, Mod.ServerStopping.class)
+        .put(FMLServerStoppedEvent.class, Mod.ServerStopped.class)
        .put(IMCEvent.class,Mod.IMCCallback.class)
+        .put(FMLFingerprintViolationEvent.class, Mod.FingerprintWarning.class)
        .build();
    private static final BiMap<Class<? extends Annotation>, Class<? extends FMLEvent>> modTypeAnnotations = modAnnotationTypes.inverse();
    private String annotationDependencies;
    private VersionRange minecraftAccepted;
-
+    private boolean fingerprintNotPresent;
+    private Set<String> sourceFingerprints;
+    private Certificate certificate;
+    private String modLanguage;
+    private ILanguageAdapter languageAdapter;
+    private ListMultimap<Class<? extends FMLEvent>,Method> eventMethods;
+    private Map<String, String> customModProperties;

    public FMLModContainer(String className, File modSource, Map<String,Object> modDescriptor)
    {
        this.className = className;
        this.source = modSource;
        this.descriptor = modDescriptor;
+        this.modLanguage = (String) modDescriptor.get("modLanguage");
+        this.languageAdapter = "scala".equals(modLanguage) ? new ILanguageAdapter.ScalaAdapter() : new ILanguageAdapter.JavaAdapter();
+        this.eventMethods = ArrayListMultimap.create();
    }

+    private ILanguageAdapter getLanguageAdapter()
+    {
+        return languageAdapter;
+    }
    @Override
    public String getModId()
    {
@@ -149,15 +177,15 @@ public class FMLModContainer implements ModContainer
            modMetadata.requiredMods = requirements;
            modMetadata.dependencies = dependencies;
            modMetadata.dependants = dependants;
-            FMLLog.finest("Parsed dependency info : %s %s %s", requirements, dependencies, dependants);
+            FMLLog.log(getModId(), Level.FINEST, "Parsed dependency info : %s %s %s", requirements, dependencies, dependants);
        }
        else
        {
-            FMLLog.finest("Using mcmod dependency info : %s %s %s", modMetadata.requiredMods, modMetadata.dependencies, modMetadata.dependants);
+            FMLLog.log(getModId(), Level.FINEST, "Using mcmod dependency info : %s %s %s", modMetadata.requiredMods, modMetadata.dependencies, modMetadata.dependants);
        }
        if (Strings.isNullOrEmpty(modMetadata.name))
        {
-            FMLLog.info("Mod %s is missing the required element 'name'. Substituting %s", getModId(), getModId());
+            FMLLog.log(getModId(), Level.INFO,"Mod %s is missing the required element 'name'. Substituting %s", getModId(), getModId());
            modMetadata.name = getModId();
        }
        internalVersion = (String) descriptor.get("version");
@@ -167,18 +195,18 @@ public class FMLModContainer implements ModContainer
            if (versionProps != null)
            {
                internalVersion = versionProps.getProperty(getModId()+".version");
-                FMLLog.fine("Found version %s for mod %s in version.properties, using", internalVersion, getModId());
+                FMLLog.log(getModId(), Level.FINE, "Found version %s for mod %s in version.properties, using", internalVersion, getModId());
            }

        }
        if (Strings.isNullOrEmpty(internalVersion) && !Strings.isNullOrEmpty(modMetadata.version))
        {
-            FMLLog.warning("Mod %s is missing the required element 'version' and a version.properties file could not be found. Falling back to metadata version %s", getModId(), modMetadata.version);
+            FMLLog.log(getModId(), Level.WARNING, "Mod %s is missing the required element 'version' and a version.properties file could not be found. Falling back to metadata version %s", getModId(), modMetadata.version);
            internalVersion = modMetadata.version;
        }
        if (Strings.isNullOrEmpty(internalVersion))
        {
-            FMLLog.warning("Mod %s is missing the required element 'version' and no fallback can be found. Substituting '1.0'.", getModId());
+            FMLLog.log(getModId(), Level.WARNING, "Mod %s is missing the required element 'version' and no fallback can be found. Substituting '1.0'.", getModId());
            modMetadata.version = internalVersion = "1.0";
        }

@@ -197,7 +225,7 @@ public class FMLModContainer implements ModContainer
    {
        try
        {
-            FMLLog.fine("Attempting to load the file version.properties from %s to locate a version number for %s", getSource().getName(), getModId());
+            FMLLog.log(getModId(), Level.FINE,"Attempting to load the file version.properties from %s to locate a version number for %s", getSource().getName(), getModId());
            Properties version = null;
            if (getSource().isFile())
            {
@@ -226,7 +254,7 @@ public class FMLModContainer implements ModContainer
        catch (Exception e)
        {
            Throwables.propagateIfPossible(e);
-            FMLLog.fine("Failed to find a usable version.properties file");
+            FMLLog.log(getModId(), Level.FINEST, "Failed to find a usable version.properties file");
            return null;
        }
    }
@@ -278,7 +306,7 @@ public class FMLModContainer implements ModContainer
    {
        if (this.enabled)
        {
-            FMLLog.fine("Enabling mod %s", getModId());
+            FMLLog.log(getModId(), Level.FINE, "Enabling mod %s", getModId());
            this.eventBus = bus;
            this.controller = controller;
            eventBus.register(this);
@@ -290,10 +318,9 @@ public class FMLModContainer implements ModContainer
        }
    }

-    private Multimap<Class<? extends Annotation>, Object> gatherAnnotations(Class<?> clazz) throws Exception
+    private Method gatherAnnotations(Class<?> clazz) throws Exception
    {
-        Multimap<Class<? extends Annotation>,Object> anns = ArrayListMultimap.create();
-
+        Method factoryMethod = null;
        for (Method m : clazz.getDeclaredMethods())
        {
            for (Annotation a : m.getAnnotations())
@@ -301,20 +328,47 @@ public class FMLModContainer implements ModContainer
                if (modTypeAnnotations.containsKey(a.annotationType()))
                {
                    Class<?>[] paramTypes = new Class[] { modTypeAnnotations.get(a.annotationType()) };
-
                    if (Arrays.equals(m.getParameterTypes(), paramTypes))
                    {
                        m.setAccessible(true);
-                        anns.put(a.annotationType(), m);
+                        eventMethods.put(modTypeAnnotations.get(a.annotationType()), m);
                    }
                    else
                    {
-                        FMLLog.severe("The mod %s appears to have an invalid method annotation %s. This annotation can only apply to methods with argument types %s -it will not be called", getModId(), a.annotationType().getSimpleName(), Arrays.toString(paramTypes));
+                        FMLLog.log(getModId(), Level.SEVERE,"The mod %s appears to have an invalid method annotation %s. This annotation can only apply to methods with argument types %s -it will not be called", getModId(), a.annotationType().getSimpleName(), Arrays.toString(paramTypes));
+                    }
+                }
+                else if (a.annotationType().equals(Mod.EventHandler.class))
+                {
+                    if (m.getParameterTypes().length == 1 && modAnnotationTypes.containsKey(m.getParameterTypes()[0]))
+                    {
+                        m.setAccessible(true);
+                        eventMethods.put((Class<? extends FMLEvent>) m.getParameterTypes()[0],m);
+                    }
+                    else
+                    {
+                        FMLLog.log(getModId(), Level.SEVERE,"The mod %s appears to have an invalid event annotation %s. This annotation can only apply to methods with recognized event arguments - it will not be called", getModId(), a.annotationType().getSimpleName());
+                    }
+                }
+                else if (a.annotationType().equals(Mod.InstanceFactory.class))
+                {
+                    if (Modifier.isStatic(m.getModifiers()) && m.getParameterTypes().length == 0 && factoryMethod == null)
+                    {
+                        m.setAccessible(true);
+                        factoryMethod = m;
+                    }
+                    else if (!(Modifier.isStatic(m.getModifiers()) && m.getParameterTypes().length == 0))
+                    {
+                        FMLLog.log(getModId(),  Level.SEVERE, "The InstanceFactory annotation can only apply to a static method, taking zero arguments - it will be ignored on %s(%s)", m.getName(), Arrays.asList(m.getParameterTypes()));
+                    }
+                    else if (factoryMethod != null)
+                    {
+                        FMLLog.log(getModId(), Level.SEVERE, "The InstanceFactory annotation can only be used once, the application to %s(%s) will be ignored", m.getName(), Arrays.asList(m.getParameterTypes()));
                    }
                }
            }
        }
-        return anns;
+        return factoryMethod;
    }

    private void processFieldAnnotations(ASMDataTable asmDataTable) throws Exception
@@ -335,13 +389,6 @@ public class FMLModContainer implements ModContainer
                return mc.getMetadata();
            }
        });
-
-//TODO
-//        for (Object o : annotations.get(Block.class))
-//        {
-//            Field f = (Field) o;
-//            f.set(modInstance, GameRegistry.buildBlock(this, f.getType(), f.getAnnotation(Block.class)));
-//        }
    }

    private void parseSimpleFieldAnnotation(SetMultimap<String, ASMData> annotations, String annotationClassName, Function<ModContainer, Object> retreiver) throws IllegalAccessException
@@ -380,7 +427,7 @@ public class FMLModContainer implements ModContainer
                catch (Exception e)
                {
                    Throwables.propagateIfPossible(e);
-                    FMLLog.log(Level.WARNING, e, "Attempting to load @%s in class %s for %s and failing", annotationName, targets.getClassName(), mc.getModId());
+                    FMLLog.log(getModId(), Level.WARNING, e, "Attempting to load @%s in class %s for %s and failing", annotationName, targets.getClassName(), mc.getModId());
                }
            }
            if (f != null)
@@ -391,7 +438,7 @@ public class FMLModContainer implements ModContainer
                    target = modInstance;
                    if (!modInstance.getClass().equals(clz))
                    {
-                        FMLLog.warning("Unable to inject @%s in non-static field %s.%s for %s as it is NOT the primary mod instance", annotationName, targets.getClassName(), targets.getObjectName(), mc.getModId());
+                        FMLLog.log(getModId(), Level.WARNING, "Unable to inject @%s in non-static field %s.%s for %s as it is NOT the primary mod instance", annotationName, targets.getClassName(), targets.getObjectName(), mc.getModId());
                        continue;
                    }
                }
@@ -408,13 +455,68 @@ public class FMLModContainer implements ModContainer
            ModClassLoader modClassLoader = event.getModClassLoader();
            modClassLoader.addFile(source);
            Class<?> clazz = Class.forName(className, true, modClassLoader);
-            ASMDataTable asmHarvestedAnnotations = event.getASMHarvestedData();
-            // TODO
-            asmHarvestedAnnotations.getAnnotationsFor(this);
-            annotations = gatherAnnotations(clazz);
+
+            Certificate[] certificates = clazz.getProtectionDomain().getCodeSource().getCertificates();
+            int len = 0;
+            if (certificates != null)
+            {
+                len = certificates.length;
+            }
+            Builder<String> certBuilder = ImmutableList.<String>builder();
+            for (int i = 0; i < len; i++)
+            {
+                certBuilder.add(CertificateHelper.getFingerprint(certificates[i]));
+            }
+
+            ImmutableList<String> certList = certBuilder.build();
+            sourceFingerprints = ImmutableSet.copyOf(certList);
+
+            String expectedFingerprint = (String) descriptor.get("certificateFingerprint");
+
+            fingerprintNotPresent = true;
+
+            if (expectedFingerprint != null && !expectedFingerprint.isEmpty())
+            {
+                if (!sourceFingerprints.contains(expectedFingerprint))
+                {
+                    Level warnLevel = Level.SEVERE;
+                    if (source.isDirectory())
+                    {
+                        warnLevel = Level.FINER;
+                    }
+                    FMLLog.log(getModId(), warnLevel, "The mod %s is expecting signature %s for source %s, however there is no signature matching that description", getModId(), expectedFingerprint, source.getName());
+                }
+                else
+                {
+                    certificate = certificates[certList.indexOf(expectedFingerprint)];
+                    fingerprintNotPresent = false;
+                }
+            }
+
+            CustomProperty[] props = (CustomProperty[]) descriptor.get("customProperties");
+            if (props!=null && props.length > 0)
+            {
+                com.google.common.collect.ImmutableMap.Builder<String, String> builder = ImmutableMap.<String,String>builder();
+                for (CustomProperty p : props)
+                {
+                    builder.put(p.k(),p.v());
+                }
+                customModProperties = builder.build();
+            }
+            else
+            {
+                customModProperties = EMPTY_PROPERTIES;
+            }
+
+
+            Method factoryMethod = gatherAnnotations(clazz);
            isNetworkMod = FMLNetworkHandler.instance().registerNetworkMod(this, clazz, event.getASMHarvestedData());
-            modInstance = clazz.newInstance();
-            ProxyInjector.inject(this, event.getASMHarvestedData(), FMLCommonHandler.instance().getSide());
+            modInstance = getLanguageAdapter().getNewInstance(this,clazz, modClassLoader, factoryMethod);
+            if (fingerprintNotPresent)
+            {
+                eventBus.post(new FMLFingerprintViolationEvent(source.isDirectory(), source, ImmutableSet.copyOf(this.sourceFingerprints), expectedFingerprint));
+            }
+            ProxyInjector.inject(this, event.getASMHarvestedData(), FMLCommonHandler.instance().getSide(), getLanguageAdapter());
            processFieldAnnotations(event.getASMHarvestedData());
        }
        catch (Throwable e)
@@ -427,23 +529,20 @@ public class FMLModContainer implements ModContainer
    @Subscribe
    public void handleModStateEvent(FMLEvent event)
    {
-        Class<? extends Annotation> annotation = modAnnotationTypes.get(event.getClass());
-        if (annotation == null)
+        if (!eventMethods.containsKey(event.getClass()))
        {
            return;
        }
        try
        {
-            for (Object o : annotations.get(annotation))
+            for (Method m : eventMethods.get(event.getClass()))
            {
-                Method m = (Method) o;
                m.invoke(modInstance, event);
            }
        }
        catch (Throwable t)
        {
            controller.errorOccurred(this, t);
-            Throwables.propagateIfPossible(t);
        }
    }

@@ -479,4 +578,35 @@ public class FMLModContainer implements ModContainer
    {
        return minecraftAccepted;
    }
+
+    @Override
+    public Certificate getSigningCertificate()
+    {
+        return certificate;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "FMLMod:"+getModId()+"{"+getVersion()+"}";
+    }
+
+    @Override
+    public Map<String, String> getCustomModProperties()
+    {
+        return customModProperties;
+    }
+
+    @Override
+    public Class<?> getCustomResourcePackClass()
+    {
+        try
+        {
+            return getSource().isDirectory() ? Class.forName("cpw.mods.fml.client.FMLFolderResourcePack", true, getClass().getClassLoader()) : Class.forName("cpw.mods.fml.client.FMLFileResourcePack",true, getClass().getClassLoader());
+        }
+        catch (ClassNotFoundException e)
+        {
+            return null;
+        }
+    }
 }
@@ -0,0 +1,34 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
+package cpw.mods.fml.common;
+
+import org.objectweb.asm.tree.ClassNode;
+
+public interface IASMHook {
+    /**
+     * Inject the {@link Mod} class node into this instance. This allows retrieval from custom
+     * attributes or other artifacts in your mod class
+     *
+     * @param modClassNode The mod class
+     * @return optionally some code generated classes that will be injected into the classloader
+     */
+    ClassNode[] inject(ClassNode modClassNode);
+    /**
+     * Allow mods to manipulate classes loaded from this {@link Mod}'s jar file. The {@link Mod}
+     * class is always guaranteed to be called first.
+     * The node state should be changed in place.
+     *
+     * @param node The class being loaded
+     */
+    void modifyClass(String className, ClassNode node);
+}
@@ -1,15 +1,13 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
 */

 package cpw.mods.fml.common;
@@ -1,21 +1,20 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
 */
+
 package cpw.mods.fml.common;

-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;

 /**
 * Return a crafting handler for the mod container to call
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import java.util.concurrent.Callable;
@@ -1,41 +0,0 @@
-/*
- * The FML Forge Mod Loader suite. Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package cpw.mods.fml.common;
-
-import java.util.Random;
-
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.World;
-
-
-public interface IDispenseHandler
-{
-    /**
-     * Return -1 if you don't want to dispense anything. the other values seem to have specific meanings
-     * to blockdispenser.
-     *
-     * @param x
-     * @param y
-     * @param z
-     * @param xVelocity
-     * @param zVelocity
-     * @param world
-     * @param item
-     * @param random
-     * @param entX
-     * @param entY
-     * @param entZ
-     */
-    @Deprecated
-    int dispense(double x, double y, double z, int xVelocity, int zVelocity, World world, ItemStack item, Random random, double entX, double entY, double entZ);
-}
@@ -1,29 +0,0 @@
-package cpw.mods.fml.common;
-
-import java.util.Random;
-
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.World;
-
-/**
- * @author cpw
- *
- */
-public interface IDispenserHandler
-{
-    /**
-     * Called to dispense an entity
-     * @param x
-     * @param y
-     * @param z
-     * @param xVelocity
-     * @param zVelocity
-     * @param world
-     * @param item
-     * @param random
-     * @param entX
-     * @param entY
-     * @param entZ
-     */
-    int dispense(int x, int y, int z, int xVelocity, int zVelocity, World world, ItemStack item, Random random, double entX, double entY, double entZ);
-}
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 public interface IFMLHandledException
@@ -1,16 +1,33 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import java.util.List;

+import com.google.common.collect.MapDifference;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.network.INetworkManager;
+import net.minecraft.network.packet.NetHandler;
+import net.minecraft.network.packet.Packet;
+import net.minecraft.network.packet.Packet131MapData;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.src.Entity;
-import net.minecraft.src.NetHandler;
-import net.minecraft.src.Packet;
-import net.minecraft.src.Packet131MapData;
 import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket;
 import cpw.mods.fml.common.network.EntitySpawnPacket;
 import cpw.mods.fml.common.network.ModMissingPacket;
+import cpw.mods.fml.common.registry.ItemData;
 import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
+import cpw.mods.fml.relauncher.Side;

 public interface IFMLSidedHandler
 {
@@ -41,4 +58,14 @@ public interface IFMLSidedHandler
    void setClientCompatibilityLevel(byte compatibilityLevel);

    byte getClientCompatibilityLevel();
+
+    boolean shouldServerShouldBeKilledQuietly();
+
+    void disconnectIDMismatch(MapDifference<Integer, ItemData> s, NetHandler toKill, INetworkManager mgr);
+
+    void addModAsResource(ModContainer container);
+
+    void updateResourcePackList();
+
+    String getCurrentLanguage();
 }
@@ -1,8 +1,20 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

-import net.minecraft.src.ItemStack;
+import net.minecraft.item.ItemStack;

 public interface IFuelHandler
 {
    int getBurnTime(ItemStack fuel);
-}
+}
@@ -0,0 +1,197 @@
+package cpw.mods.fml.common;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.logging.Level;
+
+import cpw.mods.fml.common.Mod.Instance;
+import cpw.mods.fml.relauncher.Side;
+
+public interface ILanguageAdapter {
+    public Object getNewInstance(FMLModContainer container, Class<?> objectClass, ClassLoader classLoader, Method factoryMarkedAnnotation) throws Exception;
+    public boolean supportsStatics();
+    public void setProxy(Field target, Class<?> proxyTarget, Object proxy) throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException;
+    public void setInternalProxies(ModContainer mod, Side side, ClassLoader loader);
+
+    public static class ScalaAdapter implements ILanguageAdapter {
+        @Override
+        public Object getNewInstance(FMLModContainer container, Class<?> scalaObjectClass, ClassLoader classLoader, Method factoryMarkedAnnotation) throws Exception
+        {
+            Class<?> sObjectClass = Class.forName(scalaObjectClass.getName()+"$",true,classLoader);
+            return sObjectClass.getField("MODULE$").get(null);
+        }
+
+        @Override
+        public boolean supportsStatics()
+        {
+            return false;
+        }
+
+        @Override
+        public void setProxy(Field target, Class<?> proxyTarget, Object proxy) throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException
+        {
+            try
+            {
+                // Get the actual singleton class. The two variants are from
+                // whether the @SidedProxy is declared in a the class block
+                // of the object directly, or in the object block, i.e.
+                // whether it's:
+                // class ModName {
+                //   @SidedProxy ...
+                // }
+                // object ModName extends ModName {}
+                // which leads to us getting the outer class, or
+                // object ModName {
+                //   @SidedProxy ...
+                // }
+                // which leads to us getting the inner class.
+                if (!proxyTarget.getName().endsWith("$"))
+                {
+                    // Get internal class generated by Scala.
+                    proxyTarget = Class.forName(proxyTarget.getName() + "$", true, proxyTarget.getClassLoader());
+                }
+            }
+            catch (ClassNotFoundException e)
+            {
+                // Not a singleton, look for @Instance field as a fallback.
+                FMLLog.log(Level.INFO, e, "An error occured trying to load a proxy into %s.%s. Did you declare your mod as 'class' instead of 'object'?", proxyTarget.getSimpleName(), target.getName());
+                return;
+            }
+
+            // Get the instance via the MODULE$ field which is
+            // automatically generated by the Scala compiler for
+            // singletons.
+            Object targetInstance = proxyTarget.getField("MODULE$").get(null);
+
+            try
+            {
+                // Find setter function. We do it this way because we can't
+                // necessarily use proxyTarget.getMethod(proxy.getClass()), as
+                // it might be a subclass and not the exact parameter type.
+                // All fields are private in Scala, wrapped by a getter and
+                // setter named <fieldname> and <fieldname>_$eq. To those
+                // familiar with scala.reflect.BeanProperty: these will always
+                // be there, set<Fieldname> and get<Fieldname> will always
+                // only be generated *additionally*.
+                final String setterName = target.getName() + "_$eq";
+                for (Method setter : proxyTarget.getMethods())
+                {
+                    Class<?>[] setterParameters = setter.getParameterTypes();
+                    if (setterName.equals(setter.getName()) &&
+                            // Some more validation.
+                            setterParameters.length == 1 &&
+                            setterParameters[0].isAssignableFrom(proxy.getClass()))
+                    {
+                        // Here goes nothing...
+                        setter.invoke(targetInstance, proxy);
+                        return;
+                    }
+                }
+            }
+            catch (InvocationTargetException e)
+            {
+                FMLLog.log(Level.SEVERE, e, "An error occured trying to load a proxy into %s.%s", proxyTarget.getSimpleName(), target.getName());
+                throw new LoaderException(e);
+            }
+
+            // If we come here we could not find a setter for this proxy.
+            FMLLog.severe("Failed loading proxy into %s.%s, could not find setter function. Did you declare the field with 'val' instead of 'var'?", proxyTarget.getSimpleName(), target.getName());
+            throw new LoaderException();
+        }
+
+        @Override
+        public void setInternalProxies(ModContainer mod, Side side, ClassLoader loader)
+        {
+            // For Scala mods, we want to enable authors to write them like so:
+            // object ModName {
+            //   @SidedProxy(...)
+            //   var proxy: ModProxy = null
+            // }
+            // For this to work, we have to search inside the inner class Scala
+            // generates for singletons, which is in called ModName$. These are
+            // not automatically handled, because the mod discovery code ignores
+            // internal classes.
+            // Note that it is alternatively possible to write this like so:
+            // class ModName {
+            //   @SidedProxy(...)
+            //   var proxy: ModProxy = null
+            // }
+            // object ModName extends ModName { ... }
+            // which will fall back to the normal injection code which calls
+            // setProxy in turn.
+
+            // Get the actual mod implementation, which will be the inner class
+            // if we have a singleton.
+            Class<?> proxyTarget = mod.getMod().getClass();
+            if (proxyTarget.getName().endsWith("$"))
+            {
+                // So we have a singleton class, check if there are targets.
+                for (Field target : proxyTarget.getDeclaredFields())
+                {
+                    // This will not turn up anything if the alternative
+                    // approach was taken (manually declaring the class).
+                    // So we don't initialize the field twice.
+                    if (target.getAnnotation(SidedProxy.class) != null)
+                    {
+                        String targetType = side.isClient() ? target.getAnnotation(SidedProxy.class).clientSide() : target.getAnnotation(SidedProxy.class).serverSide();
+                        try
+                        {
+                            Object proxy = Class.forName(targetType, true, loader).newInstance();
+
+                            if (!target.getType().isAssignableFrom(proxy.getClass()))
+                            {
+                                FMLLog.severe("Attempted to load a proxy type %s into %s.%s, but the types don't match", targetType, proxyTarget.getSimpleName(), target.getName());
+                                throw new LoaderException();
+                            }
+
+                            setProxy(target, proxyTarget, proxy);
+                        }
+                        catch (Exception e) {
+                            FMLLog.log(Level.SEVERE, e, "An error occured trying to load a proxy into %s.%s", proxyTarget.getSimpleName(), target.getName());
+                            throw new LoaderException(e);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                FMLLog.finer("Mod does not appear to be a singleton.");
+            }
+        }
+    }
+
+    public static class JavaAdapter implements ILanguageAdapter {
+        @Override
+        public Object getNewInstance(FMLModContainer container, Class<?> objectClass, ClassLoader classLoader, Method factoryMarkedMethod) throws Exception
+        {
+            if (factoryMarkedMethod != null)
+            {
+                return factoryMarkedMethod.invoke(null);
+            }
+            else
+            {
+                return objectClass.newInstance();
+            }
+        }
+
+        @Override
+        public boolean supportsStatics()
+        {
+            return true;
+        }
+
+        @Override
+        public void setProxy(Field target, Class<?> proxyTarget, Object proxy) throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException,
+                SecurityException
+        {
+            target.set(null, proxy);
+        }
+
+        @Override
+        public void setInternalProxies(ModContainer mod, Side side, ClassLoader loader)
+        {
+            // Nothing to do here.
+        }
+    }
+}
@@ -1,20 +1,19 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
 */
+
 package cpw.mods.fml.common;

-import net.minecraft.src.EntityItem;
-import net.minecraft.src.EntityPlayer;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;

 public interface IPickupNotifier
 {
@@ -1,20 +1,18 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
 */

 package cpw.mods.fml.common;

-import net.minecraft.src.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayer;

 /**
 * @author cpw
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 public interface IScheduledTickHandler extends ITickHandler
@@ -1,15 +1,13 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
 */

 package cpw.mods.fml.common;
@@ -1,22 +1,22 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
 */
+
 package cpw.mods.fml.common;

 import java.util.Random;

-import net.minecraft.src.IChunkProvider;
-import net.minecraft.src.World;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.IChunkProvider;
+

 /**
 * This is called back during world generation. 
@@ -1,7 +1,21 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import java.io.File;
+import java.security.cert.Certificate;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;

 import com.google.common.eventbus.EventBus;
@@ -12,11 +26,11 @@ import cpw.mods.fml.common.versioning.VersionRange;
 public class InjectedModContainer implements ModContainer
 {
    private File source;
-    private ModContainer wrappedContainer;
+    public final ModContainer wrappedContainer;

    public InjectedModContainer(ModContainer mc, File source)
    {
-        this.source = source;
+        this.source = source != null ? source : new File("minecraft.jar");
        this.wrappedContainer = mc;
    }

@@ -129,4 +143,28 @@ public class InjectedModContainer implements ModContainer
            return null;
        }
    }
+
+    @Override
+    public Certificate getSigningCertificate()
+    {
+        return wrappedContainer.getSigningCertificate();
+    }
+
+    @Override
+    public String toString()
+    {
+        return "Wrapped{"+wrappedContainer.toString()+"}";
+    }
+
+    @Override
+    public Map<String, String> getCustomModProperties()
+    {
+        return wrappedContainer.getCustomModProperties();
+    }
+
+    @Override
+    public Class<?> getCustomResourcePackClass()
+    {
+        return wrappedContainer.getCustomResourcePackClass();
+    }
 }
@@ -1,14 +1,30 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.logging.Level;
+import java.util.logging.Logger;

+import com.google.common.base.Functions;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.BiMap;
+import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
@@ -23,6 +39,8 @@ import cpw.mods.fml.common.event.FMLEvent;
 import cpw.mods.fml.common.event.FMLLoadEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLStateEvent;
+import cpw.mods.fml.common.functions.ArtifactVersionNameFunction;
+import cpw.mods.fml.common.versioning.ArtifactVersion;

 public class LoadController
 {
@@ -60,20 +78,24 @@ public class LoadController
            boolean isActive = mod.registerBus(bus, this);
            if (isActive)
            {
-                FMLLog.fine("Activating mod %s", mod.getModId());
+                Level level = Logger.getLogger(mod.getModId()).getLevel();
+                FMLLog.log(mod.getModId(), Level.FINE, "Mod Logging channel %s configured at %s level.", mod.getModId(), level == null ? "default" : level);
+                FMLLog.log(mod.getModId(), Level.INFO, "Activating mod %s", mod.getModId());
                activeModList.add(mod);
                modStates.put(mod.getModId(), ModState.UNLOADED);
                eventBus.put(mod.getModId(), bus);
+                FMLCommonHandler.instance().addModToResourcePack(mod);
            }
            else
            {
-                FMLLog.warning("Mod %s has been disabled through configuration", mod.getModId());
+                FMLLog.log(mod.getModId(), Level.WARNING, "Mod %s has been disabled through configuration", mod.getModId());
                modStates.put(mod.getModId(), ModState.UNLOADED);
                modStates.put(mod.getModId(), ModState.DISABLED);
            }
        }

        eventChannels = eventBus.build();
+        FMLCommonHandler.instance().updateResourcePackList();
    }

    public void distributeStateMessage(LoaderState state, Object... eventData)
@@ -84,30 +106,40 @@ public class LoadController
        }
    }

-    public void transition(LoaderState desiredState)
+    public void transition(LoaderState desiredState, boolean forceState)
    {
        LoaderState oldState = state;
        state = state.transition(!errors.isEmpty());
-        if (state != desiredState)
+        if (state != desiredState && !forceState)
        {
            Throwable toThrow = null;
            FMLLog.severe("Fatal errors were detected during the transition from %s to %s. Loading cannot continue", oldState, desiredState);
            StringBuilder sb = new StringBuilder();
            printModStates(sb);
-            FMLLog.severe(sb.toString());
-            FMLLog.severe("The following problems were captured during this phase");
-            for (Entry<String, Throwable> error : errors.entries())
+            FMLLog.getLogger().severe(sb.toString());
+            if (errors.size()>0)
            {
-                FMLLog.log(Level.SEVERE, error.getValue(), "Caught exception from %s", error.getKey());
-                if (error.getValue() instanceof IFMLHandledException)
+                FMLLog.severe("The following problems were captured during this phase");
+                for (Entry<String, Throwable> error : errors.entries())
                {
-                    toThrow = error.getValue();
-                }
-                else if (toThrow == null)
-                {
-                    toThrow = error.getValue();
+                    FMLLog.log(Level.SEVERE, error.getValue(), "Caught exception from %s", error.getKey());
+                    if (error.getValue() instanceof IFMLHandledException)
+                    {
+                        toThrow = error.getValue();
+                    }
+                    else if (toThrow == null)
+                    {
+                        toThrow = error.getValue();
+                    }
                }
            }
+            else
+            {
+                FMLLog.severe("The ForgeModLoader state engine has become corrupted. Probably, a state was missed by and invalid modification to a base class" +
+                		"ForgeModLoader depends on. This is a critical error and not recoverable. Investigate any modifications to base classes outside of" +
+                		"ForgeModLoader, especially Optifine, to see if there are fixes available.");
+                throw new RuntimeException("The ForgeModLoader state engine is invalid");
+            }
            if (toThrow != null && toThrow instanceof RuntimeException)
            {
                throw (RuntimeException)toThrow;
@@ -117,6 +149,12 @@ public class LoadController
                throw new LoaderException(toThrow);
            }
        }
+        else if (state != desiredState && forceState)
+        {
+            FMLLog.info("The state engine was in incorrect state %s and forced into state %s. Errors may have been discarded.", state, desiredState);
+            forceState(desiredState);
+        }
+
    }

    public ModContainer activeContainer()
@@ -133,23 +171,38 @@ public class LoadController
        }
        for (ModContainer mc : activeModList)
        {
-            activeContainer = mc;
-            String modId = mc.getModId();
-            stateEvent.applyModContainer(activeContainer());
-            FMLLog.finer("Sending event %s to mod %s", stateEvent.getEventType(), modId);
-            eventChannels.get(modId).post(stateEvent);
-            FMLLog.finer("Sent event %s to mod %s", stateEvent.getEventType(), modId);
-            activeContainer = null;
-            if (stateEvent instanceof FMLStateEvent)
+            sendEventToModContainer(stateEvent, mc);
+        }
+    }
+
+    private void sendEventToModContainer(FMLEvent stateEvent, ModContainer mc)
+    {
+        String modId = mc.getModId();
+        Collection<String> requirements =  Collections2.transform(mc.getRequirements(),new ArtifactVersionNameFunction());
+        for (ArtifactVersion av : mc.getDependencies())
+        {
+            if (av.getLabel()!= null && requirements.contains(av.getLabel()) && modStates.containsEntry(av.getLabel(),ModState.ERRORED))
            {
-	            if (!errors.containsKey(modId))
-	            {
-	                modStates.put(modId, ((FMLStateEvent)stateEvent).getModState());
-	            }
-	            else
-	            {
-	                modStates.put(modId, ModState.ERRORED);
-	            }
+                FMLLog.log(modId, Level.SEVERE, "Skipping event %s and marking errored mod %s since required dependency %s has errored", stateEvent.getEventType(), modId, av.getLabel());
+                modStates.put(modId, ModState.ERRORED);
+                return;
+            }
+        }
+        activeContainer = mc;
+        stateEvent.applyModContainer(activeContainer());
+        FMLLog.log(modId, Level.FINEST, "Sending event %s to mod %s", stateEvent.getEventType(), modId);
+        eventChannels.get(modId).post(stateEvent);
+        FMLLog.log(modId, Level.FINEST, "Sent event %s to mod %s", stateEvent.getEventType(), modId);
+        activeContainer = null;
+        if (stateEvent instanceof FMLStateEvent)
+        {
+            if (!errors.containsKey(modId))
+            {
+                modStates.put(modId, ((FMLStateEvent)stateEvent).getModState());
+            }
+            else
+            {
+                modStates.put(modId, ModState.ERRORED);
            }
        }
    }
@@ -191,7 +244,7 @@ public class LoadController
    {
        for (ModContainer mc : loader.getModList())
        {
-            ret.append("\n\t").append(mc.getModId()).append(" [").append(mc.getName()).append("] (").append(mc.getSource().getName()).append(") ");
+            ret.append("\n\t").append(mc.getModId()).append("{").append(mc.getVersion()).append("} [").append(mc.getName()).append("] (").append(mc.getSource().getName()).append(") ");
            Joiner.on("->"). appendTo(ret, modStates.get(mc.getModId()));
        }
    }
@@ -237,4 +290,9 @@ public class LoadController
 	boolean hasReachedState(LoaderState state) {
 		return this.state.ordinal()>=state.ordinal() && this.state!=LoaderState.ERRORED;
 	}
+
+    void forceState(LoaderState newState)
+    {
+        this.state = newState;
+    }
 }
@@ -1,19 +1,19 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Contributors:
+ *     cpw - implementation
 */
+
 package cpw.mods.fml.common;

 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -26,16 +26,21 @@ import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.logging.Level;

-import net.minecraft.src.CallableMinecraftVersion;
+import net.minecraft.crash.CallableMinecraftVersion;
+import net.minecraft.item.ItemStack;

 import com.google.common.base.CharMatcher;
+import com.google.common.base.Charsets;
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
+import com.google.common.base.Joiner.MapJoiner;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
+import com.google.common.collect.ImmutableListMultimap.Builder;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultiset;
 import com.google.common.collect.Iterables;
@@ -48,19 +53,25 @@ import com.google.common.collect.Multiset.Entry;
 import com.google.common.collect.Multisets;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.Sets.SetView;
+import com.google.common.collect.Table;
 import com.google.common.collect.TreeMultimap;
+import com.google.common.io.Files;

 import cpw.mods.fml.common.LoaderState.ModState;
 import cpw.mods.fml.common.discovery.ModDiscoverer;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.event.FMLLoadEvent;
+import cpw.mods.fml.common.functions.ArtifactVersionNameFunction;
 import cpw.mods.fml.common.functions.ModIdFunction;
 import cpw.mods.fml.common.modloader.BaseModProxy;
+import cpw.mods.fml.common.registry.GameData;
 import cpw.mods.fml.common.toposort.ModSorter;
 import cpw.mods.fml.common.toposort.ModSortingException;
+import cpw.mods.fml.common.toposort.ModSortingException.SortingExceptionData;
 import cpw.mods.fml.common.toposort.TopologicalSort;
 import cpw.mods.fml.common.versioning.ArtifactVersion;
 import cpw.mods.fml.common.versioning.VersionParser;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;

 /**
 * The loader class performs the actual loading of the mod code from disk.
@@ -142,6 +153,8 @@ public class Loader

    private static File minecraftDir;
    private static List<String> injectedContainers;
+    private File loggingProperties;
+    private ImmutableMap<String, String> fmlBrandingProperties;

    public static Loader instance()
    {
@@ -186,7 +199,7 @@ public class Loader
     */
    private void sortModList()
    {
-        FMLLog.fine("Verifying mod requirements are satisfied");
+        FMLLog.finer("Verifying mod requirements are satisfied");
        try
        {
            BiMap<String, ArtifactVersion> modVersions = HashBiMap.create();
@@ -202,13 +215,7 @@ public class Loader
                    FMLLog.severe("The mod %s does not wish to run in Minecraft version %s. You will have to remove it to play.", mod.getModId(), getMCVersionString());
                    throw new WrongMinecraftVersionException(mod);
                }
-                Map<String,ArtifactVersion> names = Maps.uniqueIndex(mod.getRequirements(), new Function<ArtifactVersion, String>()
-                {
-                    public String apply(ArtifactVersion v)
-                    {
-                        return v.getLabel();
-                    }
-                });
+                Map<String,ArtifactVersion> names = Maps.uniqueIndex(mod.getRequirements(), new ArtifactVersionNameFunction());
                Set<ArtifactVersion> versionMissingMods = Sets.newHashSet();
                Set<String> missingMods = Sets.difference(names.keySet(), modVersions.keySet());
                if (!missingMods.isEmpty())
@@ -238,13 +245,13 @@ public class Loader
                }
            }

-            FMLLog.fine("All mod requirements are satisfied");
+            FMLLog.finer("All mod requirements are satisfied");

            ModSorter sorter = new ModSorter(getActiveModList(), namedMods);

            try
            {
-                FMLLog.fine("Sorting mods into an ordered list");
+                FMLLog.finer("Sorting mods into an ordered list");
                List<ModContainer> sortedMods = sorter.sort();
                // Reset active list to the sorted list
                modController.getActiveModList().clear();
@@ -253,30 +260,37 @@ public class Loader
                mods.removeAll(sortedMods);
                sortedMods.addAll(mods);
                mods = sortedMods;
-                FMLLog.fine("Mod sorting completed successfully");
+                FMLLog.finer("Mod sorting completed successfully");
            }
            catch (ModSortingException sortException)
            {
                FMLLog.severe("A dependency cycle was detected in the input mod set so an ordering cannot be determined");
-                FMLLog.severe("The visited mod list is %s", sortException.getExceptionData().getVisitedNodes());
-                FMLLog.severe("The first mod in the cycle is %s", sortException.getExceptionData().getFirstBadNode());
+                SortingExceptionData<ModContainer> exceptionData = sortException.getExceptionData();
+                FMLLog.severe("The first mod in the cycle is %s", exceptionData.getFirstBadNode());
+                FMLLog.severe("The mod cycle involves");
+                for (ModContainer mc : exceptionData.getVisitedNodes())
+                {
+                    FMLLog.severe("%s : before: %s, after: %s", mc.toString(), mc.getDependants(), mc.getDependencies());
+                }
                FMLLog.log(Level.SEVERE, sortException, "The full error");
-                throw new LoaderException(sortException);
+                throw sortException;
            }
        }
        finally
        {
-            FMLLog.fine("Mod sorting data:");
+            FMLLog.fine("Mod sorting data");
+            int unprintedMods = mods.size();
            for (ModContainer mod : getActiveModList())
            {
                if (!mod.isImmutable())
                {
                    FMLLog.fine("\t%s(%s:%s): %s (%s)", mod.getModId(), mod.getName(), mod.getVersion(), mod.getSource().getName(), mod.getSortingRules());
+                    unprintedMods--;
                }
            }
-            if (mods.size()==0)
+            if (unprintedMods == mods.size())
            {
-                FMLLog.fine("No mods found to sort");
+                FMLLog.fine("No user mods found to sort");
            }
        }

@@ -308,7 +322,6 @@ public class Loader
        FMLLog.fine("Building injected Mod Containers %s", injectedContainers);
        // Add in the MCP mod container
        mods.add(new InjectedModContainer(mcp,new File("minecraft.jar")));
-        File coremod = new File(minecraftDir,"coremods");
        for (String cont : injectedContainers)
        {
            ModContainer mc;
@@ -321,7 +334,7 @@ public class Loader
                FMLLog.log(Level.SEVERE, e, "A problem occured instantiating the injected mod container %s", cont);
                throw new LoaderException(e);
            }
-            mods.add(new InjectedModContainer(mc,coremod));
+            mods.add(new InjectedModContainer(mc,mc.getSource()));
        }
        ModDiscoverer discoverer = new ModDiscoverer();
        FMLLog.fine("Attempting to load mods contained in the minecraft jar file and associated classes");
@@ -330,11 +343,21 @@ public class Loader

        FMLLog.info("Searching %s for mods", canonicalModsDir.getAbsolutePath());
        discoverer.findModDirMods(canonicalModsDir);
+        File versionSpecificModsDir = new File(canonicalModsDir,mccversion);
+        if (versionSpecificModsDir.isDirectory())
+        {
+            FMLLog.info("Also searching %s for mods", versionSpecificModsDir);
+            discoverer.findModDirMods(versionSpecificModsDir);
+        }

        mods.addAll(discoverer.identifyMods());
        identifyDuplicates(mods);
        namedMods = Maps.uniqueIndex(mods, new ModIdFunction());
        FMLLog.info("Forge Mod Loader has identified %d mod%s to load", mods.size(), mods.size() != 1 ? "s" : "");
+        for (String modId: namedMods.keySet())
+        {
+            FMLLog.makeLog(modId);
+        }
        return discoverer;
    }

@@ -376,7 +399,7 @@ public class Loader
    }

    /**
-     * @return
+     *
     */
    private void initializeLoader()
    {
@@ -435,6 +458,11 @@ public class Loader
            FMLLog.severe("Attempting to load configuration from %s, which is not a directory", canonicalConfigPath);
            throw new LoaderException();
        }
+
+        loggingProperties = new File(canonicalConfigDir, "logging.properties");
+        FMLLog.info("Reading custom logging properties from %s", loggingProperties.getPath());
+        FMLRelaunchLog.loadLogConfiguration(loggingProperties);
+        FMLLog.log(Level.OFF,"Logging level for ForgeModLoader logging is set to %s", FMLRelaunchLog.log.getLogger().getLevel());
    }

    public List<ModContainer> getModList()
@@ -453,9 +481,12 @@ public class Loader
        mods = Lists.newArrayList();
        namedMods = Maps.newHashMap();
        modController = new LoadController(this);
-        modController.transition(LoaderState.LOADING);
+        modController.transition(LoaderState.LOADING, false);
        ModDiscoverer disc = identifyMods();
        disableRequestedMods();
+        FMLLog.fine("Reloading logging properties from %s", loggingProperties.getPath());
+        FMLRelaunchLog.loadLogConfiguration(loggingProperties);
+        FMLLog.fine("Reloaded logging properties");
        modController.distributeStateMessage(FMLLoadEvent.class);
        sortModList();
        mods = ImmutableList.copyOf(mods);
@@ -474,32 +505,41 @@ public class Loader
                }
            }
        }
-        modController.transition(LoaderState.CONSTRUCTING);
+        modController.transition(LoaderState.CONSTRUCTING, false);
        modController.distributeStateMessage(LoaderState.CONSTRUCTING, modClassLoader, disc.getASMTable());
-        modController.transition(LoaderState.PREINITIALIZATION);
+        FMLLog.fine("Mod signature data");
+        for (ModContainer mod : getActiveModList())
+        {
+            FMLLog.fine("\t%s(%s:%s): %s (%s)", mod.getModId(), mod.getName(), mod.getVersion(), mod.getSource().getName(), CertificateHelper.getFingerprint(mod.getSigningCertificate()));
+        }
+        if (getActiveModList().isEmpty())
+        {
+            FMLLog.fine("No user mod signature data found");
+        }
+        modController.transition(LoaderState.PREINITIALIZATION, false);
        modController.distributeStateMessage(LoaderState.PREINITIALIZATION, disc.getASMTable(), canonicalConfigDir);
-        modController.transition(LoaderState.INITIALIZATION);
+        modController.transition(LoaderState.INITIALIZATION, false);
    }

    private void disableRequestedMods()
    {
        String forcedModList = System.getProperty("fml.modStates", "");
-        FMLLog.fine("Received a system property request \'%s\'",forcedModList);
+        FMLLog.finer("Received a system property request \'%s\'",forcedModList);
        Map<String, String> sysPropertyStateList = Splitter.on(CharMatcher.anyOf(";:"))
                .omitEmptyStrings().trimResults().withKeyValueSeparator("=")
                .split(forcedModList);
-        FMLLog.fine("System property request managing the state of %d mods", sysPropertyStateList.size());
+        FMLLog.finer("System property request managing the state of %d mods", sysPropertyStateList.size());
        Map<String, String> modStates = Maps.newHashMap();

        File forcedModFile = new File(canonicalConfigDir, "fmlModState.properties");
        Properties forcedModListProperties = new Properties();
        if (forcedModFile.exists() && forcedModFile.isFile())
        {
-            FMLLog.fine("Found a mod state file %s", forcedModFile.getName());
+            FMLLog.finer("Found a mod state file %s", forcedModFile.getName());
            try
            {
                forcedModListProperties.load(new FileReader(forcedModFile));
-                FMLLog.fine("Loaded states for %d mods from file", forcedModListProperties.size());
+                FMLLog.finer("Loaded states for %d mods from file", forcedModListProperties.size());
            }
            catch (Exception e)
            {
@@ -546,6 +586,11 @@ public class Loader

    public String getCrashInformation()
    {
+        // Handle being called before we've begun setup
+        if (modController == null)
+        {
+            return "";
+        }
        StringBuilder ret = new StringBuilder();
        List<String> branding = FMLCommonHandler.instance().getBrandings();

@@ -649,11 +694,15 @@ public class Loader
    {
        // Mod controller should be in the initialization state here
        modController.distributeStateMessage(LoaderState.INITIALIZATION);
-        modController.transition(LoaderState.POSTINITIALIZATION);
+        modController.transition(LoaderState.POSTINITIALIZATION, false);
+        // Construct the "mod object table" so mods can refer to it in IMC and postinit
+        GameData.buildModObjectTable();
        modController.distributeStateMessage(FMLInterModComms.IMCEvent.class);
        modController.distributeStateMessage(LoaderState.POSTINITIALIZATION);
-        modController.transition(LoaderState.AVAILABLE);
+        modController.transition(LoaderState.AVAILABLE, false);
        modController.distributeStateMessage(LoaderState.AVAILABLE);
+        // Dump the custom registry data map, if necessary
+        GameData.dumpRegistry(minecraftDir);
        FMLLog.info("Forge Mod Loader has successfully loaded %d mod%s", mods.size(), mods.size()==1 ? "" : "s");
    }

@@ -689,24 +738,31 @@ public class Loader
        return "Minecraft " + mccversion;
    }

-    public void serverStarting(Object server)
+    public boolean serverStarting(Object server)
    {
-        modController.distributeStateMessage(LoaderState.SERVER_STARTING, server);
-        modController.transition(LoaderState.SERVER_STARTING);
+        try
+        {
+            modController.distributeStateMessage(LoaderState.SERVER_STARTING, server);
+            modController.transition(LoaderState.SERVER_STARTING, false);
+        }
+        catch (Throwable t)
+        {
+            FMLLog.log(Level.SEVERE, t, "A fatal exception occurred during the server starting event");
+            return false;
+        }
+        return true;
    }

    public void serverStarted()
    {
        modController.distributeStateMessage(LoaderState.SERVER_STARTED);
-        modController.transition(LoaderState.SERVER_STARTED);
+        modController.transition(LoaderState.SERVER_STARTED, false);
    }

    public void serverStopping()
    {
        modController.distributeStateMessage(LoaderState.SERVER_STOPPING);
-        modController.transition(LoaderState.SERVER_STOPPING);
-        modController.transition(LoaderState.AVAILABLE);
-
+        modController.transition(LoaderState.SERVER_STOPPING, false);
    }

    public BiMap<ModContainer, Object> getModObjectList()
@@ -721,7 +777,7 @@ public class Loader

    public ModContainer activeModContainer()
    {
-        return modController.activeContainer();
+        return modController != null ? modController.activeContainer() : null;
    }

    public boolean isInState(LoaderState state)
@@ -735,10 +791,56 @@ public class Loader
    }

 	public boolean hasReachedState(LoaderState state) {
-		return modController.hasReachedState(state);
+		return modController != null ? modController.hasReachedState(state) : false;
 	}

 	public String getMCPVersionString() {
 		return String.format("MCP v%s", mcpversion);
 	}
+
+    public void serverStopped()
+    {
+        modController.distributeStateMessage(LoaderState.SERVER_STOPPED);
+        modController.transition(LoaderState.SERVER_STOPPED, true);
+        modController.transition(LoaderState.AVAILABLE, true);
+    }
+
+    public boolean serverAboutToStart(Object server)
+    {
+        try
+        {
+            modController.distributeStateMessage(LoaderState.SERVER_ABOUT_TO_START, server);
+            modController.transition(LoaderState.SERVER_ABOUT_TO_START, false);
+        }
+        catch (Throwable t)
+        {
+            FMLLog.log(Level.SEVERE, t, "A fatal exception occurred during the server about to start event");
+            return false;
+        }
+        return true;
+    }
+
+    public Map<String,String> getFMLBrandingProperties()
+    {
+        if (fmlBrandingProperties == null)
+        {
+            Properties loaded = new Properties();
+            try
+            {
+                loaded.load(getClass().getClassLoader().getResourceAsStream("fmlbranding.properties"));
+            }
+            catch (Exception e)
+            {
+                // File not found - ignore
+            }
+            fmlBrandingProperties = Maps.fromProperties(loaded);
+        }
+        return fmlBrandingProperties;
+    }
+
+
+    public Map<String,String> getCustomModProperties(String modId)
+    {
+        return getIndexedModList().get(modId).getCustomModProperties();
+    }
 }
@@ -1,16 +1,15 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
 */
+
 package cpw.mods.fml.common;

 public class LoaderException extends RuntimeException
@@ -28,4 +27,4 @@ public class LoaderException extends RuntimeException
    public LoaderException()
    {
    }
-}
+}
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import com.google.common.base.Throwables;
@@ -8,8 +20,10 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
 import cpw.mods.fml.common.event.FMLServerStartedEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
+import cpw.mods.fml.common.event.FMLServerStoppedEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import cpw.mods.fml.common.event.FMLStateEvent;

@@ -27,9 +41,11 @@ public enum LoaderState
    INITIALIZATION("Initializing mods", FMLInitializationEvent.class),
    POSTINITIALIZATION("Post-initializing mods", FMLPostInitializationEvent.class),
    AVAILABLE("Mod loading complete", FMLLoadCompleteEvent.class),
+    SERVER_ABOUT_TO_START("Server about to start", FMLServerAboutToStartEvent.class),
    SERVER_STARTING("Server starting", FMLServerStartingEvent.class),
    SERVER_STARTED("Server started", FMLServerStartedEvent.class),
    SERVER_STOPPING("Server stopping", FMLServerStoppingEvent.class),
+    SERVER_STOPPED("Server stopped", FMLServerStoppedEvent.class),
    ERRORED("Mod Loading errored",null);


@@ -49,7 +65,7 @@ public enum LoaderState
            return ERRORED;
        }
        // stopping -> available
-        if (this == SERVER_STOPPING)
+        if (this == SERVER_STOPPED)
        {
            return AVAILABLE;
        }
@@ -101,4 +117,4 @@ public enum LoaderState
            return this.label;
        }
    }
-}
+}
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import com.google.common.eventbus.EventBus;
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import java.io.InputStream;
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import cpw.mods.fml.common.versioning.ArtifactVersion;
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import java.util.Set;
@@ -1,16 +1,15 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Contributors:
+ *     cpw - implementation
 */
+
 package cpw.mods.fml.common;

 import java.lang.annotation.ElementType;
@@ -18,13 +17,60 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;

-import cpw.mods.fml.common.event.FMLInterModComms;
-import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.network.packet.Packet250CustomPayload;

-import net.minecraft.src.ItemBlock;
+import cpw.mods.fml.common.event.FMLEvent;
+import cpw.mods.fml.common.event.FMLFingerprintViolationEvent;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
+import cpw.mods.fml.common.event.FMLServerStartedEvent;
+import cpw.mods.fml.common.event.FMLServerStartingEvent;
+import cpw.mods.fml.common.event.FMLServerStoppedEvent;
+import cpw.mods.fml.common.event.FMLServerStoppingEvent;
+import cpw.mods.fml.common.event.FMLStateEvent;
+import cpw.mods.fml.common.network.IPacketHandler;
+import cpw.mods.fml.common.network.NetworkMod;
+import cpw.mods.fml.common.registry.GameRegistry;

 /**
- * The new mod style in FML 1.3
+ * This defines a Mod to FML.
+ * Any class found with this annotation applied will be loaded as a Mod. The instance that is loaded will
+ * represent the mod to other Mods in the system. It will be sent various subclasses of {@link FMLEvent}
+ * at pre-defined times during the loading of the game, based on where you have applied the {@link EventHandler}
+ * annotation.
+ *
+ * This annotation is usually paired with a second annotation {@link NetworkMod}, which declares the
+ * network related properties of this mod.
+ *
+ * <p>This is a simple example of a Mod. It has the modId of "MyModId", the name of "My example mod", it is
+ * version 1.0, and depends on FML being loaded. It has the {@link NetworkMod} annotation as well, declaring it uses channel
+ * "MyModChannel" and {@link IPacketHandler} class PacketHandler.
+ * <pre>{@code
+ * package mymod;
+ * // Declare that this is a mod with modId "MyModId", name "My example mod", version "1.0" and dependency on FML.
+ * {@literal @}Mod(modId="MyModId",name="My example mod",version="1.0",dependencies="required-after:FML")
+ * // Declare that this is a network mod using the {@link Packet250CustomPayload} channel "MyModChannel", required on the client if it's present
+ * // on the server, with {@link IPacketHandler} class PacketHandler.
+ * {@literal @}NetworkMod(channels = { "MyModChannel" }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
+ * public class MyMod {
+ *      // Populate this field with the instance of the mod created by FML
+ *      {@literal @}Instance("MyModId")
+ *      public MyMod instance;
+ *
+ *      // Mark this method for receiving an {@link FMLEvent} (in this case, it's the {@link FMLPreInitializationEvent})
+ *      {@literal @}EventHandler public void preInit(FMLPreInitializationEvent event)
+ *      {
+ *          // Do stuff in pre-init phase (read config, create blocks and items, register them)
+ *      }
+ * }
+ * }
+ * </pre>
 *
 * @author cpw
 *
@@ -66,10 +112,14 @@ public @interface Mod
     * An optional bukkit plugin that will be injected into the bukkit plugin framework if
     * this mod is loaded into the FML framework and the bukkit coremod is present.
     * Instances of the bukkit plugin can be obtained via the {@link BukkitPluginRef} annotation on fields.
+     *
+     * This may be implemented by a bukkit integration. It is not provided with vanilla FML or MinecraftForge.
+     *
     * @return The name of the plugin to load for this mod
     */
    String bukkitPlugin() default "";
    /**
+     * NOT YET IMPLEMENTED.</br>
     * Mods that this mod will <strong>not</strong> load with.
     * An optional comma separated string of (+|-)(*|modid[@value]) which specify mods that
     * this mod will refuse to load with, resulting in the game failing to start.
@@ -99,56 +149,200 @@ public @interface Mod
     *
     * @return A string listing modids to exclude from loading with this mod.
     */
+    @Deprecated
    String modExclusionList() default "";
    /**
+     * Specifying this field allows for a mod to expect a signed jar with a fingerprint matching this value.
+     * The fingerprint should be SHA-1 encoded, lowercase with ':' removed. An empty value indicates that
+     * the mod is not expecting to be signed.
+     *
+     * Any incorrectness of the fingerprint, be it missing or wrong, will result in the {@link FMLFingerprintViolationEvent}
+     * event firing <i>prior to any other event on the mod</i>.
+     *
+     * @return A certificate fingerprint that is expected for this mod.
+     */
+    String certificateFingerprint() default "";
+
+    /**
+     * The language the mod is authored in. This will be used to control certain compatibility behaviours for this mod.
+     * Valid values are currently "java", "scala"
+     *
+     * @return The language the mod is authored in
+     */
+    String modLanguage() default "java";
+    /**
+     * NOT YET IMPLEMENTED. </br>
+     * An optional ASM hook class, that can be used to apply ASM to classes loaded from this mod. It is also given
+     * the ASM tree of the class declaring {@link Mod} to do with what it will.
+     *
+     * @return The name of a class to be loaded and executed. Must implement {@link IASMHook}.
+     */
+    @Deprecated
+    String asmHookClass() default "";
+
+    /**
+     * A list of custom properties for this mod. Completely up to the mod author if/when they
+     * want to put anything in here.
+     * @return an optional list of custom properties
+     */
+    CustomProperty[] customProperties() default {};
+
+    /**
+     * A custom key => value property pair for use with {@link Mod#customProperties()}
+     * @author cpw
+     *
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target({})
+    public @interface CustomProperty
+    {
+        /**
+         * A key. Should be unique.
+         * @return A key
+         */
+        String k();
+        /**
+         * A value. Can be anything.
+         * @return A value
+         */
+        String v();
+    }
+    /**
+     * Marks the associated method as handling an FML lifecycle event.
+     * The method must have a single parameter, one of the following types. This annotation
+     * replaces the multiple different annotations that previously were used.
+     *
+     * Current event classes. This first section is standard lifecycle events. They are dispatched
+     * at various phases as the game starts. Each event should have information useful to that
+     * phase of the lifecycle. They are fired in this order.
+     *
+     * These suggestions are mostly just suggestions on what to do in each event.
+     * <ul>
+     * <li> {@link FMLPreInitializationEvent} : Run before anything else. Read your config, create blocks,
+     * items, etc, and register them with the {@link GameRegistry}.</li>
+     * <li> {@link FMLInitializationEvent} : Do your mod setup. Build whatever data structures you care about. Register recipes,
+     * send {@link FMLInterModComms} messages to other mods.</li>
+     * <li> {@link FMLPostInitializationEvent} : Handle interaction with other mods, complete your setup based on this.</li>
+     * </ul>
+     * <p>These are the server lifecycle events. They are fired whenever a server is running, or about to run. Each time a server
+     * starts they will be fired in this sequence.
+     * <ul>
+     * <li> {@link FMLServerAboutToStartEvent} : Use if you need to handle something before the server has even been created.</li>
+     * <li> {@link FMLServerStartingEvent} : Do stuff you need to do to set up the server. register commands, tweak the server.</li>
+     * <li> {@link FMLServerStartedEvent} : Do what you need to with the running server.</li>
+     * <li> {@link FMLServerStoppingEvent} : Do what you need to before the server has started it's shutdown sequence.</li>
+     * <li> {@link FMLServerStoppedEvent} : Do whatever cleanup you need once the server has shutdown. Generally only useful
+     * on the integrated server.</li>
+     * </ul>
+     * The second set of events are more specialized, for receiving notification of specific
+     * information.
+     * <ul>
+     * <li> {@link FMLFingerprintViolationEvent} : Sent just before {@link FMLPreInitializationEvent}
+     * if something is wrong with your mod signature</li>
+     * <li> {@link IMCEvent} : Sent just after {@link FMLInitializationEvent} if you have IMC messages waiting
+     * from other mods</li>
+     * </ul>
+     *
+     * @author cpw
+     *
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface EventHandler{}
+
+    /**
+     * Deprecated for {@link EventHandler}<br/>
+     * Mark the designated method as to be called at if there is something wrong with the certificate fingerprint of
+     * the mod's jar, or it is missing, or otherwise a problem.
+     * @author cpw
+     *
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    @Deprecated
+    public @interface FingerprintWarning {}
+    /**
+     * Deprecated for {@link EventHandler}<br/>
     * Mark the designated method as being called at the "pre-initialization" phase
     * @author cpw
     *
     */
    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.METHOD)
+    @Deprecated
    public @interface PreInit {}
    /**
+     * Deprecated for {@link EventHandler}<br/>
     * Mark the designated method as being called at the "initialization" phase
     * @author cpw
     *
     */
    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.METHOD)
+    @Deprecated
    public @interface Init {}
    /**
+     * Deprecated for {@link EventHandler}<br/>
     * Mark the designated method as being called at the "post-initialization" phase
     * @author cpw
     *
     */
    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.METHOD)
+    @Deprecated
    public @interface PostInit {}
    /**
+     * Deprecated for {@link EventHandler}<br/>
+     * Mark the designated method as being called at the "server-about-to-start" phase
+     * @author cpw
+     *
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    @Deprecated
+    public @interface ServerAboutToStart {}
+    /**
+     * Deprecated for {@link EventHandler}<br/>
     * Mark the designated method as being called at the "server-starting" phase
     * @author cpw
     *
     */
    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.METHOD)
+    @Deprecated
    public @interface ServerStarting {}
    /**
+     * Deprecated for {@link EventHandler}<br/>
     * Mark the designated method as being called at the "server-started" phase
     * @author cpw
     *
     */
    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.METHOD)
+    @Deprecated
    public @interface ServerStarted {}
    /**
+     * Deprecated for {@link EventHandler}<br/>
     * Mark the designated method as being called at the "server-stopping" phase
     * @author cpw
     *
     */
    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.METHOD)
+    @Deprecated
    public @interface ServerStopping {}
    /**
+     * Deprecated for {@link EventHandler}<br/>
+     * Mark the designated method as being called at the "server-stopped" phase
+     * @author cpw
+     *
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    @Deprecated
+    public @interface ServerStopped {}
+    /**
+     * Deprecated for {@link EventHandler}<br/>
     * Mark the designated method as the receiver for {@link FMLInterModComms} messages
     * Called between {@link Init} and {@link PostInit}
     * @author cpw
@@ -156,9 +350,11 @@ public @interface Mod
     */
    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.METHOD)
+    @Deprecated
    public @interface IMCCallback {}
    /**
-     * Populate the annotated field with the mod instance.
+     * Populate the annotated field with the mod instance based on the specified ModId. This can be used
+     * to retrieve instances of other mods.
     * @author cpw
     *
     */
@@ -184,12 +380,14 @@ public @interface Mod
        String value() default "";
    }
    /**
-     * Populate the annotated field with an instance of the Block as specified
+     * NOT IMPLEMENTED AND SCHEDULED FOR REMOVAL.<br/>
+     * Populate the annotated field with an instance of the Block as specified. This never worked. It will be removed.
     * @author cpw
     *
     */
    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.FIELD)
+    @Deprecated
    public @interface Block {
        /**
         * The block's name
@@ -201,12 +399,14 @@ public @interface Mod
        Class<?> itemTypeClass() default ItemBlock.class;
    }
    /**
-     * Populate the annotated field with an Item
+     * NOT IMPLEMENTED AND SCHEDULED FOR REMOVAL.<br/>
+     * Populate the annotated field with an Item. This never worked. It will be removed.
     * @author cpw
     *
     */
    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.FIELD)
+    @Deprecated
    public @interface Item {
        /**
         * The name of the item
@@ -217,4 +417,14 @@ public @interface Mod
         */
        String typeClass();
    }
+
+    /**
+     * Mod instance factory method. Should return an instance of the mod. Applies only to static methods on the same class as {@link Mod}.
+     * @author cpw
+     *
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface InstanceFactory {
+    }
 }
@@ -1,16 +1,15 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Contributors:
+ *     cpw - implementation
 */
+
 package cpw.mods.fml.common;

 import java.io.File;
@@ -21,12 +20,14 @@ import java.net.URLClassLoader;
 import java.util.List;
 import java.util.logging.Level;

+import net.minecraft.launchwrapper.IClassTransformer;
+import net.minecraft.launchwrapper.LaunchClassLoader;
+
 import com.google.common.collect.ImmutableList;

 import cpw.mods.fml.common.asm.ASMTransformer;
 import cpw.mods.fml.common.asm.transformers.AccessTransformer;
 import cpw.mods.fml.common.modloader.BaseModProxy;
-import cpw.mods.fml.relauncher.RelaunchClassLoader;

 /**
 * A simple delegating class loader used to load mods into the system
@@ -38,16 +39,16 @@ import cpw.mods.fml.relauncher.RelaunchClassLoader;
 public class ModClassLoader extends URLClassLoader
 {
    private static final List<String> STANDARD_LIBRARIES = ImmutableList.of("jinput.jar", "lwjgl.jar", "lwjgl_util.jar");
-    private RelaunchClassLoader mainClassLoader;
+    private LaunchClassLoader mainClassLoader;

    public ModClassLoader(ClassLoader parent) {
        super(new URL[0], null);
-        this.mainClassLoader = (RelaunchClassLoader)parent;
+        this.mainClassLoader = (LaunchClassLoader)parent;
    }

    public void addFile(File modFile) throws MalformedURLException
    {
-            URL url = modFile.toURI().toURL();
+        URL url = modFile.toURI().toURL();
        mainClassLoader.addURL(url);
    }

@@ -70,7 +71,7 @@ public class ModClassLoader extends URLClassLoader
        }
        catch (URISyntaxException e)
        {
-            FMLLog.log(Level.SEVERE, "Unable to process our input to locate the minecraft code", e);
+            FMLLog.log(Level.SEVERE, e, "Unable to process our input to locate the minecraft code");
            throw new LoaderException(e);
        }
    }
@@ -82,8 +83,21 @@ public class ModClassLoader extends URLClassLoader

    public Class<? extends BaseModProxy> loadBaseModClass(String modClazzName) throws Exception
    {
-        AccessTransformer transformer = (AccessTransformer)mainClassLoader.getTransformers().get(0);
-        transformer.ensurePublicAccessFor(modClazzName);
+        AccessTransformer accessTransformer = null;
+        for (IClassTransformer transformer : mainClassLoader.getTransformers())
+        {
+            if (transformer instanceof AccessTransformer)
+            {
+                accessTransformer = (AccessTransformer) transformer;
+                break;
+            }
+        }
+        if (accessTransformer == null)
+        {
+            FMLLog.log(Level.SEVERE, "No access transformer found");
+            throw new LoaderException();
+        }
+        accessTransformer.ensurePublicAccessFor(modClazzName);
        return (Class<? extends BaseModProxy>) Class.forName(modClazzName, true, this);
    }
 }
@@ -1,22 +1,24 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Contributors:
+ *     cpw - implementation
 */
+
 package cpw.mods.fml.common;

 import java.io.File;
+import java.security.cert.Certificate;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;

+import com.google.common.collect.ImmutableMap;
 import com.google.common.eventbus.EventBus;

 import cpw.mods.fml.common.versioning.ArtifactVersion;
@@ -80,13 +82,13 @@ public interface ModContainer

    /**
     * A list of modids that should be loaded prior to this one. The special
-     * value <strong>*</strong> indicates to load <em>before</em> any other mod.
+     * value <strong>*</strong> indicates to load <em>after</em> any other mod.
     */
    List<ArtifactVersion> getDependencies();

    /**
     * A list of modids that should be loaded <em>after</em> this one. The
-     * special value <strong>*</strong> indicates to load <em>after</em> any
+     * special value <strong>*</strong> indicates to load <em>before</em> any
     * other mod.
     */
    List<ArtifactVersion> getDependants();
@@ -129,4 +131,11 @@ public interface ModContainer
    String getDisplayVersion();

    VersionRange acceptableMinecraftVersionRange();
+
+    Certificate getSigningCertificate();
+
+    public static final Map<String,String> EMPTY_PROPERTIES = ImmutableMap.of();
+    Map<String,String> getCustomModProperties();
+
+    public Class<?> getCustomResourcePackClass();
 }
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import java.io.File;
@@ -1,15 +1,13 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
 */

 package cpw.mods.fml.common;
@@ -15,6 +15,7 @@ package cpw.mods.fml.common;
 import java.util.Arrays;
 import java.util.logging.Level;

+import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
 import cpw.mods.fml.relauncher.ReflectionHelper;
 import cpw.mods.fml.relauncher.ReflectionHelper.UnableToAccessFieldException;
 import cpw.mods.fml.relauncher.ReflectionHelper.UnableToFindFieldException;
@@ -27,8 +28,6 @@ import cpw.mods.fml.relauncher.ReflectionHelper.UnableToFindFieldException;
 */
 public class ObfuscationReflectionHelper
 {
-    public static boolean obfuscation;
-
    @SuppressWarnings("unchecked")
    public static <T, E> T getPrivateValue(Class<? super E> classToAccess, E instance, int fieldIndex)
    {
@@ -43,12 +42,23 @@ public class ObfuscationReflectionHelper
        }
    }

+    public static String[] remapFieldNames(String className, String... fieldNames)
+    {
+        String internalClassName = FMLDeobfuscatingRemapper.INSTANCE.unmap(className.replace('.', '/'));
+        String[] mappedNames = new String[fieldNames.length];
+        int i = 0;
+        for (String fName : fieldNames)
+        {
+            mappedNames[i++] = FMLDeobfuscatingRemapper.INSTANCE.mapFieldName(internalClassName, fName, null);
+        }
+        return mappedNames;
+    }
    @SuppressWarnings("unchecked")
    public static <T, E> T getPrivateValue(Class<? super E> classToAccess, E instance, String... fieldNames)
    {
        try
        {
-            return ReflectionHelper.getPrivateValue(classToAccess, instance, fieldNames);
+            return ReflectionHelper.getPrivateValue(classToAccess, instance, remapFieldNames(classToAccess.getName(),fieldNames));
        }
        catch (UnableToFindFieldException e)
        {
@@ -91,7 +101,7 @@ public class ObfuscationReflectionHelper
    {
        try
        {
-            ReflectionHelper.setPrivateValue(classToAccess, instance, value, fieldNames);
+            ReflectionHelper.setPrivateValue(classToAccess, instance, value, remapFieldNames(classToAccess.getName(), fieldNames));
        }
        catch (UnableToFindFieldException e)
        {
@@ -104,13 +114,4 @@ public class ObfuscationReflectionHelper
            throw e;
        }
    }
-
-    /**
-     *
-     */
-    public static void detectObfuscation(Class<?> clazz)
-    {
-        obfuscation = !clazz.getSimpleName().equals("World");
-    }
-
 }
@@ -1,15 +1,13 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Contributors:
+ *     cpw - implementation
 */

 package cpw.mods.fml.common;
@@ -19,8 +17,11 @@ import java.lang.reflect.Modifier;
 import java.util.Set;
 import java.util.logging.Level;

+import com.google.common.base.Strings;
+
 import cpw.mods.fml.common.discovery.ASMDataTable;
 import cpw.mods.fml.common.discovery.ASMDataTable.ASMData;
+import cpw.mods.fml.relauncher.Side;

 /**
 * @author cpw
@@ -28,7 +29,7 @@ import cpw.mods.fml.common.discovery.ASMDataTable.ASMData;
 */
 public class ProxyInjector
 {
-    public static void inject(ModContainer mod, ASMDataTable data, Side side)
+    public static void inject(ModContainer mod, ASMDataTable data, Side side, ILanguageAdapter languageAdapter)
    {
        FMLLog.fine("Attempting to inject @SidedProxy classes into %s", mod.getModId());
        Set<ASMData> targets = data.getAnnotationsFor(mod).get(SidedProxy.class.getName());
@@ -47,10 +48,16 @@ public class ProxyInjector
                    throw new LoaderException();
                }

-                String targetType = side.isClient() ? target.getAnnotation(SidedProxy.class).clientSide() : target.getAnnotation(SidedProxy.class).serverSide();
+                SidedProxy annotation = target.getAnnotation(SidedProxy.class);
+                if (!Strings.isNullOrEmpty(annotation.modId()) && !annotation.modId().equals(mod.getModId()))
+                {
+                    FMLLog.fine("Skipping proxy injection for %s.%s since it is not for mod %s", targ.getClassName(), targ.getObjectName(), mod.getModId());
+                    continue;
+                }
+                String targetType = side.isClient() ? annotation.clientSide() : annotation.serverSide();
                Object proxy=Class.forName(targetType, true, mcl).newInstance();

-                if ((target.getModifiers() & Modifier.STATIC) == 0 )
+                if (languageAdapter.supportsStatics() && (target.getModifiers() & Modifier.STATIC) == 0 )
                {
                    FMLLog.severe("Attempted to load a proxy type %s into %s.%s, but the field is not static", targetType, targ.getClassName(), targ.getObjectName());
                    throw new LoaderException();
@@ -60,7 +67,7 @@ public class ProxyInjector
                    FMLLog.severe("Attempted to load a proxy type %s into %s.%s, but the types don't match", targetType, targ.getClassName(), targ.getObjectName());
                    throw new LoaderException();
                }
-                target.set(null, proxy);
+                languageAdapter.setProxy(target, proxyTarget, proxy);
            }
            catch (Exception e)
            {
@@ -68,5 +75,8 @@ public class ProxyInjector
                throw new LoaderException(e);
            }
        }
+
+        // Allow language specific proxy injection.
+        languageAdapter.setInternalProxies(mod, side, mcl);
    }
 }
@@ -1,35 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package cpw.mods.fml.common;
-
-public enum Side {
-    CLIENT, SERVER, BUKKIT;
-
-    /**
-     * @return If this is the server environment
-     */
-    public boolean isServer()
-    {
-        return !isClient();
-    }
-
-    /**
-     * @return if this is the Client environment
-     */
-    public boolean isClient()
-    {
-        return this == CLIENT;
-    }
-}
@@ -1,15 +1,13 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Contributors:
+ *     cpw - implementation
 */

 package cpw.mods.fml.common;
@@ -20,6 +18,30 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;

 /**
+ * Sided proxies are loaded based on the specific environment they find themselves loaded into.
+ * They are used to ensure that client-specific code (such as GUIs) is only loaded into the game
+ * on the client side.
+ * It is applied to static fields of a class, anywhere in your mod code. FML will scan
+ * and load any classes with this annotation at mod construction time.
+ *
+ * <p>
+ * This example will load a CommonProxy on the server side, and a ClientProxy on the client side.
+ *
+ * <pre>{@code
+ *  public class MySidedProxyHolder {
+ *      {@literal @}SidedProxy(modId="MyModId",clientSide="mymod.ClientProxy", serverSide="mymod.CommonProxy")
+ *      public static CommonProxy proxy;
+ *  }
+ *
+ *  public class CommonProxy {
+ *      // Common or server stuff here that needs to be overridden on the client
+ *  }
+ *
+ *  public class ClientProxy extends CommonProxy {
+ *      // Override common stuff with client specific stuff here
+ *  }
+ * }
+ * </pre>
 * @author cpw
 *
 */
@@ -37,8 +59,17 @@ public @interface SidedProxy
     */
    String serverSide() default "";

+    @Deprecated
    /**
+     * Not implemented
     * The name of a special bukkit plugin class to load and populate
     */
    String bukkitSide() default "";
+
+    /**
+     * The (optional) name of a mod to load this proxy for. This will help ensure correct behaviour when loading a combined
+     * scala/java mod package. It is almost never going to be required, unless you ship both Scala and Java {@link Mod} content
+     * in a single jar.
+     */
+    String modId() default "";
 }
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import java.util.EnumSet;
@@ -1,15 +1,13 @@
 /*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Contributors:
+ *     cpw - implementation
 */

 package cpw.mods.fml.common;
@@ -30,19 +28,6 @@ public enum TickType {
     * arg 0 : float "partial render time"
     */
    RENDER,
-    /**
-     * client side
-     * Fired during the render processing phase if a GUI is open
-     * arg 0 : float "partial render time"
-     * arg 1 : the open gui or null if no gui is open
-     */
-    GUI,
-    /**
-     * client side
-     * Fired during the client evaluation loop
-     * arg 0 : The open gui or null if no gui is open
-     */
-    CLIENTGUI,
    /**
     * server side
     * Fired once as the world loads from disk
@@ -74,8 +59,6 @@ public enum TickType {
    {
        if (this==CLIENT) return EnumSet.of(RENDER);
        if (this==RENDER) return EnumSet.of(CLIENT);
-        if (this==GUI) return EnumSet.of(CLIENTGUI);
-        if (this==CLIENTGUI) return EnumSet.of(GUI);
        return EnumSet.noneOf(TickType.class);
    }
-}
+}
@@ -1,11 +1,22 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 import java.util.Map;

-import net.minecraft.src.NBTBase;
-import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.SaveHandler;
-import net.minecraft.src.WorldInfo;
+import net.minecraft.nbt.*;
+import net.minecraft.world.storage.*;
+

 public interface WorldAccessContainer
 {
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common;

 public class WrongMinecraftVersionException extends RuntimeException
@@ -1,5 +1,19 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common.asm;

+import net.minecraft.launchwrapper.IClassTransformer;
+
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
@@ -7,12 +21,11 @@ import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.ClassNode;

 import cpw.mods.fml.common.registry.BlockProxy;
-import cpw.mods.fml.relauncher.IClassTransformer;

 public class ASMTransformer implements IClassTransformer
 {
    @Override
-    public byte[] transform(String name, byte[] bytes)
+    public byte[] transform(String name,String transformedName, byte[] bytes)
    {
        if ("net.minecraft.src.Block".equals(name))
        {
@@ -24,7 +37,7 @@ public class ASMTransformer implements IClassTransformer
            cn.accept(cw);
            return cw.toByteArray();
        }
-        
+
        return bytes;
    }

@@ -1,19 +1,70 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common.asm;

+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.ObjectInputStream.GetField;
+import java.io.StringReader;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.nio.charset.Charset;
+import java.security.CodeSource;
+import java.security.cert.CertPath;
+import java.security.cert.CertPathValidator;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.security.cert.PKIXCertPathValidatorResult;
+import java.security.cert.PKIXParameters;
+import java.security.cert.TrustAnchor;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Locale;
 import java.util.Map;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.logging.Level;
+import java.util.zip.ZipEntry;

 import javax.swing.JOptionPane;

+import net.minecraft.launchwrapper.LaunchClassLoader;
+
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.FieldVisitor;
 import org.objectweb.asm.Opcodes;

+import com.google.common.base.Charsets;
+import com.google.common.io.ByteStreams;
+
+import cpw.mods.fml.common.CertificateHelper;
+import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
+import cpw.mods.fml.common.patcher.ClassPatchManager;
+import cpw.mods.fml.relauncher.FMLLaunchHandler;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
 import cpw.mods.fml.relauncher.IFMLCallHook;
-import cpw.mods.fml.relauncher.RelaunchClassLoader;
+import cpw.mods.fml.relauncher.Side;

 public class FMLSanityChecker implements IFMLCallHook
 {
+    private static final String FMLFINGERPRINT =   "51:0A:FB:4C:AF:A4:A0:F2:F5:CF:C5:0E:B4:CC:3C:30:24:4A:E3:8E".toLowerCase().replace(":", "");
+    private static final String FORGEFINGERPRINT = "E3:C3:D5:0C:7C:98:6D:F7:4C:64:5C:0A:C5:46:39:74:1C:90:A5:57".toLowerCase().replace(":", "");
+    private static final String MCFINGERPRINT =    "CD:99:95:96:56:F7:53:DC:28:D8:63:B4:67:69:F7:F8:FB:AE:FC:FC".toLowerCase().replace(":", "");
    static class MLDetectorClassVisitor extends ClassVisitor
    {
        private boolean foundMarker = false;
@@ -33,11 +84,132 @@ public class FMLSanityChecker implements IFMLCallHook
        }
    }

-    private RelaunchClassLoader cl;
+    private LaunchClassLoader cl;
+    public static File fmlLocation;

    @Override
    public Void call() throws Exception
    {
+        CodeSource codeSource = getClass().getProtectionDomain().getCodeSource();
+        boolean goodFML = false;
+        boolean fmlIsJar = false;
+        if (codeSource.getLocation().getProtocol().equals("jar"))
+        {
+            fmlIsJar = true;
+            Certificate[] certificates = codeSource.getCertificates();
+            if (certificates!=null)
+            {
+
+                for (Certificate cert : certificates)
+                {
+                    String fingerprint = CertificateHelper.getFingerprint(cert);
+                    if (fingerprint.equals(FMLFINGERPRINT))
+                    {
+                        FMLRelaunchLog.info("Found valid fingerprint for FML. Certificate fingerprint %s", fingerprint);
+                        goodFML = true;
+                    }
+                    else if (fingerprint.equals(FORGEFINGERPRINT))
+                    {
+                        FMLRelaunchLog.info("Found valid fingerprint for Minecraft Forge. Certificate fingerprint %s", fingerprint);
+                        goodFML = true;
+                    }
+                    else
+                    {
+                        FMLRelaunchLog.severe("Found invalid fingerprint for FML: %s", fingerprint);
+                    }
+                }
+            }
+        }
+        else
+        {
+            goodFML = true;
+        }
+
+        boolean goodMC = FMLLaunchHandler.side() == Side.SERVER; //Server is not signed, so assume it's good.
+        int certCount = 0;
+        try
+        {
+            Class cbr = Class.forName("net.minecraft.client.ClientBrandRetriever",false, cl);
+            codeSource = cbr.getProtectionDomain().getCodeSource();
+        }
+        catch (Exception e)
+        {
+            // Probably a development environment, or the server (the server is not signed)
+            goodMC = true;
+        }
+        JarFile mcJarFile = null;
+        if (fmlIsJar && !goodMC && codeSource.getLocation().getProtocol().equals("jar"))
+        {
+            try
+            {
+                String mcPath = codeSource.getLocation().getPath().substring(5);
+                mcPath = mcPath.substring(0, mcPath.lastIndexOf('!'));
+                mcPath = URLDecoder.decode(mcPath, Charsets.UTF_8.name());
+                mcJarFile = new JarFile(mcPath,true);
+                mcJarFile.getManifest();
+                JarEntry cbrEntry = mcJarFile.getJarEntry("net/minecraft/client/ClientBrandRetriever.class");
+                ByteStreams.toByteArray(mcJarFile.getInputStream(cbrEntry));
+                Certificate[] certificates = cbrEntry.getCertificates();
+                certCount = certificates != null ? certificates.length : 0;
+                if (certificates!=null)
+                {
+
+                    for (Certificate cert : certificates)
+                    {
+                        String fingerprint = CertificateHelper.getFingerprint(cert);
+                        if (fingerprint.equals(MCFINGERPRINT))
+                        {
+                            FMLRelaunchLog.info("Found valid fingerprint for Minecraft. Certificate fingerprint %s", fingerprint);
+                            goodMC = true;
+                        }
+                    }
+                }
+            }
+            catch (Throwable e)
+            {
+                FMLRelaunchLog.log(Level.SEVERE, e, "A critical error occurred trying to read the minecraft jar file");
+            }
+            finally
+            {
+                if (mcJarFile != null)
+                {
+                    try 
+                    {
+                        mcJarFile.close();
+                    }
+                    catch (IOException ioe)
+                    {
+                        // Noise
+                    }
+                }
+            }
+        }
+        else
+        {
+            goodMC = true;
+        }
+        if (!goodMC)
+        {
+            FMLRelaunchLog.severe("The minecraft jar %s appears to be corrupt! There has been CRITICAL TAMPERING WITH MINECRAFT, it is highly unlikely minecraft will work! STOP NOW, get a clean copy and try again!",codeSource.getLocation().getFile());
+            if (!Boolean.parseBoolean(System.getProperty("fml.ignoreInvalidMinecraftCertificates","false")))
+            {
+                FMLRelaunchLog.severe("For your safety, FML will not launch minecraft. You will need to fetch a clean version of the minecraft jar file");
+                FMLRelaunchLog.severe("Technical information: The class net.minecraft.client.ClientBrandRetriever should have been associated with the minecraft jar file, " +
+                		"and should have returned us a valid, intact minecraft jar location. This did not work. Either you have modified the minecraft jar file (if so " +
+                		"run the forge installer again), or you are using a base editing jar that is changing this class (and likely others too). If you REALLY " +
+                		"want to run minecraft in this configuration, add the flag -Dfml.ignoreInvalidMinecraftCertificates=true to the 'JVM settings' in your launcher profile.");
+                System.exit(1);
+            }
+            else
+            {
+                FMLRelaunchLog.severe("FML has been ordered to ignore the invalid or missing minecraft certificate. This is very likely to cause a problem!");
+                FMLRelaunchLog.severe("Technical information: ClientBrandRetriever was at %s, there were %d certificates for it", codeSource.getLocation(), certCount);
+            }
+        }
+        if (!goodFML)
+        {
+            FMLRelaunchLog.severe("FML appears to be missing any signature data. This is not a good thing");
+        }
        byte[] mlClass = cl.getClassBytes("ModLoader");
        // Only care in obfuscated env
        if (mlClass == null)
@@ -66,7 +238,11 @@ public class FMLSanityChecker implements IFMLCallHook
    @Override
    public void injectData(Map<String, Object> data)
    {
-        cl = (RelaunchClassLoader) data.get("classLoader");
+        cl = (LaunchClassLoader) data.get("classLoader");
+        File mcDir = (File)data.get("mcLocation");
+        fmlLocation = (File)data.get("coremodLocation");
+        FMLDeobfuscatingRemapper.INSTANCE.setup(mcDir, cl, (String) data.get("deobfuscationFileName"));
+        ClassPatchManager.INSTANCE.setup(FMLLaunchHandler.side());
    }

 }
@@ -0,0 +1,29 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
+package cpw.mods.fml.common.asm;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Used to force certain classes to reobfuscate
+ * @author cpw
+ *
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface ReobfuscationMarker {
+
+}
@@ -1,15 +0,0 @@
-package cpw.mods.fml.common.asm;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import cpw.mods.fml.common.Side;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR})
-public @interface SideOnly
-{
-    public Side value();
-}
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common.asm.transformers;

 import static org.objectweb.asm.Opcodes.ACC_FINAL;
@@ -20,6 +32,8 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;

+import net.minecraft.launchwrapper.IClassTransformer;
+
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
@@ -35,7 +49,8 @@ import com.google.common.collect.Multimap;
 import com.google.common.io.LineProcessor;
 import com.google.common.io.Resources;

-import cpw.mods.fml.relauncher.IClassTransformer;
+import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;

 public class AccessTransformer implements IClassTransformer
 {
@@ -139,19 +154,49 @@ public class AccessTransformer implements IClassTransformer
                return true;
            }
        });
+        System.out.printf("Loaded %d rules from AccessTransformer config file %s\n", modifiers.size(), rulesFile);
    }

-    @SuppressWarnings("unchecked")
    @Override
-    public byte[] transform(String name, byte[] bytes)
+    public byte[] transform(String name, String transformedName, byte[] bytes)
    {
-    	if (bytes == null) { return null; }
-        if (!modifiers.containsKey(name)) { return bytes; }
+        if (bytes == null) { return null; }
+        boolean makeAllPublic = FMLDeobfuscatingRemapper.INSTANCE.isRemappedClass(name);
+
+        if (DEBUG)
+        {
+            FMLRelaunchLog.fine("Considering all methods and fields on %s (%s): %b\n", name, transformedName, makeAllPublic);
+        }
+        if (!makeAllPublic && !modifiers.containsKey(name)) { return bytes; }

        ClassNode classNode = new ClassNode();
        ClassReader classReader = new ClassReader(bytes);
        classReader.accept(classNode, 0);

+        if (makeAllPublic)
+        {
+            // class
+            Modifier m = new Modifier();
+            m.targetAccess = ACC_PUBLIC;
+            m.modifyClassVisibility = true;
+            modifiers.put(name,m);
+            // fields
+            m = new Modifier();
+            m.targetAccess = ACC_PUBLIC;
+            m.name = "*";
+            modifiers.put(name,m);
+            // methods
+            m = new Modifier();
+            m.targetAccess = ACC_PUBLIC;
+            m.name = "*";
+            m.desc = "<dummy>";
+            modifiers.put(name,m);
+            if (DEBUG)
+            {
+                System.out.printf("Injected all public modifiers for %s (%s)\n", name, transformedName);
+            }
+        }
+
        Collection<Modifier> mods = modifiers.get(name);
        for (Modifier m : mods)
        {
@@ -166,7 +211,7 @@ public class AccessTransformer implements IClassTransformer
            }
            if (m.desc.isEmpty())
            {
-                for (FieldNode n : (List<FieldNode>) classNode.fields)
+                for (FieldNode n : classNode.fields)
                {
                    if (n.name.equals(m.name) || m.name.equals("*"))
                    {
@@ -185,7 +230,7 @@ public class AccessTransformer implements IClassTransformer
            }
            else
            {
-                for (MethodNode n : (List<MethodNode>) classNode.methods)
+                for (MethodNode n : classNode.methods)
                {
                    if ((n.name.equals(m.name) && n.desc.equals(m.desc)) || m.name.equals("*"))
                    {
@@ -239,7 +284,7 @@ public class AccessTransformer implements IClassTransformer
        }

        // Clear the "final" marker on fields only if specified in control field
-        if (target.changeFinal && target.desc == "")
+        if (target.changeFinal)
        {
            if (target.markFinal)
            {
@@ -375,7 +420,7 @@ public class AccessTransformer implements IClassTransformer

                    for (AccessTransformer trans : transformers)
                    {
-                        entryData = trans.transform(name, entryData);
+                        entryData = trans.transform(name, name, entryData);
                    }
                }

@@ -416,4 +461,4 @@ public class AccessTransformer implements IClassTransformer
        m.modifyClassVisibility = true;
        modifiers.put(modClazzName, m);
    }
-}
+}
@@ -0,0 +1,55 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
+package cpw.mods.fml.common.asm.transformers;
+
+import net.minecraft.launchwrapper.IClassNameTransformer;
+import net.minecraft.launchwrapper.IClassTransformer;
+
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.commons.RemappingClassAdapter;
+import org.objectweb.asm.tree.ClassNode;
+
+import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
+import cpw.mods.fml.common.asm.transformers.deobf.FMLRemappingAdapter;
+
+public class DeobfuscationTransformer implements IClassTransformer, IClassNameTransformer {
+
+    @Override
+    public byte[] transform(String name, String transformedName, byte[] bytes)
+    {
+        if (bytes == null)
+        {
+            return null;
+        }
+        ClassReader classReader = new ClassReader(bytes);
+        ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_MAXS);
+        RemappingClassAdapter remapAdapter = new FMLRemappingAdapter(classWriter);
+        classReader.accept(remapAdapter, ClassReader.EXPAND_FRAMES);
+        return classWriter.toByteArray();
+    }
+
+    @Override
+    public String remapClassName(String name)
+    {
+        return FMLDeobfuscatingRemapper.INSTANCE.map(name.replace('.','/')).replace('/', '.');
+    }
+
+    @Override
+    public String unmapClassName(String name)
+    {
+        return FMLDeobfuscatingRemapper.INSTANCE.unmap(name.replace('.', '/')).replace('/','.');
+    }
+
+}
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common.asm.transformers;

 import java.io.BufferedOutputStream;
@@ -35,8 +47,8 @@ import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;

-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.asm.SideOnly;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;

 public class MCPMerger
 {
@@ -45,6 +57,8 @@ public class MCPMerger
    private static Hashtable<String, ClassInfo> servers = new Hashtable<String, ClassInfo>();
    private static HashSet<String> copyToServer = new HashSet<String>();
    private static HashSet<String> copyToClient = new HashSet<String>();
+    private static HashSet<String> dontAnnotate = new HashSet<String>();
+    private static HashSet<String> dontProcess  = new HashSet<String>();
    private static final boolean DEBUG = false;

    public static void main(String[] args)
@@ -58,9 +72,8 @@ public class MCPMerger
        File map_file = new File(args[0]);
        File client_jar = new File(args[1]);
        File server_jar = new File(args[2]);
-        File client_jar_tmp = new File(args[1] + ".MergeBack");
-        File server_jar_tmp = new File(args[2] + ".MergeBack");
-
+        File client_jar_tmp = new File(args[1] + ".backup_merge");
+        File server_jar_tmp = new File(args[2] + ".backup_merge");

        if (client_jar_tmp.exists() && !client_jar_tmp.delete())
        {
@@ -134,11 +147,17 @@ public class MCPMerger
            String line;
            while ((line = br.readLine()) != null)
            {
-		line = line.split("#")[0];
-                boolean toClient = line.charAt(0) == '<';
+                line = line.split("#")[0];
+                char cmd = line.charAt(0);
                line = line.substring(1).trim();
-                if (toClient) copyToClient.add(line);
-                else copyToServer.add(line);
+
+                switch (cmd)
+                {
+                    case '!': dontAnnotate.add(line); break;
+                    case '<': copyToClient.add(line); break;
+                    case '>': copyToServer.add(line); break;
+                    case '^': dontProcess.add(line);  break;
+                }
            }

            in.close();
@@ -225,20 +244,14 @@ public class MCPMerger
                cAdded.add(name);
                sAdded.add(name);
            }
+
            for (Entry<String, ZipEntry> entry : sClasses.entrySet())
            {
-                if (!copyToClient.contains(entry.getKey()))
+                if (DEBUG)
                {
-                    copyClass(sInJar, entry.getValue(), null, sOutJar, false);
-                }
-                else
-                {
-                    if (DEBUG)
-                    {
-                        System.out.println("Copy class s->c : " + entry.getKey());
-                    }
-                    copyClass(sInJar, entry.getValue(), cOutJar, sOutJar, false);
+                    System.out.println("Copy class s->c : " + entry.getKey());
                }
+                copyClass(sInJar, entry.getValue(), cOutJar, sOutJar, false);
            }

            for (String name : new String[]{SideOnly.class.getName(), Side.class.getName()})
@@ -289,7 +302,7 @@ public class MCPMerger

        reader.accept(classNode, 0);

-        if (!classNode.name.equals("bdz")) //Special case CodecMus so I dont have to make a new patch, anyone who uses this in production code is.. bad.
+        if (!dontAnnotate.contains(classNode.name))
        {
            if (classNode.visibleAnnotations == null) classNode.visibleAnnotations = new ArrayList<AnnotationNode>();
            classNode.visibleAnnotations.add(getSideAnn(isClientOnly));
@@ -321,19 +334,30 @@ public class MCPMerger
        return ann;
    }

-    @SuppressWarnings("unchecked")
    private static Hashtable<String, ZipEntry> getClassEntries(ZipFile inFile, ZipOutputStream outFile) throws IOException
    {
        Hashtable<String, ZipEntry> ret = new Hashtable<String, ZipEntry>();
-        for (ZipEntry entry : Collections.list((Enumeration<ZipEntry>)inFile.entries()))
+        for (ZipEntry entry : Collections.list(inFile.entries()))
        {
            if (entry.isDirectory())
            {
                outFile.putNextEntry(entry);
                continue;
            }
+
            String entryName = entry.getName();
-            if (!entryName.endsWith(".class") || entryName.startsWith("."))
+
+            boolean filtered = false;
+            for (String filter : dontProcess)
+            {
+                if (entryName.startsWith(filter))
+                {
+                    filtered = true;
+                    break;
+                }
+            }
+
+            if (filtered || !entryName.endsWith(".class") || entryName.startsWith("."))
            {
                ZipEntry newEntry = new ZipEntry(entry.getName());
                outFile.putNextEntry(newEntry);
@@ -398,7 +422,6 @@ public class MCPMerger
        return classNode;
    }

-    @SuppressWarnings("unchecked")
    private static void processFields(ClassNode cClass, ClassNode sClass, ClassInfo info)
    {
        List<FieldNode> cFields = cClass.fields;
@@ -512,7 +535,6 @@ public class MCPMerger
            return Objects.toStringHelper(this).add("name", node.name).add("desc",node.desc).add("server",server).add("client",client).toString();
        }
    }
-    @SuppressWarnings("unchecked")
    private static void processMethods(ClassNode cClass, ClassNode sClass, ClassInfo info)
    {
        List<MethodNode> cMethods = (List<MethodNode>)cClass.methods;
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common.asm.transformers;

 import java.io.BufferedInputStream;
@@ -14,6 +26,8 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;

+import net.minecraft.launchwrapper.IClassTransformer;
+
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.tree.ClassNode;
@@ -27,8 +41,6 @@ import com.google.common.collect.Lists;
 import com.google.common.io.LineProcessor;
 import com.google.common.io.Resources;

-import cpw.mods.fml.relauncher.IClassTransformer;
-
 public class MarkerTransformer implements IClassTransformer
 {
    private ListMultimap<String, String> markers = ArrayListMultimap.create();
@@ -85,9 +97,8 @@ public class MarkerTransformer implements IClassTransformer
        });
    }

-    @SuppressWarnings("unchecked")
    @Override
-    public byte[] transform(String name, byte[] bytes)
+    public byte[] transform(String name, String transformedName, byte[] bytes)
    {
    	if (bytes == null) { return null; }
        if (!markers.containsKey(name)) { return bytes; }
@@ -240,7 +251,7 @@ public class MarkerTransformer implements IClassTransformer

                    for (MarkerTransformer trans : transformers)
                    {
-                        entryData = trans.transform(name, entryData);
+                        entryData = trans.transform(name, name, entryData);
                    }
                }

@@ -274,4 +285,4 @@ public class MarkerTransformer implements IClassTransformer
            }
        }
    }
-}
+}
@@ -0,0 +1,13 @@
+package cpw.mods.fml.common.asm.transformers;
+
+import net.minecraft.launchwrapper.IClassTransformer;
+import cpw.mods.fml.common.patcher.ClassPatchManager;
+
+public class PatchingTransformer implements IClassTransformer {
+    @Override
+    public byte[] transform(String name, String transformedName, byte[] bytes)
+    {
+        return ClassPatchManager.INSTANCE.applyPatch(name, transformedName, bytes);
+    }
+
+}
@@ -1,8 +1,22 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common.asm.transformers;

 import java.util.Iterator;
 import java.util.List;

+import net.minecraft.launchwrapper.IClassTransformer;
+
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Type;
@@ -11,17 +25,15 @@ import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.FieldNode;
 import org.objectweb.asm.tree.MethodNode;

-import cpw.mods.fml.common.asm.SideOnly;
-import cpw.mods.fml.relauncher.FMLRelauncher;
-import cpw.mods.fml.relauncher.IClassTransformer;
+import cpw.mods.fml.relauncher.FMLLaunchHandler;
+import cpw.mods.fml.relauncher.SideOnly;

 public class SideTransformer implements IClassTransformer
 {
-    private static String SIDE = FMLRelauncher.side();
+    private static String SIDE = FMLLaunchHandler.side().name();
    private static final boolean DEBUG = false;
-    @SuppressWarnings("unchecked")
    @Override
-    public byte[] transform(String name, byte[] bytes)
+    public byte[] transform(String name, String transformedName, byte[] bytes)
    {
    	if (bytes == null) { return null; }

@@ -69,7 +81,7 @@ public class SideTransformer implements IClassTransformer
        classNode.accept(writer);
        return writer.toByteArray();
    }
-    
+
    private boolean remove(List<AnnotationNode> anns, String side)
    {
        if (anns == null)
@@ -0,0 +1,418 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
+package cpw.mods.fml.common.asm.transformers.deobf;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import net.minecraft.launchwrapper.LaunchClassLoader;
+
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.commons.Remapper;
+
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Charsets;
+import com.google.common.base.Splitter;
+import com.google.common.base.Strings;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.google.common.collect.ImmutableBiMap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableBiMap.Builder;
+import com.google.common.io.CharStreams;
+import com.google.common.io.InputSupplier;
+
+import cpw.mods.fml.common.FMLLog;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.FieldNode;
+
+public class FMLDeobfuscatingRemapper extends Remapper {
+    public static final FMLDeobfuscatingRemapper INSTANCE = new FMLDeobfuscatingRemapper();
+
+    private BiMap<String, String> classNameBiMap;
+    private BiMap<String, String> mcpNameBiMap;
+
+    private Map<String,Map<String,String>> rawFieldMaps;
+    private Map<String,Map<String,String>> rawMethodMaps;
+
+    private Map<String,Map<String,String>> fieldNameMaps;
+    private Map<String,Map<String,String>> methodNameMaps;
+
+    private LaunchClassLoader classLoader;
+
+    private FMLDeobfuscatingRemapper()
+    {
+        classNameBiMap=ImmutableBiMap.of();
+        mcpNameBiMap=ImmutableBiMap.of();
+    }
+
+    public void setupLoadOnly(String deobfFileName, boolean loadAll)
+    {
+        try
+        {
+            File mapData = new File(deobfFileName);
+            LZMAInputSupplier zis = new LZMAInputSupplier(new FileInputStream(mapData));
+            InputSupplier<InputStreamReader> srgSupplier = CharStreams.newReaderSupplier(zis,Charsets.UTF_8);
+            List<String> srgList = CharStreams.readLines(srgSupplier);
+            rawMethodMaps = Maps.newHashMap();
+            rawFieldMaps = Maps.newHashMap();
+            Builder<String, String> builder = ImmutableBiMap.<String,String>builder();
+            Builder<String, String> mcpBuilder = ImmutableBiMap.<String,String>builder();
+            Splitter splitter = Splitter.on(CharMatcher.anyOf(": ")).omitEmptyStrings().trimResults();
+            for (String line : srgList)
+            {
+                String[] parts = Iterables.toArray(splitter.split(line),String.class);
+                String typ = parts[0];
+                if ("CL".equals(typ))
+                {
+                    parseClass(builder, parts);
+                    parseMCPClass(mcpBuilder,parts);
+                }
+                else if ("MD".equals(typ) && loadAll)
+                {
+                    parseMethod(parts);
+                }
+                else if ("FD".equals(typ) && loadAll)
+                {
+                    parseField(parts);
+                }
+            }
+            classNameBiMap = builder.build();
+            // Special case some mappings for modloader mods
+            mcpBuilder.put("BaseMod","net/minecraft/src/BaseMod");
+            mcpBuilder.put("ModLoader","net/minecraft/src/ModLoader");
+            mcpBuilder.put("EntityRendererProxy","net/minecraft/src/EntityRendererProxy");
+            mcpBuilder.put("MLProp","net/minecraft/src/MLProp");
+            mcpBuilder.put("TradeEntry","net/minecraft/src/TradeEntry");
+            mcpNameBiMap = mcpBuilder.build();
+        }
+        catch (IOException ioe)
+        {
+            Logger.getLogger("FML").log(Level.SEVERE, "An error occurred loading the deobfuscation map data", ioe);
+        }
+        methodNameMaps = Maps.newHashMapWithExpectedSize(rawMethodMaps.size());
+        fieldNameMaps = Maps.newHashMapWithExpectedSize(rawFieldMaps.size());
+
+    }
+    public void setup(File mcDir, LaunchClassLoader classLoader, String deobfFileName)
+    {
+        this.classLoader = classLoader;
+        try
+        {
+            InputStream classData = getClass().getResourceAsStream(deobfFileName);
+            LZMAInputSupplier zis = new LZMAInputSupplier(classData);
+            InputSupplier<InputStreamReader> srgSupplier = CharStreams.newReaderSupplier(zis,Charsets.UTF_8);
+            List<String> srgList = CharStreams.readLines(srgSupplier);
+            rawMethodMaps = Maps.newHashMap();
+            rawFieldMaps = Maps.newHashMap();
+            Builder<String, String> builder = ImmutableBiMap.<String,String>builder();
+            Builder<String, String> mcpBuilder = ImmutableBiMap.<String,String>builder();
+            Splitter splitter = Splitter.on(CharMatcher.anyOf(": ")).omitEmptyStrings().trimResults();
+            for (String line : srgList)
+            {
+                String[] parts = Iterables.toArray(splitter.split(line),String.class);
+                String typ = parts[0];
+                if ("CL".equals(typ))
+                {
+                    parseClass(builder, parts);
+                    parseMCPClass(mcpBuilder,parts);
+                }
+                else if ("MD".equals(typ))
+                {
+                    parseMethod(parts);
+                }
+                else if ("FD".equals(typ))
+                {
+                    parseField(parts);
+                }
+            }
+            classNameBiMap = builder.build();
+            // Special case some mappings for modloader mods
+            mcpBuilder.put("BaseMod","net/minecraft/src/BaseMod");
+            mcpBuilder.put("ModLoader","net/minecraft/src/ModLoader");
+            mcpBuilder.put("EntityRendererProxy","net/minecraft/src/EntityRendererProxy");
+            mcpBuilder.put("MLProp","net/minecraft/src/MLProp");
+            mcpBuilder.put("TradeEntry","net/minecraft/src/TradeEntry");
+            mcpNameBiMap = mcpBuilder.build();
+        }
+        catch (IOException ioe)
+        {
+            FMLRelaunchLog.log(Level.SEVERE, ioe, "An error occurred loading the deobfuscation map data");
+        }
+        methodNameMaps = Maps.newHashMapWithExpectedSize(rawMethodMaps.size());
+        fieldNameMaps = Maps.newHashMapWithExpectedSize(rawFieldMaps.size());
+    }
+
+    public boolean isRemappedClass(String className)
+    {
+        className = className.replace('.', '/');
+        return classNameBiMap.containsKey(className) || mcpNameBiMap.containsKey(className) || (!classNameBiMap.isEmpty() && className.indexOf('/') == -1);
+    }
+
+    private void parseField(String[] parts)
+    {
+        String oldSrg = parts[1];
+        int lastOld = oldSrg.lastIndexOf('/');
+        String cl = oldSrg.substring(0,lastOld);
+        String oldName = oldSrg.substring(lastOld+1);
+        String newSrg = parts[2];
+        int lastNew = newSrg.lastIndexOf('/');
+        String newName = newSrg.substring(lastNew+1);
+        if (!rawFieldMaps.containsKey(cl))
+        {
+            rawFieldMaps.put(cl, Maps.<String,String>newHashMap());
+        }
+        rawFieldMaps.get(cl).put(oldName + ":" + getFieldType(cl, oldName), newName);
+        rawFieldMaps.get(cl).put(oldName + ":null", newName);
+    }
+
+    /*
+     * Cache the field descriptions for classes so we don't repeatedly reload the same data again and again
+     */
+    private Map<String,Map<String,String>> fieldDescriptions = Maps.newHashMap();
+
+    private String getFieldType(String owner, String name)
+    {
+        if (fieldDescriptions.containsKey(owner))
+        {
+            return fieldDescriptions.get(owner).get(name);
+        }
+        synchronized (fieldDescriptions)
+        {
+            try
+            {
+                byte[] classBytes = classLoader.getClassBytes(owner);
+                if (classBytes == null)
+                {
+                    return null;
+                }
+                ClassReader cr = new ClassReader(classBytes);
+                ClassNode classNode = new ClassNode();
+                cr.accept(classNode, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
+                Map<String,String> resMap = Maps.newHashMap();
+                for (FieldNode fieldNode : (List<FieldNode>) classNode.fields) {
+                    resMap.put(fieldNode.name, fieldNode.desc);
+                }
+                fieldDescriptions.put(owner, resMap);
+                return resMap.get(name);
+            }
+            catch (IOException e)
+            {
+                FMLLog.log(Level.SEVERE,e, "A critical exception occured reading a class file %s", owner);
+            }
+            return null;
+        }
+    }
+
+    private void parseClass(Builder<String, String> builder, String[] parts)
+    {
+        builder.put(parts[1],parts[2]);
+    }
+
+    private void parseMCPClass(Builder<String, String> builder, String[] parts)
+    {
+        int clIdx = parts[2].lastIndexOf('/');
+        builder.put("net/minecraft/src/"+parts[2].substring(clIdx+1),parts[2]);
+    }
+
+    private void parseMethod(String[] parts)
+    {
+        String oldSrg = parts[1];
+        int lastOld = oldSrg.lastIndexOf('/');
+        String cl = oldSrg.substring(0,lastOld);
+        String oldName = oldSrg.substring(lastOld+1);
+        String sig = parts[2];
+        String newSrg = parts[3];
+        int lastNew = newSrg.lastIndexOf('/');
+        String newName = newSrg.substring(lastNew+1);
+        if (!rawMethodMaps.containsKey(cl))
+        {
+            rawMethodMaps.put(cl, Maps.<String,String>newHashMap());
+        }
+        rawMethodMaps.get(cl).put(oldName+sig, newName);
+    }
+
+    @Override
+    public String mapFieldName(String owner, String name, String desc)
+    {
+        if (classNameBiMap == null || classNameBiMap.isEmpty())
+        {
+            return name;
+        }
+        Map<String, String> fieldMap = getFieldMap(owner);
+        return fieldMap!=null && fieldMap.containsKey(name+":"+desc) ? fieldMap.get(name+":"+desc) : name;
+    }
+
+    @Override
+    public String map(String typeName)
+    {
+        if (classNameBiMap == null || classNameBiMap.isEmpty())
+        {
+            return typeName;
+        }
+
+        int dollarIdx = typeName.indexOf('$');
+        String realType = dollarIdx > -1 ? typeName.substring(0, dollarIdx) : typeName;
+        String subType = dollarIdx > -1 ? typeName.substring(dollarIdx+1) : "";
+
+        String result = classNameBiMap.containsKey(realType) ? classNameBiMap.get(realType) : mcpNameBiMap.containsKey(realType) ? mcpNameBiMap.get(realType) : realType;
+        result = dollarIdx > -1 ? result+"$"+subType : result;
+//        System.out.printf("Mapping %s=>%s\n",typeName,result);
+        return result;
+    }
+
+    public String unmap(String typeName)
+    {
+        if (classNameBiMap == null || classNameBiMap.isEmpty())
+        {
+            return typeName;
+        }
+        int dollarIdx = typeName.indexOf('$');
+        String realType = dollarIdx > -1 ? typeName.substring(0, dollarIdx) : typeName;
+        String subType = dollarIdx > -1 ? typeName.substring(dollarIdx+1) : "";
+
+
+        String result = classNameBiMap.containsValue(realType) ? classNameBiMap.inverse().get(realType) : mcpNameBiMap.containsValue(realType) ? mcpNameBiMap.inverse().get(realType) : realType;
+        result = dollarIdx > -1 ? result+"$"+subType : result;
+//        System.out.printf("Unmapping %s=>%s\n",typeName,result);
+        return result;
+    }
+
+
+    @Override
+    public String mapMethodName(String owner, String name, String desc)
+    {
+        if (classNameBiMap==null || classNameBiMap.isEmpty())
+        {
+            return name;
+        }
+        Map<String, String> methodMap = getMethodMap(owner);
+        String methodDescriptor = name+desc;
+        return methodMap!=null && methodMap.containsKey(methodDescriptor) ? methodMap.get(methodDescriptor) : name;
+    }
+
+    private Map<String,String> getFieldMap(String className)
+    {
+        if (!fieldNameMaps.containsKey(className))
+        {
+            findAndMergeSuperMaps(className);
+        }
+        return fieldNameMaps.get(className);
+    }
+
+    private Map<String,String> getMethodMap(String className)
+    {
+        if (!methodNameMaps.containsKey(className))
+        {
+            findAndMergeSuperMaps(className);
+        }
+        return methodNameMaps.get(className);
+    }
+
+    private void findAndMergeSuperMaps(String name)
+    {
+        try
+        {
+            byte[] classBytes = classLoader.getClassBytes(name);
+            if (classBytes == null)
+            {
+                return;
+            }
+            ClassReader cr = new ClassReader(classBytes);
+            String superName = cr.getSuperName();
+            String[] interfaces = cr.getInterfaces();
+            if (interfaces == null)
+            {
+                interfaces = new String[0];
+            }
+            mergeSuperMaps(name, superName, interfaces);
+        }
+        catch (IOException e)
+        {
+            e.printStackTrace();
+        }
+    }
+    public void mergeSuperMaps(String name, String superName, String[] interfaces)
+    {
+//        System.out.printf("Computing super maps for %s: %s %s\n", name, superName, Arrays.asList(interfaces));
+        if (classNameBiMap == null || classNameBiMap.isEmpty())
+        {
+            return;
+        }
+        // Skip Object
+        if (Strings.isNullOrEmpty(superName))
+        {
+            return;
+        }
+
+        List<String> allParents = ImmutableList.<String>builder().add(superName).addAll(Arrays.asList(interfaces)).build();
+        // generate maps for all parent objects
+        for (String parentThing : allParents)
+        {
+            if (!methodNameMaps.containsKey(parentThing))
+            {
+                findAndMergeSuperMaps(parentThing);
+            }
+        }
+        Map<String, String> methodMap = Maps.<String,String>newHashMap();
+        Map<String, String> fieldMap = Maps.<String,String>newHashMap();
+        for (String parentThing : allParents)
+        {
+            if (methodNameMaps.containsKey(parentThing))
+            {
+                methodMap.putAll(methodNameMaps.get(parentThing));
+            }
+            if (fieldNameMaps.containsKey(parentThing))
+            {
+                fieldMap.putAll(fieldNameMaps.get(parentThing));
+            }
+        }
+        if (rawMethodMaps.containsKey(name))
+        {
+            methodMap.putAll(rawMethodMaps.get(name));
+        }
+        if (rawFieldMaps.containsKey(name))
+        {
+            fieldMap.putAll(rawFieldMaps.get(name));
+        }
+        methodNameMaps.put(name, ImmutableMap.copyOf(methodMap));
+        fieldNameMaps.put(name, ImmutableMap.copyOf(fieldMap));
+//        System.out.printf("Maps: %s %s\n", name, methodMap);
+    }
+
+    public Set<String> getObfedClasses()
+    {
+        return ImmutableSet.copyOf(classNameBiMap.keySet());
+    }
+}
@@ -0,0 +1,35 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
+package cpw.mods.fml.common.asm.transformers.deobf;
+
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.commons.Remapper;
+import org.objectweb.asm.commons.RemappingClassAdapter;
+
+public class FMLRemappingAdapter extends RemappingClassAdapter {
+    public FMLRemappingAdapter(ClassVisitor cv)
+    {
+        super(cv, FMLDeobfuscatingRemapper.INSTANCE);
+    }
+
+    @Override
+    public void visit(int version, int access, String name, String signature, String superName, String[] interfaces)
+    {
+        if (interfaces == null)
+        {
+            interfaces = new String[0];
+        }
+        FMLDeobfuscatingRemapper.INSTANCE.mergeSuperMaps(name, superName, interfaces);
+        super.visit(version, access, name, signature, superName, interfaces);
+    }
+}
@@ -0,0 +1,38 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ *
+ * Contributors:
+ *     cpw - implementation
+ */
+
+package cpw.mods.fml.common.asm.transformers.deobf;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import LZMA.LzmaInputStream;
+
+import com.google.common.io.InputSupplier;
+
+public class LZMAInputSupplier implements InputSupplier<InputStream> {
+    private InputStream compressedData;
+
+    public LZMAInputSupplier(InputStream compressedData)
+    {
+        this.compressedData = compressedData;
+    }
+
+    @Override
+    public InputStream getInput() throws IOException
+    {
+        return new LzmaInputStream(this.compressedData);
+    }
+
+}
@@ -1,3 +1,15 @@
+/*
+ * Forge Mod Loader
+ * Copyright (c) 2012-2013 cpw.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     cpw - implementation
+ */
+
 package cpw.mods.fml.common.discovery;

 import java.util.List;