First functional release under reobfuscation.

The beginnings of the new mod structure too.

.gitattributes

@@ -1,9 +1,13 @@
 * text eol=lf
 *.bat text eol=crlf
 *.patch text eol=lf
+*.java text eol=lf
+*.gradle text eol=crlf
 *.png binary
 *.exe binary
 *.dll binary
+*.jar binary
+*.lzma binary
 *.zip binary
 *.pyd binary
 *.cfg text eol=lf

.gitignore

@@ -1,17 +1,21 @@
+#eclipse
 /bin
-/minecraft_server
-/mods
-/fmlbuild.properties
-/fmlversion.properties
-/difflist.txt
-/target
-fmlbranding.properties
-/fernflower.zip
-/commands.py.bck
-/mcp*.zip
-/mcp
-/eclipse
-/deobfuscation_data*.zip
-/binpatch
-/mcp_data/
-/map_client.txt
+/.settings
+/.classpath
+
+#idea
+/.idea
+*.iml
+
+#gradle
+/build
+/buildSrc
+/.gradle
+
+#occupational hazards
+/eclipse/
+/repo/
+
+
+#Patch reject
+*.rej

FML152.json

@@ -1,69 +0,0 @@
-{
-  "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"
-}

applypatches.py

@@ -1,14 +0,0 @@
-import os, sys
-                    
-def main():
-    fml_dir = os.path.abspath(sys.argv[1])
-    work_dir = os.path.normpath(sys.argv[2])
-    mcp_dir = os.path.normpath(sys.argv[3])
-    
-    sys.path.append(os.path.join(fml_dir, 'install'))
-    from fml import apply_fml_patches
-    
-    apply_fml_patches(fml_dir, mcp_dir, work_dir, False)
-        
-if __name__ == '__main__':
-    main()

build.gradle

@@ -0,0 +1,110 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        mavenLocal()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.1-SNAPSHOT'
+    }
+}
+
+import static net.minecraftforge.gradle.dev.FmlDevPlugin.*
+
+apply plugin: 'maven'
+apply plugin: 'fmldev'
+
+repositories {
+    flatDir {
+        name "fileRepo"
+        dirs "repo"
+    }
+}
+
+minecraft {
+    version = '1.7.2'
+    mcpVersion = '9.01-pre'
+    fmlDir = projectDir.getAbsolutePath();
+    mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
+    installerVersion = "1.4"
+}
+
+group = 'cpw.mods'
+version = getVersionFromGit(getProject())
+
+jenkins {
+    job = 'fml'
+}
+
+uploadArchives {
+    repositories {
+        if (project.hasProperty("filesmaven")) {
+            logger.info('Publishing to files server')
+            
+            mavenDeployer {
+                configuration = configurations.deployerJars
+
+                repository(url: project.filesmaven.url) {
+                    authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key)
+                }
+
+                pom {
+                    groupId = project.group
+                    version = project.version
+                    artifactId = project.archivesBaseName
+                    project {
+                        name project.archivesBaseName
+                        packaging 'jar'
+                        description 'ForgeModLoader'
+                        url 'https://github.com/MinecraftForge/FML'
+
+                        scm {
+                            url 'https://github.com/MinecraftForge/FML'
+                            connection 'scm:git:git://github.com/MinecraftForge/FML.git'
+                            developerConnection 'scm:git:[email protected]:MinecraftForge/FML.git'
+                        }
+
+                        issueManagement {
+                            system 'github'
+                            url 'https://github.com/MinecraftForge/FML/issues'
+                        }
+
+                        licenses {
+                            license {
+                                name 'GNU Lesser Public License (LGPL), Version 2.1'
+                                url 'http://www.gnu.org/licenses/lgpl-2.1.txt'
+                                distribution 'repo'
+                            }
+                        }
+
+                        developers {
+                            developer {
+                                id 'cpw'
+                                name 'cpw'
+                                roles { role 'developer' }
+                            }
+                            developer {
+                                id 'LexManos'
+                                name 'Lex Manos'
+                                roles { role 'developer' }
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            logger.info('Publishing to repo folder')
+            
+            mavenDeployer {
+                repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
+            }
+        }
+    }
+}

build.xml

@@ -1,427 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ======================================================================
-     30 Mar 2012 13:35:40
-
-     FML
-     The Forge Mod Loader
-
-     cpw
-     ====================================================================== -->
-<project name="FML" default="jenkinsbuild">
-  <description>The Forge Mod Loader</description>
-  <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.deobfuscation.hash" type="string" value="${deobf.checksum}" />
-    </propertyfile>
-  </target>
-
-  <target name="buildenvsetup">
-    <tstamp>
-      <format pattern="yyMMddHHmmss" property="timestamp" />
-    </tstamp>
-    <property environment="env" />
-    <property name="modname" value="fml" />
-    <condition property="mcp.home" value="${env.WORKSPACE}/mcp" else="${basedir}/mcp">
-      <isset property="env.WORKSPACE" />
-    </condition>
-    <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="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" />
-    <property name="tmp.mcp.srcdir" location="${mcp.home}/src-tmp" />
-    <property name="renamed.mcp.srcdir" location="${mcp.home}/src-renamed" />
-    <property name="common.src.dir" location="${basedir}/common" />
-    <property name="client.src.dir" location="${basedir}/client" />
-    <property name="patch.src.dir" location="${basedir}/patches" />
-    <property name="fml.conf.dir" location="${basedir}/conf" />
-    <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">
-    <antcall target="writeversion" />
-    <property file="fmlversion.properties" />
-    <property name="build.number" value="${fmlbuild.major.number}.${fmlbuild.minor.number}.${fmlbuild.revision.number}" />
-    <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="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="${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="reobfuscate" depends="buildenvsetup,recompile">
-    <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>
-    <exec executable="${python.exe}" dir="${mcp.home}">
-      <arg value="${basedir}/generatechangedfilelist.py" />
-      <arg value="${mcp.home}" />
-      <arg value="${basedir}/difflist.txt" />
-    </exec>
-  </target>
-
-  <target name="recompile" depends="buildenvsetup">
-    <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>
-  </target>
-
-  <target name="merge-client" depends="buildenvsetup">
-    <copy todir="${client.mcp.srcdir}" overwrite="true" verbose="true">
-      <fileset dir="${client.src.dir}" includes="**/*.java" />
-    </copy>
-  </target>
-
-  <target name="merge-common">
-    <copy todir="${client.mcp.srcdir}" overwrite="true" verbose="true">
-      <fileset dir="${common.src.dir}" includes="**/*.java" />
-    </copy>
-  </target>
-
-  <target name="merge-source" depends="buildenvsetup,merge-client,merge-common" />
-
-  <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>
-
-    <mkdir dir="${basedir}/target" />
-    <jar destfile="${basedir}/target/${universal.jarname}.zip" duplicate="preserve">
-      <manifest>
-        <attribute name="Main-Class" value="cpw.mods.fml.relauncher.ServerLaunchWrapper" />
-        <attribute name="Class-Path" value="minecraft_server.jar:lib/guava-14.0-rc3.jar:lib/bcprov-jdk15on-148-src.zip:lib/asm-debug-all-4.1.jar:lib/scala-library.jar:lib/argo-3.2-src.jar" />
-      </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}.zip">
-      <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="${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>
-    </zip>
-  </target>
-
-  <target name="build-source-pack" depends="makeversion">
-    <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,mc_versions.cfg" prefix="fml" />
-      <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" />
-      <zipfileset dir="${basedir}" includes="fmlversion.properties" prefix="fml/common" />
-      <zipfileset dir="${common.src.dir}" includes="*.cfg" prefix="fml/common" />
-      <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" />
-          <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="fml/README-fml.txt" />
-      </mappedresources>
-      <zipfileset dir="${basedir}/install" excludes="README.txt,fml.pyc" prefix="fml" />
-    </zip>
-  </target>
-
-  <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" />
-    <zip destfile="deobfuscation_data-${version.minecraft}.jar" basedir="${basedir}">
-      <include name="deobfuscation_data-${version.minecraft}.lzma"/>
-    </zip>
-  </target>
-
-  <target name="build" depends="buildenvsetup,merge-client,merge-common,build-deobf-data,build-universal,build-source-pack" />
-
-  <target name="jenkinsbuild" depends="buildenvsetup,jenkinsfmldecompile,patch,build" />
-
-  <target name="patch" depends="buildenvsetup">
-    <exec executable="${python.exe}" dir="${basedir}">
-      <arg value="${basedir}/applypatches.py" />
-      <arg value="${basedir}" />
-      <arg value="${mcp.srcdir}" />
-      <arg value="${mcp.home}" />
-    </exec>
-
-  </target>
-
-  <target name="setupenvironment" depends="buildenvsetup">
-    <input message="This will clean the mcp environment at ${mcp.home} and backup any src-work folder there (src-base will be erased). Continue?" validargs="y,n" addproperty="do.continue" />
-    <condition property="do.not.continue">
-      <equals arg1="n" arg2="${do.continue}" />
-    </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" />
-    <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}" />
-    </move>
-    <echo>Deleting old patch references at ${clean.mcp.srcdir}</echo>
-    <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}" />
-    </copy>
-    <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}" />
-    </copy>
-    <antcall target="writeversion" />
-    <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,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,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}" />
-    </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}" />
-    </move>
-    <delete dir="${mcp.srcdir}" />
-    <copy todir="${mcp.srcdir}">
-      <fileset dir="${clean.mcp.srcdir}" />
-    </copy>
-
-    <antcall target="cleanargo" />
-
-    <antcall target="patch" />
-    <copy todir="${patch.mcp.srcdir}">
-      <fileset dir="${mcp.srcdir}" />
-    </copy>
-  </target>
-
-  <target name="repatchclean" depends="buildenvsetup">
-    <delete dir="${mcp.srcdir}" />
-    <copy todir="${mcp.srcdir}">
-      <fileset dir="${clean.mcp.srcdir}" />
-    </copy>
-
-    <antcall target="cleanargo" />
-
-    <antcall target="patch" />
-  </target>
-
-  <target name="cleanargo" depends="buildenvsetup">
-    <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>
-      </srcfiles>
-      <globmapper from="*.java" to="${patch.src.dir}/*.java.patch" />
-    </uptodate>
-    <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}" />
-    </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}" />
-    </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}" />
-    </copy>
-    <move todir="${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-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.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>

bukkit/cpw/mods/fml/server/FMLBukkitHandler.java

