Fix license and naming

added src distribution gradle file
Move to install to not clutter root directory with the .bat and .sh files I know are coming.
2026-11-14 09:05:17 +00:00 · 2013-11-09 14:28:54 -05:00 · 2013-11-09 14:28:54 -05:00 · 2013-11-09 14:28:54 -05:00 · 2013-11-09 14:28:54 -05:00 · 2013-11-09 14:28:53 -05:00
302 changed files with 1808 additions and 6900 deletions
@@ -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
@@ -1,20 +1,16 @@
+#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
-/*.lzma
-**/*.lzma
-/installer_base.jar
+/.settings
+/.classpath
+
+#idea
+/.idea
+*.iml
+
+#gradle
+/build
+/.gradle
+
+#occupational hazards
+/eclipse/
+/repo/
@@ -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"
-}
@@ -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()
@@ -0,0 +1,106 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
+    }
+}
+
+import static net.minecraftforge.gradle.dev.FmlDevPlugin.*
+
+apply plugin: 'maven'
+apply plugin: 'fmldev'
+
+repositories {
+    flatDir {
+        name "fileRepo"
+        dirs "repo"
+    }
+}
+
+minecraft {
+    version = '1.6.4'
+    fmlDir = projectDir.getAbsolutePath();
+    mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
+    installerVersion = "1.4"
+}
+
+group = 'cpw.mods'
+version = getVersionFromGit(project)
+
+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' }
+                            }
+                        }
+                        developers {
+                            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())
+            }
+        }
+    }
+}
@@ -1,473 +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" depends="buildenvsetup,build-deobf-data">
-    <copy todir="${client.mcp.srcdir}" overwrite="true" verbose="true">
-      <fileset dir="${common.src.dir}" includes="**/*.java" />
-      <fileset dir="${basedir}" includes="deobfuscation_data-${version.minecraft}.lzma"/>
-    </copy>
-  </target>
-
-  <target name="merge-source" depends="buildenvsetup,merge-client,merge-common" />
-
-  <target name="build-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" />
-    <path id="server.classpath">
-      <pathelement path="${mcp.home}/jars/libraries/net/minecraft/launchwrapper/1.3/launchwrapper-1.3.jar"/>
-      <pathelement path="${mcp.home}/jars/libraries/org/ow2/asm/asm-all/4.1/asm-all-4.1.jar"/>
-      <pathelement path="${mcp.home}/jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
-      <pathelement path="${mcp.home}/jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar"/>
-      <pathelement path="${mcp.home}/jars/libraries/org/scala-lang/scala-library/2.10.2/scala-library-2.10.2.jar"/>
-      <pathelement path="${mcp.home}/jars/libraries/org/scala-lang/scala-compiler/2.10.2/scala-compiler-2.10.2.jar"/>
-      <pathelement path="${mcp.home}/jars/minecraft_server.${version.minecraft}.jar"/>
-    </path>
-    <manifestclasspath property="server.jar.classpath" jarfile="${mcp.home}/jars/minecraft_server.jar">
-      <classpath refid="server.classpath" />
-    </manifestclasspath>
-    <jar destfile="${basedir}/target/${universal.jarname}.jar" duplicate="preserve">
-      <manifest>
-        <attribute name="Main-Class" value="cpw.mods.fml.relauncher.ServerLaunchWrapper" />
-        <attribute name="Class-Path" value="${server.jar.classpath}" />
-      </manifest>
-      <fileset dir="${client.mcp.obfoutput}" includes="**/*.class" excludes="*.class,net/minecraft/**/*.class" />
-    </jar>
-    <antcall target="signjar" />
-    <zip update="true" destfile="${basedir}/target/${universal.jarname}.jar">
-      <fileset dir="${basedir}" includes="binpatches.pack.lzma,deobfuscation_data-${version.minecraft}.lzma"/>
-      <fileset dir="${client.mcp.obfoutput}" includes="*.class" />
-      <zipfileset dir="${basedir}" includes="fmlversion.properties" />
-      <zipfileset dir="${basedir}" includes="LICENSE-fml.txt" />
-      <zipfileset dir="${common.src.dir}" includes="mcpmod.info" />
-      <zipfileset dir="${client.src.dir}" includes="mcplogo.png" />
-      <zipfileset dir="${basedir}" includes="install/CREDITS-fml.txt" fullpath="CREDITS-fml.txt" />
-      <zipfileset dir="${common.src.dir}" includes="*.cfg" />
-      <mappedresources>
-        <concat>
-          <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-installer" depends="build-universal">
-    <condition property="version.fullname" value="${version.minecraft}-${version}" else="${version.minecraft}-${version}-${version.branch}">
-      <equals arg1="${version.branch}" arg2="master" />
-    </condition>
-    <tstamp>
-      <format property="current.time" pattern="yyyy-MM-dd'T'HH:mm:ssZ" />
-    </tstamp>
-
-    <delete file="${basedir}/installer_base.jar" />
-    <delete file="${basedir}/install_profile.json" />
-    <get src="http://files.minecraftforge.net/installer/forge-installer-1.3-shrunk.jar" dest="${basedir}/installer_base.jar" />
-    <copy file="${basedir}/jsons/${version.minecraft}-rel.json" tofile="${basedir}/install_profile.json" />
-    <copy file="${basedir}/installer_base.jar" tofile="${basedir}/target/${modname}-installer-${version.fullname}.jar" />
-    <replace file="${basedir}/install_profile.json">
-      <replaceFilter token="@version@" value="${version}" />
-      <replaceFilter token="@minecraft_version@" value="${version.minecraft}" />
-      <replaceFilter token="@timestamp@" value="${current.time}" />
-      <replaceFilter token="@universal_jar@" value="${modname}-universal-${version.fullname}.jar" />
-    </replace>
-    <jar destfile="${basedir}/target/${modname}-installer-${version.fullname}.jar" update="true">
-      <zipfileset dir="${basedir}" includes="install_profile.json" />
-      <zipfileset dir="${basedir}/jsons" includes="big_logo.png" />
-      <zipfileset dir="${basedir}/target" includes="${modname}-universal-${version.fullname}.jar" />
-    </jar>
-    <delete file="${basedir}/install_profile.json" />
-  </target>
-
-  <target name="build-source-pack" depends="makeversion">
-    <property name="srcpack.jarname" value="${modname}-src-${version.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="${basedir}/jsons" includes="${version.minecraft}-dev.json" fullpath="fml/fml.json"/>
-      <zipfileset dir="${basedir}" includes="deobfuscation_data-${version.minecraft}.lzma" prefix="fml/common" />
-      <zipfileset dir="${common.src.dir}" includes="**/*.java" prefix="fml/common" />
-      <zipfileset dir="${client.src.dir}" includes="**/*.java" prefix="fml/client" />
-      <zipfileset dir="${client.src.dir}" includes="mcp.png" prefix="fml/client" />
-      <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" />
-  </target>
-
-  <target name="build" depends="buildenvsetup,build-deobf-data,merge-client,merge-common,build-universal,build-installer,build-source-pack" />
-
-  <target name="jenkinsbuild" depends="buildenvsetup,jenkinsfmldecompile,patch,build" />
-
-  <target name="patch" depends="buildenvsetup">
-    <exec executable="${python.exe}" dir="${basedir}">
-      <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" />
-    <delete>
-      <fileset dir="${basedir}" includes="deobfuscation_data-*.lzma" />
-    </delete>
-    <antcall target="build-deobf-data" />
-    <copy todir="${common.src.dir}">
-      <fileset dir="${basedir}" includes="deobfuscation_data-*.lzma" />
-    </copy>
-    <antcall target="makeeclipse" />
-    <echo>Setup complete! You should now be able to open ${basedir}/eclipse as a workspace in eclipse and import/refresh the FML project</echo>
-  </target>
-
-  <target name="fmldecompile" depends="buildenvsetup,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-debug-all/4.1/asm-debug-all-4.1.jar"/>
-      <pathelement path="${mcp.home}/jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
-      <pathelement path="${mcp.obfoutput}/minecraft"/>
-    </path>
-    <delete dir="${basedir}/binpatch" verbose="true"/>
-    <java classname="cpw.mods.fml.common.patcher.GenDiffSet" classpathref="diffset.libs">
-      <arg path="${mcp.home}/jars/versions/${version.minecraft}/${version.minecraft}.jar.backup"/>
-      <arg path="${mcp.obfoutput}/minecraft"/>
-      <arg path="${basedir}/deobfuscation_data-${version.minecraft}.lzma"/>
-      <arg path="${basedir}/binpatch/client"/>
-      <arg value="false"/>
-    </java>
-    <java classname="cpw.mods.fml.common.patcher.GenDiffSet"  classpathref="diffset.libs">
-      <arg path="${mcp.home}/jars/minecraft_server.${version.minecraft}.jar.backup"/>
-      <arg path="${mcp.obfoutput}/minecraft"/>
-      <arg path="${basedir}/deobfuscation_data-${version.minecraft}.lzma"/>
-      <arg path="${basedir}/binpatch/server"/>
-      <arg value="true"/>
-    </java>
-    <mkdir dir="binpatch-tmp"/>
-    <zip destfile="binpatch-tmp/binpatches.jar" basedir="${basedir}">
-      <include name="binpatch/**/*.binpatch"/>
-    </zip>
-    <apply executable="pack200">
-      <arg line="--no-gzip"/>
-      <arg line="binpatch-tmp/binpatches.pack"/>
-      <fileset dir="binpatch-tmp" includes="binpatches.jar"/>
-    </apply>
-    <apply executable="${lzma.exe}">
-      <arg line="--format=lzma"/>
-      <arg line="-v"/>
-      <fileset dir="binpatch-tmp" includes="binpatches.pack"/>
-    </apply>
-    <move file="binpatch-tmp/binpatches.pack.lzma" todir="${basedir}"/>
-    <delete dir="binpatch-tmp" failonerror="false"/>
-  </target>
-</project>
@@ -1,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));
-	}
-}
@@ -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;
-	}
-
-}
@@ -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
-    }
-}
@@ -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);
-        }
-    }
-
-}
@@ -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 "";
-
-}
@@ -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);
-    }
-}
@@ -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 "";
-}
@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface BiomeGenBase {
-
-}
@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface Block {
-
-}
@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface Entity {
-
-}
@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface EntityLiving {
-
-}
@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface EnumCreatureType {
-
-}
@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface IRecipe {
-
-}
@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface ItemBlock {
-
-}
@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface ItemStack {
-
-}
@@ -1,5 +0,0 @@
-package net.minecraft.src;
-
-public interface TileEntity {
-
-}
@@ -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()
@@ -1,125 +0,0 @@
--- commands.py
-+++ commands.py
-@@ -141,6 +141,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"""
-@@ -952,6 +954,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
-@@ -1283,23 +1287,34 @@
-         pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver}
-         pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
-         pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
-+        
-+        if side == SERVER: #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])
- 
-         # HINT: We create the list of source directories based on the list of packages
-         # on windows we just pass wildcards, otherwise we pass the full file list
-        if self.osname == 'win':
-+        if self.osname == 'win' and False == True: #FML: Disable for windows we write to file now
-             all_files = False
-             append_pattern = True
-         else:
-             all_files = True
-             append_pattern = False
-         pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=append_pattern, all_files=all_files)
-+        from tempfile import NamedTemporaryFile
-         if self.cmdrecompscala: # Compile scala before java as scala scans java files, but not vice-versa
-             pkglistscala = pkglist[:]
-             pkglistscala.extend(filterdirs(pathsrclk[side], '*.scala', append_pattern=append_pattern, all_files=all_files))
-            dirs = ' '.join(pkglistscala)
-+            f = NamedTemporaryFile(mode='wb', suffix='.txt', prefix ='scala_src_path_', delete=False) #FML: We write to a temporary file just in case the command is to long
-+            for line in pkglistscala:
-+                if os.sep == '\\':
-+                    f.write('"%s"\n' % os.path.abspath(line).replace(os.sep, os.sep + os.sep))
-+                else:
-+                    f.write('"%s"\n' % os.path.abspath(line))
-+            f.close()
-+            dirs = '@"%s"' % f.name
-             classpath = os.pathsep.join(cplk[side])
-             forkcmd = self.cmdrecompscala.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side], pkgs=dirs)
-             try:
-@@ -1319,7 +1334,15 @@
-                 self.logger.error('================================')
-                 self.logger.error('')
-                 raise
-        dirs = ' '.join(pkglist)
-+            os.unlink(f.name)
-+        f = NamedTemporaryFile(mode='wb', suffix='.txt', prefix ='java_src_path_', delete=False) #FML: We write to a temporary file just in case the command is to long
-+        for line in pkglist:
-+            if os.sep == '\\':
-+                f.write('"%s"\n' % os.path.abspath(line).replace('\\', '\\\\'))
-+            else:
-+                f.write('"%s"\n' % os.path.abspath(line))
-+        f.close()
-+        dirs = '@"%s"' % f.name
-         classpath = os.pathsep.join(cplk[side])
-         forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side],
-                                         pkgs=dirs)
-@@ -1338,9 +1361,10 @@
-             self.logger.error('==================')
-             self.logger.error('')
-             raise
-+        os.unlink(f.name)
- 
-     def startserver(self, mainclass, extraargs):
-        classpath = [self.binserver] + self.cpathserver
-+        classpath = [self.binclient, self.srcclient] + self.cpathserver + self.cpathclient
-         classpath = [os.path.join('..', p) for p in classpath]
-         classpath = os.pathsep.join(classpath)
-         os.chdir(self.dirjars)
-@@ -1705,7 +1729,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:
-@@ -1720,6 +1744,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))
-@@ -1892,6 +1919,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])
-@@ -1912,6 +1942,9 @@
-         md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
-         outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
-         src = {CLIENT: self.srcclient, SERVER: self.srcserver}
-+        
-+        if side == SERVER: #Noop out server side stuff
-+            return
- 
-         # HINT: We need a table for the old md5 and the new ones
-         md5table = {}
@@ -1,5 +0,0 @@
-package cpw.mods.fml.common.patcher;
-
-public class ClassPatchingTransformer {
-
-}
@@ -1,24 +0,0 @@
-import urllib
-import zipfile
-import sys
-import os
-from optparse import OptionParser
-
-
-if __name__ == '__main__':
-    parser = OptionParser()
-    parser.add_option('-g', '--gen-conf', action="store_true", dest='gen_conf', help='Generate merged MCP conf folder', default=False)
-    parser.add_option('-m', '--mcp-dir', action='store',       dest='mcp_dir',  help='Path to download/extract MCP to', default=None )
-    parser.add_option('-f', '--fml-dir', action='store',       dest='fml_dir',  help='Path to FML install folder',      default=None )
-    options, _ = parser.parse_args()
-    
-    if options.fml_dir is None or options.mcp_dir is None:
-        print 'Invalid arguments, must supply mcp folder and fml folder: decompile.py --mcp-dir <MCPFolder> --fml-dir <FMLFolder>'
-    else:
-        sys.path.append(os.path.join(options.fml_dir, 'install'))
-        
-        from fml import decompile_minecraft, setup_mcp, download_mcp
-        
-        download_mcp(fml_dir=options.fml_dir, mcp_dir=options.mcp_dir)
-        setup_mcp(options.fml_dir, options.mcp_dir, gen_conf=options.gen_conf)
-        decompile_minecraft(options.fml_dir, options.mcp_dir)
@@ -1,2 +0,0 @@
-default.dev.home=/home/cpw/projects/mcworkspace
-default.mcp.home=${default.dev.home}/vanillamcp
@@ -1,43 +0,0 @@
-import sys
-import os
-import subprocess, shlex
-
-mcp_root = os.path.abspath(sys.argv[1])
-sys.path.append(os.path.join(mcp_root,"runtime"))
-from filehandling.srgshandler import parse_srg
-
-def cmdsplit(args):
-    if os.sep == '\\':
-        args = args.replace('\\', '\\\\')
-    return shlex.split(args)
-
-def main():
-    list_file = os.path.abspath(sys.argv[2])
-    with open(list_file, 'w') as fh:
-        write_changed(fh, os.path.join(mcp_root,"temp","client.md5"), os.path.join(mcp_root,"temp","client_reobf.md5"), 'minecraft')
-        write_changed(fh, os.path.join(mcp_root,"temp","server.md5"), os.path.join(mcp_root,"temp","server_reobf.md5"), 'minecraft_server')
-    
-def write_changed(fh, pre, post, name):
-    if not os.path.isfile(pre) or not os.path.isfile(post):
-        print 'MD5s Missing! Can not extract %s changed files' % name
-        return
-        
-    cmd = 'diff --unchanged-group-format='' --old-group-format='' --new-group-format=\'%%>\' --changed-group-format=\'%%>\' %s %s' % (pre, post)
-    process = subprocess.Popen(cmdsplit(cmd), stdout=subprocess.PIPE, bufsize=-1)
-    difflist,_= process.communicate()
-    srg_data = parse_srg(os.path.join(mcp_root,"temp","client_rg.srg"))
-    classes = {}
-    for row in srg_data['CL']:
-      classes[row['deobf_name']] = row['obf_name']
-
-    for diff in difflist.splitlines():
-        diffrow=diff.strip().split()
-        clazz=diffrow[0]
-        if clazz in classes:
-            clazz=classes[clazz]
-        if clazz.startswith("net/minecraft/src/"):
-            clazz=clazz[len("net/minecraft/src/"):]
-        fh.write("%s/%s.class\n" %(name,clazz))
-    
-if __name__ == '__main__':
-    main()
@@ -1,76 +0,0 @@
-import sys
-import os
-import commands
-import fnmatch
-import re
-import subprocess, shlex
-
-mcp_home = sys.argv[1]
-mcp_dir = os.path.abspath(mcp_home)
-
-print(mcp_dir)
-sys.path.append(mcp_dir)
-
-from runtime.commands import Commands
-Commands._version_config = os.path.join(mcp_dir,Commands._version_config)
-
-def cmdsplit(args):
-    if os.sep == '\\':
-        args = args.replace('\\', '\\\\')
-    return shlex.split(args)
-                    
-def cleanDirs(path):
-    if not os.path.isdir(path):
-        return
- 
-    files = os.listdir(path)
-    if len(files):
-        for f in files:
-            fullpath = os.path.join(path, f)
-            if os.path.isdir(fullpath):
-                cleanDirs(fullpath)
- 
-    files = os.listdir(path)
-    if len(files) == 0:
-        os.rmdir(path)
-        
-def main():
-    print("Obtaining version information from git")
-    cmd = "git describe --long --match='[^(jenkins)]*'"
-    try:
-      process = subprocess.Popen(cmdsplit(cmd), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, bufsize=-1)
-      vers, _ = process.communicate()
-    except OSError:
-      print("Git not found")
-      vers="v1.0-0-deadbeef"
-    (major,minor,rev,githash)=re.match("v(\d+).(\d+)-(\d+)-(.*)",vers).groups()
-
-    (mcpversion,mcclientversion,mcserverversion) = re.match("[.\w]+ \(data: ([.\w]+), client: ([.\w.]+), server: ([.\w.]+)\)",Commands.fullversion()).groups()
-    
-    if os.getenv("GIT_BRANCH") is None:
-      cmd = "git rev-parse --abbrev-ref HEAD"
-      try:
-        process = subprocess.Popen(cmdsplit(cmd), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, bufsize=-1)
-        branch, _ = process.communicate()
-        branch = branch.strip()
-      except OSError:
-        print("Git not found")
-        branch="master"
-    else:
-      branch=os.getenv("GIT_BRANCH").rpartition('/')[2]
-      if branch == 'HEAD':
-        branch = "master"
-
-    with open("fmlversion.properties","w") as f:
-      f.write("%s=%s\n" %("fmlbuild.major.number",major))
-      f.write("%s=%s\n" %("fmlbuild.minor.number",minor))
-      f.write("%s=%s\n" %("fmlbuild.revision.number",rev))
-      f.write("%s=%s\n" %("fmlbuild.githash",githash))
-      f.write("%s=%s\n" %("fmlbuild.mcpversion",mcpversion))
-      f.write("%s=%s\n" %("fmlbuild.mcversion",mcclientversion))
-      f.write("%s=%s\n" %("fmlbuild.branch",branch))
-
-    print("Version information: FML %s.%s.%s (%s) using MCP %s for minecraft %s" % (major, minor, rev, branch, mcpversion, mcclientversion))
-    
-if __name__ == '__main__':
-    main()
@@ -0,0 +1,6 @@
+#Tue Oct 29 18:00:54 CDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-git update-index --assume-unchanged eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/0.tree
@@ -1 +0,0 @@
-/*.pyc
@@ -0,0 +1,22 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
+    }
+}
+
+apply plugin: '${name}'
+
+version = "1.0"
+group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = "modid"
+
+minecraft {
+	version = "${version}"
+}
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="jars/libraries/org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1.jar" sourcepath="jars/libraries/org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1-sources.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/net/minecraft/launchwrapper/1.7/launchwrapper-1.7.jar"/>
-	<classpathentry kind="lib" path="jars/versions/1.6.3/1.6.3.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Minecraft/jars/versions/1.6.3/1.6.3-natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar" sourcepath="jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5-sources.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/com/paulscode/codecwav/20101023/codecwav-20101023.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/argo/argo/2.25_fixed/argo-2.25_fixed.jar" sourcepath="jars/libraries/net/sourceforge/argo/argo/2.25/argo-2.25-sources.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/org/bouncycastle/bcprov-jdk15on/1.47/bcprov-jdk15on-1.47.jar" sourcepath="jars/libraries/org/bouncycastle/bcprov-jdk15on/1.47/bcprov-jdk15on-1.47-sources.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar" sourcepath="jars/libraries/com/google/guava/guava/14.0/guava-14.0-sources.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar" sourcepath="jars/libraries/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1-sources.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar" sourcepath="jars/libraries/commons-io/commons-io/2.4/commons-io-2.4-sources.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar" sourcepath="jars/libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0-sources.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar" sourcepath="jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2-sources.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar" sourcepath="jars/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5-sources.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar" sourcepath="jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0-sources.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0.jar" sourcepath="jars/libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0-sources.jar"/>
-</classpath>
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Minecraft</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>jars</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/jars</locationURI>
-		</link>
-		<link>
-			<name>src</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/src/minecraft</locationURI>
-		</link>
-		<link>
-			<name>lib</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/lib</locationURI>
-		</link>
-	</linkedResources>
-	<filteredResources>
-		<filter>
-			<id>1372126392133</id>
-			<name>jars</name>
-			<type>13</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-libraries</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1372126392135</id>
-			<name>jars</name>
-			<type>13</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-versions</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1372126392137</id>
-			<name>jars</name>
-			<type>26</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-natives</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1372126425043</id>
-			<name>jars/libraries</name>
-			<type>21</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*.jar</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-	<variableList>
-		<variable>
-			<name>MCP_LOC</name>
-			<value>$%7BPARENT-1-WORKSPACE_LOC%7D</value>
-		</variable>
-	</variableList>
-</projectDescription>
@@ -1,4 +0,0 @@
-echo off
-@set PATH=%PATH%;%SystemDir%\system32;%SystemRoot%\System32;.\python\
-python_fml install.py %*
-pause
@@ -1,56 +0,0 @@
-import os, os.path, sys
-from optparse import OptionParser
-
-
-def fml_main(fml_dir, mcp_dir, gen_conf=True, disable_patches=False, disable_at=False, disable_merge=False, enable_server=False, 
-            disable_client=False, disable_rename=False, disable_assets=False, decompile=False):
-    sys.path.append(fml_dir)
-    from fml import download_mcp, setup_mcp, decompile_minecraft, apply_fml_patches, finish_setup_fml
-    print '================ Forge ModLoader Setup Start ==================='
-    download_mcp(fml_dir, mcp_dir)
-    setup_mcp(fml_dir, mcp_dir, gen_conf)
-    if decompile:
-        decompile_minecraft(fml_dir, mcp_dir, disable_at=disable_at, disable_merge=disable_merge, 
-              enable_server=enable_server, disable_client=disable_client,
-              disable_assets=disable_assets)
-        if disable_patches:
-            print 'Patching disabled'
-        else:
-            apply_fml_patches(fml_dir, mcp_dir, os.path.join(mcp_dir, 'src'))
-        finish_setup_fml(fml_dir, mcp_dir, enable_server=enable_server, disable_client=disable_client, disable_rename=disable_rename)
-    else:
-        print 'Decompile free install is on the to-do!'
-    print '================  Forge ModLoader Setup End  ==================='
-    
-if __name__ == '__main__':
-    parser = OptionParser()
-    parser.add_option('-m', '--mcp-dir',   action='store',      dest='mcp_dir',       help='Path to download/extract MCP to',         default=None )
-    parser.add_option('-p', '--no-patch',  action="store_true", dest='no_patch',      help='Disable application of FML patches',      default=False)
-    parser.add_option('-a', '--no-access', action="store_true", dest='no_access',     help='Disable access transformers',             default=False)
-    parser.add_option('-s', '--server',    action="store_true", dest='enable_server', help='Enable decompilation of server',          default=False)
-    parser.add_option('-c', '--no-client', action="store_true", dest='no_client',     help='Disable decompilation of server',         default=False)
-    parser.add_option('-e', '--no-merge',  action="store_true", dest='no_merge',      help='Disable merging server code into client', default=False)
-    parser.add_option('-n', '--no-rename', action="store_true", dest='no_rename',     help='Disable running updatenames',             default=False)
-    parser.add_option(      '--no-assets', action="store_true", dest='no_assets',     help='Disable downloading of assets folder',    default=False)
-    parser.add_option('-d', '--decompile', action="store_true", dest='decompile',     help='Decompile minecraft and apply patches',   default=True)
-    options, _ = parser.parse_args()
-    
-    fml_dir = os.path.dirname(os.path.abspath(__file__))
-    mcp_dir = os.path.abspath('mcp')
-
-    if not options.mcp_dir is None:
-        mcp_dir = os.path.abspath(options.mcp_dir)
-    elif os.path.isfile(os.path.join('..', 'runtime', 'commands.py')):
-        mcp_dir = os.path.abspath('..')
-    
-    if options.no_client:
-        options.no_patch = True
-        
-    if options.no_merge:
-        options.no_patch = True
-    
-    fml_main(fml_dir, mcp_dir, disable_patches=options.no_patch, 
-        disable_at=options.no_access, disable_merge=options.no_merge,
-        enable_server=options.enable_server, disable_client=options.no_client,
-        disable_rename=options.no_rename, disable_assets=options.no_assets,
-        decompile=options.decompile, gen_conf=False)
@@ -1,2 +0,0 @@
-#!/bin/bash
-python install.py "$@"
@@ -1,170 +0,0 @@
-import os, os.path, sys, csv, re, fnmatch, shutil, zipfile, pprint
-from optparse import OptionParser
-from pprint import pprint
-
-#This script attempts to rename local variables in a Fernflower decompiled Java source file to jad style names.
-#Script originally written by Grum in perl, Converted to Python by monoxide, and bug fixes/cleanup by LexManos
-
-class VarNamer:
-    # Seems this is needed to keep these variables confined to the instance
-    def __init__(self):
-        self.last = {
-          'byte':     [0, 0, ['b']],
-          'char':     [0, 0, ['c']],
-          'short':    [1, 0, ['short']],
-          'int':      [0, 1, ['i', 'j', 'k', 'l']],
-          'boolean':  [0, 1, ['flag']],
-          'double':   [0, 0, ['d']],
-          'float':    [0, 1, ['f']],
-          'File':     [1, 1, ['file']],
-          'String':   [0, 1, ['s']],
-          'Class':    [0, 1, ['oclass']],
-          'Long':     [0, 1, ['olong']],
-          'Byte':     [0, 1, ['obyte']],
-          'Short':    [0, 1, ['oshort']],
-          'Boolean':  [0, 1, ['obool']],
-          'Package':  [0, 1, ['opackage']]
-        }
-        self.remap = {
-          'long': 'int',
-        }
-
-    def get_name(self, type, var):
-        index = type if self.last.has_key(type) else (self.remap[type] if self.remap.has_key(type) else None)
-        if (not index) and (re.search('^[A-Z]', type) or re.search(r'(\[|\.\.\.)', type)):
-            type = type.replace('...', '[]')
-            while type.find('[][]') != -1:
-                type = type.replace('[][]', '[]')
- 
-            name = type.lower()
-            skip = 1
- 
-            if re.search(r'\[', type):
-                skip = 1
-                name = "a" + name
-                name = name.replace('[', '').replace(']', '').replace('...', '')
- 
-            self.last[type] = [0, skip, [name]]
-            index = type
-    
-        if not index:
-            print "No data for type: %s '%s'\n" % (type, var)
-            return type
- 
-        id = self.last[index][0]
-        skip_zero = self.last[index][1]
-        data = self.last[index][2]
-        self.last[index][0] += 1
- 
-        amount = len(data)
-    
-        if amount == 1:
-            return data[0] + ('' if ((not id) and skip_zero) else ('%d' % id))
-        else:
-            num = id / amount
-            return data[id % amount] + ('' if ((not num) and skip_zero) else ('%d' % num))
-      
-def rename_file(file, indent='3', MCP=False):
-    tmp = file + '.tmp'
-    with open(file, 'rb') as in_file:
-        data = rename_class(in_file.read().replace('\r', ''), indent, MCP)
-        with open(tmp, 'wb') as out_file:
-            out_file.write(data)
-    shutil.move(tmp, file)
-    
-def rename_class(data, indent='3', MCP=False):
-    METHOD_REG = r'^ {%s}(\w+\s+\S.*\.*(|static )(?:\{|\);|})$' % indent
-    CATCH_REG = r'catch \((.*)\) {'
-    if MCP:
-        if indent == '3':
-            indent = '4'
-        METHOD_REG = r'^ {%s}(\w+\s+\S.*\(.*|static)$' % indent
-        CATCH_REG = r'catch \((.*)\)$'
-        
-    lines = data.split('\n')
-    output = ''
- 
-    inside_method = False
-    method = ''
-    method_variables = []
-    skip = False
- 
-    for line in lines:
-        line += '\n'
-        if re.search(METHOD_REG, line) and not re.search('=', line) and not re.search(r'\(.*\(', line):
-            if re.search(r'\(.+\)', line):
-                method_variables += [s.strip() for s in re.search(r'\((.+)\)', line).group(1).split(',')]
-
-            method += line
-     
-            # Could be a single-line method
-            skip = True
-            if not re.search(r'(}|\);|throws .+?;)$', line):
-                inside_method = True
-     
-        elif re.search(r'^ {%s}}$' % indent, line):
-            inside_method = False
-     
-        if inside_method:
-            if skip:
-                skip = False
-                continue
-     
-            method += line
-     
-            m = re.search(CATCH_REG, line)
-            if m:
-                method_variables += [m.group(1)]
-            else:
-                method_variables += map(lambda x: x.group(0), filter(
-                        lambda x: not re.match(r'^(return)', x.group(0)) and not re.match(r'^(throw)', x.group(0)),
-                        re.finditer(r'([a-z_$][a-z0-9_\[\]]+ var\d+)', line, re.I)))
-            
-        else:
-            if method:
-                namer = VarNamer()
-                todo = map(lambda x: [x, namer.get_name(x.split(' ')[0], x)], method_variables)
-                
-                replace = {}
-                for mapping in todo:
-                    if not ' ' in mapping[0]:
-                        continue
-                    replace[mapping[0].split(' ')[1]] = mapping[1]
-                    
-                for k in sorted(replace, key=len, reverse=True):
-                    original = k
-                    to = replace[k]
-                    
-                    #Don't rename already renamed things.
-                    if not re.match('var\d+', original):
-                        continue
-     
-                    method = method.replace(original, to)
-     
-                output += method
-     
-                method = ''
-                method_variables = []
-     
-            if skip:
-                skip = False
-                continue
-     
-            output += line
-            
-    return output[:-1]
-            
-def main(options, args):
-    for arg in args:
-        for path, _, filelist in os.walk(arg, followlinks=True):
-            for cur_file in fnmatch.filter(filelist, '*.java'):
-                file = os.path.normpath(os.path.join(path, cur_file))
-                rename_file(file, options.indent, options.mcp)
-
-if __name__ == '__main__':
-    parser = OptionParser()
-    parser.add_option('-m', '--mcp', action='store_true', dest='mcp', help='Use MCP regexs', default=False)
-    parser.add_option('-i', '--indent', action='store', dest='indent', help='Custom indent to use', default='3')
-    options, args = parser.parse_args()
-
-    main(options, args)
@@ -1,90 +0,0 @@
-import os, os.path, sys, csv, re, fnmatch, shutil, zipfile, pprint
-from optparse import OptionParser
-from zipfile import ZipFile
-from subprocess import Popen, PIPE, STDOUT
-    
-if __name__ == '__main__':
-    parser = OptionParser()
-    parser.add_option('-j', '--jar', action='store', dest='jar', help='Jar to sign', default=None)
-    parser.add_option('-c', '--command', action='store', dest='command', help='Path to jar signer command, will be invoked on temp jar to sign', default=None)
-    parser.add_option('-a', '--alias', action='store', dest='alias', help='Optional: The keystore alias to use when siging the jar, it will be passed in as para 2 to the command', default='')
-    #This is kept as a seperate file so that if you integrate this into a build system, you are not publically displaying any private passwords
-    #Typically the format of this file will be:
-    #
-    #jarsigner -keystore my_key_store -storepass key_store_pass -keypass key_pass %1 alias
-    
-    #The rest of the parameters are used as regxs to determine what parts of the file will be signed, a file will be signed if it matches ANY of the regexs
-    options, args = parser.parse_args()
-    
-    if options.jar is None:
-        print 'You must supply the jar to sign using --jar <jar>'
-        sys.exit(1)
-    
-    if options.command is None:
-        print 'You must supply a command to be called using --command <command>, See the comments in the python for details on this'
-        sys.exit(1)
-        
-    if not os.path.isfile(options.jar):
-        print 'The specified jar "%s" could not be found' % options.jar
-        sys.exit(1)
-        
-    regs = []
-    for reg in args:
-        regs.append(re.compile(reg))
-    
-    shutil.copy(options.jar, options.jar + '.bak')
-    tmp_1 = options.jar + '.tmp1'
-    tmp_2 = options.jar + '.tmp2'
-    
-    zip_in = ZipFile(options.jar, mode='r')
-    zip_tmp_1 = ZipFile(tmp_1, mode='w')
-    zip_tmp_2 = ZipFile(tmp_2, mode='w')
-    for i in zip_in.filelist:
-        matched = False
-        for reg in regs:
-            if not reg.match(i.filename) is None:
-                matched = True
-                break
-        
-        data = zip_in.read(i.filename)
-        if matched:
-            print 'Matched: ' + i.filename
-            zip_tmp_1.writestr(i, data)
-        else:
-            if i.filename.startswith('META-INF'):
-                print 'Detected skipped META-INF File, it will not be copied to new jar, if you wish to keep this data, include it in the signed info: %s'  % i.filename
-            else:
-                print 'Skipped: ' + i.filename
-                zip_tmp_2.writestr(i, data)
-            
-    zip_in.close()
-    zip_tmp_1.close()
-    zip_tmp_2.close()
-    
-    try:
-        process = Popen([options.command, os.path.abspath(tmp_1), options.alias], stdout=PIPE, stderr=STDOUT, bufsize=-1)
-        out, _ = process.communicate()
-        print out
-    except OSError as e:
-        print "Error creating signed tmp jar: %s" % e.strerror
-        sys.exit(1)
-        
-    os.remove(options.jar)
-    
-    zip_out = ZipFile(options.jar, mode='w')
-    
-    for tmp in [tmp_1, tmp_2]:
-        zip_in = ZipFile(tmp, mode='r')
-        
-        for i in zip_in.filelist:
-            zip_out.writestr(i, zip_in.read(i.filename))
-        
-        zip_in.close()
-        
-    zip_out.close()
-    
-    os.remove(tmp_1)
-    os.remove(tmp_2)
-    
-    print 'Signing jar complete'
-    
@@ -1,64 +0,0 @@
-import os, os.path, sys, csv, re, fnmatch, shutil
-from optparse import OptionParser
-
-replaced = 0
-
-def main(mcp_dir, targets):
-    global replaced
-    packages_csv = os.path.join(mcp_dir, 'conf', 'packages.csv')
-    
-    if not os.path.isfile(packages_csv):
-        print 'Could not find Packages.csv, please specify a location of a MCP directory setup with FML using --mcp-dir <path>'
-        sys.exit(1)
-    
-    pkgs = {}    
-    with open(packages_csv) as fh:
-        reader = csv.DictReader(fh)
-        for line in reader:
-            pkgs[line['class']] = line['package']
-    
-    if len(targets) == 0:
-        print 'You must specify atleast one target directory to repackage'
-        sys.exit(1)
-    
-    regnms = re.compile(r'net.minecraft.src.(\w+)')
-    total_r = 0
-    total_f = 0
-    
-    for target in targets:        
-        for path, _, filelist in os.walk(target, followlinks=True):
-            for cur_file in fnmatch.filter(filelist, '*.java'):
-                file_name = os.path.join(path, cur_file)
-                buf = ''
-                replaced = 0
-                
-                with open(file_name, 'rb') as fh:
-                    data = fh.read()
-                    def mapname(match):
-                        global replaced
-                        cls = match.group(0)
-                        tmp = cls[18:]
-                        if tmp in pkgs.keys():
-                            replaced += 1
-                            return ('%s/%s' % (pkgs[tmp], tmp)).replace('/', '.')
-                        return cls
-                    data = regnms.sub(mapname, data)
-                
-                if replaced > 0:
-                    total_r += replaced
-                    total_f += 1
-                    
-                    print '%s: %d' % (os.path.relpath(file_name), replaced)
-                    
-                    with open(file_name + '.tmp', 'wb') as fh:
-                        fh.write(data)
-                    shutil.move(file_name + '.tmp', file_name)
-                    
-    print 'Fixed %d references in %d files' % (total_r, total_f)
-    
-if __name__ == '__main__':
-    parser = OptionParser()
-    parser.add_option('-m', '--mcp-dir', action='store', dest='mcp_dir', help='MCP Directory', default='mcp')
-    options, args = parser.parse_args()
-
-    main(os.path.abspath(options.mcp_dir), args)
@@ -8,7 +8,7 @@
  "minimumLauncherVersion": 4,
  "libraries": [
    {
-      "name": "net.minecraft:launchwrapper:1.7",
+      "name": "net.minecraft:launchwrapper:1.8",
      "comment" : "Important for FML, we add this"
    },
    {
@@ -24,7 +24,7 @@
        "url": "http://files.minecraftforge.net/maven/"
      },
      {
-        "name": "net.minecraft:launchwrapper:1.7",
+        "name": "net.minecraft:launchwrapper:1.8",
        "serverreq":true
      },
      {
@@ -34,7 +34,7 @@
      {
        "name": "org.scala-lang:scala-library:2.10.2",
        "url" : "http://files.minecraftforge.net/maven/",
-        "checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "dffc88e804861c9eaba39283757000b6558ea573" ],
+        "checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "65de4339eaed1c3675485fb03a3532fecfd8e8cd" ],
        "comment" : "Important for FML, we add this",
        "serverreq":true,
        "clientreq":true
@@ -42,7 +42,7 @@
      {
        "name": "org.scala-lang:scala-compiler:2.10.2",
        "url" : "http://files.minecraftforge.net/maven/",
-        "checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "40281b3ffc69fb385953522c843363ccaf71ba89" ],
+        "checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "99fd0ffb66f3088b0cd1071315fd5eb2b2b070ff" ],
        "comment" : "Important for FML, we add this",
        "serverreq":true,
        "clientreq":true
@@ -1,130 +0,0 @@
-[default]
-current_ver = 1.6.4
-base_url    = http://s3.amazonaws.com/MinecraftDownload/
-libraries   = lwjgl.jar lwjgl_util.jar jinput.jar
-natives     = windows_natives.jar macosx_natives.jar linux_natives.jar
-
-[1.4.4]
-client_url = http://assets.minecraft.net/1_4_4/minecraft.jar
-server_url = http://assets.minecraft.net/1_4_4/minecraft_server.jar
-client_md5 = 7aa46c8058cba2f38e9d2ddddcc77c72
-server_md5 = b5feed15df1db87c9aaf78dcefad513d
-mcp_ver    = 7.21
-mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp721.zip
-mcp_md5    = 772ecfdac7e4c9491bfb131cee3bbb36
-
-[1.4.5]
-client_url = http://assets.minecraft.net/1_4_5/minecraft.jar
-server_url = http://assets.minecraft.net/1_4_5/minecraft_server.jar
-client_md5 = b15e2b2b6b4629f0d99a95b6b44412a0
-server_md5 = 250654ceae7a26ba955a30095d90a475
-mcp_ver    = 7.23
-mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp723.zip
-mcp_md5    = 9fbb5835b437b64bc5ce618fa5a53d1d
-
-[1.4.6]
-client_url = http://assets.minecraft.net/1_4_6/minecraft.jar
-server_url = http://assets.minecraft.net/1_4_6/minecraft_server.jar
-client_md5 = 48677dc4c2b98c29918722b5ab27b4fd
-server_md5 = b0700fa969dbf0ff085082cde87384d2
-mcp_ver    = 7.25
-mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp725.zip
-mcp_md5    = a7276589fca4974d40eb4e27ba41ba16
-
-[1.4.7]
-client_url = http://assets.minecraft.net/1_4_7/minecraft.jar
-server_url = http://assets.minecraft.net/1_4_7/minecraft_server.jar
-client_md5 = 8e80fb01b321c6b3c7efca397a3eea35
-server_md5 = f69ac4bfce2dfbce03fe872518f75a05
-mcp_ver    = 7.26a
-mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp726a.zip
-mcp_md5    = 5f11fbccd857b43a0f54117253b3e4dd
-
-[s13w02b]
-client_url = http://assets.minecraft.net/13w02b/minecraft.jar
-server_url = http://assets.minecraft.net/13w02b/minecraft_server.jar
-client_md5 = 13891f6610b6739ac79f40147cca31d5
-server_md5 = b2200cfa5d6535f177d291066d2ed3a8
-mcp_ver    = 7.30c
-mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp730c.zip
-mcp_md5    = b25479ba38ca583bb8223c0a0553defe
-
-[s13w05b]
-client_url = http://assets.minecraft.net/13w05b/minecraft.jar
-server_url = http://assets.minecraft.net/13w05b/minecraft_server.jar
-client_md5 = 496002660846f2eb455cba407cd26818
-server_md5 = e317f8f4f62d0603a8eacbfb2e33549c
-mcp_ver    = 7.34
-mcp_url    = http://files.minecraftforge.net/mcpmirror/mcp734.zip
-mcp_md5    = 522dc1a7b66f8265291e1cc2f8f5d247
-
-[s13w09c]
-client_url = http://assets.minecraft.net/13w09c/minecraft.jar
-server_url = http://assets.minecraft.net/13w09c/minecraft_server.jar
-client_md5 = d2534381656da5069b96cc89e28158ef
-server_md5 = 92f4fd715191c596745c7bbfad9c1aad
-mcp_ver    = 7.39
-mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp739.zip
-mcp_md5    = cd4f6f5e6dd7032301aa98a9046201dd
-
-[1.5]
-client_url = http://assets.minecraft.net/1_5/minecraft.jar
-server_url = http://assets.minecraft.net/1_5/minecraft_server.jar
-client_md5 = fd11cbc5b01aae1d62cff0145171f3d9
-server_md5 = 00035b7842554bdbff95a48169420525
-mcp_ver    = 7.42
-mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp742.zip
-mcp_md5    = ad1a2b86916dd5f71e832181e01bd91a
-
-[1.5.1]
-client_url = http://assets.minecraft.net/1_5_1/minecraft.jar
-server_url = http://assets.minecraft.net/1_5_1/minecraft_server.jar
-client_md5 = 5c1219d869b87d233de3033688ec7567
-server_md5 = 9d31b969c3f197a1d40381d5620717ea
-mcp_ver    = 7.44
-mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp744.zip
-mcp_md5    = 0b9047820bbcb7da32c5e18f60212832
-
-[1.5.2]
-client_url = http://s3.amazonaws.com/Minecraft.Download/versions/1.5.2/1.5.2.jar
-server_url = http://s3.amazonaws.com/Minecraft.Download/versions/1.5.2/minecraft_server.1.5.2.jar
-client_md5 = 6897c3287fb971c9f362eb3ab20f5ddd
-server_md5 = c4e1bf89e834bd3670c7bf8f13874bc6
-mcp_ver    = 7.51
-mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp751.zip
-mcp_md5    = a8c68db8736227c9e26cbcb0995e5b71
-
-[1.6]
-client_md5 = 6a64a2136e3a3fe4d29b0a0df30b25fc
-server_md5 = 7c03305c8bf97a8e8f3cdb147fc90607
-mcp_ver    = 8.01
-mcp_url    = 
-mcp_md5    = 39da81bbb4d73b3f5e2d1f8f5682cdb9
-
-[1.6.1]
-client_md5 = 3c56fb4b77b1ca37dde69b5eb896fc4d
-server_md5 = ff8f81970a5955737c356b534d3aee96
-mcp_ver    = 8.03
-mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp803.zip
-mcp_md5    = 7810c2fba33e15889685b21ac8dc66cf
-
-[1.6.2]
-client_md5 = 1d43cdba8b9752d7f557ab7d3e365964
-server_md5 = 39df9f29e6904ea7b351ffb4fe949881
-mcp_ver    = 8.04
-mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp804.zip
-mcp_md5    = ebcecfa00aae07548e67787044410a11
-
-[1.6.3]
-client_md5 = 233effe2110d40a0519cf1489e4ccb1c
-server_md5 = 8ed981ab6030412f586bfe38ff0aaa82
-mcp_ver    = 8.09
-mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp809.zip
-mcp_md5    = 19133b5915dc26a90d84f587172c6692
-
-[1.6.4]
-client_md5 = 2e5044f5359e82245551167a237f3167
-server_md5 = ba3145656b1480122bd8759cecd7b7a1
-mcp_ver    = 8.11
-mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp811.zip
-mcp_md5    = 2d7a759309b5cc10ca29caa0b10f3bfc
@@ -21,16 +21,20 @@
 @SideOnly(Side.CLIENT)
 public class Minecraft implements IPlayerUsage
 {
-@@ -366,6 +373,8 @@
+@@ -362,9 +369,12 @@
+         this.field_71446_o = new TextureManager(this.field_110451_am);
+         this.field_110451_am.func_110542_a(this.field_71446_o);
+         this.field_71416_A = new SoundManager(this.field_110451_am, this.field_71474_y, this.field_110446_Y);
+        this.field_71416_A.LOAD_SOUND_SYSTEM = false;
+         this.field_110451_am.func_110542_a(this.field_71416_A);
         this.func_71357_I();
         this.field_71466_p = new FontRenderer(this.field_71474_y, new ResourceLocation("textures/font/ascii.png"), this.field_71446_o, false);
- 
-+        FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am);
 +
+        FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am);
+ 
         if (this.field_71474_y.field_74363_ab != null)
         {
-             this.field_71466_p.func_78264_a(this.field_135017_as.func_135042_a());
-@@ -400,6 +409,7 @@
+@@ -400,6 +410,7 @@
         this.field_71446_o.func_130088_a(TextureMap.field_110576_c, new TextureMap(1, "textures/items"));
         GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d);
         this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
@@ -38,7 +42,7 @@
         this.func_71361_d("Post startup");
         this.field_71456_v = new GuiIngame(this);
 
-@@ -418,6 +428,7 @@
+@@ -418,6 +429,7 @@
         {
             this.func_71352_k();
         }
@@ -46,7 +50,7 @@
     }
 
     public void func_110436_a()
-@@ -733,6 +744,7 @@
+@@ -733,6 +745,7 @@
         {
             this.func_71405_e();
         }
@@ -54,7 +58,7 @@
     }
 
     private void func_71411_J()
-@@ -801,9 +813,11 @@
+@@ -801,9 +814,11 @@
 
         if (!this.field_71454_w)
         {
@@ -66,7 +70,7 @@
         }
 
         GL11.glFlush();
-@@ -1325,10 +1339,14 @@
+@@ -1325,10 +1340,14 @@
 
     public void func_71407_l()
     {
@@ -81,7 +85,7 @@
 
         this.field_71424_I.func_76320_a("stats");
         this.field_71413_E.func_77449_e();
-@@ -1785,6 +1803,8 @@
+@@ -1785,6 +1804,8 @@
             this.field_71453_ak.func_74428_b();
         }
 
@@ -90,7 +94,7 @@
         this.field_71424_I.func_76319_b();
         this.field_71423_H = func_71386_F();
     }
-@@ -1808,8 +1828,27 @@
+@@ -1808,8 +1829,27 @@
         }
 
         this.field_71413_E.func_77450_a(StatList.field_75936_f, 1);
@@ -0,0 +1,18 @@
+--- ../src-base/minecraft/net/minecraft/client/audio/SoundManager.java
+++ ../src-work/minecraft/net/minecraft/client/audio/SoundManager.java
+@@ -27,6 +27,7 @@
+ @SideOnly(Side.CLIENT)
+ public class SoundManager implements ResourceManagerReloadListener
+ {
+    public boolean LOAD_SOUND_SYSTEM = true;
+     private static final String[] field_130084_a = new String[] {"ogg"};
+     private SoundSystem field_77381_a;
+     private boolean field_77376_g;
+@@ -67,6 +68,7 @@
+ 
+     public void func_110549_a(ResourceManager p_110549_1_)
+     {
+        if (!this.LOAD_SOUND_SYSTEM) return; //Stop the sound system from initializing three times at startup. Causing race conditions on some machines.
+         this.func_82464_d();
+         this.func_77370_b();
+         this.func_77363_d();
@@ -1,5 +0,0 @@
-[{000214A0-0000-0000-C000-000000000046}]
-Prop3=19,2
-[InternetShortcut]
-URL=http://docs.python.org/2/license.html
-IDList=
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<session version="1.0">
-<refactoring comment="Rename type &apos;net.minecraft.src.INetworkManager&apos; to &apos;NetworkManager&apos;&#x0A;- Original project: &apos;FML&apos;&#x0A;- Original element: &apos;net.minecraft.src.INetworkManager&apos;&#x0A;- Renamed element: &apos;net.minecraft.src.NetworkManager&apos;&#x0A;- Update references to refactored element&#x0A;- Update textual occurrences in comments and strings" description="Rename type &apos;INetworkManager&apos;" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/mc-common&lt;net.minecraft.src{INetworkManager.java[INetworkManager" matchStrategy="1" name="NetworkManager" project="FML" qualified="false" references="true" similarDeclarations="false" textual="false" version="1.0"/>
-<refactoring comment="Rename type &apos;net.minecraft.src.NetworkManager&apos; to &apos;INetworkManager&apos;&#x0A;- Original project: &apos;FML&apos;&#x0A;- Original element: &apos;net.minecraft.src.NetworkManager&apos;&#x0A;- Renamed element: &apos;net.minecraft.src.INetworkManager&apos;&#x0A;- Update references to refactored element&#x0A;- Update textual occurrences in comments and strings" description="Rename type &apos;NetworkManager&apos;" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/mc-common&lt;net.minecraft.src{NetworkManager.java[NetworkManager" matchStrategy="1" name="INetworkManager" project="FML" qualified="false" references="true" similarDeclarations="false" textual="false" version="1.0"/>
-</session>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<session version="1.0">
-<refactoring comment="Rename type &apos;net.minecraft.src.ITexturePack&apos; to &apos;TexturePackBase&apos;&#x0A;- Original project: &apos;FML&apos;&#x0A;- Original element: &apos;net.minecraft.src.ITexturePack&apos;&#x0A;- Renamed element: &apos;net.minecraft.src.TexturePackBase&apos;&#x0A;- Update references to refactored element&#x0A;- Update textual occurrences in comments and strings" description="Rename type &apos;ITexturePack&apos;" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/mc-client&lt;net.minecraft.src{ITexturePack.java[ITexturePack" matchStrategy="1" name="TexturePackBase" project="FML" qualified="false" references="true" similarDeclarations="false" textual="false" version="1.0"/>
-<refactoring comment="Rename type &apos;net.minecraft.src.TexturePackBase&apos; to &apos;ITexturePack&apos;&#x0A;- Original project: &apos;FML&apos;&#x0A;- Original element: &apos;net.minecraft.src.TexturePackBase&apos;&#x0A;- Renamed element: &apos;net.minecraft.src.ITexturePack&apos;&#x0A;- Update references to refactored element&#x0A;- Update textual occurrences in comments and strings" description="Rename type &apos;TexturePackBase&apos;" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/mc-client&lt;net.minecraft.src{TexturePackBase.java[TexturePackBase" matchStrategy="1" name="ITexturePack" project="FML" qualified="false" references="true" similarDeclarations="false" textual="false" version="1.0"/>
-</session>
@@ -1,4 +0,0 @@
-These are some hopefully helpful refactor scripts for eclipse. They will refactor the 1.3.2->1.4 INetworkManager and ITexturePack code changes for your codebase.
-
-To run you should be able to just "Apply script" the appropriate script on your MCP based mod code and it'll fix up the refs for you.
-
@@ -1,66 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Created on Fri Apr  8 16:54:36 2011
-
-@author: ProfMobius
-@version: v1.1-cpw
-Modified to fix temporary obfuscation issue
-"""
-
-import sys
-import logging
-from optparse import OptionParser
-
-from commands import Commands, CLIENT, SERVER
-from mcp import reobfuscate_side
-
-
-def main():
-    parser = OptionParser(version='MCP %s' % Commands.fullversion())
-    parser.add_option('--client', dest='only_client', action='store_true', help='only process client', default=False)
-    parser.add_option('--server', dest='only_server', action='store_true', help='only process server', default=False)
-    parser.add_option('-a', '--all', action='store_true', dest='reobf_all', help='output all classes', default=False)
-    parser.add_option('-n', '--nolvt', dest='keep_lvt', action='store_false', help='strip local variable table',
-                      default=True)
-    parser.add_option('-g', '--generics', dest='keep_generics', action='store_true',
-                      help='preserve generics as well as local variables', default=False)
-    parser.add_option('-c', '--config', dest='config', help='additional configuration file')
-    parser.add_option('--srgnames', dest='srg_names', action='store_true', help='Obfusicate to MCP unique names', default=False)
-    options, _ = parser.parse_args()
-    reobfuscate(options.config, options.reobf_all, options.keep_lvt, options.keep_generics, options.only_client,
-                options.only_server, options.srg_names)
-
-
-def reobfuscate(conffile, reobf_all, keep_lvt, keep_generics, only_client, only_server, srg_names):
-    try:
-        commands = Commands(conffile, verify=True)
-
-        if keep_generics:
-            keep_lvt = True
-
-        # client or server
-        process_client = True
-        process_server = True
-        if only_client and not only_server:
-            process_server = False
-        if only_server and not only_client:
-            process_client = False
-
-        if srg_names:
-            commands.logger.info('> Creating Retroguard maping files')
-            commands.createreobfsrg()
-            
-        commands.logger.info('> Creating Retroguard config files')
-        commands.creatergcfg(reobf=True, keep_lvt=keep_lvt, keep_generics=keep_generics, srg_names=srg_names)
-        
-        if process_client:
-            reobfuscate_side(commands, CLIENT, reobf_all=reobf_all, srg_names=srg_names, force_rg=True)
-        if process_server:
-            reobfuscate_side(commands, SERVER, reobf_all=reobf_all, srg_names=srg_names, force_rg=True)
-    except Exception:  # pylint: disable-msg=W0703
-        logging.exception('FATAL ERROR')
-        sys.exit(1)
-
-
-if __name__ == '__main__':
-    main()
@@ -1,333 +0,0 @@
-/*
- * The FML Forge Mod Loader suite. Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package net.minecraft.src;
-
-import java.util.Map;
-import java.util.Random;
-
-import net.minecraft.server.MinecraftServer;
-import cpw.mods.fml.common.IConsoleHandler;
-import cpw.mods.fml.common.ICraftingHandler;
-import cpw.mods.fml.common.IDispenseHandler;
-import cpw.mods.fml.common.INetworkHandler;
-import cpw.mods.fml.common.IPickupNotifier;
-import cpw.mods.fml.common.IPlayerTracker;
-import cpw.mods.fml.common.IWorldGenerator;
-import cpw.mods.fml.common.TickType;
-import cpw.mods.fml.server.FMLServerHandler;
-
-public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModProxy
-{
-    // CALLBACK MECHANISMS
-    /**
-     * @param minecraftInstance
-     * @return
-     */
-    @Override
-    public final boolean doTickInGame(TickType tick, boolean tickEnd, Object... data)
-    {
-        if (tick==TickType.SERVER && tickEnd) {
-            return onTickInGame(FMLServerHandler.instance().getServer());
-        } else {
-            return true;
-        }
-    }
-    public final boolean doTickInGUI(TickType tick, boolean tickEnd, 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
-     * @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(EntityPlayer 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(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 250 packet is received on a channel registered to this mod
-     *
-     * @param source
-     * @param payload
-     */
-    public void onPacket250Received(EntityPlayer 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(EntityPlayer 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, ICommandManager listener)
-    {
-        return false;
-    }
-
-    /**
-     * Called when a new client logs in.
-     *
-     * @param player
-     */
-    public void onClientLogin(EntityPlayer player)
-    {
-    }
-
-    /**
-     * Called when a client logs out of the server.
-     *
-     * @param player
-     */
-    public void onClientLogout(EntityPlayer player)
-    {
-
-    }
-
-    /**
-     *
-     * Called when a client changes dimensions on the server.
-     *
-     * @param player
-     */
-    public void onClientDimensionChanged(EntityPlayer player)
-    {
-
-    }
-
-    /**
-     * @param renderers
-     */
-    public void onRenderHarvest(Map renderers)
-    {
-        // NOOP
-    }
-
-    /**
-     *
-     */
-    public void onRegisterAnimations()
-    {
-        // NOOP on server
-    }
-
-    // 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);
-}
@@ -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.src;
-
-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 "";
-
-}
@@ -1,786 +0,0 @@
-/*
- * The FML Forge Mod Loader suite. Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package net.minecraft.src;
-
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import net.minecraft.server.MinecraftServer;
-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.Player;
-import cpw.mods.fml.server.FMLServerHandler;
-import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-
-public class ModLoader
-{
-    public static final String fmlMarker = "This is an FML marker";
-    /**
-     * Not used on the server.
-     *
-     * @param achievement
-     * @param name
-     * @param description
-     */
-    public static void addAchievementDesc(Achievement achievement, String name, String description)
-    {
-        String achName=achievement.field_75978_a;
-        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(BiomeGenBase biome)
-    {
-        GameRegistry.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)
-    {
-        LanguageRegistry.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)
-    {
-        LanguageRegistry.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)
-    {
-        GameRegistry.addRecipe(output, params);
-    }
-
-    /**
-     * Add a shapeless recipe
-     *
-     * @param output
-     * @param params
-     */
-    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 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);
-    }
-
-    /**
-     * This method is a call in hook from modified external code. Implemented elsewhere.
-     * {@link FMLServerHandler#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.func_603_b(x, y, z);
-
-        if (!(te instanceof IInventory))
-        {
-            return;
-        }
-
-        IInventory inv = (IInventory)te;
-
-        for (int l = 0; l < inv.func_83_a(); l++)
-        {
-            ItemStack itemstack = inv.func_82_a(l);
-
-            if (itemstack == null)
-            {
-                continue;
-            }
-
-            float f = world.field_803_m.nextFloat() * 0.8F + 0.1F;
-            float f1 = world.field_803_m.nextFloat() * 0.8F + 0.1F;
-            float f2 = world.field_803_m.nextFloat() * 0.8F + 0.1F;
-
-            while (itemstack.field_853_a > 0)
-            {
-                int i1 = world.field_803_m.nextInt(21) + 10;
-
-                if (i1 > itemstack.field_853_a)
-                {
-                    i1 = itemstack.field_853_a ;
-                }
-
-                itemstack.field_853_a  -= i1;
-                EntityItem entityitem = new EntityItem(world, (float)te.field_478_b + f, (float)te.field_483_c + f1, (float)te.field_482_d + f2, new ItemStack(itemstack.field_855_c, i1, itemstack.func_21125_h()));
-                float f3 = 0.05F;
-                entityitem.field_319_o = (float)world.field_803_m.nextGaussian() * f3;
-                entityitem.field_318_p = (float)world.field_803_m.nextGaussian() * f3 + 0.2F;
-                entityitem.field_317_q = (float)world.field_803_m.nextGaussian() * f3;
-
-                if (itemstack.func_40608_n())
-                {
-                    entityitem.field_429_a.func_40604_d((NBTTagCompound)itemstack.func_40607_o().func_40468_b());
-                }
-
-                world.func_526_a(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 FMLLog.getLogger();
-    }
-
-    public static Object getMinecraftInstance()
-    {
-        return getMinecraftServerInstance();
-    }
-
-    /**
-     * Get the minecraft server instance
-     * {@link FMLServerHandler#getServer()}
-     * @return
-     */
-    public static MinecraftServer getMinecraftServerInstance()
-    {
-        return FMLCommonHandler.instance().getMinecraftServerInstance();
-    }
-    /**
-     * 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 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
-     */
-    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
-     *
-     */
-    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 EntityRegistry.findGlobalUniqueEntityId();
-    }
-
-    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 NetworkRegistry.instance().isChannelActive(channel, (Player) 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 FMLServerHandler#handlePacket250(Packet250CustomPayload, EntityPlayer)}
-     *
-     * @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)
-    {
-        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);
-    }
-
-    /**
-     * 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);
-    }
-
-    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)
-    {
-        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);
-    }
-
-    public static void registerTileEntity(Class<? extends TileEntity> tileEntityClass, String id, Object renderer)
-    {
-        GameRegistry.registerTileEntity(tileEntityClass, id);
-    }
-
-    /**
-     * 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
-    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()
-    {
-    }
-
-    public static void sendPacket(Packet packet) {
-        // TODO
-//        FMLClientHandler.instance().sendPacket(packet);
-    }
-    /**
-     * 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 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.
-     * {@link FMLServerHandler#onItemCrafted(EntityPlayer, ItemStack, IInventory)}
-     *
-     * @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.
-     * {@link FMLServerHandler#onItemSmelted(EntityPlayer, ItemStack)}
-     *
-     * @param player
-     * @param item
-     */
-    @Deprecated
-    public static void takenFromFurnace(EntityPlayer player, ItemStack item)
-    {
-    }
-
-    /**
-     * Throw the offered exception. Likely will stop the game.
-     * {@link FMLServerHandler#raiseException(Throwable, String, boolean)}
-     *
-     * @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);
-    }
-}
@@ -0,0 +1 @@
+rootProject.name = 'fml'
@@ -39,6 +39,7 @@ import net.minecraft.crash.CrashReport;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.launchwrapper.Launch;
 import net.minecraft.network.INetworkManager;
 import net.minecraft.network.packet.NetHandler;
 import net.minecraft.network.packet.Packet;
@@ -49,6 +50,7 @@ import net.minecraft.world.World;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 import com.google.common.collect.MapDifference;
 import com.google.common.collect.MapDifference.ValueDifference;
 import com.google.common.collect.Maps;
@@ -206,6 +208,22 @@ public class FMLClientHandler implements IFMLSidedHandler
            haltGame("There was a severe problem during mod loading that has caused the game to fail", le);
            return;
        }
+
+        Map<String,Map<String,String>> sharedModList = (Map<String, Map<String, String>>) Launch.blackboard.get("modList");
+        if (sharedModList == null)
+        {
+            sharedModList = Maps.newHashMap();
+            Launch.blackboard.put("modList", sharedModList);
+        }
+        for (ModContainer mc : Loader.instance().getActiveModList())
+        {
+            Map<String,String> sharedModDescriptor = mc.getSharedModDescriptor();
+            if (sharedModDescriptor != null)
+            {
+                String sharedModId = "fml:"+mc.getModId();
+                sharedModList.put(sharedModId, sharedModDescriptor);
+            }
+        }
    }

    @Override
@@ -241,6 +259,8 @@ public class FMLClientHandler implements IFMLSidedHandler
            haltGame("There was a severe problem during mod loading that has caused the game to fail", le);
            return;
        }
+        
+        client.field_71416_A.LOAD_SOUND_SYSTEM = true;
        // Reload resources
        client.func_110436_a();
        RenderingRegistry.instance().loadEntityRenderers((Map<Class<? extends Entity>, Render>)RenderManager.field_78727_a.field_78729_o);
@@ -249,6 +269,31 @@ public class FMLClientHandler implements IFMLSidedHandler
        KeyBindingRegistry.instance().uploadKeyBindingsToGame(client.field_71474_y);
    }

+    public void extendModList()
+    {
+        Map<String,Map<String,String>> modList = (Map<String, Map<String, String>>) Launch.blackboard.get("modList");
+        if (modList != null)
+        {
+            for (Entry<String, Map<String, String>> modEntry : modList.entrySet())
+            {
+                String sharedModId = modEntry.getKey();
+                String system = sharedModId.split(":")[0];
+                if ("fml".equals(system))
+                {
+                    continue;
+                }
+                Map<String, String> mod = modEntry.getValue();
+                String modSystem = mod.get("modsystem"); // the modsystem (FML uses FML or ModLoader)
+                String modId = mod.get("id"); // unique ID
+                String modVersion = mod.get("version"); // version
+                String modName = mod.get("name"); // a human readable name
+                String modURL = mod.get("url"); // a URL for the mod (can be empty string)
+                String modAuthors = mod.get("authors"); // a csv of authors (can be empty string)
+                String modDescription = mod.get("description"); // a (potentially) multiline description (can be empty string)
+            }
+        }
+
+    }
    public void onInitializationComplete()
    {
        if (wrongMC != null)
@@ -612,4 +657,16 @@ public class FMLClientHandler implements IFMLSidedHandler
    {
        return client.func_135016_M().func_135041_c().func_135034_a();
    }
+
+    @Override
+    public void serverStopped()
+    {
+        // If the server crashes during startup, it might hang the client- reset the client so it can abend properly.
+        MinecraftServer server = getServer();
+
+        if (server != null && !server.func_71200_ad())
+        {
+            ObfuscationReflectionHelper.setPrivateValue(MinecraftServer.class, server, true, "field_71296"+"_Q","serverIs"+"Running");
+        }
+    }
 }
Author	SHA1	Message	Date
Christian	24ec338a51	Fix license and naming	2013-11-09 14:28:54 -05:00
AbrarSyed	4f634855ac	added src distribution gradle file	2013-11-09 14:28:54 -05:00
Lex Manos	9f01e3407e	Move to install to not clutter root directory with the .bat and .sh files I know are coming.	2013-11-09 14:28:54 -05:00
Lex Manos	adeaeb74aa	Include eclipse template workspace, for packaging in src distro.	2013-11-09 14:28:54 -05:00
Lex Manos	e13c3966e0	Add gradle wrapper	2013-11-09 14:28:53 -05:00
Lex Manos	02c3b4e74b	Publish to repo folder for local testing.	2013-11-09 14:28:53 -05:00
AbrarSyed	89a07d3668	Step 3: The Rebirth	2013-11-09 14:28:53 -05:00
Lex Manos	b52eb6d699	Step 2: The Reformation	2013-11-09 14:28:53 -05:00
AbrarSyed	3281faf2be	Step 1: The Purge	2013-11-09 14:28:53 -05:00
Christian	3d25b4e793	Add in the ability to strip interface references for specific interfaces - this is probably mostly useful for scala scenarios where sythetic methods are generated and is not a substitute for using Optional.Method where appropriate. Closes #300	2013-11-09 14:27:15 -05:00
Christian	f4532410ec	Change a couple of warnings, as a prelude to 1.7- preinit is now required for all GameRegistry activity, and every item and block REQUIRES registration.	2013-11-06 16:18:41 -05:00
Christian	8f87021b0f	Fix derp with custom properties. They work now!	2013-11-05 22:23:24 -05:00
Christian	bc57ff9e83	Fix recursive API dependency resolution. Allows nested APIs, such as BuildCraft's	2013-10-31 09:39:34 -04:00
Christian	de8ab934d8	Fix up duplicate entries	2013-10-30 22:46:19 -04:00
Christian	81fe1c9682	Add in an API marker for API type packages. This does several things: 1. Packages marked as API will generate a new "modid" (the provides) that can be depended on. 2. Packages marked as API will be searched systemwide, and anything declaring that package (even without the API marker) will get an implicit dependency on the API package. 3. The API package itself will get a soft dependency on the "owner" package. @Optional elements can refer to the API packages instead of a concrete mod as well.	2013-10-30 22:20:28 -04:00
Christian	58a299aabc	Attempt to inject coremods as tweakers, so both can share a dependency ordering	2013-10-27 13:28:50 -04:00
Christian	243a21a353	Wrapping coremods as tweakers. Part 1.	2013-10-20 11:53:07 +02:00
Christian	f0dc530b28	Fix up documentation of VersionCheckHandler - it only ever accepted a String and only works on the NetworkMod annotated class	2013-10-20 11:45:00 +02:00
Christian	dac7f590ea	Modify ordering of networkmod registration and mod instantiation. This fixes VersionCheckHandler logging an incorrect failure message due to NPE.	2013-10-20 11:41:28 +02:00
Lex Manos	bf54d4d667	Make each mod's EventBus log a child of it's main logger.	2013-10-19 18:24:24 -07:00
Christian	da4337efbf	Fix up handling the new method signature data for NetworkCheckHandlers	2013-10-14 21:28:15 -04:00
Christian	f92962bbbb	Use null to empty, so missing values work. sigh	2013-10-13 22:36:47 -04:00
Christian	2714da1022	Primitive capability for tweakers to order. Add a "TweakOrder" integer property to your manifest, or accept the default of zero.	2013-10-12 10:28:11 -04:00
LexManos	96be82343c	Merge pull request #280 from mc10/patch-1 Very minor style fixes	2013-10-09 20:56:05 -07:00
Kevin Ji	58577775d2	Very minor style fixes Replacing tabs with spaces consistently, making brace styles consistent, etc.	2013-10-09 19:53:50 -07:00
Christian	fc3e7647d2	Support, and fix up, interface lists for Optional	2013-10-09 13:58:14 -04:00
Lex Manos	a381874bb9	Delay sound system backend initalization to speed up startup and prevent race condition on some computers.	2013-10-06 11:13:07 -07:00
Christian	55525f6d2e	ModLoader is officially deprecated. It will all cease to be with 1.7.	2013-10-06 11:06:31 -04:00
Christian	bc64ceabef	Optional shouldn't be constructable itself. It's purely a wrapper thing.	2013-10-06 10:56:47 -04:00
Christian	63ba3aa009	Add in support for Optional interfaces and methods. Be gone coremods!	2013-10-04 17:20:05 -04:00
Christian	5265e34a35	Fix null killing the server	2013-09-29 15:51:38 -04:00
Lex Manos	35ab9f52b0	Fix md5s for new checksums.sha1 in scala libraries.	2013-09-28 19:47:32 -07:00
Christian	9b55f1f48f	Attempt at a shared modlist implementation - should allow visibility between liteloader and fml for "mod list display"	2013-09-27 10:45:20 -04:00
Christian	e356f4d713	Cross-modsystem compatibility fix with thanks to Mumfrey @ liteloader	2013-09-27 10:01:39 -04:00
Christian	bfc25bc5da	Add to both the classloader and the parent	2013-09-26 13:01:00 -04:00
Christian	9f0f9e7288	Fix deobf tweaker	2013-09-26 10:11:29 -04:00
Christian	ce6404fd5b	TYPOS!!!	2013-09-26 09:33:48 -04:00
Christian	8f18a3de9a	Separate deobf tweaker so it runs last. Should fix problems with cascaded tweakers expecting an obf environment.	2013-09-26 09:23:25 -04:00
Christian	9815d8c379	Update for launchwrapper 1.8	2013-09-25 16:40:59 -04:00
Christian	1d902df581	Use the negative cache in latest legacylauncher.	2013-09-25 11:46:11 -04:00
Christian	8e26c99de3	Add debugging for deobfuscation Add negative caching for field and method maps. Should shortcut some work Fix handling the case where a class doesn't exist, but still needs deobf Ask the patch manager for the bytes for the class, not the classLoader Fix up some more places where we should look for a patched class Fix problem with empty source classes and runtime deobfuscation	2013-09-25 07:37:25 -04:00
Lex Manos	fc8c3bef03	Update to new installer that uses xz compression and better support for non-standard jvms	2013-09-24 23:21:17 -07:00
Christian	a4de22c1ad	And use the parent that's actually going to be valid. sigh	2013-09-24 08:42:13 -04:00
Christian	70cffe6982	Herpaderp. Make addURL accessible. sigh	2013-09-24 07:33:11 -04:00
Christian	39620f1e41	Fix injection of tweaker into system	2013-09-23 13:33:16 -04:00
cpw	0e80fcb8f7	Merge pull request #284 from smcv/uninit Fix NPE when loading second single-player world	2013-09-22 18:24:56 -07:00
Simon McVittie	4a94c2c71b	Fix NPE when loading second single-player world After leaving a single-player world, getServer() can return null, resulting in the stack trace below, "Fatal errors were detected during the transition from SERVER_STOPPING to SERVER_ABOUT_TO_START", "The ForgeModLoader state engine has become corrupted" and the client getting stuck forever. Exception in thread "Server thread" java.lang.NullPointerException at cpw.mods.fml.client.FMLClientHandler.serverStopped(FMLClientHandler.java:620) at cpw.mods.fml.common.FMLCommonHandler.handleServerStopped(FMLCommonHandler.java:468) at net.minecraft.server.MinecraftServer.run(MinecraftServer.java:471) at net.minecraft.server.ThreadMinecraftServer.run(SourceFile:583)	2013-09-22 16:56:24 +01:00
Christian	79c39f8b7c	Fix classpath for launchwrapper 1.7	2013-09-21 16:15:05 -04:00
Christian	f6190e8752	Update workspaces for 1.6.4	2013-09-20 17:23:18 -04:00
Christian	0950b9fc84	Fix up a deep crash in the early server init hanging the client	2013-09-20 17:12:01 -04:00