Fix license and naming

scala scenarios where sythetic methods are generated and is not a substitute for using Optional.Method where appropriate.
Closes #300

.gitattributes

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

.gitignore

@@ -1,13 +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
+/.settings
+/.classpath
+
+#idea
+/.idea
+*.iml
+
+#gradle
+/build
+/.gradle
+
+#occupational hazards
+/eclipse/
+/repo/

CREDITS-fml.txt

@@ -0,0 +1,27 @@
+This is Forge Mod Loader.
+
+You can find the source code at all times at https://github.com/MinecraftForge/FML
+
+This minecraft mod is a clean open source implementation of a mod loader for
+minecraft servers, minecraft bukkit servers, and minecraft clients.
+
+The code is authored by cpw.
+
+It (partially) implements API defined by the client side ModLoader, authored by Risugami.
+http://www.minecraftforum.net/topic/75440-
+
+It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
+http://www.minecraftforge.net/
+
+Additionally, it contains an implementation of topological sort based on that 
+published at http://keithschwarz.com/interesting/code/?dir=topological-sort
+
+It also contains code from the Maven project for performing versioned dependency
+resolution. http://maven.apache.org/
+
+It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/
+with credit to it's authors.
+
+Forge Mod Loader downloads components from the Minecraft Coder Pack
+(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team.
+

LICENSE-fml.txt

@@ -1,7 +1,7 @@
-This minecraft mod, Forge Mod Loader, including all parts herein, is licensed
-under the GNU LGPL v2.1 or later.
+This minecraft mod, Forge Mod Loader, including all parts herein except as noted below,
+is licensed under the GNU LGPL v2.1 or later.
 
-Homepage: https://github.com/cpw/FML
+Homepage: https://github.com/MinecraftForge/FML
 
 This software includes portions from the Apache Maven project at
 http://maven.apache.org/ specifically the ComparableVersion.java code. It is
@@ -9,6 +9,30 @@ included based on guidelines at
 http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html
 with notices intact. The only change is a non-functional change of package name.
 
+This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating
+binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/
+authored by genman, heikok, pivot.
+The only changes are to replace some Trove collection types with standard Java collections, and repackaged.
+
+
+=== MCP Data ===
+This software includes data from the Minecraft Coder Pack (MCP), with kind permission
+from them. The license to MCP data is not transitive - distribution of this data by
+third parties requires independent licensing from the MCP team. This data is not
+redistributable without permission from the MCP team.
+
+=== Sharing ===
+I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of
+the minecraft modding community. All contributions to these parts should be licensed under the same additional grant.
+
+-- Runtime patcher --
+License is granted to redistribute the runtime patcher code (common/cpw/mods/fml/patcher and subdirectories) under
+any alternative open source license as classified by the OSI (http://opensource.org/licenses)
+
+-- ASM transformers --
+License is granted to redistribute the ASM transformer code (common/cpw/mods/fml/common/asm/ and subdirectories)
+under any alternative open source license as classified by the OSI (http://opensource.org/licenses)
+
 ========
 
                   GNU LESSER GENERAL PUBLIC LICENSE

README.txt

@@ -1,6 +1,6 @@
 This is Forge Mod Loader, or FML for short, by cpw.
 
-More information can be found at https://github.com/cpw/FML/wiki
+More information can be found at https://github.com/MinecraftForge/FML/wiki
 
 It is a clean reimplementation of a mod loading system for client, server and
 bukkit use, incorporating API implementations of client side ModLoader by
@@ -40,8 +40,8 @@ contributors through github.
 
 Notable integrations
 ====================
-Optifine, with the Cx series have started performing the actions necessary for 
-FML compatibility. This means optifine will work well alongside an FML or 
+Optifine has FML compatibility. It varies from Optifine release to release, however
+in general it will work well alongside an FML or 
 Minecraft Forge installation. FML will detect and ensure the good operation of
 Optifine (you can see it in your client as an additional data line on the 
 bottom left).
@@ -49,9 +49,8 @@ bottom left).
 Client notes
 ============
 FML does provide a standard pattern for mods to provide HD textures. This is why
-optifine needed integration code. FML supports very very basic HD texture packs
-up to 128x resolution (some 256x resolution packs work but not all). For full
-featured HD optifine is recommended.
+optifine needed integration code. FML supports HD texture packs
+up to 128x resolution.
 
 Mod information
 ===============
@@ -68,15 +67,13 @@ or server):
 
 Installation
 ============
-To install this on it's own into a minecraft environment, simply copy the
-contents of the fml zip file into the minecraft jar file, using your preferred
-zip management tool (I recommend 7 zip on windows).
+To install on a server, simply execute the FML or Forge jar file, with a copy of
+minecraft_server.jar placed in the same directory. FML will launch it's patched
+copy.
 
-For servers: the minecraft jar file is minecraft_server.jar.
-For clients: the minecraft jar file is minecraft.jar. You will additionally need
-to delete the "META-INF" folder in the minecraft.jar file.
-For bukkit: the mcportcentral custom builds of craftbukkit contain all you need
-already. Please refer to mcportcentral.co.za for more information.
+To install on a client, FIRST delete META-INF from the minecraft.jar file, then
+copy the contents of the FML or Forge jar file into it. FML and Forge provide 
+their own META-INF data which should *not* be deleted.
 
 Forge Installation
 ==================

applypatches.py

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

build.gradle

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

build.xml

@@ -1,352 +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}"/>
-    </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" />
-    <condition property="python.exe" value="${fml.python.dir}/python_fml" else="python">
-      <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.home}" />
-      <arg value="${basedir}" />
-    </exec>
-  </target>
-
-  <target name="reobfuscate" depends="buildenvsetup,recompile">
-    <exec executable="${python.exe}" dir="${mcp.home}" failonerror="true">
-      <arg value="${mcp.home}/runtime/reobfuscate.py" />
-    </exec>
-    <fail message="Reobfuscation failed">
-        <condition>
-            <not>
-                <and>
-                  <available file="${mcp.home}/temp/client.md5"/>
-                  <available file="${mcp.home}/temp/client_reobf.md5"/>
-                </and>
-            </not>
-        </condition>
-    </fail>
-    <exec executable="${python.exe}" dir="${mcp.home}">
-      <arg value="${basedir}/generatechangedfilelist.py"/>
-      <arg value="${mcp.home}"/>
-      <arg value="${basedir}/difflist.txt"/>
-    </exec>
-  </target>
-
-  <target name="recompile" depends="buildenvsetup">
-    <exec executable="${python.exe}" dir="${mcp.home}" failonerror="true">
-      <arg value="${mcp.home}/runtime/recompile.py" />
-    </exec>
-    <fail message="Compilation failed">
-        <condition>
-            <not>
-              <available file="${mcp.home}/bin/minecraft/net/minecraft/client/Minecraft.class"/>
-            </not>
-        </condition>
-    </fail>
-  </target>
-
-  <target name="merge-client" depends="buildenvsetup">
-    <copy todir="${client.mcp.srcdir}" overwrite="true" verbose="true">
-      <fileset dir="${client.src.dir}" includes="**/*.java" />
-    </copy>
-  </target>
-
-  <target name="merge-common">
-    <copy todir="${client.mcp.srcdir}" overwrite="true" verbose="true">
-      <fileset dir="${common.src.dir}" includes="**/*.java" />
-    </copy>
-  </target>
-
-  <target name="merge-source" depends="buildenvsetup,merge-client,merge-common" />
-
-  <target name="build-universal" depends="buildenvsetup,merge-client,merge-common,reobfuscate,makeversion">
-    <condition property="universal.jarname" value="${modname}-universal-${version.minecraft}-${version}" else="${modname}-universal-${version.minecraft}-${version}-${version.branch}">
-      <equals arg1="${version.branch}" arg2="master" />
-    </condition>
-
-    <mkdir dir="${basedir}/target" />
-    <jar destfile="${basedir}/target/${universal.jarname}.zip" duplicate="preserve">
-      <manifest>
-        <attribute name="Main-Class" value="net.minecraft.server.MinecraftServer"/>
-        <attribute name="Class-Path" value="minecraft_server.jar"/>
-      </manifest>
-      <fileset dir="${client.mcp.obfoutput}" includes="**/*.class" excludes="*.class"/>
-    </jar>
-  	<antcall target="signjar"/>
-    <zip update="true" destfile="${basedir}/target/${universal.jarname}.zip" >
-      <fileset dir="${client.mcp.obfoutput}" includes="*.class"/>
-      <zipfileset dir="${basedir}" includes="fmlversion.properties"/>
-      <zipfileset dir="${basedir}" includes="LICENSE-fml.txt" />
-        <zipfileset dir="${common.src.dir}" includes="mcpmod.info" />
-        <zipfileset dir="${client.src.dir}" includes="mcp.png" />
-      <zipfileset dir="${basedir}" includes="install/CREDITS-fml.txt" fullpath="CREDITS-fml.txt"/>
-      <zipfileset dir="${common.src.dir}" includes="*.cfg" />
-      <mappedresources>
-        <concat>
-          <fileset dir="${basedir}/install" includes="README.txt" />
-          <filterchain>
-            <replacetokens>
-              <token key="MAJOR" value="${version.major}" />
-              <token key="MINOR" value="${version.minor}" />
-              <token key="REV" value="${version.rev}" />
-              <token key="BUILD" value="${version.build}" />
-              <token key="MCVERSION" value="${version.minecraft}" />
-            </replacetokens>
-          </filterchain>
-        </concat>
-        <mergemapper to="README-fml.txt" />
-      </mappedresources>
-    </zip>
-  </target>
-
-  <target name="build-source-pack" depends="makeversion">
-    <property name="srcpack.jarname" value="${modname}-src-${version.minecraft}-${version}-${version.branch}" />
-    <zip destfile="${basedir}/target/${srcpack.jarname}.zip">
-      <zipfileset dir="${basedir}" includes="LICENSE-fml.txt,difflist.txt,commands.patch,mcp_merge.cfg,mc_versions.cfg" prefix="fml" />
-      <zipfileset dir="${common.src.dir}" includes="**/*.java" prefix="fml/common" />
-      <zipfileset dir="${client.src.dir}" includes="**/*.java" prefix="fml/client" />
-      <zipfileset dir="${client.src.dir}" includes="mcp.png" prefix="fml/client" />
-      <zipfileset dir="${basedir}" includes="fmlversion.properties" prefix="fml/common" />
-      <zipfileset dir="${common.src.dir}" includes="*.cfg" prefix="fml/common" />
-      <zipfileset dir="${common.src.dir}" includes="mcpmod.info" prefix="fml/common" />
-      <zipfileset dir="${patch.src.dir}" includes="**/*.patch" prefix="fml/patches" />
-      <zipfileset dir="${fml.conf.dir}" prefix="fml/conf" />
-      <zipfileset dir="${fml.python.dir}" prefix="fml/python" />
-      <mappedresources>
-        <concat>
-          <fileset dir="${basedir}/install" includes="README.txt" />
-          <filterchain>
-            <replacetokens>
-              <token key="MAJOR" value="${version.major}" />
-              <token key="MINOR" value="${version.minor}" />
-              <token key="REV" value="${version.rev}" />
-              <token key="BUILD" value="${version.build}" />
-              <token key="MCVERSION" value="${version.minecraft}" />
-            </replacetokens>
-          </filterchain>
-        </concat>
-        <mergemapper to="fml/README-fml.txt" />
-      </mappedresources>
-      <zipfileset dir="${basedir}/install" excludes="README.txt,fml.pyc" prefix="fml" />
-    </zip>
-  </target>
-
-  <target name="build" depends="buildenvsetup,merge-client,merge-common,build-universal,build-source-pack" />
-
-  <target name="jenkinsbuild" depends="buildenvsetup,jenkinsfmldecompile,patch,build"/>
-
-  <target name="patch" depends="buildenvsetup">
-    <exec executable="${python.exe}" dir="${basedir}">
-      <arg value="${basedir}/applypatches.py" />
-      <arg value="${basedir}" />
-      <arg value="${mcp.srcdir}" />
-      <arg value="${mcp.home}" />
-    </exec>
-
-  </target>
-
-  <target name="setupenvironment" depends="buildenvsetup">
-    <input message="This will clean the mcp environment at ${mcp.home} and backup any src-work folder there (src-base will be erased). Continue?" validargs="y,n" addproperty="do.continue" />
-    <condition property="do.not.continue">
-      <equals arg1="n" arg2="${do.continue}" />
-    </condition>
-    <fail if="do.not.continue">You have decided not to continue. This script will stop now.</fail>
-    <echo>Preparing the MCP environment at ${mcp.home}</echo>
-    <antcall target="fmldecompile"/>
-    <echo>Moving old patched sources at ${patch.mcp.srcdir} out of the way</echo>
-    <move todir="${mcp.home}/src-work${timestamp}" failonerror="false" verbose="true">
-      <fileset dir="${patch.mcp.srcdir}"/>
-    </move>
-    <echo>Deleting old patch references at ${clean.mcp.srcdir}</echo>
-    <delete dir="${clean.mcp.srcdir}" failonerror="false"/>
-    <echo>Creating new patch references at ${clean.mcp.srcdir}</echo>
-    <copy todir="${clean.mcp.srcdir}">
-      <fileset dir="${mcp.srcdir}"/>
-    </copy>
-    <antcall target="cleanargo"/>
-    <antcall target="patch"/>
-    <echo>Creating clean patched references at ${patch.mcp.srcdir}</echo>
-    <copy todir="${patch.mcp.srcdir}">
-      <fileset dir="${mcp.srcdir}"/>
-    </copy>
-    <antcall target="writeversion"/>
-    <antcall target="makeeclipse"/>
-    <echo>Setup complete! You should now be able to open ${basedir}/eclipse as a workspace in eclipse and import/refresh the FML project</echo>
-  </target>
-
-  <target name="fmldecompile" depends="buildenvsetup,makeclean">
-    <exec executable="${python.exe}" dir="${basedir}">
-      <arg value="${basedir}/decompile.py" />
-      <arg value="${mcp.home}" />
-      <arg value="${basedir}" />
-    </exec>
-  </target>
-
-  <target name="jenkinsfmldecompile" depends="buildenvsetup,makeclean">
-    <exec executable="${python.exe}" dir="${basedir}">
-      <arg value="${basedir}/decompile.py" />
-      <arg value="${mcp.home}" />
-      <arg value="${basedir}" />
-      <arg value="-no_gen_conf" />
-    </exec>
-  </target>
-
-  <target name="repatch" depends="buildenvsetup,checkpatches">
-    <echo>Moving old patched sources at ${mcp.home}/src-work out of the way</echo>
-    <move todir="${mcp.home}/src-work${timestamp}" failonerror="false" verbose="true">
-      <fileset dir="${patch.mcp.srcdir}"/>
-    </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>
-</project>

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

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

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

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

bukkit/net/minecraft/server/BaseMod.java

@@ -1,409 +0,0 @@
-/*
- * The FML Forge Mod Loader suite. Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package net.minecraft.server;
-
-import java.util.Map;
-import java.util.Random;
-
-import org.bukkit.craftbukkit.generator.NetherChunkGenerator;
-import org.bukkit.craftbukkit.generator.NormalChunkGenerator;
-
-import cpw.mods.fml.common.TickType;
-
-public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseMod
-{
-    // CALLBACK MECHANISMS
-
-    /**
-     * @param minecraftInstance
-     * @return
-     */
-    public final boolean doTickInGame(TickType tick, boolean tickEnd, Object minecraftInstance, Object... data)
-    {
-        if (tick==TickType.GAME && tickEnd) {
-            return onTickInGame((MinecraftServer)minecraftInstance);
-        } else {
-            return true;
-        }
-    }
-
-    @Override
-    public final void onCrafting(Object... craftingParameters)
-    {
-        takenFromCrafting((EntityHuman)craftingParameters[0], (ItemStack)craftingParameters[1], (IInventory)craftingParameters[2]);
-    }
-
-    @Override
-    public final void onSmelting(Object... smeltingParameters)
-    {
-        takenFromFurnace((EntityHuman)smeltingParameters[0], (ItemStack)smeltingParameters[1]);
-    }
-
-    @Override
-    public final boolean dispense(double x, double y, double z, byte xVelocity, byte zVelocity, Object... data)
-    {
-        return dispenseEntity((World)data[0], x, y, z, xVelocity, zVelocity, (ItemStack)data[1]);
-    }
-
-    @Override
-    public final boolean onChat(Object... data)
-    {
-        return onChatMessageReceived((EntityHuman)data[1], (Packet3Chat)data[0]);
-    }
-
-    @Override
-    public final void onServerLogin(Object handler) {
-        // NOOP
-    }
-
-    public final void onServerLogout() {
-        // NOOP
-    }
-    @Override
-    public final void onPlayerLogin(Object player)
-    {
-        onClientLogin((EntityHuman) player);
-    }
-
-    @Override
-    public final void onPlayerLogout(Object player)
-    {
-        onClientLogout((EntityHuman)player);
-    }
-
-    @Override
-    public final void onPlayerChangedDimension(Object player)
-    {
-        onClientDimensionChanged((EntityHuman)player);
-    }
-
-    @Override
-    public final void onPacket250Packet(Object... data)
-    {
-        onPacket250Received((EntityHuman)data[1], (Packet250CustomPayload)data[0]);
-    }
-
-    @Override
-    public final void notifyPickup(Object... pickupData)
-    {
-        EntityItem item = (EntityItem) pickupData[0];
-        EntityHuman player = (EntityHuman) pickupData[1];
-        onItemPickup(player, item.itemStack);
-    }
-
-    @Override
-    public final void generate(Random random, int chunkX, int chunkZ, Object... additionalData)
-    {
-        World w = (World) additionalData[0];
-        IChunkProvider cp = (IChunkProvider) additionalData[1];
-
-        if (cp instanceof ChunkProviderHell || cp instanceof NetherChunkGenerator)
-        {
-            generateNether(w, random, chunkX << 4, chunkZ << 4);
-        }
-        else if (cp instanceof ChunkProviderGenerate || cp instanceof NormalChunkGenerator)
-        {
-            generateSurface(w, random, chunkX << 4, chunkZ << 4);
-        }
-    }
-
-    /**
-     * NO-OP on client side
-     */
-    @Override
-    public final boolean handleCommand(String command, Object... data)
-    {
-        return onServerCommand(command, (String)data[0], (ICommandListener)data[1]);
-    }
-    @Override
-    public void onRegisterAnimations() {
-    	// NOOP on servers
-    }
-
-    @Override
-    public void onRenderHarvest(@SuppressWarnings("rawtypes") Map renderers) {
-    	// NOOP on servers
-    }
-
-    // BASEMOD API
-    /**
-     * Override if you wish to provide a fuel item for the furnace and return the fuel value of the item
-     *
-     * @param id
-     * @param metadata
-     * @return
-     */
-    public int addFuel(int id, int metadata)
-    {
-        return 0;
-    }
-
-    public void addRenderer(Map<Class<? extends Entity>, Object> renderers)
-    {
-
-    }
-
-    /**
-     * Override if you wish to perform some action other than just dispensing the item from the dispenser
-     *
-     * @param world
-     * @param x
-     * @param y
-     * @param z
-     * @param xVel
-     * @param zVel
-     * @param item
-     * @return
-     */
-    public boolean dispenseEntity(World world, double x, double y, double z, int xVel, int zVel, ItemStack item)
-    {
-        return false;
-    }
-
-    /**
-     * Override if you wish to generate Nether (Hell biome) blocks
-     *
-     * @param world
-     * @param random
-     * @param chunkX
-     * @param chunkZ
-     */
-    public void generateNether(World world, Random random, int chunkX, int chunkZ)
-    {
-    }
-
-    /**
-     * Override if you wish to generate Overworld (not hell or the end) blocks
-     *
-     * @param world
-     * @param random
-     * @param chunkX
-     * @param chunkZ
-     */
-    public void generateSurface(World world, Random random, int chunkX, int chunkZ)
-    {
-    }
-
-    /**
-     * Return the name of your mod. Defaults to the class name
-     *
-     * @return
-     */
-    public String getName()
-    {
-        return getClass().getSimpleName();
-    }
-
-    /**
-     * Get your mod priorities
-     *
-     * @return
-     */
-    public String getPriorities()
-    {
-        return "";
-    }
-
-    /**
-     * Return the version of your mod
-     *
-     * @return
-     */
-    public abstract String getVersion();
-
-    public void keyboardEvent(Object event)
-    {
-
-    }
-
-    /**
-     * Load your mod
-     */
-    public abstract void load();
-
-    /**
-     * Finish loading your mod
-     */
-    public void modsLoaded()
-    {
-    }
-
-    /**
-     * Handle item pickup
-     *
-     * @param player
-     * @param item
-     */
-    public void onItemPickup(EntityHuman player, ItemStack item)
-    {
-    }
-
-    /**
-     * Ticked every game tick if you have subscribed to tick events through {@link ModLoader#setInGameHook(BaseMod, boolean, boolean)}
-     *
-     * @param minecraftServer the server
-     * @return true to continue receiving ticks
-     */
-    public boolean onTickInGame(MinecraftServer minecraftServer)
-    {
-        return false;
-    }
-
-    public boolean onTickInGUI(float tick, Object game, Object gui)
-    {
-        return false;
-    }
-
-    /**
-     * Only implemented on the client side
-     * {@link #onChatMessageReceived(EntityPlayer, Packet3Chat)}
-     *
-     * @param text
-     */
-    public void receiveChatPacket(String text)
-    {
-
-    }
-
-    /**
-     * Only called on the client side
-     * {@link #onPacket250Received(EntityPlayer, Packet250CustomPayload)}
-     *
-     * @param packet
-     */
-    public void receiveCustomPacket(Packet250CustomPayload packet)
-    {
-
-    }
-
-    public void registerAnimation(Object game)
-    {
-
-    }
-
-    public void renderInvBlock(Object renderer, Block block, int metadata, int modelID)
-    {
-
-    }
-
-    public boolean renderWorldBlock(Object renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID)
-    {
-        return false;
-
-    }
-
-    /**
-     * Called when someone crafts an item from a crafting table
-     *
-     * @param player
-     * @param item
-     * @param matrix
-     */
-    public void takenFromCrafting(EntityHuman player, ItemStack item, IInventory matrix)
-    {
-    }
-
-    /**
-     * Called when someone takes a smelted item from a furnace
-     *
-     * @param player
-     * @param item
-     */
-    public void takenFromFurnace(EntityHuman player, ItemStack item)
-    {
-    }
-
-    /**
-     * The identifier string for the mod- used in client<->server negotiation
-     */
-    @Override
-    public String toString()
-    {
-        return getName() + " " + getVersion();
-    }
-
-    /**
-     * Called when a 250 packet is received on a channel registered to this mod
-     *
-     * @param source
-     * @param payload
-     */
-    public void onPacket250Received(EntityHuman source, Packet250CustomPayload payload)
-    {
-    }
-
-    /**
-     * Called when a chat message is received. Return true to stop further processing
-     *
-     * @param source
-     * @param chat
-     * @return true if you want to consume the message so it is not available for further processing
-     */
-    public boolean onChatMessageReceived(EntityHuman source, Packet3Chat chat)
-    {
-        return false;
-    }
-    /**
-     * Called when a server command is received
-     * @param command
-     * @return true if you want to consume the message so it is not available for further processing
-     */
-    public boolean onServerCommand(String command, String sender, ICommandListener listener)
-    {
-        return false;
-    }
-
-    /**
-     * Called when a new client logs in.
-     *
-     * @param player
-     */
-    public void onClientLogin(EntityHuman player)
-    {
-    }
-
-    /**
-     * Called when a client logs out of the server.
-     *
-     * @param player
-     */
-    public void onClientLogout(EntityHuman player)
-    {
-
-    }
-
-    /**
-     *
-     * Called when a client changes dimensions on the server.
-     *
-     * @param player
-     */
-    public void onClientDimensionChanged(EntityHuman player)
-    {
-
-    }
-
-    // Spare client junk
-    // -------
-    // void addRenderer(Map<Class<? extends Entity>, Render> renderers);
-    // void registerAnimation(Minecraft game);
-    // void renderInvBlock(RenderBlocks renderer, Block block, int metadata, int modelID);
-    // boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID);
-    // boolean onTickInGUI(float tick, Minecraft game, GuiScreen gui);
-    // void keyboardEvent(KeyBinding event);
-
-    @Override
-    public void keyBindingEvent(Object keybinding) {
-    	// NOOP on server
-    }
-}

bukkit/net/minecraft/server/BukkitRegistry.java

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

bukkit/net/minecraft/server/MLProp.java

@@ -1,48 +0,0 @@
-/*
- * The FML Forge Mod Loader suite. Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package net.minecraft.server;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import static java.lang.annotation.RetentionPolicy.*;
-import static java.lang.annotation.ElementType.*;
-
-/**
- * @author cpw
- *
- */
-@Retention(value = RUNTIME)
-@Target(value = FIELD)
-public @interface MLProp
-{
-    /**
-     * Adds additional help to top of configuration file.
-     */
-String info() default "";
-
-    /**
-     * Maximum value allowed if field is a number.
-     */
-    double max() default Double.MAX_VALUE;
-
-    /**
-     * Minimum value allowed if field is a number.
-     */
-    double min() default Double.MIN_VALUE;
-
-    /**
-     * Overrides the field name for property key.
-     */
-String name() default "";
-
-}