@@ -1,637 +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.server;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Random;
-import java.util.logging.Logger;
-
-import org.bukkit.Material;
-
-import net.minecraft.server.Block;
-import net.minecraft.server.Item;
-import net.minecraft.server.LocaleLanguage;
-import net.minecraft.server.MLProp;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.BaseMod;
-import net.minecraft.server.BiomeBase;
-import net.minecraft.server.EntityItem;
-import net.minecraft.server.EntityHuman;
-import net.minecraft.server.IChunkProvider;
-import net.minecraft.server.ICommandListener;
-import net.minecraft.server.IInventory;
-import net.minecraft.server.ItemStack;
-import net.minecraft.server.NetworkManager;
-import net.minecraft.server.Packet1Login;
-import net.minecraft.server.Packet250CustomPayload;
-import net.minecraft.server.Packet3Chat;
-import net.minecraft.server.BukkitRegistry;
-import net.minecraft.server.SidedProxy;
-import net.minecraft.server.World;
-import net.minecraft.server.WorldType;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.IFMLSidedHandler;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.common.ModMetadata;
-import cpw.mods.fml.common.ProxyInjector;
-import cpw.mods.fml.common.Side;
-import cpw.mods.fml.common.TickType;
-import cpw.mods.fml.common.modloader.ModLoaderModContainer;
-import cpw.mods.fml.common.modloader.ModProperty;
-import cpw.mods.fml.common.registry.FMLRegistry;
-
-/**
- * Handles primary communication from hooked code into the system
- *
- * The FML entry point is {@link #onPreLoad(MinecraftServer)} called from {@link MinecraftServer}
- *
- * Obfuscated code should focus on this class and other members of the "server" (or "client") code
- *
- * The actual mod loading is handled at arms length by {@link Loader}
- *
- * It is expected that a similar class will exist for each target environment: Bukkit and Client side.
- *
- * It should not be directly modified.
- *
- * @author cpw
- *
- */
-public class FMLBukkitHandler implements IFMLSidedHandler
-{
-    /**
-     * The singleton
-     */
-    private static final FMLBukkitHandler INSTANCE = new FMLBukkitHandler();
-
-    /**
-     * A reference to the server itself
-     */
-    private MinecraftServer server;
-
-    /**
-     * A handy list of the default overworld biomes
-     */
-    private BiomeBase[] defaultOverworldBiomes;
-
-	FMLBukkitProfiler profiler;
-
-    /**
-     * Called to start the whole game off from {@link MinecraftServer#startServer}
-     * @param minecraftServer
-     */
-    public void onPreLoad(MinecraftServer minecraftServer)
-    {
-        try
-        {
-            Class.forName("BaseModMp", false, getClass().getClassLoader());
-            MinecraftServer.log.severe(""
-                    + "Forge Mod Loader has detected that this server has an ModLoaderMP installed alongside Forge Mod Loader.\n"
-                    + "This will cause a serious problem with compatibility. To protect your worlds, this minecraft server will now shutdown.\n"
-                    + "You should follow the installation instructions of either Minecraft Forge of Forge Mod Loader and NOT install ModLoaderMP \n"
-                    + "into the minecraft_server.jar file "
-                    + "before this server will be allowed to start up.\n\nFailure to do so will simply result in more startup failures.\n\n"
-                    + "The authors of Minecraft Forge and Forge Mod Loader strongly suggest you talk to your mod's authors and get them to\nupdate their "
-                    + "requirements. ModLoaderMP is not compatible with Minecraft Forge on the server and they will need to update their mod\n"
-                    + "for Minecraft Forge and other server compatibility, unless they are Minecraft Forge mods, in which case they already\n"
-                    + "don't need ModLoaderMP and the mod author simply has failed to update his requirements and should be informed appropriately.\n\n"
-                    + "The authors of Forge Mod Loader would like to be compatible with ModLoaderMP but it is closed source and owned by SDK.\n"
-                    + "SDK, the author of ModLoaderMP, has a standing invitation to submit compatibility patches \n"
-                    + "to the open source community project that is Forge Mod Loader so that this incompatibility doesn't last. \n"
-                    + "Users who wish to enjoy mods of both types are "
-                    + "encouraged to request of SDK that he submit a\ncompatibility patch to the Forge Mod Loader project at \n"
-                    + "http://github.com/cpw/FML.\nPosting on the minecraft forums at\nhttp://www.minecraftforum.net/topic/86765- (the MLMP thread)\n"
-                    + "may encourage him in this effort. However, I ask that your requests be polite.\n"
-                    + "Now, the server has to shutdown so you can reinstall your minecraft_server.jar\nproperly, until such time as we can work together.");
-            throw new RuntimeException(
-                    "This FML based server has detected an installation of ModLoaderMP alongside. This will cause serious compatibility issues, so the server will now shut down.");
-        }
-        catch (ClassNotFoundException e)
-        {
-            // We're safe. continue
-        }
-        server = minecraftServer;
-        FMLCommonHandler.instance().beginLoading(this);
-        FMLRegistry.registerRegistry(new BukkitRegistry());
-        Loader.instance().loadMods();
-    }
-
-    /**
-	 * Called a bit later on during server initialization to finish loading mods
-	 */
-	public void onLoadComplete()
-	{
-	    Loader.instance().initializeMods();
-	    for (Item i : Item.byId) {
-	    	if (i!=null && Material.getMaterial(i.id).name().startsWith("X")) {
-	    		Material.setMaterialName(i.id, i.l());
-	    	}
-	    }
-	}
-
-	public void onWorldLoadTick()
-	{
-		FMLCommonHandler.instance().tickStart(EnumSet.of(TickType.WORLDLOAD));
-	}
-
-    /**
-     * Every tick just before world and other ticks occur
-     */
-    public void onPreWorldTick(World world)
-    {
-        FMLCommonHandler.instance().tickStart(EnumSet.of(TickType.WORLD),world);
-    }
-
-    /**
-     * Every tick just after world and other ticks occur
-     */
-    public void onPostWorldTick(World world)
-    {
-        FMLCommonHandler.instance().tickEnd(EnumSet.of(TickType.WORLD), world);
-    }
-
-    /**
-     * Get the server instance
-     *
-     * @return
-     */
-    public MinecraftServer getServer()
-    {
-        return server;
-    }
-
-    /**
-     * Get a handle to the server's logger instance
-     */
-    public Logger getMinecraftLogger()
-    {
-        return MinecraftServer.log;
-    }
-
-    /**
-     * Called from ChunkProviderServer when a chunk needs to be populated
-     *
-     * To avoid polluting the worldgen seed, we generate a new random from the world seed and
-     * generate a seed from that
-     *
-     * @param chunkProvider
-     * @param chunkX
-     * @param chunkZ
-     * @param world
-     * @param generator
-     */
-    public void onChunkPopulate(IChunkProvider chunkProvider, int chunkX, int chunkZ, World world, IChunkProvider generator)
-    {
-    	FMLCommonHandler.instance().handleWorldGeneration(chunkX, chunkZ, world.getSeed(), world, generator, chunkProvider);
-    }
-
-    /**
-     * Called from the furnace to lookup fuel values
-     *
-     * @param itemId
-     * @param itemDamage
-     * @return
-     */
-    public int fuelLookup(int itemId, int itemDamage)
-    {
-        int fv = 0;
-
-        for (ModContainer mod : Loader.getModList())
-        {
-            fv = Math.max(fv, mod.lookupFuelValue(itemId, itemDamage));
-        }
-
-        return fv;
-    }
-
-    /**
-     * Is the offered class and instance of BaseMod and therefore a ModLoader mod?
-     */
-    public boolean isModLoaderMod(Class<?> clazz)
-    {
-        return BaseMod.class.isAssignableFrom(clazz);
-    }
-
-    /**
-     * Load the supplied mod class into a mod container
-     */
-    public ModContainer loadBaseModMod(Class<?> clazz, File canonicalFile)
-    {
-        @SuppressWarnings("unchecked")
-        Class <? extends BaseMod > bmClazz = (Class <? extends BaseMod >) clazz;
-        return new ModLoaderModContainer(bmClazz, canonicalFile);
-    }
-
-    /**
-     * Called to notify that an item was picked up from the world
-     *
-     * @param entityItem
-     * @param entityPlayer
-     */
-    public void notifyItemPickup(EntityItem entityItem, EntityHuman entityPlayer)
-    {
-        for (ModContainer mod : Loader.getModList())
-        {
-            if (mod.wantsPickupNotification())
-            {
-                mod.getPickupNotifier().notifyPickup(entityItem, entityPlayer);
-            }
-        }
-    }
-
-    /**
-     * Raise an exception
-     *
-     * @param exception
-     * @param message
-     * @param stopGame
-     */
-    public void raiseException(Throwable exception, String message, boolean stopGame)
-    {
-        FMLCommonHandler.instance().getFMLLogger().throwing("FMLHandler", "raiseException", exception);
-        throw new RuntimeException(exception);
-    }
-
-    /**
-     * Attempt to dispense the item as an entity other than just as a the item itself
-     *
-     * @param world
-     * @param x
-     * @param y
-     * @param z
-     * @param xVelocity
-     * @param zVelocity
-     * @param item
-     * @return
-     */
-    public boolean tryDispensingEntity(World world, double x, double y, double z, byte xVelocity, byte zVelocity, ItemStack item)
-    {
-        for (ModContainer mod : Loader.getModList())
-        {
-            if (mod.wantsToDispense() && mod.getDispenseHandler().dispense(x, y, z, xVelocity, zVelocity, world, item))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @return the instance
-     */
-    public static FMLBukkitHandler instance()
-    {
-        return INSTANCE;
-    }
-
-    /**
-     * Build a list of default overworld biomes
-     *
-     * @return
-     */
-    public BiomeBase[] getDefaultOverworldBiomes()
-    {
-        if (defaultOverworldBiomes == null)
-        {
-            ArrayList<BiomeBase> biomes = new ArrayList<BiomeBase>(20);
-
-            for (int i = 0; i < 23; i++)
-            {
-                if ("Sky".equals(BiomeBase.biomes[i].y) || "Hell".equals(BiomeBase.biomes[i].y))
-                {
-                    continue;
-                }
-
-                biomes.add(BiomeBase.biomes[i]);
-            }
-
-            defaultOverworldBiomes = new BiomeBase[biomes.size()];
-            biomes.toArray(defaultOverworldBiomes);
-        }
-
-        return defaultOverworldBiomes;
-    }
-
-    /**
-     * Called when an item is crafted
-     *
-     * @param player
-     * @param craftedItem
-     * @param craftingGrid
-     */
-    public void onItemCrafted(EntityHuman player, ItemStack craftedItem, IInventory craftingGrid)
-    {
-        for (ModContainer mod : Loader.getModList())
-        {
-            if (mod.wantsCraftingNotification())
-            {
-                mod.getCraftingHandler().onCrafting(player, craftedItem, craftingGrid);
-            }
-        }
-    }
-
-    /**
-     * Called when an item is smelted
-     *
-     * @param player
-     * @param smeltedItem
-     */
-    public void onItemSmelted(EntityHuman player, ItemStack smeltedItem)
-    {
-        for (ModContainer mod : Loader.getModList())
-        {
-            if (mod.wantsCraftingNotification())
-            {
-                mod.getCraftingHandler().onSmelting(player, smeltedItem);
-            }
-        }
-    }
-
-    /**
-     * Called when a chat packet is received
-     *
-     * @param chat
-     * @param player
-     * @return true if you want the packet to stop processing and not echo to the rest of the world
-     */
-    public boolean handleChatPacket(Packet3Chat chat, EntityHuman player)
-    {
-        for (ModContainer mod : Loader.getModList())
-        {
-            if (mod.wantsNetworkPackets() && mod.getNetworkHandler().onChat(chat, player))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Called when a packet 250 packet is received from the player
-     *
-     * @param packet
-     * @param player
-     */
-    public void handlePacket250(Packet250CustomPayload packet, EntityHuman player)
-    {
-        if ("REGISTER".equals(packet.tag) || "UNREGISTER".equals(packet.tag))
-        {
-            handleClientRegistration(packet, player);
-            return;
-        }
-
-        ModContainer mod = FMLCommonHandler.instance().getModForChannel(packet.tag);
-
-        if (mod != null)
-        {
-            mod.getNetworkHandler().onPacket250Packet(packet, player);
-        }
-    }
-
-    /**
-     * Handle register requests for packet 250 channels
-     *
-     * @param packet
-     */
-    private void handleClientRegistration(Packet250CustomPayload packet, EntityHuman player)
-    {
-        if (packet.data==null) {
-            return;
-        }
-        try
-        {
-            for (String channel : new String(packet.data, "UTF8").split("\0"))
-            {
-                // Skip it if we don't know it
-                if (FMLCommonHandler.instance().getModForChannel(channel) == null)
-                {
-                    continue;
-                }
-
-                if ("REGISTER".equals(packet.tag))
-                {
-                    FMLCommonHandler.instance().activateChannel(player, channel);
-                }
-                else
-                {
-                    FMLCommonHandler.instance().deactivateChannel(player, channel);
-                }
-            }
-        }
-        catch (UnsupportedEncodingException e)
-        {
-            getMinecraftLogger().warning("Received invalid registration packet");
-        }
-    }
-
-    /**
-     * Handle a login
-     *
-     * @param loginPacket
-     * @param networkManager
-     */
-    public void handleLogin(Packet1Login loginPacket, NetworkManager networkManager)
-    {
-        Packet250CustomPayload packet = new Packet250CustomPayload();
-        packet.tag = "REGISTER";
-        packet.data = FMLCommonHandler.instance().getPacketRegistry();
-        packet.length = packet.data.length;
-        if (packet.length>0) {
-            networkManager.queue(packet);
-        }
-    }
-
-    public void announceLogin(EntityHuman player) {
-        for (ModContainer mod : Loader.getModList())
-        {
-            if (mod.wantsPlayerTracking())
-            {
-                mod.getPlayerTracker().onPlayerLogin(player);
-            }
-        }
-    }
-
-    @Override
-    public File getMinecraftRootDirectory()
-    {
-        try {
-            return server.a(".").getCanonicalFile();
-        } catch (IOException ioe) {
-            return new File(".");
-        }
-    }
-
-    /**
-     * @param var2
-     * @return
-     */
-    public boolean handleServerCommand(String command, String player, ICommandListener listener)
-    {
-        for (ModContainer mod : Loader.getModList()) {
-            if (mod.wantsConsoleCommands() && mod.getConsoleHandler().handleCommand(command, player, listener)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @param player
-     */
-    public void announceLogout(EntityHuman player)
-    {
-        for (ModContainer mod : Loader.getModList())
-        {
-            if (mod.wantsPlayerTracking())
-            {
-                mod.getPlayerTracker().onPlayerLogout(player);
-            }
-        }
-    }
-
-    /**
-     * @param p_28168_1_
-     */
-    public void announceDimensionChange(EntityHuman player)
-    {
-        for (ModContainer mod : Loader.getModList())
-        {
-            if (mod.wantsPlayerTracking())
-            {
-                mod.getPlayerTracker().onPlayerChangedDimension(player);
-            }
-        }
-    }
-
-    /**
-     * @param biome
-     */
-    public void addBiomeToDefaultWorldGenerator(BiomeBase biome)
-    {
-        WorldType.NORMAL.addNewBiome(biome);
-    }
-
-    /**
-     * @param biome
-     */
-    public void removeBiomeFromDefaultWorldGenerator(BiomeBase biome)
-    {
-        WorldType.NORMAL.removeBiome(biome);
-    }
-
-	@Override
-	public Object getMinecraftInstance() {
-		return server;
-	}
-
-	@Override
-    public String getCurrentLanguage()
-    {
-        return LocaleLanguage.a().getCurrentLanguage();
-	}
-
-	@Override
-    public Properties getCurrentLanguageTable()
-    {
-        return LocaleLanguage.a().getCurrentLanguageTable();
-	}
-
-	@Override
-    public String getObjectName(Object instance)
-    {
-        String objectName;
-        if (instance instanceof Item) {
-            objectName=((Item)instance).getName();
-        } else if (instance instanceof Block) {
-            objectName=((Block)instance).getName();
-        } else if (instance instanceof ItemStack) {
-            objectName=Item.byId[((ItemStack)instance).id].a((ItemStack)instance);
-        } else {
-            throw new IllegalArgumentException(String.format("Illegal object for naming %s",instance));
-        }
-        objectName+=".name";
-        return objectName;
-	}
-
-	@Override
-	public ModMetadata readMetadataFrom(InputStream input, ModContainer mod) throws Exception {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public void profileStart(String profileLabel) {
-		if (profiler!=null)
-		{
-			profiler.start(profileLabel);
-		}
-	}
-
-	@Override
-	public void profileEnd() {
-		if (profiler!=null)
-		{
-			profiler.end();
-		}
-	}
-
-	@Override
-	public ModProperty getModLoaderPropertyFor(Field f) {
-		if (f.isAnnotationPresent(MLProp.class)) {
-            MLProp prop = f.getAnnotation(MLProp.class);
-            return new ModProperty(prop.info(), prop.min(), prop.max(), prop.name());
-        }
-        return null;
-	}
-
-	@Override
-	public List<String> getAdditionalBrandingInformation() {
-		return null;
-	}
-
-	@Override
-	public Side getSide() {
-		return Side.BUKKIT;
-	}
-
-	@Override
-	public ProxyInjector findSidedProxyOn(cpw.mods.fml.common.modloader.BaseMod mod) {
-        for (Field f : mod.getClass().getDeclaredFields())
-        {
-            if (f.isAnnotationPresent(SidedProxy.class))
-            {
-                SidedProxy sp = f.getAnnotation(SidedProxy.class);
-                return new ProxyInjector(sp.clientSide(), sp.serverSide(), sp.bukkitSide(), f);
-            }
-        }
-        return null;
-	}
-
-	public void onServerPostTick() {
-		FMLCommonHandler.instance().tickEnd(EnumSet.of(TickType.GAME));
-	}
-
-	public void onServerPreTick() {
-		FMLCommonHandler.instance().tickStart(EnumSet.of(TickType.GAME));
-	}
-}

bukkit/cpw/mods/fml/server/FMLBukkitProfiler.java

@@ -1,131 +0,0 @@
-package cpw.mods.fml.server;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedList;
-import java.util.List;
-
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableMultiset;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multiset;
-import com.google.common.collect.Multiset.Entry;
-import com.google.common.collect.Multisets;
-import com.google.common.collect.TreeMultiset;
-import com.google.common.primitives.Ints;
-
-public class FMLBukkitProfiler {
-	private static FMLBukkitProfiler lastInstance;
-	private static long endTime;
-	private LinkedList<String> profiles = new LinkedList<String>();
-	private TreeMultiset<String> hitCounter = TreeMultiset.create();
-	private TreeMultiset<String> timings = TreeMultiset.create();
-	private long timestamp;
-
-	public static long beginProfiling(int seconds)
-	{
-		long now = System.currentTimeMillis();
-		if (lastInstance == null)
-		{
-			lastInstance = new FMLBukkitProfiler();
-			FMLBukkitHandler.instance().profiler = lastInstance;
-			endTime = now + seconds * 1000;
-		}
-		if (endTime > now)
-		{
-			return (endTime - now) / 1000;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-
-	public static long endProfiling()
-	{
-		FMLBukkitHandler.instance().profiler = null;
-		return endTime - System.currentTimeMillis();
-	}
-
-	public static void resetProfiling()
-	{
-		endProfiling();
-		lastInstance = null;
-	}
-
-	public void start(String profileLabel)
-	{
-		profiles.push(profileLabel);
-		timestamp = System.nanoTime();
-	}
-
-	public void end()
-	{
-		int timing = (int)((System.nanoTime() - timestamp)/1000L);
-		String label = Joiner.on('.').join(profiles);
-		profiles.pop();
-		hitCounter.add(label);
-		timings.add(label,timing);
-		if (System.currentTimeMillis()>endTime)
-		{
-			endProfiling();
-		}
-	}
-
-	public static String[] dumpProfileData(int count)
-	{
-		if (lastInstance == null)
-		{
-			return new String[] { "No profile data available" };
-		}
-
-		if (endTime > System.currentTimeMillis())
-		{
-			return new String[] { String.format("Timing is being gathered for another %d seconds", endTime - System.currentTimeMillis()) };
-		}
-		return lastInstance.profileData(count);
-	}
-
-	private String[] profileData(int count) {
-		List<Entry<String>> sortedTiming = getEntriesSortedByFrequency(timings, false);
-		ArrayList<String> timeLine = new ArrayList<String>();
-
-		double totalTime = timings.size();
-
-		for (Entry<String> hit : sortedTiming)
-		{
-			if (--count == 0)
-			{
-				break;
-			}
-			timeLine.add(String.format("%s : %d microseconds, %d invocations. %.2f %% of overall time",hit.getElement(), hit.getCount(), hitCounter.count(hit.getElement()), 100.0 * hit.getCount()/totalTime));
-		}
-		return timeLine.toArray(new String[0]);
-	}
-
-	/*
-	 * Code from http://stackoverflow.com/questions/4345633/simplest-way-to-iterate-through-a-multiset-in-the-order-of-element-frequency
-	 */
-	private enum EntryComp implements Comparator<Multiset.Entry<?>>{
-	    DESCENDING{
-	        @Override
-	        public int compare(final Entry<?> a, final Entry<?> b){
-	            return Ints.compare(b.getCount(), a.getCount());
-	        }
-	    },
-	    ASCENDING{
-	        @Override
-	        public int compare(final Entry<?> a, final Entry<?> b){
-	            return Ints.compare(a.getCount(), b.getCount());
-	        }
-	    },
-	}
-
-	private static <E> List<Entry<E>> getEntriesSortedByFrequency(final Multiset<E> ms, final boolean ascending) {
-	    final List<Entry<E>> entryList = Lists.newArrayList(ms.entrySet());
-	    Collections.sort(entryList, ascending ? EntryComp.ASCENDING : EntryComp.DESCENDING);
-	    return entryList;
-	}
-
-}

bukkit/net/minecraft/server/BaseMod.java

@@ -1,409 +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.server;
-
-import java.util.Map;
-import java.util.Random;
-
-import org.bukkit.craftbukkit.generator.NetherChunkGenerator;
-import org.bukkit.craftbukkit.generator.NormalChunkGenerator;
-
-import cpw.mods.fml.common.TickType;
-
-public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
-{
-    // CALLBACK MECHANISMS
-
-    /**
-     * @param minecraftInstance
-     * @return
-     */
-    public final boolean doTickInGame(TickType tick, boolean tickEnd, Object minecraftInstance, Object... data)
-    {
-        if (tick==TickType.GAME && tickEnd) {
-            return onTickInGame((MinecraftServer)minecraftInstance);
-        } else {
-            return true;
-        }
-    }
-
-    @Override
-    public final void onCrafting(Object... craftingParameters)
-    {
-        takenFromCrafting((EntityHuman)craftingParameters[0], (ItemStack)craftingParameters[1], (IInventory)craftingParameters[2]);
-    }
-
-    @Override
-    public final void onSmelting(Object... smeltingParameters)
-    {
-        takenFromFurnace((EntityHuman)smeltingParameters[0], (ItemStack)smeltingParameters[1]);
-    }
-
-    @Override
-    public final boolean dispense(double x, double y, double z, byte xVelocity, byte zVelocity, Object... data)
-    {
-        return dispenseEntity((World)data[0], x, y, z, xVelocity, zVelocity, (ItemStack)data[1]);
-    }
-
-    @Override
-    public final boolean onChat(Object... data)
-    {
-        return onChatMessageReceived((EntityHuman)data[1], (Packet3Chat)data[0]);
-    }
-
-    @Override
-    public final void onServerLogin(Object handler) {
-        // NOOP
-    }
-
-    public final void onServerLogout() {
-        // NOOP
-    }
-    @Override
-    public final void onPlayerLogin(Object player)
-    {
-        onClientLogin((EntityHuman) player);
-    }
-
-    @Override
-    public final void onPlayerLogout(Object player)
-    {
-        onClientLogout((EntityHuman)player);
-    }
-
-    @Override
-    public final void onPlayerChangedDimension(Object player)
-    {
-        onClientDimensionChanged((EntityHuman)player);
-    }
-
-    @Override
-    public final void onPacket250Packet(Object... data)
-    {
-        onPacket250Received((EntityHuman)data[1], (Packet250CustomPayload)data[0]);
-    }
-
-    @Override
-    public final void notifyPickup(Object... pickupData)
-    {
-        EntityItem item = (EntityItem) pickupData[0];
-        EntityHuman player = (EntityHuman) pickupData[1];
-        onItemPickup(player, item.itemStack);
-    }
-
-    @Override
-    public final void generate(Random random, int chunkX, int chunkZ, Object... additionalData)
-    {
-        World w = (World) additionalData[0];
-        IChunkProvider cp = (IChunkProvider) additionalData[1];
-
-        if (cp instanceof ChunkProviderHell || cp instanceof NetherChunkGenerator)
-        {
-            generateNether(w, random, chunkX << 4, chunkZ << 4);
-        }
-        else if (cp instanceof ChunkProviderGenerate || cp instanceof NormalChunkGenerator)
-        {
-            generateSurface(w, random, chunkX << 4, chunkZ << 4);
-        }
-    }
-
-    /**
-     * NO-OP on client side
-     */
-    @Override
-    public final boolean handleCommand(String command, Object... data)
-    {
-        return onServerCommand(command, (String)data[0], (ICommandListener)data[1]);
-    }
-    @Override
-    public void onRegisterAnimations() {
-    	// NOOP on servers
-    }
-
-    @Override
-    public void onRenderHarvest(@SuppressWarnings("rawtypes") Map renderers) {
-    	// NOOP on servers
-    }
-
-    // BASEMOD API
-    /**
-     * Override if you wish to provide a fuel item for the furnace and return the fuel value of the item
-     *
-     * @param id
-     * @param metadata
-     * @return
-     */
-    public int addFuel(int id, int metadata)
-    {
-        return 0;
-    }
-
-    public void addRenderer(Map<Class<? extends Entity>, Object> renderers)
-    {
-
-    }
-
-    /**
-     * Override if you wish to perform some action other than just dispensing the item from the dispenser
-     *
-     * @param world
-     * @param x
-     * @param y
-     * @param z
-     * @param xVel
-     * @param zVel
-     * @param item
-     * @return
-     */
-    public boolean dispenseEntity(World world, double x, double y, double z, int xVel, int zVel, ItemStack item)
-    {
-        return false;
-    }
-
-    /**
-     * Override if you wish to generate Nether (Hell biome) blocks
-     *
-     * @param world
-     * @param random
-     * @param chunkX
-     * @param chunkZ
-     */
-    public void generateNether(World world, Random random, int chunkX, int chunkZ)
-    {
-    }
-
-    /**
-     * Override if you wish to generate Overworld (not hell or the end) blocks
-     *
-     * @param world
-     * @param random
-     * @param chunkX
-     * @param chunkZ
-     */
-    public void generateSurface(World world, Random random, int chunkX, int chunkZ)
-    {
-    }
-
-    /**
-     * Return the name of your mod. Defaults to the class name
-     *
-     * @return
-     */
-    public String getName()
-    {
-        return getClass().getSimpleName();
-    }
-
-    /**
-     * Get your mod priorities
-     *
-     * @return
-     */
-    public String getPriorities()
-    {
-        return "";
-    }
-
-    /**
-     * Return the version of your mod
-     *
-     * @return
-     */
-    public abstract String getVersion();
-
-    public void keyboardEvent(Object event)
-    {
-
-    }
-
-    /**
-     * Load your mod
-     */
-    public abstract void load();
-
-    /**
-     * Finish loading your mod
-     */
-    public void modsLoaded()
-    {
-    }
-
-    /**
-     * Handle item pickup
-     *
-     * @param player
-     * @param item
-     */
-    public void onItemPickup(EntityHuman player, ItemStack item)
-    {
-    }
-
-    /**
-     * Ticked every game tick if you have subscribed to tick events through {@link ModLoader#setInGameHook(BaseMod, boolean, boolean)}
-     *
-     * @param minecraftServer the server
-     * @return true to continue receiving ticks
-     */
-    public boolean onTickInGame(MinecraftServer minecraftServer)
-    {
-        return false;
-    }
-
-    public boolean onTickInGUI(float tick, Object game, Object gui)
-    {
-        return false;
-    }
-
-    /**
-     * Only implemented on the client side
-     * {@link #onChatMessageReceived(EntityPlayer, Packet3Chat)}
-     *
-     * @param text
-     */
-    public void receiveChatPacket(String text)
-    {
-
-    }
-
-    /**
-     * Only called on the client side
-     * {@link #onPacket250Received(EntityPlayer, Packet250CustomPayload)}
-     *
-     * @param packet
-     */
-    public void receiveCustomPacket(Packet250CustomPayload packet)
-    {
-
-    }
-
-    public void registerAnimation(Object game)
-    {
-
-    }
-
-    public void renderInvBlock(Object renderer, Block block, int metadata, int modelID)
-    {
-
-    }
-
-    public boolean renderWorldBlock(Object renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID)
-    {
-        return false;
-
-    }
-
-    /**
-     * Called when someone crafts an item from a crafting table
-     *
-     * @param player
-     * @param item
-     * @param matrix
-     */
-    public void takenFromCrafting(EntityHuman player, ItemStack item, IInventory matrix)
-    {
-    }
-
-    /**
-     * Called when someone takes a smelted item from a furnace
-     *
-     * @param player
-     * @param item
-     */
-    public void takenFromFurnace(EntityHuman player, ItemStack item)
-    {
-    }
-
-    /**
-     * The identifier string for the mod- used in client<->server negotiation
-     */
-    @Override
-    public String toString()
-    {
-        return getName() + " " + getVersion();
-    }
-
-    /**
-     * Called when a 250 packet is received on a channel registered to this mod
-     *
-     * @param source
-     * @param payload
-     */
-    public void onPacket250Received(EntityHuman source, Packet250CustomPayload payload)
-    {
-    }
-
-    /**
-     * Called when a chat message is received. Return true to stop further processing
-     *
-     * @param source
-     * @param chat
-     * @return true if you want to consume the message so it is not available for further processing
-     */
-    public boolean onChatMessageReceived(EntityHuman source, Packet3Chat chat)
-    {
-        return false;
-    }
-    /**
-     * Called when a server command is received
-     * @param command
-     * @return true if you want to consume the message so it is not available for further processing
-     */
-    public boolean onServerCommand(String command, String sender, ICommandListener listener)
-    {
-        return false;
-    }
-
-    /**
-     * Called when a new client logs in.
-     *
-     * @param player
-     */
-    public void onClientLogin(EntityHuman player)
-    {
-    }
-
-    /**
-     * Called when a client logs out of the server.
-     *
-     * @param player
-     */
-    public void onClientLogout(EntityHuman player)
-    {
-
-    }
-
-    /**
-     *
-     * Called when a client changes dimensions on the server.
-     *
-     * @param player
-     */
-    public void onClientDimensionChanged(EntityHuman player)
-    {
-
-    }
-
-    // Spare client junk
-    // -------
-    // void addRenderer(Map<Class<? extends Entity>, Render> renderers);
-    // void registerAnimation(Minecraft game);
-    // void renderInvBlock(RenderBlocks renderer, Block block, int metadata, int modelID);
-    // boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID);
-    // boolean onTickInGUI(float tick, Minecraft game, GuiScreen gui);
-    // void keyboardEvent(KeyBinding event);
-
-    @Override
-    public void keyBindingEvent(Object keybinding) {
-    	// NOOP on server
-    }
-}

bukkit/net/minecraft/server/BukkitRegistry.java

@@ -1,164 +0,0 @@
-package net.minecraft.server;
-
-import java.util.Iterator;
-import java.util.List;
-
-import net.minecraft.src.BiomeGenBase;
-
-import cpw.mods.fml.common.registry.IMinecraftRegistry;
-import cpw.mods.fml.server.FMLBukkitHandler;
-
-public class BukkitRegistry implements IMinecraftRegistry
-{
-
-    @Override
-    public void addRecipe(net.minecraft.src.ItemStack output, Object... params)
-    {
-        CraftingManager.getInstance().registerShapedRecipe((ItemStack) output, params);
-    }
-
-    @Override
-    public void addShapelessRecipe(net.minecraft.src.ItemStack output, Object... params)
-    {
-        CraftingManager.getInstance().registerShapelessRecipe((ItemStack) output, params);
-    }
-
-    @SuppressWarnings("unchecked")
-	@Override
-    public void addRecipe(net.minecraft.src.IRecipe recipe)
-    {
-        CraftingManager.getInstance().getRecipies().add(recipe);
-    }
-
-    @Override
-    public void addSmelting(int input, net.minecraft.src.ItemStack output)
-    {
-        FurnaceRecipes.getInstance().registerRecipe(input, (ItemStack) output);
-    }
-
-    @Override
-    public void registerBlock(net.minecraft.src.Block block)
-    {
-        registerBlock(block, ItemBlock.class);
-    }
-
-    @Override
-    public void registerBlock(net.minecraft.src.Block block, Class <? extends net.minecraft.src.ItemBlock > itemclass)
-    {
-        try
-        {
-            assert block != null : "registerBlock: block cannot be null";
-            assert itemclass != null : "registerBlock: itemclass cannot be null";
-            int blockItemId = ((Block)block).id - 256;
-            itemclass.getConstructor(int.class).newInstance(blockItemId);
-        }
-        catch (Exception e)
-        {
-            //HMMM
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-	@Override
-    public void registerEntityID(Class <? extends net.minecraft.src.Entity > entityClass, String entityName, int id)
-    {
-        EntityTypes.addNewEntityListMapping((Class<? extends Entity>) entityClass, entityName, id);
-    }
-
-    @SuppressWarnings("unchecked")
-	@Override
-    public void registerEntityID(Class <? extends net.minecraft.src.Entity > entityClass, String entityName, int id, int backgroundEggColour, int foregroundEggColour)
-    {
-        EntityTypes.addNewEntityListMapping((Class<? extends Entity>) entityClass, entityName, id, backgroundEggColour, foregroundEggColour);
-    }
-
-    @SuppressWarnings("unchecked")
-	@Override
-    public void registerTileEntity(Class <? extends net.minecraft.src.TileEntity > tileEntityClass, String id)
-    {
-        TileEntity.addNewTileEntityMapping((Class<? extends TileEntity>) tileEntityClass, id);
-    }
-
-    @Override
-    public void addBiome(BiomeGenBase biome)
-    {
-    	FMLBukkitHandler.instance().addBiomeToDefaultWorldGenerator((BiomeBase) biome);
-    }
-
-    @Override
-    public void addSpawn(Class <? extends net.minecraft.src.EntityLiving > entityClass, int weightedProb, int min, int max, net.minecraft.src.EnumCreatureType typeOfCreature, BiomeGenBase... biomes)
-    {
-    	BiomeBase[] realBiomes=(BiomeBase[]) biomes;
-        for (BiomeBase biome : realBiomes)
-        {
-            @SuppressWarnings("unchecked")
-            List<BiomeMeta> spawns = ((BiomeBase)biome).getMobs((EnumCreatureType)typeOfCreature);
-
-            for (BiomeMeta entry : spawns)
-            {
-                //Adjusting an existing spawn entry
-                if (entry.a == entityClass)
-                {
-                    entry.d = weightedProb;
-                    entry.b = min;
-                    entry.c = max;
-                    break;
-                }
-            }
-
-            spawns.add(new BiomeMeta(entityClass, weightedProb, min, max));
-        }
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void addSpawn(String entityName, int weightedProb, int min, int max, net.minecraft.src.EnumCreatureType spawnList, BiomeGenBase... biomes)
-    {
-        Class <? extends Entity > entityClazz = EntityTypes.getEntityToClassMapping().get(entityName);
-
-        if (EntityLiving.class.isAssignableFrom(entityClazz))
-        {
-            addSpawn((Class <? extends net.minecraft.src.EntityLiving >) entityClazz, weightedProb, min, max, spawnList, biomes);
-        }
-    }
-
-    @Override
-    public void removeBiome(BiomeGenBase biome)
-    {
-    	FMLBukkitHandler.instance().removeBiomeFromDefaultWorldGenerator((BiomeBase)biome);
-    }
-
-    @Override
-    public void removeSpawn(Class <? extends net.minecraft.src.EntityLiving > entityClass, net.minecraft.src.EnumCreatureType typeOfCreature, BiomeGenBase... biomesO)
-    {
-    	BiomeBase[] biomes=(BiomeBase[]) biomesO;
-        for (BiomeBase biome : biomes)
-        {
-            @SuppressWarnings("unchecked")
-            List<BiomeMeta> spawns = ((BiomeBase)biome).getMobs((EnumCreatureType) typeOfCreature);
-
-            Iterator<BiomeMeta> entries = spawns.iterator();
-            while (entries.hasNext())
-            {
-            	BiomeMeta entry = entries.next();
-                if (entry.a == entityClass)
-                {
-                    entries.remove();
-                }
-            }
-        }
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void removeSpawn(String entityName, net.minecraft.src.EnumCreatureType spawnList, BiomeGenBase... biomes)
-    {
-        Class <? extends Entity > entityClazz = EntityTypes.getEntityToClassMapping().get(entityName);
-
-        if (EntityLiving.class.isAssignableFrom(entityClazz))
-        {
-            removeSpawn((Class <? extends net.minecraft.src.EntityLiving >) entityClazz, spawnList, biomes);
-        }
-    }
-
-}

bukkit/net/minecraft/server/MLProp.java

@@ -1,48 +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.server;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import static java.lang.annotation.RetentionPolicy.*;
-import static java.lang.annotation.ElementType.*;
-
-/**
- * @author cpw
- *
- */
-@Retention(value = RUNTIME)
-@Target(value = FIELD)
-public @interface MLProp
-{
-    /**
-     * Adds additional help to top of configuration file.
-     */
-String info() default "";
-
-    /**
-     * Maximum value allowed if field is a number.
-     */
-    double max() default Double.MAX_VALUE;
-
-    /**
-     * Minimum value allowed if field is a number.
-     */
-    double min() default Double.MIN_VALUE;
-
-    /**
-     * Overrides the field name for property key.
-     */
-String name() default "";
-
-}

bukkit/net/minecraft/server/ModLoader.java

@@ -1,780 +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.server;
-
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.ReflectionHelper;
-import cpw.mods.fml.common.modloader.ModLoaderHelper;
-import cpw.mods.fml.common.modloader.ModLoaderModContainer;
-import cpw.mods.fml.common.registry.FMLRegistry;
-import cpw.mods.fml.server.FMLBukkitHandler;
-
-public class ModLoader
-{
-    /**
-     * Not used on the server.
-     *
-     * @param achievement
-     * @param name
-     * @param description
-     */
-    public static void addAchievementDesc(Achievement achievement, String name, String description)
-    {
-        String achName=achievement.getName();
-        addLocalization(achName, name);
-        addLocalization(achName+".desc", description);
-    }
-
-    /**
-     * This method is a call in hook from modified external code. Implemented elsewhere.
-     *
-     * {@link FMLCommonHandler#fuelLookup(int, int)}
-     * 
-     * @param id
-     * @param metadata
-     * @return
-     */
-    @Deprecated
-    public static int addAllFuel(int id, int metadata)
-    {
-        return 0;
-    }
-
-    public static void addAllRenderers(Map<Class<? extends Entity>, Object> renderers)
-    {
-    }
-
-    public static void addAnimation(Object anim)
-    {
-    }
-
-    /**
-     * This method is unimplemented in server versions to date.
-     *
-     * @param armor
-     * @return
-     */
-    public static int addArmor(String armor)
-    {
-        return 0;
-    }
-
-    /**
-     * This method adds the supplied biome to the set of candidate biomes for the default world generator type.
-     *
-     * @param biome
-     */
-    public static void addBiome(BiomeBase biome)
-    {
-        FMLRegistry.addBiome(biome);
-    }
-
-    /**
-     * Add localization for the specified string
-     *
-     * @param key
-     * @param value
-     */
-    public static void addLocalization(String key, String value)
-    {
-        addLocalization(key, "en_US", value);
-    }
-
-    /**
-     * Add localization for the specified string
-     *
-     * @param key
-     * @param lang
-     * @param value
-     */
-    public static void addLocalization(String key, String lang, String value)
-    {
-        FMLCommonHandler.instance().addStringLocalization(key, lang, value);
-    }
-
-    /**
-     * Name the specified minecraft object with the supplied name
-     *
-     * @param instance
-     * @param name
-     */
-    public static void addName(Object instance, String name)
-    {
-        addName(instance,"en_US",name);
-    }
-
-    /**
-     * Unimplemented on the server as it does not generate names
-     *
-     * @param instance
-     * @param lang
-     * @param name
-     */
-    public static void addName(Object instance, String lang, String name)
-    {
-        FMLCommonHandler.instance().addNameForObject(instance, lang, name);
-    }
-
-    /**
-     * Unimplemented on the server as it does not render textures
-     * 
-     * @param fileToOverride
-     * @param fileToAdd
-     * @return
-     */
-    public static int addOverride(String fileToOverride, String fileToAdd)
-    {
-        return 0;
-    }
-
-    /**
-     * Unimplemented on the server as it does not render textures
-     * 
-     * @param path
-     * @param overlayPath
-     * @param index
-     */
-    public static void addOverride(String path, String overlayPath, int index)
-    {
-        // NOOP
-    }
-
-    /**
-     * Add a Shaped Recipe
-     *
-     * @param output
-     * @param params
-     */
-    public static void addRecipe(ItemStack output, Object... params)
-    {
-        FMLRegistry.addRecipe(output, params);
-    }
-
-    /**
-     * Add a shapeless recipe
-     *
-     * @param output
-     * @param params
-     */
-    public static void addShapelessRecipe(ItemStack output, Object... params)
-    {
-        FMLRegistry.addShapelessRecipe(output, params);
-    }
-
-    /**
-     * Add a new product to be smelted
-     *
-     * @param input
-     * @param output
-     */
-    public static void addSmelting(int input, ItemStack output)
-    {
-        FMLRegistry.addSmelting(input, output);
-    }
-
-    /**
-     * Add a mob to the spawn list
-     *
-     * @param entityClass
-     * @param weightedProb
-     * @param min
-     * @param max
-     * @param spawnList
-     */
-    public static void addSpawn(Class <? extends EntityLiving > entityClass, int weightedProb, int min, int max, EnumCreatureType spawnList)
-    {
-        FMLRegistry.addSpawn(entityClass, weightedProb, min, max, spawnList, FMLBukkitHandler.instance().getDefaultOverworldBiomes());
-    }
-
-    /**
-     * Add a mob to the spawn list
-     * @param entityClass
-     * @param weightedProb
-     * @param min
-     * @param max
-     * @param spawnList
-     * @param biomes
-     */
-    public static void addSpawn(Class <? extends EntityLiving > entityClass, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeBase... biomes)
-    {
-        FMLRegistry.addSpawn(entityClass, weightedProb, min, max, spawnList, biomes);
-    }
-
-    /**
-     * Add a mob to the spawn list
-     *
-     * @param entityName
-     * @param weightedProb
-     * @param min
-     * @param max
-     * @param spawnList
-     */
-    public static void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList)
-    {
-        FMLRegistry.addSpawn(entityName, weightedProb, min, max, spawnList, FMLBukkitHandler.instance().getDefaultOverworldBiomes());
-    }
-
-    /**
-     * Add a mob to the spawn list
-     * @param entityName
-     * @param weightedProb
-     * @param min
-     * @param max
-     * @param spawnList
-     * @param biomes
-     */
-    public static void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeBase... biomes)
-    {
-        FMLRegistry.addSpawn(entityName, weightedProb, min, max, spawnList, biomes);
-    }
-
-    /**
-     * This method is a call in hook from modified external code. Implemented elsewhere.
-     * {@link FMLBukkitHandler#tryDispensingEntity(World, double, double, double, byte, byte, ItemStack)}
-     *
-     * @param world
-     * @param x
-     * @param y
-     * @param z
-     * @param xVel
-     * @param zVel
-     * @param item
-     * @return
-     */
-    @Deprecated
-    public static boolean dispenseEntity(World world, double x, double y, double z, int xVel, int zVel, ItemStack item)
-    {
-        return false;
-    }
-
-    /**
-     * Remove a container and drop all the items in it on the ground around
-     *
-     * @param world
-     * @param x
-     * @param y
-     * @param z
-     */
-    public static void genericContainerRemoval(World world, int x, int y, int z)
-    {
-        TileEntity te = world.getTileEntity(x, y, z);
-
-        if (!(te instanceof IInventory))
-        {
-            return;
-        }
-
-        IInventory inv = (IInventory)te;
-
-        for (int l = 0; l < inv.getSize(); l++)
-        {
-            ItemStack itemstack = inv.getItem(l);
-
-            if (itemstack == null)
-            {
-                continue;
-            }
-
-            float f = world.random.nextFloat() * 0.8F + 0.1F;
-            float f1 = world.random.nextFloat() * 0.8F + 0.1F;
-            float f2 = world.random.nextFloat() * 0.8F + 0.1F;
-
-            while (itemstack.count > 0)
-            {
-                int i1 = world.random.nextInt(21) + 10;
-
-                if (i1 > itemstack.count)
-                {
-                    i1 = itemstack.count ;
-                }
-
-                itemstack.count  -= i1;
-                EntityItem entityitem = new EntityItem(world, (float)te.x + f, (float)te.y + f1, (float)te.z + f2, new ItemStack(itemstack.id, i1, itemstack.getData()));
-                float f3 = 0.05F;
-                entityitem.motX = (float)world.random.nextGaussian() * f3;
-                entityitem.motY = (float)world.random.nextGaussian() * f3 + 0.2F;
-                entityitem.motZ = (float)world.random.nextGaussian() * f3;
-
-                if (itemstack.hasTag())
-                {
-                    entityitem.itemStack.setTag((NBTTagCompound)itemstack.getTag().clone());
-                }
-
-                world.addEntity(entityitem);
-            }
-        }
-    }
-
-    /**
-     * Get a list of all BaseMod loaded into the system
-     * {@link ModLoaderModContainer#findAll}
-     *
-     * @return
-     */
-    public static List<BaseMod> getLoadedMods()
-    {
-        return ModLoaderModContainer.findAll(BaseMod.class);
-    }
-
-    /**
-     * Get a logger instance {@link FMLCommonHandler#getFMLLogger()}
-     *
-     * @return
-     */
-    public static Logger getLogger()
-    {
-        return FMLCommonHandler.instance().getFMLLogger();
-    }
-
-    public static Object getMinecraftInstance()
-    {
-        return getMinecraftServerInstance();
-    }
-
-    /**
-     * Get the minecraft server instance
-     * {@link FMLServerHandler#getServer()}
-     * @return
-     */
-    public static MinecraftServer getMinecraftServerInstance()
-    {
-        return FMLBukkitHandler.instance().getServer();
-    }
-    /**
-     * Get a value from a field using reflection
-     * {@link ReflectionHelper#getPrivateValue(Class, Object, int)}
-     *
-     * @param instanceclass
-     * @param instance
-     * @param fieldindex
-     * @return
-     */
-    public static <T, E> T getPrivateValue(Class <? super E > instanceclass, E instance, int fieldindex)
-    {
-        return ReflectionHelper.getPrivateValue(instanceclass, instance, fieldindex);
-    }
-
-    /**
-     * Get a value from a field using reflection
-     * {@link ReflectionHelper#getPrivateValue(Class, Object, String)}
-     * 
-     * @param instanceclass
-     * @param instance
-     * @param field
-     * @return
-     */
-    public static <T, E> T getPrivateValue(Class <? super E > instanceclass, E instance, String field)
-    {
-        return ReflectionHelper.getPrivateValue(instanceclass, instance, field);
-    }
-
-    /**
-     * Stubbed method on the server to return a unique model id
-     * 
-     */
-    public static int getUniqueBlockModelID(BaseMod mod, boolean inventoryRenderer)
-    {
-        return -1;
-    }
-
-    /**
-     * Get a new unique entity id
-     * {@link Entity#getNextId()}
-     *
-     * @return
-     */
-    public static int getUniqueEntityId()
-    {
-        return FMLCommonHandler.instance().nextUniqueEntityListId();
-    }
-
-    public static int getUniqueSpriteIndex(String path)
-    {
-        return -1;
-    }
-    
-    /**
-     * To properly implement packet 250 protocol you should always check your
-     * channel is active prior to sending the packet
-     * 
-     * @param player
-     * @param channel
-     * @return
-     */
-    public static boolean isChannelActive(EntityPlayer player, String channel)
-    {
-        return FMLCommonHandler.instance().isChannelActive(channel, player);
-    }
-
-    public static boolean isGUIOpen(Class<?> gui)
-    {
-        return false;
-    }
-
-    /**
-     * Is the named mod loaded?
-     * {@link Loader#isModLoaded(String)}
-     * 
-     * @param modname
-     * @return
-     */
-    public static boolean isModLoaded(String modname)
-    {
-        return Loader.isModLoaded(modname);
-    }
-
-    /**
-     * Implemented elsewhere
-     */
-    @Deprecated
-    public static void loadConfig()
-    {
-    }
-
-    public static Object loadImage(Object renderEngine, String path) throws Exception
-    {
-        return null;
-    }
-
-    /**
-     * Call in from elsewhere. Unimplemented here.
-     * @param player
-     * @param item
-     */
-    @Deprecated
-    public static void onItemPickup(EntityPlayer player, ItemStack item)
-    {
-    }
-    /**
-     * Call in from elsewhere. Unimplemented here.
-     */
-    @Deprecated
-    public static void onTick(float tick, Object game)
-    {
-    }
-
-    public static void openGUI(EntityPlayer player, Object gui)
-    {
-        // NOOP
-    }
-
-    @Deprecated
-    public static void populateChunk(IChunkProvider generator, int chunkX, int chunkZ, World world)
-    {
-    }
-
-    /**
-     * This method is a call in hook from modified external code. Implemented elsewhere.
-     * {@link FMLBukkitHandler#handlePacket250(Packet250CustomPayload, EntityHuman)}
-     *
-     * @param packet
-     */
-    @Deprecated
-    public static void receivePacket(Packet250CustomPayload packet)
-    {
-    }
-
-    @Deprecated
-    public static Object[] registerAllKeys(Object[] keys)
-    {
-        return keys;
-    }
-
-    @Deprecated
-    public static void registerAllTextureOverrides(Object cache)
-    {
-    }
-
-    /**
-     * Register a new block
-     * 
-     * @param block
-     */
-    public static void registerBlock(Block block)
-    {
-        FMLRegistry.registerBlock(block);
-    }
-
-    /**
-     * Register a new block
-     * 
-     * @param block
-     * @param itemclass
-     */
-    public static void registerBlock(Block block, Class <? extends ItemBlock > itemclass)
-    {
-        FMLRegistry.registerBlock(block, itemclass);
-    }
-
-    /**
-     * Register a new entity ID
-     * 
-     * @param entityClass
-     * @param entityName
-     * @param id
-     */
-    public static void registerEntityID(Class <? extends Entity > entityClass, String entityName, int id)
-    {
-        FMLRegistry.registerEntityID(entityClass, entityName, id);
-    }
-
-    /**
-     * Register a new entity ID
-     * 
-     * @param entityClass
-     * @param entityName
-     * @param id
-     * @param background
-     * @param foreground
-     */
-    public static void registerEntityID(Class <? extends Entity > entityClass, String entityName, int id, int background, int foreground)
-    {
-        FMLRegistry.registerEntityID(entityClass, entityName, id, background, foreground);
-    }
-
-    public static void registerKey(BaseMod mod, Object keyHandler, boolean allowRepeat)
-    {
-        // NOOP
-    }
-
-    /**
-     * Register the mod for packets on this channel. This only registers the
-     * channel with Forge Mod Loader, not with clients connecting- use
-     * BaseMod.onClientLogin to tell them about your custom channel
-     * {@link FMLCommonHandler#registerChannel(cpw.mods.fml.common.ModContainer, String)}
-     * 
-     * @param mod
-     * @param channel
-     */
-    public static void registerPacketChannel(BaseMod mod, String channel)
-    {
-        FMLCommonHandler.instance().registerChannel(ModLoaderModContainer.findContainerFor(mod), channel);
-    }
-
-    /**
-     * Register a new tile entity class
-     * 
-     * @param tileEntityClass
-     * @param id
-     */
-    public static void registerTileEntity(Class <? extends TileEntity > tileEntityClass, String id)
-    {
-        FMLRegistry.registerTileEntity(tileEntityClass, id);
-    }
-
-    public static void registerTileEntity(Class<? extends TileEntity> tileEntityClass, String id, Object renderer)
-    {
-        FMLRegistry.instance().registerTileEntity(tileEntityClass, id);
-    }
-
-    /**
-     * Remove a biome from the list of generated biomes
-     *  
-     * @param biome
-     */
-    public static void removeBiome(BiomeBase biome)
-    {
-        FMLRegistry.removeBiome(biome);
-    }
-
-    /**
-     * Remove a spawn
-     * 
-     * @param entityClass
-     * @param spawnList
-     */
-    public static void removeSpawn(Class <? extends EntityLiving > entityClass, EnumCreatureType spawnList)
-    {
-        FMLRegistry.removeSpawn(entityClass, spawnList, FMLBukkitHandler.instance().getDefaultOverworldBiomes());
-    }
-
-    /**
-     * Remove a spawn
-     * 
-     * @param entityClass
-     * @param spawnList
-     * @param biomes
-     */
-    public static void removeSpawn(Class <? extends EntityLiving > entityClass, EnumCreatureType spawnList, BiomeBase... biomes)
-    {
-        FMLRegistry.removeSpawn(entityClass, spawnList, biomes);
-    }
-
-    /**
-     * Remove a spawn
-     * 
-     * @param entityName
-     * @param spawnList
-     */
-    public static void removeSpawn(String entityName, EnumCreatureType spawnList)
-    {
-        FMLRegistry.removeSpawn(entityName, spawnList, FMLBukkitHandler.instance().getDefaultOverworldBiomes());
-    }
-
-    /**
-     * Remove a spawn
-     * 
-     * @param entityName
-     * @param spawnList
-     * @param biomes
-     */
-    public static void removeSpawn(String entityName, EnumCreatureType spawnList, BiomeBase... biomes)
-    {
-        FMLRegistry.removeSpawn(entityName, spawnList, biomes);
-    }
-
-    @Deprecated
-    public static boolean renderBlockIsItemFull3D(int modelID)
-    {
-        return false;
-    }
-
-    @Deprecated
-    public static void renderInvBlock(Object renderer, Block block, int metadata, int modelID)
-    {
-        // NOOP
-    }
-
-    @Deprecated
-    public static boolean renderWorldBlock(Object renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID)
-    {
-        return false;
-    }
-
-    /**
-     * Configuration is handled elsewhere
-     * {@link ModLoaderModContainer}
-     */
-    @Deprecated
-    public static void saveConfig()
-    {
-    }
-
-    /**
-     * Send a chat message to the server
-     * {@link FMLServerHandler#handleChatPacket(Packet3Chat, EntityPlayer)}
-     * 
-     * @param text
-     */
-    @Deprecated
-    public static void serverChat(String text)
-    {
-        //TODO
-    }
-
-    @Deprecated
-    public static void serverLogin(Object handler, Packet1Login loginPacket)
-    {
-        //TODO
-    }
-
-    /**
-     * Indicate that you want to receive ticks
-     *
-     * @param mod receiving the events
-     * @param enable indicates whether you want to recieve them or not
-     * @param useClock Not used in server side: all ticks are sent on the server side (no render subticks)
-     */
-    public static void setInGameHook(BaseMod mod, boolean enable, boolean useClock)
-    {
-    	ModLoaderHelper.updateStandardTicks(mod, enable, useClock);
-    }
-
-    
-    public static void setInGUIHook(BaseMod mod, boolean enable, boolean useClock)
-    {
-        ModLoaderHelper.updateGUITicks(mod, enable, useClock);
-    }
-
-    /**
-     * Set a private field to a value using reflection
-     * {@link ReflectionHelper#setPrivateValue(Class, Object, int, Object)}
-     * 
-     * @param instanceclass
-     * @param instance
-     * @param fieldindex
-     * @param value
-     */
-    public static <T, E> void setPrivateValue(Class <? super T > instanceclass, T instance, int fieldindex, E value)
-    {
-        ReflectionHelper.setPrivateValue(instanceclass, instance, fieldindex, value);
-    }
-
-    /**
-     * Set a private field to a value using reflection
-     * {@link ReflectionHelper#setPrivateValue(Class, Object, String, Object)}
-     * 
-     * @param instanceclass
-     * @param instance
-     * @param field
-     * @param value
-     */
-    public static <T, E> void setPrivateValue(Class <? super T > instanceclass, T instance, String field, E value)
-    {
-        ReflectionHelper.setPrivateValue(instanceclass, instance, field, value);
-    }
-
-    /**
-     * This method is a call in hook from modified external code. Implemented elsewhere.
-     * {@link FMLBukkitHandler#onItemCrafted(EntityHuman, ItemStack, IInventory)}
-     * 
-     * @param player
-     * @param item
-     * @param matrix
-     */
-    @Deprecated
-    public static void takenFromCrafting(EntityHuman player, ItemStack item, IInventory matrix)
-    {
-    }
-
-    /**
-     * This method is a call in hook from modified external code. Implemented elsewhere.
-     * {@link FMLBukkitHandler#onItemSmelted(EntityHuman, ItemStack)}
-     * 
-     * @param player
-     * @param item
-     */
-    @Deprecated
-    public static void takenFromFurnace(EntityHuman player, ItemStack item)
-    {
-    }
-
-    /**
-     * Throw the offered exception. Likely will stop the game.
-     * {@link FMLBukkitHandler#raiseException(Throwable, String, boolean)}
-     * @param message
-     * @param e
-     */
-    public static void throwException(String message, Throwable e)
-    {
-        FMLBukkitHandler.instance().raiseException(e, message, true);
-    }
-
-    /**
-     * To properly implement packet 250 protocol you should always check your channel
-     * is active prior to sending the packet
-     *
-     * @param player
-     * @param channel
-     * @return
-     */
-    public static boolean isChannelActive(EntityHuman player, String channel)
-    {
-        return FMLCommonHandler.instance().isChannelActive(channel, player);
-    }
-}

bukkit/net/minecraft/server/SidedProxy.java

@@ -1,46 +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.server;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @author cpw
- *
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface SidedProxy
-{
-    /**
-     * The name of the client side class to load and populate
-     * @return
-     */
-    String clientSide() default "";
-    
-    /**
-     * The name of the server side class to load and populate
-     * @return
-     */
-    String serverSide() default "";
-    
-    /**
-     * The name of the a special bukkit plugin class to load and populate
-     */
-    String bukkitSide() default "";
-}

bukkit/net/minecraft/src/BiomeGenBase.java

@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface BiomeGenBase {
-
-}

bukkit/net/minecraft/src/Block.java

@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface Block {
-
-}

bukkit/net/minecraft/src/Entity.java

@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface Entity {
-
-}

bukkit/net/minecraft/src/EntityLiving.java

@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface EntityLiving {
-
-}

bukkit/net/minecraft/src/EnumCreatureType.java

@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface EnumCreatureType {
-
-}

bukkit/net/minecraft/src/IRecipe.java

@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface IRecipe {
-
-}

bukkit/net/minecraft/src/ItemBlock.java

@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface ItemBlock {
-
-}

bukkit/net/minecraft/src/ItemStack.java

@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface ItemStack {
-
-}

bukkit/net/minecraft/src/TileEntity.java

@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface TileEntity {
-
-}

cleanup_source.py

@@ -1,43 +0,0 @@
-import sys
-import os, os.path, shutil
-import fnmatch
-import re
-                    
-def main():
-    sys.stdout.flush()
-    for x in range(1, len(sys.argv)):
-        cleanup_source(sys.argv[x])
-        
-count = 0
-def cleanup_source(path):
-    path = os.path.normpath(path)
-    regex_cases_before = re.compile(r'((case|default).+\r?\n)\r?\n', re.MULTILINE) #Fixes newline after case before case body
-    regex_cases_after = re.compile(r'\r?\n(\r?\n[ \t]+(case|default))', re.MULTILINE) #Fixes newline after case body before new case
-    
-    def updatefile(src_file):
-        global count
-        tmp_file = src_file + '.tmp'
-        count = 0
-        with open(src_file, 'r') as fh:
-            buf = fh.read()
-            
-        def fix_cases(match):
-            global count
-            count += 1
-            return match.group(1)
-            
-        buf = regex_cases_before.sub(fix_cases, buf)
-        buf = regex_cases_after.sub(fix_cases, buf)
-        if count > 0:
-            with open(tmp_file, 'w') as fh:
-                fh.write(buf)
-            shutil.move(tmp_file, src_file)
-            
-    for path, _, filelist in os.walk(path, followlinks=True):
-        sub_dir = os.path.relpath(path, path)
-        for cur_file in fnmatch.filter(filelist, '*.java'):
-            src_file = os.path.normpath(os.path.join(path, cur_file))
-            updatefile(src_file)
-            
-if __name__ == '__main__':
-    main()

client/cpw/mods/fml/client/GuiIdMismatchScreen.java

@@ -1,108 +0,0 @@
-/*
- * 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_);
-        }
-    }
-}

client/cpw/mods/fml/client/GuiModsMissingForServer.java

@@ -1,64 +0,0 @@
-/*
- * 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.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;
-
-public class GuiModsMissingForServer extends GuiScreen
-{
-    private ModMissingPacket modsMissing;
-
-    public GuiModsMissingForServer(ModMissingPacket modsMissing)
-    {
-        this.modsMissing = modsMissing;
-    }
-
-    @Override
-    public void func_73866_w_()
-    {
-        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
-    protected void func_73875_a(GuiButton p_73875_1_)
-    {
-        if (p_73875_1_.field_73742_g && p_73875_1_.field_73741_f == 1)
-        {
-            FMLClientHandler.instance().getClient().func_71373_a(null);
-        }
-    }
-    @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 - modsMissing.getModList().size() * 10, 10);
-        this.func_73732_a(this.field_73886_k, "Forge Mod Loader could not connect to this server", this.field_73880_f / 2, offset, 0xFFFFFF);
-        offset += 10;
-        this.func_73732_a(this.field_73886_k, "The mods and versions listed below could not be found", this.field_73880_f / 2, offset, 0xFFFFFF);
-        offset += 10;
-        this.func_73732_a(this.field_73886_k, "They are required to play on this server", this.field_73880_f / 2, offset, 0xFFFFFF);
-        offset += 5;
-        for (ArtifactVersion v : modsMissing.getModList())
-        {
-            offset += 10;
-            this.func_73732_a(this.field_73886_k, String.format("%s : %s", v.getLabel(), v.getRangeString()), this.field_73880_f / 2, offset, 0xEEEEEE);
-        }
-        super.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
-    }
-}

client/cpw/mods/fml/client/GuiSortingProblem.java

@@ -1,48 +0,0 @@
-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);
-    }
-
-}

client/cpw/mods/fml/client/TextureFXManager.java

@@ -1,142 +0,0 @@
-/*
- * 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.awt.Dimension;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-import javax.imageio.ImageIO;
-
-import org.lwjgl.opengl.ContextCapabilities;
-import org.lwjgl.opengl.GLContext;
-
-import com.google.common.collect.Maps;
-
-import cpw.mods.fml.common.FMLLog;
-
-import net.minecraft.client.Minecraft;
-
-public class TextureFXManager
-{
-    private static final TextureFXManager INSTANCE = new TextureFXManager();
-
-    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 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;
-//    }
-}

client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java

@@ -1,81 +0,0 @@
-/*
- * 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.world.IBlockAccess;
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-
-/**
- * @author cpw
- *
- */
-public class ModLoaderBlockRendererHandler implements ISimpleBlockRenderingHandler
-{
-    private int renderId;
-    private boolean render3dInInventory;
-    private BaseMod mod;
-
-    /**
-     * @param mod
-     *
-     */
-    public ModLoaderBlockRendererHandler(int renderId, boolean render3dInInventory, BaseMod mod)
-    {
-        this.renderId=renderId;
-        this.render3dInInventory=render3dInInventory;
-        this.mod=mod;
-    }
-
-    @Override
-    public int getRenderId()
-    {
-        return renderId;
-    }
-
-    @Override
-    public boolean shouldRender3DInInventory()
-    {
-        return render3dInInventory;
-    }
-
-    /**
-     * @param world
-     * @param x
-     * @param y
-     * @param z
-     * @param block
-     * @param modelId
-     * @param renderer
-     */
-    @Override
-    public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer)
-    {
-        return mod.renderWorldBlock(renderer, world, x, y, z, block, modelId);
-    }
-
-    /**
-     * @param block
-     * @param metadata
-     * @param modelID
-     * @param renderer
-     */
-    @Override
-    public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
-    {
-        mod.renderInvBlock(renderer, block, metadata, modelID);
-    }
-
-}

client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java

@@ -1,190 +0,0 @@
-/*
- * 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;
-import java.util.Collections;
-import java.util.Map;
-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.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.Equivalence;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.MapDifference;
-import com.google.common.collect.MapDifference.ValueDifference;
-import com.google.common.collect.MapMaker;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.client.registry.KeyBindingRegistry;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.modloader.BaseModProxy;
-import cpw.mods.fml.common.modloader.IModLoaderSidedHelper;
-import cpw.mods.fml.common.modloader.ModLoaderHelper;
-import cpw.mods.fml.common.modloader.ModLoaderModContainer;
-import cpw.mods.fml.common.network.EntitySpawnPacket;
-import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
-
-public class ModLoaderClientHelper implements IModLoaderSidedHelper
-{
-    public static int obtainBlockModelIdFor(BaseMod mod, boolean inventoryRenderer)
-    {
-        int renderId=RenderingRegistry.getNextAvailableRenderId();
-        ModLoaderBlockRendererHandler bri=new ModLoaderBlockRendererHandler(renderId, inventoryRenderer, mod);
-        RenderingRegistry.registerBlockHandler(bri);
-        return renderId;
-    }
-
-
-    public static void handleFinishLoadingFor(ModLoaderModContainer mc, Minecraft game)
-    {
-        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.log(mc.getModId(), Level.FINEST, "Requesting renderers from basemod %s", mc.getModId());
-            mod.addRenderer(renderers);
-            FMLLog.log(mc.getModId(), Level.FINEST, "Received %d renderers from basemod %s", renderers.size(), mc.getModId());
-        }
-        catch (Exception e)
-        {
-            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, Equivalence.identity());
-
-        for ( Entry<Class<? extends Entity>, Render> e : difference.entriesOnlyOnLeft().entrySet())
-        {
-            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.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.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());
-        }
-
-        try
-        {
-            mod.registerAnimation(game);
-        }
-        catch (Exception e)
-        {
-            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());
-        }
-    }
-
-    public ModLoaderClientHelper(Minecraft client)
-    {
-        this.client = client;
-        ModLoaderHelper.sidedHelper = this;
-        keyBindingContainers = Multimaps.newMultimap(Maps.<ModLoaderModContainer, Collection<ModLoaderKeyBindingHandler>>newHashMap(), new Supplier<Collection<ModLoaderKeyBindingHandler>>()
-        {
-            @Override
-            public Collection<ModLoaderKeyBindingHandler> get()
-            {
-                return Collections.singleton(new ModLoaderKeyBindingHandler());
-            }
-        });
-    }
-
-    private Minecraft client;
-    private static Multimap<ModLoaderModContainer, ModLoaderKeyBindingHandler> keyBindingContainers;
-
-    @Override
-    public void finishModLoading(ModLoaderModContainer mc)
-    {
-        handleFinishLoadingFor(mc, client);
-    }
-
-
-    public static void registerKeyBinding(BaseModProxy mod, KeyBinding keyHandler, boolean allowRepeat)
-    {
-        ModLoaderModContainer mlmc = (ModLoaderModContainer) Loader.instance().activeModContainer();
-        ModLoaderKeyBindingHandler handler = Iterables.getOnlyElement(keyBindingContainers.get(mlmc));
-        handler.setModContainer(mlmc);
-        handler.addKeyBinding(keyHandler, allowRepeat);
-        KeyBindingRegistry.registerKeyBinding(handler);
-    }
-
-
-    @Override
-    public Object getClientGui(BaseModProxy mod, EntityPlayer player, int ID, int x, int y, int z)
-    {
-        return ((net.minecraft.src.BaseMod)mod).getContainerGUI((EntityClientPlayerMP) player, ID, x, y, z);
-    }
-
-
-    @Override
-    public Entity spawnEntity(BaseModProxy mod, EntitySpawnPacket input, EntityRegistration er)
-    {
-        return ((net.minecraft.src.BaseMod)mod).spawnEntity(er.getModEntityId(), client.field_71441_e, input.scaledX, input.scaledY, input.scaledZ);
-    }
-
-
-    @Override
-    public void sendClientPacket(BaseModProxy mod, Packet250CustomPayload packet)
-    {
-        ((net.minecraft.src.BaseMod)mod).clientCustomPayload(client.field_71439_g.field_71174_a, packet);
-    }
-
-    private Map<INetworkManager,NetHandler> managerLookups = new MapMaker().weakKeys().weakValues().makeMap();
-    @Override
-    public void clientConnectionOpened(NetHandler netClientHandler, INetworkManager manager, BaseModProxy mod)
-    {
-        managerLookups.put(manager, netClientHandler);
-        ((BaseMod)mod).clientConnect((NetClientHandler)netClientHandler);
-    }
-
-
-    @Override
-    public boolean clientConnectionClosed(INetworkManager manager, BaseModProxy mod)
-    {
-        if (managerLookups.containsKey(manager))
-        {
-            ((BaseMod)mod).clientDisconnect((NetClientHandler) managerLookups.get(manager));
-            return true;
-        }
-        return false;
-    }
-}

client/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java

@@ -1,110 +0,0 @@
-/*
- * 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.Arrays;
-import java.util.EnumSet;
-import java.util.List;
-
-import org.lwjgl.input.Mouse;
-
-import com.google.common.collect.ObjectArrays;
-import com.google.common.primitives.Booleans;
-
-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;
-
-/**
- * @author cpw
- *
- */
-public class ModLoaderKeyBindingHandler extends KeyBindingRegistry.KeyHandler
-{
-    private ModLoaderModContainer modContainer;
-    private List<KeyBinding> helper;
-    private boolean[] active = new boolean[0];
-    private boolean[] mlRepeats = new boolean[0];
-    private boolean[] armed = new boolean[0];
-
-    public ModLoaderKeyBindingHandler()
-    {
-        super(new KeyBinding[0], new boolean[0]);
-    }
-
-    void setModContainer(ModLoaderModContainer modContainer)
-    {
-        this.modContainer = modContainer;
-    }
-
-    public void fireKeyEvent(KeyBinding kb)
-    {
-        ((net.minecraft.src.BaseMod)modContainer.getMod()).keyboardEvent(kb);
-    }
-
-    @Override
-    public void keyDown(EnumSet<TickType> type, KeyBinding kb, boolean end, boolean repeats)
-    {
-        if (!end)
-        {
-            return;
-        }
-        int idx = helper.indexOf(kb);
-        if (type.contains(TickType.CLIENT))
-        {
-            armed[idx] = true;
-        }
-        if (armed[idx] && type.contains(TickType.RENDER) && (!active[idx] || mlRepeats[idx]))
-        {
-            fireKeyEvent(kb);
-            active[idx] = true;
-            armed[idx] = false;
-        }
-    }
-
-    @Override
-    public void keyUp(EnumSet<TickType> type, KeyBinding kb, boolean end)
-    {
-        if (!end)
-        {
-            return;
-        }
-        int idx = helper.indexOf(kb);
-        active[idx] = false;
-    }
-
-    @Override
-    public EnumSet<TickType> ticks()
-    {
-        return EnumSet.of(TickType.CLIENT, TickType.RENDER);
-    }
-
-    @Override
-    public String getLabel()
-    {
-        return modContainer.getModId() +" KB "+keyBindings[0].field_74512_d;
-    }
-
-    void addKeyBinding(KeyBinding binding, boolean repeats)
-    {
-        this.keyBindings = ObjectArrays.concat(this.keyBindings, binding);
-        this.repeatings = new boolean[this.keyBindings.length];
-        Arrays.fill(this.repeatings, true);
-        this.active = new boolean[this.keyBindings.length];
-        this.armed = new boolean[this.keyBindings.length];
-        this.mlRepeats = Booleans.concat(this.mlRepeats, new boolean[] { repeats });
-        this.keyDown = new boolean[this.keyBindings.length];
-        this.helper = Arrays.asList(this.keyBindings);
-    }
-}

client/net/minecraft/src/BaseMod.java

@@ -1,456 +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 cpw.mods.fml.relauncher.Side.CLIENT;
-
-import java.util.Map;
-import java.util.Random;
-
-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.relauncher.SideOnly;
-
-public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModProxy
-{
-    // CALLBACK MECHANISMS
-
-    public final boolean doTickInGame(TickType tick, boolean tickEnd, Object... data)
-    {
-        Minecraft mc = FMLClientHandler.instance().getClient();
-        boolean hasWorld = mc.field_71441_e != null;
-        // World and render ticks
-        if (tickEnd && ( tick==TickType.RENDER || tick==TickType.CLIENT ) && hasWorld) {
-            return onTickInGame((Float) data[0], mc);
-        }
-        return true;
-    }
-
-    public final boolean doTickInGUI(TickType tick, boolean tickEnd, Object... data)
-    {
-        Minecraft mc = FMLClientHandler.instance().getClient();
-
-        boolean hasWorld = mc.field_71441_e != null;
-
-        if (tickEnd && ( tick==TickType.RENDER || ( tick==TickType.CLIENT && hasWorld))) {
-            return onTickInGUI((Float) data[0], mc, mc.field_71462_r);
-        }
-        return true;
-    }
-
-   /*
-    public final void onRenderHarvest(Map renderers)
-    {
-        addRenderer((Map<Class<? extends Entity>,Render>)renderers);
-    }
-
-    public final void onRegisterAnimations()
-    {
-        registerAnimation(FMLClientHandler.instance().getClient());
-    }
-
-    @Override
-    public final void onCrafting(Object... craftingParameters)
-    {
-        takenFromCrafting((EntityPlayer)craftingParameters[0], (ItemStack)craftingParameters[1], (IInventory)craftingParameters[2]);
-    }
-
-    @Override
-    public final void onSmelting(Object... smeltingParameters)
-    {
-        takenFromFurnace((EntityPlayer)smeltingParameters[0], (ItemStack)smeltingParameters[1]);
-    }
-
-    @Override
-    public final boolean dispense(double x, double y, double z, int xVelocity, int zVelocity, Object... data)
-    {
-        return dispenseEntity((World)data[0], x, y, z, xVelocity, zVelocity, (ItemStack)data[1]);
-    }
-
-    @Override
-    public final boolean onChat(Object... data)
-    {
-        receiveChatPacket(((Packet3Chat)data[0]).field_73476_b);
-        return true;
-    }
-
-
-    @Override
-    public final void onServerLogin(Object handler) {
-        serverConnect((NetClientHandler) handler);
-    }
-
-    public final void onServerLogout() {
-        serverDisconnect();
-    }
-
-    @Override
-    public final void onPlayerLogin(Object player)
-    {
-        onClientLogin((EntityPlayer) player);
-    }
-
-    @Override
-    public final void onPlayerLogout(Object player)
-    {
-        onClientLogout((EntityPlayer)player);
-    }
-
-    @Override
-    public final void onPlayerChangedDimension(Object player)
-    {
-        onClientDimensionChanged((EntityPlayer)player);
-    }
-
-    @Override
-    public final void onPacket250Packet(Object... data)
-    {
-        receiveCustomPacket((Packet250CustomPayload)data[0]);
-    }
-
-    @Override
-    public final void notifyPickup(Object... pickupData)
-    {
-        EntityItem item = (EntityItem) pickupData[0];
-        EntityPlayer player = (EntityPlayer) pickupData[1];
-        onItemPickup(player, item.field_70294_a);
-    }
-
-    @Override
-    public final void generate(Random random, int chunkX, int chunkZ, Object... additionalData)
-    {
-        World w = (World) additionalData[0];
-        IChunkProvider cp = (IChunkProvider) additionalData[1];
-
-        if (cp instanceof ChunkProviderGenerate)
-        {
-            generateSurface(w, random, chunkX << 4, chunkZ << 4);
-        }
-        else if (cp instanceof ChunkProviderHell)
-        {
-            generateNether(w, random, chunkX << 4, chunkZ << 4);
-        }
-    }
-
-    @Override
-    public final boolean handleCommand(String command, Object... data)
-    {
-        return false;
-    }
-
-    */
-    // BASEMOD API
-    /**
-     * Override if you wish to provide a fuel item for the furnace and return the fuel value of the item
-     *
-     * @param id
-     * @param metadata
-     */
-    public int addFuel(int id, int metadata)
-    {
-        return 0;
-    }
-
-    @SideOnly(CLIENT)
-    public void addRenderer(Map<Class<? extends Entity>, Render> renderers)
-    {
-    }
-
-    /**
-     * Override if you wish to generate Nether (Hell biome) blocks
-     *
-     * @param world
-     * @param random
-     * @param chunkX
-     * @param chunkZ
-     */
-    public void generateNether(World world, Random random, int chunkX, int chunkZ)
-    {
-    }
-
-    /**
-     * Override if you wish to generate Overworld (not hell or the end) blocks
-     *
-     * @param world
-     * @param random
-     * @param chunkX
-     * @param chunkZ
-     */
-    public void generateSurface(World world, Random random, int chunkX, int chunkZ)
-    {
-    }
-
-    /**
-     * Callback to return a gui screen to display
-     * @param player
-     * @param containerID
-     * @param x
-     * @param y
-     * @param z
-     */
-    @SideOnly(CLIENT)
-    public GuiContainer getContainerGUI(EntityClientPlayerMP player, int containerID, int x, int y, int z)
-    {
-        return null;
-    }
-
-    /**
-     * Return the name of your mod. Defaults to the class name
-     */
-    public String getName()
-    {
-        return getClass().getSimpleName();
-    }
-
-    /**
-     * Get your mod priorities
-     */
-    public String getPriorities()
-    {
-        return "";
-    }
-
-    /**
-     * Return the version of your mod
-     */
-    public abstract String getVersion();
-
-    @SideOnly(CLIENT)
-    public void keyboardEvent(KeyBinding event)
-    {
-
-    }
-
-    /**
-     * Load your mod
-     */
-    public abstract void load();
-
-    /**
-     * Finish loading your mod
-     */
-    public void modsLoaded()
-    {
-    }
-
-    /**
-     * Handle item pickup
-     *
-     * @param player
-     * @param item
-     */
-    public void onItemPickup(EntityPlayer player, ItemStack item)
-    {
-    }
-
-    /**
-     * Ticked every game tick if you have subscribed to tick events through {@link ModLoader#setInGameHook(BaseMod, boolean, boolean)}
-     *
-     * @param time the rendering subtick time (0.0-1.0)
-     * @param minecraftInstance the client
-     * @return true to continue receiving ticks
-     */
-    @SideOnly(CLIENT)
-    public boolean onTickInGame(float time, Minecraft minecraftInstance)
-    {
-        return false;
-    }
-
-    public boolean onTickInGame(MinecraftServer minecraftServer)
-    {
-        return false;
-    }
-
-    @SideOnly(CLIENT)
-    public boolean onTickInGUI(float tick, Minecraft game, GuiScreen gui)
-    {
-        return false;
-    }
-
-    /**
-     * Only implemented on the client side
-     * {@link #serverChat(NetServerHandler, String)}
-     *
-     * @param text
-     */
-    @Override
-    public void clientChat(String text)
-    {
-    }
-
-    /**
-     * Called when a client connects
-     * @param handler
-     */
-    @SideOnly(CLIENT)
-    public void clientConnect(NetClientHandler handler)
-    {
-
-    }
-
-    /**
-     * Called when the client disconnects
-     * @param handler
-     */
-    @SideOnly(CLIENT)
-    public void clientDisconnect(NetClientHandler handler)
-    {
-
-    }
-    /**
-     * 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
-     */
-    @Override
-    public void receiveCustomPacket(Packet250CustomPayload packet)
-    {
-    }
-
-    @SideOnly(CLIENT)
-    public void registerAnimation(Minecraft game)
-    {
-
-    }
-
-    @SideOnly(CLIENT)
-    public void renderInvBlock(RenderBlocks renderer, Block block, int metadata, int modelID)
-    {
-
-    }
-
-    @SideOnly(CLIENT)
-    public boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID)
-    {
-        return false;
-
-    }
-    /*
-     * NOTE: this method is not provided in Risugami's implementation of BaseMod!
-     */
-    @Override
-    public void serverConnect(NetHandler handler) {
-
-    }
-
-    @Override
-    public void serverCustomPayload(NetServerHandler handler, Packet250CustomPayload packet)
-    {
-
-    }
-
-    /*
-     * NOTE: this method is not provided in Risugami's implementation of BaseMod!
-     */
-    @Override
-    public void serverDisconnect() {
-
-    }
-    /**
-     * Called when someone crafts an item from a crafting table
-     *
-     * @param player
-     * @param item
-     * @param matrix
-     */
-    public void takenFromCrafting(EntityPlayer player, ItemStack item, IInventory matrix)
-    {
-    }
-
-    /**
-     * Called when someone takes a smelted item from a furnace
-     *
-     * @param player
-     * @param item
-     */
-    public void takenFromFurnace(EntityPlayer player, ItemStack item)
-    {
-    }
-
-    /**
-     * The identifier string for the mod- used in client<->server negotiation
-     */
-    @Override
-    public String toString()
-    {
-        return getName() + " " + getVersion();
-    }
-
-    /**
-     * Called when a chat message is received. Return true to stop further processing
-     */
-    @Override
-    public void serverChat(NetServerHandler source, String message)
-    {
-    }
-    /**
-     * Called when a new client logs in.
-     * 
-     * NOTE: this method is not provided in Risugami's implementation of BaseMod!
-     *
-     * @param player
-     */
-    @Override
-    public void onClientLogin(EntityPlayer player)
-    {
-    }
-
-    /**
-     * 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)
-    {
-
-    }
-
-    /**
-     * Spawn the entity of the supplied type, if it is your mod's
-     */
-    @SideOnly(CLIENT)
-    public Entity spawnEntity(int entityId, World world, double scaledX, double scaledY, double scaledZ)
-    {
-        return null;
-    }
-
-    public void clientCustomPayload(NetClientHandler handler, Packet250CustomPayload packet)
-    {
-
-    }
-
-}

client/net/minecraft/src/EntityRendererProxy.java

@@ -1,35 +0,0 @@
-/*
- * 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
-{
-    public static final String fmlMarker = "This is an FML marker";
-    private Minecraft game;
-
-    public EntityRendererProxy(Minecraft minecraft)
-    {
-        super(minecraft);
-        game = minecraft;
-    }
-
-    @Override
-    public void func_78480_b(float tick)
-    {
-        super.func_78480_b(tick);
-        //This is where ModLoader does all of it's ticking
-    }
-}

client/net/minecraft/src/MLProp.java

@@ -1,49 +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 java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * @author cpw
- * 
- */
-@Retention(value = RUNTIME)
-@Target(value = FIELD)
-public @interface MLProp
-{
-    /**
-     * Adds additional help to top of configuration file.
-     */
-    String info() default "";
-
-    /**
-     * Maximum value allowed if field is a number.
-     */
-    double max() default Double.MAX_VALUE;
-
-    /**
-     * Minimum value allowed if field is a number.
-     */
-    double min() default Double.MIN_VALUE;
-
-    /**
-     * Overrides the field name for property key.
-     */
-    String name() default "";
-
-}

client/net/minecraft/src/ModLoader.java

@@ -1,916 +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 cpw.mods.fml.relauncher.Side.CLIENT;
-
-import java.awt.image.BufferedImage;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
-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.TextureFXManager;
-import cpw.mods.fml.client.modloader.ModLoaderClientHelper;
-import cpw.mods.fml.client.modloader.ModLoaderKeyBindingHandler;
-import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.client.registry.KeyBindingRegistry;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-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.modloader.ModLoaderHelper;
-import cpw.mods.fml.common.modloader.ModLoaderModContainer;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.network.PacketDispatcher;
-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
-{
-    public static final String fmlMarker = "This is an FML marker";
-    // TODO dirty workaround for millinaire
-    @Deprecated
-    public static final Map<String,Map<String,String>> localizedStrings=Collections.emptyMap();
-
-    /**
-     * Adds localization info for an achievement, Not used on the server.
-     *
-     * @param achievement The achievement to name
-     * @param name The name
-     * @param description The description
-     */
-    public static void addAchievementDesc(Achievement achievement, String name, String description)
-    {
-        String achName=achievement.func_75970_i();
-        addLocalization(achName, name);
-        addLocalization(achName+".desc", description);
-    }
-
-    /**
-     * This method is a call in hook from modified external code. Implemented elsewhere.
-     *
-     * {@link GameRegistry#getFuelValue(ItemStack)}
-     *
-     * @param id The Item ID
-     * @param metadata The Item Metadata
-     * @return The fuel strength, in ticks, 0 if unhandled
-     */
-    @Deprecated
-    public static int addAllFuel(int id, int metadata)
-    {
-        return 0;
-    }
-
-    @Deprecated
-    @SideOnly(CLIENT)
-    public static void addAllRenderers(Map<Class<? extends Entity>, Render> renderers)
-    {
-    }
-
-    /**
-     * Adds a new prefix to the armor texture list
-     *
-     * {@link RenderingRegistry#addNewArmourRendererPrefix(String)}
-     *
-     * @param armor The new armor prefix
-     * @return The new armor index
-     */
-    @SideOnly(CLIENT)
-    public static int addArmor(String armor)
-    {
-        return RenderingRegistry.addNewArmourRendererPrefix(armor);
-    }
-
-    /**
-     * This method adds the supplied biome to the set of candidate biomes for the default world generator type.
-     *
-     * @param biome The biome to add
-     */
-    public static void addBiome(BiomeGenBase biome)
-    {
-        GameRegistry.addBiome(biome);
-    }
-
-    public static void addEntityTracker(BaseMod mod, Class<? extends Entity> entityClass, int entityTypeId, int updateRange, int updateInterval, boolean sendVelocityInfo)
-    {
-        ModLoaderHelper.buildEntityTracker(mod, entityClass, entityTypeId, updateRange, updateInterval, sendVelocityInfo);
-    }
-
-    public static void addCommand(ICommand command)
-    {
-        ModLoaderHelper.addCommand(command);
-    }
-
-    /**
-     * Add a behaviour to the dispenser
-     *
-     * @param item
-     * @param behavior
-     */
-    public static void addDispenserBehavior(Item item, IBehaviorDispenseItem behavior)
-    {
-    	BlockDispenser.field_82527_a.func_82595_a(item, behavior);
-    }
-    /**
-     * Add localization for the specified string
-     *
-     * @param key Key
-     * @param value Value
-     */
-    public static void addLocalization(String key, String value)
-    {
-        addLocalization(key, "en_US", value);
-    }
-
-    /**
-     * Add localization for the specified string
-     *
-     * @param key Key
-     * @param lang Language identifier
-     * @param value Value
-     */
-    public static void addLocalization(String key, String lang, String value)
-    {
-        LanguageRegistry.instance().addStringLocalization(key, lang, value);
-    }
-
-    /**
-     * Name the specified minecraft object with the supplied name
-     *
-     * @param instance Item to name
-     * @param name The name to give it
-     */
-    public static void addName(Object instance, String name)
-    {
-        addName(instance,"en_US",name);
-    }
-
-    /**
-     * Unimplemented on the server as it does not generate names
-     *
-     * @param instance Item to name
-     * @param lang Languge identifier
-     * @param name Name to give it
-     */
-    public static void addName(Object instance, String lang, String name)
-    {
-        LanguageRegistry.instance().addNameForObject(instance, lang, name);
-    }
-
-    /**
-     * Attempts to register a small image to be applied to a larger texture image,
-     * typically how old ModLoader mods add custom Item/Block textures.
-     *
-     * Forge mods should use setTextureFile in Item/Block
-     *
-     * Will return the icon index it was applied to.
-     *
-     * Unimplemented on the server as it does not render textures
-     *
-     * @param fileToOverride The texture to apply the new image to
-     * @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)
-    {
-        return RenderingRegistry.addTextureOverride(fileToOverride, fileToAdd);
-    }
-
-    /**
-     * Attempts to register a small image to be applied to a larger texture image,
-     * typically how old ModLoader mods add custom Item/Block textures.
-     *
-     * Forge mods should use setTextureFile in Item/Block
-     *
-     * Unimplemented on the server as it does not render textures
-     *
-     * @param path The texture to apply the new image to
-     * @param overlayPath The new image
-     * @param index Where on the texture to apply it
-     */
-    @SideOnly(CLIENT)
-    public static void addOverride(String path, String overlayPath, int index)
-    {
-        RenderingRegistry.addTextureOverride(path, overlayPath, index);
-    }
-
-    /**
-     * Add a Shaped Recipe
-     *
-     * @param output The result
-     * @param params The input
-     */
-    public static void addRecipe(ItemStack output, Object... params)
-    {
-        GameRegistry.addRecipe(output, params);
-    }
-
-    /**
-     * Add a shapeless recipe
-     *
-     * @param output The result
-     * @param params The input
-     */
-    public static void addShapelessRecipe(ItemStack output, Object... params)
-    {
-        GameRegistry.addShapelessRecipe(output, params);
-    }
-
-    /**
-     * Add a new product to be smelted
-     *
-     * @param input
-     * @param output
-     */
-    public static void addSmelting(int input, ItemStack output)
-    {
-        GameRegistry.addSmelting(input, output, 1.0f);
-    }
-
-    /**
-     * Add a new product to be smelted
-     *
-     * @param input
-     * @param output
-     */
-    public static void addSmelting(int input, ItemStack output, float experience)
-    {
-        GameRegistry.addSmelting(input, output, experience);
-    }
-    /**
-     * Add a mob to the spawn list
-     *
-     * @param entityClass
-     * @param weightedProb
-     * @param min
-     * @param max
-     * @param spawnList
-     */
-    public static void addSpawn(Class<? extends EntityLiving> entityClass, int weightedProb, int min, int max, EnumCreatureType spawnList)
-    {
-        EntityRegistry.addSpawn(entityClass, weightedProb, min, max, spawnList, WorldType.base12Biomes);
-    }
-
-    /**
-     * Add a mob to the spawn list
-     *
-     * @param entityClass
-     * @param weightedProb
-     * @param min
-     * @param max
-     * @param spawnList
-     * @param biomes
-     */
-    public static void addSpawn(Class<? extends EntityLiving> entityClass, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeGenBase... biomes)
-    {
-        EntityRegistry.addSpawn(entityClass, weightedProb, min, max, spawnList, biomes);
-    }
-
-    /**
-     * Add a mob to the spawn list
-     *
-     * @param entityName
-     * @param weightedProb
-     * @param min
-     * @param max
-     * @param spawnList
-     */
-    public static void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList)
-    {
-        EntityRegistry.addSpawn(entityName, weightedProb, min, max, spawnList, WorldType.base12Biomes);
-    }
-
-    /**
-     * Add a mob to the spawn list
-     *
-     * @param entityName
-     * @param weightedProb
-     * @param min
-     * @param max
-     * @param spawnList
-     * @param biomes
-     */
-    public static void addSpawn(String entityName, int weightedProb, int min, int max, EnumCreatureType spawnList, BiomeGenBase... biomes)
-    {
-        EntityRegistry.addSpawn(entityName, weightedProb, min, max, spawnList, biomes);
-    }
-
-    public static void addTrade(int profession, TradeEntry entry)
-    {
-        ModLoaderHelper.registerTrade(profession, entry);
-    }
-    /**
-     * Send a packet from the client
-     * @param packet
-     */
-    public static void clientSendPacket(Packet packet)
-    {
-        PacketDispatcher.sendPacketToServer(packet);
-    }
-
-    /**
-     * This method is a call in hook from modified external code. Implemented elsewhere.
-     *
-     * @param world
-     * @param x
-     * @param y
-     * @param z
-     * @param xVel
-     * @param zVel
-     * @param item
-     * @return Always false, not implemented here
-     */
-    @Deprecated
-    public static boolean dispenseEntity(World world, double x, double y, double z, int xVel, int zVel, ItemStack item)
-    {
-        return false;
-    }
-
-    /**
-     * Remove a container and drop all the items in it on the ground around
-     *
-     * @param world
-     * @param x
-     * @param y
-     * @param z
-     */
-    public static void genericContainerRemoval(World world, int x, int y, int z)
-    {
-/*        TileEntity te = world.func_603_b(x, y, z);
-
-        if (!(te instanceof IInventory))
-        {
-            return;
-        }
-
-        IInventory inv = (IInventory)te;
-
-        for (int l = 0; l < inv.func_469_c(); l++)
-        {
-            ItemStack itemstack = inv.func_468_c(l);
-
-            if (itemstack == null)
-            {
-                continue;
-            }
-
-            float f = world.field_1037_n.nextFloat() * 0.8F + 0.1F;
-            float f1 = world.field_1037_n.nextFloat() * 0.8F + 0.1F;
-            float f2 = world.field_1037_n.nextFloat() * 0.8F + 0.1F;
-
-            while (itemstack.field_1615_a > 0)
-            {
-                int i1 = world.field_1037_n.nextInt(21) + 10;
-
-                if (i1 > itemstack.field_1615_a)
-                {
-                    i1 = itemstack.field_1615_a;
-                }
-
-                itemstack.field_1615_a -= i1;
-                EntityItem entityitem = new EntityItem(world, (float)te.field_823_f + f, (float)te.field_822_g + f1, (float)te.field_821_h + f2, new ItemStack(itemstack.field_1617_c, i1, itemstack.func_21181_i()));
-                float f3 = 0.05F;
-                entityitem.field_608_an = (float) world.field_1037_n.nextGaussian() * f3;
-                entityitem.field_607_ao = (float) world.field_1037_n.nextGaussian() * f3 + 0.2F;
-                entityitem.field_606_ap = (float) world.field_1037_n.nextGaussian() * f3;
-
-                if (itemstack.func_40710_n())
-                {
-                    entityitem.field_801_a.func_40706_d((NBTTagCompound) itemstack.func_40709_o().func_40195_b());
-                }
-
-                world.func_674_a(entityitem);
-            }
-        }
-*/    }
-
-    /**
-     * Get a list of all BaseMod loaded into the system
-     * {@link ModLoaderModContainer#findAll}
-     *
-     * @return A list containing all loaded ModLoader mods
-     */
-    public static List<BaseMod> getLoadedMods()
-    {
-        return ModLoaderModContainer.findAll(BaseMod.class);
-    }
-
-    /**
-     * Get a logger instance {@link FMLCommonHandler#getFMLLogger()}
-     *
-     * @return The current logger
-     */
-    public static Logger getLogger()
-    {
-        return FMLLog.getLogger();
-    }
-
-    @SideOnly(CLIENT)
-    public static Minecraft getMinecraftInstance()
-    {
-        return FMLClientHandler.instance().getClient();
-    }
-
-    public static MinecraftServer getMinecraftServerInstance()
-    {
-        return FMLCommonHandler.instance().getMinecraftServerInstance();
-    }
-
-    /**
-     * Get a value from a field using reflection
-     * {@link ObfuscationReflectionHelper#getPrivateValue(Class, Object, int)}
-     *
-     * @param instanceclass
-     * @param instance
-     * @param fieldindex
-     * @return The value in the specified field.
-     */
-    public static <T, E> T getPrivateValue(Class<? super E> instanceclass, E instance, int fieldindex)
-    {
-        return ObfuscationReflectionHelper.getPrivateValue(instanceclass, instance, fieldindex);
-    }
-
-    /**
-     * Get a value from a field using reflection
-     * {@link ObfuscationReflectionHelper#getPrivateValue(Class, Object, String[])}
-     *
-     * @param instanceclass
-     * @param instance
-     * @param field
-     * @return The value in the specified field.
-     */
-    public static <T, E> T getPrivateValue(Class<? super E> instanceclass, E instance, String field)
-    {
-        return ObfuscationReflectionHelper.getPrivateValue(instanceclass, instance, field);
-    }
-
-    /**
-     * Stubbed method on the server to return a unique model id
-     *
-     */
-    @SideOnly(CLIENT)
-    public static int getUniqueBlockModelID(BaseMod mod, boolean inventoryRenderer)
-    {
-        return ModLoaderClientHelper.obtainBlockModelIdFor(mod, inventoryRenderer);
-    }
-
-    /**
-     * Get a new unique entity id
-     * {@link EntityRegistry#findGlobalUniqueEntityId()}
-     *
-     * @return A unique entity ID
-     */
-    public static int getUniqueEntityId()
-    {
-        return EntityRegistry.findGlobalUniqueEntityId();
-    }
-
-    @Deprecated
-    @SideOnly(CLIENT)
-    public static int getUniqueSpriteIndex(String path)
-    {
-        return -1;
-    }
-
-    /**
-     * To properly implement packet 250 protocol you should always check your
-     * channel is active prior to sending the packet
-     *
-     * @param player
-     * @param channel
-     * @return If the channel is registered to the current connection.
-     */
-    public static boolean isChannelActive(EntityPlayer player, String channel)
-    {
-        return NetworkRegistry.instance().isChannelActive(channel, (Player)player);
-    }
-
-    @SideOnly(CLIENT)
-    public static boolean isGUIOpen(Class<? extends GuiScreen> gui)
-    {
-        return FMLClientHandler.instance().isGUIOpen(gui);
-    }
-
-    /**
-     * Is the named mod loaded?
-     * {@link Loader#isModLoaded(String)}
-     *
-     * @param modname
-     * @return If the specified mod is loaded
-     */
-    public static boolean isModLoaded(String modname)
-    {
-        return Loader.isModLoaded(modname);
-    }
-
-    /**
-     * Implemented elsewhere
-     */
-    @Deprecated
-    public static void loadConfig()
-    {
-    }
-
-//    @SideOnly(CLIENT)
-//    public static BufferedImage loadImage(RenderEngine renderEngine, String path) throws Exception
-//    {
-//        return TextureFXManager.instance().loadImageFromTexturePack(renderEngine, path);
-//    }
-
-    /**
-     * Call in from elsewhere. Unimplemented here.
-     * @param player
-     * @param item
-     */
-    @Deprecated
-    public static void onItemPickup(EntityPlayer player, ItemStack item)
-    {
-    }
-    /**
-     * Call in from elsewhere. Unimplemented here.
-     */
-    @Deprecated
-    @SideOnly(CLIENT)
-    public static void onTick(float tick, Minecraft game)
-    {
-    }
-
-    @SideOnly(CLIENT)
-    public static void openGUI(EntityPlayer player, GuiScreen gui)
-    {
-        FMLClientHandler.instance().displayGuiScreen(player, gui);
-    }
-
-    @Deprecated
-    public static void populateChunk(IChunkProvider generator, int chunkX, int chunkZ, World world)
-    {
-    }
-
-    /**
-     * This method is a call in hook from modified external code. Implemented elsewhere.
-     *
-     * @param packet
-     */
-    @Deprecated
-    public static void receivePacket(Packet250CustomPayload packet)
-    {
-    }
-
-    @Deprecated
-    @SideOnly(CLIENT)
-    public static KeyBinding[] registerAllKeys(KeyBinding[] keys)
-    {
-        return keys;
-    }
-
-//    @Deprecated
-//    @SideOnly(CLIENT)
-//    public static void registerAllTextureOverrides(RenderEngine cache)
-//    {
-//    }
-
-    /**
-     * Register a new block
-     *
-     * @param block
-     */
-    public static void registerBlock(Block block)
-    {
-        GameRegistry.registerBlock(block);
-    }
-
-    /**
-     * Register a new block
-     *
-     * @param block
-     * @param itemclass
-     */
-    public static void registerBlock(Block block, Class<? extends ItemBlock> itemclass)
-    {
-        GameRegistry.registerBlock(block, itemclass);
-    }
-
-    public static void registerContainerID(BaseMod mod, int id)
-    {
-        ModLoaderHelper.buildGuiHelper(mod, id);
-    }
-    /**
-     * Register a new entity ID
-     *
-     * @param entityClass
-     * @param entityName
-     * @param id
-     */
-    public static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id)
-    {
-        EntityRegistry.registerGlobalEntityID(entityClass, entityName, id);
-    }
-
-    /**
-     * Register a new entity ID
-     *
-     * @param entityClass
-     * @param entityName
-     * @param id
-     * @param background
-     * @param foreground
-     */
-    public static void registerEntityID(Class<? extends Entity> entityClass, String entityName, int id, int background, int foreground)
-    {
-        EntityRegistry.registerGlobalEntityID(entityClass, entityName, id, background, foreground);
-    }
-
-    @SideOnly(CLIENT)
-    public static void registerKey(BaseMod mod, KeyBinding keyHandler, boolean allowRepeat)
-    {
-        ModLoaderClientHelper.registerKeyBinding(mod, keyHandler, allowRepeat);
-    }
-
-    /**
-     * Register the mod for packets on this channel.
-     * {@link NetworkRegistry#registerChannel(IPacketHandler, String)}
-     *
-     * @param mod
-     * @param channel
-     */
-    public static void registerPacketChannel(BaseMod mod, String channel)
-    {
-        NetworkRegistry.instance().registerChannel(ModLoaderHelper.buildPacketHandlerFor(mod), channel);
-    }
-
-    /**
-     * Register a new tile entity class
-     *
-     * @param tileEntityClass
-     * @param id
-     */
-    public static void registerTileEntity(Class<? extends TileEntity> tileEntityClass, String id)
-    {
-        GameRegistry.registerTileEntity(tileEntityClass, id);
-    }
-
-    @SideOnly(CLIENT)
-    public static void registerTileEntity(Class<? extends TileEntity> tileEntityClass, String id, TileEntitySpecialRenderer renderer)
-    {
-        ClientRegistry.registerTileEntity(tileEntityClass, id, renderer);
-    }
-
-    /**
-     * Remove a biome from the list of generated biomes
-     *
-     * @param biome
-     */
-    public static void removeBiome(BiomeGenBase biome)
-    {
-        GameRegistry.removeBiome(biome);
-    }
-
-    /**
-     * Remove a spawn
-     *
-     * @param entityClass
-     * @param spawnList
-     */
-    public static void removeSpawn(Class<? extends EntityLiving> entityClass, EnumCreatureType spawnList)
-    {
-        EntityRegistry.removeSpawn(entityClass, spawnList, WorldType.base12Biomes);
-    }
-
-    /**
-     * Remove a spawn
-     *
-     * @param entityClass
-     * @param spawnList
-     * @param biomes
-     */
-    public static void removeSpawn(Class<? extends EntityLiving> entityClass, EnumCreatureType spawnList, BiomeGenBase... biomes)
-    {
-        EntityRegistry.removeSpawn(entityClass, spawnList, biomes);
-    }
-
-    /**
-     * Remove a spawn
-     *
-     * @param entityName
-     * @param spawnList
-     */
-    public static void removeSpawn(String entityName, EnumCreatureType spawnList)
-    {
-        EntityRegistry.removeSpawn(entityName, spawnList, WorldType.base12Biomes);
-    }
-
-    /**
-     * Remove a spawn
-     *
-     * @param entityName
-     * @param spawnList
-     * @param biomes
-     */
-    public static void removeSpawn(String entityName, EnumCreatureType spawnList, BiomeGenBase... biomes)
-    {
-        EntityRegistry.removeSpawn(entityName, spawnList, biomes);
-    }
-
-    @Deprecated
-    @SideOnly(CLIENT)
-    public static boolean renderBlockIsItemFull3D(int modelID)
-    {
-        return RenderingRegistry.instance().renderItemAsFull3DBlock(modelID);
-    }
-
-    @Deprecated
-    @SideOnly(CLIENT)
-    public static void renderInvBlock(RenderBlocks renderer, Block block, int metadata, int modelID)
-    {
-        RenderingRegistry.instance().renderInventoryBlock(renderer, block, metadata, modelID);
-    }
-
-    @Deprecated
-    @SideOnly(CLIENT)
-    public static boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID)
-    {
-        return RenderingRegistry.instance().renderWorldBlock(renderer, world, x, y, z, block, modelID);
-    }
-
-    /**
-     * Configuration is handled elsewhere
-     * {@link ModLoaderModContainer}
-     */
-    @Deprecated
-    public static void saveConfig()
-    {
-    }
-
-    /**
-     * Send a packet from client to server
-     *
-     * @param packet
-     */
-    public static void sendPacket(Packet packet) {
-        PacketDispatcher.sendPacketToServer(packet);
-    }
-    /**
-     * Send a chat message to the server
-     *
-     * @param text
-     */
-    @Deprecated
-    public static void serverChat(String text)
-    {
-    }
-
-    @Deprecated
-    @SideOnly(CLIENT)
-    public static void serverLogin(NetClientHandler handler, Packet1Login loginPacket)
-    {
-    }
-
-    public static void serverSendPacket(NetServerHandler handler, Packet packet)
-    {
-        if (handler != null)
-        {
-            PacketDispatcher.sendPacketToPlayer(packet, (Player)handler.getPlayer());
-        }
-    }
-    public static void serverOpenWindow(EntityPlayerMP player, Container container, int ID, int x, int y, int z)
-    {
-        ModLoaderHelper.openGui(ID, player, container, x, y, z);
-    }
-
-    /**
-     * Indicate that you want to receive ticks
-     *
-     * @param mod receiving the events
-     * @param enable indicates whether you want to recieve them or not
-     * @param useClock don't receive render subticks, just world ticks
-     */
-    public static void setInGameHook(BaseMod mod, boolean enable, boolean useClock)
-    {
-        ModLoaderHelper.updateStandardTicks(mod, enable, useClock);
-    }
-
-
-    public static void setInGUIHook(BaseMod mod, boolean enable, boolean useClock)
-    {
-        ModLoaderHelper.updateGUITicks(mod, enable, useClock);
-    }
-
-    /**
-     * Set a private field to a value using reflection
-     * {@link ObfuscationReflectionHelper#setPrivateValue(Class, Object, int, Object)}
-     *
-     * @param instanceclass
-     * @param instance
-     * @param fieldindex
-     * @param value
-     */
-    public static <T, E> void setPrivateValue(Class<? super T> instanceclass, T instance, int fieldindex, E value)
-    {
-        ObfuscationReflectionHelper.setPrivateValue(instanceclass, instance, value, fieldindex);
-    }
-
-    /**
-     * Set a private field to a value using reflection
-     * {@link ObfuscationReflectionHelper#setPrivateValue(Class, Object, String, Object)}
-     *
-     * @param instanceclass
-     * @param instance
-     * @param field
-     * @param value
-     */
-    public static <T, E> void setPrivateValue(Class<? super T> instanceclass, T instance, String field, E value)
-    {
-        ObfuscationReflectionHelper.setPrivateValue(instanceclass, instance, value, field);
-    }
-
-    /**
-     * This method is a call in hook from modified external code. Implemented elsewhere.
-     *
-     * @param player
-     * @param item
-     * @param matrix
-     */
-    @Deprecated
-    public static void takenFromCrafting(EntityPlayer player, ItemStack item, IInventory matrix)
-    {
-    }
-
-    /**
-     * This method is a call in hook from modified external code. Implemented elsewhere.
-     *
-     * @param player
-     * @param item
-     */
-    @Deprecated
-    public static void takenFromFurnace(EntityPlayer player, ItemStack item)
-    {
-    }
-
-    /**
-     * Throw the offered exception. Likely will stop the game.
-     *
-     * @param message
-     * @param e
-     */
-    public static void throwException(String message, Throwable e)
-    {
-        FMLCommonHandler.instance().raiseException(e, message, true);
-    }
-
-    public static void throwException(Throwable e)
-    {
-        throwException("Exception in ModLoader", e);
-    }
-}

client/net/minecraft/src/TradeEntry.java

@@ -1,42 +0,0 @@
-/*
- * 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;
-
-/**
- * Compatibility class for ModLoader -- do not use
- *
- * @author cpw
- *
- */
-public class TradeEntry
-{
-    public final int id;
-    public float chance;
-    public boolean buying;
-    public int min = 0;
-    public int max = 0;
-
-    public TradeEntry(int id, float chance, boolean buying, int min, int max)
-    {
-        this.id = id;
-        this.chance = chance;
-        this.buying = buying;
-        this.min = min;
-        this.max = max;
-    }
-
-    public TradeEntry(int id, float chance, boolean buying)
-    {
-        this(id, chance, buying, 0, 0);
-    }
-}

commands.patch

@@ -1,87 +0,0 @@
---- commands.py
-+++ commands.py
-@@ -139,6 +139,8 @@
-             fieldnames = csvreader.fieldnames
-     return set(fieldnames)
- 
-+def commands_sanity_check():
-+    print '    Commands patch applied successfully'
- 
- class Commands(object):
-     """Contains the commands and initialisation for a full mcp run"""
-@@ -943,6 +945,8 @@
-         binlk = {CLIENT: self.binclient, SERVER: self.binserver}
-         testlk = {CLIENT: self.testclient, SERVER: self.testserver}
- 
-+        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
-@@ -1274,6 +1278,9 @@
-         pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver}
-         pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
-         pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
-+        
-+        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])
-@@ -1331,7 +1338,7 @@
-             raise
- 
-     def startserver(self):
--        classpath = [self.binserver] + self.cpathserver
-+        classpath = [self.binclient, self.srcclient] + self.cpathserver
-         classpath = [os.path.join('..', p) for p in classpath]
-         classpath = os.pathsep.join(classpath)
-         os.chdir(self.dirjars)
-@@ -1339,7 +1346,7 @@
-         self.runmc(forkcmd)
- 
-     def startclient(self):
--        classpath = [self.binclient] + self.cpathclient
-+        classpath = [self.binclient, self.srcclient] + self.cpathclient
-         classpath = [os.path.join('..', p) for p in classpath]
-         classpath = os.pathsep.join(classpath)
-         natives = os.path.join('..', self.dirnatives)
-@@ -1696,7 +1703,7 @@
-         self.runcmd(forkcmd)
-         return True
- 
--    def gathermd5s(self, side, reobf=False):
-+    def gathermd5s(self, side, reobf=False, skip_fml=False):
-         if not reobf:
-             md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
-         else:
-@@ -1711,6 +1718,9 @@
-                     class_path = ''
-                 else:
-                     class_path += '/'
-+                if skip_fml:
-+                    if class_path.startswith('cpw/'):
-+                        continue
-                 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))
-@@ -1883,6 +1893,9 @@
-                 sys.exit(1)
- 
-         for entry in newfiles:
-+            if 'commands.py' in entry[0]: #FML, Disable updating of Commands.py
-+                print 'Update to runtime/commands.py found, but disbled due to using fml'
-+                continue
-             if entry[3] == 'U':
-                 self.logger.info('Retrieving file from server : %s', entry[0])
-                 cur_file = os.path.normpath(entry[0])
-@@ -1903,6 +1916,9 @@
-         md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
-         outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
-         src = {CLIENT: self.srcclient, SERVER: self.srcserver}
-+        
-+        if side == SERVER: #Noop out server side stuff
-+            return
- 
-         # HINT: We need a table for the old md5 and the new ones
-         md5table = {}

common/cpw/mods/fml/common/IFMLSidedHandler.java

@@ -1,65 +0,0 @@
-/*
- * 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 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
-{
-    List<String> getAdditionalBrandingInformation();
-
-    Side getSide();
-
-    void haltGame(String message, Throwable exception);
-
-    void showGuiScreen(Object clientGuiElement);
-
-    Entity spawnEntityIntoClientWorld(EntityRegistration registration, EntitySpawnPacket packet);
-
-    void adjustEntityLocationOnClient(EntitySpawnAdjustmentPacket entitySpawnAdjustmentPacket);
-
-    void beginServerLoading(MinecraftServer server);
-
-    void finishServerLoading();
-
-    MinecraftServer getServer();
-
-    void sendPacket(Packet packet);
-
-    void displayMissingMods(ModMissingPacket modMissingPacket);
-
-    void handleTinyPacket(NetHandler handler, Packet131MapData mapData);
-
-    void setClientCompatibilityLevel(byte compatibilityLevel);
-
-    byte getClientCompatibilityLevel();
-
-    boolean shouldServerShouldBeKilledQuietly();
-
-    void disconnectIDMismatch(MapDifference<Integer, ItemData> s, NetHandler toKill, INetworkManager mgr);
-}

common/cpw/mods/fml/common/ModMetadata.java

@@ -1,162 +0,0 @@
-/*
- * 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 static argo.jdom.JsonNodeBuilders.aStringBuilder;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-
-import argo.jdom.JsonNode;
-import argo.jdom.JsonStringNode;
-
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.base.Objects;
-import com.google.common.base.Optional;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-import cpw.mods.fml.common.functions.ModNameFunction;
-import cpw.mods.fml.common.versioning.ArtifactVersion;
-import cpw.mods.fml.common.versioning.VersionParser;
-
-/**
- * @author cpw
- *
- */
-public class ModMetadata
-{
-    private static final class JsonStringConverter implements Function<JsonNode, Object>
-    {
-        public Object apply(JsonNode arg0)
-        {
-            if (arg0.hasElements())
-            {
-                return Lists.transform(arg0.getElements(), new JsonArrayConverter());
-            }
-            else
-            {
-                return arg0.getText();
-            }
-        }
-    }
-
-    private static final class JsonArrayConverter implements Function<JsonNode, String>
-    {
-        public String apply(JsonNode arg0)
-        {
-            return arg0.getText();
-        }
-    }
-
-    public String modId;
-    public String name;
-    public String description;
-
-    public String url = "";
-    public String updateUrl = "";
-
-    public String logoFile = "";
-    public String version = "";
-    public List<String> authorList = Lists.newArrayList();
-    public String credits = "";
-    public String parent = "";
-    public String[] screenshots;
-
-    public ModContainer parentMod;
-    public List<ModContainer> childMods = Lists.newArrayList();
-
-    public boolean useDependencyInformation;
-    public Set<ArtifactVersion> requiredMods;
-    public List<ArtifactVersion> dependencies;
-    public List<ArtifactVersion> dependants;
-    public boolean autogenerated;
-
-    public ModMetadata(JsonNode node)
-    {
-        Map<JsonStringNode, Object> processedFields = Maps.transformValues(node.getFields(), new JsonStringConverter());
-        modId = (String)processedFields.get(aStringBuilder("modid"));
-        if (Strings.isNullOrEmpty(modId))
-        {
-            FMLLog.log(Level.SEVERE, "Found an invalid mod metadata file - missing modid");
-            throw new LoaderException();
-        }
-        name = Strings.nullToEmpty((String)processedFields.get(aStringBuilder("name")));
-        description = Strings.nullToEmpty((String)processedFields.get(aStringBuilder("description")));
-        url = Strings.nullToEmpty((String)processedFields.get(aStringBuilder("url")));
-        updateUrl = Strings.nullToEmpty((String)processedFields.get(aStringBuilder("updateUrl")));
-        logoFile = Strings.nullToEmpty((String)processedFields.get(aStringBuilder("logoFile")));
-        version = Strings.nullToEmpty((String)processedFields.get(aStringBuilder("version")));
-        credits = Strings.nullToEmpty((String)processedFields.get(aStringBuilder("credits")));
-        parent =  Strings.nullToEmpty((String)processedFields.get(aStringBuilder("parent")));
-        authorList = Objects.firstNonNull(((List<String>)processedFields.get(aStringBuilder("authors"))),Objects.firstNonNull(((List<String>)processedFields.get(aStringBuilder("authorList"))), authorList));
-        requiredMods = processReferences(processedFields.get(aStringBuilder("requiredMods")), HashSet.class);
-        dependencies = processReferences(processedFields.get(aStringBuilder("dependencies")), ArrayList.class);
-        dependants = processReferences(processedFields.get(aStringBuilder("dependants")), ArrayList.class);
-        useDependencyInformation = Boolean.parseBoolean(Strings.nullToEmpty((String)processedFields.get(aStringBuilder("useDependencyInformation"))));
-    }
-
-    public ModMetadata()
-    {
-    }
-
-    private <T extends Collection<ArtifactVersion>> T processReferences(Object refs, Class<? extends T> retType)
-    {
-        T res = null;
-        try
-        {
-            res = retType.newInstance();
-        }
-        catch (Exception e)
-        {
-            // unpossible
-        }
-
-        if (refs == null)
-        {
-            return res;
-        }
-        for (String ref : ((List<String>)refs))
-        {
-            res.add(VersionParser.parseVersionReference(ref));
-        }
-        return res;
-    }
-
-    public String getChildModCountString()
-    {
-        return String.format("%d child mod%s", childMods.size(), childMods.size() != 1 ? "s" : "");
-    }
-
-    public String getAuthorList()
-    {
-        return Joiner.on(", ").join(authorList);
-    }
-
-    public String getChildModList()
-    {
-        return Joiner.on(", ").join(Lists.transform(childMods, new ModNameFunction()));
-    }
-
-    public String printableSortingRules()
-    {
-        return "";
-    }
-}

common/cpw/mods/fml/common/asm/ASMTransformer.java

@@ -1,44 +0,0 @@
-/*
- * 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;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.ClassNode;
-
-import cpw.mods.fml.common.registry.BlockProxy;
-
-public class ASMTransformer implements IClassTransformer
-{
-    @Override
-    public byte[] transform(String name,String transformedName, byte[] bytes)
-    {
-        if ("net.minecraft.src.Block".equals(name))
-        {
-            ClassReader cr = new ClassReader(bytes);
-            ClassNode cn = new ClassNode(Opcodes.ASM4);
-            cr.accept(cn, ClassReader.EXPAND_FRAMES);
-            cn.interfaces.add(Type.getInternalName(BlockProxy.class));
-            ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
-            cn.accept(cw);
-            return cw.toByteArray();
-        }
-
-        return bytes;
-    }
-
-}

common/cpw/mods/fml/common/asm/FMLSanityChecker.java

@@ -1,151 +0,0 @@
-/*
- * 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.InputStreamReader;
-import java.io.ObjectInputStream.GetField;
-import java.io.StringReader;
-import java.net.JarURLConnection;
-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 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 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;
-
-public class FMLSanityChecker implements IFMLCallHook
-{
-    private static final String FMLFINGERPRINT = "AE:F6:54:79:96:E9:1B:D1:59:70:6C:B4:6B:F5:4A:89:C5:CE:08:1D".toLowerCase().replace(":","");
-    private static final String FORGEFINGERPRINT = "DE:4C:F8:A3:F3:BC:15:63:58:10:04:4C:39:24:0B:F9:68:04:EA:7D".toLowerCase().replace(":", "");
-    static class MLDetectorClassVisitor extends ClassVisitor
-    {
-        private boolean foundMarker = false;
-        private MLDetectorClassVisitor()
-        {
-            super(Opcodes.ASM4);
-        }
-
-        @Override
-        public FieldVisitor visitField(int arg0, String arg1, String arg2, String arg3, Object arg4)
-        {
-            if ("fmlMarker".equals(arg1))
-            {
-                foundMarker = true;
-            }
-            return null;
-        }
-    }
-
-    private LaunchClassLoader cl;
-
-    @Override
-    public Void call() throws Exception
-    {
-        CodeSource codeSource = getClass().getProtectionDomain().getCodeSource();
-        boolean goodFML = false;
-        if (codeSource.getLocation().getProtocol().equals("jar"))
-        {
-            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;
-        }
-        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)
-        {
-            return null;
-        }
-        MLDetectorClassVisitor mlTester = new MLDetectorClassVisitor();
-        ClassReader cr = new ClassReader(mlClass);
-        cr.accept(mlTester, ClassReader.SKIP_CODE);
-        if (!mlTester.foundMarker)
-        {
-            JOptionPane.showMessageDialog(null, "<html>CRITICAL ERROR<br/>" +
-            		"ModLoader was detected in this environment<br/>" +
-                        "ForgeModLoader cannot be installed alongside ModLoader<br/>" +
-                        "All mods should work without ModLoader being installed<br/>" +
-                        "Because ForgeModLoader is 100% compatible with ModLoader<br/>" +
-                        "Re-install Minecraft Forge or Forge ModLoader into a clean<br/>" +
-                        "jar and try again.",
-                        "ForgeModLoader critical error",
-                        JOptionPane.ERROR_MESSAGE);
-            throw new RuntimeException("Invalid ModLoader class detected");
-        }
-        return null;
-    }
-
-    @Override
-    public void injectData(Map<String, Object> data)
-    {
-        cl = (LaunchClassLoader) data.get("classLoader");
-        File mcDir = (File)data.get("mcLocation");
-        FMLDeobfuscatingRemapper.INSTANCE.setup(mcDir, cl, (String) data.get("deobfuscationFileName"));
-        File binpatches = new File(mcDir,"binpatch");
-        ClassPatchManager.INSTANCE.setup(FMLLaunchHandler.side());
-    }
-
-}

common/cpw/mods/fml/common/asm/transformers/MCPMerger.java

@@ -1,662 +0,0 @@
-/*
- * 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;
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
-
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.AnnotationNode;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.FieldNode;
-import org.objectweb.asm.tree.MethodNode;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class MCPMerger
-{
-    private static Hashtable<String, ClassInfo> clients = new Hashtable<String, ClassInfo>();
-    private static Hashtable<String, ClassInfo> shared  = new Hashtable<String, ClassInfo>();
-    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)
-    {
-        if (args.length != 3)
-        {
-            System.out.println("Usage: MCPMerger <MapFile> <minecraft.jar> <minecraft_server.jar>");
-            System.exit(1);
-        }
-
-        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] + ".backup_merge");
-        File server_jar_tmp = new File(args[2] + ".backup_merge");
-
-        if (client_jar_tmp.exists() && !client_jar_tmp.delete())
-        {
-            System.out.println("Could not delete temp file: " + client_jar_tmp);
-        }
-
-        if (server_jar_tmp.exists() && !server_jar_tmp.delete())
-        {
-            System.out.println("Could not delete temp file: " + server_jar_tmp);
-        }
-
-        if (!client_jar.exists())
-        {
-            System.out.println("Could not find minecraft.jar: " + client_jar);
-            System.exit(1);
-        }
-
-        if (!server_jar.exists())
-        {
-            System.out.println("Could not find minecraft_server.jar: " + server_jar);
-            System.exit(1);
-        }
-
-        if (!client_jar.renameTo(client_jar_tmp))
-        {
-            System.out.println("Could not rename file: " + client_jar + " -> " + client_jar_tmp);
-            System.exit(1);
-        }
-
-        if (!server_jar.renameTo(server_jar_tmp))
-        {
-            System.out.println("Could not rename file: " + server_jar + " -> " + server_jar_tmp);
-            System.exit(1);
-        }
-
-        if (!readMapFile(map_file))
-        {
-            System.out.println("Could not read map file: " + map_file);
-            System.exit(1);
-        }
-
-        try
-        {
-            processJar(client_jar_tmp, server_jar_tmp, client_jar, server_jar);
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-            System.exit(1);
-        }
-
-        if (!client_jar_tmp.delete())
-        {
-            System.out.println("Could not delete temp file: " + client_jar_tmp);
-        }
-
-        if (!server_jar_tmp.delete())
-        {
-            System.out.println("Could not delete temp file: " + server_jar_tmp);
-        }
-    }
-
-    private static boolean readMapFile(File mapFile)
-    {
-        try
-        {
-            FileInputStream fstream = new FileInputStream(mapFile);
-            DataInputStream in = new DataInputStream(fstream);
-            BufferedReader br = new BufferedReader(new InputStreamReader(in));
-
-            String line;
-            while ((line = br.readLine()) != null)
-            {
-                line = line.split("#")[0];
-                char cmd = line.charAt(0);
-                line = line.substring(1).trim();
-
-                switch (cmd)
-                {
-                    case '!': dontAnnotate.add(line); break;
-                    case '<': copyToClient.add(line); break;
-                    case '>': copyToServer.add(line); break;
-                    case '^': dontProcess.add(line);  break;
-                }
-            }
-
-            in.close();
-            return true;
-        }
-        catch (Exception e)
-        {
-            System.err.println("Error: " + e.getMessage());
-            return false;
-        }
-    }
-
-    public static void processJar(File clientInFile, File serverInFile, File clientOutFile, File serverOutFile) throws IOException
-    {
-        ZipFile cInJar = null;
-        ZipFile sInJar = null;
-        ZipOutputStream cOutJar = null;
-        ZipOutputStream sOutJar = null;
-
-        try
-        {
-            try
-            {
-                cInJar = new ZipFile(clientInFile);
-                sInJar = new ZipFile(serverInFile);
-            }
-            catch (FileNotFoundException e)
-            {
-                throw new FileNotFoundException("Could not open input file: " + e.getMessage());
-            }
-            try
-            {
-                cOutJar = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(clientOutFile)));
-                sOutJar = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(serverOutFile)));
-            }
-            catch (FileNotFoundException e)
-            {
-                throw new FileNotFoundException("Could not open output file: " + e.getMessage());
-            }
-            Hashtable<String, ZipEntry> cClasses = getClassEntries(cInJar, cOutJar);
-            Hashtable<String, ZipEntry> sClasses = getClassEntries(sInJar, sOutJar);
-            HashSet<String> cAdded = new HashSet<String>();
-            HashSet<String> sAdded = new HashSet<String>();
-
-            for (Entry<String, ZipEntry> entry : cClasses.entrySet())
-            {
-                String name = entry.getKey();
-                ZipEntry cEntry = entry.getValue();
-                ZipEntry sEntry = sClasses.get(name);
-
-                if (sEntry == null)
-                {
-                    if (!copyToServer.contains(name))
-                    {
-                        copyClass(cInJar, cEntry, cOutJar, null, true);
-                        cAdded.add(name);
-                    }
-                    else
-                    {
-                        if (DEBUG)
-                        {
-                            System.out.println("Copy class c->s : " + name);
-                        }
-                        copyClass(cInJar, cEntry, cOutJar, sOutJar, true);
-                        cAdded.add(name);
-                        sAdded.add(name);
-                    }
-                    continue;
-                }
-
-                sClasses.remove(name);
-                ClassInfo info = new ClassInfo(name);
-                shared.put(name, info);
-
-                byte[] cData = readEntry(cInJar, entry.getValue());
-                byte[] sData = readEntry(sInJar, sEntry);
-                byte[] data = processClass(cData, sData, info);
-
-                ZipEntry newEntry = new ZipEntry(cEntry.getName());
-                cOutJar.putNextEntry(newEntry);
-                cOutJar.write(data);
-                sOutJar.putNextEntry(newEntry);
-                sOutJar.write(data);
-                cAdded.add(name);
-                sAdded.add(name);
-            }
-
-            for (Entry<String, ZipEntry> entry : sClasses.entrySet())
-            {
-                if (DEBUG)
-                {
-                    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()})
-            {
-                String eName = name.replace(".", "/");
-                byte[] data = getClassBytes(name);
-                ZipEntry newEntry = new ZipEntry(name.replace(".", "/").concat(".class"));
-                if (!cAdded.contains(eName))
-                {
-                    cOutJar.putNextEntry(newEntry);
-                    cOutJar.write(data);
-                }
-                if (!sAdded.contains(eName))
-                {
-                    sOutJar.putNextEntry(newEntry);
-                    sOutJar.write(data);
-                }
-            }
-
-        }
-        finally
-        {
-            if (cInJar != null)
-            {
-                try { cInJar.close(); } catch (IOException e){}
-            }
-
-            if (sInJar != null)
-            {
-                try { sInJar.close(); } catch (IOException e) {}
-            }
-            if (cOutJar != null)
-            {
-                try { cOutJar.close(); } catch (IOException e){}
-            }
-
-            if (sOutJar != null)
-            {
-                try { sOutJar.close(); } catch (IOException e) {}
-            }
-        }
-    }
-
-    private static void copyClass(ZipFile inJar, ZipEntry entry, ZipOutputStream outJar, ZipOutputStream outJar2, boolean isClientOnly) throws IOException
-    {
-        ClassReader reader = new ClassReader(readEntry(inJar, entry));
-        ClassNode classNode = new ClassNode();
-
-        reader.accept(classNode, 0);
-
-        if (!dontAnnotate.contains(classNode.name))
-        {
-            if (classNode.visibleAnnotations == null) classNode.visibleAnnotations = new ArrayList<AnnotationNode>();
-            classNode.visibleAnnotations.add(getSideAnn(isClientOnly));
-        }
-
-        ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-        classNode.accept(writer);
-        byte[] data = writer.toByteArray();
-
-        ZipEntry newEntry = new ZipEntry(entry.getName());
-        if (outJar != null)
-        {
-            outJar.putNextEntry(newEntry);
-            outJar.write(data);
-        }
-        if (outJar2 != null)
-        {
-            outJar2.putNextEntry(newEntry);
-            outJar2.write(data);
-        }
-    }
-
-    private static AnnotationNode getSideAnn(boolean isClientOnly)
-    {
-        AnnotationNode ann = new AnnotationNode(Type.getDescriptor(SideOnly.class));
-        ann.values = new ArrayList<Object>();
-        ann.values.add("value");
-        ann.values.add(new String[]{ Type.getDescriptor(Side.class), (isClientOnly ? "CLIENT" : "SERVER")});
-        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()))
-        {
-            if (entry.isDirectory())
-            {
-                outFile.putNextEntry(entry);
-                continue;
-            }
-
-            String entryName = entry.getName();
-
-            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);
-                outFile.write(readEntry(inFile, entry));
-            }
-            else
-            {
-                ret.put(entryName.replace(".class", ""), entry);
-            }
-        }
-        return ret;
-    }
-    private static byte[] readEntry(ZipFile inFile, ZipEntry entry) throws IOException
-    {
-        return readFully(inFile.getInputStream(entry));
-    }
-    private static byte[] readFully(InputStream stream) throws IOException
-    {
-        byte[] data = new byte[4096];
-        ByteArrayOutputStream entryBuffer = new ByteArrayOutputStream();
-        int len;
-        do
-        {
-            len = stream.read(data);
-            if (len > 0)
-            {
-                entryBuffer.write(data, 0, len);
-            }
-        } while (len != -1);
-
-        return entryBuffer.toByteArray();
-    }
-    private static class ClassInfo
-    {
-        public String name;
-        public ArrayList<FieldNode> cField = new ArrayList<FieldNode>();
-        public ArrayList<FieldNode> sField = new ArrayList<FieldNode>();
-        public ArrayList<MethodNode> cMethods = new ArrayList<MethodNode>();
-        public ArrayList<MethodNode> sMethods = new ArrayList<MethodNode>();
-        public ClassInfo(String name){ this.name = name; }
-        public boolean isSame() { return (cField.size() == 0 && sField.size() == 0 && cMethods.size() == 0 && sMethods.size() == 0); }
-    }
-
-    public static byte[] processClass(byte[] cIn, byte[] sIn, ClassInfo info)
-    {
-        ClassNode cClassNode = getClassNode(cIn);
-        ClassNode sClassNode = getClassNode(sIn);
-
-        processFields(cClassNode, sClassNode, info);
-        processMethods(cClassNode, sClassNode, info);
-
-        ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-        cClassNode.accept(writer);
-        return writer.toByteArray();
-    }
-
-    private static ClassNode getClassNode(byte[] data)
-    {
-        ClassReader reader = new ClassReader(data);
-        ClassNode classNode = new ClassNode();
-        reader.accept(classNode, 0);
-        return classNode;
-    }
-
-    @SuppressWarnings("unchecked")
-    private static void processFields(ClassNode cClass, ClassNode sClass, ClassInfo info)
-    {
-        List<FieldNode> cFields = cClass.fields;
-        List<FieldNode> sFields = sClass.fields;
-
-        int sI = 0;
-        for (int x = 0; x < cFields.size(); x++)
-        {
-            FieldNode cF = cFields.get(x);
-            if (sI < sFields.size())
-            {
-                if (!cF.name.equals(sFields.get(sI).name))
-                {
-                    boolean serverHas = false;
-                    for (int y = sI + 1; y < sFields.size(); y++)
-                    {
-                        if (cF.name.equals(sFields.get(y).name))
-                        {
-                            serverHas = true;
-                            break;
-                        }
-                    }
-                    if (serverHas)
-                    {
-                        boolean clientHas = false;
-                        FieldNode sF = sFields.get(sI);
-                        for (int y = x + 1; y < cFields.size(); y++)
-                        {
-                            if (sF.name.equals(cFields.get(y).name))
-                            {
-                                clientHas = true;
-                                break;
-                            }
-                        }
-                        if (!clientHas)
-                        {
-                            if  (sF.visibleAnnotations == null) sF.visibleAnnotations = new ArrayList<AnnotationNode>();
-                            sF.visibleAnnotations.add(getSideAnn(false));
-                            cFields.add(x++, sF);
-                            info.sField.add(sF);
-                        }
-                    }
-                    else
-                    {
-                        if  (cF.visibleAnnotations == null) cF.visibleAnnotations = new ArrayList<AnnotationNode>();
-                        cF.visibleAnnotations.add(getSideAnn(true));
-                        sFields.add(sI, cF);
-                        info.cField.add(cF);
-                    }
-                }
-            }
-            else
-            {
-                if  (cF.visibleAnnotations == null) cF.visibleAnnotations = new ArrayList<AnnotationNode>();
-                cF.visibleAnnotations.add(getSideAnn(true));
-                sFields.add(sI, cF);
-                info.cField.add(cF);
-            }
-            sI++;
-        }
-        if (sFields.size() != cFields.size())
-        {
-            for (int x = cFields.size(); x < sFields.size(); x++)
-            {
-                FieldNode sF = sFields.get(x);
-                if  (sF.visibleAnnotations == null) sF.visibleAnnotations = new ArrayList<AnnotationNode>();
-                sF.visibleAnnotations.add(getSideAnn(true));
-                cFields.add(x++, sF);
-                info.sField.add(sF);
-            }
-        }
-    }
-
-    private static class MethodWrapper
-    {
-        private MethodNode node;
-        public boolean client;
-        public boolean server;
-        public MethodWrapper(MethodNode node)
-        {
-            this.node = node;
-        }
-        @Override
-        public boolean equals(Object obj)
-        {
-            if (obj == null || !(obj instanceof MethodWrapper)) return false;
-            MethodWrapper mw = (MethodWrapper) obj;
-            boolean eq = Objects.equal(node.name, mw.node.name) && Objects.equal(node.desc, mw.node.desc);
-            if (eq)
-            {
-                mw.client = this.client | mw.client;
-                mw.server = this.server | mw.server;
-                this.client = this.client | mw.client;
-                this.server = this.server | mw.server;
-                if (DEBUG)
-                {
-                    System.out.printf(" eq: %s %s\n", this, mw);
-                }
-            }
-            return eq;
-        }
-
-        @Override
-        public int hashCode()
-        {
-            return Objects.hashCode(node.name, node.desc);
-        }
-        @Override
-        public String toString()
-        {
-            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;
-        List<MethodNode> sMethods = (List<MethodNode>)sClass.methods;
-        LinkedHashSet<MethodWrapper> allMethods = Sets.newLinkedHashSet();
-
-        int cPos = 0;
-        int sPos = 0;
-        int cLen = cMethods.size();
-        int sLen = sMethods.size();
-        String clientName = "";
-        String lastName = clientName;
-        String serverName = "";
-        while (cPos < cLen || sPos < sLen)
-        {
-            do
-            {
-                if (sPos>=sLen)
-                {
-                    break;
-                }
-                MethodNode sM = sMethods.get(sPos);
-                serverName = sM.name;
-                if (!serverName.equals(lastName) && cPos != cLen)
-                {
-                    if (DEBUG)
-                    {
-                        System.out.printf("Server -skip : %s %s %d (%s %d) %d [%s]\n", sClass.name, clientName, cLen - cPos, serverName, sLen - sPos, allMethods.size(), lastName);
-                    }
-                    break;
-                }
-                MethodWrapper mw = new MethodWrapper(sM);
-                mw.server = true;
-                allMethods.add(mw);
-                if (DEBUG)
-                {
-                    System.out.printf("Server *add* : %s %s %d (%s %d) %d [%s]\n", sClass.name, clientName, cLen - cPos, serverName, sLen - sPos, allMethods.size(), lastName);
-                }
-                sPos++;
-            }
-            while (sPos < sLen);
-            do
-            {
-                if (cPos>=cLen)
-                {
-                    break;
-                }
-                MethodNode cM = cMethods.get(cPos);
-                lastName = clientName;
-                clientName = cM.name;
-                if (!clientName.equals(lastName) && sPos != sLen)
-                {
-                    if (DEBUG)
-                    {
-                        System.out.printf("Client -skip : %s %s %d (%s %d) %d [%s]\n", cClass.name, clientName, cLen - cPos, serverName, sLen - sPos, allMethods.size(), lastName);
-                    }
-                    break;
-                }
-                MethodWrapper mw = new MethodWrapper(cM);
-                mw.client = true;
-                allMethods.add(mw);
-                if (DEBUG)
-                {
-                    System.out.printf("Client *add* : %s %s %d (%s %d) %d [%s]\n", cClass.name, clientName, cLen - cPos, serverName, sLen - sPos, allMethods.size(), lastName);
-                }
-                cPos++;
-            }
-            while (cPos < cLen);
-        }
-
-        cMethods.clear();
-        sMethods.clear();
-
-        for (MethodWrapper mw : allMethods)
-        {
-            if (DEBUG)
-            {
-                System.out.println(mw);
-            }
-            cMethods.add(mw.node);
-            sMethods.add(mw.node);
-            if (mw.server && mw.client)
-            {
-                // no op
-            }
-            else
-            {
-                if (mw.node.visibleAnnotations == null) mw.node.visibleAnnotations = Lists.newArrayListWithExpectedSize(1);
-                mw.node.visibleAnnotations.add(getSideAnn(mw.client));
-                if (mw.client)
-                {
-                    info.sMethods.add(mw.node);
-                }
-                else
-                {
-                    info.cMethods.add(mw.node);
-                }
-            }
-        }
-    }
-
-    public static byte[] getClassBytes(String name) throws IOException
-    {
-        InputStream classStream = null;
-        try
-        {
-            classStream = MCPMerger.class.getResourceAsStream("/" + name.replace('.', '/').concat(".class"));
-            return readFully(classStream);
-        }
-        finally
-        {
-            if (classStream != null)
-            {
-                try
-                {
-                    classStream.close();
-                }
-                catch (IOException e){}
-            }
-        }
-    }
-}

common/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java

@@ -1,73 +0,0 @@
-/*
- * 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.asm;
-
-import java.util.LinkedList;
-
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-import com.google.common.collect.Lists;
-
-public class ModMethodVisitor extends MethodVisitor
-{
-
-    private ASMModParser discoverer;
-    private boolean inCode;
-    private LinkedList<Label> labels = Lists.newLinkedList();
-    private String foundProperties;
-    private boolean validProperties;
-
-    public ModMethodVisitor(String name, ASMModParser discoverer)
-    {
-        super(Opcodes.ASM4);
-        this.discoverer = discoverer;
-    }
-    @Override
-    public void visitCode()
-    {
-        labels.clear();
-    }
-    
-    @Override
-    public void visitLdcInsn(Object cst)
-    {
-        if (cst instanceof String && labels.size() == 1)
-        {
-            foundProperties = (String) cst;
-        }
-    }
-    @Override
-    public void visitInsn(int opcode)
-    {
-        if (Opcodes.ARETURN == opcode && labels.size() == 1 && foundProperties != null)
-        {
-            validProperties = true;
-        }
-    }
-    @Override
-    public void visitLabel(Label label)
-    {
-        labels.push(label);
-    }
-    
-    @Override
-    public void visitEnd()
-    {
-        if (validProperties)
-        {
-            discoverer.setBaseModProperties(foundProperties);
-        }
-    }
-}

common/cpw/mods/fml/common/launcher/FMLTweaker.java

@@ -1,99 +0,0 @@
-package cpw.mods.fml.common.launcher;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.google.common.base.Throwables;
-import com.google.common.collect.ObjectArrays;
-
-import cpw.mods.fml.relauncher.FMLLaunchHandler;
-
-import net.minecraft.launchwrapper.ITweaker;
-import net.minecraft.launchwrapper.LaunchClassLoader;
-
-public class FMLTweaker implements ITweaker {
-    private List<String> args;
-    private File gameDir;
-    private File assetsDir;
-    private String profile;
-    private static URI jarLocation;
-    private String[] array;
-
-    @Override
-    public void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile)
-    {
-        this.args = args;
-        this.gameDir = (gameDir == null ? new File(".") : gameDir);
-        this.assetsDir = assetsDir;
-        this.profile = profile;
-        try
-        {
-            jarLocation = getClass().getProtectionDomain().getCodeSource().getLocation().toURI();
-        }
-        catch (URISyntaxException e)
-        {
-            Logger.getLogger("FMLTWEAK").log(Level.SEVERE, "Missing URI information for FML tweak");
-            throw Throwables.propagate(e);
-        }
-    }
-
-    @Override
-    public void injectIntoClassLoader(LaunchClassLoader classLoader)
-    {
-        classLoader.addTransformerExclusion("cpw.mods.fml.repackage.");
-        classLoader.addTransformerExclusion("cpw.mods.fml.relauncher.");
-        classLoader.addTransformerExclusion("cpw.mods.fml.common.asm.transformers.");
-        classLoader.addClassLoaderExclusion("LZMA.");
-        FMLLaunchHandler.configureForClientLaunch(classLoader, this);
-    }
-
-    @Override
-    public String getLaunchTarget()
-    {
-        return "net.minecraft.client.main.Main";
-    }
-
-    @Override
-    public String[] getLaunchArguments()
-    {
-        String[] array = args.toArray(new String[args.size()]);
-
-        if (gameDir != null)
-        {
-            array = ObjectArrays.concat(gameDir.getAbsolutePath(),array);
-            array = ObjectArrays.concat("--gameDir",array);
-        }
-
-        if (assetsDir != null)
-        {
-            array = ObjectArrays.concat(assetsDir.getAbsolutePath(),array);
-            array = ObjectArrays.concat("--assetsDir",array);
-        }
-        if (profile != null)
-        {
-            array = ObjectArrays.concat(profile,array);
-            array = ObjectArrays.concat("--version",array);
-        }
-        else
-        {
-            array = ObjectArrays.concat("UnknownFMLProfile",array);
-            array = ObjectArrays.concat("--version",array);
-        }
-        return array;
-    }
-
-    public File getGameDir()
-    {
-        return gameDir;
-    }
-
-    public static URI getJarLocation()
-    {
-        return jarLocation;
-    }
-
-}

common/cpw/mods/fml/common/modloader/BaseModProxy.java

@@ -1,74 +0,0 @@
-/*
- * 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.modloader;
-
-import java.util.Random;
-
-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.world.World;
-
-import cpw.mods.fml.common.TickType;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-/**
- *
- * Marker interface for BaseMod
- *
- * @author cpw
- *
- */
-public interface BaseModProxy
-{
-    void modsLoaded();
-
-    void load();
-
-    String getName();
-
-    String getPriorities();
-
-    String getVersion();
-
-    boolean doTickInGUI(TickType type, boolean end, Object... tickData);
-    boolean doTickInGame(TickType type, boolean end, Object... tickData);
-    void generateSurface(World w, Random random, int i, int j);
-    void generateNether(World w, Random random, int i, int j);
-    int addFuel(int itemId, int damage);
-    void takenFromCrafting(EntityPlayer player, ItemStack item, IInventory craftMatrix);
-    void takenFromFurnace(EntityPlayer player, ItemStack item);
-
-    public abstract void onClientLogout(INetworkManager manager);
-
-    public abstract void onClientLogin(EntityPlayer player);
-
-    public abstract void serverDisconnect();
-
-    public abstract void serverConnect(NetHandler handler);
-
-    public abstract void receiveCustomPacket(Packet250CustomPayload packet);
-
-    public abstract void clientChat(String text);
-
-    public abstract void onItemPickup(EntityPlayer player, ItemStack item);
-
-    public abstract void serverCustomPayload(NetServerHandler handler, Packet250CustomPayload packet);
-
-    public abstract void serverChat(NetServerHandler source, String message);
-}

common/cpw/mods/fml/common/modloader/BaseModTicker.java

@@ -1,127 +0,0 @@
-/*
- * 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.modloader;
-
-import java.util.EnumSet;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.ITickHandler;
-import cpw.mods.fml.common.TickType;
-
-/**
- * @author cpw
- *
- */
-public class BaseModTicker implements ITickHandler
-{
-
-    private BaseModProxy mod;
-    private EnumSet<TickType> ticks;
-    private boolean clockTickTrigger;
-    private boolean sendGuiTicks;
-
-
-    BaseModTicker(BaseModProxy mod, boolean guiTicker)
-    {
-        this.mod = mod;
-        this.ticks = EnumSet.of(TickType.WORLDLOAD);
-        this.sendGuiTicks = guiTicker;
-    }
-
-    BaseModTicker(EnumSet<TickType> ticks, boolean guiTicker)
-    {
-        this.ticks = ticks;
-        this.sendGuiTicks = guiTicker;
-    }
-
-    @Override
-    public void tickStart(EnumSet<TickType> types, Object... tickData)
-    {
-        tickBaseMod(types, false, tickData);
-    }
-
-    @Override
-    public void tickEnd(EnumSet<TickType> types, Object... tickData)
-    {
-        tickBaseMod(types, true, tickData);
-    }
-
-    private void tickBaseMod(EnumSet<TickType> types, boolean end, Object... tickData)
-    {
-        if (FMLCommonHandler.instance().getSide().isClient() && ( ticks.contains(TickType.CLIENT) || ticks.contains(TickType.WORLDLOAD)))
-        {
-            EnumSet cTypes=EnumSet.copyOf(types);
-            if ( ( end && types.contains(TickType.CLIENT)) || types.contains(TickType.WORLDLOAD))
-            {
-                clockTickTrigger =  true;
-                cTypes.remove(TickType.CLIENT);
-                cTypes.remove(TickType.WORLDLOAD);
-            }
-
-            if (end && clockTickTrigger && types.contains(TickType.RENDER))
-            {
-                clockTickTrigger = false;
-                cTypes.remove(TickType.RENDER);
-                cTypes.add(TickType.CLIENT);
-            }
-
-            sendTick(cTypes, end, tickData);
-        }
-        else
-        {
-            sendTick(types, end, tickData);
-        }
-    }
-
-    private void sendTick(EnumSet<TickType> types, boolean end, Object... tickData)
-    {
-        for (TickType type : types)
-        {
-            if (!ticks.contains(type))
-            {
-                continue;
-            }
-
-            boolean keepTicking=true;
-            if (sendGuiTicks)
-            {
-                keepTicking = mod.doTickInGUI(type, end, tickData);
-            }
-            else
-            {
-                keepTicking = mod.doTickInGame(type, end, tickData);
-            }
-            if (!keepTicking) {
-                ticks.remove(type);
-                ticks.removeAll(type.partnerTicks());
-            }
-        }
-    }
-
-    @Override
-    public EnumSet<TickType> ticks()
-    {
-        return (clockTickTrigger ? EnumSet.of(TickType.RENDER) : ticks);
-    }
-
-    @Override
-    public String getLabel()
-    {
-        return mod.getClass().getSimpleName();
-    }
-
-    public void setMod(BaseModProxy mod)
-    {
-        this.mod = mod;
-    }
-}

common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java

@@ -1,38 +0,0 @@
-/*
- * 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.modloader;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.NetHandler;
-import net.minecraft.network.packet.Packet250CustomPayload;
-import cpw.mods.fml.common.network.EntitySpawnPacket;
-import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
-
-public interface IModLoaderSidedHelper
-{
-
-    void finishModLoading(ModLoaderModContainer mc);
-
-    Object getClientGui(BaseModProxy mod, EntityPlayer player, int iD, int x, int y, int z);
-
-    Entity spawnEntity(BaseModProxy mod, EntitySpawnPacket input, EntityRegistration registration);
-
-    void sendClientPacket(BaseModProxy mod, Packet250CustomPayload packet);
-
-    void clientConnectionOpened(NetHandler netClientHandler, INetworkManager manager, BaseModProxy mod);
-
-    boolean clientConnectionClosed(INetworkManager manager, BaseModProxy mod);
-
-}

common/cpw/mods/fml/common/modloader/ModLoaderChatListener.java

@@ -1,43 +0,0 @@
-/*
- * 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.modloader;
-
-import net.minecraft.network.NetServerHandler;
-import net.minecraft.network.packet.*;
-import cpw.mods.fml.common.network.IChatListener;
-
-public class ModLoaderChatListener implements IChatListener
-{
-
-    private BaseModProxy mod;
-
-    public ModLoaderChatListener(BaseModProxy mod)
-    {
-        this.mod = mod;
-    }
-
-    @Override
-    public Packet3Chat serverChat(NetHandler handler, Packet3Chat message)
-    {
-        mod.serverChat((NetServerHandler)handler, message.field_73476_b);
-        return message;
-    }
-
-    @Override
-    public Packet3Chat clientChat(NetHandler handler, Packet3Chat message)
-    {
-        mod.clientChat(message.field_73476_b);
-        return message;
-    }
-
-}

common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java

@@ -1,73 +0,0 @@
-/*
- * 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.modloader;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.NetLoginHandler;
-import net.minecraft.network.packet.NetHandler;
-import net.minecraft.network.packet.Packet1Login;
-import net.minecraft.server.MinecraftServer;
-import cpw.mods.fml.common.network.IConnectionHandler;
-import cpw.mods.fml.common.network.Player;
-
-public class ModLoaderConnectionHandler implements IConnectionHandler
-{
-    private BaseModProxy mod;
-
-    public ModLoaderConnectionHandler(BaseModProxy mod)
-    {
-        this.mod = mod;
-    }
-
-    @Override
-    public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager)
-    {
-        mod.onClientLogin((EntityPlayer)player);
-    }
-
-    @Override
-    public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager)
-    {
-        return null;
-    }
-
-    @Override
-    public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager)
-    {
-        ModLoaderHelper.sidedHelper.clientConnectionOpened(netClientHandler, manager, mod);
-    }
-
-    @Override
-    public void connectionClosed(INetworkManager manager)
-    {
-        if (ModLoaderHelper.sidedHelper==null || !ModLoaderHelper.sidedHelper.clientConnectionClosed(manager, mod))
-        {
-            mod.serverDisconnect();
-            mod.onClientLogout(manager);
-        }
-    }
-
-    @Override
-    public void clientLoggedIn(NetHandler nh, INetworkManager manager, Packet1Login login)
-    {
-        mod.serverConnect(nh);
-    }
-
-    @Override
-    public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager)
-    {
-        ModLoaderHelper.sidedHelper.clientConnectionOpened(netClientHandler, manager, mod);
-    }
-
-}

common/cpw/mods/fml/common/modloader/ModLoaderCraftingHelper.java

@@ -1,42 +0,0 @@
-/*
- * 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.modloader;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-import cpw.mods.fml.common.ICraftingHandler;
-
-public class ModLoaderCraftingHelper implements ICraftingHandler
-{
-
-    private BaseModProxy mod;
-
-    public ModLoaderCraftingHelper(BaseModProxy mod)
-    {
-        this.mod = mod;
-    }
-
-    @Override
-    public void onCrafting(EntityPlayer player, ItemStack item, IInventory craftMatrix)
-    {
-        mod.takenFromCrafting(player, item, craftMatrix);
-    }
-
-    @Override
-    public void onSmelting(EntityPlayer player, ItemStack item)
-    {
-        mod.takenFromFurnace(player, item);
-    }
-
-}

common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java

@@ -1,43 +0,0 @@
-/*
- * 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.modloader;
-
-import java.util.concurrent.Callable;
-
-import net.minecraft.entity.Entity;
-
-import com.google.common.base.Function;
-
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.common.network.EntitySpawnPacket;
-import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
-
-public class ModLoaderEntitySpawnCallback implements Function<EntitySpawnPacket, Entity>
-{
-
-    private BaseModProxy mod;
-    private EntityRegistration registration;
-    private boolean isAnimal;
-
-    public ModLoaderEntitySpawnCallback(BaseModProxy mod, EntityRegistration er)
-    {
-        this.mod = mod;
-        this.registration = er;
-    }
-
-    @Override
-    public Entity apply(EntitySpawnPacket input)
-    {
-        return ModLoaderHelper.sidedHelper.spawnEntity(mod, input, registration);
-    }
-}

common/cpw/mods/fml/common/modloader/ModLoaderFuelHelper.java

@@ -1,34 +0,0 @@
-/*
- * 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.modloader;
-
-import net.minecraft.item.ItemStack;
-import cpw.mods.fml.common.IFuelHandler;
-
-public class ModLoaderFuelHelper implements IFuelHandler
-{
-
-    private BaseModProxy mod;
-
-    public ModLoaderFuelHelper(BaseModProxy mod)
-    {
-        this.mod = mod;
-    }
-
-    @Override
-    public int getBurnTime(ItemStack fuel)
-    {
-        return mod.addFuel(fuel.field_77993_c, fuel.field_77993_c);
-    }
-
-}

common/cpw/mods/fml/common/modloader/ModLoaderGuiHelper.java

@@ -1,67 +0,0 @@
-/*
- * 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.modloader;
-
-import java.util.Set;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.world.World;
-
-import com.google.common.collect.Sets;
-
-import cpw.mods.fml.common.network.IGuiHandler;
-
-public class ModLoaderGuiHelper implements IGuiHandler
-{
-
-    private BaseModProxy mod;
-    private Set<Integer> ids;
-    private Container container;
-    private int currentID;
-
-    ModLoaderGuiHelper(BaseModProxy mod)
-    {
-        this.mod = mod;
-        this.ids = Sets.newHashSet();
-    }
-
-    @Override
-    public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
-    {
-        return container;
-    }
-
-    @Override
-    public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
-    {
-        return ModLoaderHelper.getClientSideGui(mod, player, ID, x, y, z);
-    }
-
-    public void injectContainerAndID(Container container, int ID)
-    {
-        this.container = container;
-        this.currentID = ID;
-    }
-
-    public Object getMod()
-    {
-        return mod;
-    }
-
-    public void associateId(int additionalID)
-    {
-        this.ids.add(additionalID);
-    }
-
-}

common/cpw/mods/fml/common/modloader/ModLoaderHelper.java

@@ -1,224 +0,0 @@
-/*
- * 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.modloader;
-
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.Callable;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Maps;
-import com.google.common.collect.SetMultimap;
-
-import net.minecraft.command.ICommand;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.passive.IAnimals;
-import net.minecraft.entity.boss.EntityDragon;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.src.BaseMod;
-import net.minecraft.src.TradeEntry;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.ICraftingHandler;
-import cpw.mods.fml.common.IFuelHandler;
-import cpw.mods.fml.common.IPickupNotifier;
-import cpw.mods.fml.common.IWorldGenerator;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.TickType;
-import cpw.mods.fml.common.network.IChatListener;
-import cpw.mods.fml.common.network.IConnectionHandler;
-import cpw.mods.fml.common.network.IGuiHandler;
-import cpw.mods.fml.common.network.IPacketHandler;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
-import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
-import cpw.mods.fml.common.registry.VillagerRegistry;
-
-/**
- * @author cpw
- *
- */
-@SuppressWarnings("deprecation")
-public class ModLoaderHelper
-{
-    public static IModLoaderSidedHelper sidedHelper;
-
-    private static Map<BaseModProxy, ModLoaderGuiHelper> guiHelpers = Maps.newHashMap();
-    private static Map<Integer, ModLoaderGuiHelper> guiIDs = Maps.newHashMap();
-
-    public static void updateStandardTicks(BaseModProxy mod, boolean enable, boolean useClock)
-    {
-        ModLoaderModContainer mlmc = (ModLoaderModContainer) Loader.instance().getReversedModObjectList().get(mod);
-        if (mlmc==null)
-        {
-            mlmc = (ModLoaderModContainer) Loader.instance().activeModContainer();
-        }
-        if (mlmc == null)
-        {
-            FMLLog.severe("Attempted to register ModLoader ticking for invalid BaseMod %s",mod);
-            return;
-        }
-        BaseModTicker ticker = mlmc.getGameTickHandler();
-        EnumSet<TickType> ticks = ticker.ticks();
-        // If we're enabled we get render ticks
-        if (enable && !useClock) {
-            ticks.add(TickType.RENDER);
-        } else {
-            ticks.remove(TickType.RENDER);
-        }
-        // If we're enabled but we want clock ticks, or we're server side we get game ticks
-        if (enable && (useClock || FMLCommonHandler.instance().getSide().isServer())) {
-            ticks.add(TickType.CLIENT);
-            ticks.add(TickType.WORLDLOAD);
-        } else {
-            ticks.remove(TickType.CLIENT);
-            ticks.remove(TickType.WORLDLOAD);
-        }
-    }
-
-    public static void updateGUITicks(BaseModProxy mod, boolean enable, boolean useClock)
-    {
-        ModLoaderModContainer mlmc = (ModLoaderModContainer) Loader.instance().getReversedModObjectList().get(mod);
-        if (mlmc==null)
-        {
-            mlmc = (ModLoaderModContainer) Loader.instance().activeModContainer();
-        }
-        if (mlmc == null)
-        {
-            FMLLog.severe("Attempted to register ModLoader ticking for invalid BaseMod %s",mod);
-            return;
-        }
-        EnumSet<TickType> ticks = mlmc.getGUITickHandler().ticks();
-        // If we're enabled and we don't want clock ticks we get render ticks
-        if (enable && !useClock) {
-            ticks.add(TickType.RENDER);
-        } else {
-            ticks.remove(TickType.RENDER);
-        }
-        // If we're enabled but we want clock ticks, or we're server side we get world ticks
-        if (enable && useClock) {
-            ticks.add(TickType.CLIENT);
-            ticks.add(TickType.WORLDLOAD);
-        } else {
-            ticks.remove(TickType.CLIENT);
-            ticks.remove(TickType.WORLDLOAD);
-        }
-    }
-
-    public static IPacketHandler buildPacketHandlerFor(BaseModProxy mod)
-    {
-        return new ModLoaderPacketHandler(mod);
-    }
-
-    public static IWorldGenerator buildWorldGenHelper(BaseModProxy mod)
-    {
-        return new ModLoaderWorldGenerator(mod);
-    }
-
-    public static IFuelHandler buildFuelHelper(BaseModProxy mod)
-    {
-        return new ModLoaderFuelHelper(mod);
-    }
-
-    public static ICraftingHandler buildCraftingHelper(BaseModProxy mod)
-    {
-        return new ModLoaderCraftingHelper(mod);
-    }
-
-    public static void finishModLoading(ModLoaderModContainer mc)
-    {
-        if (sidedHelper != null)
-        {
-            sidedHelper.finishModLoading(mc);
-        }
-    }
-
-    public static IConnectionHandler buildConnectionHelper(BaseModProxy mod)
-    {
-        return new ModLoaderConnectionHandler(mod);
-    }
-
-    public static IPickupNotifier buildPickupHelper(BaseModProxy mod)
-    {
-        return new ModLoaderPickupNotifier(mod);
-    }
-
-    public static void buildGuiHelper(BaseModProxy mod, int id)
-    {
-        ModLoaderGuiHelper handler = guiHelpers.get(mod);
-        if (handler == null)
-        {
-            handler = new ModLoaderGuiHelper(mod);
-            guiHelpers.put(mod,handler);
-            NetworkRegistry.instance().registerGuiHandler(mod, handler);
-        }
-        handler.associateId(id);
-        guiIDs.put(id, handler);
-    }
-
-    public static void openGui(int id, EntityPlayer player, Container container, int x, int y, int z)
-    {
-        ModLoaderGuiHelper helper = guiIDs.get(id);
-        helper.injectContainerAndID(container, id);
-        player.openGui(helper.getMod(), id, player.field_70170_p, x, y, z);
-    }
-
-    public static Object getClientSideGui(BaseModProxy mod, EntityPlayer player, int ID, int x, int y, int z)
-    {
-        if (sidedHelper != null)
-        {
-            return sidedHelper.getClientGui(mod, player, ID, x, y, z);
-        }
-        return null;
-    }
-
-    public static void buildEntityTracker(BaseModProxy mod, Class<? extends Entity> entityClass, int entityTypeId, int updateRange, int updateInterval,
-            boolean sendVelocityInfo)
-    {
-        EntityRegistration er = EntityRegistry.registerModLoaderEntity(mod, entityClass, entityTypeId, updateRange, updateInterval, sendVelocityInfo);
-        er.setCustomSpawning(new ModLoaderEntitySpawnCallback(mod, er), EntityDragon.class.isAssignableFrom(entityClass) || IAnimals.class.isAssignableFrom(entityClass));
-    }
-
-    private static ModLoaderVillageTradeHandler[] tradeHelpers = new ModLoaderVillageTradeHandler[6];
-
-    public static void registerTrade(int profession, TradeEntry entry)
-    {
-        assert profession < tradeHelpers.length : "The profession is out of bounds";
-        if (tradeHelpers[profession] == null)
-        {
-            tradeHelpers[profession] = new ModLoaderVillageTradeHandler();
-            VillagerRegistry.instance().registerVillageTradeHandler(profession, tradeHelpers[profession]);
-        }
-
-        tradeHelpers[profession].addTrade(entry);
-    }
-
-    public static void addCommand(ICommand command)
-    {
-        ModLoaderModContainer mlmc = (ModLoaderModContainer) Loader.instance().activeModContainer();
-        if (mlmc!=null)
-        {
-            mlmc.addServerCommand(command);
-        }
-    }
-
-    public static IChatListener buildChatListener(BaseModProxy mod)
-    {
-        return new ModLoaderChatListener(mod);
-    }
-}

common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java

@@ -1,624 +0,0 @@
-/*
- * 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.modloader;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.security.cert.Certificate;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.logging.Level;
-
-import net.minecraft.command.ICommand;
-
-import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.ILanguageAdapter;
-import cpw.mods.fml.common.LoadController;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.LoaderException;
-import cpw.mods.fml.common.MetadataCollection;
-import cpw.mods.fml.common.ModClassLoader;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.common.ModMetadata;
-import cpw.mods.fml.common.ProxyInjector;
-import cpw.mods.fml.common.TickType;
-import cpw.mods.fml.common.discovery.ASMDataTable;
-import cpw.mods.fml.common.discovery.ASMDataTable.ASMData;
-import cpw.mods.fml.common.discovery.ContainerType;
-import cpw.mods.fml.common.event.FMLConstructionEvent;
-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.FMLServerStartingEvent;
-import cpw.mods.fml.common.network.FMLNetworkHandler;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.TickRegistry;
-import cpw.mods.fml.common.versioning.ArtifactVersion;
-import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
-import cpw.mods.fml.common.versioning.VersionRange;
-import cpw.mods.fml.relauncher.Side;
-
-public class ModLoaderModContainer implements ModContainer
-{
-    public BaseModProxy mod;
-    private File modSource;
-    public Set<ArtifactVersion> requirements = Sets.newHashSet();
-    public ArrayList<ArtifactVersion> dependencies = Lists.newArrayList();
-    public ArrayList<ArtifactVersion> dependants = Lists.newArrayList();
-    private ContainerType sourceType;
-    private ModMetadata metadata;
-    private ProxyInjector sidedProxy;
-    private BaseModTicker gameTickHandler;
-    private BaseModTicker guiTickHandler;
-    private String modClazzName;
-    private String modId;
-    private EventBus bus;
-    private LoadController controller;
-    private boolean enabled = true;
-    private String sortingProperties;
-    private ArtifactVersion processedVersion;
-    private boolean isNetworkMod;
-    private List<ICommand> serverCommands = Lists.newArrayList();
-
-    public ModLoaderModContainer(String className, File modSource, String sortingProperties)
-    {
-        this.modClazzName = className;
-        this.modSource = modSource;
-        this.modId = className.contains(".") ? className.substring(className.lastIndexOf('.')+1) : className;
-        this.sortingProperties = Strings.isNullOrEmpty(sortingProperties) ? "" : sortingProperties;
-    }
-
-    /**
-     * We only instantiate this for "not mod mods"
-     * @param instance
-     */
-    ModLoaderModContainer(BaseModProxy instance) {
-        this.mod=instance;
-        this.gameTickHandler = new BaseModTicker(instance, false);
-        this.guiTickHandler = new BaseModTicker(instance, true);
-    }
-
-    /**
-     *
-     */
-    private void configureMod(Class<? extends BaseModProxy> modClazz, ASMDataTable asmData)
-    {
-        File configDir = Loader.instance().getConfigDir();
-        File modConfig = new File(configDir, String.format("%s.cfg", getModId()));
-        Properties props = new Properties();
-
-        boolean existingConfigFound = false;
-        boolean mlPropFound = false;
-
-        if (modConfig.exists())
-        {
-            try
-            {
-                FMLLog.fine("Reading existing configuration file for %s : %s", getModId(), modConfig.getName());
-                FileReader configReader = new FileReader(modConfig);
-                props.load(configReader);
-                configReader.close();
-            }
-            catch (Exception e)
-            {
-                FMLLog.log(Level.SEVERE, e, "Error occured reading mod configuration file %s", modConfig.getName());
-                throw new LoaderException(e);
-            }
-            existingConfigFound = true;
-        }
-
-        StringBuffer comments = new StringBuffer();
-        comments.append("MLProperties: name (type:default) min:max -- information\n");
-
-
-        List<ModProperty> mlPropFields = Lists.newArrayList();
-        try
-        {
-            for (ASMData dat : Sets.union(asmData.getAnnotationsFor(this).get("net.minecraft.src.MLProp"), asmData.getAnnotationsFor(this).get("MLProp")))
-            {
-                if (dat.getClassName().equals(modClazzName))
-                {
-                    try
-                    {
-                        mlPropFields.add(new ModProperty(modClazz.getDeclaredField(dat.getObjectName()), dat.getAnnotationInfo()));
-                        FMLLog.finest("Found an MLProp field %s in %s", dat.getObjectName(), getModId());
-                    }
-                    catch (Exception e)
-                    {
-                        FMLLog.log(Level.WARNING, e, "An error occured trying to access field %s in mod %s", dat.getObjectName(), getModId());
-                    }
-                }
-            }
-            for (ModProperty property : mlPropFields)
-            {
-                if (!Modifier.isStatic(property.field().getModifiers()))
-                {
-                    FMLLog.info("The MLProp field %s in mod %s appears not to be static", property.field().getName(), getModId());
-                    continue;
-                }
-                FMLLog.finest("Considering MLProp field %s", property.field().getName());
-                Field f = property.field();
-                String propertyName = !Strings.nullToEmpty(property.name()).isEmpty() ? property.name() : f.getName();
-                String propertyValue = null;
-                Object defaultValue = null;
-
-                try
-                {
-                    defaultValue = f.get(null);
-                    propertyValue = props.getProperty(propertyName, extractValue(defaultValue));
-                    Object currentValue = parseValue(propertyValue, property, f.getType(), propertyName);
-                    FMLLog.finest("Configuration for %s.%s found values default: %s, configured: %s, interpreted: %s", modClazzName, propertyName, defaultValue, propertyValue, currentValue);
-
-                    if (currentValue != null && !currentValue.equals(defaultValue))
-                    {
-                        FMLLog.finest("Configuration for %s.%s value set to: %s", modClazzName, propertyName, currentValue);
-                        f.set(null, currentValue);
-                    }
-                }
-                catch (Exception e)
-                {
-                    FMLLog.log(Level.SEVERE, e, "Invalid configuration found for %s in %s", propertyName, modConfig.getName());
-                    throw new LoaderException(e);
-                }
-                finally
-                {
-                    comments.append(String.format("MLProp : %s (%s:%s", propertyName, f.getType().getName(), defaultValue));
-
-                    if (property.min() != Double.MIN_VALUE)
-                    {
-                        comments.append(",>=").append(String.format("%.1f", property.min()));
-                    }
-
-                    if (property.max() != Double.MAX_VALUE)
-                    {
-                        comments.append(",<=").append(String.format("%.1f", property.max()));
-                    }
-
-                    comments.append(")");
-
-                    if (!Strings.nullToEmpty(property.info()).isEmpty())
-                    {
-                        comments.append(" -- ").append(property.info());
-                    }
-
-                    if (propertyValue != null)
-                    {
-                        props.setProperty(propertyName, extractValue(propertyValue));
-                    }
-                    comments.append("\n");
-                }
-                mlPropFound = true;
-            }
-        }
-        finally
-        {
-            if (!mlPropFound && !existingConfigFound)
-            {
-                FMLLog.fine("No MLProp configuration for %s found or required. No file written", getModId());
-                return;
-            }
-
-            if (!mlPropFound && existingConfigFound)
-            {
-                File mlPropBackup = new File(modConfig.getParent(),modConfig.getName()+".bak");
-                FMLLog.fine("MLProp configuration file for %s found but not required. Attempting to rename file to %s", getModId(), mlPropBackup.getName());
-                boolean renamed = modConfig.renameTo(mlPropBackup);
-                if (renamed)
-                {
-                    FMLLog.fine("Unused MLProp configuration file for %s renamed successfully to %s", getModId(), mlPropBackup.getName());
-                }
-                else
-                {
-                    FMLLog.fine("Unused MLProp configuration file for %s renamed UNSUCCESSFULLY to %s", getModId(), mlPropBackup.getName());
-                }
-
-                return;
-            }
-            try
-            {
-                FileWriter configWriter = new FileWriter(modConfig);
-                props.store(configWriter, comments.toString());
-                configWriter.close();
-                FMLLog.fine("Configuration for %s written to %s", getModId(), modConfig.getName());
-            }
-            catch (IOException e)
-            {
-                FMLLog.log(Level.SEVERE, e, "Error trying to write the config file %s", modConfig.getName());
-                throw new LoaderException(e);
-            }
-        }
-    }
-
-    private Object parseValue(String val, ModProperty property, Class<?> type, String propertyName)
-    {
-        if (type.isAssignableFrom(String.class))
-        {
-            return (String)val;
-        }
-        else if (type.isAssignableFrom(Boolean.TYPE) || type.isAssignableFrom(Boolean.class))
-        {
-            return Boolean.parseBoolean(val);
-        }
-        else if (Number.class.isAssignableFrom(type) || type.isPrimitive())
-        {
-            Number n = null;
-
-            if (type.isAssignableFrom(Double.TYPE) || Double.class.isAssignableFrom(type))
-            {
-                n = Double.parseDouble(val);
-            }
-            else if (type.isAssignableFrom(Float.TYPE) || Float.class.isAssignableFrom(type))
-            {
-                n = Float.parseFloat(val);
-            }
-            else if (type.isAssignableFrom(Long.TYPE) || Long.class.isAssignableFrom(type))
-            {
-                n = Long.parseLong(val);
-            }
-            else if (type.isAssignableFrom(Integer.TYPE) || Integer.class.isAssignableFrom(type))
-            {
-                n = Integer.parseInt(val);
-            }
-            else if (type.isAssignableFrom(Short.TYPE) || Short.class.isAssignableFrom(type))
-            {
-                n = Short.parseShort(val);
-            }
-            else if (type.isAssignableFrom(Byte.TYPE) || Byte.class.isAssignableFrom(type))
-            {
-                n = Byte.parseByte(val);
-            }
-            else
-            {
-                throw new IllegalArgumentException(String.format("MLProp declared on %s of type %s, an unsupported type",propertyName, type.getName()));
-            }
-
-            double dVal = n.doubleValue();
-            if ((property.min()!=Double.MIN_VALUE && dVal < property.min()) || (property.max()!=Double.MAX_VALUE && dVal > property.max()))
-            {
-                FMLLog.warning("Configuration for %s.%s found value %s outside acceptable range %s,%s", modClazzName,propertyName, n, property.min(), property.max());
-                return null;
-            }
-            else
-            {
-                return n;
-            }
-        }
-
-        throw new IllegalArgumentException(String.format("MLProp declared on %s of type %s, an unsupported type",propertyName, type.getName()));
-    }
-    private String extractValue(Object value)
-    {
-        if (String.class.isInstance(value))
-        {
-            return (String)value;
-        }
-        else if (Number.class.isInstance(value) || Boolean.class.isInstance(value))
-        {
-            return String.valueOf(value);
-        }
-        else
-        {
-            throw new IllegalArgumentException("MLProp declared on non-standard type");
-        }
-    }
-
-    @Override
-    public String getName()
-    {
-        return mod != null ? mod.getName() : modId;
-    }
-
-    @Override
-    public String getSortingRules()
-    {
-        return sortingProperties;
-    }
-
-    @Override
-    public boolean matches(Object mod)
-    {
-        return this.mod == mod;
-    }
-
-    /**
-     * Find all the BaseMods in the system
-     * @param <A>
-     */
-    public static <A extends BaseModProxy> List<A> findAll(Class<A> clazz)
-    {
-        ArrayList<A> modList = new ArrayList<A>();
-
-        for (ModContainer mc : Loader.instance().getActiveModList())
-        {
-            if (mc instanceof ModLoaderModContainer && mc.getMod()!=null)
-            {
-                modList.add((A)((ModLoaderModContainer)mc).mod);
-            }
-        }
-
-        return modList;
-    }
-
-    @Override
-    public File getSource()
-    {
-        return modSource;
-    }
-
-    @Override
-    public Object getMod()
-    {
-        return mod;
-    }
-
-    @Override
-    public Set<ArtifactVersion> getRequirements()
-    {
-        return requirements;
-    }
-
-    @Override
-    public List<ArtifactVersion> getDependants()
-    {
-        return dependants;
-    }
-
-    @Override
-    public List<ArtifactVersion> getDependencies()
-    {
-        return dependencies;
-    }
-
-
-    public String toString()
-    {
-        return modId;
-    }
-
-    @Override
-    public ModMetadata getMetadata()
-    {
-        return metadata;
-    }
-
-    @Override
-    public String getVersion()
-    {
-        if (mod == null || mod.getVersion() == null)
-        {
-            return "Not available";
-        }
-        return mod.getVersion();
-    }
-
-    public BaseModTicker getGameTickHandler()
-    {
-        return this.gameTickHandler;
-    }
-
-    public BaseModTicker getGUITickHandler()
-    {
-        return this.guiTickHandler;
-    }
-
-    @Override
-    public String getModId()
-    {
-        return modId;
-    }
-
-    @Override
-    public void bindMetadata(MetadataCollection mc)
-    {
-        Map<String, Object> dummyMetadata = ImmutableMap.<String,Object>builder().put("name", modId).put("version", "1.0").build();
-        this.metadata = mc.getMetadataForId(modId, dummyMetadata);
-        Loader.instance().computeDependencies(sortingProperties, getRequirements(), getDependencies(), getDependants());
-    }
-
-    @Override
-    public void setEnabledState(boolean enabled)
-    {
-        this.enabled = enabled;
-    }
-
-    @Override
-    public boolean registerBus(EventBus bus, LoadController controller)
-    {
-        if (this.enabled)
-        {
-            FMLLog.fine("Enabling mod %s", getModId());
-            this.bus = bus;
-            this.controller = controller;
-            bus.register(this);
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    // Lifecycle mod events
-
-    @Subscribe
-    public void constructMod(FMLConstructionEvent event)
-    {
-        try
-        {
-            ModClassLoader modClassLoader = event.getModClassLoader();
-            modClassLoader.addFile(modSource);
-            EnumSet<TickType> ticks = EnumSet.noneOf(TickType.class);
-            this.gameTickHandler = new BaseModTicker(ticks, false);
-            this.guiTickHandler = new BaseModTicker(ticks.clone(), true);
-            Class<? extends BaseModProxy> modClazz = (Class<? extends BaseModProxy>) modClassLoader.loadBaseModClass(modClazzName);
-            configureMod(modClazz, event.getASMHarvestedData());
-            isNetworkMod = FMLNetworkHandler.instance().registerNetworkMod(this, modClazz, event.getASMHarvestedData());
-            ModLoaderNetworkHandler dummyHandler = null;
-            if (!isNetworkMod)
-            {
-                FMLLog.fine("Injecting dummy network mod handler for BaseMod %s", getModId());
-                dummyHandler = new ModLoaderNetworkHandler(this);
-                FMLNetworkHandler.instance().registerNetworkMod(dummyHandler);
-            }
-            Constructor<? extends BaseModProxy> ctor = modClazz.getConstructor();
-            ctor.setAccessible(true);
-            mod = modClazz.newInstance();
-            if (dummyHandler != null)
-            {
-                dummyHandler.setBaseMod(mod);
-            }
-            ProxyInjector.inject(this, event.getASMHarvestedData(), FMLCommonHandler.instance().getSide(), new ILanguageAdapter.JavaAdapter());
-        }
-        catch (Exception e)
-        {
-            controller.errorOccurred(this, e);
-            Throwables.propagateIfPossible(e);
-        }
-    }
-
-    @Subscribe
-    public void preInit(FMLPreInitializationEvent event)
-    {
-        try
-        {
-            this.gameTickHandler.setMod(mod);
-            this.guiTickHandler.setMod(mod);
-            TickRegistry.registerTickHandler(this.gameTickHandler, Side.CLIENT);
-            TickRegistry.registerTickHandler(this.guiTickHandler, Side.CLIENT);
-            GameRegistry.registerWorldGenerator(ModLoaderHelper.buildWorldGenHelper(mod));
-            GameRegistry.registerFuelHandler(ModLoaderHelper.buildFuelHelper(mod));
-            GameRegistry.registerCraftingHandler(ModLoaderHelper.buildCraftingHelper(mod));
-            GameRegistry.registerPickupHandler(ModLoaderHelper.buildPickupHelper(mod));
-            NetworkRegistry.instance().registerChatListener(ModLoaderHelper.buildChatListener(mod));
-            NetworkRegistry.instance().registerConnectionHandler(ModLoaderHelper.buildConnectionHelper(mod));
-        }
-        catch (Exception e)
-        {
-            controller.errorOccurred(this, e);
-            Throwables.propagateIfPossible(e);
-        }
-    }
-
-
-    @Subscribe
-    public void init(FMLInitializationEvent event)
-    {
-        try
-        {
-            mod.load();
-        }
-        catch (Throwable t)
-        {
-            controller.errorOccurred(this, t);
-            Throwables.propagateIfPossible(t);
-        }
-    }
-
-    @Subscribe
-    public void postInit(FMLPostInitializationEvent event)
-    {
-        try
-        {
-            mod.modsLoaded();
-        }
-        catch (Throwable t)
-        {
-            controller.errorOccurred(this, t);
-            Throwables.propagateIfPossible(t);
-        }
-    }
-
-    @Subscribe
-    public void loadComplete(FMLLoadCompleteEvent complete)
-    {
-        ModLoaderHelper.finishModLoading(this);
-    }
-
-    @Subscribe
-    public void serverStarting(FMLServerStartingEvent evt)
-    {
-        for (ICommand cmd : serverCommands)
-        {
-            evt.registerServerCommand(cmd);
-        }
-    }
-    @Override
-    public ArtifactVersion getProcessedVersion()
-    {
-        if (processedVersion == null)
-        {
-            processedVersion = new DefaultArtifactVersion(modId, getVersion());
-        }
-        return processedVersion;
-    }
-
-    @Override
-    public boolean isImmutable()
-    {
-        return false;
-    }
-
-    @Override
-    public boolean isNetworkMod()
-    {
-        return this.isNetworkMod;
-    }
-
-    @Override
-    public String getDisplayVersion()
-    {
-        return metadata!=null ? metadata.version : getVersion();
-    }
-
-    public void addServerCommand(ICommand command)
-    {
-        serverCommands .add(command);
-    }
-
-    @Override
-    public VersionRange acceptableMinecraftVersionRange()
-    {
-        return Loader.instance().getMinecraftModContainer().getStaticVersionRange();
-    }
-    @Override
-    public Certificate getSigningCertificate()
-    {
-        return null;
-    }
-
-    @Override
-    public Map<String, String> getCustomModProperties()
-    {
-        return EMPTY_PROPERTIES;
-    }
-}

common/cpw/mods/fml/common/modloader/ModLoaderNetworkHandler.java

@@ -1,56 +0,0 @@
-/*
- * 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.modloader;
-
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.common.discovery.ASMDataTable;
-import cpw.mods.fml.common.network.NetworkMod;
-import cpw.mods.fml.common.network.NetworkModHandler;
-
-public class ModLoaderNetworkHandler extends NetworkModHandler
-{
-
-    private BaseModProxy baseMod;
-    public ModLoaderNetworkHandler(ModLoaderModContainer mlmc)
-    {
-        super(mlmc, null);
-    }
-
-    public void setBaseMod(BaseModProxy baseMod)
-    {
-        this.baseMod = baseMod;
-    }
-
-    @Override
-    public boolean requiresClientSide()
-    {
-        return false;
-    }
-
-    @Override
-    public boolean requiresServerSide()
-    {
-        return false;
-    }
-
-    @Override
-    public boolean acceptVersion(String version)
-    {
-        return baseMod.getVersion().equals(version);
-    }
-    @Override
-    public boolean isNetworkMod()
-    {
-        return true;
-    }
-}

common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java

@@ -1,43 +0,0 @@
-/*
- * 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.modloader;
-
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
-import cpw.mods.fml.common.network.IPacketHandler;
-import cpw.mods.fml.common.network.Player;
-
-public class ModLoaderPacketHandler implements IPacketHandler
-{
-    private BaseModProxy mod;
-
-    public ModLoaderPacketHandler(BaseModProxy mod)
-    {
-        this.mod = mod;
-    }
-
-    @Override
-    public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player)
-    {
-        if (player instanceof EntityPlayerMP)
-        {
-            mod.serverCustomPayload(((EntityPlayerMP)player).field_71135_a, packet);
-        }
-        else
-        {
-            ModLoaderHelper.sidedHelper.sendClientPacket(mod, packet);
-        }
-    }
-
-}

common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java

@@ -1,35 +0,0 @@
-/*
- * 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.modloader;
-
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import cpw.mods.fml.common.IPickupNotifier;
-
-public class ModLoaderPickupNotifier implements IPickupNotifier
-{
-
-    private BaseModProxy mod;
-
-    public ModLoaderPickupNotifier(BaseModProxy mod)
-    {
-        this.mod = mod;
-    }
-
-    @Override
-    public void notifyPickup(EntityItem item, EntityPlayer player)
-    {
-        mod.onItemPickup(player, item.func_92059_d());
-    }
-
-}

common/cpw/mods/fml/common/modloader/ModLoaderVillageTradeHandler.java

@@ -1,51 +0,0 @@
-/*
- * 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.modloader;
-
-import java.util.List;
-import java.util.Random;
-
-import com.google.common.collect.Lists;
-
-import net.minecraft.entity.passive.EntityVillager;
-import net.minecraft.item.Item;
-import net.minecraft.src.TradeEntry;
-import net.minecraft.village.MerchantRecipeList;
-import cpw.mods.fml.common.registry.VillagerRegistry;
-import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
-
-public class ModLoaderVillageTradeHandler implements IVillageTradeHandler
-{
-    private List<TradeEntry> trades = Lists.newArrayList();
-
-    @Override
-    public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random)
-    {
-        for (TradeEntry ent : trades)
-        {
-            if (ent.buying)
-            {
-                VillagerRegistry.addEmeraldBuyRecipe(villager, recipeList, random, Item.field_77698_e[ent.id], ent.chance, ent.min, ent.max);
-            }
-            else
-            {
-                VillagerRegistry.addEmeraldSellRecipe(villager, recipeList, random, Item.field_77698_e[ent.id], ent.chance, ent.min, ent.max);
-            }
-        }
-    }
-
-    public void addTrade(TradeEntry entry)
-    {
-        trades.add(entry);
-    }
-}

common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java

@@ -1,45 +0,0 @@
-/*
- * 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.modloader;
-
-import java.util.Random;
-
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.IChunkProvider;
-import net.minecraft.world.gen.ChunkProviderGenerate;
-import net.minecraft.world.gen.ChunkProviderHell;
-
-import cpw.mods.fml.common.IWorldGenerator;
-
-public class ModLoaderWorldGenerator implements IWorldGenerator
-{
-    private BaseModProxy mod;
-
-    public ModLoaderWorldGenerator(BaseModProxy mod)
-    {
-        this.mod = mod;
-    }
-
-    @Override
-    public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider)
-    {
-        if (chunkGenerator instanceof ChunkProviderGenerate)
-        {
-            mod.generateSurface(world, random, chunkX << 4, chunkZ << 4);
-        }
-        else if (chunkGenerator instanceof ChunkProviderHell)
-        {
-            mod.generateNether(world, random, chunkX << 4, chunkZ << 4);
-        }
-    }
-}

common/cpw/mods/fml/common/modloader/ModProperty.java

@@ -1,67 +0,0 @@
-/*
- * 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.modloader;
-
-import java.lang.reflect.Field;
-import java.util.Map;
-
-/**
- * @author cpw
- *
- */
-public class ModProperty
-{
-    private String info;
-    private double min;
-    private double max;
-    private String name;
-    private Field field;
-
-    public ModProperty(Field f, String info, Double min, Double max, String name)
-    {
-        this.field = f;
-        this.info = info;
-        this.min = min != null ? min : Double.MIN_VALUE;
-        this.max = max != null ? max : Double.MAX_VALUE;
-        this.name = name;
-    }
-    public ModProperty(Field field, Map<String, Object> annotationInfo)
-    {
-        this(field, (String)annotationInfo.get("info"), (Double)annotationInfo.get("min"), (Double)annotationInfo.get("max"), (String)annotationInfo.get("name"));
-    }
-
-    public String name()
-    {
-        return name;
-    }
-
-    public double min()
-    {
-        return min;
-    }
-
-    public double max()
-    {
-        return max;
-    }
-
-    public String info()
-    {
-        return info;
-    }
-
-    public Field field()
-    {
-        return field;
-    }
-}

common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java

@@ -1,65 +0,0 @@
-/*
- * 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.network;
-
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.NetHandler;
-
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-
-public class EntitySpawnAdjustmentPacket extends FMLPacket
-{
-
-    public EntitySpawnAdjustmentPacket()
-    {
-        super(Type.ENTITYSPAWNADJUSTMENT);
-    }
-
-    public int entityId;
-    public int serverX;
-    public int serverY;
-    public int serverZ;
-
-    @Override
-    public byte[] generatePacket(Object... data)
-    {
-        ByteArrayDataOutput dat = ByteStreams.newDataOutput();
-        dat.writeInt((Integer) data[0]);
-        dat.writeInt((Integer) data[1]);
-        dat.writeInt((Integer) data[2]);
-        dat.writeInt((Integer) data[3]);
-        return dat.toByteArray();
-    }
-
-    @Override
-    public FMLPacket consumePacket(byte[] data)
-    {
-        ByteArrayDataInput dat = ByteStreams.newDataInput(data);
-        entityId = dat.readInt();
-        serverX = dat.readInt();
-        serverY = dat.readInt();
-        serverZ = dat.readInt();
-        return this;
-    }
-
-    @Override
-    public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
-    {
-        FMLCommonHandler.instance().adjustEntityLocationOnClient(this);
-    }
-
-}

common/cpw/mods/fml/common/network/EntitySpawnPacket.java

@@ -1,197 +0,0 @@
-/*
- * 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.network;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.logging.Level;
-
-import net.minecraft.entity.*;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.NetHandler;
-import net.minecraft.util.MathHelper;
-
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
-import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
-import cpw.mods.fml.common.registry.IThrowableEntity;
-
-public class EntitySpawnPacket extends FMLPacket
-{
-
-    public int networkId;
-    public int modEntityId;
-    public int entityId;
-    public double scaledX;
-    public double scaledY;
-    public double scaledZ;
-    public float scaledYaw;
-    public float scaledPitch;
-    public float scaledHeadYaw;
-    public List metadata;
-    public int throwerId;
-    public double speedScaledX;
-    public double speedScaledY;
-    public double speedScaledZ;
-    public ByteArrayDataInput dataStream;
-    public int rawX;
-    public int rawY;
-    public int rawZ;
-
-    public EntitySpawnPacket()
-    {
-        super(Type.ENTITYSPAWN);
-    }
-
-    @Override
-    public byte[] generatePacket(Object... data)
-    {
-        EntityRegistration er = (EntityRegistration) data[0];
-        Entity ent = (Entity) data[1];
-        NetworkModHandler handler = (NetworkModHandler) data[2];
-        ByteArrayDataOutput dat = ByteStreams.newDataOutput();
-
-        dat.writeInt(handler.getNetworkId());
-        dat.writeInt(er.getModEntityId());
-        // entity id
-        dat.writeInt(ent.field_70157_k);
-
-        // entity pos x,y,z
-        dat.writeInt(MathHelper.func_76128_c(ent.field_70165_t * 32D));
-        dat.writeInt(MathHelper.func_76128_c(ent.field_70163_u * 32D));
-        dat.writeInt(MathHelper.func_76128_c(ent.field_70161_v * 32D));
-
-        // yaw, pitch
-        dat.writeByte((byte) (ent.field_70177_z * 256.0F / 360.0F));
-        dat.writeByte((byte) (ent.field_70125_A * 256.0F / 360.0F));
-
-        // head yaw
-        if (ent instanceof EntityLiving)
-        {
-            dat.writeByte((byte) (((EntityLiving)ent).field_70759_as * 256.0F / 360.0F));
-        }
-        else
-        {
-            dat.writeByte(0);
-        }
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        DataOutputStream dos = new DataOutputStream(bos);
-        try
-        {
-            ent.func_70096_w().func_75689_a(dos);
-        }
-        catch (IOException e)
-        {
-            // unpossible
-        }
-
-        dat.write(bos.toByteArray());
-
-        if (ent instanceof IThrowableEntity)
-        {
-            Entity owner = ((IThrowableEntity)ent).getThrower();
-            dat.writeInt(owner == null ? ent.field_70157_k : owner.field_70157_k);
-            double maxVel = 3.9D;
-            double mX = ent.field_70159_w;
-            double mY = ent.field_70181_x;
-            double mZ = ent.field_70179_y;
-            if (mX < -maxVel) mX = -maxVel;
-            if (mY < -maxVel) mY = -maxVel;
-            if (mZ < -maxVel) mZ = -maxVel;
-            if (mX >  maxVel) mX =  maxVel;
-            if (mY >  maxVel) mY =  maxVel;
-            if (mZ >  maxVel) mZ =  maxVel;
-            dat.writeInt((int)(mX * 8000D));
-            dat.writeInt((int)(mY * 8000D));
-            dat.writeInt((int)(mZ * 8000D));
-        }
-        else
-        {
-            dat.writeInt(0);
-        }
-        if (ent instanceof IEntityAdditionalSpawnData)
-        {
-            ((IEntityAdditionalSpawnData)ent).writeSpawnData(dat);
-        }
-
-        return dat.toByteArray();
-    }
-
-    @Override
-    public FMLPacket consumePacket(byte[] data)
-    {
-        ByteArrayDataInput dat = ByteStreams.newDataInput(data);
-        networkId = dat.readInt();
-        modEntityId = dat.readInt();
-        entityId = dat.readInt();
-        rawX = dat.readInt();
-        rawY = dat.readInt();
-        rawZ = dat.readInt();
-        scaledX = rawX / 32D;
-        scaledY = rawY / 32D;
-        scaledZ = rawZ / 32D;
-        scaledYaw = dat.readByte() * 360F / 256F;
-        scaledPitch = dat.readByte() * 360F / 256F;
-        scaledHeadYaw = dat.readByte() * 360F / 256F;
-        ByteArrayInputStream bis = new ByteArrayInputStream(data, 27, data.length - 27);
-        DataInputStream dis = new DataInputStream(bis);
-        try
-        {
-            metadata = DataWatcher.func_75686_a(dis);
-        }
-        catch (IOException e)
-        {
-            // Nope
-        }
-        dat.skipBytes(data.length - bis.available() - 27);
-        throwerId = dat.readInt();
-        if (throwerId != 0)
-        {
-            speedScaledX = dat.readInt() / 8000D;
-            speedScaledY = dat.readInt() / 8000D;
-            speedScaledZ = dat.readInt() / 8000D;
-        }
-
-        this.dataStream = dat;
-        return this;
-    }
-
-    @Override
-    public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
-    {
-        NetworkModHandler nmh = handler.findNetworkModHandler(networkId);
-        ModContainer mc = nmh.getContainer();
-
-        EntityRegistration registration = EntityRegistry.instance().lookupModSpawn(mc, modEntityId);
-        if (registration == null || registration.getEntityClass() == null)
-        {
-            FMLLog.log(Level.WARNING, "Missing mod entity information for %s : %d", mc.getModId(), modEntityId);
-            return;
-        }
-
-
-        Entity entity = FMLCommonHandler.instance().spawnEntityIntoClientWorld(registration, this);
-    }
-
-}

common/cpw/mods/fml/common/network/FMLPacket.java

@@ -1,161 +0,0 @@
-/*
- * 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.network;
-
-import java.util.Arrays;
-import java.util.concurrent.ConcurrentMap;
-import java.util.logging.Level;
-
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.NetHandler;
-
-import com.google.common.base.Throwables;
-import com.google.common.collect.MapMaker;
-import com.google.common.primitives.Bytes;
-import com.google.common.primitives.Ints;
-import com.google.common.primitives.UnsignedBytes;
-
-import cpw.mods.fml.common.FMLLog;
-
-public abstract class FMLPacket
-{
-    enum Type
-    {
-        /**
-         * Opening salutation from the server to the client -> request all mods from the client
-         */
-        MOD_LIST_REQUEST(ModListRequestPacket.class, false),
-        /**
-         * The client responds with the list of mods and versions it has. This is verified by the server.
-         */
-        MOD_LIST_RESPONSE(ModListResponsePacket.class, false),
-        /**
-         * At which point the server tells the client the mod identifiers for this session.
-         */
-        MOD_IDENTIFIERS(ModIdentifiersPacket.class, false),
-        /**
-         * Or, if there is missing stuff, the server tells the client what's missing and drops the connection.
-         */
-        MOD_MISSING(ModMissingPacket.class, false),
-        /**
-         * Open a GUI on the client from the server
-         */
-        GUIOPEN(OpenGuiPacket.class, false),
-        /**
-         * Spawn an entity on the client from the server
-         */
-        ENTITYSPAWN(EntitySpawnPacket.class, false),
-        /**
-         * Fixes entity location data after spawning
-         */
-        ENTITYSPAWNADJUSTMENT(EntitySpawnAdjustmentPacket.class, false),
-        /**
-         * The ID map to send to the client
-         */
-        MOD_IDMAP(ModIdMapPacket.class, true);
-
-
-        private Class<? extends FMLPacket> packetType;
-        private boolean isMultipart;
-        private ConcurrentMap<INetworkManager, FMLPacket> partTracker;
-
-        private Type(Class<? extends FMLPacket> clazz, boolean isMultipart)
-        {
-            this.packetType = clazz;
-            this.isMultipart = isMultipart;
-        }
-
-        FMLPacket make()
-        {
-            try
-            {
-                return this.packetType.newInstance();
-            }
-            catch (Exception e)
-            {
-                Throwables.propagateIfPossible(e);
-                FMLLog.log(Level.SEVERE, e, "A bizarre critical error occured during packet encoding");
-                throw new FMLNetworkException(e);
-            }
-        }
-
-        public boolean isMultipart()
-        {
-            return isMultipart;
-        }
-
-        private FMLPacket findCurrentPart(INetworkManager network)
-        {
-            if (partTracker == null)
-            {
-                partTracker = new MapMaker().weakKeys().weakValues().makeMap();
-            }
-            if (!partTracker.containsKey(network))
-            {
-                partTracker.put(network, make());
-            }
-            return partTracker.get(network);
-        }
-    }
-
-    private Type type;
-
-    public static byte[][] makePacketSet(Type type, Object... data)
-    {
-        if (!type.isMultipart())
-        {
-            return new byte[0][];
-        }
-        byte[] packetData = type.make().generatePacket(data);
-
-        byte[][] chunks = new byte[packetData.length / 32000 + 1][];
-        for (int i = 0; i < packetData.length / 32000 + 1; i++)
-        {
-            int len = Math.min(32000, packetData.length - i* 32000);
-            chunks[i] = Bytes.concat(new byte[] { UnsignedBytes.checkedCast(type.ordinal()), UnsignedBytes.checkedCast(i), UnsignedBytes.checkedCast(chunks.length)}, Ints.toByteArray(len), Arrays.copyOfRange(packetData, i * 32000, len + i * 32000));
-        }
-        return chunks;
-    }
-    public static byte[] makePacket(Type type, Object... data)
-    {
-        byte[] packetData = type.make().generatePacket(data);
-        return Bytes.concat(new byte[] { UnsignedBytes.checkedCast(type.ordinal()) }, packetData );
-    }
-
-    public static FMLPacket readPacket(INetworkManager network, byte[] payload)
-    {
-        int type = UnsignedBytes.toInt(payload[0]);
-        Type eType = Type.values()[type];
-        FMLPacket pkt;
-        if (eType.isMultipart())
-        {
-            pkt = eType.findCurrentPart(network);
-        }
-        else
-        {
-            pkt = eType.make();
-        }
-        return pkt.consumePacket(Arrays.copyOfRange(payload, 1, payload.length));
-    }
-
-    public FMLPacket(Type type)
-    {
-        this.type = type;
-    }
-
-    public abstract byte[] generatePacket(Object... data);
-
-    public abstract FMLPacket consumePacket(byte[] data);
-
-    public abstract void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName);
-}

common/cpw/mods/fml/common/network/IChatListener.java

@@ -1,33 +0,0 @@
-/*
- * 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.network;
-
-import net.minecraft.network.packet.*;
-
-public interface IChatListener
-{
-    /**
-     * Called when there is a chat message received on the server
-     * @param handler
-     * @param message
-     */
-    public Packet3Chat serverChat(NetHandler handler, Packet3Chat message);
-
-    /**
-     * Called when there is a chat message recived on the client
-     *
-     * @param handler
-     * @param message
-     */
-    public Packet3Chat clientChat(NetHandler handler, Packet3Chat message);
-}

common/cpw/mods/fml/common/network/IConnectionHandler.java

@@ -1,84 +0,0 @@
-/*
- * 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.network;
-
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.NetLoginHandler;
-import net.minecraft.network.packet.NetHandler;
-import net.minecraft.network.packet.Packet1Login;
-import net.minecraft.server.MinecraftServer;
-
-public interface IConnectionHandler
-{
-    /**
-     * Called when a player logs into the server
-     *  SERVER SIDE
-     *
-     * @param player
-     * @param netHandler
-     * @param manager
-     */
-    void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager);
-
-    /**
-     * If you don't want the connection to continue, return a non-empty string here
-     * If you do, you can do other stuff here- note no FML negotiation has occured yet
-     * though the client is verified as having FML installed
-     *
-     * SERVER SIDE
-     *
-     * @param netHandler
-     * @param manager
-     */
-    String connectionReceived(NetLoginHandler netHandler, INetworkManager manager);
-
-    /**
-     * Fired when a remote connection is opened
-     * CLIENT SIDE
-     *
-     * @param netClientHandler
-     * @param server
-     * @param port
-     */
-    void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager);
-    /**
-     *
-     * Fired when a local connection is opened
-     *
-     * CLIENT SIDE
-     *
-     * @param netClientHandler
-     * @param server
-     */
-    void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager);
-
-    /**
-     * Fired when a connection closes
-     *
-     * ALL SIDES
-     *
-     * @param manager
-     */
-    void connectionClosed(INetworkManager manager);
-
-    /**
-     * Fired when the client established the connection to the server
-     *
-     * CLIENT SIDE
-     * @param clientHandler
-     * @param manager
-     * @param login
-     */
-    void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login);
-
-}