bukkit/net/minecraft/server/ModLoader.java

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

bukkit/net/minecraft/server/SidedProxy.java

@@ -1,46 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package net.minecraft.server;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @author cpw
- *
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface SidedProxy
-{
-    /**
-     * The name of the client side class to load and populate
-     * @return
-     */
-    String clientSide() default "";
-    
-    /**
-     * The name of the server side class to load and populate
-     * @return
-     */
-    String serverSide() default "";
-    
-    /**
-     * The name of the a special bukkit plugin class to load and populate
-     */
-    String bukkitSide() default "";
-}

bukkit/net/minecraft/src/BiomeGenBase.java

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

bukkit/net/minecraft/src/Block.java

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

bukkit/net/minecraft/src/Entity.java

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

bukkit/net/minecraft/src/EntityLiving.java

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

bukkit/net/minecraft/src/EnumCreatureType.java

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

bukkit/net/minecraft/src/IRecipe.java

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

bukkit/net/minecraft/src/ItemBlock.java

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

bukkit/net/minecraft/src/ItemStack.java

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

bukkit/net/minecraft/src/TileEntity.java

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

cleanup_source.py

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

client/cpw/mods/fml/client/FMLTextureFX.java

@@ -1,70 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package cpw.mods.fml.client;
-
-import java.awt.Dimension;
-import java.util.List;
-import java.util.logging.Logger;
-
-import net.minecraft.client.renderer.RenderEngine;
-import net.minecraft.client.renderer.texturefx.TextureFX;
-import net.minecraft.client.texturepacks.ITexturePack;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
-
-public class FMLTextureFX extends TextureFX implements ITextureFX
-{
-    public int tileSizeBase = 16;
-    public int tileSizeSquare = 256;
-    public int tileSizeMask = 15;
-    public int tileSizeSquareMask = 255;
-    public boolean errored = false;
-    protected Logger log = FMLLog.getLogger();
-
-    public FMLTextureFX(int icon)
-    {
-        super(icon);
-    }
-
-    @Override public void setErrored(boolean err){ errored = err; }
-    @Override public boolean getErrored(){ return errored; }
-    @Override
-    public void onTexturePackChanged(RenderEngine engine, ITexturePack texturepack, Dimension dimensions)
-    {
-        onTextureDimensionsUpdate(dimensions.width, dimensions.height);
-    }
-    @Override
-    public void onTextureDimensionsUpdate(int width, int height)
-    {
-        tileSizeBase = width >> 4;
-        tileSizeSquare = tileSizeBase * tileSizeBase;
-        tileSizeMask = tileSizeBase - 1;
-        tileSizeSquareMask = tileSizeSquare - 1;
-        setErrored(false);
-        setup();
-    }
-
-    protected void setup()
-    {
-        field_76852_a = new byte[tileSizeSquare << 2];
-    }
-
-    public boolean unregister(RenderEngine engine, List<TextureFX> effects)
-    {
-        effects.remove(this);
-        return true;
-    }
-}

client/cpw/mods/fml/client/ITextureFX.java

@@ -1,31 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package cpw.mods.fml.client;
-
-import java.awt.Dimension;
-
-import net.minecraft.client.renderer.RenderEngine;
-import net.minecraft.client.texturepacks.ITexturePack;
-
-public interface ITextureFX
-{
-    public void onTexturePackChanged(RenderEngine engine, ITexturePack texturepack, Dimension dimensions);
-
-    public void onTextureDimensionsUpdate(int width, int height);
-    
-    public void setErrored(boolean errored);
-    
-    public boolean getErrored();
-}

client/cpw/mods/fml/client/OverrideInfo.java

@@ -1,44 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package cpw.mods.fml.client;
-
-import net.minecraft.client.renderer.texturefx.TextureFX;
-
-class OverrideInfo
-{
-    public String texture;
-    public String override;
-    public int index;
-    public int imageIndex;
-    public TextureFX textureFX;
-    public boolean added;
-    
-    @Override
-    public boolean equals(Object obj)
-    {
-        try {
-            OverrideInfo inf=(OverrideInfo) obj;
-            return index==inf.index && imageIndex==inf.imageIndex;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-    
-    @Override
-    public int hashCode()
-    {
-        return index+imageIndex;
-    }
-}

client/cpw/mods/fml/client/SpriteHelper.java

@@ -1,138 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package cpw.mods.fml.client;
-
-import java.util.BitSet;
-import java.util.HashMap;
-import java.util.logging.Level;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
-
-/**
- * @author cpw
- *
- */
-public class SpriteHelper
-{
-    private static HashMap<String, BitSet> spriteInfo = new HashMap<String, BitSet>();
-
-    private static void initMCSpriteMaps() {
-        BitSet slots =
-                SpriteHelper.toBitSet(
-                "0000000000000000" +
-                "0000000000110000" +
-                "0000000000100000" +
-                "0000000001100000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000011111" +
-                "0000000000000000" +
-                "0000000001111100" +
-                "0000000001111000" +
-                "0000000000000000");
-        spriteInfo.put("/terrain.png", slots);
-
-        slots = SpriteHelper.toBitSet(
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0000000000000000" +
-                "0111110000000000" +
-                "1111111010000000" +
-                "0111111110000000" +
-                "0111111111111001" +
-                "1111111111111111" +
-                "0000011111111111" +
-                "0000000000000000");
-        spriteInfo.put("/gui/items.png", slots);
-    }
-    /**
-     * Register a sprite map for ModTextureStatic, to allow for other mods to override
-     * your sprite page.
-     *
-     *
-     */
-    public static void registerSpriteMapForFile(String file, String spriteMap) {
-        if (spriteInfo.size() == 0) {
-            initMCSpriteMaps();
-        }
-        if (spriteInfo.containsKey(file)) {
-            FMLCommonHandler.instance().getFMLLogger().finer(String.format("Duplicate attempt to register a sprite file %s for overriding -- ignoring",file));
-            return;
-        }
-        spriteInfo.put(file, toBitSet(spriteMap));
-    }
-
-    public static int getUniqueSpriteIndex(String path)
-    {
-        if (!spriteInfo.containsKey("/terrain.png"))
-        {
-            initMCSpriteMaps();
-        }
-
-        BitSet slots = spriteInfo.get(path);
-
-        if (slots == null)
-        {
-            Exception ex = new Exception(String.format("Invalid getUniqueSpriteIndex call for texture: %s", path));
-            FMLLog.log(Level.SEVERE, ex, "A critical error has been detected with sprite overrides");
-            FMLCommonHandler.instance().raiseException(ex,"Invalid request to getUniqueSpriteIndex",true);
-        }
-
-        int ret = getFreeSlot(slots);
-
-        if (ret == -1)
-        {
-            Exception ex = new Exception(String.format("No more sprite indicies left for: %s", path));
-            FMLLog.log(Level.SEVERE, ex, "There are no sprite indicies left for %s", path);
-            FMLCommonHandler.instance().raiseException(ex,"No more sprite indicies left", true);
-        }
-        return ret;
-    }
-
-    public static BitSet toBitSet(String data)
-    {
-        BitSet ret = new BitSet(data.length());
-        for (int x = 0; x < data.length(); x++)
-        {
-            ret.set(x, data.charAt(x) == '1');
-        }
-        return ret;
-    }
-
-    public static int getFreeSlot(BitSet slots)
-    {
-        int next=slots.nextSetBit(0);
-        slots.clear(next);
-        return next;
-    }
-
-    public static int freeSlotCount(String textureToOverride)
-    {
-        return spriteInfo.get(textureToOverride).cardinality();
-    }
-
-}

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

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

client/net/minecraft/src/EntityRendererProxy.java

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

client/net/minecraft/src/FMLRenderAccessLibrary.java

@@ -1,99 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package net.minecraft.src;
-
-import java.awt.Dimension;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.RenderEngine;
-import net.minecraft.client.renderer.texturefx.TextureFX;
-import net.minecraft.client.texturepacks.ITexturePack;
-import net.minecraft.world.IBlockAccess;
-
-import cpw.mods.fml.client.TextureFXManager;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.FMLLog;
-
-/**
- *
- * A static hook library for optifine and other basemod editing code to access FML functions
- *
- * @author cpw
- *
- */
-public class FMLRenderAccessLibrary
-{
-    public static Logger getLogger()
-    {
-        return FMLLog.getLogger();
-    }
-
-    public static void log(Level level, String message)
-    {
-        FMLLog.log(level, message);
-    }
-
-    public static void log(Level level, String message, Throwable throwable)
-    {
-        FMLLog.log(level, throwable, message);
-    }
-
-    public static void setTextureDimensions(int textureId, int width, int height, List<TextureFX> textureFXList)
-    {
-        TextureFXManager.instance().setTextureDimensions(textureId, width, height, textureFXList);
-    }
-
-    public static void preRegisterEffect(TextureFX textureFX)
-    {
-        TextureFXManager.instance().onPreRegisterEffect(textureFX);
-    }
-
-    public static boolean onUpdateTextureEffect(TextureFX textureFX)
-    {
-        return TextureFXManager.instance().onUpdateTextureEffect(textureFX);
-    }
-
-    public static Dimension getTextureDimensions(TextureFX textureFX)
-    {
-        return TextureFXManager.instance().getTextureDimensions(textureFX);
-    }
-
-    public static void onTexturePackChange(RenderEngine engine, ITexturePack texturePack, List<TextureFX> textureFXList)
-    {
-        TextureFXManager.instance().onTexturePackChange(engine, texturePack, textureFXList);
-    }
-
-    @SuppressWarnings("deprecation")
-    public static boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelId)
-    {
-        return RenderingRegistry.instance().renderWorldBlock(renderer, world, x, y, z, block, modelId);
-    }
-
-    @SuppressWarnings("deprecation")
-    public static void renderInventoryBlock(RenderBlocks renderer, Block block, int metadata, int modelID)
-    {
-        RenderingRegistry.instance().renderInventoryBlock(renderer, block, metadata, modelID);
-    }
-
-    @SuppressWarnings("deprecation")
-    public static boolean renderItemAsFull3DBlock(int modelId)
-    {
-        return RenderingRegistry.instance().renderItemAsFull3DBlock(modelId);
-    }
-}

client/net/minecraft/src/ModTextureAnimation.java

@@ -1,141 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package net.minecraft.src;
-
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.ImageObserver;
-
-import net.minecraft.client.renderer.RenderEngine;
-
-import org.lwjgl.opengl.GL11;
-
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.client.FMLTextureFX;
-
-/**
- * A texture override for animations, it takes a vertical image of
- * texture frames and constantly rotates them in the texture.
- */
-public class ModTextureAnimation extends FMLTextureFX
-{
-    private final int tickRate;
-    private byte[][] images;
-    private int index = 0;
-    private int ticks = 0;
-
-    private String targetTex = null;
-    private BufferedImage imgData = null;
-
-    public ModTextureAnimation(int icon, int target, BufferedImage image, int tickCount)
-    {
-        this(icon, 1, target, image, tickCount);
-    }
-
-    public ModTextureAnimation(int icon, int size, int target, BufferedImage image, int tickCount)
-    {
-        this(icon, size, (target == 0 ? "/terrain.png" : "/gui/items.png"), image, tickCount);
-    }
-
-    public ModTextureAnimation(int icon, int size, String target, BufferedImage image, int tickCount)
-    {
-        super(icon);
-        RenderEngine re = FMLClientHandler.instance().getClient().field_71446_o;
-
-        targetTex = target;
-        field_76849_e = size;
-        field_76847_f = re.func_78341_b(target);
-
-        tickRate = tickCount;
-        ticks = tickCount;
-        imgData = image;
-    }
-
-    @Override
-    public void setup()
-    {
-        super.setup();
-
-        int sWidth  = imgData.getWidth();
-        int sHeight = imgData.getHeight();
-        int tWidth  = tileSizeBase;
-        int tHeight = tileSizeBase;
-
-
-        int frames = (int)Math.floor((double)(sHeight / sWidth));
-
-        if (frames < 1)
-        {
-            throw new IllegalArgumentException(String.format("Attempted to create a TextureAnimation with no complete frames: %dx%d", sWidth, sHeight));
-        }
-        else
-        {
-            images = new byte[frames][];
-            BufferedImage image = imgData;
-
-            if (sWidth != tWidth)
-            {
-                BufferedImage b = new BufferedImage(tWidth, tHeight * frames, 6);
-                Graphics2D g = b.createGraphics();
-                g.drawImage(imgData, 0, 0, tWidth, tHeight * frames, 0, 0, sWidth, sHeight, (ImageObserver)null);
-                g.dispose();
-                image = b;
-            }
-
-            for (int frame = 0; frame < frames; frame++)
-            {
-                int[] pixels = new int[tileSizeSquare];
-                image.getRGB(0, tHeight * frame, tWidth, tHeight, pixels, 0, tWidth);
-                images[frame] = new byte[tileSizeSquare << 2];
-
-                for (int i = 0; i < pixels.length; i++)
-                {
-                    int i4 = i * 4;
-                    images[frame][i4 + 0] = (byte)(pixels[i] >> 16 & 255);
-                    images[frame][i4 + 1] = (byte)(pixels[i] >> 8  & 255);
-                    images[frame][i4 + 2] = (byte)(pixels[i] >> 0  & 255);
-                    images[frame][i4 + 3] = (byte)(pixels[i] >> 24 & 255);
-                }
-            }
-        }
-    }
-
-    public void func_76846_a()
-    {
-        if (++ticks >= tickRate)
-        {
-            if (++index >= images.length)
-            {
-                index = 0;
-            }
-
-            field_76852_a = images[index];
-            ticks = 0;
-        }
-    }
-
-    public void func_76845_a(RenderEngine renderEngine)
-    {
-        GL11.glBindTexture(GL11.GL_TEXTURE_2D, field_76847_f);
-    }
-
-    // TODO: REMOVE THIS - just for you dan200
-    @Deprecated
-    public void func_783_a()
-    {
-        func_76846_a();
-    }
-
-}

client/net/minecraft/src/ModTextureStatic.java

@@ -1,183 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package net.minecraft.src;
-
-import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D;
-
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.awt.image.ImageObserver;
-
-import net.minecraft.client.renderer.RenderEngine;
-
-import org.lwjgl.opengl.GL11;
-
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.client.FMLTextureFX;
-
-public class ModTextureStatic extends FMLTextureFX
-{
-    private boolean oldanaglyph = false;
-    private int[] pixels = null;
-    private String targetTex = null;
-    private int storedSize;
-    private BufferedImage overrideData = null;
-    private int needApply = 10;
-
-
-    public ModTextureStatic(int icon, int target, BufferedImage image)
-    {
-        this(icon, 1, target, image);
-    }
-
-    public ModTextureStatic(int icon, int size, int target, BufferedImage image)
-    {
-        this(icon, size, (target == 0 ? "/terrain.png" : "/gui/items.png"), image);
-    }
-
-    public ModTextureStatic(int icon, int size, String target, BufferedImage image)
-    {
-        super(icon);
-        RenderEngine re = FMLClientHandler.instance().getClient().field_71446_o;
-
-        targetTex = target;
-        storedSize = size;
-        field_76849_e = size;
-        field_76847_f = re.func_78341_b(target);
-        overrideData = image;
-    }
-
-    @Override
-    public void setup()
-    {
-        super.setup();
-        int sWidth  = overrideData.getWidth();
-        int sHeight = overrideData.getHeight();
-
-        pixels = new int[tileSizeSquare];
-        if (tileSizeBase == sWidth && tileSizeBase == sHeight)
-        {
-            overrideData.getRGB(0, 0, sWidth, sHeight, pixels, 0, sWidth);
-        }
-        else
-        {
-            BufferedImage tmp = new BufferedImage(tileSizeBase, tileSizeBase, 6);
-            Graphics2D gfx = tmp.createGraphics();
-            gfx.drawImage(overrideData, 0, 0, tileSizeBase, tileSizeBase, 0, 0, sWidth, sHeight, (ImageObserver)null);
-            tmp.getRGB(0, 0, tileSizeBase, tileSizeBase, pixels, 0, tileSizeBase);
-            gfx.dispose();
-        }
-
-        update();
-    }
-
-    @Override
-    public void func_76846_a()
-    {
-        if (oldanaglyph != field_76851_c)
-        {
-            update();
-        }
-        // This makes it so we only apply the texture to the target texture when we need to,
-        //due to the fact that update is called when the Effect is first registered, we actually
-        //need to wait for the next one.
-        field_76849_e = (needApply == 0 ? 0 : storedSize);
-        if (needApply > 0)
-        {
-            needApply--;
-        }
-    }
-
-    @Override
-    public void func_76845_a(RenderEngine p_76845_1_)
-    {
-        GL11.glBindTexture(GL_TEXTURE_2D, p_76845_1_.func_78341_b(targetTex));
-    }
-
-    public void update()
-    {
-        needApply = 10;
-        for (int idx = 0; idx < pixels.length; idx++)
-        {
-            int i = idx * 4;
-            int a = pixels[idx] >> 24 & 255;
-            int r = pixels[idx] >> 16 & 255;
-            int g = pixels[idx] >> 8 & 255;
-            int b = pixels[idx] >> 0 & 255;
-
-            if (field_76851_c)
-            {
-                r = g = b = (r + g + b) / 3;
-            }
-
-            field_76852_a[i + 0] = (byte)r;
-            field_76852_a[i + 1] = (byte)g;
-            field_76852_a[i + 2] = (byte)b;
-            field_76852_a[i + 3] = (byte)a;
-        }
-
-        oldanaglyph = field_76851_c;
-    }
-
-    //Implementation of http://scale2x.sourceforge.net/algorithm.html
-    public static BufferedImage scale2x(BufferedImage image)
-    {
-        int w = image.getWidth();
-        int h = image.getHeight();
-        BufferedImage tmp = new BufferedImage(w * 2, h * 2, 2);
-
-        for (int x = 0; x < h; ++x)
-        {
-            int x2 = x * 2;
-            for (int y = 0; y < w; ++y)
-            {
-                int y2 = y * 2;
-                int E = image.getRGB(y, x);
-                int D = (x == 0     ? E : image.getRGB(y,     x - 1));
-                int B = (y == 0     ? E : image.getRGB(y - 1, x    ));
-                int H = (y >= w - 1 ? E : image.getRGB(y + 1, x    ));
-                int F = (x >= h - 1 ? E : image.getRGB(y,     x + 1));
-
-                int e0, e1, e2, e3;
-
-                if (B != H && D != F)
-                {
-                    e0 = D == B ? D : E;
-                    e1 = B == F ? F : E;
-                    e2 = D == H ? D : E;
-                    e3 = H == F ? F : E;
-                }
-                else
-                {
-                    e0 = e1 = e2 = e3 = E;
-                }
-
-                tmp.setRGB(y2,     x2,     e0);
-                tmp.setRGB(y2 + 1, x2,     e1);
-                tmp.setRGB(y2,     x2 + 1, e2);
-                tmp.setRGB(y2 + 1, x2 + 1, e3);
-            }
-        }
-
-        return tmp;
-    }
-
-
-    @Override
-    public String toString()
-    {
-        return String.format("ModTextureStatic %s @ %d", targetTex, field_76850_b);
-    }
-}

commands.patch

@@ -1,126 +0,0 @@
---- commands.py
-+++ commands.py
-@@ -58,6 +58,8 @@
- 
- 
- def reallyrmtree(path):
-+    if os.path.isfile(os.path.join(path, 'asm-all-4.0.jar')): #Check if asm exists, indicating the libs folder, if so, don't delete it
-+        return
-     if not sys.platform.startswith('win'):
-         if os.path.exists(path):
-             shutil.rmtree(path)
-@@ -788,6 +790,8 @@
-         binlk = {CLIENT: self.binclient, SERVER: self.binserver}
-         testlk = {CLIENT: self.testclient, SERVER: self.testserver}
- 
-+        if side == SERVER:
-+            return self.checkbins(CLIENT)
-         if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
-             return False
-         return True
-@@ -1029,6 +1033,10 @@
-         pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
-         pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
- 
-+        if side == SERVER: #Disable server because FML recombines it into client
-+            self.logger.info('Server side recompiling skipped, this is normal')
-+            return
-+        
-         if not os.path.exists(pathbinlk[side]):
-             os.makedirs(pathbinlk[side])
- 
-@@ -1062,7 +1070,7 @@
-             raise
- 
-     def startserver(self):
--        classpath = [self.binserver] + self.cpathserver
-+        classpath = [self.binclient] + self.cpathserver
-         classpath = [os.path.join('..', p) for p in classpath]
-         classpath = os.pathsep.join(classpath)
-         os.chdir(self.dirjars)
-@@ -1197,20 +1205,20 @@
-         with open(self.csvmethods, 'rb') as fh:
-             methodsreader = csv.DictReader(fh)
-             for row in methodsreader:
--                if int(row['side']) == side:
-+                if int(row['side']) == side or int(row['side']) == 2:
-                     if row['name'] != row['searge']:
-                         names['methods'][row['searge']] = row['name']
-         with open(self.csvfields, 'rb') as fh:
-             fieldsreader = csv.DictReader(fh)
-             for row in fieldsreader:
--                if int(row['side']) == side:
-+                if int(row['side']) == side or int(row['side']) == 2:
-                     if row['name'] != row['searge']:
-                         names['fields'][row['searge']] = row['name']
-         if self.has_param_csv:
-             with open(self.csvparams, 'rb') as fh:
-                 paramsreader = csv.DictReader(fh)
-                 for row in paramsreader:
--                    if int(row['side']) == side:
-+                    if int(row['side']) == side or int(row['side']) == 2:
-                         names['params'][row['param']] = row['name']
- 
-         regexps = {
-@@ -1344,13 +1352,13 @@
-         methods = {}
-         for row in methodsreader:
-             #HINT: Only include methods that have a non-empty description
--            if int(row['side']) == side and row['desc']:
-+            if (int(row['side']) == side or int(row['side']) == 2) and row['desc']:
-                 methods[row['searge']] = row['desc'].replace('*/', '* /')
- 
-         fields = {}
-         for row in fieldsreader:
-             #HINT: Only include fields that have a non-empty description
--            if int(row['side']) == side and row['desc']:
-+            if (int(row['side']) == side or int(row['side']) == 2) and row['desc']:
-                 fields[row['searge']] = row['desc'].replace('*/', '* /')
- 
-         regexps = {
-@@ -1427,7 +1435,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:
-@@ -1442,6 +1450,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))
-@@ -1594,6 +1605,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])
-@@ -1614,6 +1628,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 = {}
-@@ -1656,3 +1673,6 @@
-                 except IOError:
-                     self.logger.error('* File %s copy failed', in_class)
- 
-+def commands_sanity_check():
-+    print 'Commands patch applied successfully'
-+    

common/cpw/mods/fml/common/BukkitProxy.java

@@ -1,12 +0,0 @@
-package cpw.mods.fml.common;
-
-/**
- * A marker interface for retrieving a proxy to a bukkit plugin.
- * Fields associated with {@link BukkitPluginRef} annotations should be should probably
- * declare this type and cast down if the target is available (not null)
- * @author cpw
- *
- */
-public interface BukkitProxy
-{
-}

common/cpw/mods/fml/common/DuplicateModsFoundException.java

@@ -1,16 +0,0 @@
-package cpw.mods.fml.common;
-
-import java.io.File;
-import java.util.List;
-
-import com.google.common.collect.SetMultimap;
-
-public class DuplicateModsFoundException extends LoaderException {
-
-	public SetMultimap<ModContainer,File> dupes;
-
-	public DuplicateModsFoundException(SetMultimap<ModContainer, File> dupes) {
-		this.dupes = dupes;
-	}
-
-}

common/cpw/mods/fml/common/IConsoleHandler.java

@@ -1,24 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package cpw.mods.fml.common;
-
-/**
- * @author cpw
- *
- */
-public interface IConsoleHandler
-{
-    public boolean handleCommand(String command, Object... data);
-}

common/cpw/mods/fml/common/ICraftingHandler.java

@@ -1,43 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package cpw.mods.fml.common;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
-
-/**
- * Return a crafting handler for the mod container to call
- *
- * @author cpw
- *
- */
-public interface ICraftingHandler
-{
-    /**
-     * The object array contains these three arguments
-     *
-     * @param player
-     * @param item
-     * @param craftMatrix
-     */
-    void onCrafting(EntityPlayer player, ItemStack item, IInventory craftMatrix);
-
-    /**
-     * The object array contains these two arguments
-     * @param player
-     * @param item
-     */
-    void onSmelting(EntityPlayer player, ItemStack item);
-}

common/cpw/mods/fml/common/ICrashCallable.java

@@ -1,8 +0,0 @@
-package cpw.mods.fml.common;
-
-import java.util.concurrent.Callable;
-
-public interface ICrashCallable extends Callable<String>
-{
-    String getLabel();
-}

common/cpw/mods/fml/common/IDispenseHandler.java