common/cpw/mods/fml/common/network/IPacketHandler.java

@@ -1,27 +0,0 @@
-/*
- * 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.network;
-
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
-
-public interface IPacketHandler
-{
-    /**
-     * Recieve a packet from one of the registered channels for this packet handler
-     * @param manager The network manager this packet arrived from
-     * @param packet The packet itself
-     * @param player A dummy interface representing the player - it can be cast into a real player instance if needed
-     */
-    public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player);
-}

common/cpw/mods/fml/common/network/ITinyPacketHandler.java

@@ -1,20 +0,0 @@
-/*
- * 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.network;
-
-import net.minecraft.network.packet.*;
-
-public interface ITinyPacketHandler
-{
-    void handle(NetHandler handler, Packet131MapData mapData);
-}

common/cpw/mods/fml/common/network/ModIdMapPacket.java

@@ -1,110 +0,0 @@
-/*
- * 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.network;
-
-import java.io.IOException;
-import java.util.BitSet;
-import java.util.Set;
-import java.util.logging.Level;
-
-import net.minecraft.nbt.*;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.NetHandler;
-
-import com.google.common.collect.MapDifference;
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteStreams;
-import com.google.common.primitives.Bytes;
-import com.google.common.primitives.Ints;
-import com.google.common.primitives.UnsignedBytes;
-
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.registry.GameData;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.ItemData;
-import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_IDMAP;
-
-public class ModIdMapPacket extends FMLPacket {
-    private byte[][] partials;
-
-    public ModIdMapPacket()
-    {
-        super(MOD_IDMAP);
-    }
-
-    @Override
-    public byte[] generatePacket(Object... data)
-    {
-        NBTTagList completeList = (NBTTagList) data[0];
-        NBTTagCompound wrap = new NBTTagCompound();
-        wrap.func_74782_a("List", completeList);
-        try
-        {
-            return CompressedStreamTools.func_74798_a(wrap);
-        }
-        catch (Exception e)
-        {
-            FMLLog.log(Level.SEVERE, e, "A critical error writing the id map");
-            throw new FMLNetworkException(e);
-        }
-    }
-
-    @Override
-    public FMLPacket consumePacket(byte[] data)
-    {
-        ByteArrayDataInput bdi = ByteStreams.newDataInput(data);
-        int chunkIdx = UnsignedBytes.toInt(bdi.readByte());
-        int chunkTotal = UnsignedBytes.toInt(bdi.readByte());
-        int chunkLength = bdi.readInt();
-        if (partials == null)
-        {
-            partials = new byte[chunkTotal][];
-        }
-        partials[chunkIdx] = new byte[chunkLength];
-        bdi.readFully(partials[chunkIdx]);
-        for (int i = 0; i < partials.length; i++)
-        {
-            if (partials[i] == null)
-            {
-                return null;
-            }
-        }
-        return this;
-    }
-
-    @Override
-    public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
-    {
-        byte[] allData = Bytes.concat(partials);
-        GameData.initializeServerGate(1);
-        try
-        {
-            NBTTagCompound serverList = CompressedStreamTools.func_74792_a(allData);
-            NBTTagList list = serverList.func_74761_m("List");
-            Set<ItemData> itemData = GameData.buildWorldItemData(list);
-            GameData.validateWorldSave(itemData);
-            MapDifference<Integer, ItemData> serverDifference = GameData.gateWorldLoadingForValidation();
-            if (serverDifference!=null)
-            {
-                FMLCommonHandler.instance().disconnectIDMismatch(serverDifference, netHandler, network);
-
-            }
-        }
-        catch (IOException e)
-        {
-        }
-    }
-
-}

common/cpw/mods/fml/common/network/ModIdentifiersPacket.java

@@ -1,79 +0,0 @@
-/*
- * 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.network;
-
-import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_IDENTIFIERS;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.NetHandler;
-
-import com.google.common.collect.Maps;
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
-public class ModIdentifiersPacket extends FMLPacket
-{
-
-    private Map<String, Integer> modIds = Maps.newHashMap();
-
-    public ModIdentifiersPacket()
-    {
-        super(MOD_IDENTIFIERS);
-    }
-
-    @Override
-    public byte[] generatePacket(Object... data)
-    {
-        ByteArrayDataOutput dat = ByteStreams.newDataOutput();
-        Collection<NetworkModHandler >networkMods = FMLNetworkHandler.instance().getNetworkIdMap().values();
-
-        dat.writeInt(networkMods.size());
-        for (NetworkModHandler handler : networkMods)
-        {
-            dat.writeUTF(handler.getContainer().getModId());
-            dat.writeInt(handler.getNetworkId());
-        }
-
-        // TODO send the other id maps as well
-        return dat.toByteArray();
-    }
-
-    @Override
-    public FMLPacket consumePacket(byte[] data)
-    {
-        ByteArrayDataInput dat = ByteStreams.newDataInput(data);
-        int listSize = dat.readInt();
-        for (int i = 0; i < listSize; i++)
-        {
-            String modId = dat.readUTF();
-            int networkId = dat.readInt();
-            modIds.put(modId, networkId);
-        }
-        return this;
-    }
-
-    @Override
-    public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
-    {
-        for (Entry<String,Integer> idEntry : modIds.entrySet())
-        {
-            handler.bindNetworkId(idEntry.getKey(), idEntry.getValue());
-        }
-        // TODO other id maps
-    }
-}

common/cpw/mods/fml/common/network/ModListRequestPacket.java

@@ -1,129 +0,0 @@
-/*
- * 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.network;
-
-import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_LIST_REQUEST;
-import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_LIST_RESPONSE;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.NetHandler;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.ModContainer;
-
-public class ModListRequestPacket extends FMLPacket
-{
-    private List<String> sentModList;
-    private byte compatibilityLevel;
-
-    public ModListRequestPacket()
-    {
-        super(MOD_LIST_REQUEST);
-    }
-
-    @Override
-    public byte[] generatePacket(Object... data)
-    {
-        ByteArrayDataOutput dat = ByteStreams.newDataOutput();
-        Set<ModContainer> activeMods = FMLNetworkHandler.instance().getNetworkModList();
-        dat.writeInt(activeMods.size());
-        for (ModContainer mc : activeMods)
-        {
-            dat.writeUTF(mc.getModId());
-        }
-        dat.writeByte(FMLNetworkHandler.getCompatibilityLevel());
-        return dat.toByteArray();
-    }
-
-    @Override
-    public FMLPacket consumePacket(byte[] data)
-    {
-        sentModList = Lists.newArrayList();
-        ByteArrayDataInput in = ByteStreams.newDataInput(data);
-        int listSize = in.readInt();
-        for (int i = 0; i < listSize; i++)
-        {
-            sentModList.add(in.readUTF());
-        }
-        try
-        {
-            compatibilityLevel = in.readByte();
-        }
-        catch (IllegalStateException e)
-        {
-            FMLLog.fine("No compatibility byte found - the server is too old");
-        }
-        return this;
-    }
-
-    /**
-     *
-     * This packet is executed on the client to evaluate the server's mod list against
-     * the client
-     *
-     * @see cpw.mods.fml.common.network.FMLPacket#execute(INetworkManager, FMLNetworkHandler, NetHandler, String)
-     */
-    @Override
-    public void execute(INetworkManager mgr, FMLNetworkHandler handler, NetHandler netHandler, String userName)
-    {
-        List<String> missingMods = Lists.newArrayList();
-        Map<String,String> modVersions = Maps.newHashMap();
-        Map<String, ModContainer> indexedModList = Maps.newHashMap(Loader.instance().getIndexedModList());
-
-        for (String m : sentModList)
-        {
-            ModContainer mc = indexedModList.get(m);
-            if (mc == null)
-            {
-                missingMods.add(m);
-                continue;
-            }
-            indexedModList.remove(m);
-            modVersions.put(m, mc.getVersion());
-        }
-
-        if (indexedModList.size()>0)
-        {
-            for (Entry<String, ModContainer> e : indexedModList.entrySet())
-            {
-                if (e.getValue().isNetworkMod())
-                {
-                    NetworkModHandler missingHandler = FMLNetworkHandler.instance().findNetworkModHandler(e.getValue());
-                    if (missingHandler.requiresServerSide())
-                    {
-                        // TODO : what should we do if a mod is marked "serverSideRequired"? Stop the connection?
-                        FMLLog.warning("The mod %s was not found on the server you connected to, but requested that the server side be present", e.getKey());
-                    }
-                }
-            }
-        }
-
-        FMLLog.fine("The server has compatibility level %d", compatibilityLevel);
-        FMLCommonHandler.instance().getSidedDelegate().setClientCompatibilityLevel(compatibilityLevel);
-
-        mgr.func_74429_a(PacketDispatcher.getPacket("FML", FMLPacket.makePacket(MOD_LIST_RESPONSE, modVersions, missingMods)));
-    }
-}