@@ -1,48 +0,0 @@
-/*
- * The FML Forge Mod Loader suite. Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package cpw.mods.fml.common;
-
-import java.util.Random;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-
-/**
- * Deprecated without replacement, use vanilla DispenserRegistry code
- *
- * @author cpw
- *
- */
-@Deprecated
-public interface IDispenseHandler
-{
-    /**
-     * Return -1 if you don't want to dispense anything. the other values seem to have specific meanings
-     * to blockdispenser.
-     *
-     * @param x
-     * @param y
-     * @param z
-     * @param xVelocity
-     * @param zVelocity
-     * @param world
-     * @param item
-     * @param random
-     * @param entX
-     * @param entY
-     * @param entZ
-     */
-    @Deprecated
-    int dispense(double x, double y, double z, int xVelocity, int zVelocity, World world, ItemStack item, Random random, double entX, double entY, double entZ);
-}

common/cpw/mods/fml/common/IDispenserHandler.java

@@ -1,33 +0,0 @@
-package cpw.mods.fml.common;
-
-import java.util.Random;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-/**
- *
- * Deprecated without replacement. Use vanilla DispenserRegistry code.
- *
- * @author cpw
- *
- */
-@Deprecated
-public interface IDispenserHandler
-{
-    /**
-     * Called to dispense an entity
-     * @param x
-     * @param y
-     * @param z
-     * @param xVelocity
-     * @param zVelocity
-     * @param world
-     * @param item
-     * @param random
-     * @param entX
-     * @param entY
-     * @param entZ
-     */
-    int dispense(int x, int y, int z, int xVelocity, int zVelocity, World world, ItemStack item, Random random, double entX, double entY, double entZ);
-}

common/cpw/mods/fml/common/IFMLHandledException.java

@@ -1,6 +0,0 @@
-package cpw.mods.fml.common;
-
-public interface IFMLHandledException
-{
-
-}

common/cpw/mods/fml/common/IFuelHandler.java

@@ -1,8 +0,0 @@
-package cpw.mods.fml.common;
-
-import net.minecraft.item.ItemStack;
-
-public interface IFuelHandler
-{
-    int getBurnTime(ItemStack fuel);
-}

common/cpw/mods/fml/common/IPickupNotifier.java

@@ -1,22 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package cpw.mods.fml.common;
-
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-
-public interface IPickupNotifier
-{
-    void notifyPickup(EntityItem item, EntityPlayer player);
-}

common/cpw/mods/fml/common/IPlayerTracker.java

@@ -1,32 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package cpw.mods.fml.common;
-
-import net.minecraft.entity.player.EntityPlayer;
-
-/**
- * @author cpw
- *
- */
-public interface IPlayerTracker
-{
-    void onPlayerLogin(EntityPlayer player);
-
-    void onPlayerLogout(EntityPlayer player);
-
-    void onPlayerChangedDimension(EntityPlayer player);
-
-    void onPlayerRespawn(EntityPlayer player);
-}

common/cpw/mods/fml/common/IScheduledTickHandler.java

@@ -1,12 +0,0 @@
-package cpw.mods.fml.common;
-
-public interface IScheduledTickHandler extends ITickHandler
-{
-    /**
-     * Return the number of actual ticks that will pass
-     * before your next tick will fire. This will be called
-     * just after your last tick fired to compute the next delay.
-     * @return Time until next tick
-     */
-    public int nextTickSpacing();
-}

common/cpw/mods/fml/common/LoaderException.java

@@ -1,31 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package cpw.mods.fml.common;
-
-public class LoaderException extends RuntimeException
-{
-    /**
-     *
-     */
-    private static final long serialVersionUID = -5675297950958861378L;
-
-    public LoaderException(Throwable wrapped)
-    {
-        super(wrapped);
-    }
-
-    public LoaderException()
-    {
-    }
-}

common/cpw/mods/fml/common/MCPDummyContainer.java

@@ -1,14 +0,0 @@
-package cpw.mods.fml.common;
-
-import com.google.common.eventbus.EventBus;
-
-public class MCPDummyContainer extends DummyModContainer {
-	public MCPDummyContainer(ModMetadata metadata) {
-		super(metadata);
-	}
-
-	@Override
-	public boolean registerBus(EventBus bus, LoadController controller) {
-		return true;
-	}
-}

common/cpw/mods/fml/common/Mod.java

@@ -1,240 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package cpw.mods.fml.common;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import net.minecraft.item.ItemBlock;
-
-import cpw.mods.fml.common.event.FMLInterModComms;
-import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
-
-/**
- * The new mod style in FML 1.3
- *
- * @author cpw
- *
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface Mod
-{
-    /**
-     * The unique mod identifier for this mod
-     */
-    String modid();
-    /**
-     * A user friendly name for the mod
-     */
-    String name() default "";
-    /**
-     * A version string for this mod
-     */
-    String version() default "";
-    /**
-     * A simple dependency string for this mod (see modloader's "priorities" string specification)
-     */
-    String dependencies() default "";
-    /**
-     * Whether to use the mcmod.info metadata by default for this mod.
-     * If true, settings in the mcmod.info file will override settings in these annotations.
-     */
-    boolean useMetadata() default false;
-
-    /**
-     * The acceptable range of minecraft versions that this mod will load and run in
-     * The default ("empty string") indicates that only the current minecraft version is acceptable.
-     * FML will refuse to run with an error if the minecraft version is not in this range across all mods.
-     * @return A version range as specified by the maven version range specification or the empty string
-     */
-    String acceptedMinecraftVersions() default "";
-    /**
-     * An optional bukkit plugin that will be injected into the bukkit plugin framework if
-     * this mod is loaded into the FML framework and the bukkit coremod is present.
-     * Instances of the bukkit plugin can be obtained via the {@link BukkitPluginRef} annotation on fields.
-     * @return The name of the plugin to load for this mod
-     */
-    String bukkitPlugin() default "";
-    /**
-     * Mods that this mod will <strong>not</strong> load with.
-     * An optional comma separated string of (+|-)(*|modid[@value]) which specify mods that
-     * this mod will refuse to load with, resulting in the game failing to start.
-     * Entries can be prefixed with a + for a positive exclusion assertion, or - for a negative exclusion
-     * assertion. Asterisk is the wildcard and represents <strong>all</strong> mods.
-     *
-     * The <strong>only</strong> mods that cannot be excluded are FML and MCP, trivially.
-     * Other special values:
-     * <ul>
-     * <li>+f indicates that the mod will accept a minecraft forge environment.</li>
-     * <li>-* indicates that the mod will not accept any other mods.</li>
-     * </ul>
-     *
-     * Some examples:
-     * <ul>
-     * <li><em>-*,+f,+IronChest</em>: Will run only in a minecraft forge environment with the mod IronChests.
-     * The -* forces all mods to be excluded, then the +f and +IronChest add into the "allowed list".</li>
-     * <li><em>+f,-IC2</em>: Will run in a minecraft forge environment but will <strong>not</strong> run if
-     * IndustrialCraft 2 (IC2) is loaded alongside.</li>
-     * <li><em>-*</em>: Will not run if <strong>any</strong> othe mod is loaded except MCP/FML itself.</li>
-     * </ul>
-     *
-     * If a mod is present on the excluded list, the game will stop and show an error screen. If the
-     * class containing the {@link Mod} annotation has a "getCustomErrorException" method, it will be
-     * called to retrieve a custom error message for display in this case. If two mods have a declared
-     * exclusion which is matched, the screen that is shown is indeterminate.
-     *
-     * @return A string listing modids to exclude from loading with this mod.
-     */
-    String modExclusionList() default "";
-    /**
-     * Specifying this field allows for a mod to expect a signed jar with a fingerprint matching this value.
-     * The fingerprint should be SHA-1 encoded, lowercase with ':' removed. An empty value indicates that
-     * the mod is not expecting to be signed.
-     *
-     * Any incorrectness of the fingerprint, be it missing or wrong, will result in the {@link FingerprintWarning}
-     * method firing <i>prior to any other event on the mod</i>.
-     *
-     * @return A certificate fingerprint that is expected for this mod.
-     */
-    String certificateFingerprint() default "";
-    /**
-     * Mark the designated method as to be called at if there is something wrong with the certificate fingerprint of
-     * the mod's jar, or it is missing, or otherwise a problem.
-     * @author cpw
-     *
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface FingerprintWarning {}
-    /**
-     * Mark the designated method as being called at the "pre-initialization" phase
-     * @author cpw
-     *
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface PreInit {}
-    /**
-     * Mark the designated method as being called at the "initialization" phase
-     * @author cpw
-     *
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface Init {}
-    /**
-     * Mark the designated method as being called at the "post-initialization" phase
-     * @author cpw
-     *
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface PostInit {}
-    /**
-     * Mark the designated method as being called at the "server-starting" phase
-     * @author cpw
-     *
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface ServerStarting {}
-    /**
-     * Mark the designated method as being called at the "server-started" phase
-     * @author cpw
-     *
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface ServerStarted {}
-    /**
-     * Mark the designated method as being called at the "server-stopping" phase
-     * @author cpw
-     *
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface ServerStopping {}
-    /**
-     * Mark the designated method as the receiver for {@link FMLInterModComms} messages
-     * Called between {@link Init} and {@link PostInit}
-     * @author cpw
-     *
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    public @interface IMCCallback {}
-    /**
-     * Populate the annotated field with the mod instance.
-     * @author cpw
-     *
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.FIELD)
-    public @interface Instance {
-        /**
-         * The mod object to inject into this field
-         */
-        String value() default "";
-    }
-    /**
-     * Populate the annotated field with the mod's metadata.
-     * @author cpw
-     *
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.FIELD)
-    public @interface Metadata {
-        /**
-         * The mod id specifying the metadata to load here
-         */
-        String value() default "";
-    }
-    /**
-     * Populate the annotated field with an instance of the Block as specified
-     * @author cpw
-     *
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.FIELD)
-    public @interface Block {
-        /**
-         * The block's name
-         */
-        String name();
-        /**
-         * The associated ItemBlock subtype for the item (can be null for an ItemBlock)
-         */
-        Class<?> itemTypeClass() default ItemBlock.class;
-    }
-    /**
-     * Populate the annotated field with an Item
-     * @author cpw
-     *
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.FIELD)
-    public @interface Item {
-        /**
-         * The name of the item
-         */
-        String name();
-        /**
-         * The type of the item
-         */
-        String typeClass();
-    }
-}

common/cpw/mods/fml/common/ModClassLoader.java

@@ -1,89 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-package cpw.mods.fml.common;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.List;
-import java.util.logging.Level;
-
-import com.google.common.collect.ImmutableList;
-
-import cpw.mods.fml.common.asm.ASMTransformer;
-import cpw.mods.fml.common.asm.transformers.AccessTransformer;
-import cpw.mods.fml.common.modloader.BaseModProxy;
-import cpw.mods.fml.relauncher.RelaunchClassLoader;
-
-/**
- * A simple delegating class loader used to load mods into the system
- *
- *
- * @author cpw
- *
- */
-public class ModClassLoader extends URLClassLoader
-{
-    private static final List<String> STANDARD_LIBRARIES = ImmutableList.of("jinput.jar", "lwjgl.jar", "lwjgl_util.jar");
-    private RelaunchClassLoader mainClassLoader;
-
-    public ModClassLoader(ClassLoader parent) {
-        super(new URL[0], null);
-        this.mainClassLoader = (RelaunchClassLoader)parent;
-    }
-
-    public void addFile(File modFile) throws MalformedURLException
-    {
-            URL url = modFile.toURI().toURL();
-        mainClassLoader.addURL(url);
-    }
-
-    @Override
-    public Class<?> loadClass(String name) throws ClassNotFoundException
-    {
-        return mainClassLoader.loadClass(name);
-    }
-
-    public File[] getParentSources() {
-        List<URL> urls=mainClassLoader.getSources();
-        File[] sources=new File[urls.size()];
-        try
-        {
-            for (int i = 0; i<urls.size(); i++)
-            {
-                sources[i]=new File(urls.get(i).toURI());
-            }
-            return sources;
-        }
-        catch (URISyntaxException e)
-        {
-            FMLLog.log(Level.SEVERE, "Unable to process our input to locate the minecraft code", e);
-            throw new LoaderException(e);
-        }
-    }
-
-    public List<String> getDefaultLibraries()
-    {
-        return STANDARD_LIBRARIES;
-    }
-
-    public Class<? extends BaseModProxy> loadBaseModClass(String modClazzName) throws Exception
-    {
-        AccessTransformer transformer = (AccessTransformer)mainClassLoader.getTransformers().get(0);
-        transformer.ensurePublicAccessFor(modClazzName);
-        return (Class<? extends BaseModProxy>) Class.forName(modClazzName, true, this);
-    }
-}

common/cpw/mods/fml/common/SidedProxy.java

@@ -1,44 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package cpw.mods.fml.common;
-
-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
-     */
-    String clientSide() default "";
-
-    /**
-     * The name of the server side class to load and populate
-     */
-    String serverSide() default "";
-
-    /**
-     * The name of a special bukkit plugin class to load and populate
-     */
-    String bukkitSide() default "";
-}

common/cpw/mods/fml/common/TickType.java

@@ -1,81 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package cpw.mods.fml.common;
-
-import java.util.EnumSet;
-
-public enum TickType {
-    /**
-     * Fired during the world evaluation loop
-     * server and client side
-     *
-     * arg 0 : The world that is ticking
-     */
-    WORLD,
-    /**
-     * client side
-     * Fired during the render processing phase
-     * arg 0 : float "partial render time"
-     */
-    RENDER,
-    /**
-     * client side
-     * Fired during the render processing phase if a GUI is open
-     * arg 0 : float "partial render time"
-     * arg 1 : the open gui or null if no gui is open
-     */
-    GUI,
-    /**
-     * client side
-     * Fired during the client evaluation loop
-     * arg 0 : The open gui or null if no gui is open
-     */
-    CLIENTGUI,
-    /**
-     * server side
-     * Fired once as the world loads from disk
-     */
-    WORLDLOAD,
-    /**
-     * client side only
-     * Fired once per client tick loop.
-     */
-    CLIENT,
-    /**
-     * client and server side.
-     * Fired whenever the players update loop runs.
-     * arg 0 : the player
-     * arg 1 : the world the player is in
-     */
-    PLAYER,
-    /**
-     * server side only.
-     * This is the server game tick.
-     * Fired once per tick loop on the server.
-     */
-    SERVER;
-
-    /**
-     * Partner ticks that are also cancelled by returning false from onTickInGame
-     */
-    public EnumSet<TickType> partnerTicks()
-    {
-        if (this==CLIENT) return EnumSet.of(RENDER);
-        if (this==RENDER) return EnumSet.of(CLIENT);
-        if (this==GUI) return EnumSet.of(CLIENTGUI);
-        if (this==CLIENTGUI) return EnumSet.of(GUI);
-        return EnumSet.noneOf(TickType.class);
-    }
-}

common/cpw/mods/fml/common/WorldAccessContainer.java

@@ -1,13 +0,0 @@
-package cpw.mods.fml.common;
-
-import java.util.Map;
-
-import net.minecraft.nbt.*;
-import net.minecraft.world.storage.*;
-
-
-public interface WorldAccessContainer
-{
-    public NBTTagCompound getDataForWriting(SaveHandler handler, WorldInfo info);
-    public void readData(SaveHandler handler, WorldInfo info, Map<String,NBTBase> propertyMap, NBTTagCompound tag);
-}

common/cpw/mods/fml/common/WrongMinecraftVersionException.java

@@ -1,13 +0,0 @@
-package cpw.mods.fml.common;
-
-public class WrongMinecraftVersionException extends RuntimeException
-{
-
-    public ModContainer mod;
-
-    public WrongMinecraftVersionException(ModContainer mod)
-    {
-        this.mod = mod;
-    }
-
-}

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

@@ -1,129 +0,0 @@
-package cpw.mods.fml.common.asm;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStreamReader;
-import java.io.ObjectInputStream.GetField;
-import java.io.StringReader;
-import java.net.JarURLConnection;
-import java.nio.charset.Charset;
-import java.security.CodeSource;
-import java.security.cert.CertPath;
-import java.security.cert.CertPathValidator;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateFactory;
-import java.security.cert.PKIXCertPathValidatorResult;
-import java.security.cert.PKIXParameters;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509Certificate;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
-
-import javax.swing.JOptionPane;
-
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.Opcodes;
-
-import cpw.mods.fml.common.CertificateHelper;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.relauncher.IFMLCallHook;
-import cpw.mods.fml.relauncher.RelaunchClassLoader;
-
-public class FMLSanityChecker implements IFMLCallHook
-{
-    private static final String FMLFINGERPRINT = "AE:F6:54:79:96:E9:1B:D1:59:70:6C:B4:6B:F5:4A:89:C5:CE:08:1D".toLowerCase().replace(":","");
-    private static final String FORGEFINGERPRINT = "DE:4C:F8:A3:F3:BC:15:63:58:10:04:4C:39:24:0B:F9:68:04:EA:7D".toLowerCase().replace(":", "");
-    static class MLDetectorClassVisitor extends ClassVisitor
-    {
-        private boolean foundMarker = false;
-        private MLDetectorClassVisitor()
-        {
-            super(Opcodes.ASM4);
-        }
-
-        @Override
-        public FieldVisitor visitField(int arg0, String arg1, String arg2, String arg3, Object arg4)
-        {
-            if ("fmlMarker".equals(arg1))
-            {
-                foundMarker = true;
-            }
-            return null;
-        }
-    }
-
-    private RelaunchClassLoader cl;
-
-    @Override
-    public Void call() throws Exception
-    {
-        CodeSource codeSource = getClass().getProtectionDomain().getCodeSource();
-        boolean goodFML = false;
-        if (codeSource.getLocation().getProtocol().equals("jar"))
-        {
-            Certificate[] certificates = codeSource.getCertificates();
-            if (certificates!=null)
-            {
-
-                for (Certificate cert : certificates)
-                {
-                    String fingerprint = CertificateHelper.getFingerprint(cert);
-                    if (fingerprint.equals(FMLFINGERPRINT))
-                    {
-                        FMLLog.info("Found valid fingerprint for FML. Certificate fingerprint %s", fingerprint);
-                        goodFML = true;
-                    }
-                    else if (fingerprint.equals(FORGEFINGERPRINT))
-                    {
-                        FMLLog.info("Found valid fingerprint for Minecraft Forge. Certificate fingerprint %s", fingerprint);
-                        goodFML = true;
-                    }
-                    else
-                    {
-                        FMLLog.severe("Found invalid fingerprint for FML: %s", fingerprint);
-                    }
-                }
-            }
-        }
-        else
-        {
-            goodFML = true;
-        }
-        if (!goodFML)
-        {
-            FMLLog.severe("FML appears to be missing any signature data. This is not a good thing");
-        }
-        byte[] mlClass = cl.getClassBytes("ModLoader");
-        // Only care in obfuscated env
-        if (mlClass == null)
-        {
-            return null;
-        }
-        MLDetectorClassVisitor mlTester = new MLDetectorClassVisitor();
-        ClassReader cr = new ClassReader(mlClass);
-        cr.accept(mlTester, ClassReader.SKIP_CODE);
-        if (!mlTester.foundMarker)
-        {
-            JOptionPane.showMessageDialog(null, "<html>CRITICAL ERROR<br/>" +
-            		"ModLoader was detected in this environment<br/>" +
-                        "ForgeModLoader cannot be installed alongside ModLoader<br/>" +
-                        "All mods should work without ModLoader being installed<br/>" +
-                        "Because ForgeModLoader is 100% compatible with ModLoader<br/>" +
-                        "Re-install Minecraft Forge or Forge ModLoader into a clean<br/>" +
-                        "jar and try again.",
-                        "ForgeModLoader critical error",
-                        JOptionPane.ERROR_MESSAGE);
-            throw new RuntimeException("Invalid ModLoader class detected");
-        }
-        return null;
-    }
-
-    @Override
-    public void injectData(Map<String, Object> data)
-    {
-        cl = (RelaunchClassLoader) data.get("classLoader");
-    }
-
-}

common/cpw/mods/fml/common/discovery/ITypeDiscoverer.java

@@ -1,13 +0,0 @@
-package cpw.mods.fml.common.discovery;
-
-import java.util.List;
-import java.util.regex.Pattern;
-
-import cpw.mods.fml.common.ModContainer;
-
-public interface ITypeDiscoverer
-{
-    public static Pattern classFile = Pattern.compile("([^\\s$]+).class$");
-
-    public List<ModContainer> discover(ModCandidate candidate, ASMDataTable table);
-}

common/cpw/mods/fml/common/event/FMLEvent.java

@@ -1,15 +0,0 @@
-package cpw.mods.fml.common.event;
-
-import cpw.mods.fml.common.ModContainer;
-
-public class FMLEvent
-{
-    public final String getEventType()
-    {
-        return getClass().getSimpleName();
-    }
-
-	public void applyModContainer(ModContainer activeContainer) {
-	    // NO OP
-	}
-}

common/cpw/mods/fml/common/event/FMLFingerprintViolationEvent.java

@@ -1,23 +0,0 @@
-package cpw.mods.fml.common.event;
-
-import java.io.File;
-import java.util.List;
-import java.util.Set;
-
-import com.google.common.collect.ImmutableSet;
-
-
-public class FMLFingerprintViolationEvent extends FMLEvent {
-
-    public final boolean isDirectory;
-    public final Set<String> fingerprints;
-    public final File source;
-
-    public FMLFingerprintViolationEvent(boolean isDirectory, File source, ImmutableSet<String> fingerprints)
-    {
-        super();
-        this.isDirectory = isDirectory;
-        this.source = source;
-        this.fingerprints = fingerprints;
-    }
-}

common/cpw/mods/fml/common/event/FMLInitializationEvent.java

@@ -1,19 +0,0 @@
-package cpw.mods.fml.common.event;
-
-import cpw.mods.fml.common.LoaderState.ModState;
-
-public class FMLInitializationEvent extends FMLStateEvent
-{
-
-    public FMLInitializationEvent(Object... data)
-    {
-        super(data);
-    }
-    
-    @Override
-    public ModState getModState()
-    {
-        return ModState.INITIALIZED;
-    }
-
-}

common/cpw/mods/fml/common/event/FMLInterModComms.java

@@ -1,92 +0,0 @@
-package cpw.mods.fml.common.event;
-
-import java.util.List;
-
-import com.google.common.base.Function;
-import com.google.common.base.Functions;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableListMultimap;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimaps;
-
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.LoaderState;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.common.Mod.Init;
-import cpw.mods.fml.common.Mod.PostInit;
-
-
-/**
- * Simple intermod communications to receive simple messages directed at you from
- * other mods
- *
- * @author cpw
- *
- */
-public class FMLInterModComms {
-	private static ArrayListMultimap<String, IMCMessage> modMessages = ArrayListMultimap.create();
-	/**
-	 * Subscribe to this event to receive your messages (they are sent between {@link Init} and {@link PostInit})
-	 *
-	 * @author cpw
-	 *
-	 */
-	public static class IMCEvent extends FMLEvent {
-		@Override
-		public void applyModContainer(ModContainer activeContainer) {
-			currentList = ImmutableList.copyOf(modMessages.get(activeContainer.getModId()));
-		}
-		private ImmutableList<IMCMessage> currentList;
-
-		public ImmutableList<IMCMessage> getMessages()
-		{
-			return currentList;
-		}
-	}
-
-	/**
-	 * You will receive an instance of this for each message sent
-	 * @author cpw
-	 *
-	 */
-	public static final class IMCMessage {
-		/**
-		 * This is the modid of the mod that sent you the message
-		 */
-		public final String sender;
-
-		/**
-		 * This field, and {@link #value} are both at the mod's discretion
-		 */
-		public final String key;
-		/**
-		 * This field, and {@link #key} are both at the mod's discretion
-		 */
-		public final String value;
-
-		private IMCMessage(String sender, String key, String value)
-		{
-			this.key = key;
-			this.value = value;
-			this.sender = sender;
-		}
-		@Override
-		public String toString() {
-			return sender;
-		}
-	}
-
-	public static boolean sendMessage(String modId, String key, String value)
-	{
-		if (Loader.instance().activeModContainer()==null)
-		{
-			return false;
-		}
-		modMessages.put(modId, new IMCMessage(Loader.instance().activeModContainer().getModId(), key, value));
-		return Loader.isModLoaded(modId) && !Loader.instance().hasReachedState(LoaderState.POSTINITIALIZATION);
-	}
-}

common/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java

@@ -1,19 +0,0 @@
-package cpw.mods.fml.common.event;
-
-import cpw.mods.fml.common.LoaderState.ModState;
-
-public class FMLLoadCompleteEvent extends FMLStateEvent
-{
-
-    public FMLLoadCompleteEvent(Object... data)
-    {
-        super(data);
-    }
-    
-    @Override
-    public ModState getModState()
-    {
-        return ModState.AVAILABLE;
-    }
-
-}

common/cpw/mods/fml/common/event/FMLLoadEvent.java

@@ -1,6 +0,0 @@
-package cpw.mods.fml.common.event;
-
-public class FMLLoadEvent
-{
-
-}

common/cpw/mods/fml/common/event/FMLServerStartedEvent.java