common/cpw/mods/fml/common/network/ModListResponsePacket.java

@@ -1,153 +0,0 @@
-/*
- * 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.network;
-
-import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_IDENTIFIERS;
-import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_LIST_RESPONSE;
-import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_MISSING;
-import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_IDMAP;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.logging.Logger;
-
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.*;
-import net.minecraft.network.packet.*;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.common.registry.GameData;
-import cpw.mods.fml.common.registry.GameRegistry;
-
-public class ModListResponsePacket extends FMLPacket
-{
-    private Map<String,String> modVersions;
-    private List<String> missingMods;
-
-    public ModListResponsePacket()
-    {
-        super(MOD_LIST_RESPONSE);
-    }
-
-    @Override
-    public byte[] generatePacket(Object... data)
-    {
-        Map<String,String> modVersions = (Map<String, String>) data[0];
-        List<String> missingMods = (List<String>) data[1];
-        ByteArrayDataOutput dat = ByteStreams.newDataOutput();
-        dat.writeInt(modVersions.size());
-        for (Entry<String, String> version : modVersions.entrySet())
-        {
-            dat.writeUTF(version.getKey());
-            dat.writeUTF(version.getValue());
-        }
-        dat.writeInt(missingMods.size());
-        for (String missing : missingMods)
-        {
-            dat.writeUTF(missing);
-        }
-        return dat.toByteArray();
-    }
-
-    @Override
-    public FMLPacket consumePacket(byte[] data)
-    {
-        ByteArrayDataInput dat = ByteStreams.newDataInput(data);
-        int versionListSize = dat.readInt();
-        modVersions = Maps.newHashMapWithExpectedSize(versionListSize);
-        for (int i = 0; i < versionListSize; i++)
-        {
-            String modName = dat.readUTF();
-            String modVersion = dat.readUTF();
-            modVersions.put(modName, modVersion);
-        }
-
-        int missingModSize = dat.readInt();
-        missingMods = Lists.newArrayListWithExpectedSize(missingModSize);
-
-        for (int i = 0; i < missingModSize; i++)
-        {
-            missingMods.add(dat.readUTF());
-        }
-        return this;
-    }
-
-    @Override
-    public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
-    {
-        Map<String, ModContainer> indexedModList = Maps.newHashMap(Loader.instance().getIndexedModList());
-        List<String> missingClientMods = Lists.newArrayList();
-        List<String> versionIncorrectMods = Lists.newArrayList();
-
-        for (String m : missingMods)
-        {
-            ModContainer mc = indexedModList.get(m);
-            NetworkModHandler networkMod = handler.findNetworkModHandler(mc);
-            if (networkMod.requiresClientSide())
-            {
-                missingClientMods.add(m);
-            }
-        }
-
-        for (Entry<String,String> modVersion : modVersions.entrySet())
-        {
-            ModContainer mc = indexedModList.get(modVersion.getKey());
-            NetworkModHandler networkMod = handler.findNetworkModHandler(mc);
-            if (!networkMod.acceptVersion(modVersion.getValue()))
-            {
-                versionIncorrectMods.add(modVersion.getKey());
-            }
-        }
-
-        Packet250CustomPayload pkt = new Packet250CustomPayload();
-        pkt.field_73630_a = "FML";
-        if (missingClientMods.size()>0 || versionIncorrectMods.size() > 0)
-        {
-            pkt.field_73629_c = FMLPacket.makePacket(MOD_MISSING, missingClientMods, versionIncorrectMods);
-            Logger.getLogger("Minecraft").info(String.format("User %s connection failed: missing %s, bad versions %s", userName, missingClientMods, versionIncorrectMods));
-            FMLLog.info("User %s connection failed: missing %s, bad versions %s", userName, missingClientMods, versionIncorrectMods);
-            // Mark this as bad
-            FMLNetworkHandler.setHandlerState((NetLoginHandler) netHandler, FMLNetworkHandler.MISSING_MODS_OR_VERSIONS);
-            pkt.field_73628_b = pkt.field_73629_c.length;
-            network.func_74429_a(pkt);
-        }
-        else
-        {
-            pkt.field_73629_c = FMLPacket.makePacket(MOD_IDENTIFIERS, netHandler);
-            Logger.getLogger("Minecraft").info(String.format("User %s connecting with mods %s", userName, modVersions.keySet()));
-            FMLLog.info("User %s connecting with mods %s", userName, modVersions.keySet());
-            pkt.field_73628_b = pkt.field_73629_c.length;
-            network.func_74429_a(pkt);
-            NBTTagList itemList = new NBTTagList();
-            GameData.writeItemData(itemList);
-            byte[][] registryPackets = FMLPacket.makePacketSet(MOD_IDMAP, itemList);
-            for (int i = 0; i < registryPackets.length; i++)
-            {
-                network.func_74429_a(PacketDispatcher.getPacket("FML", registryPackets[i]));
-            }
-        }
-
-        // reset the continuation flag - we have completed extra negotiation and the login should complete now
-        NetLoginHandler.func_72531_a((NetLoginHandler) netHandler, true);
-    }
-
-}

common/cpw/mods/fml/common/network/ModMissingPacket.java

@@ -1,120 +0,0 @@
-/*
- * 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.network;
-
-import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableList.Builder;
-import com.google.common.collect.Lists;
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.common.versioning.ArtifactVersion;
-import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
-import cpw.mods.fml.common.versioning.VersionRange;
-
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.NetHandler;
-
-public class ModMissingPacket extends FMLPacket
-{
-
-    private List<ModData> missing;
-    private List<ModData> badVersion;
-
-    public ModMissingPacket()
-    {
-        super(Type.MOD_MISSING);
-    }
-
-    @Override
-    public byte[] generatePacket(Object... data)
-    {
-        ByteArrayDataOutput dat = ByteStreams.newDataOutput();
-
-        List<String> missing = (List<String>) data[0];
-        List<String> badVersion = (List<String>) data[1];
-
-        dat.writeInt(missing.size());
-        for (String missed : missing)
-        {
-            ModContainer mc = Loader.instance().getIndexedModList().get(missed);
-            dat.writeUTF(missed);
-            dat.writeUTF(mc.getVersion());
-        }
-        dat.writeInt(badVersion.size());
-        for (String bad : badVersion)
-        {
-            ModContainer mc = Loader.instance().getIndexedModList().get(bad);
-            dat.writeUTF(bad);
-            dat.writeUTF(mc.getVersion());
-        }
-        return dat.toByteArray();
-    }
-
-    private static class ModData
-    {
-        String modId;
-        String modVersion;
-    }
-    @Override
-    public FMLPacket consumePacket(byte[] data)
-    {
-        ByteArrayDataInput dat = ByteStreams.newDataInput(data);
-        int missingLen = dat.readInt();
-        missing = Lists.newArrayListWithCapacity(missingLen);
-        for (int i = 0; i < missingLen; i++)
-        {
-            ModData md = new ModData();
-            md.modId = dat.readUTF();
-            md.modVersion = dat.readUTF();
-            missing.add(md);
-        }
-        int badVerLength = dat.readInt();
-        badVersion = Lists.newArrayListWithCapacity(badVerLength);
-        for (int i = 0; i < badVerLength; i++)
-        {
-            ModData md = new ModData();
-            md.modId = dat.readUTF();
-            md.modVersion = dat.readUTF();
-            badVersion.add(md);
-        }
-        return this;
-    }
-
-    @Override
-    public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
-    {
-        FMLCommonHandler.instance().getSidedDelegate().displayMissingMods(this);
-    }
-
-    public List<ArtifactVersion> getModList()
-    {
-        Builder<ArtifactVersion> builder = ImmutableList.<ArtifactVersion>builder();
-        for (ModData md : missing)
-        {
-            builder.add(new DefaultArtifactVersion(md.modId, VersionRange.createFromVersion(md.modVersion, null)));
-        }
-        for (ModData md : badVersion)
-        {
-            builder.add(new DefaultArtifactVersion(md.modId, VersionRange.createFromVersion(md.modVersion, null)));
-        }
-        return builder.build();
-    }
-
-}

common/cpw/mods/fml/common/network/NetworkMod.java

@@ -1,97 +0,0 @@
-/*
- * 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.network;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface NetworkMod
-{
-    /**
-     * Does this mod require the client side to be present when installed on a server?
-     */
-    boolean clientSideRequired() default false;
-    /**
-     * Does this mod require the server side to be present when installed on a client?
-     */
-    boolean serverSideRequired() default false;
-    /**
-     * A list of Packet250 network channels to register for this mod - these channels
-     * will be universal and will require a universal packethandler to handle them
-     */
-    String[] channels() default {};
-    /**
-     * An optional range check for client to server communication version compatibility
-     */
-    String versionBounds() default "";
-
-    /**
-     * A packet handler implementation for channels registered through this annotation
-     * - this packet handler will be universal and handle both client and server
-     * requests.
-     */
-    Class<? extends IPacketHandler> packetHandler() default NULL.class;
-
-    /**
-     * A tiny packet handler implementation based on {@link net.minecraft.network.packet.Packet131MapData} for "small"
-     * data packet loads.
-     */
-    Class<? extends ITinyPacketHandler> tinyPacketHandler() default NULL.class;
-    /**
-     * A connection handler implementation for this network mod
-     */
-    Class<? extends IConnectionHandler> connectionHandler() default NULL.class;
-    /**
-     * A packet handler and channels to register for the client side
-     */
-    SidedPacketHandler clientPacketHandlerSpec() default @SidedPacketHandler(channels = {}, packetHandler = NULL.class );
-
-    /**
-     * A packet handler and channels to register for the server side
-     */
-    SidedPacketHandler serverPacketHandlerSpec() default @SidedPacketHandler(channels = {}, packetHandler = NULL.class );
-
-    /**
-     * Special dummy class for handling stupid annotation default values
-     * @author cpw
-     *
-     */
-    static interface NULL extends IPacketHandler, IConnectionHandler, ITinyPacketHandler {};
-
-    /**
-     * A marker for a method that will be offered the client's version string
-     * if more sophisticated version rejection handling is required:
-     * The method should accept a "String", a "NetworkManager" and return a boolean true
-     * if the version can be accepted.
-     * @author cpw
-     *
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface VersionCheckHandler { }
-
-    /**
-     * Bundles together a packet handler and it's associated channels for the sided packet handlers
-     * @author cpw
-     *
-     */
-    public @interface SidedPacketHandler {
-        String[] channels();
-        Class<? extends IPacketHandler> packetHandler();
-    }
-
-}

common/cpw/mods/fml/common/network/NetworkModHandler.java

@@ -1,369 +0,0 @@
-/*
- * 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.network;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-import java.util.logging.Level;
-
-import net.minecraft.item.Item;
-
-import com.google.common.base.Strings;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.common.discovery.ASMDataTable;
-import cpw.mods.fml.common.discovery.ASMDataTable.ASMData;
-import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
-import cpw.mods.fml.common.versioning.InvalidVersionSpecificationException;
-import cpw.mods.fml.common.versioning.VersionRange;
-import cpw.mods.fml.relauncher.Side;
-
-public class NetworkModHandler
-{
-    private static Object connectionHandlerDefaultValue;
-    private static Object packetHandlerDefaultValue;
-    private static Object clientHandlerDefaultValue;
-    private static Object serverHandlerDefaultValue;
-    private static Object tinyPacketHandlerDefaultValue;
-
-    private static int assignedIds = 1;
-
-    private int localId;
-    private int networkId;
-
-    private ModContainer container;
-    private NetworkMod mod;
-    private Method checkHandler;
-
-    private VersionRange acceptableRange;
-    private ITinyPacketHandler tinyPacketHandler;
-
-    public NetworkModHandler(ModContainer container, NetworkMod modAnnotation)
-    {
-        this.container = container;
-        this.mod = modAnnotation;
-        this.localId = assignedIds++;
-        this.networkId = this.localId;
-        // Skip over the map object because it has special network id meaning
-        if (Item.field_77744_bd.field_77779_bT == assignedIds)
-        {
-            assignedIds++;
-        }
-    }
-    public NetworkModHandler(ModContainer container, Class<?> networkModClass, ASMDataTable table)
-    {
-        this(container, networkModClass.getAnnotation(NetworkMod.class));
-        if (this.mod == null)
-        {
-            return;
-        }
-
-        Set<ASMData> versionCheckHandlers = table.getAnnotationsFor(container).get(NetworkMod.VersionCheckHandler.class.getName());
-        String versionCheckHandlerMethod = null;
-        for (ASMData vch : versionCheckHandlers)
-        {
-            if (vch.getClassName().equals(networkModClass.getName()))
-            {
-                versionCheckHandlerMethod = vch.getObjectName();
-                break;
-            }
-        }
-        if (versionCheckHandlerMethod != null)
-        {
-            try
-            {
-                Method checkHandlerMethod = networkModClass.getDeclaredMethod(versionCheckHandlerMethod, String.class);
-                if (checkHandlerMethod.isAnnotationPresent(NetworkMod.VersionCheckHandler.class))
-                {
-                    this.checkHandler = checkHandlerMethod;
-                }
-            }
-            catch (Exception e)
-            {
-                FMLLog.log(Level.WARNING, e, "The declared version check handler method %s on network mod id %s is not accessible", versionCheckHandlerMethod, container.getModId());
-            }
-        }
-
-        configureNetworkMod(container);
-    }
-    protected void configureNetworkMod(ModContainer container)
-    {
-        if (this.checkHandler == null)
-        {
-            String versionBounds = mod.versionBounds();
-            if (!Strings.isNullOrEmpty(versionBounds))
-            {
-                try
-                {
-                    this.acceptableRange = VersionRange.createFromVersionSpec(versionBounds);
-                }
-                catch (InvalidVersionSpecificationException e)
-                {
-                    FMLLog.log(Level.WARNING, e, "Invalid bounded range %s specified for network mod id %s", versionBounds, container.getModId());
-                }
-            }
-        }
-
-        FMLLog.finest("Testing mod %s to verify it accepts its own version in a remote connection", container.getModId());
-        boolean acceptsSelf = acceptVersion(container.getVersion());
-        if (!acceptsSelf)
-        {
-            FMLLog.severe("The mod %s appears to reject its own version number (%s) in its version handling. This is likely a severe bug in the mod!", container.getModId(), container.getVersion());
-        }
-        else
-        {
-            FMLLog.finest("The mod %s accepts its own version (%s)", container.getModId(), container.getVersion());
-        }
-
-        tryCreatingPacketHandler(container, mod.packetHandler(), mod.channels(), null);
-        if (FMLCommonHandler.instance().getSide().isClient())
-        {
-            if (mod.clientPacketHandlerSpec() != getClientHandlerSpecDefaultValue())
-            {
-                tryCreatingPacketHandler(container, mod.clientPacketHandlerSpec().packetHandler(), mod.clientPacketHandlerSpec().channels(), Side.CLIENT);
-            }
-        }
-        if (mod.serverPacketHandlerSpec() != getServerHandlerSpecDefaultValue())
-        {
-            tryCreatingPacketHandler(container, mod.serverPacketHandlerSpec().packetHandler(), mod.serverPacketHandlerSpec().channels(), Side.SERVER);
-        }
-
-        if (mod.connectionHandler() != getConnectionHandlerDefaultValue())
-        {
-            IConnectionHandler instance;
-            try
-            {
-                instance = mod.connectionHandler().newInstance();
-            }
-            catch (Exception e)
-            {
-                FMLLog.log(Level.SEVERE, e, "Unable to create connection handler instance %s", mod.connectionHandler().getName());
-                throw new FMLNetworkException(e);
-            }
-
-            NetworkRegistry.instance().registerConnectionHandler(instance);
-        }
-
-        if (mod.tinyPacketHandler()!=getTinyPacketHandlerDefaultValue())
-        {
-            try
-            {
-                tinyPacketHandler = mod.tinyPacketHandler().newInstance();
-            }
-            catch (Exception e)
-            {
-                FMLLog.log(Level.SEVERE, e, "Unable to create tiny packet handler instance %s", mod.tinyPacketHandler().getName());
-                throw new FMLNetworkException(e);
-            }
-        }
-    }
-    /**
-     * @param container
-     */
-    private void tryCreatingPacketHandler(ModContainer container, Class<? extends IPacketHandler> clazz, String[] channels, Side side)
-    {
-        if (side!=null && side.isClient() && ! FMLCommonHandler.instance().getSide().isClient())
-        {
-            return;
-        }
-        if (clazz!=getPacketHandlerDefaultValue())
-        {
-            if (channels.length==0)
-            {
-                FMLLog.log(Level.WARNING, "The mod id %s attempted to register a packet handler without specifying channels for it", container.getModId());
-            }
-            else
-            {
-                IPacketHandler instance;
-                try
-                {
-                    instance = clazz.newInstance();
-                }
-                catch (Exception e)
-                {
-                    FMLLog.log(Level.SEVERE, e, "Unable to create a packet handler instance %s for mod %s", clazz.getName(), container.getModId());
-                    throw new FMLNetworkException(e);
-                }
-
-                for (String channel : channels)
-                {
-                    NetworkRegistry.instance().registerChannel(instance, channel, side);
-                }
-            }
-        }
-        else if (channels.length > 0)
-        {
-            FMLLog.warning("The mod id %s attempted to register channels without specifying a packet handler", container.getModId());
-        }
-    }
-    /**
-     * @return the default {@link NetworkMod#connectionHandler()} annotation value
-     */
-    private Object getConnectionHandlerDefaultValue()
-    {
-        try {
-            if (connectionHandlerDefaultValue == null)
-            {
-                connectionHandlerDefaultValue = NetworkMod.class.getMethod("connectionHandler").getDefaultValue();
-            }
-            return connectionHandlerDefaultValue;
-        }
-        catch (NoSuchMethodException e)
-        {
-            throw new RuntimeException("Derp?", e);
-        }
-    }
-
-    /**
-     * @return the default {@link NetworkMod#packetHandler()} annotation value
-     */
-    private Object getPacketHandlerDefaultValue()
-    {
-        try {
-            if (packetHandlerDefaultValue == null)
-            {
-                packetHandlerDefaultValue = NetworkMod.class.getMethod("packetHandler").getDefaultValue();
-            }
-            return packetHandlerDefaultValue;
-        }
-        catch (NoSuchMethodException e)
-        {
-            throw new RuntimeException("Derp?", e);
-        }
-    }
-
-    /**
-     * @return the default {@link NetworkMod#tinyPacketHandler()} annotation value
-     */
-    private Object getTinyPacketHandlerDefaultValue()
-    {
-        try {
-            if (tinyPacketHandlerDefaultValue == null)
-            {
-                tinyPacketHandlerDefaultValue = NetworkMod.class.getMethod("tinyPacketHandler").getDefaultValue();
-            }
-            return tinyPacketHandlerDefaultValue;
-        }
-        catch (NoSuchMethodException e)
-        {
-            throw new RuntimeException("Derp?", e);
-        }
-    }
-    /**
-     * @return the {@link NetworkMod#clientPacketHandlerSpec()} default annotation value
-     */
-    private Object getClientHandlerSpecDefaultValue()
-    {
-        try {
-            if (clientHandlerDefaultValue == null)
-            {
-                clientHandlerDefaultValue = NetworkMod.class.getMethod("clientPacketHandlerSpec").getDefaultValue();
-            }
-            return clientHandlerDefaultValue;
-        }
-        catch (NoSuchMethodException e)
-        {
-            throw new RuntimeException("Derp?", e);
-        }
-    }
-    /**
-     * @return the default {@link NetworkMod#serverPacketHandlerSpec()} annotation value
-     */
-    private Object getServerHandlerSpecDefaultValue()
-    {
-        try {
-            if (serverHandlerDefaultValue == null)
-            {
-                serverHandlerDefaultValue = NetworkMod.class.getMethod("serverPacketHandlerSpec").getDefaultValue();
-            }
-            return serverHandlerDefaultValue;
-        }
-        catch (NoSuchMethodException e)
-        {
-            throw new RuntimeException("Derp?", e);
-        }
-    }
-    public boolean requiresClientSide()
-    {
-        return mod.clientSideRequired();
-    }
-
-    public boolean requiresServerSide()
-    {
-        return mod.serverSideRequired();
-    }
-
-    public boolean acceptVersion(String version)
-    {
-        if (checkHandler != null)
-        {
-            try
-            {
-                return (Boolean)checkHandler.invoke(container.getMod(), version);
-            }
-            catch (Exception e)
-            {
-                FMLLog.log(Level.WARNING, e, "There was a problem invoking the checkhandler method %s for network mod id %s", checkHandler.getName(), container.getModId());
-                return false;
-            }
-        }
-
-        if (acceptableRange!=null)
-        {
-            return acceptableRange.containsVersion(new DefaultArtifactVersion(version));
-        }
-
-        return container.getVersion().equals(version);
-    }
-
-    public int getLocalId()
-    {
-        return localId;
-    }
-
-    public int getNetworkId()
-    {
-        return networkId;
-    }
-
-    public ModContainer getContainer()
-    {
-        return container;
-    }
-
-    public NetworkMod getMod()
-    {
-        return mod;
-    }
-
-    public boolean isNetworkMod()
-    {
-        return mod != null;
-    }
-
-    public void setNetworkId(int value)
-    {
-        this.networkId = value;
-    }
-
-    public boolean hasTinyPacketHandler()
-    {
-        return tinyPacketHandler != null;
-    }
-    public ITinyPacketHandler getTinyPacketHandler()
-    {
-        return tinyPacketHandler;
-    }
-}