@@ -1,19 +0,0 @@
-package cpw.mods.fml.common.event;
-
-import cpw.mods.fml.common.LoaderState.ModState;
-
-public class FMLServerStartedEvent extends FMLStateEvent
-{
-
-    public FMLServerStartedEvent(Object... data)
-    {
-        super(data);
-    }
-    
-    @Override
-    public ModState getModState()
-    {
-        return ModState.AVAILABLE;
-    }
-
-}

common/cpw/mods/fml/common/event/FMLServerStoppingEvent.java

@@ -1,19 +0,0 @@
-package cpw.mods.fml.common.event;
-
-import cpw.mods.fml.common.LoaderState.ModState;
-
-public class FMLServerStoppingEvent extends FMLStateEvent
-{
-
-    public FMLServerStoppingEvent(Object... data)
-    {
-        super(data);
-    }
-    
-    @Override
-    public ModState getModState()
-    {
-        return ModState.AVAILABLE;
-    }
-
-}

common/cpw/mods/fml/common/functions/ModIdFunction.java

@@ -1,13 +0,0 @@
-package cpw.mods.fml.common.functions;
-
-import com.google.common.base.Function;
-
-import cpw.mods.fml.common.ModContainer;
-
-public final class ModIdFunction implements Function<ModContainer, String>
-{
-    public String apply(ModContainer container)
-    {
-        return container.getModId();
-    }
-}

common/cpw/mods/fml/common/functions/ModNameFunction.java

@@ -1,15 +0,0 @@
-package cpw.mods.fml.common.functions;
-
-import com.google.common.base.Function;
-
-import cpw.mods.fml.common.ModContainer;
-
-public class ModNameFunction implements Function<ModContainer, String>
-{
-    @Override
-    public String apply(ModContainer input)
-    {
-        return input.getName();
-    }
-
-}

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

@@ -1,28 +0,0 @@
-package cpw.mods.fml.common.modloader;
-
-import java.util.Random;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-import cpw.mods.fml.common.IDispenseHandler;
-import cpw.mods.fml.common.IDispenserHandler;
-
-public class ModLoaderDispenseHelper implements IDispenserHandler
-{
-
-    private BaseModProxy mod;
-
-    public ModLoaderDispenseHelper(BaseModProxy mod)
-    {
-        this.mod = mod;
-    }
-
-    @Override
-    public int dispense(int x, int y, int z, int xVelocity, int zVelocity, World world, ItemStack item, Random random, double entX, double entY,
-            double entZ)
-    {
-    	return -1;
-    }
-
-}

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

@@ -1,22 +0,0 @@
-package cpw.mods.fml.common.modloader;
-
-import net.minecraft.item.ItemStack;
-import cpw.mods.fml.common.IFuelHandler;
-
-public class ModLoaderFuelHelper implements IFuelHandler
-{
-
-    private BaseModProxy mod;
-
-    public ModLoaderFuelHelper(BaseModProxy mod)
-    {
-        this.mod = mod;
-    }
-
-    @Override
-    public int getBurnTime(ItemStack fuel)
-    {
-        return mod.addFuel(fuel.field_77993_c, fuel.field_77993_c);
-    }
-
-}

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

@@ -1,14 +0,0 @@
-package cpw.mods.fml.common.network;
-
-public class FMLNetworkException extends RuntimeException
-{
-
-    public FMLNetworkException(Exception e)
-    {
-        super(e);
-    }
-
-    public FMLNetworkException()
-    {
-    }
-}

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

@@ -1,8 +0,0 @@
-package cpw.mods.fml.common.network;
-
-import net.minecraft.network.packet.*;
-
-public interface ITinyPacketHandler
-{
-    void handle(NetHandler handler, Packet131MapData mapData);
-}

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

@@ -1,11 +0,0 @@
-package cpw.mods.fml.common.network;
-
-/**
- *
- * @author cpw
- *
- */
-public interface Player
-{
-
-}

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

@@ -1,6 +0,0 @@
-package cpw.mods.fml.common.registry;
-
-public interface BlockProxy
-{
-
-}

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

@@ -1,168 +0,0 @@
-package cpw.mods.fml.common.registry;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-
-import net.minecraft.item.Item;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-
-import com.google.common.base.Function;
-import com.google.common.collect.MapDifference;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.LoaderState;
-import cpw.mods.fml.common.ModContainer;
-
-public class GameData {
-    private static Map<Integer, ItemData> idMap = Maps.newHashMap();
-    private static CountDownLatch serverValidationLatch;
-    private static CountDownLatch clientValidationLatch;
-    private static MapDifference<Integer, ItemData> difference;
-    private static boolean shouldContinue = true;
-    private static boolean isSaveValid = true;
-
-    public static void newItemAdded(Item item)
-    {
-        ModContainer mc = Loader.instance().activeModContainer();
-        if (mc == null)
-        {
-            mc = Loader.instance().getMinecraftModContainer();
-            if (Loader.instance().hasReachedState(LoaderState.AVAILABLE))
-            {
-                FMLLog.severe("It appears something has tried to allocate an Item outside of the initialization phase of Minecraft, this could be very bad for your network connectivity.");
-            }
-        }
-        String itemType = item.getClass().getName();
-        ItemData itemData = new ItemData(item, mc);
-        if (idMap.containsKey(item.field_77779_bT))
-        {
-            ItemData id = idMap.get(item.field_77779_bT);
-            FMLLog.warning("[ItemTracker] The mod %s is attempting to overwrite existing item at %d (%s from %s) with %s", mc.getModId(), id.getItemId(), id.getItemType(), id.getModId(), itemType);
-        }
-        idMap.put(item.field_77779_bT, itemData);
-        FMLLog.fine("[ItemTracker] Adding item %s(%d) owned by %s", item.getClass().getName(), item.field_77779_bT, mc.getModId());
-    }
-
-    public static void validateWorldSave(Set<ItemData> worldSaveItems)
-    {
-        isSaveValid = true;
-        shouldContinue = true;
-        // allow ourselves to continue if there's no saved data
-        if (worldSaveItems == null)
-        {
-            serverValidationLatch.countDown();
-            try
-            {
-                clientValidationLatch.await();
-            }
-            catch (InterruptedException e)
-            {
-            }
-            return;
-        }
-
-        Function<? super ItemData, Integer> idMapFunction = new Function<ItemData, Integer>() {
-            public Integer apply(ItemData input) {
-                return input.getItemId();
-            };
-        };
-
-        Map<Integer,ItemData> worldMap = Maps.uniqueIndex(worldSaveItems,idMapFunction);
-        difference = Maps.difference(worldMap, idMap);
-        FMLLog.fine("The difference set is %s", difference);
-        if (!difference.entriesDiffering().isEmpty() || !difference.entriesOnlyOnLeft().isEmpty())
-        {
-            FMLLog.severe("FML has detected item discrepancies");
-            FMLLog.severe("Missing items : %s", difference.entriesOnlyOnLeft());
-            FMLLog.severe("Mismatched items : %s", difference.entriesDiffering());
-            isSaveValid = false;
-            serverValidationLatch.countDown();
-        }
-        else
-        {
-            isSaveValid = true;
-            serverValidationLatch.countDown();
-        }
-        try
-        {
-            clientValidationLatch.await();
-            if (!shouldContinue)
-            {
-                throw new RuntimeException("This server instance is going to stop abnormally because of a fatal ID mismatch");
-            }
-        }
-        catch (InterruptedException e)
-        {
-        }
-    }
-
-    public static void writeItemData(NBTTagList itemList)
-    {
-        for (ItemData dat : idMap.values())
-        {
-            itemList.func_74742_a(dat.toNBT());
-        }
-    }
-
-    /**
-     * Initialize the server gate
-     * @param gateCount the countdown amount. If it's 2 we're on the client and the client and server
-     * will wait at the latch. 1 is a server and the server will proceed
-     */
-    public static void initializeServerGate(int gateCount)
-    {
-        serverValidationLatch = new CountDownLatch(gateCount - 1);
-        clientValidationLatch = new CountDownLatch(gateCount - 1);
-    }
-
-    public static MapDifference<Integer, ItemData> gateWorldLoadingForValidation()
-    {
-        try
-        {
-            serverValidationLatch.await();
-            if (!isSaveValid)
-            {
-                return difference;
-            }
-        }
-        catch (InterruptedException e)
-        {
-        }
-        difference = null;
-        return null;
-    }
-
-
-    public static void releaseGate(boolean carryOn)
-    {
-        shouldContinue = carryOn;
-        clientValidationLatch.countDown();
-    }
-
-    public static Set<ItemData> buildWorldItemData(NBTTagList modList)
-    {
-        Set<ItemData> worldSaveItems = Sets.newHashSet();
-        for (int i = 0; i < modList.func_74745_c(); i++)
-        {
-            NBTTagCompound mod = (NBTTagCompound) modList.func_74743_b(i);
-            ItemData dat = new ItemData(mod);
-            worldSaveItems.add(dat);
-        }
-        return worldSaveItems;
-    }
-
-    static void setName(Item item, String name, String modId)
-    {
-        int id = item.field_77779_bT;
-        ItemData itemData = idMap.get(id);
-        itemData.setName(name,modId);
-    }
-
-
-
-}

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

@@ -1,6 +0,0 @@
-package cpw.mods.fml.common.registry;
-
-public interface ItemProxy
-{
-
-}

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

@@ -1,11 +0,0 @@
-package cpw.mods.fml.relauncher;
-
-public class ArgsWrapper
-{
-    public ArgsWrapper(String[] args)
-    {
-        this.args=args;
-    }
-
-    public String[] args;
-}

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

@@ -1,26 +0,0 @@
-package cpw.mods.fml.relauncher;
-
-public class CoreFMLLibraries implements ILibrarySet
-{
-    private static String[] libraries = { "argo-2.25.jar","guava-12.0.1.jar","asm-all-4.0.jar", "bcprov-jdk15on-147.jar" };
-    private static String[] checksums = { "bb672829fde76cb163004752b86b0484bd0a7f4b", "b8e78b9af7bf45900e14c6f958486b6ca682195f", "98308890597acb64047f7e896638e0d98753ae82", "b6f5d9926b0afbde9f4dbe3db88c5247be7794bb" };
-
-    @Override
-    public String[] getLibraries()
-    {
-        return libraries;
-    }
-
-    @Override
-    public String[] getHashes()
-    {
-        return checksums;
-    }
-
-    @Override
-    public String getRootURL()
-    {
-        return "http://files.minecraftforge.net/fmllibs/%s";
-    }
-
-}

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

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

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