common/cpw/mods/fml/common/network/OpenGuiPacket.java

@@ -1,71 +0,0 @@
-/*
- * 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.network;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.NetHandler;
-
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
-public class OpenGuiPacket extends FMLPacket
-{
-    private int windowId;
-    private int networkId;
-    private int modGuiId;
-    private int x;
-    private int y;
-    private int z;
-    
-    public OpenGuiPacket()
-    {
-        super(Type.GUIOPEN);
-    }
-
-    @Override
-    public byte[] generatePacket(Object... data)
-    {
-        ByteArrayDataOutput dat = ByteStreams.newDataOutput();
-        dat.writeInt((Integer) data[0]); // windowId
-        dat.writeInt((Integer) data[1]); // networkId
-        dat.writeInt((Integer) data[2]); // modGuiId
-        dat.writeInt((Integer) data[3]); // x
-        dat.writeInt((Integer) data[4]); // y
-        dat.writeInt((Integer) data[5]); // z
-        return dat.toByteArray();
-    }
-
-    @Override
-    public FMLPacket consumePacket(byte[] data)
-    {
-        ByteArrayDataInput dat = ByteStreams.newDataInput(data);
-        windowId = dat.readInt();
-        networkId = dat.readInt();
-        modGuiId = dat.readInt();
-        x = dat.readInt();
-        y = dat.readInt();
-        z = dat.readInt();
-        return this;
-    }
-
-    @Override
-    public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName)
-    {
-        EntityPlayer player = netHandler.getPlayer();
-        player.openGui(networkId, modGuiId, player.field_70170_p, x, y, z);
-        player.field_71070_bA.field_75152_c = windowId;
-    }
-
-}

common/cpw/mods/fml/common/network/PacketDispatcher.java

@@ -1,93 +0,0 @@
-/*
- * 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.network;
-
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.network.packet.Packet;
-import net.minecraft.network.packet.Packet131MapData;
-import net.minecraft.network.packet.Packet250CustomPayload;
-import net.minecraft.server.MinecraftServer;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
-
-/**
- * A simple utility class to send packet 250 packets around the place
- *
- * @author cpw
- *
- */
-public class PacketDispatcher
-{
-    public static Packet250CustomPayload getPacket(String type, byte[] data)
-    {
-        return new Packet250CustomPayload(type, data);
-    }
-
-    public static void sendPacketToServer(Packet packet)
-    {
-        FMLCommonHandler.instance().getSidedDelegate().sendPacket(packet);
-    }
-
-    public static void sendPacketToPlayer(Packet packet, Player player)
-    {
-        if (player instanceof EntityPlayerMP)
-        {
-            ((EntityPlayerMP)player).field_71135_a.func_72567_b(packet);
-        }
-    }
-
-    public static void sendPacketToAllAround(double X, double Y, double Z, double range, int dimensionId, Packet packet)
-    {
-        MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
-        if (server != null)
-        {
-            server.func_71203_ab().func_72393_a(X, Y, Z, range, dimensionId, packet);
-        }
-        else
-        {
-            FMLLog.fine("Attempt to send packet to all around without a server instance available");
-        }
-    }
-
-    public static void sendPacketToAllInDimension(Packet packet, int dimId)
-    {
-        MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
-        if (server != null)
-        {
-            server.func_71203_ab().func_72396_a(packet, dimId);
-        }
-        else
-        {
-            FMLLog.fine("Attempt to send packet to all in dimension without a server instance available");
-        }
-    }
-
-    public static void sendPacketToAllPlayers(Packet packet)
-    {
-        MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
-        if (server != null)
-        {
-            server.func_71203_ab().func_72384_a(packet);
-        }
-        else
-        {
-            FMLLog.fine("Attempt to send packet to all in dimension without a server instance available");
-        }
-    }
-
-    public static Packet131MapData getTinyPacket(Object mod, short tag, byte[] data)
-    {
-        NetworkModHandler nmh = FMLNetworkHandler.instance().findNetworkModHandler(mod);
-        return new Packet131MapData((short) nmh.getNetworkId(), tag, data);
-    }
-}

common/cpw/mods/fml/common/network/Player.java

@@ -1,23 +0,0 @@
-/*
- * 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.network;
-
-/**
- *
- * @author cpw
- *
- */
-public interface Player
-{
-
-}

common/cpw/mods/fml/common/patcher/ClassPatchingTransformer.java

@@ -1,5 +0,0 @@
-package cpw.mods.fml.common.patcher;
-
-public class ClassPatchingTransformer {
-
-}

common/cpw/mods/fml/common/registry/BlockProxy.java

@@ -1,18 +0,0 @@
-/*
- * 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.registry;
-
-public interface BlockProxy
-{
-
-}

common/cpw/mods/fml/common/registry/BlockTracker.java

@@ -1,61 +0,0 @@
-/*
- * 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.registry;
-
-import java.util.BitSet;
-
-import net.minecraft.block.Block;
-
-class BlockTracker
-{
-    private static final BlockTracker INSTANCE = new BlockTracker();
-    private BitSet allocatedBlocks;
-
-    private BlockTracker()
-    {
-        allocatedBlocks = new BitSet(4096);
-        allocatedBlocks.set(0, 4096);
-        for (int i = 0; i < Block.field_71973_m.length; i++)
-        {
-            if (Block.field_71973_m[i]!=null)
-            {
-                allocatedBlocks.clear(i);
-            }
-        }
-    }
-    public static int nextBlockId()
-    {
-        return instance().getNextBlockId();
-    }
-
-    private int getNextBlockId()
-    {
-        int idx = allocatedBlocks.nextSetBit(0);
-        allocatedBlocks.clear(idx);
-        return idx;
-    }
-    private static BlockTracker instance()
-    {
-        return INSTANCE;
-    }
-    public static void reserveBlockId(int id)
-    {
-        instance().doReserveId(id);
-    }
-    private void doReserveId(int id)
-    {
-        allocatedBlocks.clear(id);
-    }
-
-
-}

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

@@ -1,365 +0,0 @@
-/*
- * 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.registry;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.logging.Level;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockSand;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-
-import com.google.common.base.Charsets;
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.base.Throwables;
-import com.google.common.base.Joiner.MapJoiner;
-import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.ImmutableListMultimap;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableTable;
-import com.google.common.collect.ImmutableTable.Builder;
-import com.google.common.collect.MapDifference;
-import com.google.common.collect.Tables;
-import com.google.common.collect.MapDifference.ValueDifference;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.google.common.collect.Table;
-import com.google.common.collect.Table.Cell;
-import com.google.common.io.Files;
-
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.LoaderState;
-import cpw.mods.fml.common.ModContainer;
-
-public class GameData {
-    private static Map<Integer, ItemData> idMap = Maps.newHashMap();
-    private static CountDownLatch serverValidationLatch;
-    private static CountDownLatch clientValidationLatch;
-    private static MapDifference<Integer, ItemData> difference;
-    private static boolean shouldContinue = true;
-    private static boolean isSaveValid = true;
-    private static ImmutableTable<String, String, Integer> modObjectTable;
-    private static Table<String, String, ItemStack> customItemStacks = HashBasedTable.create();
-    private static Map<String,String> ignoredMods;
-
-    private static boolean isModIgnoredForIdValidation(String modId)
-    {
-        if (ignoredMods == null)
-        {
-            File f = new File(Loader.instance().getConfigDir(),"fmlIDChecking.properties");
-            if (f.exists())
-            {
-                Properties p = new Properties();
-                try
-                {
-                    p.load(new FileInputStream(f));
-                    ignoredMods = Maps.fromProperties(p);
-                    if (ignoredMods.size()>0)
-                    {
-                        FMLLog.log("fml.ItemTracker", Level.WARNING, "Using non-empty ignored mods configuration file %s", ignoredMods.keySet());
-                    }
-                }
-                catch (Exception e)
-                {
-                    Throwables.propagateIfPossible(e);
-                    FMLLog.log("fml.ItemTracker", Level.SEVERE, e, "Failed to read ignored ID checker mods properties file");
-                    ignoredMods = ImmutableMap.<String, String>of();
-                }
-            }
-            else
-            {
-                ignoredMods = ImmutableMap.<String, String>of();
-            }
-        }
-        return ignoredMods.containsKey(modId);
-    }
-
-    public static void newItemAdded(Item item)
-    {
-        ModContainer mc = Loader.instance().activeModContainer();
-        if (mc == null)
-        {
-            mc = Loader.instance().getMinecraftModContainer();
-            if (Loader.instance().hasReachedState(LoaderState.AVAILABLE))
-            {
-                FMLLog.severe("It appears something has tried to allocate an Item outside of the initialization phase of Minecraft, this could be very bad for your network connectivity.");
-            }
-        }
-        String itemType = item.getClass().getName();
-        ItemData itemData = new ItemData(item, mc);
-        if (idMap.containsKey(item.field_77779_bT))
-        {
-            ItemData id = idMap.get(item.field_77779_bT);
-            FMLLog.log("fml.ItemTracker", Level.INFO, "The mod %s is overwriting existing item at %d (%s from %s) with %s", mc.getModId(), id.getItemId(), id.getItemType(), id.getModId(), itemType);
-        }
-        idMap.put(item.field_77779_bT, itemData);
-        if (!"Minecraft".equals(mc.getModId()))
-        {
-            FMLLog.log("fml.ItemTracker",Level.FINE, "Adding item %s(%d) owned by %s", item.getClass().getName(), item.field_77779_bT, mc.getModId());
-        }
-    }
-
-    public static void validateWorldSave(Set<ItemData> worldSaveItems)
-    {
-        isSaveValid = true;
-        shouldContinue = true;
-        // allow ourselves to continue if there's no saved data
-        if (worldSaveItems == null)
-        {
-            serverValidationLatch.countDown();
-            try
-            {
-                clientValidationLatch.await();
-            }
-            catch (InterruptedException e)
-            {
-            }
-            return;
-        }
-
-        Function<? super ItemData, Integer> idMapFunction = new Function<ItemData, Integer>() {
-            public Integer apply(ItemData input) {
-                return input.getItemId();
-            };
-        };
-
-        Map<Integer,ItemData> worldMap = Maps.uniqueIndex(worldSaveItems,idMapFunction);
-        difference = Maps.difference(worldMap, idMap);
-        FMLLog.log("fml.ItemTracker", Level.FINE, "The difference set is %s", difference);
-        if (!difference.entriesDiffering().isEmpty() || !difference.entriesOnlyOnLeft().isEmpty())
-        {
-            FMLLog.log("fml.ItemTracker", Level.SEVERE, "FML has detected item discrepancies");
-            FMLLog.log("fml.ItemTracker", Level.SEVERE, "Missing items : %s", difference.entriesOnlyOnLeft());
-            FMLLog.log("fml.ItemTracker", Level.SEVERE, "Mismatched items : %s", difference.entriesDiffering());
-            boolean foundNonIgnored = false;
-            for (ItemData diff : difference.entriesOnlyOnLeft().values())
-            {
-                if (!isModIgnoredForIdValidation(diff.getModId()))
-                {
-                    foundNonIgnored = true;
-                }
-            }
-            for (ValueDifference<ItemData> diff : difference.entriesDiffering().values())
-            {
-                if (! ( isModIgnoredForIdValidation(diff.leftValue().getModId()) || isModIgnoredForIdValidation(diff.rightValue().getModId()) ) )
-                {
-                    foundNonIgnored = true;
-                }
-            }
-            if (!foundNonIgnored)
-            {
-                FMLLog.log("fml.ItemTracker", Level.SEVERE, "FML is ignoring these ID discrepancies because of configuration. YOUR GAME WILL NOW PROBABLY CRASH. HOPEFULLY YOU WON'T HAVE CORRUPTED YOUR WORLD. BLAME %s", ignoredMods.keySet());
-            }
-            isSaveValid = !foundNonIgnored;
-            serverValidationLatch.countDown();
-        }
-        else
-        {
-            isSaveValid = true;
-            serverValidationLatch.countDown();
-        }
-        try
-        {
-            clientValidationLatch.await();
-            if (!shouldContinue)
-            {
-                throw new RuntimeException("This server instance is going to stop abnormally because of a fatal ID mismatch");
-            }
-        }
-        catch (InterruptedException e)
-        {
-        }
-    }
-
-    public static void writeItemData(NBTTagList itemList)
-    {
-        for (ItemData dat : idMap.values())
-        {
-            itemList.func_74742_a(dat.toNBT());
-        }
-    }
-
-    /**
-     * Initialize the server gate
-     * @param gateCount the countdown amount. If it's 2 we're on the client and the client and server
-     * will wait at the latch. 1 is a server and the server will proceed
-     */
-    public static void initializeServerGate(int gateCount)
-    {
-        serverValidationLatch = new CountDownLatch(gateCount - 1);
-        clientValidationLatch = new CountDownLatch(gateCount - 1);
-    }
-
-    public static MapDifference<Integer, ItemData> gateWorldLoadingForValidation()
-    {
-        try
-        {
-            serverValidationLatch.await();
-            if (!isSaveValid)
-            {
-                return difference;
-            }
-        }
-        catch (InterruptedException e)
-        {
-        }
-        difference = null;
-        return null;
-    }
-
-
-    public static void releaseGate(boolean carryOn)
-    {
-        shouldContinue = carryOn;
-        clientValidationLatch.countDown();
-    }
-
-    public static Set<ItemData> buildWorldItemData(NBTTagList modList)
-    {
-        Set<ItemData> worldSaveItems = Sets.newHashSet();
-        for (int i = 0; i < modList.func_74745_c(); i++)
-        {
-            NBTTagCompound mod = (NBTTagCompound) modList.func_74743_b(i);
-            ItemData dat = new ItemData(mod);
-            worldSaveItems.add(dat);
-        }
-        return worldSaveItems;
-    }
-
-    static void setName(Item item, String name, String modId)
-    {
-        int id = item.field_77779_bT;
-        ItemData itemData = idMap.get(id);
-        itemData.setName(name,modId);
-    }
-
-    public static void buildModObjectTable()
-    {
-        if (modObjectTable != null)
-        {
-            throw new IllegalStateException("Illegal call to buildModObjectTable!");
-        }
-
-        Map<Integer, Cell<String, String, Integer>> map = Maps.transformValues(idMap, new Function<ItemData,Cell<String,String,Integer>>() {
-            public Cell<String,String,Integer> apply(ItemData data)
-            {
-                if ("Minecraft".equals(data.getModId()) || !data.isOveridden())
-                {
-                    return null;
-                }
-                return Tables.immutableCell(data.getModId(), data.getItemType(), data.getItemId());
-            }
-        });
-
-        Builder<String, String, Integer> tBuilder = ImmutableTable.builder();
-        for (Cell<String, String, Integer> c : map.values())
-        {
-            if (c!=null)
-            {
-                tBuilder.put(c);
-            }
-        }
-        modObjectTable = tBuilder.build();
-    }
-    static Item findItem(String modId, String name)
-    {
-        if (modObjectTable == null || !modObjectTable.contains(modId, name))
-        {
-            return null;
-        }
-
-        return Item.field_77698_e[modObjectTable.get(modId, name)];
-    }
-
-    static Block findBlock(String modId, String name)
-    {
-        if (modObjectTable == null)
-        {
-            return null;
-        }
-
-        Integer blockId = modObjectTable.get(modId, name);
-        if (blockId == null || blockId >= Block.field_71973_m.length)
-        {
-            return null;
-        }
-        return Block.field_71973_m[blockId];
-    }
-
-    static ItemStack findItemStack(String modId, String name)
-    {
-        ItemStack is = customItemStacks.get(modId, name);
-        if (is == null)
-        {
-            Item i = findItem(modId, name);
-            if (i != null)
-            {
-                is = new ItemStack(i, 0 ,0);
-            }
-        }
-        if (is == null)
-        {
-            Block b = findBlock(modId, name);
-            if (b != null)
-            {
-                is = new ItemStack(b, 0, Short.MAX_VALUE);
-            }
-        }
-        return is;
-    }
-
-    static void registerCustomItemStack(String name, ItemStack itemStack)
-    {
-        customItemStacks.put(Loader.instance().activeModContainer().getModId(), name, itemStack);
-    }
-
-    public static void dumpRegistry(File minecraftDir)
-    {
-        if (customItemStacks == null)
-        {
-            return;
-        }
-        if (Boolean.valueOf(System.getProperty("fml.dumpRegistry", "false")).booleanValue())
-        {
-            ImmutableListMultimap.Builder<String, String> builder = ImmutableListMultimap.builder();
-            for (String modId : customItemStacks.rowKeySet())
-            {
-                builder.putAll(modId, customItemStacks.row(modId).keySet());
-            }
-
-            File f = new File(minecraftDir, "itemStackRegistry.csv");
-            MapJoiner mapJoiner = Joiner.on("\n").withKeyValueSeparator(",");
-            try
-            {
-                Files.write(mapJoiner.join(builder.build().entries()), f, Charsets.UTF_8);
-                FMLLog.log(Level.INFO, "Dumped item registry data to %s", f.getAbsolutePath());
-            }
-            catch (IOException e)
-            {
-                FMLLog.log(Level.SEVERE, e, "Failed to write registry data to %s", f.getAbsolutePath());
-            }
-        }
-    }
-}

common/cpw/mods/fml/common/registry/ItemData.java

@@ -1,167 +0,0 @@
-/*
- * 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.registry;
-
-import java.util.Map;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.nbt.NBTTagCompound;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multiset;
-
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.LoaderException;
-import cpw.mods.fml.common.ModContainer;
-
-public class ItemData {
-
-    private static Map<String, Multiset<String>> modOrdinals = Maps.newHashMap();
-    private final String modId;
-    private final String itemType;
-    private final int itemId;
-    private final int ordinal;
-    private String forcedModId;
-    private String forcedName;
-
-    public ItemData(Item item, ModContainer mc)
-    {
-        this.itemId = item.field_77779_bT;
-        if (item.getClass().equals(ItemBlock.class))
-        {
-            this.itemType =  Block.field_71973_m[this.getItemId()].getClass().getName();
-        }
-        else
-        {
-            this.itemType = item.getClass().getName();
-        }
-        this.modId = mc.getModId();
-        if (!modOrdinals.containsKey(mc.getModId()))
-        {
-            modOrdinals.put(mc.getModId(), HashMultiset.<String>create());
-        }
-        this.ordinal = modOrdinals.get(mc.getModId()).add(itemType, 1);
-    }
-
-    public ItemData(NBTTagCompound tag)
-    {
-        this.modId = tag.func_74779_i("ModId");
-        this.itemType = tag.func_74779_i("ItemType");
-        this.itemId = tag.func_74762_e("ItemId");
-        this.ordinal = tag.func_74762_e("ordinal");
-        this.forcedModId = tag.func_74764_b("ForcedModId") ? tag.func_74779_i("ForcedModId") : null;
-        this.forcedName = tag.func_74764_b("ForcedName") ? tag.func_74779_i("ForcedName") : null;
-    }
-
-    public String getItemType()
-    {
-        return this.forcedName !=null ? forcedName : itemType;
-    }
-
-    public String getModId()
-    {
-        return this.forcedModId != null ? forcedModId : modId;
-    }
-
-    public int getOrdinal()
-    {
-        return ordinal;
-    }
-
-    public int getItemId()
-    {
-        return itemId;
-    }
-
-    public NBTTagCompound toNBT()
-    {
-        NBTTagCompound tag = new NBTTagCompound();
-        tag.func_74778_a("ModId", modId);
-        tag.func_74778_a("ItemType", itemType);
-        tag.func_74768_a("ItemId", itemId);
-        tag.func_74768_a("ordinal", ordinal);
-        if (forcedModId != null)
-        {
-            tag.func_74778_a("ForcedModId", forcedModId);
-        }
-        if (forcedName != null)
-        {
-            tag.func_74778_a("ForcedName", forcedName);
-        }
-        return tag;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hashCode(itemId, ordinal);
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        try
-        {
-            ItemData other = (ItemData) obj;
-            return Objects.equal(getModId(), other.getModId()) && Objects.equal(getItemType(), other.getItemType()) && Objects.equal(itemId, other.itemId) && ( isOveridden() || Objects.equal(ordinal, other.ordinal));
-        }
-        catch (ClassCastException cce)
-        {
-            return false;
-        }
-    }
-
-    @Override
-    public String toString()
-    {
-        return String.format("Item %d, Type %s, owned by %s, ordinal %d, name %s, claimedModId %s", itemId, itemType, modId, ordinal, forcedName, forcedModId);
-    }
-
-    public boolean mayDifferByOrdinal(ItemData rightValue)
-    {
-        return Objects.equal(getItemType(), rightValue.getItemType()) && Objects.equal(getModId(), rightValue.getModId());
-    }
-
-    public boolean isOveridden()
-    {
-        return forcedName != null;
-    }
-
-    public void setName(String name, String modId)
-    {
-        if (name == null)
-        {
-            this.forcedName = null;
-            this.forcedModId = null;
-            return;
-        }
-        String localModId = modId;
-        if (modId == null)
-        {
-            localModId = Loader.instance().activeModContainer().getModId();
-        }
-        if (modOrdinals.get(localModId).count(name)>0)
-        {
-            FMLLog.severe("The mod %s is attempting to redefine the item at id %d with a non-unique name (%s.%s)", Loader.instance().activeModContainer(), itemId, localModId, name);
-            throw new LoaderException();
-        }
-        modOrdinals.get(localModId).add(name);
-        this.forcedModId = modId;
-        this.forcedName = name;
-    }
-}

common/cpw/mods/fml/common/registry/ItemProxy.java

@@ -1,18 +0,0 @@
-/*
- * 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.registry;
-
-public interface ItemProxy
-{
-
-}

common/cpw/mods/fml/relauncher/CoreFMLLibraries.java

@@ -1,38 +0,0 @@
-/*
- * 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.relauncher;
-
-public class CoreFMLLibraries implements ILibrarySet
-{
-    private static String[] libraries = { "argo-small-3.2.jar","guava-14.0-rc3.jar","asm-all-4.1.jar", "bcprov-jdk15on-148.jar", FMLInjectionData.debfuscationDataName(), "scala-library.jar" };
-    private static String[] checksums = { "58912ea2858d168c50781f956fa5b59f0f7c6b51", "931ae21fa8014c3ce686aaa621eae565fefb1a6a", "054986e962b88d8660ae4566475658469595ef58", "960dea7c9181ba0b17e8bab0c06a43f0a5f04e65", FMLInjectionData.deobfuscationDataHash, "458d046151ad179c85429ed7420ffb1eaf6ddf85" };
-
-    @Override
-    public String[] getLibraries()
-    {
-        return libraries;
-    }
-
-    @Override
-    public String[] getHashes()
-    {
-        return checksums;
-    }
-
-    @Override
-    public String getRootURL()
-    {
-        return System.getProperty("fml.core.libraries.mirror", "http://files.minecraftforge.net/fmllibs/%s");
-    }
-
-}

common/cpw/mods/fml/relauncher/CoreModManager.java

@@ -1,630 +0,0 @@
-/*
- * 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.relauncher;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InterruptedIOException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.ByteBuffer;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileChannel.MapMode;
-import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.logging.Level;
-
-import net.minecraft.launchwrapper.LaunchClassLoader;
-
-import cpw.mods.fml.common.CertificateHelper;
-import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
-import cpw.mods.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions;
-
-public class CoreModManager
-{
-    private static String[] rootPlugins =  { "cpw.mods.fml.relauncher.FMLCorePlugin" , "net.minecraftforge.classloading.FMLForgePlugin" };
-    private static List<String> loadedLibraries = new ArrayList<String>();
-    private static Map<IFMLLoadingPlugin, File> pluginLocations;
-    private static List<IFMLLoadingPlugin> loadPlugins;
-    private static List<ILibrarySet> libraries;
-    private static boolean deobfuscatedEnvironment;
-
-    public static void handleLaunch(File mcDir, LaunchClassLoader classLoader)
-    {
-        try
-        {
-            // Are we in a 'decompiled' environment?
-            byte[] bs = classLoader.getClassBytes("net.minecraft.world.World");
-            if (bs != null)
-            {
-                FMLRelaunchLog.info("Managed to load a deobfuscated Minecraft name- we are in a deobfuscated environment. Skipping runtime deobfuscation");
-                deobfuscatedEnvironment = true;
-            }
-        }
-        catch (IOException e1)
-        {
-        }
-
-        if (!deobfuscatedEnvironment)
-        {
-            FMLRelaunchLog.fine("Enabling runtime deobfuscation");
-        }
-        pluginLocations = new HashMap<IFMLLoadingPlugin, File>();
-        loadPlugins = new ArrayList<IFMLLoadingPlugin>();
-        for (String s : rootPlugins)
-        {
-            try
-            {
-                FMLRelaunchLog.finest("Adding coremod for loading %s", s);
-                IFMLLoadingPlugin plugin = (IFMLLoadingPlugin) Class.forName(s, true, classLoader).newInstance();
-                loadPlugins.add(plugin);
-            }
-            catch (Exception e)
-            {
-                // HMMM
-            }
-        }
-
-        if (loadPlugins.isEmpty())
-        {
-            throw new RuntimeException("A fatal error has occured - no valid fml load plugin was found - this is a completely corrupt FML installation.");
-        }
-
-        downloadMonitor.updateProgressString("All core mods are successfully located");
-        // Now that we have the root plugins loaded - lets see what else might be around
-        String commandLineCoremods = System.getProperty("fml.coreMods.load","");
-        for (String s : commandLineCoremods.split(","))
-        {
-            if (s.isEmpty())
-            {
-                continue;
-            }
-            FMLRelaunchLog.info("Found a command line coremod : %s", s);
-            try
-            {
-                classLoader.addTransformerExclusion(s);
-                Class<?> coreModClass = Class.forName(s, true, classLoader);
-                TransformerExclusions trExclusions = coreModClass.getAnnotation(IFMLLoadingPlugin.TransformerExclusions.class);
-                if (trExclusions!=null)
-                {
-                    for (String st : trExclusions.value())
-                    {
-                        classLoader.addTransformerExclusion(st);
-                    }
-                }
-                IFMLLoadingPlugin plugin = (IFMLLoadingPlugin) coreModClass.newInstance();
-                loadPlugins.add(plugin);
-                if (plugin.getLibraryRequestClass()!=null)
-                {
-                    for (String libName : plugin.getLibraryRequestClass())
-                    {
-                        libraries.add((ILibrarySet) Class.forName(libName, true, classLoader).newInstance());
-                    }
-                }
-            }
-            catch (Throwable e)
-            {
-                FMLRelaunchLog.log(Level.SEVERE,e,"Exception occured trying to load coremod %s",s);
-                throw new RuntimeException(e);
-            }
-        }
-        discoverCoreMods(mcDir, classLoader, loadPlugins, libraries);
-
-        List<Throwable> caughtErrors = new ArrayList<Throwable>();
-        try
-        {
-            File libDir;
-            try
-            {
-                libDir = setupLibDir(mcDir);
-            }
-            catch (Exception e)
-            {
-                caughtErrors.add(e);
-                return;
-            }
-
-            libraries = new ArrayList<ILibrarySet>();
-            for (ILibrarySet lib : libraries)
-            {
-                for (int i=0; i<lib.getLibraries().length; i++)
-                {
-                    boolean download = false;
-                    String libName = lib.getLibraries()[i];
-                    String targFileName = libName.lastIndexOf('/')>=0 ? libName.substring(libName.lastIndexOf('/')) : libName;
-                    String checksum = lib.getHashes()[i];
-                    File libFile = new File(libDir, targFileName);
-                    if (!libFile.exists())
-                    {
-                        try
-                        {
-                            downloadFile(libFile, lib.getRootURL(), libName, checksum);
-                            download = true;
-                        }
-                        catch (Throwable e)
-                        {
-                            caughtErrors.add(e);
-                            continue;
-                        }
-                    }
-
-                    if (libFile.exists() && !libFile.isFile())
-                    {
-                        caughtErrors.add(new RuntimeException(String.format("Found a file %s that is not a normal file - you should clear this out of the way", libName)));
-                        continue;
-                    }
-
-                    if (!download)
-                    {
-                        try
-                        {
-                            FileInputStream fis = new FileInputStream(libFile);
-                            FileChannel chan = fis.getChannel();
-                            MappedByteBuffer mappedFile = chan.map(MapMode.READ_ONLY, 0, libFile.length());
-                            String fileChecksum = generateChecksum(mappedFile);
-                            fis.close();
-                            // bad checksum and I did not download this file
-                            if (!checksum.equals(fileChecksum))
-                            {
-                                caughtErrors.add(new RuntimeException(String.format("The file %s was found in your lib directory and has an invalid checksum %s (expecting %s) - it is unlikely to be the correct download, please move it out of the way and try again.", libName, fileChecksum, checksum)));
-                                continue;
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            FMLRelaunchLog.log(Level.SEVERE, e, "The library file %s could not be validated", libFile.getName());
-                            caughtErrors.add(new RuntimeException(String.format("The library file %s could not be validated", libFile.getName()),e));
-                            continue;
-                        }
-                    }
-
-                    if (!download)
-                    {
-                        downloadMonitor.updateProgressString("Found library file %s present and correct in lib dir", libName);
-                    }
-                    else
-                    {
-                        downloadMonitor.updateProgressString("Library file %s was downloaded and verified successfully", libName);
-                    }
-
-                    try
-                    {
-                        classLoader.addURL(libFile.toURI().toURL());
-                        loadedLibraries.add(libName);
-                    }
-                    catch (MalformedURLException e)
-                    {
-                        caughtErrors.add(new RuntimeException(String.format("Should never happen - %s is broken - probably a somehow corrupted download. Delete it and try again.", libFile.getName()), e));
-                    }
-                }
-            }
-        }
-        finally
-        {
-            if (downloadMonitor.shouldStopIt())
-            {
-                return;
-            }
-            if (!caughtErrors.isEmpty())
-            {
-                FMLRelaunchLog.severe("There were errors during initial FML setup. " +
-                		"Some files failed to download or were otherwise corrupted. " +
-                		"You will need to manually obtain the following files from " +
-                		"these download links and ensure your lib directory is clean. ");
-                for (ILibrarySet set : libraries)
-                {
-                    for (String file : set.getLibraries())
-                    {
-                        FMLRelaunchLog.severe("*** Download "+set.getRootURL(), file);
-                    }
-                }
-                FMLRelaunchLog.severe("<===========>");
-                FMLRelaunchLog.severe("The following is the errors that caused the setup to fail. " +
-                		"They may help you diagnose and resolve the issue");
-                for (Throwable t : caughtErrors)
-                {
-                    if (t.getMessage()!=null)
-                    {
-                        FMLRelaunchLog.severe(t.getMessage());
-                    }
-                }
-                FMLRelaunchLog.severe("<<< ==== >>>");
-                FMLRelaunchLog.severe("The following is diagnostic information for developers to review.");
-                for (Throwable t : caughtErrors)
-                {
-                    FMLRelaunchLog.log(Level.SEVERE, t, "Error details");
-                }
-                throw new RuntimeException("A fatal error occured and FML cannot continue");
-            }
-        }
-
-        for (IFMLLoadingPlugin plug : loadPlugins)
-        {
-            if (plug.getASMTransformerClass()!=null)
-            {
-                for (String xformClass : plug.getASMTransformerClass())
-                {
-                    FMLRelaunchLog.finest("Registering transformer %s", xformClass);
-                    classLoader.registerTransformer(xformClass);
-                }
-            }
-        }
-        // Deobfuscation transformer, always last
-        if (!deobfuscatedEnvironment)
-        {
-            classLoader.registerTransformer("cpw.mods.fml.common.asm.transformers.DeobfuscationTransformer");
-        }
-        downloadMonitor.updateProgressString("Running coremod plugins");
-        Map<String,Object> data = new HashMap<String,Object>();
-        data.put("mcLocation", mcDir);
-        data.put("coremodList", loadPlugins);
-        data.put("runtimeDeobfuscationEnabled", !deobfuscatedEnvironment);
-        for (IFMLLoadingPlugin plugin : loadPlugins)
-        {
-            downloadMonitor.updateProgressString("Running coremod plugin %s", plugin.getClass().getSimpleName());
-            data.put("coremodLocation", pluginLocations.get(plugin));
-            plugin.injectData(data);
-            String setupClass = plugin.getSetupClass();
-            if (setupClass != null)
-            {
-                try
-                {
-                    IFMLCallHook call = (IFMLCallHook) Class.forName(setupClass, true, classLoader).newInstance();
-                    Map<String,Object> callData = new HashMap<String, Object>();
-                    callData.put("mcLocation", mcDir);
-                    callData.put("classLoader", classLoader);
-                    callData.put("coremodLocation", pluginLocations.get(plugin));
-                    callData.put("deobfuscationFileName", FMLInjectionData.debfuscationDataName());
-                    call.injectData(callData);
-                    call.call();
-                }
-                catch (Exception e)
-                {
-                    throw new RuntimeException(e);
-                }
-            }
-            downloadMonitor.updateProgressString("Coremod plugin %s run successfully", plugin.getClass().getSimpleName());
-
-            String modContainer = plugin.getModContainerClass();
-            if (modContainer != null)
-            {
-                FMLInjectionData.containers.add(modContainer);
-            }
-        }
-        try
-        {
-            downloadMonitor.updateProgressString("Validating minecraft");
-            Class<?> loaderClazz = Class.forName("cpw.mods.fml.common.Loader", true, classLoader);
-            Method m = loaderClazz.getMethod("injectData", Object[].class);
-            m.invoke(null, (Object)FMLInjectionData.data());
-            m = loaderClazz.getMethod("instance");
-            m.invoke(null);
-            downloadMonitor.updateProgressString("Minecraft validated, launching...");
-            downloadBuffer = null;
-        }
-        catch (Exception e)
-        {
-            // Load in the Loader, make sure he's ready to roll - this will initialize most of the rest of minecraft here
-            System.out.println("A CRITICAL PROBLEM OCCURED INITIALIZING MINECRAFT - LIKELY YOU HAVE AN INCORRECT VERSION FOR THIS FML");
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static void discoverCoreMods(File mcDir, LaunchClassLoader classLoader, List<IFMLLoadingPlugin> loadPlugins, List<ILibrarySet> libraries)
-    {
-        downloadMonitor.updateProgressString("Discovering coremods");
-        File coreMods = setupCoreModDir(mcDir);
-        FilenameFilter ff = new FilenameFilter()
-        {
-            @Override
-            public boolean accept(File dir, String name)
-            {
-                return name.endsWith(".jar");
-            }
-        };
-        File[] coreModList = coreMods.listFiles(ff);
-        Arrays.sort(coreModList);
-
-        for (File coreMod : coreModList)
-        {
-            downloadMonitor.updateProgressString("Found a candidate coremod %s", coreMod.getName());
-            JarFile jar;
-            Attributes mfAttributes;
-            try
-            {
-                jar = new JarFile(coreMod);
-                if (jar.getManifest() == null)
-                {
-                    FMLRelaunchLog.warning("Found an un-manifested jar file in the coremods folder : %s, it will be ignored.", coreMod.getName());
-                    continue;
-                }
-                mfAttributes = jar.getManifest().getMainAttributes();
-            }
-            catch (IOException ioe)
-            {
-                FMLRelaunchLog.log(Level.SEVERE, ioe, "Unable to read the coremod jar file %s - ignoring", coreMod.getName());
-                continue;
-            }
-
-            String fmlCorePlugin = mfAttributes.getValue("FMLCorePlugin");
-            if (fmlCorePlugin == null)
-            {
-                FMLRelaunchLog.severe("The coremod %s does not contain a valid jar manifest- it will be ignored", coreMod.getName());
-                continue;
-            }
-
-//            String className = fmlCorePlugin.replace('.', '/').concat(".class");
-//            JarEntry ent = jar.getJarEntry(className);
-//            if (ent ==null)
-//            {
-//                FMLLog.severe("The coremod %s specified %s as it's loading class but it does not include it - it will be ignored", coreMod.getName(), fmlCorePlugin);
-//                continue;
-//            }
-//            try
-//            {
-//                Class<?> coreModClass = Class.forName(fmlCorePlugin, false, classLoader);
-//                FMLLog.severe("The coremods %s specified a class %s that is already present in the classpath - it will be ignored", coreMod.getName(), fmlCorePlugin);
-//                continue;
-//            }
-//            catch (ClassNotFoundException cnfe)
-//            {
-//                // didn't find it, good
-//            }
-            try
-            {
-                classLoader.addURL(coreMod.toURI().toURL());
-            }
-            catch (MalformedURLException e)
-            {
-                FMLRelaunchLog.log(Level.SEVERE, e, "Unable to convert file into a URL. weird");
-                continue;
-            }
-            try
-            {
-                downloadMonitor.updateProgressString("Loading coremod %s", coreMod.getName());
-                classLoader.addTransformerExclusion(fmlCorePlugin);
-                Class<?> coreModClass = Class.forName(fmlCorePlugin, true, classLoader);
-                MCVersion requiredMCVersion = coreModClass.getAnnotation(IFMLLoadingPlugin.MCVersion.class);
-                String version = "";
-                if (requiredMCVersion == null)
-                {
-                    FMLRelaunchLog.log(Level.WARNING, "The coremod %s does not have a MCVersion annotation, it may cause issues with this version of Minecraft", fmlCorePlugin);
-                }
-                else
-                {
-                    version = requiredMCVersion.value();
-                }
-                if (!"".equals(version) && !FMLInjectionData.mccversion.equals(version))
-                {
-                    FMLRelaunchLog.log(Level.SEVERE, "The coremod %s is requesting minecraft version %s and minecraft is %s. It will be ignored.", fmlCorePlugin, version, FMLInjectionData.mccversion);
-                    continue;
-                }
-                else if (!"".equals(version))
-                {
-                    FMLRelaunchLog.log(Level.FINE, "The coremod %s requested minecraft version %s and minecraft is %s. It will be loaded.", fmlCorePlugin, version, FMLInjectionData.mccversion);
-                }
-                TransformerExclusions trExclusions = coreModClass.getAnnotation(IFMLLoadingPlugin.TransformerExclusions.class);
-                if (trExclusions!=null)
-                {
-                    for (String st : trExclusions.value())
-                    {
-                        classLoader.addTransformerExclusion(st);
-                    }
-                }
-                IFMLLoadingPlugin plugin = (IFMLLoadingPlugin) coreModClass.newInstance();
-                loadPlugins.add(plugin);
-                pluginLocations .put(plugin, coreMod);
-                if (plugin.getLibraryRequestClass()!=null)
-                {
-                    for (String libName : plugin.getLibraryRequestClass())
-                    {
-                        libraries.add((ILibrarySet) Class.forName(libName, true, classLoader).newInstance());
-                    }
-                }
-                downloadMonitor.updateProgressString("Loaded coremod %s", coreMod.getName());
-            }
-            catch (ClassNotFoundException cnfe)
-            {
-                FMLRelaunchLog.log(Level.SEVERE, cnfe, "Coremod %s: Unable to class load the plugin %s", coreMod.getName(), fmlCorePlugin);
-            }
-            catch (ClassCastException cce)
-            {
-                FMLRelaunchLog.log(Level.SEVERE, cce, "Coremod %s: The plugin %s is not an implementor of IFMLLoadingPlugin", coreMod.getName(), fmlCorePlugin);
-            }
-            catch (InstantiationException ie)
-            {
-                FMLRelaunchLog.log(Level.SEVERE, ie, "Coremod %s: The plugin class %s was not instantiable", coreMod.getName(), fmlCorePlugin);
-            }
-            catch (IllegalAccessException iae)
-            {
-                FMLRelaunchLog.log(Level.SEVERE, iae, "Coremod %s: The plugin class %s was not accessible", coreMod.getName(), fmlCorePlugin);
-            }
-        }
-    }
-
-    /**
-     * @param mcDir the minecraft home directory
-     * @return the lib directory
-     */
-    private static File setupLibDir(File mcDir)
-    {
-        File libDir = new File(mcDir,"lib");
-        try
-        {
-            libDir = libDir.getCanonicalFile();
-        }
-        catch (IOException e)
-        {
-            throw new RuntimeException(String.format("Unable to canonicalize the lib dir at %s", mcDir.getName()),e);
-        }
-        if (!libDir.exists())
-        {
-            libDir.mkdir();
-        }
-        else if (libDir.exists() && !libDir.isDirectory())
-        {
-            throw new RuntimeException(String.format("Found a lib file in %s that's not a directory", mcDir.getName()));
-        }
-        return libDir;
-    }
-
-    /**
-     * @param mcDir the minecraft home directory
-     * @return the coremod directory
-     */
-    private static File setupCoreModDir(File mcDir)
-    {
-        File coreModDir = new File(mcDir,"coremods");
-        try
-        {
-            coreModDir = coreModDir.getCanonicalFile();
-        }
-        catch (IOException e)
-        {
-            throw new RuntimeException(String.format("Unable to canonicalize the coremod dir at %s", mcDir.getName()),e);
-        }
-        if (!coreModDir.exists())
-        {
-            coreModDir.mkdir();
-        }
-        else if (coreModDir.exists() && !coreModDir.isDirectory())
-        {
-            throw new RuntimeException(String.format("Found a coremod file in %s that's not a directory", mcDir.getName()));
-        }
-        return coreModDir;
-    }
-
-    private static void downloadFile(File libFile, String rootUrl,String realFilePath, String hash)
-    {
-        try
-        {
-            URL libDownload = new URL(String.format(rootUrl,realFilePath));
-            downloadMonitor.updateProgressString("Downloading file %s", libDownload.toString());
-            FMLRelaunchLog.info("Downloading file %s", libDownload.toString());
-            URLConnection connection = libDownload.openConnection();
-            connection.setConnectTimeout(5000);
-            connection.setReadTimeout(5000);
-            connection.setRequestProperty("User-Agent", "FML Relaunch Downloader");
-            int sizeGuess = connection.getContentLength();
-            performDownload(connection.getInputStream(), sizeGuess, hash, libFile);
-            downloadMonitor.updateProgressString("Download complete");
-            FMLRelaunchLog.info("Download complete");
-        }
-        catch (Exception e)
-        {
-            if (downloadMonitor.shouldStopIt())
-            {
-                FMLRelaunchLog.warning("You have stopped the downloading operation before it could complete");
-                return;
-            }
-            if (e instanceof RuntimeException) throw (RuntimeException)e;
-            FMLRelaunchLog.severe("There was a problem downloading the file %s automatically. Perhaps you " +
-            		"have an environment without internet access. You will need to download " +
-            		"the file manually or restart and let it try again\n", libFile.getName());
-            libFile.delete();
-            throw new RuntimeException("A download error occured", e);
-        }
-    }
-
-    public static List<String> getLibraries()
-    {
-        return loadedLibraries;
-    }
-
-    private static ByteBuffer downloadBuffer = ByteBuffer.allocateDirect(1 << 23);
-    static IDownloadDisplay downloadMonitor;
-
-    private static void performDownload(InputStream is, int sizeGuess, String validationHash, File target)
-    {
-        if (sizeGuess > downloadBuffer.capacity())
-        {
-            throw new RuntimeException(String.format("The file %s is too large to be downloaded by FML - the coremod is invalid", target.getName()));
-        }
-        downloadBuffer.clear();
-
-        int bytesRead, fullLength = 0;
-
-        downloadMonitor.resetProgress(sizeGuess);
-        try
-        {
-            downloadMonitor.setPokeThread(Thread.currentThread());
-            byte[] smallBuffer = new byte[1024];
-            while ((bytesRead = is.read(smallBuffer)) >= 0) {
-                downloadBuffer.put(smallBuffer, 0, bytesRead);
-                fullLength += bytesRead;
-                if (downloadMonitor.shouldStopIt())
-                {
-                    break;
-                }
-                downloadMonitor.updateProgress(fullLength);
-            }
-            is.close();
-            downloadMonitor.setPokeThread(null);
-            downloadBuffer.limit(fullLength);
-            downloadBuffer.position(0);
-        }
-        catch (InterruptedIOException e)
-        {
-            // We were interrupted by the stop button. We're stopping now.. clear interruption flag.
-            Thread.interrupted();
-            return;
-        }
-        catch (IOException e)
-        {
-            throw new RuntimeException(e);
-        }
-
-
-        try
-        {
-            String cksum = generateChecksum(downloadBuffer);
-            if (cksum.equals(validationHash))
-            {
-                downloadBuffer.position(0);
-                FileOutputStream fos = new FileOutputStream(target);
-                fos.getChannel().write(downloadBuffer);
-                fos.close();
-            }
-            else
-            {
-                throw new RuntimeException(String.format("The downloaded file %s has an invalid checksum %s (expecting %s). The download did not succeed correctly and the file has been deleted. Please try launching again.", target.getName(), cksum, validationHash));
-            }
-        }
-        catch (Exception e)
-        {
-            if (e instanceof RuntimeException) throw (RuntimeException)e;
-            throw new RuntimeException(e);
-        }
-
-
-
-    }
-
-    private static String generateChecksum(ByteBuffer buffer)
-    {
-        return CertificateHelper.getFingerprint(buffer);
-    }
-}

common/cpw/mods/fml/relauncher/Downloader.java

@@ -1,152 +0,0 @@
-/*
- * 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.relauncher;
-
-import java.awt.Dialog.ModalityType;
-import java.awt.Dimension;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import javax.swing.Box;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JProgressBar;
-
-import cpw.mods.fml.common.FMLLog;
-
-public class Downloader extends JOptionPane implements IDownloadDisplay
-{
-    private JDialog container;
-    private JLabel currentActivity;
-    private JProgressBar progress;
-    boolean stopIt;
-    Thread pokeThread;
-
-    private Box makeProgressPanel()
-    {
-        Box box = Box.createVerticalBox();
-        box.add(Box.createRigidArea(new Dimension(0,10)));
-        JLabel welcomeLabel = new JLabel("<html><b><font size='+1'>FML is setting up your minecraft environment</font></b></html>");
-        box.add(welcomeLabel);
-        welcomeLabel.setAlignmentY(LEFT_ALIGNMENT);
-        welcomeLabel = new JLabel("<html>Please wait, FML has some tasks to do before you can play</html>");
-        welcomeLabel.setAlignmentY(LEFT_ALIGNMENT);
-        box.add(welcomeLabel);
-        box.add(Box.createRigidArea(new Dimension(0,10)));
-        currentActivity = new JLabel("Currently doing ...");
-        box.add(currentActivity);
-        box.add(Box.createRigidArea(new Dimension(0,10)));
-        progress = new JProgressBar(0, 100);
-        progress.setStringPainted(true);
-        box.add(progress);
-        box.add(Box.createRigidArea(new Dimension(0,30)));
-        return box;
-    }
-
-    public JDialog makeDialog()
-    {
-        setMessageType(JOptionPane.INFORMATION_MESSAGE);
-        setMessage(makeProgressPanel());
-        setOptions(new Object[] { "Stop" });
-        addPropertyChangeListener(new PropertyChangeListener()
-        {
-            @Override
-            public void propertyChange(PropertyChangeEvent evt)
-            {
-                if (evt.getSource() == Downloader.this && evt.getPropertyName()==VALUE_PROPERTY)
-                {
-                    requestClose("This will stop minecraft from launching\nAre you sure you want to do this?");
-                }
-            }
-        });
-        container = new JDialog(null, "Hello", ModalityType.MODELESS);
-        container.setResizable(false);
-        container.setLocationRelativeTo(null);
-        container.add(this);
-        this.updateUI();
-        container.pack();
-        container.setMinimumSize(container.getPreferredSize());
-        container.setVisible(true);
-        container.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-        container.addWindowListener(new WindowAdapter()
-        {
-            @Override
-            public void windowClosing(WindowEvent e)
-            {
-                requestClose("Closing this window will stop minecraft from launching\nAre you sure you wish to do this?");
-            }
-        });
-        return container;
-    }
-    protected void requestClose(String message)
-    {
-        int shouldClose = JOptionPane.showConfirmDialog(container, message, "Are you sure you want to stop?", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
-        if (shouldClose == JOptionPane.YES_OPTION)
-        {
-            container.dispose();
-        }
-        stopIt = true;
-        if (pokeThread != null)
-        {
-            pokeThread.interrupt();
-        }
-    }
-
-    public void updateProgressString(String progressUpdate, Object... data)
-    {
-        FMLLog.finest(progressUpdate, data);
-        if (currentActivity!=null)
-        {
-            currentActivity.setText(String.format(progressUpdate,data));
-        }
-    }
-
-    public void resetProgress(int sizeGuess)
-    {
-        if (progress!=null)
-        {
-            progress.getModel().setRangeProperties(0, 0, 0, sizeGuess, false);
-        }
-    }
-
-    public void updateProgress(int fullLength)
-    {
-        if (progress!=null)
-        {
-            progress.getModel().setValue(fullLength);
-        }
-    }
-
-    public void makeHeadless()
-    {
-        container = null;
-        progress = null;
-        currentActivity = null;
-    }
-
-    @Override
-    public void setPokeThread(Thread currentThread)
-    {
-        this.pokeThread = currentThread;
-    }
-
-    @Override
-    public boolean shouldStopIt()
-    {
-        return stopIt;
-    }
-}

common/cpw/mods/fml/relauncher/DummyDownloader.java

@@ -1,68 +0,0 @@
-/*
- * 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.relauncher;
-
-import java.util.logging.Level;
-
-public class DummyDownloader implements IDownloadDisplay
-{
-
-    @Override
-    public void resetProgress(int sizeGuess)
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setPokeThread(Thread currentThread)
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void updateProgress(int fullLength)
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public boolean shouldStopIt()
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public void updateProgressString(String string, Object... data)
-    {
-        FMLRelaunchLog.log(Level.FINE, string, data);
-    }
-
-    @Override
-    public Object makeDialog()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void makeHeadless()
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-}

common/cpw/mods/fml/relauncher/IDownloadDisplay.java

@@ -1,34 +0,0 @@
-/*
- * 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.relauncher;
-
-import javax.swing.JDialog;
-
-public interface IDownloadDisplay
-{
-
-    void resetProgress(int sizeGuess);
-
-    void setPokeThread(Thread currentThread);
-
-    void updateProgress(int fullLength);
-
-    boolean shouldStopIt();
-
-    void updateProgressString(String string, Object ... data);
-
-    Object makeDialog();
-
-    void makeHeadless();
-
-}

common/cpw/mods/fml/relauncher/ILibrarySet.java

@@ -1,42 +0,0 @@
-/*
- * 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.relauncher;
-
-/**
- * Interface for certain core plugins to register libraries to
- * be loaded in by the FML class loader at launch time
- *
- * @author cpw
- *
- */
-public interface ILibrarySet
-{
-    /**
-     * Return a list of libraries available from a common location
-     *
-     * @return a list of libraries available from a common location
-     */
-    String[] getLibraries();
-    /**
-     * Return the string encoded sha1 hash for each library in the returned list
-     *
-     * @return the string encoded sha1 hash for each library in the returned list
-     */
-    String[] getHashes();
-    /**
-     * Return the root URL format string from which this library set can be obtained
-     * There needs to be a single %s string substitution which is the library name
-     * @return the root URL format string from which this library set can be obtained
-     */
-    String getRootURL();
-}

common/cpw/mods/fml/relauncher/ServerLaunchWrapper.java

@@ -1,32 +0,0 @@
-package cpw.mods.fml.relauncher;
-
-import java.io.File;
-import java.net.URLClassLoader;
-import java.util.logging.Level;
-
-import net.minecraft.launchwrapper.Launch;
-import net.minecraft.launchwrapper.LaunchClassLoader;
-
-import com.google.common.base.Throwables;
-
-public class ServerLaunchWrapper {
-
-    /**
-     * @param args
-     */
-    public static void main(String[] args)
-    {
-        new ServerLaunchWrapper().run(args);
-    }
-
-    private ServerLaunchWrapper()
-    {
-
-    }
-
-    private void run(String[] args)
-    {
-        Launch.main(args);
-    }
-
-}

common/fml_at.cfg

@@ -1,76 +0,0 @@
-#Main FML Access Transformer configuration file
-# TileEntity addMapping
-public asi.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
-# EntityList addMappings
-public nq.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
-public nq.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
-public nq.b #FD:EntityList/field_75625_b #nameToClassMap
-public nq.c #FD:EntityList/field_75626_c #classToNameMap
-public nq.d #FD:EntityList/field_75623_d #idToClassMap
-# RenderEngine
-#public bba.h #FD:RenderEngine/field_78367_h #textureList # -- MISSING MAPPING # -- MISSING MAPPING
-#public bge.g #FD:RenderEngine/field_78366_k #texturePack # -- MISSING MAPPING
-# RenderManager
-public bga.q #FD:RenderManager/field_78729_o #renderers
-# RenderBlocks - everything
-public bfg.* #FD:RenderBlocks/*
-public bfg.*() #MD:RenderBlocks/*
-#RenderPlayer
-#public-f bht.h #FD:RenderPlayer/field_77110_j #armorlist # -- MISSING MAPPING
-#RenderBiped
-public-f bgj.l #FD:RenderBiped/field_82424_k #armorlist
-#StringTranslate
-#public bp.b #FD:StringTranslate/field_74815_b # -- MISSING MAPPING
-#public bp.e #FD:StringTranslate/field_74813_d # -- MISSING MAPPING
-# TileEntityRenderer
-public bis.m #FD:TileEntityRenderer/field_76966_m
-# CraftingManager - make the add recipe methods public
-public aaa.a(Lxz;[Ljava/lang/Object;)Laad; #MD:CraftingManager/func_92103_a
-public aaa.b(Lxz;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
-# WeightedRandomItem
-public mg.a #FD:WeightedRandomItem/field_76292_a #probability
-# ItemStack
-#public+f tv.c #FD:ItemStack/field_77993_c #itemId
-# StatBase
-public kr.a #FD:StatBase/field_75978_a #statName
-# NetLoginHandler
-public jv.a(Ljv;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
-public jv.g #FD:NetLoginHandler/field_72543_h #userName
-# EntityPlayerMP getNextWindowId
-public js.bJ()V #MD:EntityPlayerMP/func_71117_bO
-public js.bX #FD:EntityPlayerMP/field_71139_cq
-# EntityAITaskEntry
-public pr #CL:EntityAITaskEntry
-# EntityAITasks
-public pq.a #FD:EntityAITasks/field_75782_a #taskList
-# BlockChest
-public and.m(Labr;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
-# EntityLiving
-#public ng.aU #FD:EntityLiving/field_70736_aM #carryoverDamage # -- MISSING MAPPING
-public od.c #FD:EntityLiving/field_70714_bg #tasks
-#public ng.bG #FD:EntityLiving/field_70703_bu #isJumping # -- MISSING MAPPING
-# EntityAIOcelotSit
-protected qd.a(Labr;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
-protected qd.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
-# CallableMinecraftVersion - sanity check the MC version
-public c #CL:CallableMinecraftVersion
-public c.<init>(Lb;)V #MD:CallableMinecraftVersion/<init>(Lnet/minecraft/src/CrashReport;) #constructor
-# EntityAnimal
-public rm.bp #FD:EntityAnimal/field_70881_d #inLove
-# WorldType
-public acb.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
-public acb.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
-# ComponentVillage
-public ajf #CL:ComponentVillage
-# EntityVillager - minmax lists
-public tw.a(Labh;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
-public tw.b(Labh;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
-public tw.bB #FD:EntityVillager/field_70958_bB
-public tw.bC #FD:EntityVillager/field_70960_bC
-# GuiButtonMerchant
-public axo #CL:GuiButtonMerchant
-
-protected auo.a #FD:GuiYesNo/field_73942_a #guiScreen
-# Minecraft
-public atn.C #FD:Minecraft/field_71425_J #running
-public atn.M #FD:Minecraft/field_71446_o # textureManager

common/fml_marker.cfg

@@ -1,12 +0,0 @@
-# Marker interfaces to add to minecraft - helps in bukkit and client/server unification
-# Only runs at runtime because it's not necessary at compile time
-# has deobf and obf mappings so it runs OK in mcp
-# entityplayer -> network/player
-ua cpw/mods/fml/common/network/Player
-net.minecraft.entity.player.EntityPlayer cpw/mods/fml/common/network/Player
-# block -> blockproxy
-aqs cpw/mods/fml/common/registry/BlockProxy
-net.minecraft.block.Block cpw/mods/fml/common/registry/BlockProxy
-# item -> itemproxy
-xx cpw/mods/fml/common/registry/ItemProxy
-net.minecraft.item.Item cpw/mods/fml/common/registry/ItemProxy

conf/mcp.cfg

@@ -22,8 +22,8 @@ Params  = %(DirConf)s/params.csv
 NewIds  = %(DirConf)s/newids.csv
 
 [SRGS]
-ConfClient     = %(DirConf)s/packaged.srg
-ConfServer     = %(DirConf)s/packaged.srg
+ConfClient     = %(DirConf)s/client.srg
+ConfServer     = %(DirConf)s/server.srg
 Client         = %(DirTemp)s/client_rg.srg
 Server         = %(DirTemp)s/server_rg.srg
 DeobfClient    = %(DirTemp)s/client_deobf.srg
@@ -38,8 +38,8 @@ DirNatives = %(DirJars)s/bin/natives
 Client     = %(DirJars)s/bin/minecraft.jar
 Server     = %(DirJars)s/minecraft_server.jar
 LWJGL      = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
-MD5Client  = 3c56fb4b77b1ca37dde69b5eb896fc4d
-MD5Server  = ff8f81970a5955737c356b534d3aee96
+MD5Client  = 7a304554fdea879a799efe6eaedd8c95
+MD5Server  = c48168f463e935262ea65b702f175153
 
 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@@ -58,8 +58,10 @@ ServerDeobLog  = %(DirLogs)s/server_deob.log
 NullPkg        = net/minecraft/src
 
 [EXCEPTOR]
-XClientCfg      = %(DirConf)s/packaged.exc
-XServerCfg      = %(DirConf)s/packaged.exc
+XClientJson     = %(DirConf)s/exceptor.json
+XServerJson     = %(DirConf)s/exceptor.json
+XClientCfg      = %(DirConf)s/joined.exc
+XServerCfg      = %(DirConf)s/joined.exc
 XClientOut      = %(DirTemp)s/minecraft_exc.jar
 XServerOut      = %(DirTemp)s/minecraft_server_exc.jar
 XClientLog      = %(DirLogs)s/client_exc.log
@@ -100,7 +102,7 @@ ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJa
 ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
 ClientFixes     = %(DirConf)s/patches
 FixStart        = Start
-IgnorePkg       = paulscode,com,isom,ibxm,de/matthiasmann/twl,org,javax/xml,javax/ws,argo
+IgnorePkg       = paulscode,com,isom,ibxm,de/matthiasmann/twl,org,javax,argo,gnu,io/netty
 
 [REOBF]
 MD5Client         = %(DirTemp)s/client.md5
@@ -125,10 +127,10 @@ OutSRCServer      = %(DirModSrc)s/minecraft_server
 [MCP]
 LogFile           = %(DirLogs)s/mcp.log
 LogFileErr        = %(DirLogs)s/mcperr.log
-UpdateUrl         = 
+UpdateUrl         = http://mcp.ocean-labs.de/files/mcprolling_{version}/
 IgnoreUpdate      = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
-RGIndex           = 140000
-ParamIndex        = 40000
+RGIndex           = 145000
+ParamIndex        = 45000
 
 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg
@@ -155,9 +157,9 @@ CmdRGReobf    = %s -cp "{classpath}" RetroGuard -notch {conffile}
 CmdSS         = %s -cp "{classpath}" -jar %s -i {injar} -o {outjar} -m {mapfile} --kill-source
 CmdSSReobf    = %s -cp "{classpath}" -jar %s -i {injar} -o {outjar} -r -m {mapfile} -d {identifier} -e %s
 CmdJadretro   = %s -jar %s {targetdir}
-CmdFernflower = %s -Xmx512M -jar %s -din=0 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
-CmdExceptor   = %s -jar %s {input} {output} {conf} {log}
-CmdRecomp     = %s -encoding UTF-8 -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
+CmdFernflower = %s -jar %s -din=1 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
+CmdExceptor   = %s -jar %s --jarIn {input} --jarOut {output} --mapIn {conf} --log {log} --jsonIn {json} --applyMarkers
+CmdRecomp     = %s -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
 CmdRecompScala = %s -encoding UTF-8 -deprecation -target:jvm-1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
 CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer
 CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start