@@ -1,55 +0,0 @@
-package cpw.mods.fml.relauncher;
-
-public class DummyDownloader implements IDownloadDisplay
-{
-
-    @Override
-    public void resetProgress(int sizeGuess)
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void setPokeThread(Thread currentThread)
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void updateProgress(int fullLength)
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public boolean shouldStopIt()
-    {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
-    public void updateProgressString(String string, Object... data)
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public Object makeDialog()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public void makeHeadless()
-    {
-        // TODO Auto-generated method stub
-
-    }
-
-}

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

@@ -1,317 +0,0 @@
-package cpw.mods.fml.relauncher;
-
-import java.applet.Applet;
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.URLClassLoader;
-
-import javax.swing.JDialog;
-import javax.swing.JOptionPane;
-
-public class FMLRelauncher
-{
-    private static FMLRelauncher INSTANCE;
-    public static String logFileNamePattern;
-    private static String side;
-    private RelaunchClassLoader classLoader;
-    private Object newApplet;
-    private Class<? super Object> appletClass;
-
-    JDialog popupWindow;
-
-    public static void handleClientRelaunch(ArgsWrapper wrap)
-    {
-        logFileNamePattern = "ForgeModLoader-client-%g.log";
-        side = "CLIENT";
-        instance().relaunchClient(wrap);
-    }
-
-    public static void handleServerRelaunch(ArgsWrapper wrap)
-    {
-        logFileNamePattern = "ForgeModLoader-server-%g.log";
-        side = "SERVER";
-        instance().relaunchServer(wrap);
-    }
-
-    static FMLRelauncher instance()
-    {
-        if (INSTANCE == null)
-        {
-            INSTANCE = new FMLRelauncher();
-        }
-        return INSTANCE;
-
-    }
-
-    private FMLRelauncher()
-    {
-        URLClassLoader ucl = (URLClassLoader) getClass().getClassLoader();
-
-        classLoader = new RelaunchClassLoader(ucl.getURLs());
-
-    }
-
-    private void showWindow(boolean showIt)
-    {
-        if (RelaunchLibraryManager.downloadMonitor != null) { return; }
-        try
-        {
-            if (showIt)
-            {
-                RelaunchLibraryManager.downloadMonitor = new Downloader();
-                popupWindow = (JDialog) RelaunchLibraryManager.downloadMonitor.makeDialog();
-            }
-            else
-            {
-                RelaunchLibraryManager.downloadMonitor = new DummyDownloader();
-            }
-        }
-        catch (Throwable e)
-        {
-            if (RelaunchLibraryManager.downloadMonitor == null)
-            {
-                RelaunchLibraryManager.downloadMonitor = new DummyDownloader();
-                e.printStackTrace();
-            }
-            else
-            {
-                RelaunchLibraryManager.downloadMonitor.makeHeadless();
-            }
-            popupWindow = null;
-        }
-    }
-
-    private void relaunchClient(ArgsWrapper wrap)
-    {
-        showWindow(true);
-        // Now we re-inject the home into the "new" minecraft under our control
-        Class<? super Object> client;
-        try
-        {
-            File minecraftHome = computeExistingClientHome();
-            setupHome(minecraftHome);
-
-            client = setupNewClientHome(minecraftHome);
-        }
-        finally
-        {
-            if (popupWindow != null)
-            {
-                popupWindow.setVisible(false);
-                popupWindow.dispose();
-            }
-        }
-
-        if (RelaunchLibraryManager.downloadMonitor.shouldStopIt())
-        {
-            System.exit(1);
-        }
-        try
-        {
-            ReflectionHelper.findMethod(client, null, new String[] { "fmlReentry" }, ArgsWrapper.class).invoke(null, wrap);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-            // Hmmm
-        }
-    }
-
-    private Class<? super Object> setupNewClientHome(File minecraftHome)
-    {
-        Class<? super Object> client = ReflectionHelper.getClass(classLoader, "net.minecraft.client.Minecraft");
-        ReflectionHelper.setPrivateValue(client, null, minecraftHome, "field_71463_am", "an", "minecraftDir");
-        return client;
-    }
-
-    private void relaunchServer(ArgsWrapper wrap)
-    {
-        showWindow(false);
-        // Now we re-inject the home into the "new" minecraft under our control
-        Class<? super Object> server;
-        File minecraftHome = new File(".");
-        setupHome(minecraftHome);
-
-        server = ReflectionHelper.getClass(classLoader, "net.minecraft.server.MinecraftServer");
-        try
-        {
-            ReflectionHelper.findMethod(server, null, new String[] { "fmlReentry" }, ArgsWrapper.class).invoke(null, wrap);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    private void setupHome(File minecraftHome)
-    {
-        FMLInjectionData.build(minecraftHome, classLoader);
-        FMLRelaunchLog.minecraftHome = minecraftHome;
-        FMLRelaunchLog.info("Forge Mod Loader version %s.%s.%s.%s for Minecraft %s loading", FMLInjectionData.major, FMLInjectionData.minor,
-                FMLInjectionData.rev, FMLInjectionData.build, FMLInjectionData.mccversion, FMLInjectionData.mcpversion);
-
-        try
-        {
-            RelaunchLibraryManager.handleLaunch(minecraftHome, classLoader);
-        }
-        catch (Throwable t)
-        {
-            if (popupWindow != null)
-            {
-                try
-                {
-                    String logFile = new File(minecraftHome, "ForgeModLoader-client-0.log").getCanonicalPath();
-                    JOptionPane.showMessageDialog(popupWindow, String.format(
-                            "<html><div align=\"center\"><font size=\"+1\">There was a fatal error starting up minecraft and FML</font></div><br/>"
-                                    + "Minecraft cannot launch in it's current configuration<br/>"
-                                    + "Please consult the file <i><a href=\"file:///%s\">%s</a></i> for further information</html>", logFile, logFile),
-                            "Fatal FML error", JOptionPane.ERROR_MESSAGE);
-                }
-                catch (Exception ex)
-                {
-                    // ah well, we tried
-                }
-            }
-            throw new RuntimeException(t);
-        }
-    }
-
-    /**
-     * @return
-     */
-    private File computeExistingClientHome()
-    {
-        Class<? super Object> mcMaster = ReflectionHelper.getClass(getClass().getClassLoader(), "net.minecraft.client.Minecraft");
-        // If we get the system property we inject into the old MC, setup the
-        // dir, then pull the value
-        String str = System.getProperty("minecraft.applet.TargetDirectory");
-        if (str != null)
-        {
-            str = str.replace('/', File.separatorChar);
-            ReflectionHelper.setPrivateValue(mcMaster, null, new File(str), "minecraftDir", "an", "minecraftDir");
-        }
-        // We force minecraft to setup it's homedir very early on so we can
-        // inject stuff into it
-        Method setupHome = ReflectionHelper.findMethod(mcMaster, null, new String[] { "func_71380_b", "getMinecraftDir", "b" });
-        try
-        {
-            setupHome.invoke(null);
-        }
-        catch (Exception e)
-        {
-            // Hmmm
-        }
-        File minecraftHome = ReflectionHelper.getPrivateValue(mcMaster, null, "field_71463_am", "an", "minecraftDir");
-        return minecraftHome;
-    }
-
-    public static void appletEntry(Applet minecraftApplet)
-    {
-        side = "CLIENT";
-        logFileNamePattern = "ForgeModLoader-client-%g.log";
-        instance().relaunchApplet(minecraftApplet);
-    }
-
-    private void relaunchApplet(Applet minecraftApplet)
-    {
-        showWindow(true);
-
-        appletClass = ReflectionHelper.getClass(classLoader, "net.minecraft.client.MinecraftApplet");
-        if (minecraftApplet.getClass().getClassLoader() == classLoader)
-        {
-            if (popupWindow != null)
-            {
-                popupWindow.setVisible(false);
-                popupWindow.dispose();
-            }
-            try
-            {
-                newApplet = minecraftApplet;
-                ReflectionHelper.findMethod(appletClass, newApplet, new String[] { "fmlInitReentry" }).invoke(newApplet);
-                return;
-            }
-            catch (Exception e)
-            {
-                System.out.println("FMLRelauncher.relaunchApplet");
-                e.printStackTrace();
-                throw new RuntimeException(e);
-            }
-        }
-
-        File mcDir = computeExistingClientHome();
-        setupHome(mcDir);
-        setupNewClientHome(mcDir);
-
-        Class<? super Object> parentAppletClass = ReflectionHelper.getClass(getClass().getClassLoader(), "java.applet.Applet");
-
-        try
-        {
-            newApplet = appletClass.newInstance();
-            Object appletContainer = ReflectionHelper.getPrivateValue(ReflectionHelper.getClass(getClass().getClassLoader(), "java.awt.Component"),
-                    minecraftApplet, "parent");
-
-            String launcherClassName = System.getProperty("minecraft.applet.WrapperClass", "net.minecraft.Launcher");
-            Class<? super Object> launcherClass = ReflectionHelper.getClass(getClass().getClassLoader(), launcherClassName);
-            if (launcherClass.isInstance(appletContainer))
-            {
-                ReflectionHelper.findMethod(ReflectionHelper.getClass(getClass().getClassLoader(), "java.awt.Container"), minecraftApplet,
-                        new String[] { "removeAll" }).invoke(appletContainer);
-                ReflectionHelper.findMethod(launcherClass, appletContainer, new String[] { "replace" }, parentAppletClass).invoke(appletContainer, newApplet);
-            }
-            else
-            {
-                FMLRelaunchLog.severe("Found unknown applet parent %s, unable to inject!\n", appletContainer.getClass().getName());
-                throw new RuntimeException();
-            }
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException(e);
-        }
-        finally
-        {
-            if (popupWindow != null)
-            {
-                popupWindow.setVisible(false);
-                popupWindow.dispose();
-            }
-        }
-    }
-
-    public static void appletStart(Applet applet)
-    {
-        instance().startApplet(applet);
-    }
-
-    private void startApplet(Applet applet)
-    {
-        if (applet.getClass().getClassLoader() == classLoader)
-        {
-            if (popupWindow != null)
-            {
-                popupWindow.setVisible(false);
-                popupWindow.dispose();
-            }
-            if (RelaunchLibraryManager.downloadMonitor.shouldStopIt())
-            {
-                System.exit(1);
-            }
-            try
-            {
-                ReflectionHelper.findMethod(appletClass, newApplet, new String[] { "fmlStartReentry" }).invoke(newApplet);
-            }
-            catch (Exception e)
-            {
-                System.out.println("FMLRelauncher.startApplet");
-                e.printStackTrace();
-                throw new RuntimeException(e);
-            }
-        }
-        return;
-    }
-
-    public static String side()
-    {
-        return side;
-    }
-}

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

@@ -1,6 +0,0 @@
-package cpw.mods.fml.relauncher;
-
-public interface IClassTransformer
-{
-    public byte[] transform(String name, byte[] bytes);
-}

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

@@ -1,22 +0,0 @@
-package cpw.mods.fml.relauncher;
-
-import javax.swing.JDialog;
-
-public interface IDownloadDisplay
-{
-
-    void resetProgress(int sizeGuess);
-
-    void setPokeThread(Thread currentThread);
-
-    void updateProgress(int fullLength);
-
-    boolean shouldStopIt();
-
-    void updateProgressString(String string, Object ... data);
-
-    Object makeDialog();
-
-    void makeHeadless();
-
-}

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

@@ -1,300 +0,0 @@
-package cpw.mods.fml.relauncher;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.JarURLConnection;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLConnection;
-import java.security.CodeSigner;
-import java.security.CodeSource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.jar.Attributes.Name;
-import java.util.jar.Attributes;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-import java.util.logging.Level;
-
-import cpw.mods.fml.common.FMLLog;
-
-public class RelaunchClassLoader extends URLClassLoader
-{
-    private List<URL> sources;
-    private ClassLoader parent;
-
-    private List<IClassTransformer> transformers;
-    private Map<String, Class> cachedClasses;
-    private Set<String> invalidClasses;
-
-    private Set<String> classLoaderExceptions = new HashSet<String>();
-    private Set<String> transformerExceptions = new HashSet<String>();
-    private Map<Package,Manifest> packageManifests = new HashMap<Package,Manifest>();
-
-    private static Manifest EMPTY = new Manifest();
-
-    public RelaunchClassLoader(URL[] sources)
-    {
-        super(sources, null);
-        this.sources = new ArrayList<URL>(Arrays.asList(sources));
-        this.parent = getClass().getClassLoader();
-        this.cachedClasses = new HashMap<String,Class>(1000);
-        this.invalidClasses = new HashSet<String>(1000);
-        this.transformers = new ArrayList<IClassTransformer>(2);
-//        ReflectionHelper.setPrivateValue(ClassLoader.class, null, this, "scl");
-        Thread.currentThread().setContextClassLoader(this);
-
-        // standard classloader exclusions
-        addClassLoaderExclusion("java.");
-        addClassLoaderExclusion("sun.");
-        addClassLoaderExclusion("org.lwjgl.");
-        addClassLoaderExclusion("cpw.mods.fml.relauncher.");
-        addClassLoaderExclusion("net.minecraftforge.classloading.");
-
-        // standard transformer exclusions
-        addTransformerExclusion("javax.");
-        addTransformerExclusion("org.objectweb.asm.");
-        addTransformerExclusion("com.google.common.");
-    }
-
-    public void registerTransformer(String transformerClassName)
-    {
-        try
-        {
-            transformers.add((IClassTransformer) loadClass(transformerClassName).newInstance());
-        }
-        catch (Exception e)
-        {
-            FMLRelaunchLog.log(Level.SEVERE, e, "A critical problem occured registering the ASM transformer class %s", transformerClassName);
-        }
-    }
-    @Override
-    public Class<?> findClass(String name) throws ClassNotFoundException
-    {
-        if (invalidClasses.contains(name))
-        {
-            throw new ClassNotFoundException(name);
-        }
-        for (String st : classLoaderExceptions)
-        {
-            if (name.startsWith(st))
-            {
-                return parent.loadClass(name);
-            }
-        }
-
-        if (cachedClasses.containsKey(name))
-        {
-            return cachedClasses.get(name);
-        }
-
-        for (String st : transformerExceptions)
-        {
-            if (name.startsWith(st))
-            {
-                try
-                {
-                    Class<?> cl = super.findClass(name);
-                    cachedClasses.put(name, cl);
-                    return cl;
-                }
-                catch (ClassNotFoundException e)
-                {
-                    invalidClasses.add(name);
-                    throw e;
-                }
-            }
-        }
-
-        try
-        {
-            CodeSigner[] signers = null;
-            int lastDot = name.lastIndexOf('.');
-            String pkgname = lastDot == -1 ? "" : name.substring(0, lastDot);
-            String fName = name.replace('.', '/').concat(".class");
-            String pkgPath = pkgname.replace('.', '/');
-            URLConnection urlConnection = findCodeSourceConnectionFor(fName);
-            if (urlConnection instanceof JarURLConnection && lastDot > -1)
-            {
-                JarURLConnection jarUrlConn = (JarURLConnection)urlConnection;
-                JarFile jf = jarUrlConn.getJarFile();
-                if (jf != null && jf.getManifest() != null)
-                {
-                    Manifest mf = jf.getManifest();
-                    JarEntry ent = jf.getJarEntry(fName);
-                    Package pkg = getPackage(pkgname);
-                    getClassBytes(name);
-                    signers = ent.getCodeSigners();
-                    if (pkg == null)
-                    {
-                        pkg = definePackage(pkgname, mf, jarUrlConn.getJarFileURL());
-                        packageManifests.put(pkg, mf);
-                    }
-                    else
-                    {
-                        if (pkg.isSealed() && !pkg.isSealed(jarUrlConn.getJarFileURL()))
-                        {
-                            FMLLog.severe("The jar file %s is trying to seal already secured path %s", jf.getName(), pkgname);
-                        }
-                        else if (isSealed(pkgname, mf))
-                        {
-                            FMLLog.severe("The jar file %s has a security seal for path %s, but that path is defined and not secure", jf.getName(), pkgname);
-                        }
-                    }
-                }
-            }
-            else if (lastDot > -1)
-            {
-                Package pkg = getPackage(pkgname);
-                if (pkg == null)
-                {
-                    pkg = definePackage(pkgname, null, null, null, null, null, null, null);
-                    packageManifests.put(pkg, EMPTY);
-                }
-                else if (pkg.isSealed())
-                {
-                    FMLLog.severe("The URL %s is defining elements for sealed path %s", urlConnection.getURL(), pkgname);
-                }
-            }
-            byte[] basicClass = getClassBytes(name);
-            byte[] transformedClass = runTransformers(name, basicClass);
-            Class<?> cl = defineClass(name, transformedClass, 0, transformedClass.length, new CodeSource(urlConnection.getURL(), signers));
-            cachedClasses.put(name, cl);
-            return cl;
-        }
-        catch (Throwable e)
-        {
-            invalidClasses.add(name);
-            throw new ClassNotFoundException(name, e);
-        }
-    }
-
-    private boolean isSealed(String path, Manifest man)
-    {
-        Attributes attr = man.getAttributes(path);
-        String sealed = null;
-        if (attr != null) {
-            sealed = attr.getValue(Name.SEALED);
-        }
-        if (sealed == null) {
-            if ((attr = man.getMainAttributes()) != null) {
-                sealed = attr.getValue(Name.SEALED);
-            }
-        }
-        return "true".equalsIgnoreCase(sealed);
-    }
-
-    private URLConnection findCodeSourceConnectionFor(String name)
-    {
-        URL res = findResource(name);
-        if (res != null)
-        {
-            try
-            {
-                return res.openConnection();
-            }
-            catch (IOException e)
-            {
-                throw new RuntimeException(e);
-            }
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    private byte[] runTransformers(String name, byte[] basicClass)
-    {
-        for (IClassTransformer transformer : transformers)
-        {
-            basicClass = transformer.transform(name, basicClass);
-        }
-        return basicClass;
-    }
-
-    @Override
-    public void addURL(URL url)
-    {
-        super.addURL(url);
-        sources.add(url);
-    }
-
-    public List<URL> getSources()
-    {
-        return sources;
-    }
-
-
-    private byte[] readFully(InputStream stream)
-    {
-        try
-        {
-            ByteArrayOutputStream bos = new ByteArrayOutputStream(stream.available());
-            int r;
-            while ((r = stream.read()) != -1)
-            {
-                bos.write(r);
-            }
-
-            return bos.toByteArray();
-        }
-        catch (Throwable t)
-        {
-            /// HMMM
-            return new byte[0];
-        }
-    }
-
-    public List<IClassTransformer> getTransformers()
-    {
-        return Collections.unmodifiableList(transformers);
-    }
-
-    private void addClassLoaderExclusion(String toExclude)
-    {
-        classLoaderExceptions.add(toExclude);
-    }
-
-    void addTransformerExclusion(String toExclude)
-    {
-        transformerExceptions.add(toExclude);
-    }
-
-    public byte[] getClassBytes(String name) throws IOException
-    {
-        InputStream classStream = null;
-        try
-        {
-            URL classResource = findResource(name.replace('.', '/').concat(".class"));
-            if (classResource == null)
-            {
-                return null;
-            }
-            classStream = classResource.openStream();
-            return readFully(classStream);
-        }
-        finally
-        {
-            if (classStream != null)
-            {
-                try
-                {
-                    classStream.close();
-                }
-                catch (IOException e)
-                {
-                    // Swallow the close exception
-                }
-            }
-        }
-    }
-}

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

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

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

@@ -1,35 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package cpw.mods.fml.relauncher;
-
-public enum Side {
-    CLIENT, SERVER, BUKKIT;
-
-    /**
-     * @return If this is the server environment
-     */
-    public boolean isServer()
-    {
-        return !isClient();
-    }
-
-    /**
-     * @return if this is the Client environment
-     */
-    public boolean isClient()
-    {
-        return this == CLIENT;
-    }
-}

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

@@ -1,14 +0,0 @@
-package cpw.mods.fml.relauncher;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR})
-public @interface SideOnly
-{
-    public Side value();
-}

common/fml_at.cfg

@@ -1,73 +0,0 @@
-#Main FML Access Transformer configuration file
-# TileEntity addMapping
-public any.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
-# EntityList addMappings
-public lv.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
-public lv.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
-public lv.b #FD:EntityList/field_75625_b #nameToClassMap
-public lv.c #FD:EntityList/field_75626_c #classToNameMap
-public lv.d #FD:EntityList/field_75623_d #idToClassMap
-# RenderEngine
-public bba.h #FD:RenderEngine/field_78367_h #textureList
-public bba.k #FD:RenderEngine/field_78366_k #texturePack
-# RenderManager
-public bbu.p #FD:RenderManager/field_78729_o #renderers
-# RenderBlocks - everything
-public bbb.* #FD:RenderBlocks/*
-public bbb.*() #MD:RenderBlocks/*
-#RenderPlayer
-public-f bco.h #FD:RenderPlayer/field_77110_j #armorlist
-#RenderBiped
-public-f bcc.k #FD:RenderBiped/field_82424_k #armorlist
-#StringTranslate
-public bn.b #FD:StringTranslate/field_74815_b
-public bn.d #FD:StringTranslate/field_74813_d
-# TileEntityRenderer
-public bdw.m #FD:TileEntityRenderer/field_76966_m
-# CraftingManager - make the add recipe methods public
-public wn.a(Lur;[Ljava/lang/Object;)Lwq; #MD:CraftingManager/func_92051_a
-public wn.b(Lur;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
-# WeightedRandomItem
-public kv.a #FD:WeightedRandomItem/field_76292_a #probability
-# ItemStack
-#public+f tv.c #FD:ItemStack/field_77993_c #itemId
-# StatBase
-public jl.a #FD:StatBase/field_75978_a #statName
-# NetLoginHandler
-public it.a(Lit;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
-public it.h #FD:NetLoginHandler/field_72543_h #userName
-# EntityPlayerMP getNextWindowId
-public iq.cg()V #MD:EntityPlayerMP/func_71117_bO
-public iq.ct #FD:EntityPlayerMP/field_71139_cq
-# EntityAITaskEntry
-public ne #CL:EntityAITaskEntry
-# EntityAITasks
-public nd.a #FD:EntityAITasks/field_75782_a #taskList
-# BlockChest
-public ajk.n(Lyc;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
-# EntityLiving
-public md.aT #FD:EntityLiving/field_70736_aM #carryoverDamage
-public md.bn #FD:EntityLiving/field_70714_bg #tasks
-public md.bF #FD:EntityLiving/field_70703_bu #isJumping
-# EntityAIOcelotSit
-protected nq.a(Lyc;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
-protected nq.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
-# CallableMinecraftVersion - sanity check the MC version
-public b #CL:CallableMinecraftVersion
-public b.<init>(La;)V #MD:CallableMinecraftVersion/<init>(Lnet/minecraft/src/CrashReport;) #constructor
-# EntityAnimal
-public ox.d #FD:EntityAnimal/field_70881_d #inLove
-# WorldType
-public yn.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
-public yn.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
-# ComponentVillage
-public afs #CL:ComponentVillage
-# EntityVillager - minmax lists
-public qu.a(Lxu;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
-public qu.b(Lxu;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
-public qu.bO #FD:EntityVillager/field_70958_bB
-public qu.bP #FD:EntityVillager/field_70960_bC
-# GuiButtonMerchant
-public awb #CL:GuiButtonMerchant
-
-protected atf.a #FD:GuiYesNo/field_73942_a #guiScreen

conf/astyle.cfg

@@ -8,7 +8,7 @@ break-closing-brackets
 
 indent-switches
 
-max-instatement-indent=2
+max-instatement-indent=40
 
 pad-oper
 pad-header

conf/mcp.cfg

@@ -22,22 +22,24 @@ Params  = %(DirConf)s/params.csv
 NewIds  = %(DirConf)s/newids.csv
 
 [SRGS]
-ConfClient  = %(DirConf)s/packaged.srg
-ConfServer  = %(DirConf)s/packaged.srg
-Client      = %(DirTemp)s/client_rg.srg
-Server      = %(DirTemp)s/server_rg.srg
-DeobfClient = %(DirTemp)s/client_deobf.srg
-DeobfServer = %(DirTemp)s/server_deobf.srg
-ReobfClient = %(DirTemp)s/client_ro.srg
-ReobfServer = %(DirTemp)s/server_ro.srg
+ConfClient     = %(DirConf)s/packaged.srg
+ConfServer     = %(DirConf)s/packaged.srg
+Client         = %(DirTemp)s/client_rg.srg
+Server         = %(DirTemp)s/server_rg.srg
+DeobfClient    = %(DirTemp)s/client_deobf.srg
+DeobfServer    = %(DirTemp)s/server_deobf.srg
+ReobfClient    = %(DirTemp)s/client_ro.srg
+ReobfServer    = %(DirTemp)s/server_ro.srg
+ReobfClientSrg = %(DirTemp)s/client_ro_srg.srg
+ReobfServerSrg = %(DirTemp)s/server_ro_srg.srg
 
 [JAR]
 DirNatives = %(DirJars)s/bin/natives
 Client     = %(DirJars)s/bin/minecraft.jar
 Server     = %(DirJars)s/minecraft_server.jar
 LWJGL      = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
-MD5Client  = 48677dc4c2b98c29918722b5ab27b4fd
-MD5Server  = b0700fa969dbf0ff085082cde87384d2
+MD5Client  = 2e5044f5359e82245551167a237f3167
+MD5Server  = ba3145656b1480122bd8759cecd7b7a1
 
 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@@ -69,13 +71,15 @@ ClsServerTemp = %(DirTempCls)s/minecraft_server
 SrcClientTemp = %(DirTempSrc)s/minecraft
 SrcServerTemp = %(DirTempSrc)s/minecraft_server
 FFSource      = net
+FFClientIn    = %(DirTemp)s/minecraft_ff_in.jar
+FFServerIn    = %(DirTemp)s/minecraft_server_ff_in.jar
 
 [OUTPUT]
 BinClientTemp = %(DirTempBin)s/minecraft
 BinServerTemp = %(DirTempBin)s/minecraft_server
 SrcClient  = %(DirSrc)s/minecraft
 SrcServer  = %(DirSrc)s/minecraft_server
-TestClient = net/minecraft/client/Minecraft
+TestClient = net/minecraft/client/main/Main
 TestServer = net/minecraft/server/MinecraftServer
 
 [PATCHES]
@@ -92,11 +96,11 @@ BinClient       = %(DirBin)s/minecraft
 BinServer       = %(DirBin)s/minecraft_server
 LogClient       = %(DirLogs)s/client_compile.log
 LogServer       = %(DirLogs)s/server_compile.log
-ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
-ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
+ClassPathClient = 
+ClassPathServer = 
 ClientFixes     = %(DirConf)s/patches
 FixStart        = Start
-IgnorePkg       = paulscode,com/jcraft,isom,ibxm,de/matthiasmann/twl,org/xmlpull,javax/xml,org/bouncycastle,argo
+IgnorePkg       = paulscode,com,isom,ibxm,de/matthiasmann/twl,org,javax/xml,javax/ws,argo
 
 [REOBF]
 MD5Client         = %(DirTemp)s/client.md5
@@ -123,8 +127,8 @@ LogFile           = %(DirLogs)s/mcp.log
 LogFileErr        = %(DirLogs)s/mcperr.log
 UpdateUrl         = 
 IgnoreUpdate      = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
-RGIndex           = 92000
-ParamIndex        = 8000
+RGIndex           = 143000
+ParamIndex        = 43000
 
 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg
@@ -142,14 +146,18 @@ AStyle_osx    = %(DirRuntime)s/bin/astyle-osx
 JadRetro      = %(DirRuntime)s/bin/jadretro.jar
 Fernflower    = %(DirRuntime)s/bin/fernflower.jar
 Exceptor      = %(DirRuntime)s/bin/mcinjector.jar
+SpecialSource = %(DirRuntime)s/bin/specialsource.jar
 CmdPatch      = %s -p1 -u -i {patchfile} -d {srcdir}
 CmdJad        = %s -b -d {outdir} -dead -o -r -s .java -stat -ff {classes}
 CmdAStyle     = %s --suffix=none --quiet --options={conffile} {classes}
 CmdRG         = %s -cp "{classpath}" RetroGuard -searge {conffile}
 CmdRGReobf    = %s -cp "{classpath}" RetroGuard -notch {conffile}
+CmdSS         = %s -cp "{classpath}" -jar %s -i {injar} -o {outjar} -m {mapfile} --kill-source
+CmdSSReobf    = %s -cp "{classpath}" -jar %s -i {injar} -o {outjar} -r -m {mapfile} -d {identifier} -e %s
 CmdJadretro   = %s -jar %s {targetdir}
-CmdFernflower = %s -jar %s -din=0 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
+CmdFernflower = %s -Xmx512M -jar %s -din=0 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
 CmdExceptor   = %s -jar %s {input} {output} {conf} {log}
 CmdRecomp     = %s -encoding UTF-8 -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
-CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer
-CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start
+CmdRecompScala = %s -encoding UTF-8 -deprecation -target:jvm-1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
+CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" cpw.mods.fml.relauncher.ServerLaunchWrapper {extraargs}
+CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} net.minecraft.launchwrapper.Launch --tweakClass cpw.mods.fml.common.launcher.FMLTweaker --version FML_DEV {extraargs}

conf/packages.csv

@@ -1,36 +1,30 @@
 class,package
-EntityFireworkOverlayFX,net/minecraft/client/particle
-EntityFireworkSparkFX,net/minecraft/client/particle
-EntityFireworkStarterFX,net/minecraft/client/particle
-ScheduledSound,net/minecraft/client/audio
-BehaviorDispenseFirework,net/minecraft/dispenser
-EnchantmentThorns,net/minecraft/enchantment
-EntityFireworkRocket,net/minecraft/entity/item
-ItemBook,net/minecraft/item
-ItemEnchantedBook,net/minecraft/item
-ItemFirework,net/minecraft/item
-ItemFireworkCharge,net/minecraft/item
-RecipeFireworks,net/minecraft/item/crafting
-TileEntityMobSpawnerSpawnData,net/minecraft/tileentity
 Block,net/minecraft/block
 BlockAnvil,net/minecraft/block
+BlockBasePressurePlate,net/minecraft/block
+BlockBaseRailLogic,net/minecraft/block
 BlockBeacon,net/minecraft/block
 BlockBed,net/minecraft/block
 BlockBookshelf,net/minecraft/block
 BlockBreakable,net/minecraft/block
 BlockBrewingStand,net/minecraft/block
 BlockButton,net/minecraft/block
+BlockButtonStone,net/minecraft/block
+BlockButtonWood,net/minecraft/block
 BlockCactus,net/minecraft/block
 BlockCake,net/minecraft/block
+BlockCarpet,net/minecraft/block
 BlockCarrot,net/minecraft/block
 BlockCauldron,net/minecraft/block
 BlockChest,net/minecraft/block
 BlockClay,net/minecraft/block
-BlockCloth,net/minecraft/block
 BlockCocoa,net/minecraft/block
+BlockColored,net/minecraft/block
 BlockCommandBlock,net/minecraft/block
+BlockComparator,net/minecraft/block
 BlockContainer,net/minecraft/block
 BlockCrops,net/minecraft/block
+BlockDaylightDetector,net/minecraft/block
 BlockDeadBush,net/minecraft/block
 BlockDetectorRail,net/minecraft/block
 BlockDirectional,net/minecraft/block
@@ -38,6 +32,7 @@ BlockDirt,net/minecraft/block
 BlockDispenser,net/minecraft/block
 BlockDoor,net/minecraft/block
 BlockDragonEgg,net/minecraft/block
+BlockDropper,net/minecraft/block
 BlockEnchantmentTable,net/minecraft/block
 BlockEndPortal,net/minecraft/block
 BlockEndPortalFrame,net/minecraft/block
@@ -57,6 +52,8 @@ BlockGlowStone,net/minecraft/block
 BlockGrass,net/minecraft/block
 BlockGravel,net/minecraft/block
 BlockHalfSlab,net/minecraft/block
+BlockHay,net/minecraft/block
+BlockHopper,net/minecraft/block
 BlockIce,net/minecraft/block
 BlockJukeBox,net/minecraft/block
 BlockLadder,net/minecraft/block
@@ -83,15 +80,22 @@ BlockPistonExtension,net/minecraft/block
 BlockPistonMoving,net/minecraft/block
 BlockPortal,net/minecraft/block
 BlockPotato,net/minecraft/block
+BlockPoweredOre,net/minecraft/block
 BlockPressurePlate,net/minecraft/block
+BlockPressurePlateWeighted,net/minecraft/block
 BlockPumpkin,net/minecraft/block
+BlockQuartz,net/minecraft/block
 BlockRail,net/minecraft/block
+BlockRailBase,net/minecraft/block
+BlockRailPowered,net/minecraft/block
 BlockRedstoneLight,net/minecraft/block
+BlockRedstoneLogic,net/minecraft/block
 BlockRedstoneOre,net/minecraft/block
 BlockRedstoneRepeater,net/minecraft/block
 BlockRedstoneTorch,net/minecraft/block
 BlockRedstoneWire,net/minecraft/block
 BlockReed,net/minecraft/block
+BlockRotatedPillar,net/minecraft/block
 BlockSand,net/minecraft/block
 BlockSandStone,net/minecraft/block
 BlockSapling,net/minecraft/block
@@ -122,13 +126,12 @@ BlockWood,net/minecraft/block
 BlockWoodSlab,net/minecraft/block
 BlockWorkbench,net/minecraft/block
 EnumMobType,net/minecraft/block
-RailLogic,net/minecraft/block
+ITileEntityProvider,net/minecraft/block
 RedstoneUpdateInfo,net/minecraft/block
 StepSound,net/minecraft/block
 StepSoundAnvil,net/minecraft/block
 StepSoundSand,net/minecraft/block
 StepSoundStone,net/minecraft/block
-TileEntityRecordPlayer,net/minecraft/block
 MapColor,net/minecraft/block/material
 Material,net/minecraft/block/material
 MaterialLiquid,net/minecraft/block/material
@@ -136,31 +139,29 @@ MaterialLogic,net/minecraft/block/material
 MaterialPortal,net/minecraft/block/material
 MaterialTransparent,net/minecraft/block/material
 MaterialWeb,net/minecraft/block/material
+AnvilConverterException,net/minecraft/client
 CallableClientMemoryStats,net/minecraft/client
 CallableClientProfiler,net/minecraft/client
 CallableGLInfo,net/minecraft/client
 CallableLWJGLVersion,net/minecraft/client
+CallableLaunchedVersion,net/minecraft/client
 CallableModded,net/minecraft/client
+CallableParticleScreenName,net/minecraft/client
 CallableTexturePack,net/minecraft/client
-CallableTickingScreenName,net/minecraft/client
 CallableType2,net/minecraft/client
 CallableUpdatingScreenName,net/minecraft/client
-CanvasCrashReport,net/minecraft/client
-CanvasMinecraftApplet,net/minecraft/client
-CanvasMojangLogo,net/minecraft/client
-EnumOSHelper,net/minecraft/client
-GameWindowListener,net/minecraft/client
-MinecraftAppletImpl,net/minecraft/client
-MinecraftFakeLauncher,net/minecraft/client
-PanelCrashReport,net/minecraft/client
+Minecraft,net/minecraft/client
+MinecraftINNER13,net/minecraft/client
 StatStringFormatKeyInv,net/minecraft/client
 ThreadClientSleep,net/minecraft/client
-ThreadShutdown,net/minecraft/client
-CodecMus,net/minecraft/client/audio
-MusInputStream,net/minecraft/client/audio
+ScheduledSound,net/minecraft/client/audio
 SoundManager,net/minecraft/client/audio
+SoundManagerINNER1,net/minecraft/client/audio
 SoundPool,net/minecraft/client/audio
 SoundPoolEntry,net/minecraft/client/audio
+SoundPoolProtocolHandler,net/minecraft/client/audio
+SoundPoolURLConnection,net/minecraft/client/audio
+AbstractClientPlayer,net/minecraft/client/entity
 EntityClientPlayerMP,net/minecraft/client/entity
 EntityOtherPlayerMP,net/minecraft/client/entity
 EntityPlayerSP,net/minecraft/client/entity
@@ -170,10 +171,10 @@ FontRenderer,net/minecraft/client/gui
 Gui,net/minecraft/client/gui
 GuiButton,net/minecraft/client/gui
 GuiButtonLanguage,net/minecraft/client/gui
+GuiButtonLink,net/minecraft/client/gui
 GuiButtonMerchant,net/minecraft/client/gui
 GuiButtonNextPage,net/minecraft/client/gui
 GuiChat,net/minecraft/client/gui
-GuiChatConfirmLink,net/minecraft/client/gui
 GuiCommandBlock,net/minecraft/client/gui
 GuiConfirmOpenLink,net/minecraft/client/gui
 GuiControls,net/minecraft/client/gui
@@ -188,6 +189,7 @@ GuiFlatPresets,net/minecraft/client/gui
 GuiFlatPresetsItem,net/minecraft/client/gui
 GuiFlatPresetsListSlot,net/minecraft/client/gui
 GuiGameOver,net/minecraft/client/gui
+GuiHopper,net/minecraft/client/gui
 GuiIngame,net/minecraft/client/gui
 GuiIngameMenu,net/minecraft/client/gui
 GuiLanguage,net/minecraft/client/gui
@@ -197,22 +199,31 @@ GuiMerchant,net/minecraft/client/gui
 GuiMultiplayer,net/minecraft/client/gui
 GuiNewChat,net/minecraft/client/gui
 GuiOptions,net/minecraft/client/gui
-GuiParticle,net/minecraft/client/gui
 GuiPlayerInfo,net/minecraft/client/gui
-GuiProgress,net/minecraft/client/gui
 GuiRenameWorld,net/minecraft/client/gui
 GuiRepair,net/minecraft/client/gui
 GuiScreen,net/minecraft/client/gui
 GuiScreenAddServer,net/minecraft/client/gui
 GuiScreenBook,net/minecraft/client/gui
+GuiScreenConfigureWorld,net/minecraft/client/gui
+GuiScreenConfirmation,net/minecraft/client/gui
 GuiScreenDemo,net/minecraft/client/gui
+GuiScreenDisconnectedOnline,net/minecraft/client/gui
+GuiScreenEditOnlineWorld,net/minecraft/client/gui
+GuiScreenInvite,net/minecraft/client/gui
+GuiScreenLongRunningTask,net/minecraft/client/gui
+GuiScreenOnlineServers,net/minecraft/client/gui
+GuiScreenOnlineServersSubscreen,net/minecraft/client/gui
+GuiScreenSelectLocation,net/minecraft/client/gui
 GuiScreenServerList,net/minecraft/client/gui
+GuiScreenSubscription,net/minecraft/client/gui
 GuiSelectWorld,net/minecraft/client/gui
 GuiShareToLan,net/minecraft/client/gui
 GuiSleepMP,net/minecraft/client/gui
 GuiSlider,net/minecraft/client/gui
 GuiSlot,net/minecraft/client/gui
 GuiSlotLanguage,net/minecraft/client/gui
+GuiSlotOnlineServerList,net/minecraft/client/gui
 GuiSlotServer,net/minecraft/client/gui
 GuiSmallButton,net/minecraft/client/gui
 GuiSnooper,net/minecraft/client/gui
@@ -224,9 +235,16 @@ GuiWorldSlot,net/minecraft/client/gui
 GuiYesNo,net/minecraft/client/gui
 LoadingScreenRenderer,net/minecraft/client/gui
 MapItemRenderer,net/minecraft/client/gui
-Particle,net/minecraft/client/gui
+RunnableTitleScreen,net/minecraft/client/gui
 ScaledResolution,net/minecraft/client/gui
 ScreenChatOptions,net/minecraft/client/gui
+SelectionListBase,net/minecraft/client/gui
+SelectionListInvited,net/minecraft/client/gui
+TaskLongRunning,net/minecraft/client/gui
+TaskOnlineConnect,net/minecraft/client/gui
+ThreadConnectToOnlineServer,net/minecraft/client/gui
+ThreadOnlineConnect,net/minecraft/client/gui
+ThreadOnlineScreen,net/minecraft/client/gui
 ThreadPollServers,net/minecraft/client/gui
 GuiAchievement,net/minecraft/client/gui/achievement
 GuiAchievements,net/minecraft/client/gui/achievement
@@ -253,7 +271,52 @@ GuiDispenser,net/minecraft/client/gui/inventory
 GuiEditSign,net/minecraft/client/gui/inventory
 GuiFurnace,net/minecraft/client/gui/inventory
 GuiInventory,net/minecraft/client/gui/inventory
+GuiScreenHorseInventory,net/minecraft/client/gui/inventory
 SlotCreativeInventory,net/minecraft/client/gui/inventory
+GuiScreenBackup,net/minecraft/client/gui/mco
+GuiScreenBackupDownloadThread,net/minecraft/client/gui/mco
+GuiScreenBackupRestoreTask,net/minecraft/client/gui/mco
+GuiScreenBackupSelectionList,net/minecraft/client/gui/mco
+GuiScreenCreateOnlineWorld,net/minecraft/client/gui/mco
+GuiScreenMcoWorldTemplate,net/minecraft/client/gui/mco
+GuiScreenMcoWorldTemplateDownloadThread,net/minecraft/client/gui/mco
+GuiScreenMcoWorldTemplateSelectionList,net/minecraft/client/gui/mco
+GuiScreenPendingInvitation,net/minecraft/client/gui/mco
+GuiScreenPendingInvitationINNER1,net/minecraft/client/gui/mco
+GuiScreenPendingInvitationINNER2,net/minecraft/client/gui/mco
+GuiScreenPendingInvitationINNER3,net/minecraft/client/gui/mco
+GuiScreenPendingInvitationList,net/minecraft/client/gui/mco
+GuiScreenResetWorld,net/minecraft/client/gui/mco
+ScreenWithCallback,net/minecraft/client/gui/mco
+TaskResetWorld,net/minecraft/client/gui/mco
+TaskWorldCreation,net/minecraft/client/gui/mco
+MainProxyAuthenticator,net/minecraft/client/main
+MainShutdownHook,net/minecraft/client/main
+Backup,net/minecraft/client/mco
+BackupList,net/minecraft/client/mco
+ExceptionMcoHttp,net/minecraft/client/mco
+ExceptionMcoService,net/minecraft/client/mco
+ExceptionRetryCall,net/minecraft/client/mco
+GuiScreenClientOutdated,net/minecraft/client/mco
+GuiScreenConfirmationType,net/minecraft/client/mco
+McoClient,net/minecraft/client/mco
+McoServer,net/minecraft/client/mco
+McoServerAddress,net/minecraft/client/mco
+McoServerList,net/minecraft/client/mco
+McoServerListEmptyAnon,net/minecraft/client/mco
+McoServerListUpdateTask,net/minecraft/client/mco
+McoServerListUpdateTaskComparator,net/minecraft/client/mco
+PendingInvite,net/minecraft/client/mco
+PendingInvitesList,net/minecraft/client/mco
+Request,net/minecraft/client/mco
+RequestDelete,net/minecraft/client/mco
+RequestGet,net/minecraft/client/mco
+RequestPost,net/minecraft/client/mco
+RequestPut,net/minecraft/client/mco
+ValueObjectList,net/minecraft/client/mco
+ValueObjectSubscription,net/minecraft/client/mco
+WorldTemplate,net/minecraft/client/mco
+WorldTemplateList,net/minecraft/client/mco
 ModelBase,net/minecraft/client/model
 ModelBat,net/minecraft/client/model
 ModelBiped,net/minecraft/client/model
@@ -269,8 +332,10 @@ ModelDragon,net/minecraft/client/model
 ModelEnderCrystal,net/minecraft/client/model
 ModelEnderman,net/minecraft/client/model
 ModelGhast,net/minecraft/client/model
+ModelHorse,net/minecraft/client/model
 ModelIronGolem,net/minecraft/client/model
 ModelLargeChest,net/minecraft/client/model
+ModelLeashKnot,net/minecraft/client/model
 ModelMagmaCube,net/minecraft/client/model
 ModelMinecart,net/minecraft/client/model
 ModelOcelot,net/minecraft/client/model
@@ -303,7 +368,6 @@ GuiConnecting,net/minecraft/client/multiplayer
 LanServer,net/minecraft/client/multiplayer
 LanServerList,net/minecraft/client/multiplayer
 NetClientHandler,net/minecraft/client/multiplayer
-NetClientWebTextures,net/minecraft/client/multiplayer
 PlayerControllerMP,net/minecraft/client/multiplayer
 ServerAddress,net/minecraft/client/multiplayer
 ServerData,net/minecraft/client/multiplayer
@@ -312,7 +376,8 @@ ThreadConnectToServer,net/minecraft/client/multiplayer
 ThreadLanServerFind,net/minecraft/client/multiplayer
 ThreadLanServerPing,net/minecraft/client/multiplayer
 WorldClient,net/minecraft/client/multiplayer
-CallableLastTickedParticle,net/minecraft/client/particle
+WorldClientINNER3,net/minecraft/client/multiplayer
+WorldClientINNER4,net/minecraft/client/multiplayer
 EffectRenderer,net/minecraft/client/particle
 EntityAuraFX,net/minecraft/client/particle
 EntityBreakingFX,net/minecraft/client/particle
@@ -325,6 +390,9 @@ EntityDropParticleFX,net/minecraft/client/particle
 EntityEnchantmentTableParticleFX,net/minecraft/client/particle
 EntityExplodeFX,net/minecraft/client/particle
 EntityFX,net/minecraft/client/particle
+EntityFireworkOverlayFX,net/minecraft/client/particle
+EntityFireworkSparkFX,net/minecraft/client/particle
+EntityFireworkStarterFX,net/minecraft/client/particle
 EntityFlameFX,net/minecraft/client/particle
 EntityFootStepFX,net/minecraft/client/particle
 EntityHeartFX,net/minecraft/client/particle
@@ -344,7 +412,6 @@ EntitySuspendFX,net/minecraft/client/particle
 ActiveRenderInfo,net/minecraft/client/renderer
 CallableMouseLocation,net/minecraft/client/renderer
 CallableParticlePositionInfo,net/minecraft/client/renderer
-CallableParticleScreenName,net/minecraft/client/renderer
 CallableScreenName,net/minecraft/client/renderer
 CallableScreenSize,net/minecraft/client/renderer
 ChestItemRenderHelper,net/minecraft/client/renderer
@@ -353,20 +420,21 @@ EntityRenderer,net/minecraft/client/renderer
 EntitySorter,net/minecraft/client/renderer
 GLAllocation,net/minecraft/client/renderer
 IImageBuffer,net/minecraft/client/renderer
+IconFlipped,net/minecraft/client/renderer
 ImageBufferDownload,net/minecraft/client/renderer
 InventoryEffectRenderer,net/minecraft/client/renderer
 ItemRenderer,net/minecraft/client/renderer
 OpenGlCapsChecker,net/minecraft/client/renderer
 OpenGlHelper,net/minecraft/client/renderer
 RenderBlocks,net/minecraft/client/renderer
-RenderEngine,net/minecraft/client/renderer
 RenderGlobal,net/minecraft/client/renderer
 RenderHelper,net/minecraft/client/renderer
 RenderList,net/minecraft/client/renderer
 RenderSorter,net/minecraft/client/renderer
+StitcherException,net/minecraft/client/renderer
 Tessellator,net/minecraft/client/renderer
-ThreadDownloadImage,net/minecraft/client/renderer
 ThreadDownloadImageData,net/minecraft/client/renderer
+ThreadDownloadImageDataINNER1,net/minecraft/client/renderer
 WorldRenderer,net/minecraft/client/renderer
 ClippingHelper,net/minecraft/client/renderer/culling
 ClippingHelperImpl,net/minecraft/client/renderer/culling
@@ -378,6 +446,7 @@ RenderBat,net/minecraft/client/renderer/entity
 RenderBiped,net/minecraft/client/renderer/entity
 RenderBlaze,net/minecraft/client/renderer/entity
 RenderBoat,net/minecraft/client/renderer/entity
+RenderCaveSpider,net/minecraft/client/renderer/entity
 RenderChicken,net/minecraft/client/renderer/entity
 RenderCow,net/minecraft/client/renderer/entity
 RenderCreeper,net/minecraft/client/renderer/entity
@@ -390,13 +459,16 @@ RenderFireball,net/minecraft/client/renderer/entity
 RenderFish,net/minecraft/client/renderer/entity
 RenderGhast,net/minecraft/client/renderer/entity
 RenderGiantZombie,net/minecraft/client/renderer/entity
+RenderHorse,net/minecraft/client/renderer/entity
 RenderIronGolem,net/minecraft/client/renderer/entity
 RenderItem,net/minecraft/client/renderer/entity
+RenderLeashKnot,net/minecraft/client/renderer/entity
 RenderLightningBolt,net/minecraft/client/renderer/entity
 RenderLiving,net/minecraft/client/renderer/entity
 RenderMagmaCube,net/minecraft/client/renderer/entity
 RenderManager,net/minecraft/client/renderer/entity
 RenderMinecart,net/minecraft/client/renderer/entity
+RenderMinecartMobSpawner,net/minecraft/client/renderer/entity
 RenderMooshroom,net/minecraft/client/renderer/entity
 RenderOcelot,net/minecraft/client/renderer/entity
 RenderPainting,net/minecraft/client/renderer/entity
@@ -411,21 +483,32 @@ RenderSnowball,net/minecraft/client/renderer/entity
 RenderSpider,net/minecraft/client/renderer/entity
 RenderSquid,net/minecraft/client/renderer/entity
 RenderTNTPrimed,net/minecraft/client/renderer/entity
+RenderTntMinecart,net/minecraft/client/renderer/entity
 RenderVillager,net/minecraft/client/renderer/entity
 RenderWitch,net/minecraft/client/renderer/entity
 RenderWither,net/minecraft/client/renderer/entity
 RenderWolf,net/minecraft/client/renderer/entity
 RenderXPOrb,net/minecraft/client/renderer/entity
 RenderZombie,net/minecraft/client/renderer/entity
-TextureCompassFX,net/minecraft/client/renderer/texturefx
-TextureFX,net/minecraft/client/renderer/texturefx
-TextureFlamesFX,net/minecraft/client/renderer/texturefx
-TextureLavaFX,net/minecraft/client/renderer/texturefx
-TextureLavaFlowFX,net/minecraft/client/renderer/texturefx
-TexturePortalFX,net/minecraft/client/renderer/texturefx
-TextureWatchFX,net/minecraft/client/renderer/texturefx
-TextureWaterFX,net/minecraft/client/renderer/texturefx
-TextureWaterFlowFX,net/minecraft/client/renderer/texturefx
+RendererLivingEntity,net/minecraft/client/renderer/entity
+AbstractTexture,net/minecraft/client/renderer/texture
+DynamicTexture,net/minecraft/client/renderer/texture
+IconRegister,net/minecraft/client/renderer/texture
+LayeredTexture,net/minecraft/client/renderer/texture
+SimpleTexture,net/minecraft/client/renderer/texture
+StitchHolder,net/minecraft/client/renderer/texture
+StitchSlot,net/minecraft/client/renderer/texture
+Stitcher,net/minecraft/client/renderer/texture
+TextureAtlasSprite,net/minecraft/client/renderer/texture
+TextureClock,net/minecraft/client/renderer/texture
+TextureCompass,net/minecraft/client/renderer/texture
+TextureManager,net/minecraft/client/renderer/texture
+TextureManagerINNER1,net/minecraft/client/renderer/texture
+TextureMap,net/minecraft/client/renderer/texture
+TextureObject,net/minecraft/client/renderer/texture
+TextureUtil,net/minecraft/client/renderer/texture
+Tickable,net/minecraft/client/renderer/texture
+TickableTextureObject,net/minecraft/client/renderer/texture
 RenderEndPortal,net/minecraft/client/renderer/tileentity
 RenderEnderCrystal,net/minecraft/client/renderer/tileentity
 RenderItemFrame,net/minecraft/client/renderer/tileentity
@@ -439,24 +522,59 @@ TileEntityRendererPiston,net/minecraft/client/renderer/tileentity
 TileEntitySignRenderer,net/minecraft/client/renderer/tileentity
 TileEntitySkullRenderer,net/minecraft/client/renderer/tileentity
 TileEntitySpecialRenderer,net/minecraft/client/renderer/tileentity
+AbstractResourcePack,net/minecraft/client/resources
+DefaultResourcePack,net/minecraft/client/resources
+FallbackResourceManager,net/minecraft/client/resources
+FileResourcePack,net/minecraft/client/resources
+FolderResourcePack,net/minecraft/client/resources
+FoliageColorReloadListener,net/minecraft/client/resources
+GrassColorReloadListener,net/minecraft/client/resources
+GuiScreenTemporaryResourcePackSelect,net/minecraft/client/resources
+GuiScreenTemporaryResourcePackSelectSelectionList,net/minecraft/client/resources
+I18n,net/minecraft/client/resources
+Language,net/minecraft/client/resources
+LanguageManager,net/minecraft/client/resources
+Locale,net/minecraft/client/resources
+ReloadableResourceManager,net/minecraft/client/resources
+Resource,net/minecraft/client/resources
+ResourceManager,net/minecraft/client/resources
+ResourceManagerReloadListener,net/minecraft/client/resources
+ResourcePack,net/minecraft/client/resources
+ResourcePackFileNotFoundException,net/minecraft/client/resources
+ResourcePackRepository,net/minecraft/client/resources
+ResourcePackRepositoryEntry,net/minecraft/client/resources
+ResourcePackRepositoryFilter,net/minecraft/client/resources
+SimpleReloadableResourceManager,net/minecraft/client/resources
+SimpleReloadableResourceManagerINNER1,net/minecraft/client/resources
+SimpleResource,net/minecraft/client/resources
+AnimationFrame,net/minecraft/client/resources/data
+AnimationMetadataSection,net/minecraft/client/resources/data
+AnimationMetadataSectionSerializer,net/minecraft/client/resources/data
+BaseMetadataSectionSerializer,net/minecraft/client/resources/data
+FontMetadataSection,net/minecraft/client/resources/data
+FontMetadataSectionSerializer,net/minecraft/client/resources/data
+LanguageMetadataSection,net/minecraft/client/resources/data
+LanguageMetadataSectionSerializer,net/minecraft/client/resources/data
+MetadataSection,net/minecraft/client/resources/data
+MetadataSectionSerializer,net/minecraft/client/resources/data
+MetadataSerializer,net/minecraft/client/resources/data
+MetadataSerializerEmptyAnon,net/minecraft/client/resources/data
+MetadataSerializerRegistration,net/minecraft/client/resources/data
+PackMetadataSection,net/minecraft/client/resources/data
+PackMetadataSectionSerializer,net/minecraft/client/resources/data
+TextureMetadataSection,net/minecraft/client/resources/data
+TextureMetadataSectionSerializer,net/minecraft/client/resources/data
 EnumOptions,net/minecraft/client/settings
 EnumOptionsHelper,net/minecraft/client/settings
 GameSettings,net/minecraft/client/settings
 KeyBinding,net/minecraft/client/settings
-GuiTexturePackSlot,net/minecraft/client/texturepacks
-GuiTexturePacks,net/minecraft/client/texturepacks
-ITexturePack,net/minecraft/client/texturepacks
-TexturePackCustom,net/minecraft/client/texturepacks
-TexturePackDefault,net/minecraft/client/texturepacks
-TexturePackDownloadSuccess,net/minecraft/client/texturepacks
-TexturePackFolder,net/minecraft/client/texturepacks
-TexturePackImplementation,net/minecraft/client/texturepacks
-TexturePackList,net/minecraft/client/texturepacks
+StatPlaceholder,net/minecraft/client/stats
 CommandBase,net/minecraft/command
 CommandClearInventory,net/minecraft/command
 CommandDebug,net/minecraft/command
 CommandDefaultGameMode,net/minecraft/command
 CommandDifficulty,net/minecraft/command
+CommandEffect,net/minecraft/command
 CommandEnchant,net/minecraft/command
 CommandException,net/minecraft/command
 CommandGameMode,net/minecraft/command
@@ -466,6 +584,7 @@ CommandHandler,net/minecraft/command
 CommandHelp,net/minecraft/command
 CommandKill,net/minecraft/command
 CommandNotFoundException,net/minecraft/command
+CommandPlaySound,net/minecraft/command
 CommandServerBan,net/minecraft/command
 CommandServerBanIp,net/minecraft/command
 CommandServerBanlist,net/minecraft/command
@@ -485,12 +604,17 @@ CommandServerSay,net/minecraft/command
 CommandServerStop,net/minecraft/command
 CommandServerTp,net/minecraft/command
 CommandServerWhitelist,net/minecraft/command
+CommandSetPlayerTimeout,net/minecraft/command
 CommandSetSpawnpoint,net/minecraft/command
 CommandShowSeed,net/minecraft/command
+CommandSpreadPlayers,net/minecraft/command
+CommandSpreadPlayersPosition,net/minecraft/command
 CommandTime,net/minecraft/command
 CommandToggleDownfall,net/minecraft/command
 CommandWeather,net/minecraft/command
 CommandXP,net/minecraft/command
+EntitySelectorAlive,net/minecraft/command
+EntitySelectorInventory,net/minecraft/command
 IAdminCommand,net/minecraft/command
 ICommand,net/minecraft/command
 ICommandManager,net/minecraft/command
@@ -532,21 +656,25 @@ CreativeTabSearch,net/minecraft/creativetab
 CreativeTabTools,net/minecraft/creativetab
 CreativeTabTransport,net/minecraft/creativetab
 CreativeTabs,net/minecraft/creativetab
-BehaviorArrowDispense,net/minecraft/dispenser
-BehaviorBucketEmptyDispense,net/minecraft/dispenser
-BehaviorBucketFullDispense,net/minecraft/dispenser
 BehaviorDefaultDispenseItem,net/minecraft/dispenser
-BehaviorDispenseBoat,net/minecraft/dispenser
-BehaviorDispenseFireball,net/minecraft/dispenser
 BehaviorDispenseItemProvider,net/minecraft/dispenser
-BehaviorDispenseMinecart,net/minecraft/dispenser
-BehaviorEggDispense,net/minecraft/dispenser
-BehaviorExpBottleDispense,net/minecraft/dispenser
-BehaviorMobEggDispense,net/minecraft/dispenser
-BehaviorPotionDispense,net/minecraft/dispenser
-BehaviorPotionDispenseLogic,net/minecraft/dispenser
 BehaviorProjectileDispense,net/minecraft/dispenser
-BehaviorSnowballDispense,net/minecraft/dispenser
+DispenserBehaviorArrow,net/minecraft/dispenser
+DispenserBehaviorBoat,net/minecraft/dispenser
+DispenserBehaviorDye,net/minecraft/dispenser
+DispenserBehaviorEgg,net/minecraft/dispenser
+DispenserBehaviorEmptyBucket,net/minecraft/dispenser
+DispenserBehaviorExperience,net/minecraft/dispenser
+DispenserBehaviorFilledBucket,net/minecraft/dispenser
+DispenserBehaviorFire,net/minecraft/dispenser
+DispenserBehaviorFireball,net/minecraft/dispenser
+DispenserBehaviorFireworks,net/minecraft/dispenser
+DispenserBehaviorMobEgg,net/minecraft/dispenser
+DispenserBehaviorPotion,net/minecraft/dispenser
+DispenserBehaviorPotionProjectile,net/minecraft/dispenser
+DispenserBehaviorSnowball,net/minecraft/dispenser
+DispenserBehaviorTNT,net/minecraft/dispenser
+DispenserBehaviors,net/minecraft/dispenser
 IBehaviorDispenseItem,net/minecraft/dispenser
 IBlockSource,net/minecraft/dispenser
 ILocatableSource,net/minecraft/dispenser
@@ -574,10 +702,13 @@ EnchantmentModifierDamage,net/minecraft/enchantment
 EnchantmentModifierLiving,net/minecraft/enchantment
 EnchantmentOxygen,net/minecraft/enchantment
 EnchantmentProtection,net/minecraft/enchantment
+EnchantmentThorns,net/minecraft/enchantment
 EnchantmentUntouching,net/minecraft/enchantment
 EnchantmentWaterWorker,net/minecraft/enchantment
 EnumEnchantmentType,net/minecraft/enchantment
 IEnchantmentModifier,net/minecraft/enchantment
+CallableEntityName,net/minecraft/entity
+CallableEntityTracker,net/minecraft/entity
 CallableEntityType,net/minecraft/entity
 DataWatcher,net/minecraft/entity
 Entity,net/minecraft/entity
@@ -587,8 +718,13 @@ EntityCreature,net/minecraft/entity
 EntityEggInfo,net/minecraft/entity
 EntityFlying,net/minecraft/entity
 EntityHanging,net/minecraft/entity
+EntityLeashKnot,net/minecraft/entity
 EntityList,net/minecraft/entity
 EntityLiving,net/minecraft/entity
+EntityLivingBase,net/minecraft/entity
+EntityLivingData,net/minecraft/entity
+EntityOwnable,net/minecraft/entity
+EntitySelectorArmoredMob,net/minecraft/entity
 EntityTracker,net/minecraft/entity
 EntityTrackerEntry,net/minecraft/entity
 EnumCreatureAttribute,net/minecraft/entity
@@ -601,10 +737,13 @@ INpc,net/minecraft/entity
 IProjectile,net/minecraft/entity
 IRangedAttackMob,net/minecraft/entity
 NpcMerchant,net/minecraft/entity
+SharedMonsterAttributes,net/minecraft/entity
+SpiderEffectsGroupData,net/minecraft/entity
 WatchableObject,net/minecraft/entity
 EntityAIArrowAttack,net/minecraft/entity/ai
 EntityAIAttackOnCollide,net/minecraft/entity/ai
 EntityAIAvoidEntity,net/minecraft/entity/ai
+EntityAIAvoidEntitySelector,net/minecraft/entity/ai
 EntityAIBase,net/minecraft/entity/ai
 EntityAIBeg,net/minecraft/entity/ai
 EntityAIBreakDoor,net/minecraft/entity/ai
@@ -625,9 +764,10 @@ EntityAILookIdle,net/minecraft/entity/ai
 EntityAIMate,net/minecraft/entity/ai
 EntityAIMoveIndoors,net/minecraft/entity/ai
 EntityAIMoveThroughVillage,net/minecraft/entity/ai
+EntityAIMoveTowardsRestriction,net/minecraft/entity/ai
 EntityAIMoveTowardsTarget,net/minecraft/entity/ai
-EntityAIMoveTwardsRestriction,net/minecraft/entity/ai
 EntityAINearestAttackableTarget,net/minecraft/entity/ai
+EntityAINearestAttackableTargetSelector,net/minecraft/entity/ai
 EntityAINearestAttackableTargetSorter,net/minecraft/entity/ai
 EntityAIOcelotAttack,net/minecraft/entity/ai
 EntityAIOcelotSit,net/minecraft/entity/ai
@@ -638,6 +778,7 @@ EntityAIPanic,net/minecraft/entity/ai
 EntityAIPlay,net/minecraft/entity/ai
 EntityAIRestrictOpenDoor,net/minecraft/entity/ai
 EntityAIRestrictSun,net/minecraft/entity/ai
+EntityAIRunAroundLikeCrazy,net/minecraft/entity/ai
 EntityAISit,net/minecraft/entity/ai
 EntityAISwimming,net/minecraft/entity/ai
 EntityAITarget,net/minecraft/entity/ai
@@ -652,9 +793,19 @@ EntityAIWatchClosest,net/minecraft/entity/ai
 EntityAIWatchClosest2,net/minecraft/entity/ai
 EntityJumpHelper,net/minecraft/entity/ai
 EntityLookHelper,net/minecraft/entity/ai
+EntityMinecartMobSpawner,net/minecraft/entity/ai
+EntityMinecartMobSpawnerLogic,net/minecraft/entity/ai
 EntityMoveHelper,net/minecraft/entity/ai
 EntitySenses,net/minecraft/entity/ai
 RandomPositionGenerator,net/minecraft/entity/ai
+Attribute,net/minecraft/entity/ai/attributes
+AttributeInstance,net/minecraft/entity/ai/attributes
+AttributeModifier,net/minecraft/entity/ai/attributes
+BaseAttribute,net/minecraft/entity/ai/attributes
+BaseAttributeMap,net/minecraft/entity/ai/attributes
+ModifiableAttributeInstance,net/minecraft/entity/ai/attributes
+RangedAttribute,net/minecraft/entity/ai/attributes
+ServersideAttributeMap,net/minecraft/entity/ai/attributes
 BossStatus,net/minecraft/entity/boss
 EntityDragon,net/minecraft/entity/boss
 EntityDragonPart,net/minecraft/entity/boss
@@ -669,9 +820,16 @@ EntityEnderEye,net/minecraft/entity/item
 EntityEnderPearl,net/minecraft/entity/item
 EntityExpBottle,net/minecraft/entity/item
 EntityFallingSand,net/minecraft/entity/item
+EntityFireworkRocket,net/minecraft/entity/item
 EntityItem,net/minecraft/entity/item
 EntityItemFrame,net/minecraft/entity/item
 EntityMinecart,net/minecraft/entity/item
+EntityMinecartChest,net/minecraft/entity/item
+EntityMinecartContainer,net/minecraft/entity/item
+EntityMinecartEmpty,net/minecraft/entity/item
+EntityMinecartFurnace,net/minecraft/entity/item
+EntityMinecartHopper,net/minecraft/entity/item
+EntityMinecartTNT,net/minecraft/entity/item
 EntityPainting,net/minecraft/entity/item
 EntityTNTPrimed,net/minecraft/entity/item
 EntityXPOrb,net/minecraft/entity/item
@@ -694,6 +852,8 @@ EntitySnowman,net/minecraft/entity/monster
 EntitySpider,net/minecraft/entity/monster
 EntityWitch,net/minecraft/entity/monster
 EntityZombie,net/minecraft/entity/monster
+EntityZombieGroupData,net/minecraft/entity/monster
+EntityZombieINNER1,net/minecraft/entity/monster
 FilterIMob,net/minecraft/entity/monster
 IMob,net/minecraft/entity/monster
 ContainerSheep,net/minecraft/entity/passive
@@ -702,6 +862,9 @@ EntityAnimal,net/minecraft/entity/passive
 EntityBat,net/minecraft/entity/passive
 EntityChicken,net/minecraft/entity/passive
 EntityCow,net/minecraft/entity/passive
+EntityHorse,net/minecraft/entity/passive
+EntityHorseBredSelector,net/minecraft/entity/passive
+EntityHorseGroupData,net/minecraft/entity/passive
 EntityMooshroom,net/minecraft/entity/passive
 EntityOcelot,net/minecraft/entity/passive
 EntityPig,net/minecraft/entity/passive
@@ -712,6 +875,7 @@ EntityVillager,net/minecraft/entity/passive
 EntityWaterMob,net/minecraft/entity/passive
 EntityWolf,net/minecraft/entity/passive
 IAnimals,net/minecraft/entity/passive
+CallableItemName,net/minecraft/entity/player
 EntityPlayer,net/minecraft/entity/player
 EntityPlayerMP,net/minecraft/entity/player
 EnumStatus,net/minecraft/entity/player
@@ -727,6 +891,7 @@ EntitySmallFireball,net/minecraft/entity/projectile
 EntitySnowball,net/minecraft/entity/projectile
 EntityThrowable,net/minecraft/entity/projectile
 EntityWitherSkull,net/minecraft/entity/projectile
+AnimalChest,net/minecraft/inventory
 Container,net/minecraft/inventory
 ContainerBeacon,net/minecraft/inventory
 ContainerBrewingStand,net/minecraft/inventory
@@ -734,20 +899,26 @@ ContainerChest,net/minecraft/inventory
 ContainerDispenser,net/minecraft/inventory
 ContainerEnchantment,net/minecraft/inventory
 ContainerFurnace,net/minecraft/inventory
+ContainerHopper,net/minecraft/inventory
+ContainerHorseInventory,net/minecraft/inventory
+ContainerHorseInventorySlotArmor,net/minecraft/inventory
+ContainerHorseInventorySlotSaddle,net/minecraft/inventory
 ContainerMerchant,net/minecraft/inventory
 ContainerPlayer,net/minecraft/inventory
 ContainerRepair,net/minecraft/inventory
+ContainerRepairINNER1,net/minecraft/inventory
+ContainerRepairINNER2,net/minecraft/inventory
 ContainerWorkbench,net/minecraft/inventory
 ICrafting,net/minecraft/inventory
 IInvBasic,net/minecraft/inventory
 IInventory,net/minecraft/inventory
+ISidedInventory,net/minecraft/inventory
 InventoryBasic,net/minecraft/inventory
 InventoryCraftResult,net/minecraft/inventory
 InventoryCrafting,net/minecraft/inventory
 InventoryEnderChest,net/minecraft/inventory
 InventoryLargeChest,net/minecraft/inventory
 InventoryMerchant,net/minecraft/inventory
-InventoryRepair,net/minecraft/inventory
 Slot,net/minecraft/inventory
 SlotArmor,net/minecraft/inventory
 SlotBeacon,net/minecraft/inventory
@@ -758,7 +929,8 @@ SlotEnchantment,net/minecraft/inventory
 SlotEnchantmentTable,net/minecraft/inventory
 SlotFurnace,net/minecraft/inventory
 SlotMerchantResult,net/minecraft/inventory
-SlotRepair,net/minecraft/inventory
+BehaviorDispenseArmor,net/minecraft/item
+BehaviorDispenseMinecart,net/minecraft/item
 EnumAction,net/minecraft/item
 EnumArmorMaterial,net/minecraft/item
 EnumRarity,net/minecraft/item
@@ -770,7 +942,9 @@ ItemArmor,net/minecraft/item
 ItemAxe,net/minecraft/item
 ItemBed,net/minecraft/item
 ItemBlock,net/minecraft/item
+ItemBlockWithMetadata,net/minecraft/item
 ItemBoat,net/minecraft/item
+ItemBook,net/minecraft/item
 ItemBow,net/minecraft/item
 ItemBucket,net/minecraft/item
 ItemBucketMilk,net/minecraft/item
@@ -783,10 +957,13 @@ ItemDye,net/minecraft/item
 ItemEditableBook,net/minecraft/item
 ItemEgg,net/minecraft/item
 ItemEmptyMap,net/minecraft/item
+ItemEnchantedBook,net/minecraft/item
 ItemEnderEye,net/minecraft/item
 ItemEnderPearl,net/minecraft/item
 ItemExpBottle,net/minecraft/item
 ItemFireball,net/minecraft/item
+ItemFirework,net/minecraft/item
+ItemFireworkCharge,net/minecraft/item
 ItemFishingRod,net/minecraft/item
 ItemFlintAndSteel,net/minecraft/item
 ItemFood,net/minecraft/item
@@ -794,6 +971,7 @@ ItemGlassBottle,net/minecraft/item
 ItemHangingEntity,net/minecraft/item
 ItemHoe,net/minecraft/item
 ItemInWorldManager,net/minecraft/item
+ItemLeash,net/minecraft/item
 ItemLeaves,net/minecraft/item
 ItemLilyPad,net/minecraft/item
 ItemMap,net/minecraft/item
@@ -801,6 +979,7 @@ ItemMapBase,net/minecraft/item
 ItemMinecart,net/minecraft/item
 ItemMonsterPlacer,net/minecraft/item
 ItemMultiTextureTile,net/minecraft/item
+ItemNameTag,net/minecraft/item
 ItemPickaxe,net/minecraft/item
 ItemPiston,net/minecraft/item
 ItemPotion,net/minecraft/item
@@ -815,6 +994,7 @@ ItemSign,net/minecraft/item
 ItemSimpleFoiled,net/minecraft/item
 ItemSkull,net/minecraft/item
 ItemSlab,net/minecraft/item
+ItemSnow,net/minecraft/item
 ItemSnowball,net/minecraft/item
 ItemSoup,net/minecraft/item
 ItemSpade,net/minecraft/item
@@ -825,6 +1005,7 @@ ItemWritableBook,net/minecraft/item
 CraftingManager,net/minecraft/item/crafting
 FurnaceRecipes,net/minecraft/item/crafting
 IRecipe,net/minecraft/item/crafting
+RecipeFireworks,net/minecraft/item/crafting
 RecipeSorter,net/minecraft/item/crafting
 RecipesArmor,net/minecraft/item/crafting
 RecipesArmorDyes,net/minecraft/item/crafting
@@ -838,6 +1019,10 @@ RecipesTools,net/minecraft/item/crafting
 RecipesWeapons,net/minecraft/item/crafting
 ShapedRecipes,net/minecraft/item/crafting
 ShapelessRecipes,net/minecraft/item/crafting
+ILogAgent,net/minecraft/logging
+LogAgent,net/minecraft/logging
+LogAgentEmptyAnon,net/minecraft/logging
+LogFormatter,net/minecraft/logging
 CallableTagCompound1,net/minecraft/nbt
 CallableTagCompound2,net/minecraft/nbt
 CompressedStreamTools,net/minecraft/nbt
@@ -854,6 +1039,9 @@ NBTTagList,net/minecraft/nbt
 NBTTagLong,net/minecraft/nbt
 NBTTagShort,net/minecraft/nbt
 NBTTagString,net/minecraft/nbt
+CallableConnectionName,net/minecraft/network
+CallablePacketClass,net/minecraft/network
+CallablePacketID,net/minecraft/network
 INetworkManager,net/minecraft/network
 MemoryConnection,net/minecraft/network
 NetLoginHandler,net/minecraft/network
@@ -883,6 +1071,7 @@ Packet12PlayerLook,net/minecraft/network/packet
 Packet130UpdateSign,net/minecraft/network/packet
 Packet131MapData,net/minecraft/network/packet
 Packet132TileEntityData,net/minecraft/network/packet
+Packet133TileEditorOpen,net/minecraft/network/packet
 Packet13PlayerLookMove,net/minecraft/network/packet
 Packet14BlockDig,net/minecraft/network/packet
 Packet15Place,net/minecraft/network/packet
@@ -897,8 +1086,11 @@ Packet202PlayerAbilities,net/minecraft/network/packet
 Packet203AutoComplete,net/minecraft/network/packet
 Packet204ClientInfo,net/minecraft/network/packet
 Packet205ClientCommand,net/minecraft/network/packet
+Packet206SetObjective,net/minecraft/network/packet
+Packet207SetScore,net/minecraft/network/packet
+Packet208SetDisplayObjective,net/minecraft/network/packet
+Packet209SetPlayerTeam,net/minecraft/network/packet
 Packet20NamedEntitySpawn,net/minecraft/network/packet
-Packet21PickupSpawn,net/minecraft/network/packet
 Packet22Collect,net/minecraft/network/packet
 Packet23VehicleSpawn,net/minecraft/network/packet
 Packet24MobSpawn,net/minecraft/network/packet
@@ -909,6 +1101,7 @@ Packet254ServerPing,net/minecraft/network/packet
 Packet255KickDisconnect,net/minecraft/network/packet
 Packet25EntityPainting,net/minecraft/network/packet
 Packet26EntityExpOrb,net/minecraft/network/packet
+Packet27PlayerInput,net/minecraft/network/packet
 Packet28EntityVelocity,net/minecraft/network/packet
 Packet29DestroyEntity,net/minecraft/network/packet
 Packet2ClientProtocol,net/minecraft/network/packet
@@ -925,6 +1118,8 @@ Packet40EntityMetadata,net/minecraft/network/packet
 Packet41EntityEffect,net/minecraft/network/packet
 Packet42RemoveEntityEffect,net/minecraft/network/packet
 Packet43Experience,net/minecraft/network/packet
+Packet44UpdateAttributes,net/minecraft/network/packet
+Packet44UpdateAttributesSnapshot,net/minecraft/network/packet
 Packet4UpdateTime,net/minecraft/network/packet
 Packet51MapChunk,net/minecraft/network/packet
 Packet51MapChunkData,net/minecraft/network/packet
@@ -937,6 +1132,7 @@ Packet5PlayerInventory,net/minecraft/network/packet
 Packet60Explosion,net/minecraft/network/packet
 Packet61DoorChange,net/minecraft/network/packet
 Packet62LevelSound,net/minecraft/network/packet
+Packet63WorldParticles,net/minecraft/network/packet
 Packet6SpawnPosition,net/minecraft/network/packet
 Packet70GameEvent,net/minecraft/network/packet
 Packet71Weather,net/minecraft/network/packet
@@ -959,14 +1155,30 @@ PathFinder,net/minecraft/pathfinding
 PathNavigate,net/minecraft/pathfinding
 PathPoint,net/minecraft/pathfinding
 Potion,net/minecraft/potion
+PotionAbsoption,net/minecraft/potion
+PotionAttackDamage,net/minecraft/potion
 PotionEffect,net/minecraft/potion
 PotionHealth,net/minecraft/potion
+PotionHealthBoost,net/minecraft/potion
 PotionHelper,net/minecraft/potion
 IPlayerUsage,net/minecraft/profiler
 PlayerUsageSnooper,net/minecraft/profiler
 PlayerUsageSnooperThread,net/minecraft/profiler
 Profiler,net/minecraft/profiler
 ProfilerResult,net/minecraft/profiler
+Score,net/minecraft/scoreboard
+ScoreComparator,net/minecraft/scoreboard
+ScoreDummyCriteria,net/minecraft/scoreboard
+ScoreHealthCriteria,net/minecraft/scoreboard
+ScoreObjective,net/minecraft/scoreboard
+ScoreObjectiveCriteria,net/minecraft/scoreboard
+ScorePlayerTeam,net/minecraft/scoreboard
+Scoreboard,net/minecraft/scoreboard
+ScoreboardSaveData,net/minecraft/scoreboard
+ServerCommandScoreboard,net/minecraft/scoreboard
+ServerCommandTestFor,net/minecraft/scoreboard
+ServerScoreboard,net/minecraft/scoreboard
+Team,net/minecraft/scoreboard
 CallableIsServerModded,net/minecraft/server
 CallableServerMemoryStats,net/minecraft/server
 CallableServerProfiler,net/minecraft/server
@@ -976,24 +1188,22 @@ ThreadDedicatedServer,net/minecraft/server
 ThreadMinecraftServer,net/minecraft/server
 CallableServerType,net/minecraft/server/dedicated
 CallableType,net/minecraft/server/dedicated
-ConsoleLogFormatter,net/minecraft/server/dedicated
-ConsoleLogManager,net/minecraft/server/dedicated
 DedicatedPlayerList,net/minecraft/server/dedicated
 DedicatedServer,net/minecraft/server/dedicated
 DedicatedServerCommandThread,net/minecraft/server/dedicated
 DedicatedServerListenThread,net/minecraft/server/dedicated
 DedicatedServerSleepThread,net/minecraft/server/dedicated
 PropertyManager,net/minecraft/server/dedicated
-GuiLogFormatter,net/minecraft/server/gui
-GuiLogOutputHandler,net/minecraft/server/gui
-GuiStatsComponent,net/minecraft/server/gui
-GuiStatsListener,net/minecraft/server/gui
 IUpdatePlayerListBox,net/minecraft/server/gui
-PlayerListBox,net/minecraft/server/gui
-ServerGUI,net/minecraft/server/gui
-ServerGuiCommandListener,net/minecraft/server/gui
-ServerGuiFocusAdapter,net/minecraft/server/gui
-ServerWindowAdapter,net/minecraft/server/gui
+MinecraftServerGui,net/minecraft/server/gui
+MinecraftServerGuiINNER1,net/minecraft/server/gui
+MinecraftServerGuiINNER2,net/minecraft/server/gui
+MinecraftServerGuiINNER3,net/minecraft/server/gui
+PlayerListComponent,net/minecraft/server/gui
+StatsComponent,net/minecraft/server/gui
+StatsComponentINNER1,net/minecraft/server/gui
+TextAreaLogHandler,net/minecraft/server/gui
+TextAreaLogHandlerINNER1,net/minecraft/server/gui
 CallableIsModded,net/minecraft/server/integrated
 CallableType3,net/minecraft/server/integrated
 IntegratedPlayerList,net/minecraft/server/integrated
@@ -1017,32 +1227,47 @@ StatCrafting,net/minecraft/stats
 StatFileWriter,net/minecraft/stats
 StatList,net/minecraft/stats
 StatTypeDistance,net/minecraft/stats
+StatTypeFloat,net/minecraft/stats
 StatTypeSimple,net/minecraft/stats
 StatTypeTime,net/minecraft/stats
 StatsSyncher,net/minecraft/stats
 ThreadStatSyncherReceive,net/minecraft/stats
 ThreadStatSyncherSend,net/minecraft/stats
+CallableTileEntityData,net/minecraft/tileentity
+CallableTileEntityID,net/minecraft/tileentity
 CallableTileEntityName,net/minecraft/tileentity
+Hopper,net/minecraft/tileentity
+MobSpawnerBaseLogic,net/minecraft/tileentity
 TileEntity,net/minecraft/tileentity
 TileEntityBeacon,net/minecraft/tileentity
 TileEntityBrewingStand,net/minecraft/tileentity
 TileEntityChest,net/minecraft/tileentity
 TileEntityCommandBlock,net/minecraft/tileentity
+TileEntityComparator,net/minecraft/tileentity
+TileEntityDaylightDetector,net/minecraft/tileentity
 TileEntityDispenser,net/minecraft/tileentity
+TileEntityDropper,net/minecraft/tileentity
 TileEntityEnchantmentTable,net/minecraft/tileentity
 TileEntityEndPortal,net/minecraft/tileentity
 TileEntityEnderChest,net/minecraft/tileentity
 TileEntityFurnace,net/minecraft/tileentity
+TileEntityHopper,net/minecraft/tileentity
 TileEntityMobSpawner,net/minecraft/tileentity
+TileEntityMobSpawnerLogic,net/minecraft/tileentity
 TileEntityNote,net/minecraft/tileentity
 TileEntityPiston,net/minecraft/tileentity
+TileEntityRecordPlayer,net/minecraft/tileentity
 TileEntitySign,net/minecraft/tileentity
 TileEntitySkull,net/minecraft/tileentity
+WeightedRandomMinecart,net/minecraft/tileentity
 AABBLocalPool,net/minecraft/util
 AABBPool,net/minecraft/util
 AxisAlignedBB,net/minecraft/util
 ChatAllowedCharacters,net/minecraft/util
+ChatMessageComponent,net/minecraft/util
 ChunkCoordinates,net/minecraft/util
+CombatEntry,net/minecraft/util
+CombatTracker,net/minecraft/util
 CryptManager,net/minecraft/util
 DamageSource,net/minecraft/util
 Direction,net/minecraft/util
@@ -1050,21 +1275,22 @@ EnchantmentNameParts,net/minecraft/util
 EntityDamageSource,net/minecraft/util
 EntityDamageSourceIndirect,net/minecraft/util
 EnumArt,net/minecraft/util
+EnumChatFormatting,net/minecraft/util
 EnumFacing,net/minecraft/util
 EnumMovingObjectType,net/minecraft/util
 EnumOS,net/minecraft/util
 Facing,net/minecraft/util
 FoodStats,net/minecraft/util
 HttpUtil,net/minecraft/util
-HttpUtilRunnable,net/minecraft/util
-IDownloadSuccess,net/minecraft/util
 IProgressUpdate,net/minecraft/util
+Icon,net/minecraft/util
 IntHashMap,net/minecraft/util
 IntHashMapEntry,net/minecraft/util
 LongHashMap,net/minecraft/util
 LongHashMapEntry,net/minecraft/util
 MD5String,net/minecraft/util
 MathHelper,net/minecraft/util
+MessageComponentSerializer,net/minecraft/util
 MinecraftError,net/minecraft/util
 MouseFilter,net/minecraft/util
 MouseHelper,net/minecraft/util
@@ -1072,14 +1298,16 @@ MovementInput,net/minecraft/util
 MovementInputFromOptions,net/minecraft/util
 MovingObjectPosition,net/minecraft/util
 ReportedException,net/minecraft/util
+ResourceLocation,net/minecraft/util
 ScreenShotHelper,net/minecraft/util
 Session,net/minecraft/util
 StatCollector,net/minecraft/util
 StringTranslate,net/minecraft/util
 StringUtils,net/minecraft/util
-ThreadDownloadResources,net/minecraft/util
 Timer,net/minecraft/util
 Tuple,net/minecraft/util
+Util,net/minecraft/util
+ValueObject,net/minecraft/util
 Vec3,net/minecraft/util
 Vec3Pool,net/minecraft/util
 WeightedRandom,net/minecraft/util
@@ -1100,7 +1328,6 @@ ChunkCoordIntPair,net/minecraft/world
 ChunkPosition,net/minecraft/world
 ColorizerFoliage,net/minecraft/world
 ColorizerGrass,net/minecraft/world
-ColorizerWater,net/minecraft/world
 EnumGameType,net/minecraft/world
 EnumSkyBlock,net/minecraft/world
 Explosion,net/minecraft/world
@@ -1256,6 +1483,7 @@ ComponentNetherBridgeThrone,net/minecraft/world/gen/structure
 ComponentScatteredFeature,net/minecraft/world/gen/structure
 ComponentScatteredFeatureDesertPyramid,net/minecraft/world/gen/structure
 ComponentScatteredFeatureJunglePyramid,net/minecraft/world/gen/structure
+ComponentScatteredFeaturePieces,net/minecraft/world/gen/structure
 ComponentScatteredFeaturePieces2,net/minecraft/world/gen/structure
 ComponentScatteredFeatureSwampHut,net/minecraft/world/gen/structure
 ComponentStronghold,net/minecraft/world/gen/structure
@@ -1293,6 +1521,8 @@ MapGenMineshaft,net/minecraft/world/gen/structure
 MapGenNetherBridge,net/minecraft/world/gen/structure
 MapGenStronghold,net/minecraft/world/gen/structure
 MapGenStructure,net/minecraft/world/gen/structure
+MapGenStructureData,net/minecraft/world/gen/structure
+MapGenStructureIO,net/minecraft/world/gen/structure
 MapGenVillage,net/minecraft/world/gen/structure
 StructureBoundingBox,net/minecraft/world/gen/structure
 StructureComponent,net/minecraft/world/gen/structure

conf/patches/Start.java

@@ -5,75 +5,110 @@ import java.lang.reflect.Field;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
+import java.util.Arrays;
+
+import joptsimple.ArgumentAcceptingOptionSpec;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.main.Main;
 
 public class Start
 {
-    public static void main(String[] args)
+    public static void main(String[] args) throws Exception
+    {
+        int userIndex = -1;
+        int passIndex = -1;
+        int sessIndex = -1;
+        int versIndex = -1;
+
+        for( int x = 0; x < args.length; x++)
+        {
+            if (args[x].equals("--username"))      userIndex = x + 1;
+            else if (args[x].equals("--password")) passIndex = x + 1;
+            else if (args[x].equals("--session"))  sessIndex = x + 1;
+            else if (args[x].equals("--version"))  versIndex = x + 1;
+        }
+
+        if (userIndex != 0-1 && passIndex != -1 && sessIndex == -1)
+        {
+            String[] session = getSession(args[userIndex], args[passIndex]);
+            if (session != null)
+            {
+                args[userIndex] = session[0];
+                args = concat(args, new String[]{"--session", session[1]});
+            }
+        }
+        
+        //Kill the password if its there so it isn't printed to the console.
+        if (passIndex != -1)
+        {
+            args[passIndex-1] = "no_password_for_joo";
+            args[passIndex] = "no_password_for_joo";
+        }
+
+        if (versIndex == -1)
+        {
+            args = concat(args, new String[]{ "--version", "fml_mcp" });
+        }
+
+        Main.main(args);
+    }
+    
+    private static String[] getSession(String username, String password) throws UnsupportedEncodingException
+    {
+        String parameters = "http://login.minecraft.net/?user=" + URLEncoder.encode(username, "UTF-8") +
+                "&password=" + URLEncoder.encode(password, "UTF-8") +
+                "&version=" + 13;
+        String result = openUrl(parameters);
+        
+        if (result == null)
+        {
+            System.out.println("Can't connect to minecraft.net");
+            return null;
+        }
+        
+        if (!result.contains(":"))
+        {
+            System.out.println("Login Failed: " + result);
+            return null;
+        }
+        String[] values = result.split(":");
+        return new String[]{ values[2].trim(), values[3].trim() };
+    }
+
+    private static String openUrl(String addr)
     {
         try
         {
-            Field f = Minecraft.class.getDeclaredField("field_71463_am");
-            Field.setAccessible(new Field[] { f }, true);
-            f.set(null, new File("."));
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-            return;
-        }
-        if (args.length != 2)
-        {
-            Minecraft.main(args);
-        }
-        else
-        {
-            try {
-                String parameters = "http://login.minecraft.net/?user=" + URLEncoder.encode(args[0], "UTF-8") + 
-                        "&password=" + URLEncoder.encode(args[1], "UTF-8") + 
-                        "&version=" + 13;
-                String result = openUrl(parameters);
-                
-                if (result == null) 
-                {
-                  System.out.println("Can't connect to minecraft.net");
-                  return;
-                }
-                
-                if (!result.contains(":")) 
-                {
-                  System.out.println("Login Failed: " + result);
-                  return;
-                }
-                //latestVersion, downloadTicket, userName, sessionId    
-                String[] values = result.split(":");    
-                Minecraft.main(new String[]{values[2].trim(), values[3].trim()});
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-    
-    private static String openUrl(String addr)
-    {
-        try {
             URL url = new URL(addr);
             java.io.InputStream is;
             is = url.openConnection().getInputStream();
-    
             java.io.BufferedReader reader = new java.io.BufferedReader(new java.io.InputStreamReader(is));
             String buf = "";
             String line = null;
-            while((line = reader.readLine() ) != null)
+
+            while ((line = reader.readLine()) != null)
             {
-               buf += "\n" + line;
+                buf += "\n" + line;
             }
+
             reader.close();
             return buf;
-        } catch (IOException e) {
+        }
+        catch (IOException e)
+        {
             e.printStackTrace();
         }
+
         return null;
     }
+    
+    private static <T> T[] concat(T[] first, T[] second)
+    {
+        T[] result = Arrays.copyOf(first, first.length + second.length);
+        System.arraycopy(second, 0, result, first.length, second.length);
+        return result;
+    }
 }

conf/patches/minecraft_ff.patch

@@ -1,95 +1,51 @@
-diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
---- minecraft\net\minecraft\client\Minecraft.java	Mon Dec 17 22:49:48 2012
-+++ minecraft_patched\net\minecraft\client\Minecraft.java	Mon Dec 17 22:51:37 2012
-@@ -546,9 +546,8 @@
-          return;
-       }
- 
--      while(true) {
-          try {
--            if(this.field_71425_J) {
-+            while(this.field_71425_J) {
-                if(this.field_71434_R && this.field_71433_S != null) {
-                   this.func_71377_b(this.field_71433_S);
-                   return;
-@@ -566,7 +565,6 @@
-                   this.func_71373_a(new GuiMemoryErrorScreen());
-                   System.gc();
-                }
--               continue;
-             }
-          } catch (MinecraftError var12) {
-             ;
-@@ -584,8 +582,6 @@
-             this.func_71405_e();
-          }
- 
--         return;
--      }
-    }
- 
-    private void func_71411_J() {
 diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java
---- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Mon Dec 17 22:49:49 2012
-+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Mon Dec 17 22:51:37 2012
+--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Tue Sep 17 13:58:48 2013
++++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Tue Sep 17 14:01:01 2013
 @@ -21,9 +21,14 @@
  
-    public String func_85085_a() {
+    public String func_85085_a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {
        StringBuilder var1 = new StringBuilder();
--      Field var2 = ClassLoader.class.getDeclaredField("classes");
--      var2.setAccessible(true);
++     ArrayList var3;
++     try {
+       Field var2 = ClassLoader.class.getDeclaredField("classes");
+       var2.setAccessible(true);
 -      ArrayList var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
-+      ArrayList var3;
-+      try {
-+	     Field var2 = ClassLoader.class.getDeclaredField("classes");
-+	     var2.setAccessible(true);
-+	     var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
-+      } catch(Exception ex) {
-+    	 return "";
-+      }
++      var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
++     } catch(Exception ex) {
++      return "";
++     }
        boolean var4 = true;
        boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
        HashMap var6 = new HashMap();
-diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
---- minecraft\net\minecraft\src\CodecMus.java	Mon Dec 17 22:49:49 2012
-+++ minecraft_patched\net\minecraft\src\CodecMus.java	Mon Dec 17 22:51:37 2012
-@@ -1,5 +1,6 @@
- package net.minecraft.src;
+@@ -98,6 +103,10 @@
  
-+import java.io.IOException;
- import java.io.InputStream;
- import net.minecraft.src.MusInputStream;
- import paulscode.sound.codecs.CodecJOrbis;
-@@ -7,6 +8,10 @@
- public class CodecMus extends CodecJOrbis {
- 
-    protected InputStream openInputStream() {
--      return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
-+      try {
-+         return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
-+      } catch (IOException e) {
-+         return null;
-+      }
+    // $FF: synthetic method
+    public Object call() {
++     try {
+       return this.func_85085_a();
++     } catch(Exception ex) {
++      return null;
++     }
     }
  }
 diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
---- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Mon Dec 17 22:49:49 2012
-+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Mon Dec 17 22:51:37 2012
+--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Sep 17 13:58:48 2013
++++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Sep 17 14:01:01 2013
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
  
-+   public ComponentStrongholdRightTurn(int p_i3843_1_, Random p_i3843_2_, StructureBoundingBox p_i3843_3_, int p_i3843_4_) {
-+      super(p_i3843_1_, p_i3843_2_, p_i3843_3_, p_i3843_4_);
++   public ComponentStrongholdRightTurn(int p_i2074_1_, Random p_i2074_2_, StructureBoundingBox p_i2074_3_, int p_i2074_4_) {
++      super(p_i2074_1_, p_i2074_2_, p_i2074_3_, p_i2074_4_);
 +   }
 +
     public void func_74861_a(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_) {
        if(this.field_74885_f != 2 && this.field_74885_f != 3) {
           this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java
---- minecraft\net\minecraft\src\DedicatedServer.java	Mon Dec 17 22:49:49 2012
-+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Mon Dec 17 22:51:37 2012
-@@ -202,7 +202,7 @@
+--- minecraft\net\minecraft\src\DedicatedServer.java	Tue Sep 17 13:58:48 2013
++++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Tue Sep 17 14:01:01 2013
+@@ -208,7 +208,7 @@
        System.exit(0);
     }
  
@@ -98,28 +54,56 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\
        super.func_71190_q();
        this.func_71333_ah();
     }
-diff -r -U 3 minecraft\net\minecraft\src\EntityMooshroom.java minecraft_patched\net\minecraft\src\EntityMooshroom.java
---- minecraft\net\minecraft\src\EntityMooshroom.java	Mon Dec 17 22:49:50 2012
-+++ minecraft_patched\net\minecraft\src\EntityMooshroom.java	Mon Dec 17 22:51:37 2012
-@@ -56,10 +56,10 @@
-       return new EntityMooshroom(this.field_70170_p);
+diff -r -U 3 minecraft\net\minecraft\src\EnumChatFormatting.java minecraft_patched\net\minecraft\src\EnumChatFormatting.java
+--- minecraft\net\minecraft\src\EnumChatFormatting.java	Tue Sep 17 13:58:49 2013
++++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Tue Sep 17 14:01:01 2013
+@@ -38,7 +38,7 @@
+    private final String field_96304_B;
+ 
+    private EnumChatFormatting(char p_i1336_3_) {
+-      this(p_i1336_1_, p_i1336_2_, p_i1336_3_, false);
++      this(p_i1336_3_, false);
     }
  
--   // $FF: synthetic method
--   public EntityCow func_70879_a(EntityAgeable p_70879_1_) {
--      return this.func_70879_a(p_70879_1_);
--   }
-+//   // $FF: synthetic method
-+//   public EntityCow func_70879_a(EntityAgeable p_70879_1_) {
-+//      return this.func_70879_a(p_70879_1_);
-+//   }
+    private EnumChatFormatting(char p_i1337_3_, boolean p_i1337_4_) {
+diff -r -U 3 minecraft\net\minecraft\src\FileResourcePack.java minecraft_patched\net\minecraft\src\FileResourcePack.java
+--- minecraft\net\minecraft\src\FileResourcePack.java	Tue Sep 17 13:58:49 2013
++++ minecraft_patched\net\minecraft\src\FileResourcePack.java	Tue Sep 17 14:01:01 2013
+@@ -84,12 +84,18 @@
  
-    // $FF: synthetic method
-    public EntityAgeable func_90011_a(EntityAgeable p_90011_1_) {
+    protected void finalize() {
+       this.close();
++     try {
+       super.finalize();
++     } catch(Throwable t) {
++     }
+    }
+ 
+    public void close() {
+       if(this.field_110600_d != null) {
++        try {
+          this.field_110600_d.close();
++        } catch(Exception ex) {
++        }
+          this.field_110600_d = null;
+       }
+ 
+diff -r -U 3 minecraft\net\minecraft\src\FolderResourcePack.java minecraft_patched\net\minecraft\src\FolderResourcePack.java
+--- minecraft\net\minecraft\src\FolderResourcePack.java	Tue Sep 17 13:58:49 2013
++++ minecraft_patched\net\minecraft\src\FolderResourcePack.java	Tue Sep 17 14:01:01 2013
+@@ -29,7 +29,7 @@
+       HashSet var1 = Sets.newHashSet();
+       File var2 = new File(this.field_110597_b, "assets/");
+       if(var2.isDirectory()) {
+-         File[] var3 = var2.listFiles(DirectoryFileFilter.DIRECTORY);
++         File[] var3 = var2.listFiles((java.io.FileFilter)DirectoryFileFilter.DIRECTORY);
+          int var4 = var3.length;
+ 
+          for(int var5 = 0; var5 < var4; ++var5) {
 diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
---- minecraft\net\minecraft\src\FontRenderer.java	Mon Dec 17 22:49:50 2012
-+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Mon Dec 17 22:51:37 2012
-@@ -611,8 +611,6 @@
+--- minecraft\net\minecraft\src\FontRenderer.java	Tue Sep 17 13:58:49 2013
++++ minecraft_patched\net\minecraft\src\FontRenderer.java	Tue Sep 17 14:01:01 2013
+@@ -630,8 +630,6 @@
           case 10:
              --var5;
              break;
@@ -128,19 +112,19 @@ diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net
           case 167:
              if(var5 < var3 - 1) {
                 ++var5;
-@@ -626,6 +624,8 @@
+@@ -645,6 +643,8 @@
                 }
              }
              break;
 +         case 32:
-+             var6 = var5;
++            var6 = var5;
           default:
              var4 += this.func_78263_a(var8);
              if(var7) {
 diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java
---- minecraft\net\minecraft\src\IntegratedServer.java	Mon Dec 17 22:49:50 2012
-+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Mon Dec 17 22:51:37 2012
-@@ -98,7 +98,7 @@
+--- minecraft\net\minecraft\src\IntegratedServer.java	Tue Sep 17 13:58:50 2013
++++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Tue Sep 17 14:01:01 2013
+@@ -103,7 +103,7 @@
        return true;
     }
  
@@ -149,10 +133,135 @@ diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched
        boolean var1 = this.field_71348_o;
        this.field_71348_o = this.field_71347_n.func_71752_f();
        if(!var1 && this.field_71348_o) {
+diff -r -U 3 minecraft\net\minecraft\src\Minecraft.java minecraft_patched\net\minecraft\src\Minecraft.java
+--- minecraft\net\minecraft\src\Minecraft.java	Tue Sep 17 13:58:50 2013
++++ minecraft_patched\net\minecraft\src\Minecraft.java	Tue Sep 17 14:01:01 2013
+@@ -604,8 +604,8 @@
+          return;
+       }
+ 
+-      while(true) {
+-         try {
++      try {
++         while(this.field_71425_J) {
+             if(this.field_71425_J) {
+                if(this.field_71434_R && this.field_71433_S != null) {
+                   this.func_71377_b(this.field_71433_S);
+@@ -626,23 +626,20 @@
+                }
+                continue;
+             }
+-         } catch (MinecraftError var12) {
+-            ;
+-         } catch (ReportedException var13) {
+-            this.func_71396_d(var13.func_71575_a());
+-            this.func_71398_f();
+-            var13.printStackTrace();
+-            this.func_71377_b(var13.func_71575_a());
+-         } catch (Throwable var14) {
+-            var2 = this.func_71396_d(new CrashReport("Unexpected error", var14));
+-            this.func_71398_f();
+-            var14.printStackTrace();
+-            this.func_71377_b(var2);
+-         } finally {
+-            this.func_71405_e();
+          }
+-
+-         return;
++      } catch (MinecraftError var12) {
++      } catch (ReportedException var13) {
++         this.func_71396_d(var13.func_71575_a());
++         this.func_71398_f();
++         var13.printStackTrace();
++         this.func_71377_b(var13.func_71575_a());
++      } catch (Throwable var14) {
++         var2 = this.func_71396_d(new CrashReport("Unexpected error", var14));
++         this.func_71398_f();
++         var14.printStackTrace();
++         this.func_71377_b(var2);
++      } finally {
++         this.func_71405_e();
+       }
+    }
+ 
+diff -r -U 3 minecraft\net\minecraft\src\RConThreadClient.java minecraft_patched\net\minecraft\src\RConThreadClient.java
+--- minecraft\net\minecraft\src\RConThreadClient.java	Tue Sep 17 13:58:51 2013
++++ minecraft_patched\net\minecraft\src\RConThreadClient.java	Tue Sep 17 14:01:01 2013
+@@ -32,8 +32,8 @@
+    }
+ 
+    public void run() {
+-      while(true) {
+-         try {
++      try {
++         while(true) {
+             if(!this.field_72619_a) {
+                break;
+             }
+@@ -84,20 +84,14 @@
+                   continue;
+                }
+             }
+-         } catch (SocketTimeoutException var17) {
+-            break;
+-         } catch (IOException var18) {
+-            break;
+-         } catch (Exception var19) {
+-            System.out.println(var19);
+-            break;
+-         } finally {
+-            this.func_72653_g();
+          }
+-
+-         return;
++      } catch (SocketTimeoutException var17) {
++      } catch (IOException var18) {
++      } catch (Exception var19) {
++         System.out.println(var19);
++      } finally {
++         this.func_72653_g();
+       }
+-
+    }
+ 
+    private void func_72654_a(int p_72654_1_, int p_72654_2_, String p_72654_3_) throws IOException {
+diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net\minecraft\src\RenderBlocks.java
+--- minecraft\net\minecraft\src\RenderBlocks.java	Tue Sep 17 13:58:51 2013
++++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Tue Sep 17 14:01:01 2013
+@@ -1960,16 +1960,16 @@
+       float var25 = (float)(p_78589_2_ + 1);
+       float var26 = (float)(p_78589_4_ + 0);
+       float var27 = (float)(p_78589_4_ + 1);
+-      boolean var28 = false;
++      int var28 = 0;
+       if((var20 || var21) && !var22 && !var23) {
+-         var28 = true;
++         var28 = 1;
+       }
+ 
+       if((var22 || var23) && !var21 && !var20) {
+-         var28 = true;
++         var28 = 2;
+       }
+ 
+-      if(!var28) {
++      if(var28 == 0) {
+          int var29 = 0;
+          int var30 = 0;
+          int var31 = 16;
+@@ -2016,7 +2016,7 @@
+          var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var9.func_94214_a((double)var31), (double)var9.func_94207_b((double)var30));
+          var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var9.func_94214_a((double)var29), (double)var9.func_94207_b((double)var30));
+          var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var27, (double)var9.func_94214_a((double)var29), (double)var9.func_94207_b((double)var32));
+-      } else if(var28) {
++      } else if(var28 == 1) {
+          var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var27, (double)var8.func_94212_f(), (double)var8.func_94210_h());
+          var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94212_f(), (double)var8.func_94206_g());
+          var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94209_e(), (double)var8.func_94206_g());
 diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
---- minecraft\net\minecraft\src\RenderGlobal.java	Mon Dec 17 22:49:52 2012
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Mon Dec 17 22:51:37 2012
-@@ -1447,7 +1447,7 @@
+--- minecraft\net\minecraft\src\RenderGlobal.java	Tue Sep 17 13:58:51 2013
++++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Tue Sep 17 14:01:01 2013
+@@ -1445,7 +1445,7 @@
           double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
           double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
           double var19 = this.field_72777_q.field_71451_h.field_70161_v - p_72726_6_;
@@ -161,11 +270,26 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net
           if(p_72726_1_.equals("hugeexplosion")) {
              this.field_72777_q.field_71452_i.func_78873_a(var21 = new EntityHugeExplodeFX(this.field_72769_h, p_72726_2_, p_72726_4_, p_72726_6_, p_72726_8_, p_72726_10_, p_72726_12_));
           } else if(p_72726_1_.equals("largeexplode")) {
+diff -r -U 3 minecraft\net\minecraft\src\SoundPoolURLConnection.java minecraft_patched\net\minecraft\src\SoundPoolURLConnection.java
+--- minecraft\net\minecraft\src\SoundPoolURLConnection.java	Tue Sep 17 13:58:51 2013
++++ minecraft_patched\net\minecraft\src\SoundPoolURLConnection.java	Tue Sep 17 14:01:01 2013
+@@ -22,7 +22,11 @@
+    public void connect() {}
+ 
+    public InputStream getInputStream() {
++     try {
+       return SoundPool.func_110655_a(this.field_110660_a).func_110536_a(this.field_110659_b).func_110527_b();
++     } catch(Exception ex) {
++      return null;
++     }
+    }
+ 
+    // $FF: synthetic method
 diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
---- minecraft\net\minecraft\src\TcpMasterThread.java	Mon Dec 17 22:49:52 2012
-+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Mon Dec 17 22:51:37 2012
+--- minecraft\net\minecraft\src\TcpMasterThread.java	Tue Sep 17 13:58:51 2013
++++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Tue Sep 17 14:01:01 2013
 @@ -11,6 +11,7 @@
-       this.field_74504_a = p_i3285_1_;
+       this.field_74504_a = p_i1395_1_;
     }
  
 +   @SuppressWarnings("deprecation")
@@ -173,15 +297,13 @@ diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\
        try {
           Thread.sleep(5000L);
 diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
---- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Mon Dec 17 22:49:52 2012
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Mon Dec 17 22:51:37 2012
-@@ -20,7 +20,8 @@
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Tue Sep 17 13:58:52 2013
++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Tue Sep 17 14:01:01 2013
+@@ -20,6 +20,7 @@
     }
  
     public void run() {
--      this.func_75736_b();
-+      while(true)
-+         this.func_75736_b();
++     while(true)
+       this.func_75736_b();
     }
  
-    private void func_75736_b() {

conf/patches/minecraft_server_ff.patch

@@ -1,42 +1,52 @@
 diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java
---- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Mon Dec 17 22:50:59 2012
-+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Mon Dec 17 22:52:18 2012
+--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Tue Sep 17 14:00:13 2013
++++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Tue Sep 17 14:01:07 2013
 @@ -21,9 +21,14 @@
  
-    public String func_85085_a() {
+    public String func_85085_a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {
        StringBuilder var1 = new StringBuilder();
--      Field var2 = ClassLoader.class.getDeclaredField("classes");
--      var2.setAccessible(true);
++     ArrayList var3;
++     try {
+       Field var2 = ClassLoader.class.getDeclaredField("classes");
+       var2.setAccessible(true);
 -      ArrayList var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
-+      ArrayList var3;
-+      try {
-+         Field var2 = ClassLoader.class.getDeclaredField("classes");
-+         var2.setAccessible(true);
-+         var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
-+      } catch(Exception ex) {
-+    	 return "";
-+      }
++      var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
++     } catch(Exception ex) {
++      return "";
++     }
        boolean var4 = true;
        boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
        HashMap var6 = new HashMap();
+@@ -98,6 +103,10 @@
+ 
+    // $FF: synthetic method
+    public Object call() {
+-      return this.func_85085_a();
++     try {
++       return this.func_85085_a();
++     } catch(Exception ex) {
++       return null;
++     }
+    }
+ }
 diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
---- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Mon Dec 17 22:50:59 2012
-+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Mon Dec 17 22:52:18 2012
+--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Sep 17 14:00:14 2013
++++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Sep 17 14:01:07 2013
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
  
-+   public ComponentStrongholdRightTurn(int p_i3843_1_, Random p_i3843_2_, StructureBoundingBox p_i3843_3_, int p_i3843_4_) {
-+      super(p_i3843_1_, p_i3843_2_, p_i3843_3_, p_i3843_4_);
++   public ComponentStrongholdRightTurn(int p_i2074_1_, Random p_i2074_2_, StructureBoundingBox p_i2074_3_, int p_i2074_4_) {
++      super(p_i2074_1_, p_i2074_2_, p_i2074_3_, p_i2074_4_);
 +   }
 +
     public void func_74861_a(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_) {
        if(this.field_74885_f != 2 && this.field_74885_f != 3) {
           this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java
---- minecraft_server\net\minecraft\src\DedicatedServer.java	Mon Dec 17 22:50:59 2012
-+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Mon Dec 17 22:52:18 2012
-@@ -203,7 +203,7 @@
+--- minecraft_server\net\minecraft\src\DedicatedServer.java	Tue Sep 17 14:00:14 2013
++++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Tue Sep 17 14:01:07 2013
+@@ -209,7 +209,7 @@
        System.exit(0);
     }
  
@@ -45,29 +55,87 @@ diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_s
        super.func_71190_q();
        this.func_71333_ah();
     }
-diff -r -U 3 minecraft_server\net\minecraft\src\EntityMooshroom.java minecraft_server_patched\net\minecraft\src\EntityMooshroom.java
---- minecraft_server\net\minecraft\src\EntityMooshroom.java	Mon Dec 17 22:51:00 2012
-+++ minecraft_server_patched\net\minecraft\src\EntityMooshroom.java	Mon Dec 17 22:52:18 2012
-@@ -56,10 +56,10 @@
-       return new EntityMooshroom(this.field_70170_p);
+diff -r -U 3 minecraft_server\net\minecraft\src\EnumChatFormatting.java minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java
+--- minecraft_server\net\minecraft\src\EnumChatFormatting.java	Tue Sep 17 14:00:14 2013
++++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java	Tue Sep 17 14:01:07 2013
+@@ -38,7 +38,7 @@
+    private final String field_96304_B;
+ 
+    private EnumChatFormatting(char p_i1336_3_) {
+-      this(p_i1336_1_, p_i1336_2_, p_i1336_3_, false);
++      this(p_i1336_3_, false);
     }
  
--   // $FF: synthetic method
--   public EntityCow func_70879_a(EntityAgeable p_70879_1_) {
--      return this.func_70879_a(p_70879_1_);
--   }
-+//   // $FF: synthetic method
-+//   public EntityCow func_70879_a(EntityAgeable p_70879_1_) {
-+//      return this.func_70879_a(p_70879_1_);
-+//   }
+    private EnumChatFormatting(char p_i1337_3_, boolean p_i1337_4_) {
+diff -r -U 3 minecraft_server\net\minecraft\src\MemoryConnection.java minecraft_server_patched\net\minecraft\src\MemoryConnection.java
+--- minecraft_server\net\minecraft\src\MemoryConnection.java	Tue Sep 17 14:00:15 2013
++++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java	Tue Sep 17 14:01:07 2013
+@@ -11,13 +11,18 @@
+ public class MemoryConnection implements INetworkManager {
  
-    // $FF: synthetic method
-    public EntityAgeable func_90011_a(EntityAgeable p_90011_1_) {
+    private static final SocketAddress field_74444_a = new InetSocketAddress("127.0.0.1", 0);
+-   private final List field_74442_b;
++   private final List field_74442_b  = java.util.Collections.synchronizedList(new java.util.ArrayList());
+    private final ILogAgent field_98214_c;
+    private MemoryConnection field_74443_c;
+    private NetHandler field_74440_d;
+    private boolean field_74441_e;
+    private String field_74438_f;
+    private Object[] field_74439_g;
++
++   public MemoryConnection(ILogAgent p_i1392_1_, NetHandler p_i1392_2_) {
++      this.field_74440_d = p_i1392_2_;
++      this.field_98214_c = p_i1392_1_;
++   }
+ 
+    public void func_74425_a(NetHandler p_74425_1_) {
+       this.field_74440_d = p_74425_1_;
+diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_server_patched\net\minecraft\src\RConThreadClient.java
+--- minecraft_server\net\minecraft\src\RConThreadClient.java	Tue Sep 17 14:00:15 2013
++++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java	Tue Sep 17 14:01:07 2013
+@@ -32,8 +32,8 @@
+    }
+ 
+    public void run() {
+-      while(true) {
+-         try {
++      try {
++         while(true) {
+             if(!this.field_72619_a) {
+                break;
+             }
+@@ -84,20 +84,14 @@
+                   continue;
+                }
+             }
+-         } catch (SocketTimeoutException var17) {
+-            break;
+-         } catch (IOException var18) {
+-            break;
+-         } catch (Exception var19) {
+-            System.out.println(var19);
+-            break;
+-         } finally {
+-            this.func_72653_g();
+          }
+-
+-         return;
++      } catch (SocketTimeoutException var17) {
++      } catch (IOException var18) {
++      } catch (Exception var19) {
++         System.out.println(var19);
++      } finally {
++         this.func_72653_g();
+       }
+-
+    }
+ 
+    private void func_72654_a(int p_72654_1_, int p_72654_2_, String p_72654_3_) throws IOException {
 diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_server_patched\net\minecraft\src\TcpMasterThread.java
---- minecraft_server\net\minecraft\src\TcpMasterThread.java	Mon Dec 17 22:51:01 2012
-+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Mon Dec 17 22:52:18 2012
+--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Tue Sep 17 14:00:16 2013
++++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Tue Sep 17 14:01:07 2013
 @@ -11,6 +11,7 @@
-       this.field_74504_a = p_i3285_1_;
+       this.field_74504_a = p_i1395_1_;
     }
  
 +   @SuppressWarnings("deprecation")
@@ -75,15 +143,13 @@ diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_s
        try {
           Thread.sleep(5000L);
 diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
---- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Mon Dec 17 22:51:01 2012
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Mon Dec 17 22:52:18 2012
-@@ -20,7 +20,8 @@
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Tue Sep 17 14:00:16 2013
++++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Tue Sep 17 14:01:07 2013
+@@ -20,6 +20,7 @@
     }
  
     public void run() {
--      this.func_75736_b();
-+      while(true)
-+         this.func_75736_b();
++     while(true)
+       this.func_75736_b();
     }
  
-    private void func_75736_b() {

conf/version.cfg

@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 7.25
-ClientVersion = 1.4.6
-ServerVersion = 1.4.6
+MCPVersion = 8.11
+ClientVersion = 1.6.4
+ServerVersion = 1.6.4