Merge branch 'fg2'

2015-08-20 12:27:20 -07:00 · 2015-08-20 12:27:20 -07:00 · b211aca5ce
commit b211aca5ce
parent b45fd787f3 58ab3de7c1
474 changed files with 2011 additions and 54094 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,13 +12,14 @@
 /.gradle

 #occupational hazards
-/eclipse/
+/projects/
 /repo/
 /buildSrc

 #Patch rejects
 *.rej
 /patches-/
+
 # FML changelog
 changelog.txt
 /patches_old/
--- a/fml/CREDITS-fml.txt
+++ b/fml/CREDITS-fml.txt
--- a/fml/LICENSE-fml.txt
+++ b/fml/LICENSE-fml.txt
--- a/build.gradle
+++ b/build.gradle
@ -1,11 +1,6 @@
 buildscript {
    repositories {
-        maven {
-            name = "central_mirrior"
-            url = "http://uk.maven.org/maven2"
-        }
        mavenCentral()
-        mavenLocal()
        maven {
            name = "forge"
            url = "http://files.minecraftforge.net/maven"
@ -16,71 +11,218 @@ buildscript {
        }
    }
    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT'
    }
 }

-configurations {
-    deployJars
-}
-
-import static net.minecraftforge.gradle.dev.ForgeDevPlugin.*
-
-apply plugin: 'maven'
-apply plugin: 'forgedev'
-
-repositories {
-    maven {
-        name = "central_mirrior"
-        url = "http://uk.maven.org/maven2"
-    }
-    mavenLocal()
-    flatDir {
-        name "fileRepo"
-        dirs "repo"
-    }
-}
+apply plugin: "maven"
+apply plugin: "net.minecraftforge.gradle.patcher"
+apply plugin: "net.minecraftforge.gradle.launch4j"

 minecraft {
-    version = '1.8'
-    mcpVersion = '9.10'
-    mappings = 'snapshot_nodoc_20141130'
-    fmlDir = projectDir.getAbsolutePath() + "/fml";
-    mainClass = 'net.minecraftforge.fml.relauncher.ServerLaunchWrapper'
-    tweakClass = 'net.minecraftforge.fml.common.launcher.FMLTweaker'
+    version = "1.8"
+    //mappings = 'stable_16'
+    mappings = "snapshot_nodoc_20141130"
+    workspaceDir = "projects"
+    versionJson = "jsons/1.8-dev.json"
+    buildUserdev = true
+    buildInstaller = true
    installerVersion = "1.4"
+
+    def common = {
+        patchPrefixOriginal "../src-base/minecraft"
+        patchPrefixChanged "../src-work/minecraft"
+        mainClassClient "net.minecraft.launchwrapper.Launch"
+        tweakClassClient "net.minecraftforge.fml.common.launcher.FMLTweaker"
+        mainClassServer "net.minecraft.launchwrapper.Launch"
+        tweakClassServer "net.minecraftforge.fml.common.launcher.FMLServerTweaker"
+    }
+
+    projects {
+//        fml {
+//            rootDir 'fml'
+//            patchDir "fml/patches/minecraft"
+//            patchAfter "clean"
+//            genPatchesFrom "clean"
+//
+//            with common
+//        }
+        forge {
+            rootDir "."
+            patchDir "patches/minecraft"
+            patchAfter "clean"
+            genPatchesFrom "clean"
+
+            with common
+        }
+    }
 }

 group = 'net.minecraftforge'
-version = getVersionFromJava(getProject(), 'src/main/java/net/minecraftforge/common/ForgeVersion.java')
+version = getVersionFromJava(file("src/main/java/net/minecraftforge/common/ForgeVersion.java"))

-jenkins {
-    job = 'minecraftforge'
+extractForgeSources { exclude "**/SideOnly.java", "**/Side.java" }
+
+genGradleProjects { addTestCompileDep "junit:junit:4.12" }
+
+processJson {
+    releaseJson = "jsons/1.8-rel.json"
+    addReplacements([
+        "@minecraft_version@": project.minecraft.version,
+        "@version@": project.version,
+        "@project@": "forge",
+        "@artifact@": "net.minecraftforge:forge:${project.version}",
+        "@universal_jar@": { outputJar.archiveName },
+        "@timestamp@": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+    ])
 }

-// crowdin stuff
-if (project.hasProperty("crowdinKey"))
-    tasks.getLocalizations.apiKey = project.crowdinKey
+task changelog(type: JenkinsChangelog) {

+    // skip if there is no forge jenkins pass
+    onlyIf {
+        project.hasProperty('forgeJenkinsPass')
+        project.file("build/distributions/${project.name}-${project.version}-changelog.txt").text = ""
+    }
+
+    outputs.upToDateWhen { false } // never up to date
+    serverRoot = "http://ci.jenkins.minecraftforge.net/"
+    jobName = "minecraftforge"
+    targetBuild = System.env['BUILD_NUMBER'] ?: 0;
+    authName = "console_script"
+    authPassword = project.hasProperty('forgeJenkinsPass') ? project.getProperty('forgeJenkinsPass') : "";
+    output = "build/distributions/${project.name}-${project.version}-changelog.txt"
+}
+
+task crowdin(type: CrowdinDownload) {
+    output = "build/crowdin.zip"
+    projectId = 'minecraft-forge'
+    extract = false // we wanna keep it as a zip. not extract it to a folder named "crowdin.zip"
+    
+    // task auomatically skips if this is null
+    if (project.hasProperty('crowdinKey'))
+        apiKey = project.crowdinKey
+}
+
+def extraTxts = [
+    changelog, // yeah we can do thi, because gradle and groovy are awesome
+    "LICENSE-fml.txt",
+    "CREDITS-fml.txt",
+    "MinecraftForge-Credits.txt",
+    "MinecraftForge-License.txt",
+    "Paulscode SoundSystem CodecIBXM License.txt",
+    "Paulscode IBXM Library License.txt"
+]
+
+outputJar {
+    classifier = 'universal'
+    from extraTxts
+
+    // add crowdin locales
+    from { crowdin.getDidWork() ? zipTree(crowdin) : null}
+    dependsOn 'crowdin'
+
+    manifest.attributes([
+        "Main-Class": "net.minecraftforge.fml.relauncher.ServerLaunchWrapper",
+        "TweakClass": "net.minecraftforge.fml.common.launcher.FMLTweaker",
+        "Class-Path": getServerClasspath(file("jsons/1.8-rel.json"))
+    ])
+}
+
+installer {
+    classifier = 'installer'
+    from extraTxts
+    from "src/main/resources/forge_logo.png"
+    rename "forge_logo\\.png", "big_logo.png"
+}
+
+task signUniversal(type: SignJar, dependsOn: 'outputJar') {
+    onlyIf {
+        project.hasProperty('jarsigner')
+    }
+
+    def jarsigner = [:];
+
+    if (project.hasProperty('jarsigner'))
+        jarsigner = project.jarsigner;
+
+    alias = 'forge'
+    exclude "paulscode/**"
+    storePass = jarsigner.storepass
+    keyPass = jarsigner.keypass
+    keyStore = jarsigner.keystore
+    inputFile = outputJar.archivePath
+    outputFile = outputJar.archivePath
+}
+uploadArchives.dependsOn signUniversal
+build.dependsOn signUniversal
+
+// MDK package
+
+import org.apache.tools.ant.filters.ReplaceTokens
+task makeMdk(type: Zip) {
+    baseName = project.name
+    classifier = "mdk"
+    version = project.version
+    destinationDir = file('build/distributions')
+
+    from 'gradlew'
+    from 'gradlew.bat'
+    into ('gradle') {
+    	from 'gradle'
+    }
+    from changelog.output
+    from ('mdk') {
+	    filter(ReplaceTokens, tokens: [
+		VERSION: project.version,
+		MAPPINGS: minecraft.mappings.replace('nodoc_', '')
+	    ])
+	    rename 'gitignore\\.txt', '.gitignore'
+	    from 'MinecraftForge-Credits.txt'
+	    from 'MinecraftForge-License.txt'
+	    from 'Paulscode IBXM Library License.txt'
+	    from 'Paulscode SoundSystem CodecIBXM License.txt'
+	    from 'LICENSE-fml.txt'
+    }
+}
+tasks.build.dependsOn makeMdk
+
+// launch4j

 launch4j {
+    jar = installer.archivePath.canonicalPath
+    outfile = file("build/distributions/${project.name}-${project.version}-installer-win.exe").canonicalPath
+    icon = file('icon.ico').canonicalPath
+    manifest = file('l4jManifest.xml').canonicalPath
    jreMinVersion = '1.6.0'
+    initialHeapPercent = 5;
+    maxHeapPercent = 100;
+}
+tasks.generateXmlConfig.dependsOn installer
+tasks.build.dependsOn 'launch4j'
+
+// MAVEN
+
+artifacts {
+    archives changelog.output
+    archives file("build/distributions/${project.name}-${project.version}-installer-win.exe")
+    archives makeMdk
 }

 uploadArchives {
-    repositories {
-        add getProject().repositories.mavenLocal()
-    }
    repositories.mavenDeployer {
-        configuration = configurations.deployJars

-        if (project.hasProperty("filesmaven")) {
-            logger.info('Publishing to files server')
-            repository(url: project.filesmaven.url) {
-                authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key)
+        dependsOn 'build'
+
+        if (project.hasProperty('forgeMavenPass'))
+        {
+            repository(url: "http://files.minecraftforge.net/maven/manage/upload") {
+                authentication(userName: "forge", password: project.getProperty('forgeMavenPass')) // the elvis operator. look it up.
            }
-        } else {
-            logger.info('Publishing to repo folder')
+        }
+        else
+        {
+            // local repo folder. Might wanna juset use  gradle install   if you wanans end it to maven-local
            repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
        }

@ -88,8 +230,7 @@ uploadArchives {
            groupId = project.group
            version = project.version
            artifactId = project.archivesBaseName
-        }
-        pom.project {
+            project {
                name project.archivesBaseName
                packaging 'jar'
                description 'Minecraft Forge API'
@ -133,4 +274,81 @@ uploadArchives {
                }
            }
        }
+    }
 }
+
+// HELPER METHODS
+
+import groovy.json.JsonSlurper;
+
+String getServerClasspath(File file)
+{
+    def node = new JsonSlurper().parse(file);
+    def out = new StringBuilder()
+    node.versionInfo.libraries.each { lib ->
+        if (lib.serverreq)
+        {
+            // group : artifact : version
+            def split = lib.name.split(':')
+            def group = split[0].replace('.', '/')
+            def artifact = split[1]
+            def version = split[2]
+            out += "libraries/$group/$artifact/$version/$artifact-${version}.jar "
+        }
+    }
+    out += "minecraft_server.${minecraft.version}.jar"
+
+    return out.toString();
+}
+
+String getVersionFromJava(File file)
+{
+    String major = "0";
+    String minor = "0";
+    String revision = "0";
+    String build = "0";
+
+    String prefix = "public static final int";
+    file.eachLine{ String s ->
+        s = s.trim();
+        if (s.startsWith(prefix))
+        {
+            s = s.substring(prefix.length(), s.length() - 1);
+            s = s.replace('=', ' ').replace("Version", "").replaceAll(" +", " ").trim();
+            String[] pts = s.split(" ");
+
+            if (pts[0].equals("major")) major = pts[pts.length - 1];
+            else if (pts[0] == "minor") minor = pts[pts.length - 1];
+            else if (pts[0] == "revision") revision = pts[pts.length - 1];
+        }
+    }
+
+    if (System.getenv().containsKey("BUILD_NUMBER"))
+    {
+        build = System.getenv("BUILD_NUMBER");
+    }
+
+    String branch = null;
+    if (!System.getenv().containsKey("GIT_BRANCH"))
+    {
+        // TODO: use grgit
+        branch = "git rev-parse --abbrev-ref HEAD".execute().text.trim()
+    }
+    else
+    {
+        branch = System.getenv("GIT_BRANCH");
+        branch = branch.substring(branch.lastIndexOf('/') + 1);
+    }
+
+    def out = "${minecraft.version.replace('-', '_')}-$major.$minor.$revision.$build"
+
+    if (branch && branch != 'master' && branch != 'HEAD')
+        out += "-$branch"
+
+    return out;
+}
+
+// re-add old tasks for jenkins compat
+// should be remvoed, and the jenkisn fixed when no longer building with FG 1.2
+task setupForge { dependsOn 'setup' }
+task buildPackages { dependsOn 'build' }
--- a/eclipse-workspace-dev.zip
+++ b/eclipse-workspace-dev.zip
--- a/fml/.gitattributes
+++ b/fml/.gitattributes
@ -1,14 +0,0 @@
-* 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
-*.py text eol=lf
--- a/fml/.gitignore
+++ b/fml/.gitignore
@ -1,21 +0,0 @@
-#eclipse
-/bin
-/.settings
-/.classpath
-
-#idea
-/.idea
-*.iml
-
-#gradle
-/build
-/buildSrc
-/.gradle
-
-#occupational hazards
-/eclipse/
-/repo/
-
-
-#Patch reject
-*.rej
--- a/fml/README.txt
+++ b/fml/README.txt
@ -1,94 +0,0 @@
-This is Forge Mod Loader, or FML for short, by cpw.
-
-More information can be found at https://github.com/MinecraftForge/FML/wiki
-
-It is a clean reimplementation of a mod loading system for client and server.
-
-It can be installed on its own, or as part of Minecraft Forge.
-
----------------------
-About Forge Mod Loader
----------------------
-
-Environments and compatibility
-==============================
-FML covers two main environments: client and server. All environments share
-the main mod loading code base, with additional varying hooks based on the 
-specific environment.
-
-There are some very visible changes to the client when FML is installed.
-
-There are some bukkit compatibility hooks available, consult MCPC+, now known as Cauldron
-for more information.
-
-Minecraft Forge in all cases bundles FML as it's modloading technology of choice
-because FML is open source, freely distributable, and can be easily updated by
-contributors through github.
-
-Notable integrations
-====================
-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).
-
-Mod information
-===============
-FML exposes the mod information through a mod list visible on the main screen as
-well as some small branding enhancements. For full data mods need to provide an
-information file. This file is a standard format so hopefully tools providing
-launch capabilities can also leverage this content.
-
-------------------------------
-Binary installation information
-------------------------------
-If you have downloaded a binary zip file you can install it as follows (client
-or server):
-
-Installation
-============
-To install on a server, simply execute the FML or Forge jar file, with a copy of
-minecraft_server-@MC_VERSION@.jar placed in the same directory. FML will launch
-it's patched copy.
-
-To install on a client, run the installer by executing java -jar <installer>.jar.
-It will identify the location of you minecraft installation (this can be customized)
-and create a new profile "FML" there.
-
-Forge Installation
-==================
-This code also ships as a part of Minecraft Forge. You do not need to install it
-separately from your Minecraft Forge installation. Minecraft Forge contains the
-exact same code as this. You should not install FML if you are also installing
-Minecraft Forge.
-
-------------------------------------------
-Source installation information for modders
-------------------------------------------
-This code follows the Minecraft Forge installation methodology. It will apply
-some small patches to the vanilla MCP source code, giving you and it access 
-to some of the data and functions you need to build a successful mod.
-
-Note also that the patches are built against "unrenamed" MCP source code (aka
-srgnames) - this means that you will not be able to read them directly against
-normal code.
-
-Source pack installation information:
-
-Standalone source installation
-==============================
-
-To install this source code for development purposes, extract this zip file.
-It ships with a demonstration mod. Run "gradle setupDevWorkspace" to create
-a gradle environment primed with FML. Run gradle eclipse or gradle idea to
-create an IDE workspace of your choice.
-Refer to ForgeGradle for more information about the gradle environment
-
-Forge source installation
-=========================
-MinecraftForge ships with this code and installs it as part of the forge
-installation process, no further action is required on your part.
-
-For reference this is version @MAJOR@.@MINOR@.@REV@.@BUILD@ of FML
-for Minecraft version @MCVERSION@.
--- a/fml/build.gradle
+++ b/fml/build.gradle
@ -1,112 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        mavenLocal()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-    }
-}
-
-import static net.minecraftforge.gradle.dev.FmlDevPlugin.*
-
-apply plugin: 'maven'
-apply plugin: 'fmldev'
-
-repositories {
-    flatDir {
-        name "fileRepo"
-        dirs "repo"
-    }
-}
-
-minecraft {
-    version = '1.8'
-    mcpVersion = '9.10'
-    mappings = 'snapshot_nodoc_20141130'
-    fmlDir = projectDir.getAbsolutePath();
-    mainClass = 'net.minecraftforge.fml.relauncher.ServerLaunchWrapper'
-    tweakClass = 'net.minecraftforge.fml.common.launcher.FMLTweaker'
-    installerVersion = "1.4"
-}
-
-group = 'net.minecraftforge'
-version = getVersionFromGit(getProject())
-
-jenkins {
-    job = 'fml'
-}
-
-uploadArchives {
-    repositories {
-        if (project.hasProperty("filesmaven")) {
-            logger.info('Publishing to files server')
-            
-            mavenDeployer {
-                configuration = configurations.deployJars
-
-                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:git@github.com:MinecraftForge/FML.git'
-                        }
-
-                        issueManagement {
-                            system 'github'
-                            url 'https://github.com/MinecraftForge/FML/issues'
-                        }
-
-                        licenses {
-                            license {
-                                name 'GNU Lesser Public License (LGPL), Version 2.1'
-                                url 'http://www.gnu.org/licenses/lgpl-2.1.txt'
-                                distribution 'repo'
-                            }
-                        }
-
-                        developers {
-                            developer {
-                                id 'cpw'
-                                name 'cpw'
-                                roles { role 'developer' }
-                            }
-                            developer {
-                                id 'LexManos'
-                                name 'Lex Manos'
-                                roles { role 'developer' }
-                            }
-                        }
-                    }
-                }
-            }
-        } else {
-            logger.info('Publishing to repo folder')
-            
-            mavenDeployer {
-                repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
-            }
-        }
-    }
-}
--- a/fml/conf/astyle.cfg
+++ b/fml/conf/astyle.cfg
@ -1,19 +0,0 @@
-# Artistic Style format configuration
-# see http://astyle.sourceforge.net/astyle.html
-
-style=allman
-
-add-brackets
-break-closing-brackets
-
-indent-switches
-
-max-instatement-indent=40
-
-pad-oper
-pad-header
-unpad-paren
-
-break-blocks
-
-delete-empty-lines
--- a/fml/conf/exceptor.json
+++ b/fml/conf/exceptor.json
--- a/fml/conf/joined.exc
+++ b/fml/conf/joined.exc
--- a/fml/conf/joined.srg
+++ b/fml/conf/joined.srg
--- a/fml/conf/mcp.cfg
+++ b/fml/conf/mcp.cfg
@ -1,172 +0,0 @@
-[DEFAULT]
-DirTemp    = temp
-DirSrc     = src
-DirLogs    = logs
-DirBin     = bin
-DirJars    = jars
-DirReobf   = reobf
-DirConf    = conf
-DirRuntime = runtime
-DirLib     = lib
-DirTempSrc = temp/src
-DirTempCls = temp/cls
-DirTempBin = temp/bin
-DirModSrc  = modsrc
-DirEclipse = eclipse
-
-[CSV]
-Classes = %(DirConf)s/classes.csv
-Methods = %(DirConf)s/methods.csv
-Fields  = %(DirConf)s/fields.csv
-Params  = %(DirConf)s/params.csv
-NewIds  = %(DirConf)s/newids.csv
-
-[SRGS]
-ConfClient     = %(DirConf)s/joined.srg
-ConfServer     = %(DirConf)s/joined.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
-ReobfClientCls = %(DirTemp)s/client_ro_cls.srg
-ReobfServerCls = %(DirTemp)s/server_ro_cls.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  = 8663a10cecc10eaa683a927ef5371852
-MD5Server  = 5b19d1a562a8a7c5f9a787ad96c8148b
-
-[RETROGUARD]
-Location       = %(DirRuntime)s/bin/retroguard.jar
-RetroConf      = %(DirTemp)s/retroguard.cfg
-RetroReobConf  = %(DirTemp)s/retroguard_ro.cfg
-ClientConf     = %(DirTemp)s/client_rg.cfg
-ServerConf     = %(DirTemp)s/server_rg.cfg
-ClientReobConf = %(DirTemp)s/client_ro.cfg
-ServerReobConf = %(DirTemp)s/server_ro.cfg
-ClientOut      = %(DirTemp)s/minecraft_rg.jar
-ServerOut      = %(DirTemp)s/minecraft_server_rg.jar
-ClientLog      = %(DirLogs)s/client_rg.log
-ServerLog      = %(DirLogs)s/server_rg.log
-ClientDeobLog  = %(DirLogs)s/client_deob.log
-ServerDeobLog  = %(DirLogs)s/server_deob.log
-NullPkg        = net/minecraft/src
-
-[EXCEPTOR]
-XClientJson     = %(DirConf)s/exceptor.json
-XServerJson     = %(DirConf)s/exceptor.json
-XClientCfg      = %(DirConf)s/joined.exc
-XServerCfg      = %(DirConf)s/joined.exc
-XClientOut      = %(DirTemp)s/minecraft_exc.jar
-XServerOut      = %(DirTemp)s/minecraft_server_exc.jar
-XClientLog      = %(DirLogs)s/client_exc.log
-XServerLog      = %(DirLogs)s/server_exc.log
-XClientLogReobf = %(DirLogs)s/client_reobf_exc.log
-XServerLogReobf = %(DirLogs)s/server_reobf_exc.log
-XClientMeta     = %(DirTemp)s/client_meta.log
-XServerMeta     = %(DirTemp)s/server_meta.log
-
-
-[DECOMPILE]
-ClsClientTemp = %(DirTempCls)s/minecraft
-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/main/Main
-TestServer = net/minecraft/server/MinecraftServer
-
-[PATCHES]
-PatchClient   = %(DirConf)s/patches/minecraft.patch
-PatchServer   = %(DirConf)s/patches/minecraft_server.patch
-PatchTemp     = %(DirTemp)s/temp.patch
-FFPatchClient = %(DirConf)s/patches/minecraft_ff
-FFPatchServer = %(DirConf)s/patches/minecraft_server_ff
-PatchClient_osx = %(DirConf)s/patches/minecraft_osx.patch
-PatchServer_osx = %(DirConf)s/patches/minecraft_server_osx.patch
-
-[RECOMPILE]
-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
-ClientFixes     = %(DirConf)s/patches
-FixStart        = Start
-IgnorePkg       = paulscode,com,isom,ibxm,de/matthiasmann/twl,org,javax,argo,gnu,io/netty
-
-[REOBF]
-MD5Client         = %(DirTemp)s/client.md5
-MD5Server         = %(DirTemp)s/server.md5
-MD5PreReobfClient = %(DirTemp)s/client_reobf.md5
-MD5PreReobfServer = %(DirTemp)s/server_reobf.md5
-RecompJarClient   = %(DirTemp)s/client_recomp.jar
-RecompJarServer   = %(DirTemp)s/server_recomp.jar
-ObfJarClient      = %(DirTemp)s/client_reobf.jar
-ObfJarServer      = %(DirTemp)s/server_reobf.jar
-ReobfDirClient    = %(DirReobf)s/minecraft
-ReobfDirServer    = %(DirReobf)s/minecraft_server
-ClientRoLog       = %(DirLogs)s/client_ro.log
-ServerRoLog       = %(DirLogs)s/server_ro.log
-ReobfClientLog    = %(DirLogs)s/client_reob.log
-ReobfServerLog    = %(DirLogs)s/server_reob.log
-
-[GETMODSOURCE]
-OutSRCClient      = %(DirModSrc)s/minecraft
-OutSRCServer      = %(DirModSrc)s/minecraft_server
-
-[MCP]
-LogFile           = %(DirLogs)s/mcp.log
-LogFileErr        = %(DirLogs)s/mcperr.log
-UpdateUrl         = http://mcp.ocean-labs.de/files/mcprolling_{version}/
-IgnoreUpdate      = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
-RGIndex           = 180425
-
-[ASTYLE]
-AstyleConfig  = %(DirConf)s/astyle.cfg
-
-[COMMANDS]
-Wine          = wine
-Patcher_win   = %(DirRuntime)s/bin/applydiff.exe
-Patcher_linux = patch
-Patcher_osx   = patch
-Jad_win       = %(DirRuntime)s/bin/jad.exe
-Jad_osx       = %(DirRuntime)s/bin/jad-osx
-AStyle_win    = %(DirRuntime)s/bin/astyle.exe
-AStyle_linux  = astyle
-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=1 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
-CmdExceptor   = %s -jar %s --jarIn {input} --jarOut {output} --mapIn {conf} --log {log} --jsonIn {json} --applyMarkers --generateParams
-CmdExceptorDry = %s -jar %s --jarIn {input} --mapIn {conf} --log {log} --jsonIn {json} --applyMarkers
-CmdRecomp     = %s -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
-CmdRecompScala = %s -encoding UTF-8 -deprecation -target:jvm-1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
-CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer
-CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start
--- a/fml/conf/patches/Start.java
+++ b/fml/conf/patches/Start.java
@ -1,114 +0,0 @@
-import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-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) 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
-        {
-            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)
-            {
-                buf += "\n" + line;
-            }
-
-            reader.close();
-            return buf;
-        }
-        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;
-    }
-}
--- a/fml/conf/patches/minecraft_ff/net.minecraft.client.Minecraft.java.patch
+++ b/fml/conf/patches/minecraft_ff/net.minecraft.client.Minecraft.java.patch
@ -1,22 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
--- minecraft\net\minecraft\client\Minecraft.java
-+++ minecraft_patched\net\minecraft\client\Minecraft.java
-@@ -695,9 +695,7 @@
- 
-       while(true) {
-          try {
-            if(!this.field_71425_J) {
-               break;
-            }
-+            while(this.field_71425_J) {
- 
-             if(!this.field_71434_R || this.field_71433_S == null) {
-                try {
-@@ -711,6 +709,7 @@
-             }
- 
-             this.func_71377_b(this.field_71433_S);
-+          }
-          } catch (MinecraftError var12) {
-             break;
-          } catch (ReportedException var13) {
--- a/fml/conf/patches/minecraft_ff/net.minecraft.client.Minecraft.java.patch.2
+++ b/fml/conf/patches/minecraft_ff/net.minecraft.client.Minecraft.java.patch.2
@ -1,12 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
--- minecraft\net\minecraft\client\Minecraft.java
-+++ minecraft_patched\net\minecraft\client\Minecraft.java
-@@ -326,7 +326,7 @@
- 
-       while(true) {
-          try {
-            if(this.field_71425_J) {
-+            while(this.field_71425_J) {
-                if(!this.field_71434_R || this.field_71433_S == null) {
-                   try {
-                      this.func_71411_J();
--- a/fml/conf/patches/minecraft_ff/net.minecraft.client.gui.FontRenderer.java.patch
+++ b/fml/conf/patches/minecraft_ff/net.minecraft.client.gui.FontRenderer.java.patch
@ -1,21 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\gui\FontRenderer.java minecraft_patched\net\minecraft\client\gui\FontRenderer.java
--- minecraft\net\minecraft\client\gui\FontRenderer.java
-+++ minecraft_patched\net\minecraft\client\gui\FontRenderer.java
-@@ -592,8 +592,6 @@
-          case 10:
-             --var5;
-             break;
-         case 32:
-            var6 = var5;
-          case 167:
-             if(var5 < var3 - 1) {
-                ++var5;
-@@ -607,6 +605,8 @@
-                }
-             }
-             break;
-+         case 32:
-+             var6 = var5;
-          default:
-             var4 += this.func_78263_a(var8);
-             if(var7) {
--- a/fml/conf/patches/minecraft_ff/net.minecraft.client.network.NetHandlerPlayClient.java.patch
+++ b/fml/conf/patches/minecraft_ff/net.minecraft.client.network.NetHandlerPlayClient.java.patch
@ -1,37 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\network\NetHandlerPlayClient.java minecraft_patched\net\minecraft\client\network\NetHandlerPlayClient.java
--- minecraft\net\minecraft\client\network\NetHandlerPlayClient.java
-+++ minecraft_patched\net\minecraft\client\network\NetHandlerPlayClient.java
-@@ -1275,14 +1275,14 @@
-                      private static final String __OBFID = "CL_00002622";
- 
-                      public void func_73878_a(boolean p_73878_1_, int p_73878_2_) {
-                        NetHandlerPlayClient.thisxxx.field_147299_f = Minecraft.func_71410_x();
-+                        NetHandlerPlayClient.this.field_147299_f = Minecraft.func_71410_x();
-                         if(p_73878_1_) {
-                           if(NetHandlerPlayClient.thisxx.field_147299_f.func_147104_D() != null) {
-                              NetHandlerPlayClient.thisxxxxxxx.field_147299_f.func_147104_D().func_152584_a(ServerData.ServerResourceMode.ENABLED);
-+                           if(NetHandlerPlayClient.this.field_147299_f.func_147104_D() != null) {
-+                              NetHandlerPlayClient.this.field_147299_f.func_147104_D().func_152584_a(ServerData.ServerResourceMode.ENABLED);
-                            }
- 
-                            NetHandlerPlayClient.this.field_147302_e.func_179290_a(new C19PacketResourcePackStatus(var3, C19PacketResourcePackStatus.Action.ACCEPTED));
-                           Futures.addCallback(NetHandlerPlayClient.thisx.field_147299_f.func_110438_M().func_180601_a(var2, var3), new FutureCallback() {
-+                           Futures.addCallback(NetHandlerPlayClient.this.field_147299_f.func_110438_M().func_180601_a(var2, var3), new FutureCallback() {
- 
-                               private static final String __OBFID = "CL_00002621";
- 
-@@ -1294,11 +1294,11 @@
-                               }
-                            });
-                         } else {
-                           if(NetHandlerPlayClient.thisxxxx.field_147299_f.func_147104_D() != null) {
-                              NetHandlerPlayClient.thisxxxxx.field_147299_f.func_147104_D().func_152584_a(ServerData.ServerResourceMode.DISABLED);
-+                           if(NetHandlerPlayClient.this.field_147299_f.func_147104_D() != null) {
-+                              NetHandlerPlayClient.this.field_147299_f.func_147104_D().func_152584_a(ServerData.ServerResourceMode.DISABLED);
-                            }
- 
-                           NetHandlerPlayClient.thisxxxxxx.field_147302_e.func_179290_a(new C19PacketResourcePackStatus(var3x, C19PacketResourcePackStatus.Action.DECLINED));
-+                           NetHandlerPlayClient.this.field_147302_e.func_179290_a(new C19PacketResourcePackStatus(var3, C19PacketResourcePackStatus.Action.DECLINED));
-                         }
- 
-                         ServerList.func_147414_b(NetHandlerPlayClient.this.field_147299_f.func_147104_D());
--- a/fml/conf/patches/minecraft_ff/net.minecraft.client.particle.EffectRenderer.java.patch
+++ b/fml/conf/patches/minecraft_ff/net.minecraft.client.particle.EffectRenderer.java.patch
@ -1,13 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\particle\EffectRenderer.java minecraft_patched\net\minecraft\client\particle\EffectRenderer.java
--- minecraft\net\minecraft\client\particle\EffectRenderer.java
-+++ minecraft_patched\net\minecraft\client\particle\EffectRenderer.java
-@@ -242,7 +242,8 @@
-       GlStateManager.func_179112_b(770, 771);
-       GlStateManager.func_179092_a(516, 0.003921569F);
- 
-      for(final int var8 = 0; var8 < 3; ++var8) {
-+      for(int var8_nf = 0; var8_nf < 3; ++var8_nf) {
-+         final int var8 = var8_nf;
-          for(int var9 = 0; var9 < 2; ++var9) {
-             if(!this.field_78876_b[var8][var9].isEmpty()) {
-                switch(var9) {
--- a/fml/conf/patches/minecraft_ff/net.minecraft.client.renderer.block.model.ModelBlockDefinition.java.patch
+++ b/fml/conf/patches/minecraft_ff/net.minecraft.client.renderer.block.model.ModelBlockDefinition.java.patch
@ -1,12 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\renderer\block\model\ModelBlockDefinition.java minecraft_patched\net\minecraft\client\renderer\block\model\ModelBlockDefinition.java
--- minecraft\net\minecraft\client\renderer\block\model\ModelBlockDefinition.java
-+++ minecraft_patched\net\minecraft\client\renderer\block\model\ModelBlockDefinition.java
-@@ -82,7 +82,7 @@
-       public ModelBlockDefinition func_178336_a(JsonElement p_178336_1_, Type p_178336_2_, JsonDeserializationContext p_178336_3_) {
-          JsonObject var4 = p_178336_1_.getAsJsonObject();
-          List var5 = this.func_178334_a(p_178336_3_, var4);
-         return new ModelBlockDefinition(var5);
-+         return new ModelBlockDefinition((Collection)var5);
-       }
- 
-       protected List func_178334_a(JsonDeserializationContext p_178334_1_, JsonObject p_178334_2_) {
--- a/fml/conf/patches/minecraft_ff/net.minecraft.client.renderer.texture.TextureManager.java.patch
+++ b/fml/conf/patches/minecraft_ff/net.minecraft.client.renderer.texture.TextureManager.java.patch
@ -1,30 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\renderer\texture\TextureManager.java minecraft_patched\net\minecraft\client\renderer\texture\TextureManager.java
--- minecraft\net\minecraft\client\renderer\texture\TextureManager.java
-+++ minecraft_patched\net\minecraft\client\renderer\texture\TextureManager.java
-@@ -57,13 +57,14 @@
- 
-    public boolean func_110579_a(ResourceLocation p_110579_1_, final ITextureObject p_110579_2_) {
-       boolean var3 = true;
-
-+      ITextureObject p_110579_2_2 = p_110579_2_;
-+      
-       try {
-          ((ITextureObject)p_110579_2_).func_110551_a(this.field_110582_d);
-       } catch (IOException var8) {
-          field_147646_a.warn("Failed to load texture: " + p_110579_1_, var8);
-         p_110579_2_ = TextureUtil.field_111001_a;
-         this.field_110585_a.put(p_110579_1_, p_110579_2_);
-+         p_110579_2_2 = TextureUtil.field_111001_a;
-+         this.field_110585_a.put(p_110579_1_, p_110579_2_2);
-          var3 = false;
-       } catch (Throwable var9) {
-          CrashReport var5 = CrashReport.func_85055_a(var9, "Registering texture");
-@@ -80,7 +81,7 @@
-          throw new ReportedException(var5);
-       }
- 
-      this.field_110585_a.put(p_110579_1_, p_110579_2_);
-+      this.field_110585_a.put(p_110579_1_, p_110579_2_2);
-       return var3;
-    }
- 
--- a/fml/conf/patches/minecraft_ff/net.minecraft.client.resources.FolderResourcePack.java.patch
+++ b/fml/conf/patches/minecraft_ff/net.minecraft.client.resources.FolderResourcePack.java.patch
@ -1,12 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\resources\FolderResourcePack.java minecraft_patched\net\minecraft\client\resources\FolderResourcePack.java
--- minecraft\net\minecraft\client\resources\FolderResourcePack.java
-+++ minecraft_patched\net\minecraft\client\resources\FolderResourcePack.java
-@@ -31,7 +31,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) {
--- a/fml/conf/patches/minecraft_ff/net.minecraft.command.PlayerSelector.java.patch
+++ b/fml/conf/patches/minecraft_ff/net.minecraft.command.PlayerSelector.java.patch
@ -1,100 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\command\PlayerSelector.java minecraft_patched\net\minecraft\command\PlayerSelector.java
--- minecraft\net\minecraft\command\PlayerSelector.java
-+++ minecraft_patched\net\minecraft\command\PlayerSelector.java
-@@ -135,7 +135,7 @@
- 
-    private static List func_179663_a(Map p_179663_0_, String p_179663_1_) {
-       ArrayList var2 = Lists.newArrayList();
-      final String var3 = func_179651_b(p_179663_0_, "type");
-+      String var3 = func_179651_b(p_179663_0_, "type");
-       final boolean var4 = var3 != null && var3.startsWith("!");
-       if(var4) {
-          var3 = var3.substring(1);
-@@ -159,12 +159,13 @@
-             });
-          }
-       } else {
-+         final String var3_f = var3;
-          var2.add(new Predicate() {
- 
-             private static final String __OBFID = "CL_00002362";
- 
-             public boolean func_179613_a(Entity p_179613_1_) {
-               return EntityList.func_180123_a(p_179613_1_, var3) != var4;
-+               return EntityList.func_180123_a(p_179613_1_, var3_f) != var4;
-             }
-             // $FF: synthetic method
-             public boolean apply(Object p_apply_1_) {
-@@ -231,13 +232,14 @@
- 
-    private static List func_179659_d(Map p_179659_0_) {
-       ArrayList var1 = Lists.newArrayList();
-      final String var2 = func_179651_b(p_179659_0_, "team");
-+      String var2 = func_179651_b(p_179659_0_, "team");
-       final boolean var3 = var2 != null && var2.startsWith("!");
-       if(var3) {
-          var2 = var2.substring(1);
-       }
- 
-       if(var2 != null) {
-+         final String var2_f = var2;
-          var1.add(new Predicate() {
- 
-             private static final String __OBFID = "CL_00002355";
-@@ -249,7 +251,7 @@
-                   EntityLivingBase var2x = (EntityLivingBase)p_179621_1_;
-                   Team var3x = var2x.func_96124_cp();
-                   String var4 = var3x == null?"":var3x.func_96661_b();
-                  return var4.equals(var2) != var3;
-+                  return var4.equals(var2_f) != var3;
-                }
-             }
-             // $FF: synthetic method
-@@ -321,19 +323,20 @@
- 
-    private static List func_179647_f(Map p_179647_0_) {
-       ArrayList var1 = Lists.newArrayList();
-      final String var2 = func_179651_b(p_179647_0_, "name");
-+      String var2 = func_179651_b(p_179647_0_, "name");
-       final boolean var3 = var2 != null && var2.startsWith("!");
-       if(var3) {
-          var2 = var2.substring(1);
-       }
- 
-       if(var2 != null) {
-+         final String var2_f = var2;
-          var1.add(new Predicate() {
- 
-             private static final String __OBFID = "CL_00002353";
- 
-             public boolean func_179600_a(Entity p_179600_1_) {
-               return p_179600_1_.func_70005_c_().equals(var2) != var3;
-+               return p_179600_1_.func_70005_c_().equals(var2_f) != var3;
-             }
-             // $FF: synthetic method
-             public boolean apply(Object p_apply_1_) {
-@@ -372,11 +375,9 @@
- 
-    private static List func_179662_g(Map p_179662_0_) {
-       ArrayList var1 = Lists.newArrayList();
-      final int var2;
-      final int var3;
-       if(p_179662_0_.containsKey("rym") || p_179662_0_.containsKey("ry")) {
-         var2 = func_179650_a(func_179653_a(p_179662_0_, "rym", 0));
-         var3 = func_179650_a(func_179653_a(p_179662_0_, "ry", 359));
-+         final int var2 = func_179650_a(func_179653_a(p_179662_0_, "rym", 0));
-+         final int var3 = func_179650_a(func_179653_a(p_179662_0_, "ry", 359));
-          var1.add(new Predicate() {
- 
-             private static final String __OBFID = "CL_00002351";
-@@ -393,8 +394,8 @@
-       }
- 
-       if(p_179662_0_.containsKey("rxm") || p_179662_0_.containsKey("rx")) {
-         var2 = func_179650_a(func_179653_a(p_179662_0_, "rxm", 0));
-         var3 = func_179650_a(func_179653_a(p_179662_0_, "rx", 359));
-+         final int var2 = func_179650_a(func_179653_a(p_179662_0_, "rxm", 0));
-+         final int var3 = func_179650_a(func_179653_a(p_179662_0_, "rx", 359));
-          var1.add(new Predicate() {
- 
-             private static final String __OBFID = "CL_00002361";
--- a/fml/conf/patches/minecraft_ff/net.minecraft.inventory.ContainerPlayer.java.patch
+++ b/fml/conf/patches/minecraft_ff/net.minecraft.inventory.ContainerPlayer.java.patch
@ -1,34 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\inventory\ContainerPlayer.java minecraft_patched\net\minecraft\inventory\ContainerPlayer.java
--- minecraft\net\minecraft\inventory\ContainerPlayer.java
-+++ minecraft_patched\net\minecraft\inventory\ContainerPlayer.java
-@@ -28,7 +28,7 @@
-       this.field_82862_h = p_i1819_3_;
-       this.func_75146_a(new SlotCrafting(p_i1819_1_.field_70458_d, this.field_75181_e, this.field_75179_f, 0, 144, 36));
- 
-      final int var4;
-+      int var4;
-       int var5;
-       for(var4 = 0; var4 < 2; ++var4) {
-          for(var5 = 0; var5 < 2; ++var5) {
-@@ -37,6 +37,7 @@
-       }
- 
-       for(var4 = 0; var4 < 4; ++var4) {
-+         final int var44 = var4;
-          this.func_75146_a(new Slot(p_i1819_1_, p_i1819_1_.func_70302_i_() - 1 - var4, 8, 8 + var4 * 18) {
- 
-             private static final String __OBFID = "CL_00001755";
-@@ -45,11 +46,11 @@
-                return 1;
-             }
-             public boolean func_75214_a(ItemStack p_75214_1_) {
-               return p_75214_1_ == null?false:(p_75214_1_.func_77973_b() instanceof ItemArmor?((ItemArmor)p_75214_1_.func_77973_b()).field_77881_a == var4:(p_75214_1_.func_77973_b() != Item.func_150898_a(Blocks.field_150423_aK) && p_75214_1_.func_77973_b() != Items.field_151144_bL?false:var4 == 0));
-+               return p_75214_1_ == null?false:(p_75214_1_.func_77973_b() instanceof ItemArmor?((ItemArmor)p_75214_1_.func_77973_b()).field_77881_a == var44:(p_75214_1_.func_77973_b() != Item.func_150898_a(Blocks.field_150423_aK) && p_75214_1_.func_77973_b() != Items.field_151144_bL?false:var44 == 0));
-             }
-             @SideOnly(Side.CLIENT)
-             public String func_178171_c() {
-               return ItemArmor.field_94603_a[var4];
-+               return ItemArmor.field_94603_a[var44];
-             }
-          });
-       }
--- a/fml/conf/patches/minecraft_ff/net.minecraft.network.PacketBuffer.java.patch
+++ b/fml/conf/patches/minecraft_ff/net.minecraft.network.PacketBuffer.java.patch
@ -1,14 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\network\PacketBuffer.java minecraft_patched\net\minecraft\network\PacketBuffer.java
--- minecraft\net\minecraft\network\PacketBuffer.java
-+++ minecraft_patched\net\minecraft\network\PacketBuffer.java
-@@ -799,10 +799,4 @@
-    public boolean release(int p_release_1_) {
-       return this.field_150794_a.release(p_release_1_);
-    }
-
-   // $FF: synthetic method
-   // $FF: bridge method
-   public int compareTo(Object p_compareTo_1_) {
-      return this.compareTo((ByteBuf)p_compareTo_1_);
-   }
- }
--- a/fml/conf/patches/minecraft_ff/net.minecraft.server.network.NetHandlerLoginServer.java.patch
+++ b/fml/conf/patches/minecraft_ff/net.minecraft.server.network.NetHandlerLoginServer.java.patch
@ -1,14 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\server\network\NetHandlerLoginServer.java minecraft_patched\net\minecraft\server\network\NetHandlerLoginServer.java
--- minecraft\net\minecraft\server\network\NetHandlerLoginServer.java
-+++ minecraft_patched\net\minecraft\server\network\NetHandlerLoginServer.java
-@@ -95,10 +95,6 @@
-                public void operationComplete(ChannelFuture p_operationComplete_1_) {
-                   NetHandlerLoginServer.this.field_147333_a.func_179289_a(NetHandlerLoginServer.this.field_147327_f.func_175577_aI());
-                }
-               // $FF: synthetic method
-               public void operationComplete(Future p_operationComplete_1_) {
-                  this.operationComplete((ChannelFuture)p_operationComplete_1_);
-               }
-             }, new GenericFutureListener[0]);
-          }
- 
--- a/fml/conf/patches/minecraft_ff/net.minecraft.util.BlockPos.java.patch
+++ b/fml/conf/patches/minecraft_ff/net.minecraft.util.BlockPos.java.patch
@ -1,12 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\util\BlockPos.java minecraft_patched\net\minecraft\util\BlockPos.java
--- minecraft\net\minecraft\util\BlockPos.java
-+++ minecraft_patched\net\minecraft\util\BlockPos.java
-@@ -194,7 +194,7 @@
- 
-                protected BlockPos.MutableBlockPos func_179313_a() {
-                   if(this.field_179314_b == null) {
-                     this.field_179314_b = new BlockPos.MutableBlockPos(var2xxx.func_177958_n(), var2.func_177956_o(), var2x.func_177952_p(), null);
-+                     this.field_179314_b = new BlockPos.MutableBlockPos(var2.func_177958_n(), var2.func_177956_o(), var2.func_177952_p(), null);
-                      return this.field_179314_b;
-                   } else if(this.field_179314_b.equals(var3)) {
-                      return (BlockPos.MutableBlockPos)this.endOfData();
--- a/fml/conf/patches/minecraft_ff/net.minecraft.world.storage.ThreadedFileIOBase.java.patch
+++ b/fml/conf/patches/minecraft_ff/net.minecraft.world.storage.ThreadedFileIOBase.java.patch
@ -1,11 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\world\storage\ThreadedFileIOBase.java minecraft_patched\net\minecraft\world\storage\ThreadedFileIOBase.java
--- minecraft\net\minecraft\world\storage\ThreadedFileIOBase.java
-+++ minecraft_patched\net\minecraft\world\storage\ThreadedFileIOBase.java
-@@ -25,6 +25,7 @@
-    }
- 
-    public void run() {
-+     while(true)
-       this.func_75736_b();
-    }
- 
--- a/fml/conf/version.cfg
+++ b/fml/conf/version.cfg
@ -1,4 +0,0 @@
-[VERSION]
-MCPVersion = 9.10
-ClientVersion = 1.8
-ServerVersion = 1.8
--- a/fml/eclipse-workspace-dev.zip
+++ b/fml/eclipse-workspace-dev.zip
--- a/fml/gradle/wrapper/gradle-wrapper.jar
+++ b/fml/gradle/wrapper/gradle-wrapper.jar
--- a/fml/gradlew
+++ b/fml/gradlew
@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
--- a/fml/gradlew.bat
+++ b/fml/gradlew.bat
@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
--- a/fml/mcp_merge.cfg
+++ b/fml/mcp_merge.cfg
@ -1,9 +0,0 @@
-^org/bouncycastle
-^org/apache
-^com/google
-^com/mojang/authlib
-^com/mojang/util
-^gnu/trove
-^io/netty
-^javax/annotation
-^argo
--- a/fml/patches/minecraft/net/minecraft/block/Block.java.patch
+++ b/fml/patches/minecraft/net/minecraft/block/Block.java.patch
@ -1,24 +0,0 @@
--- ../src-base/minecraft/net/minecraft/block/Block.java
-+++ ../src-work/minecraft/net/minecraft/block/Block.java
-@@ -39,8 +39,9 @@
- public class Block
- {
-     private static final ResourceLocation field_176230_a = new ResourceLocation("air");
-    public static final RegistryNamespacedDefaultedByKey field_149771_c = new RegistryNamespacedDefaultedByKey(field_176230_a);
-    public static final ObjectIntIdentityMap field_176229_d = new ObjectIntIdentityMap();
-+    public static final RegistryNamespacedDefaultedByKey field_149771_c = net.minecraftforge.fml.common.registry.GameData.getBlockRegistry();
-+    @Deprecated //Modders: DO NOT use this! Use GameRegistry
-+    public static final ObjectIntIdentityMap field_176229_d = net.minecraftforge.fml.common.registry.GameData.getBlockStateIDMap();
-     private CreativeTabs field_149772_a;
-     public static final Block.SoundType field_149769_e = new Block.SoundType("stone", 1.0F, 1.0F);
-     public static final Block.SoundType field_149766_f = new Block.SoundType("wood", 1.0F, 1.0F);
-@@ -124,6 +125,9 @@
-     private String field_149770_b;
-     private static final String __OBFID = "CL_00000199";
- 
-+    public final net.minecraftforge.fml.common.registry.RegistryDelegate<Block> delegate =
-+            ((net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry)field_149771_c).getDelegate(this, Block.class);
-+
-     public static int func_149682_b(Block p_149682_0_)
-     {
-         return field_149771_c.func_148757_b(p_149682_0_);
--- a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
@ -1,194 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/Minecraft.java
-+++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
-@@ -410,10 +410,10 @@
-         this.field_110451_am = new SimpleReloadableResourceManager(this.field_110452_an);
-         this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab);
-         this.field_110451_am.func_110542_a(this.field_135017_as);
-        this.func_110436_a();
-+        net.minecraftforge.fml.client.FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am);
-         this.field_71446_o = new TextureManager(this.field_110451_am);
-         this.field_110451_am.func_110542_a(this.field_71446_o);
-        this.func_180510_a(this.field_71446_o);
-+        net.minecraftforge.fml.client.SplashProgress.drawVanillaScreen(this.field_71446_o);
-         this.func_175595_al();
-         this.field_152350_aA = new SkinManager(this.field_71446_o, new File(this.field_110446_Y, "skins"), this.field_152355_az);
-         this.field_71469_aa = new AnvilSaveConverter(new File(this.field_71412_D, "saves"));
-@@ -449,6 +449,8 @@
-             }
-         });
-         this.field_71417_B = new MouseHelper();
-+        net.minecraftforge.fml.common.ProgressManager.ProgressBar bar= net.minecraftforge.fml.common.ProgressManager.push("Rendering Setup", 5, true);
-+        bar.step("GL Setup");
-         this.func_71361_d("Pre startup");
-         GlStateManager.func_179098_w();
-         GlStateManager.func_179103_j(7425);
-@@ -462,17 +464,21 @@
-         GlStateManager.func_179096_D();
-         GlStateManager.func_179128_n(5888);
-         this.func_71361_d("Startup");
-        this.field_147128_au = new TextureMap("textures");
-+        bar.step("Loading Texture Map");
-+        this.field_147128_au = new TextureMap("textures",true);
-         this.field_147128_au.func_147633_a(this.field_71474_y.field_151442_I);
-         this.field_71446_o.func_110580_a(TextureMap.field_110575_b, this.field_147128_au);
-         this.field_71446_o.func_110577_a(TextureMap.field_110575_b);
-         this.field_147128_au.func_174937_a(false, this.field_71474_y.field_151442_I > 0);
-+        bar.step("Loading Model Manager");
-         this.field_175617_aL = new ModelManager(this.field_147128_au);
-         this.field_110451_am.func_110542_a(this.field_175617_aL);
-+        bar.step("Loading Item Renderer");
-         this.field_175621_X = new RenderItem(this.field_71446_o, this.field_175617_aL);
-         this.field_175616_W = new RenderManager(this.field_71446_o, this.field_175621_X);
-         this.field_175620_Y = new ItemRenderer(this);
-         this.field_110451_am.func_110542_a(this.field_175621_X);
-+        bar.step("Loading Entity Renderer");
-         this.field_71460_t = new EntityRenderer(this, this.field_110451_am);
-         this.field_110451_am.func_110542_a(this.field_71460_t);
-         this.field_175618_aM = new BlockRendererDispatcher(this.field_175617_aL.func_174954_c(), this.field_71474_y);
-@@ -482,22 +488,25 @@
-         this.field_71458_u = new GuiAchievement(this);
-         GlStateManager.func_179083_b(0, 0, this.field_71443_c, this.field_71440_d);
-         this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
-+        net.minecraftforge.fml.common.ProgressManager.pop(bar);
-+        net.minecraftforge.fml.client.FMLClientHandler.instance().finishMinecraftLoading();
-         this.func_71361_d("Post startup");
-         this.field_71456_v = new GuiIngame(this);
- 
-         if (this.field_71475_ae != null)
-         {
-            this.func_147108_a(new GuiConnecting(new GuiMainMenu(), this, this.field_71475_ae, this.field_71477_af));
-+            net.minecraftforge.fml.client.FMLClientHandler.instance().connectToServerAtStartup(this.field_71475_ae, this.field_71477_af);
-         }
-         else
-         {
-             this.func_147108_a(new GuiMainMenu());
-         }
- 
-        this.field_71446_o.func_147645_c(this.field_152354_ay);
-+        net.minecraftforge.fml.client.SplashProgress.clearVanillaResources(field_71446_o, field_152354_ay);
-         this.field_152354_ay = null;
-         this.field_71461_s = new LoadingScreenRenderer(this);
- 
-+        net.minecraftforge.fml.client.FMLClientHandler.instance().onInitializationComplete();
-         if (this.field_71474_y.field_74353_u && !this.field_71431_Q)
-         {
-             this.func_71352_k();
-@@ -681,21 +690,23 @@
-         File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt");
-         Bootstrap.func_179870_a(p_71377_1_.func_71502_e());
- 
-+        int retVal;
-         if (p_71377_1_.func_71497_f() != null)
-         {
-             Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + p_71377_1_.func_71497_f());
-            System.exit(-1);
-+            retVal = -1;
-         }
-         else if (p_71377_1_.func_147149_a(file2))
-         {
-             Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + file2.getAbsolutePath());
-            System.exit(-1);
-+            retVal = -1;
-         }
-         else
-         {
-             Bootstrap.func_179870_a("#@?@# Game crashed! Crash report could not be saved. #@?@#");
-            System.exit(-2);
-+            retVal = -2;
-         }
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().handleExit(retVal);
-     }
- 
-     public boolean func_152349_b()
-@@ -999,7 +1010,7 @@
-         {
-             while (!this.field_152351_aB.isEmpty())
-             {
-                ((FutureTask)this.field_152351_aB.poll()).run();
-+                net.minecraftforge.fml.common.FMLCommonHandler.callFuture(((FutureTask)this.field_152351_aB.poll()));
-             }
-         }
- 
-@@ -1034,9 +1045,11 @@
- 
-         if (!this.field_71454_w)
-         {
-+            net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_74281_c);
-             this.field_71424_I.func_76318_c("gameRenderer");
-             this.field_71460_t.func_78480_b(this.field_71428_T.field_74281_c);
-             this.field_71424_I.func_76319_b();
-+            net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_74281_c);
-         }
- 
-         this.field_71424_I.func_76319_b();
-@@ -1591,6 +1604,8 @@
-             --this.field_71467_ac;
-         }
- 
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreClientTick();
-+
-         this.field_71424_I.func_76320_a("gui");
- 
-         if (!this.field_71445_n)
-@@ -1744,6 +1759,7 @@
-                         this.field_71462_r.func_146274_d();
-                     }
-                 }
-+                net.minecraftforge.fml.common.FMLCommonHandler.instance().fireMouseInput();
-             }
- 
-             if (this.field_71429_W > 0)
-@@ -1920,6 +1936,7 @@
-                         }
-                     }
-                 }
-+                net.minecraftforge.fml.common.FMLCommonHandler.instance().fireKeyInput();
-             }
- 
-             for (i = 0; i < 9; ++i)
-@@ -2120,12 +2137,15 @@
-             this.field_71453_ak.func_74428_b();
-         }
- 
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostClientTick();
-+
-         this.field_71424_I.func_76319_b();
-         this.field_71423_H = func_71386_F();
-     }
- 
-     public void func_71371_a(String p_71371_1_, String p_71371_2_, WorldSettings p_71371_3_)
-     {
-+        net.minecraftforge.fml.client.FMLClientHandler.instance().startIntegratedServer(p_71371_1_, p_71371_2_, p_71371_3_);
-         this.func_71403_a((WorldClient)null);
-         System.gc();
-         ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
-@@ -2161,6 +2181,12 @@
- 
-         while (!this.field_71437_Z.func_71200_ad())
-         {
-+            if (!net.minecraftforge.fml.common.StartupQuery.check())
-+            {
-+                func_71403_a(null);
-+                func_147108_a(null);
-+                return;
-+            }
-             String s2 = this.field_71437_Z.func_71195_b_();
- 
-             if (s2 != null)
-@@ -2186,7 +2212,7 @@
-         SocketAddress socketaddress = this.field_71437_Z.func_147137_ag().func_151270_a();
-         NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress);
-         networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null));
-        networkmanager.func_179290_a(new C00Handshake(47, socketaddress.toString(), 0, EnumConnectionState.LOGIN));
-+        networkmanager.func_179290_a(new C00Handshake(47, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true));
-         networkmanager.func_179290_a(new C00PacketLoginStart(this.func_110432_I().func_148256_e()));
-         this.field_71453_ak = networkmanager;
-     }
-@@ -2237,6 +2263,7 @@
- 
-             this.func_71351_a((ServerData)null);
-             this.field_71455_al = false;
-+            net.minecraftforge.fml.client.FMLClientHandler.instance().handleClientWorldClosing(this.field_71441_e);
-         }
- 
-         this.field_147127_av.func_147690_c();
--- a/fml/patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch
@ -1,126 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/gui/FontRenderer.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/FontRenderer.java
-@@ -57,7 +57,7 @@
-         this.field_111273_g = p_i1035_2_;
-         this.field_78298_i = p_i1035_3_;
-         this.field_78293_l = p_i1035_4_;
-        p_i1035_3_.func_110577_a(this.field_111273_g);
-+        bindTexture(this.field_111273_g);
- 
-         for (int i = 0; i < 32; ++i)
-         {
-@@ -105,7 +105,7 @@
- 
-         try
-         {
-            bufferedimage = TextureUtil.func_177053_a(Minecraft.func_71410_x().func_110442_L().func_110536_a(this.field_111273_g).func_110527_b());
-+            bufferedimage = TextureUtil.func_177053_a(getResourceInputStream(this.field_111273_g));
-         }
-         catch (IOException ioexception)
-         {
-@@ -172,7 +172,7 @@
- 
-         try
-         {
-            inputstream = Minecraft.func_71410_x().func_110442_L().func_110536_a(new ResourceLocation("font/glyph_sizes.bin")).func_110527_b();
-+            inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin"));
-             inputstream.read(this.field_78287_e);
-         }
-         catch (IOException ioexception)
-@@ -195,7 +195,7 @@
-         float f = (float)(p_78266_1_ % 16 * 8);
-         float f1 = (float)(p_78266_1_ / 16 * 8);
-         float f2 = p_78266_2_ ? 1.0F : 0.0F;
-        this.field_78298_i.func_110577_a(this.field_111273_g);
-+        bindTexture(this.field_111273_g);
-         float f3 = (float)this.field_78286_d[p_78266_1_] - 0.01F;
-         GL11.glBegin(GL11.GL_TRIANGLE_STRIP);
-         GL11.glTexCoord2f(f / 128.0F, f1 / 128.0F);
-@@ -222,7 +222,7 @@
- 
-     private void func_78257_a(int p_78257_1_)
-     {
-        this.field_78298_i.func_110577_a(this.func_111271_a(p_78257_1_));
-+        bindTexture(this.func_111271_a(p_78257_1_));
-     }
- 
-     protected float func_78277_a(char p_78277_1_, boolean p_78277_2_)
-@@ -269,7 +269,7 @@
- 
-     public int func_175065_a(String p_175065_1_, float p_175065_2_, float p_175065_3_, int p_175065_4_, boolean p_175065_5_)
-     {
-        GlStateManager.func_179141_d();
-+        enableAlpha();
-         this.func_78265_b();
-         int j;
- 
-@@ -341,7 +341,7 @@
- 
-                     k = this.field_78285_g[j];
-                     this.field_78304_r = k;
-                    GlStateManager.func_179131_c((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.field_78305_q);
-+                    setColor((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.field_78305_q);
-                 }
-                 else if (j == 16)
-                 {
-@@ -370,7 +370,7 @@
-                     this.field_78299_w = false;
-                     this.field_78300_v = false;
-                     this.field_78301_u = false;
-                    GlStateManager.func_179131_c(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
-+                    setColor(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
-                 }
- 
-                 ++i;
-@@ -429,6 +429,15 @@
-                     ++f;
-                 }
- 
-+                doDraw(f);
-+            }
-+        }
-+    }
-+
-+    protected void doDraw(float f)
-+    {
-+        {
-+            {
-                 Tessellator tessellator;
-                 WorldRenderer worldrenderer;
- 
-@@ -504,7 +513,7 @@
-             this.field_78292_o = (float)(p_180455_4_ >> 8 & 255) / 255.0F;
-             this.field_78306_p = (float)(p_180455_4_ & 255) / 255.0F;
-             this.field_78305_q = (float)(p_180455_4_ >> 24 & 255) / 255.0F;
-            GlStateManager.func_179131_c(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
-+            setColor(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
-             this.field_78295_j = p_180455_2_;
-             this.field_78296_k = p_180455_3_;
-             this.func_78255_a(p_180455_1_, p_180455_5_);
-@@ -842,6 +851,26 @@
-         return this.field_78294_m;
-     }
- 
-+    protected void setColor(float r, float g, float b, float a)
-+    {
-+        GlStateManager.func_179131_c(r,g,b,a);
-+    }
-+
-+    protected void enableAlpha()
-+    {
-+        GlStateManager.func_179141_d();
-+    }
-+
-+    protected void bindTexture(ResourceLocation location)
-+    {
-+        field_78298_i.func_110577_a(location);
-+    }
-+
-+    protected InputStream getResourceInputStream(ResourceLocation location) throws IOException
-+    {
-+        return Minecraft.func_71410_x().func_110442_L().func_110536_a(location).func_110527_b();
-+    }
-+
-     public int func_175064_b(char p_175064_1_)
-     {
-         return this.field_78285_g["0123456789abcdef".indexOf(p_175064_1_)];
--- a/fml/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/gui/GuiCreateWorld.java.patch
@ -1,11 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
-@@ -213,6 +213,8 @@
-                     }
-                 }
- 
-+                WorldType.field_77139_a[this.field_146331_K].onGUICreateWorldPress();
-+
-                 WorldSettings.GameType gametype = WorldSettings.GameType.func_77142_a(this.field_146342_r);
-                 WorldSettings worldsettings = new WorldSettings(i, gametype, this.field_146341_s, this.field_146337_w, WorldType.field_77139_a[this.field_146331_K]);
-                 worldsettings.func_82750_a(this.field_146334_a);
--- a/fml/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch
@ -1,24 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
-@@ -30,8 +30,9 @@
- 
-         this.field_146292_n.add(new GuiButton(4, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 24 + b0, I18n.func_135052_a("menu.returnToGame", new Object[0])));
-         this.field_146292_n.add(new GuiButton(0, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 96 + b0, 98, 20, I18n.func_135052_a("menu.options", new Object[0])));
-+        this.field_146292_n.add(new GuiButton(12, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + b0, 98, 20, I18n.func_135052_a("fml.menu.modoptions")));
-         GuiButton guibutton;
-        this.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + b0, 98, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
-+        this.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 72 + b0, 200, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
-         this.field_146292_n.add(new GuiButton(5, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 48 + b0, 98, 20, I18n.func_135052_a("gui.achievements", new Object[0])));
-         this.field_146292_n.add(new GuiButton(6, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 48 + b0, 98, 20, I18n.func_135052_a("gui.stats", new Object[0])));
-         guibutton.field_146124_l = this.field_146297_k.func_71356_B() && !this.field_146297_k.func_71401_C().func_71344_c();
-@@ -65,6 +66,10 @@
-                 break;
-             case 7:
-                 this.field_146297_k.func_147108_a(new GuiShareToLan(this));
-+                break;
-+            case 12:
-+                net.minecraftforge.fml.client.FMLClientHandler.instance().showInGameModOptions(this);
-+                break;
-         }
-     }
- 
--- a/fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
@ -1,43 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java
-@@ -198,6 +198,11 @@
-         this.field_146292_n.add(new GuiButton(1, this.field_146294_l / 2 - 100, p_73969_1_, I18n.func_135052_a("menu.singleplayer", new Object[0])));
-         this.field_146292_n.add(new GuiButton(2, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 1, I18n.func_135052_a("menu.multiplayer", new Object[0])));
-         this.field_146292_n.add(this.field_175372_K = new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0])));
-+        GuiButton fmlModButton = new GuiButton(6, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("fml.menu.mods"));
-+        fmlModButton.field_146128_h = this.field_146294_l / 2 + 2;
-+        field_175372_K.field_146120_f = 98;
-+        fmlModButton.field_146120_f = 98;
-+        this.field_146292_n.add(fmlModButton);
-     }
- 
-     private void func_73972_b(int p_73972_1_, int p_73972_2_)
-@@ -245,6 +250,11 @@
-             this.field_146297_k.func_71400_g();
-         }
- 
-+        if (p_146284_1_.field_146127_k == 6)
-+        {
-+            this.field_146297_k.func_147108_a(new net.minecraftforge.fml.client.GuiModList(this));
-+        }
-+
-         if (p_146284_1_.field_146127_k == 11)
-         {
-             this.field_146297_k.func_71371_a("Demo_World", "Demo_World", DemoWorldServer.field_73071_a);
-@@ -492,7 +502,15 @@
-             s = s + " Demo";
-         }
- 
-        this.func_73731_b(this.field_146289_q, s, 2, this.field_146295_m - 10, -1);
-+        java.util.List<String> brandings = com.google.common.collect.Lists.reverse(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(true));
-+        for (int i = 0; i < brandings.size(); i++)
-+        {
-+            String brd = brandings.get(i);
-+            if (!com.google.common.base.Strings.isNullOrEmpty(brd))
-+            {
-+                this.func_73731_b(this.field_146289_q, brd, 2, this.field_146295_m - ( 10 + i * (this.field_146289_q.field_78288_b + 1)), 16777215);
-+            }
-+        }
-         String s1 = "Copyright Mojang AB. Do not distribute!";
-         this.func_73731_b(this.field_146289_q, s1, this.field_146294_l - this.field_146289_q.func_78256_a(s1) - 2, this.field_146295_m - 10, -1);
- 
--- a/fml/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
@ -1,11 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
-+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
-@@ -247,7 +247,7 @@
-     {
-         PacketThreadUtil.func_180031_a(p_147282_1_, this, this.field_147299_f);
-         this.field_147299_f.field_71442_b = new PlayerControllerMP(this.field_147299_f, this);
-        this.field_147300_g = new WorldClient(this, new WorldSettings(0L, p_147282_1_.func_149198_e(), false, p_147282_1_.func_149195_d(), p_147282_1_.func_149196_i()), p_147282_1_.func_149194_f(), p_147282_1_.func_149192_g(), this.field_147299_f.field_71424_I);
-+        this.field_147300_g = new WorldClient(this, new WorldSettings(0L, p_147282_1_.func_149198_e(), false, p_147282_1_.func_149195_d(), p_147282_1_.func_149196_i()), net.minecraftforge.fml.common.network.handshake.NetworkDispatcher.get(func_147298_b()).getOverrideDimension(p_147282_1_), p_147282_1_.func_149192_g(), this.field_147299_f.field_71424_I);
-         this.field_147299_f.field_71474_y.field_74318_M = p_147282_1_.func_149192_g();
-         this.field_147299_f.func_71403_a(this.field_147300_g);
-         this.field_147299_f.field_71439_g.field_71093_bK = p_147282_1_.func_149194_f();
--- a/fml/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch
@ -1,26 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/texture/Stitcher.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/Stitcher.java
-@@ -60,6 +60,7 @@
-     public void func_94305_f()
-     {
-         Stitcher.Holder[] aholder = (Stitcher.Holder[])this.field_94319_a.toArray(new Stitcher.Holder[this.field_94319_a.size()]);
-+        net.minecraftforge.fml.common.ProgressManager.ProgressBar bar = net.minecraftforge.fml.common.ProgressManager.push("Texture stitching", aholder.length);
-         Arrays.sort(aholder);
-         Stitcher.Holder[] aholder1 = aholder;
-         int i = aholder.length;
-@@ -67,6 +68,7 @@
-         for (int j = 0; j < i; ++j)
-         {
-             Stitcher.Holder holder = aholder1[j];
-+            bar.step(holder.func_98150_a().func_94215_i());
- 
-             if (!this.func_94310_b(holder))
-             {
-@@ -80,6 +82,7 @@
-             this.field_94318_c = MathHelper.func_151236_b(this.field_94318_c);
-             this.field_94315_d = MathHelper.func_151236_b(this.field_94315_d);
-         }
-+        net.minecraftforge.fml.common.ProgressManager.pop(bar);
-     }
- 
-     public List func_94309_g()
--- a/fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
@ -1,136 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureMap.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureMap.java
-@@ -29,6 +29,7 @@
- @SideOnly(Side.CLIENT)
- public class TextureMap extends AbstractTexture implements ITickableTextureObject
- {
-+    private static final boolean ENABLE_SKIP = Boolean.parseBoolean(System.getProperty("fml.skipFirstTextureLoad", "true"));
-     private static final Logger field_147635_d = LogManager.getLogger();
-     public static final ResourceLocation field_174945_f = new ResourceLocation("missingno");
-     public static final ResourceLocation field_110575_b = new ResourceLocation("textures/atlas/blocks.png");
-@@ -40,6 +41,7 @@
-     private int field_147636_j;
-     private final TextureAtlasSprite field_94249_f;
-     private static final String __OBFID = "CL_00001058";
-+    private boolean skipFirst = false;
- 
-     public TextureMap(String p_i46099_1_)
-     {
-@@ -48,12 +50,23 @@
- 
-     public TextureMap(String p_i46100_1_, IIconCreator p_i46100_2_)
-     {
-+        this(p_i46100_1_, p_i46100_2_, false);
-+    }
-+
-+    public TextureMap(String p_i46100_1_, boolean skipFirst)
-+    {
-+        this(p_i46100_1_, null, skipFirst);
-+    }
-+
-+    public TextureMap(String p_i46100_1_, IIconCreator iconCreatorIn, boolean skipFirst)
-+    {
-         this.field_94258_i = Lists.newArrayList();
-         this.field_110574_e = Maps.newHashMap();
-         this.field_94252_e = Maps.newHashMap();
-         this.field_94249_f = new TextureAtlasSprite("missingno");
-         this.field_94254_c = p_i46100_1_;
-        this.field_174946_m = p_i46100_2_;
-+        this.field_174946_m = iconCreatorIn;
-+        this.skipFirst = skipFirst && ENABLE_SKIP;
-     }
- 
-     private void func_110569_e()
-@@ -91,14 +104,16 @@
-         this.field_94258_i.clear();
-         int j = Integer.MAX_VALUE;
-         int k = 1 << this.field_147636_j;
-+        net.minecraftforge.fml.common.ProgressManager.ProgressBar bar = net.minecraftforge.fml.common.ProgressManager.push("Texture stitching", skipFirst ? 0 : this.field_110574_e.size());
-         Iterator iterator = this.field_110574_e.entrySet().iterator();
- 
-        while (iterator.hasNext())
-+        while (!skipFirst && iterator.hasNext())
-         {
-             Entry entry = (Entry)iterator.next();
-             TextureAtlasSprite textureatlassprite = (TextureAtlasSprite)entry.getValue();
-             ResourceLocation resourcelocation = new ResourceLocation(textureatlassprite.func_94215_i());
-             ResourceLocation resourcelocation1 = this.func_147634_a(resourcelocation, 0);
-+            bar.step(resourcelocation1.func_110623_a());
- 
-             try
-             {
-@@ -150,12 +165,14 @@
-             }
-             catch (RuntimeException runtimeexception)
-             {
-                field_147635_d.error("Unable to parse metadata from " + resourcelocation1, runtimeexception);
-+                //logger.error("Unable to parse metadata from " + resourcelocation1, runtimeexception);
-+                net.minecraftforge.fml.client.FMLClientHandler.instance().trackBrokenTexture(resourcelocation1, runtimeexception.getMessage());
-                 continue;
-             }
-             catch (IOException ioexception1)
-             {
-                field_147635_d.error("Using missing texture, unable to load " + resourcelocation1, ioexception1);
-+                //logger.error("Using missing texture, unable to load " + resourcelocation1, ioexception1);
-+                net.minecraftforge.fml.client.FMLClientHandler.instance().trackMissingTexture(resourcelocation1);
-                 continue;
-             }
- 
-@@ -171,6 +188,7 @@
-             stitcher.func_110934_a(textureatlassprite);
-         }
- 
-+        net.minecraftforge.fml.common.ProgressManager.pop(bar);
-         int j1 = Math.min(j, k);
-         int k1 = MathHelper.func_151239_c(j1);
- 
-@@ -181,10 +199,12 @@
-         }
- 
-         Iterator iterator1 = this.field_110574_e.values().iterator();
-+        bar = net.minecraftforge.fml.common.ProgressManager.push("Mipmap generation", skipFirst ? 0 : this.field_110574_e.size());
- 
-        while (iterator1.hasNext())
-+        while (!skipFirst && iterator1.hasNext())
-         {
-             final TextureAtlasSprite textureatlassprite1 = (TextureAtlasSprite)iterator1.next();
-+            bar.step(textureatlassprite1.func_94215_i());
- 
-             try
-             {
-@@ -225,9 +245,13 @@
- 
-         this.field_94249_f.func_147963_d(this.field_147636_j);
-         stitcher.func_110934_a(this.field_94249_f);
-+        net.minecraftforge.fml.common.ProgressManager.pop(bar);
-+        skipFirst = false;
-+        bar = net.minecraftforge.fml.common.ProgressManager.push("Texture creation", 3);
- 
-         try
-         {
-+            bar.step("Stitching");
-             stitcher.func_94305_f();
-         }
-         catch (StitcherException stitcherexception)
-@@ -236,11 +260,13 @@
-         }
- 
-         field_147635_d.info("Created: {}x{} {}-atlas", new Object[] {Integer.valueOf(stitcher.func_110935_a()), Integer.valueOf(stitcher.func_110936_b()), this.field_94254_c});
-+        bar.step("Allocating GL texture");
-         TextureUtil.func_180600_a(this.func_110552_b(), this.field_147636_j, stitcher.func_110935_a(), stitcher.func_110936_b());
-         HashMap hashmap = Maps.newHashMap(this.field_110574_e);
-         Iterator iterator2 = stitcher.func_94309_g().iterator();
-         TextureAtlasSprite textureatlassprite2;
- 
-+        bar.step("Uploading GL texture");
-         while (iterator2.hasNext())
-         {
-             textureatlassprite2 = (TextureAtlasSprite)iterator2.next();
-@@ -276,6 +302,7 @@
-         }
- 
-         TextureUtil.func_177055_a(this.field_94254_c.replaceAll("/", "_"), this.func_110552_b(), this.field_147636_j, stitcher.func_110935_a(), stitcher.func_110936_b());
-+        net.minecraftforge.fml.common.ProgressManager.pop(bar);
-     }
- 
-     private ResourceLocation func_147634_a(ResourceLocation p_147634_1_, int p_147634_2_)
--- a/fml/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.java.patch
+++ b/fml/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.java.patch
@ -1,41 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/resources/model/ModelBakery.java
-+++ ../src-work/minecraft/net/minecraft/client/resources/model/ModelBakery.java
-@@ -318,6 +318,7 @@
- 
-     private void func_177592_e()
-     {
-+        this.field_177613_u.clear(); //FML clear this to prevent double ups.
-         this.field_177613_u.put(Item.func_150898_a(Blocks.field_150348_b), Lists.newArrayList(new String[] {"stone", "granite", "granite_smooth", "diorite", "diorite_smooth", "andesite", "andesite_smooth"}));
-         this.field_177613_u.put(Item.func_150898_a(Blocks.field_150346_d), Lists.newArrayList(new String[] {"dirt", "coarse_dirt", "podzol"}));
-         this.field_177613_u.put(Item.func_150898_a(Blocks.field_150344_f), Lists.newArrayList(new String[] {"oak_planks", "spruce_planks", "birch_planks", "jungle_planks", "acacia_planks", "dark_oak_planks"}));
-@@ -360,6 +361,10 @@
-         this.field_177613_u.put(Item.func_150898_a(Blocks.field_180390_bo), Lists.newArrayList(new String[] {"oak_fence_gate"}));
-         this.field_177613_u.put(Item.func_150898_a(Blocks.field_180407_aO), Lists.newArrayList(new String[] {"oak_fence"}));
-         this.field_177613_u.put(Items.field_179570_aq, Lists.newArrayList(new String[] {"oak_door"}));
-+        for (Entry<net.minecraftforge.fml.common.registry.RegistryDelegate<Item>, Set<String>> e : customVariantNames.entrySet())
-+        {
-+            this.field_177613_u.put(e.getKey().get(), Lists.newArrayList(e.getValue().iterator()));
-+        }
-     }
- 
-     private List func_177596_a(Item p_177596_1_)
-@@ -809,4 +814,19 @@
-         field_177617_q.field_178317_b = "class generation marker";
-         field_177616_r.field_178317_b = "block entity marker";
-     }
-+    
-+    /***********************************************************
-+     * FML Start
-+     ***********************************************************/
-+    private static Map<net.minecraftforge.fml.common.registry.RegistryDelegate<Item>, Set<String>> customVariantNames = Maps.newHashMap();
-+    public static void addVariantName(Item item, String... names)
-+    {
-+        if (customVariantNames.containsKey(item.delegate))
-+            customVariantNames.get(item.delegate).addAll(Lists.newArrayList(names));
-+        else
-+            customVariantNames.put(item.delegate, Sets.newHashSet(names));
-+    }
-+    /***********************************************************
-+     * FML End
-+     ***********************************************************/
- }
--- a/fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch
+++ b/fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch
@ -1,60 +0,0 @@
--- ../src-base/minecraft/net/minecraft/entity/EntityList.java
-+++ ../src-work/minecraft/net/minecraft/entity/EntityList.java
-@@ -153,9 +153,10 @@
-             p_75615_0_.func_82580_o("Type");
-         }
- 
-+        Class oclass = null;
-         try
-         {
-            Class oclass = (Class)field_75625_b.get(p_75615_0_.func_74779_i("id"));
-+            oclass = (Class)field_75625_b.get(p_75615_0_.func_74779_i("id"));
- 
-             if (oclass != null)
-             {
-@@ -169,7 +170,17 @@
- 
-         if (entity != null)
-         {
-+            try
-+            {
-             entity.func_70020_e(p_75615_0_);
-+            }
-+            catch (Exception e)
-+            {
-+                net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e,
-+                        "An Entity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author",
-+                        p_75615_0_.func_74779_i("id"), oclass.getName());
-+                entity = null;
-+            }
-         }
-         else
-         {
-@@ -344,7 +355,9 @@
- 
-     public static class EntityEggInfo
-         {
-+            @Deprecated // This is not always a valid number in the global ID list.
-             public final int field_75613_a;
-+            public final String name;
-             public final int field_75611_b;
-             public final int field_75612_c;
-             public final StatBase field_151512_d;
-@@ -358,6 +371,17 @@
-                 this.field_75612_c = p_i1583_3_;
-                 this.field_151512_d = StatList.func_151182_a(this);
-                 this.field_151513_e = StatList.func_151176_b(this);
-+                this.name = EntityList.func_75617_a(p_i1583_1_);
-             }
-+
-+            public EntityEggInfo(String name, int primaryColor, int secondaryColor)
-+            {
-+                this.field_75613_a = -1;
-+                this.name = name;
-+                this.field_75611_b = primaryColor;
-+                this.field_75612_c = secondaryColor;
-+                this.field_151512_d = (new StatBase("stat.killEntity."     + name, new net.minecraft.util.ChatComponentTranslation("stat.entityKill",     new net.minecraft.util.ChatComponentTranslation("entity." + name + ".name")))).func_75971_g();
-+                this.field_151513_e = (new StatBase("stat.entityKilledBy." + name, new net.minecraft.util.ChatComponentTranslation("stat.entityKilledBy", new net.minecraft.util.ChatComponentTranslation("entity." + name + ".name")))).func_75971_g();
-+            }
-         }
- }
--- a/fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch
+++ b/fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch
@ -1,11 +0,0 @@
--- ../src-base/minecraft/net/minecraft/entity/EntityTracker.java
-+++ ../src-work/minecraft/net/minecraft/entity/EntityTracker.java
-@@ -58,6 +58,8 @@
- 
-     public void func_72786_a(Entity p_72786_1_)
-     {
-+        if (net.minecraftforge.fml.common.registry.EntityRegistry.instance().tryTrackingEntity(this, p_72786_1_)) return;
-+
-         if (p_72786_1_ instanceof EntityPlayerMP)
-         {
-             this.func_72791_a(p_72786_1_, 512, 2);
--- a/fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch
+++ b/fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch
@ -1,27 +0,0 @@
--- ../src-base/minecraft/net/minecraft/entity/EntityTrackerEntry.java
-+++ ../src-work/minecraft/net/minecraft/entity/EntityTrackerEntry.java
-@@ -388,6 +388,14 @@
-                     this.field_73138_k = this.field_73132_a.field_70181_x;
-                     this.field_73135_l = this.field_73132_a.field_70179_y;
- 
-+                    int posX = MathHelper.func_76128_c(this.field_73132_a.field_70165_t * 32.0D);
-+                    int posY = MathHelper.func_76128_c(this.field_73132_a.field_70163_u * 32.0D);
-+                    int posZ = MathHelper.func_76128_c(this.field_73132_a.field_70161_v * 32.0D);
-+                    if (posX != this.field_73128_d || posY != this.field_73129_e || posZ != this.field_73126_f)
-+                    {
-+                        net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.makeEntitySpawnAdjustment(this.field_73132_a, p_73117_1_, this.field_73128_d, this.field_73129_e, this.field_73126_f);
-+                    }
-+
-                     if (this.field_73143_t && !(packet instanceof S0FPacketSpawnMob))
-                     {
-                         p_73117_1_.field_71135_a.func_147359_a(new S12PacketEntityVelocity(this.field_73132_a.func_145782_y(), this.field_73132_a.field_70159_w, this.field_73132_a.field_70181_x, this.field_73132_a.field_70179_y));
-@@ -474,6 +482,9 @@
-             field_151262_p.warn("Fetching addPacket for removed entity");
-         }
- 
-+        Packet pkt = net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.getEntitySpawningPacket(this.field_73132_a);
-+        if (pkt != null) return pkt;
-+
-         if (this.field_73132_a instanceof EntityItem)
-         {
-             return new S0EPacketSpawnObject(this.field_73132_a, 2, 1);
--- a/fml/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch
+++ b/fml/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch
@ -1,10 +0,0 @@
--- ../src-base/minecraft/net/minecraft/entity/item/EntityItem.java
-+++ ../src-work/minecraft/net/minecraft/entity/item/EntityItem.java
-@@ -366,6 +366,7 @@
-                     }
-                 }
- 
-+                net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerItemPickupEvent(p_70100_1_, this);
-                 if (!this.func_174814_R())
-                 {
-                     this.field_70170_p.func_72956_a(p_70100_1_, "random.pop", 0.2F, ((this.field_70146_Z.nextFloat() - this.field_70146_Z.nextFloat()) * 0.7F + 1.0F) * 2.0F);
--- a/fml/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch
+++ b/fml/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch
--- a/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
+++ b/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
@ -1,49 +0,0 @@
--- ../src-base/minecraft/net/minecraft/entity/player/EntityPlayer.java
-+++ ../src-work/minecraft/net/minecraft/entity/player/EntityPlayer.java
-@@ -200,6 +200,7 @@
- 
-     public void func_70071_h_()
-     {
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().onPlayerPreTick(this);
-         this.field_70145_X = this.func_175149_v();
- 
-         if (this.func_175149_v())
-@@ -344,6 +345,7 @@
-         {
-             this.func_70107_b(d3, this.field_70163_u, d4);
-         }
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().onPlayerPostTick(this);
-     }
- 
-     public int func_82145_z()
-@@ -1725,6 +1727,7 @@
-         }
- 
-         EntityList.EntityEggInfo entityegginfo = (EntityList.EntityEggInfo)EntityList.field_75627_a.get(Integer.valueOf(EntityList.func_75619_a(p_70074_1_)));
-+        if (entityegginfo == null) entityegginfo = net.minecraftforge.fml.common.registry.EntityRegistry.getEggs().get(EntityList.func_75621_b(p_70074_1_));
- 
-         if (entityegginfo != null)
-         {
-@@ -2139,6 +2142,22 @@
-         this.field_175153_bG = p_175150_1_;
-     }
- 
-+    /**
-+     * Opens a GUI with this player, uses FML's IGuiHandler system.
-+     * Allows for extension by modders.
-+     *
-+     * @param mod The mod trying to open a GUI
-+     * @param modGuiId GUI ID
-+     * @param world Current World
-+     * @param x Passed directly to IGuiHandler, data meaningless Typically world X position
-+     * @param y Passed directly to IGuiHandler, data meaningless Typically world Y position
-+     * @param z Passed directly to IGuiHandler, data meaningless Typically world Z position
-+     */
-+    public void openGui(Object mod, int modGuiId, World world, int x, int y, int z)
-+    {
-+        net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z);
-+    }
-+
-     public static enum EnumChatVisibility
-     {
-         FULL(0, "options.chat.visibility.full"),
--- a/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch
+++ b/fml/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch
@ -1,10 +0,0 @@
--- ../src-base/minecraft/net/minecraft/entity/player/EntityPlayerMP.java
-+++ ../src-work/minecraft/net/minecraft/entity/player/EntityPlayerMP.java
-@@ -481,6 +481,7 @@
-         if (entitylivingbase != null)
-         {
-             EntityList.EntityEggInfo entityegginfo = (EntityList.EntityEggInfo)EntityList.field_75627_a.get(Integer.valueOf(EntityList.func_75619_a(entitylivingbase)));
-+            if (entityegginfo == null) entityegginfo = net.minecraftforge.fml.common.registry.EntityRegistry.getEggs().get(EntityList.func_75621_b(entitylivingbase));
- 
-             if (entityegginfo != null)
-             {
--- a/fml/patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch
+++ b/fml/patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch
@ -1,10 +0,0 @@
--- ../src-base/minecraft/net/minecraft/inventory/SlotCrafting.java
-+++ ../src-work/minecraft/net/minecraft/inventory/SlotCrafting.java
-@@ -113,6 +113,7 @@
- 
-     public void func_82870_a(EntityPlayer p_82870_1_, ItemStack p_82870_2_)
-     {
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerCraftingEvent(p_82870_1_, p_82870_2_, field_75239_a);
-         this.func_75208_c(p_82870_2_);
-         ItemStack[] aitemstack = CraftingManager.func_77594_a().func_180303_b(this.field_75239_a, p_82870_1_.field_70170_p);
- 
--- a/fml/patches/minecraft/net/minecraft/item/Item.java.patch
+++ b/fml/patches/minecraft/net/minecraft/item/Item.java.patch
@ -1,23 +0,0 @@
--- ../src-base/minecraft/net/minecraft/item/Item.java
-+++ ../src-work/minecraft/net/minecraft/item/Item.java
-@@ -47,8 +47,8 @@
- 
- public class Item
- {
-    public static final RegistryNamespaced field_150901_e = new RegistryNamespaced();
-    private static final Map field_179220_a = Maps.newHashMap();
-+    public static final RegistryNamespaced field_150901_e = net.minecraftforge.fml.common.registry.GameData.getItemRegistry();
-+    private static final Map field_179220_a = net.minecraftforge.fml.common.registry.GameData.getBlockItemMap();
-     protected static final UUID field_111210_e = UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF");
-     private CreativeTabs field_77701_a;
-     protected static Random field_77697_d = new Random();
-@@ -61,6 +61,9 @@
-     private String field_77774_bZ;
-     private static final String __OBFID = "CL_00000041";
- 
-+    public final net.minecraftforge.fml.common.registry.RegistryDelegate<Item> delegate =
-+            ((net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry)field_150901_e).getDelegate(this, Item.class);
-+
-     public static int func_150891_b(Item p_150891_0_)
-     {
-         return p_150891_0_ == null ? 0 : field_150901_e.func_148757_b(p_150891_0_);
--- a/fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch
+++ b/fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch
@ -1,50 +0,0 @@
--- ../src-base/minecraft/net/minecraft/item/ItemStack.java
-+++ ../src-work/minecraft/net/minecraft/item/ItemStack.java
-@@ -52,6 +52,7 @@
-     private boolean field_179551_k;
-     private static final String __OBFID = "CL_00000043";
- 
-+    private net.minecraftforge.fml.common.registry.RegistryDelegate<Item> delegate;
-     public ItemStack(Block p_i1876_1_)
-     {
-         this(p_i1876_1_, 1);
-@@ -83,7 +84,7 @@
-         this.field_179553_i = false;
-         this.field_179550_j = null;
-         this.field_179551_k = false;
-        this.field_151002_e = p_i1881_1_;
-+        this.func_150996_a(p_i1881_1_);
-         this.field_77994_a = p_i1881_2_;
-         this.field_77991_e = p_i1881_3_;
- 
-@@ -123,7 +124,7 @@
- 
-     public Item func_77973_b()
-     {
-        return this.field_151002_e;
-+        return this.delegate != null ? this.delegate.get() : null;
-     }
- 
-     public boolean func_179546_a(EntityPlayer p_179546_1_, World p_179546_2_, BlockPos p_179546_3_, EnumFacing p_179546_4_, float p_179546_5_, float p_179546_6_, float p_179546_7_)
-@@ -172,11 +173,11 @@
-     {
-         if (p_77963_1_.func_150297_b("id", 8))
-         {
-            this.field_151002_e = Item.func_111206_d(p_77963_1_.func_74779_i("id"));
-+            this.func_150996_a(Item.func_111206_d(p_77963_1_.func_74779_i("id")));
-         }
-         else
-         {
-            this.field_151002_e = Item.func_150899_d(p_77963_1_.func_74765_d("id"));
-+            this.func_150996_a(Item.func_150899_d(p_77963_1_.func_74765_d("id")));
-         }
- 
-         this.field_77994_a = p_77963_1_.func_74771_c("Count");
-@@ -870,6 +871,7 @@
- 
-     public void func_150996_a(Item p_150996_1_)
-     {
-+        this.delegate = p_150996_1_ != null ? p_150996_1_.delegate : null;
-         this.field_151002_e = p_150996_1_;
-     }
- 
--- a/fml/patches/minecraft/net/minecraft/network/ServerStatusResponse.java.patch
+++ b/fml/patches/minecraft/net/minecraft/network/ServerStatusResponse.java.patch
@ -1,18 +0,0 @@
--- ../src-base/minecraft/net/minecraft/network/ServerStatusResponse.java
-+++ ../src-work/minecraft/net/minecraft/network/ServerStatusResponse.java
-@@ -233,6 +233,7 @@
-                     serverstatusresponse.func_151320_a(JsonUtils.func_151200_h(jsonobject, "favicon"));
-                 }
- 
-+                net.minecraftforge.fml.client.FMLClientHandler.instance().captureAdditionalData(serverstatusresponse, jsonobject);
-                 return serverstatusresponse;
-             }
- 
-@@ -260,6 +261,7 @@
-                     jsonobject.addProperty("favicon", p_serialize_1_.func_151316_d());
-                 }
- 
-+                net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.enhanceStatusQuery(jsonobject);
-                 return jsonobject;
-             }
- 
--- a/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
+++ b/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
@ -1,115 +0,0 @@
--- ../src-base/minecraft/net/minecraft/server/MinecraftServer.java
-+++ ../src-work/minecraft/net/minecraft/server/MinecraftServer.java
-@@ -399,7 +399,7 @@
- 
-     public void func_71260_j()
-     {
-        if (!this.field_71290_O)
-+        if (!this.field_71290_O && net.minecraftforge.fml.common.Loader.instance().hasReachedState(net.minecraftforge.fml.common.LoaderState.SERVER_STARTED) && !field_71316_v) // make sure the save is valid and we don't save twice
-         {
-             field_147145_h.info("Stopping server");
- 
-@@ -456,6 +456,7 @@
-         {
-             if (this.func_71197_b())
-             {
-+                net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStarted();
-                 this.field_175591_ab = func_130071_aq();
-                 long i = 0L;
-                 this.field_147147_p.func_151315_a(new ChatComponentText(this.field_71286_C));
-@@ -500,12 +501,20 @@
-                     Thread.sleep(Math.max(1L, 50L - i));
-                     this.field_71296_Q = true;
-                 }
-+                net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStopping();
-+                net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
-             }
-             else
-             {
-+                net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
-                 this.func_71228_a((CrashReport)null);
-             }
-         }
-+        catch (net.minecraftforge.fml.common.StartupQuery.AbortedException e)
-+        {
-+            // ignore silently
-+            net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
-+        }
-         catch (Throwable throwable1)
-         {
-             field_147145_h.error("Encountered an unexpected exception", throwable1);
-@@ -531,6 +540,7 @@
-                 field_147145_h.error("We were unable to save this crash report to disk.");
-             }
- 
-+            net.minecraftforge.fml.common.FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
-             this.func_71228_a(crashreport);
-         }
-         finally
-@@ -546,6 +556,8 @@
-             }
-             finally
-             {
-+                net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStopped();
-+                this.field_71316_v = true;
-                 this.func_71240_o();
-             }
-         }
-@@ -591,6 +603,7 @@
-     public void func_71217_p()
-     {
-         long i = System.nanoTime();
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreServerTick();
-         ++this.field_71315_w;
- 
-         if (this.field_71295_T)
-@@ -644,6 +657,7 @@
- 
-         this.field_71304_b.func_76319_b();
-         this.field_71304_b.func_76319_b();
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostServerTick();
-     }
- 
-     public void func_71190_q()
-@@ -657,7 +671,7 @@
-             {
-                 try
-                 {
-                    ((FutureTask)this.field_175589_i.poll()).run();
-+                    net.minecraftforge.fml.common.FMLCommonHandler.callFuture(((FutureTask)this.field_175589_i.poll()));
-                 }
-                 catch (Throwable throwable2)
-                 {
-@@ -686,6 +700,7 @@
-                 }
- 
-                 this.field_71304_b.func_76320_a("tick");
-+                net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreWorldTick(worldserver);
-                 CrashReport crashreport;
- 
-                 try
-@@ -710,6 +725,7 @@
-                     throw new ReportedException(crashreport);
-                 }
- 
-+                net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostWorldTick(worldserver);
-                 this.field_71304_b.func_76319_b();
-                 this.field_71304_b.func_76320_a("tracker");
-                 worldserver.func_73039_n().func_72788_a();
-@@ -741,6 +757,7 @@
- 
-     public void func_71256_s()
-     {
-+        net.minecraftforge.fml.common.StartupQuery.reset();
-         this.field_175590_aa = new Thread(this, "Server thread");
-         this.field_175590_aa.start();
-     }
-@@ -787,7 +804,7 @@
- 
-     public String getServerModName()
-     {
-        return "vanilla";
-+        return net.minecraftforge.fml.common.FMLCommonHandler.instance().getModName();
-     }
- 
-     public CrashReport func_71230_b(CrashReport p_71230_1_)
--- a/fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch
+++ b/fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch
@ -1,23 +0,0 @@
--- ../src-base/minecraft/net/minecraft/server/integrated/IntegratedServer.java
-+++ ../src-work/minecraft/net/minecraft/server/integrated/IntegratedServer.java
-@@ -144,9 +144,10 @@
-         this.func_71245_h(true);
-         field_147148_h.info("Generating keypair");
-         this.func_71253_a(CryptManager.func_75891_b());
-+        if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerAboutToStart(this)) return false;
-         this.func_71247_a(this.func_71270_I(), this.func_71221_J(), this.field_71350_m.func_77160_d(), this.field_71350_m.func_77165_h(), this.field_71350_m.func_82749_j());
-         this.func_71205_p(this.func_71214_G() + " - " + this.field_71305_c[0].func_72912_H().func_76065_j());
-        return true;
-+        return net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStarting(this);
-     }
- 
-     public void func_71217_p()
-@@ -171,7 +172,7 @@
-                 {
-                     try
-                     {
-                        ((FutureTask)this.field_175589_i.poll()).run();
-+                        net.minecraftforge.fml.common.FMLCommonHandler.callFuture(((FutureTask)this.field_175589_i.poll()));
-                     }
-                     catch (Throwable throwable)
-                     {
--- a/fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch
+++ b/fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch
@ -1,76 +0,0 @@
--- ../src-base/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
-+++ ../src-work/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
-@@ -103,7 +103,7 @@
-         this.field_72405_c = 8;
-     }
- 
-    public void func_72355_a(NetworkManager p_72355_1_, EntityPlayerMP p_72355_2_)
-+    public void func_72355_a(NetworkManager p_72355_1_, EntityPlayerMP p_72355_2_, NetHandlerPlayServer nethandlerplayserver)
-     {
-         GameProfile gameprofile = p_72355_2_.func_146103_bH();
-         PlayerProfileCache playerprofilecache = this.field_72400_f.func_152358_ax();
-@@ -125,7 +125,7 @@
-         WorldInfo worldinfo = worldserver.func_72912_H();
-         BlockPos blockpos = worldserver.func_175694_M();
-         this.func_72381_a(p_72355_2_, (EntityPlayerMP)null, worldserver);
-        NetHandlerPlayServer nethandlerplayserver = new NetHandlerPlayServer(this.field_72400_f, p_72355_1_, p_72355_2_);
-+        p_72355_2_.field_71135_a = nethandlerplayserver;
-         nethandlerplayserver.func_147359_a(new S01PacketJoinGame(p_72355_2_.func_145782_y(), p_72355_2_.field_71134_c.func_73081_b(), worldinfo.func_76093_s(), worldserver.field_73011_w.func_177502_q(), worldserver.func_175659_aa(), this.func_72352_l(), worldinfo.func_76067_t(), worldserver.func_82736_K().func_82766_b("reducedDebugInfo")));
-         nethandlerplayserver.func_147359_a(new S3FPacketCustomPayload("MC|Brand", (new PacketBuffer(Unpooled.buffer())).func_180714_a(this.func_72365_p().getServerModName())));
-         nethandlerplayserver.func_147359_a(new S41PacketServerDifficulty(worldinfo.func_176130_y(), worldinfo.func_176123_z()));
-@@ -168,6 +168,7 @@
- 
-         p_72355_2_.func_71116_b();
- 
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerLoggedIn(p_72355_2_);
-         if (nbttagcompound != null && nbttagcompound.func_150297_b("Riding", 10))
-         {
-             Entity entity = EntityList.func_75615_a(nbttagcompound.func_74775_l("Riding"), worldserver);
-@@ -281,8 +282,23 @@
-         return nbttagcompound1;
-     }
- 
-+    public NBTTagCompound getPlayerNBT(EntityPlayerMP player)
-+    {
-+        // Hacky method to allow loading the NBT for a player prior to login
-+        NBTTagCompound nbttagcompound = this.field_72400_f.field_71305_c[0].func_72912_H().func_76072_h();
-+        if (player.func_70005_c_().equals(this.field_72400_f.func_71214_G()) && nbttagcompound != null)
-+        {
-+            return nbttagcompound;
-+        }
-+        else
-+        {
-+            return ((net.minecraft.world.storage.SaveHandler)this.field_72412_k).getPlayerNBT(player);
-+        }
-+    }
-     protected void func_72391_b(EntityPlayerMP p_72391_1_)
-     {
-+        if (p_72391_1_.field_71135_a == null) return;
-+
-         this.field_72412_k.func_75753_a(p_72391_1_);
-         StatisticsFile statisticsfile = (StatisticsFile)this.field_148547_k.get(p_72391_1_.func_110124_au());
- 
-@@ -315,6 +331,7 @@
- 
-     public void func_72367_e(EntityPlayerMP p_72367_1_)
-     {
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerLoggedOut(p_72367_1_);
-         p_72367_1_.func_71029_a(StatList.field_75947_j);
-         this.func_72391_b(p_72367_1_);
-         WorldServer worldserver = p_72367_1_.func_71121_q();
-@@ -473,6 +490,7 @@
-         this.field_177454_f.put(entityplayermp1.func_110124_au(), entityplayermp1);
-         entityplayermp1.func_71116_b();
-         entityplayermp1.func_70606_j(entityplayermp1.func_110143_aJ());
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerRespawnEvent(entityplayermp1);
-         return entityplayermp1;
-     }
- 
-@@ -498,6 +516,7 @@
-             PotionEffect potioneffect = (PotionEffect)iterator.next();
-             p_72356_1_.field_71135_a.func_147359_a(new S1DPacketEntityEffect(p_72356_1_.func_145782_y(), potioneffect));
-         }
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerChangedDimensionEvent(p_72356_1_, j, p_72356_2_);
-     }
- 
-     public void func_82448_a(Entity p_82448_1_, int p_82448_2_, WorldServer p_82448_3_, WorldServer p_82448_4_)
--- a/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch
+++ b/fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch
@ -1,40 +0,0 @@
--- ../src-base/minecraft/net/minecraft/tileentity/TileEntity.java
-+++ ../src-work/minecraft/net/minecraft/tileentity/TileEntity.java
-@@ -89,9 +89,10 @@
-     {
-         TileEntity tileentity = null;
- 
-+        Class oclass = null;
-         try
-         {
-            Class oclass = (Class)field_145855_i.get(p_145827_0_.func_74779_i("id"));
-+            oclass = (Class)field_145855_i.get(p_145827_0_.func_74779_i("id"));
- 
-             if (oclass != null)
-             {
-@@ -109,7 +110,17 @@
-         }
-         else
-         {
-+            try
-+            {
-             field_145852_a.warn("Skipping BlockEntity with id " + p_145827_0_.func_74779_i("id"));
-+            }
-+            catch (Exception ex)
-+            {
-+                net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, ex,
-+                        "A TileEntity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author",
-+                        p_145827_0_.func_74779_i("id"), oclass.getName());
-+                tileentity = null;
-+            }
-         }
- 
-         return tileentity;
-@@ -141,7 +152,6 @@
-         }
-     }
- 
-    @SideOnly(Side.CLIENT)
-     public double func_145835_a(double p_145835_1_, double p_145835_3_, double p_145835_5_)
-     {
-         double d3 = (double)this.field_174879_c.func_177958_n() + 0.5D - p_145835_1_;
--- a/fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch
+++ b/fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch
@ -1,19 +0,0 @@
--- ../src-base/minecraft/net/minecraft/tileentity/TileEntityFurnace.java
-+++ ../src-work/minecraft/net/minecraft/tileentity/TileEntityFurnace.java
-@@ -348,7 +348,15 @@
-                 }
-             }
- 
-            return item instanceof ItemTool && ((ItemTool)item).func_77861_e().equals("WOOD") ? 200 : (item instanceof ItemSword && ((ItemSword)item).func_150932_j().equals("WOOD") ? 200 : (item instanceof ItemHoe && ((ItemHoe)item).func_77842_f().equals("WOOD") ? 200 : (item == Items.field_151055_y ? 100 : (item == Items.field_151044_h ? 1600 : (item == Items.field_151129_at ? 20000 : (item == Item.func_150898_a(Blocks.field_150345_g) ? 100 : (item == Items.field_151072_bj ? 2400 : 0)))))));
-+            if (item instanceof ItemTool && ((ItemTool)item).func_77861_e().equals("WOOD")) return 200;
-+            if (item instanceof ItemSword && ((ItemSword)item).func_150932_j().equals("WOOD")) return 200;
-+            if (item instanceof ItemHoe && ((ItemHoe)item).func_77842_f().equals("WOOD")) return 200;
-+            if (item == Items.field_151055_y) return 100;
-+            if (item == Items.field_151044_h) return 1600;
-+            if (item == Items.field_151129_at) return 20000;
-+            if (item == Item.func_150898_a(Blocks.field_150345_g)) return 100;
-+            if (item == Items.field_151072_bj) return 2400;
-+            return net.minecraftforge.fml.common.registry.GameRegistry.getFuelValue(p_145952_0_);
-         }
-     }
- 
--- a/fml/patches/minecraft/net/minecraft/world/World.java.patch
+++ b/fml/patches/minecraft/net/minecraft/world/World.java.patch
@ -1,29 +0,0 @@
--- ../src-base/minecraft/net/minecraft/world/World.java
-+++ ../src-work/minecraft/net/minecraft/world/World.java
-@@ -1626,8 +1626,6 @@
-             }
-         }
- 
-        this.field_147481_N = false;
-
-         if (!this.field_147483_b.isEmpty())
-         {
-             this.field_175730_i.removeAll(this.field_147483_b);
-@@ -1635,6 +1633,8 @@
-             this.field_147483_b.clear();
-         }
- 
-+        this.field_147481_N = false;  //FML Move below remove to prevent CMEs
-+
-         this.field_72984_F.func_76318_c("pendingBlockEntities");
- 
-         if (!this.field_147484_a.isEmpty())
-@@ -3429,7 +3429,7 @@
-     @SideOnly(Side.CLIENT)
-     public double func_72919_O()
-     {
-        return this.field_72986_A.func_76067_t() == WorldType.field_77138_c ? 0.0D : 63.0D;
-+        return this.field_72986_A.func_76067_t().getHorizon(this);
-     }
- 
-     public void func_175715_c(int p_175715_1_, BlockPos p_175715_2_, int p_175715_3_)
--- a/fml/patches/minecraft/net/minecraft/world/WorldProvider.java.patch
+++ b/fml/patches/minecraft/net/minecraft/world/WorldProvider.java.patch
@ -1,47 +0,0 @@
--- ../src-base/minecraft/net/minecraft/world/WorldProvider.java
-+++ ../src-work/minecraft/net/minecraft/world/WorldProvider.java
-@@ -52,26 +52,12 @@
- 
-     protected void func_76572_b()
-     {
-        WorldType worldtype = this.field_76579_a.func_72912_H().func_76067_t();
-
-        if (worldtype == WorldType.field_77138_c)
-        {
-            FlatGeneratorInfo flatgeneratorinfo = FlatGeneratorInfo.func_82651_a(this.field_76579_a.func_72912_H().func_82571_y());
-            this.field_76578_c = new WorldChunkManagerHell(BiomeGenBase.func_180276_a(flatgeneratorinfo.func_82648_a(), BiomeGenBase.field_180279_ad), 0.5F);
-        }
-        else if (worldtype == WorldType.field_180272_g)
-        {
-            this.field_76578_c = new WorldChunkManagerHell(BiomeGenBase.field_76772_c, 0.0F);
-        }
-        else
-        {
-            this.field_76578_c = new WorldChunkManager(this.field_76579_a);
-        }
-+        this.field_76578_c = field_76577_b.getChunkManager(field_76579_a);
-     }
- 
-     public IChunkProvider func_76555_c()
-     {
-        return (IChunkProvider)(this.field_76577_b == WorldType.field_77138_c ? new ChunkProviderFlat(this.field_76579_a, this.field_76579_a.func_72905_C(), this.field_76579_a.func_72912_H().func_76089_r(), this.field_82913_c) : (this.field_76577_b == WorldType.field_180272_g ? new ChunkProviderDebug(this.field_76579_a) : (this.field_76577_b == WorldType.field_180271_f ? new ChunkProviderGenerate(this.field_76579_a, this.field_76579_a.func_72905_C(), this.field_76579_a.func_72912_H().func_76089_r(), this.field_82913_c) : new ChunkProviderGenerate(this.field_76579_a, this.field_76579_a.func_72905_C(), this.field_76579_a.func_72912_H().func_76089_r(), this.field_82913_c))));
-+        return field_76577_b.getChunkGenerator(field_76579_a, field_82913_c);
-     }
- 
-     public boolean func_76566_a(int p_76566_1_, int p_76566_2_)
-@@ -177,13 +163,13 @@
- 
-     public int func_76557_i()
-     {
-        return this.field_76577_b == WorldType.field_77138_c ? 4 : 64;
-+        return this.field_76577_b.getMinimumSpawnHeight(this.field_76579_a);
-     }
- 
-     @SideOnly(Side.CLIENT)
-     public double func_76565_k()
-     {
-        return this.field_76577_b == WorldType.field_77138_c ? 1.0D : 0.03125D;
-+        return this.field_76577_b.voidFadeMagnitude();
-     }
- 
-     @SideOnly(Side.CLIENT)
--- a/fml/patches/minecraft/net/minecraft/world/WorldType.java.patch
+++ b/fml/patches/minecraft/net/minecraft/world/WorldType.java.patch
@ -1,56 +0,0 @@
--- ../src-base/minecraft/net/minecraft/world/WorldType.java
-+++ ../src-work/minecraft/net/minecraft/world/WorldType.java
-@@ -114,4 +114,53 @@
-         this.field_151361_l = true;
-         return this;
-     }
-+
-+    public net.minecraft.world.biome.WorldChunkManager getChunkManager(World world)
-+    {
-+        if (this == field_77138_c)
-+        {
-+            net.minecraft.world.gen.FlatGeneratorInfo flatgeneratorinfo = net.minecraft.world.gen.FlatGeneratorInfo.func_82651_a(world.func_72912_H().func_82571_y());
-+            return new net.minecraft.world.biome.WorldChunkManagerHell(net.minecraft.world.biome.BiomeGenBase.func_180276_a(flatgeneratorinfo.func_82648_a(), net.minecraft.world.biome.BiomeGenBase.field_180279_ad), 0.5F);
-+        }
-+        else if (this == field_180272_g)
-+        {
-+            return new net.minecraft.world.biome.WorldChunkManagerHell(net.minecraft.world.biome.BiomeGenBase.field_76772_c, 0.0F);
-+        }
-+        else
-+        {
-+            return new net.minecraft.world.biome.WorldChunkManager(world);
-+        }
-+    }
-+
-+    public net.minecraft.world.chunk.IChunkProvider getChunkGenerator(World world, String generatorOptions)
-+    {
-+        if (this == field_77138_c) return new net.minecraft.world.gen.ChunkProviderFlat(world, world.func_72905_C(), world.func_72912_H().func_76089_r(), generatorOptions);
-+        if (this == field_180272_g) return new net.minecraft.world.gen.ChunkProviderDebug(world);
-+        return new net.minecraft.world.gen.ChunkProviderGenerate(world, world.func_72905_C(), world.func_72912_H().func_76089_r(), generatorOptions);
-+    }
-+
-+    public int getMinimumSpawnHeight(World world)
-+    {
-+        return this == field_77138_c ? 4 : 64;
-+    }
-+
-+    public double getHorizon(World world)
-+    {
-+        return this == field_77138_c ? 0.0D : 63.0D;
-+    }
-+
-+    public double voidFadeMagnitude()
-+    {
-+        return this == field_77138_c ? 1.0D : 0.03125D;
-+    }
-+
-+    public boolean handleSlimeSpawnReduction(java.util.Random random, World world)
-+    {
-+        return this == field_77138_c ? random.nextInt(4) != 1 : false;
-+    }
-+
-+    /**
-+     * Called when 'Create New World' button is pressed before starting game
-+     */
-+    public void onGUICreateWorldPress() { }
- }
--- a/fml/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch
+++ b/fml/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch
@ -1,41 +0,0 @@
--- ../src-base/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
-+++ ../src-work/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
-@@ -287,11 +287,20 @@
-                 Entity entity = (Entity)iterator.next();
-                 nbttagcompound1 = new NBTTagCompound();
- 
-+                try
-+                {
-                 if (entity.func_70039_c(nbttagcompound1))
-                 {
-                     p_75820_1_.func_177409_g(true);
-                     nbttaglist1.func_74742_a(nbttagcompound1);
-                 }
-+                }
-+                catch (Exception e)
-+                {
-+                    net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e,
-+                            "An Entity type %s has thrown an exception trying to write state. It will not persist. Report this to the mod author",
-+                            entity.getClass().getName());
-+                }
-             }
-         }
- 
-@@ -303,8 +312,17 @@
-         {
-             TileEntity tileentity = (TileEntity)iterator.next();
-             nbttagcompound1 = new NBTTagCompound();
-+            try
-+            {
-             tileentity.func_145841_b(nbttagcompound1);
-             nbttaglist2.func_74742_a(nbttagcompound1);
-+            }
-+            catch (Exception e)
-+            {
-+                net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, e,
-+                        "A TileEntity type %s has throw an exception trying to write state. It will not persist. Report this to the mod author",
-+                        tileentity.getClass().getName());
-+            }
-         }
- 
-         p_75820_3_.func_74782_a("TileEntities", nbttaglist2);
--- a/fml/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch
+++ b/fml/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch
@ -1,10 +0,0 @@
--- ../src-base/minecraft/net/minecraft/world/gen/ChunkProviderServer.java
-+++ ../src-work/minecraft/net/minecraft/world/gen/ChunkProviderServer.java
-@@ -209,6 +209,7 @@
-             if (this.field_73246_d != null)
-             {
-                 this.field_73246_d.func_73153_a(p_73153_1_, p_73153_2_, p_73153_3_);
-+                net.minecraftforge.fml.common.registry.GameRegistry.generateWorld(p_73153_2_, p_73153_3_, field_73251_h, field_73246_d, p_73153_1_);
-                 chunk.func_76630_e();
-             }
-         }
--- a/fml/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch
+++ b/fml/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch
@ -1,22 +0,0 @@
--- ../src-base/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java
-+++ ../src-work/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java
-@@ -59,6 +59,8 @@
-         arraylist.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.Field2.class, 3, MathHelper.func_76136_a(p_75084_0_, 2 + p_75084_1_, 4 + p_75084_1_ * 2)));
-         arraylist.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.House2.class, 15, MathHelper.func_76136_a(p_75084_0_, 0, 1 + p_75084_1_)));
-         arraylist.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.House3.class, 8, MathHelper.func_76136_a(p_75084_0_, 0 + p_75084_1_, 3 + p_75084_1_ * 2)));
-+        net.minecraftforge.fml.common.registry.VillagerRegistry.addExtraVillageComponents(arraylist, p_75084_0_, p_75084_1_);
-+
-         Iterator iterator = arraylist.iterator();
- 
-         while (iterator.hasNext())
-@@ -132,6 +134,10 @@
-         {
-             object = StructureVillagePieces.House3.func_175849_a(p_176065_0_, p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_);
-         }
-+        else
-+        {
-+            object = net.minecraftforge.fml.common.registry.VillagerRegistry.getVillageComponent(p_176065_1_, p_176065_0_ , p_176065_2_, p_176065_3_, p_176065_4_, p_176065_5_, p_176065_6_, p_176065_7_, p_176065_8_);
-+        }
- 
-         return (StructureVillagePieces.Village)object;
-     }
--- a/fml/patches/minecraft/net/minecraft/world/storage/MapData.java.patch
+++ b/fml/patches/minecraft/net/minecraft/world/storage/MapData.java.patch
@ -1,39 +0,0 @@
--- ../src-base/minecraft/net/minecraft/world/storage/MapData.java
-+++ ../src-work/minecraft/net/minecraft/world/storage/MapData.java
-@@ -22,7 +22,7 @@
- {
-     public int field_76201_a;
-     public int field_76199_b;
-    public byte field_76200_c;
-+    public int field_76200_c; //FML byte -> int
-     public byte field_76197_d;
-     public byte[] field_76198_e = new byte[16384];
-     public List field_76196_g = Lists.newArrayList();
-@@ -46,7 +46,17 @@
- 
-     public void func_76184_a(NBTTagCompound p_76184_1_)
-     {
-        this.field_76200_c = p_76184_1_.func_74771_c("dimension");
-+        net.minecraft.nbt.NBTBase dimension = p_76184_1_.func_74781_a("dimension");
-+
-+        if (dimension instanceof net.minecraft.nbt.NBTTagByte)
-+        {
-+            this.field_76200_c = ((net.minecraft.nbt.NBTTagByte)dimension).func_150290_f();
-+        }
-+        else
-+        {
-+            this.field_76200_c = ((net.minecraft.nbt.NBTTagInt)dimension).func_150287_d();
-+        }
-+
-         this.field_76201_a = p_76184_1_.func_74762_e("xCenter");
-         this.field_76199_b = p_76184_1_.func_74762_e("zCenter");
-         this.field_76197_d = p_76184_1_.func_74771_c("scale");
-@@ -87,7 +97,7 @@
- 
-     public void func_76187_b(NBTTagCompound p_76187_1_)
-     {
-        p_76187_1_.func_74774_a("dimension", this.field_76200_c);
-+        p_76187_1_.func_74768_a("dimension", this.field_76200_c);
-         p_76187_1_.func_74768_a("xCenter", this.field_76201_a);
-         p_76187_1_.func_74768_a("zCenter", this.field_76199_b);
-         p_76187_1_.func_74774_a("scale", this.field_76197_d);
--- a/fml/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch
+++ b/fml/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch
@ -1,89 +0,0 @@
--- ../src-base/minecraft/net/minecraft/world/storage/SaveHandler.java
-+++ ../src-work/minecraft/net/minecraft/world/storage/SaveHandler.java
-@@ -107,20 +107,29 @@
-         NBTTagCompound nbttagcompound;
-         NBTTagCompound nbttagcompound1;
- 
-+        WorldInfo worldInfo = null;
-+
-         if (file1.exists())
-         {
-             try
-             {
-                 nbttagcompound = CompressedStreamTools.func_74796_a(new FileInputStream(file1));
-                 nbttagcompound1 = nbttagcompound.func_74775_l("Data");
-                return new WorldInfo(nbttagcompound1);
-+                worldInfo = new WorldInfo(nbttagcompound1);
-+                net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound);
-+                return worldInfo;
-             }
-+            catch (net.minecraftforge.fml.common.StartupQuery.AbortedException e)
-+            {
-+                throw e;
-+            }
-             catch (Exception exception1)
-             {
-                 exception1.printStackTrace();
-             }
-         }
- 
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().confirmBackupLevelDatUse(this);
-         file1 = new File(this.field_75770_b, "level.dat_old");
- 
-         if (file1.exists())
-@@ -129,7 +138,13 @@
-             {
-                 nbttagcompound = CompressedStreamTools.func_74796_a(new FileInputStream(file1));
-                 nbttagcompound1 = nbttagcompound.func_74775_l("Data");
-                return new WorldInfo(nbttagcompound1);
-+                worldInfo = new WorldInfo(nbttagcompound1);
-+                net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound);
-+                return worldInfo;
-+             }
-+            catch (net.minecraftforge.fml.common.StartupQuery.AbortedException e)
-+            {
-+                throw e;
-             }
-             catch (Exception exception)
-             {
-@@ -146,6 +161,8 @@
-         NBTTagCompound nbttagcompound2 = new NBTTagCompound();
-         nbttagcompound2.func_74782_a("Data", nbttagcompound1);
- 
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataSave(this, p_75755_1_, nbttagcompound2);
-+
-         try
-         {
-             File file1 = new File(this.field_75770_b, "level.dat_new");
-@@ -184,6 +201,8 @@
-         NBTTagCompound nbttagcompound1 = new NBTTagCompound();
-         nbttagcompound1.func_74782_a("Data", nbttagcompound);
- 
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().handleWorldDataSave(this, p_75761_1_, nbttagcompound1);
-+
-         try
-         {
-             File file1 = new File(this.field_75770_b, "level.dat_new");
-@@ -301,4 +320,22 @@
-     {
-         return this.field_75767_f;
-     }
-+
-+    public NBTTagCompound getPlayerNBT(net.minecraft.entity.player.EntityPlayerMP player)
-+    {
-+        try
-+        {
-+            File file1 = new File(this.field_75771_c, player.func_110124_au().toString() + ".dat");
-+
-+            if (file1.exists() && file1.isFile())
-+            {
-+                return CompressedStreamTools.func_74796_a(new FileInputStream(file1));
-+            }
-+        }
-+        catch (Exception exception)
-+        {
-+            field_151478_a.warn("Failed to load player data for " + player.func_70005_c_());
-+        }
-+        return null;
-+    }
- }
--- a/fml/settings.gradle
+++ b/fml/settings.gradle
@ -1 +0,0 @@
-rootProject.name = 'fml'
--- a/fml/src/main/resources/fml.exc
+++ b/fml/src/main/resources/fml.exc
@ -1,2 +0,0 @@
-net/minecraft/server/management/ServerConfigurationManager.initializeConnectionToPlayer(Lnet/minecraft/network/NetworkManager;Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/network/NetHandlerPlayServer;)V=|p_72355_1_,p_72355_2_,nethandlerplayserver
-net/minecraft/item/ItemMonsterPlacer.spawnCreature(Lnet/minecraft/world/World;Ljava/lang/String;DDD)Lnet/minecraft/entity/Entity;=|p_77840_0_,name,p_77840_2_,p_77840_4_,p_77840_6_
--- a/fml/src/main/resources/fml_at.cfg
+++ b/fml/src/main/resources/fml_at.cfg
@ -1,85 +0,0 @@
-#Main FML Access Transformer configuration file
-# TileEntity addMapping
-public net.minecraft.tileentity.TileEntity func_145826_a(Ljava/lang/Class;Ljava/lang/String;)V
-# EntityList addMappings
-public net.minecraft.entity.EntityList func_75618_a(Ljava/lang/Class;Ljava/lang/String;I)V
-public net.minecraft.entity.EntityList func_75614_a(Ljava/lang/Class;Ljava/lang/String;III)V
-public net.minecraft.entity.EntityList field_75625_b #nameToClassMap
-public net.minecraft.entity.EntityList field_75626_c #classToNameMap
-public net.minecraft.entity.EntityList field_75623_d #idToClassMap
-## RenderManager
-public net.minecraft.client.renderer.entity.RenderManager field_78729_o #renderers
-## TileEntityRendererDispatcher
-public net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher field_147559_m
-## CraftingManager - make the add recipe methods public
-public net.minecraft.item.crafting.CraftingManager func_92103_a(Lnet.minecraft.item.ItemStack;[Ljava/lang/Object;)Lnet.minecraft.item.crafting.ShapedRecipes;
-public net.minecraft.item.crafting.CraftingManager func_77596_b(Lnet.minecraft.item.ItemStack;[Ljava/lang/Object;)V
-## WeightedRandomItem
-public net.minecraft.util.WeightedRandom$Item field_76292_a #probability
-## EntityPlayerMP getNextWindowId
-public net.minecraft.entity.player.EntityPlayerMP func_71117_bO()V
-public net.minecraft.entity.player.EntityPlayerMP field_71139_cq
-## EntityAITaskEntry
-public net.minecraft.entity.ai.EntityAITasks$EntityAITaskEntry
-## EntityLiving
-public net.minecraft.entity.EntityLiving field_70714_bg #tasks
-public net.minecraft.entity.EntityLiving field_70715_bh #targetTasks
-## EntityVillager - minmax lists
-public net.minecraft.entity.passive.EntityVillager func_146091_a(Lnet/minecraft/village/MerchantRecipeList;Lnet/minecraft/item/Item;Ljava/util/Random;F)V # buy
-public net.minecraft.entity.passive.EntityVillager func_146089_b(Lnet/minecraft/village/MerchantRecipeList;Lnet/minecraft/item/Item;Ljava/util/Random;F)V # sell
-public net.minecraft.entity.passive.EntityVillager field_70958_bB
-public net.minecraft.entity.passive.EntityVillager field_70960_bC
-# GuiScreen
-public net.minecraft.client.gui.GuiScreen field_146297_k # minecraft instance - public because gui's outside access it
-# Minecraft
-public net.minecraft.client.Minecraft field_71446_o # textureManager
-public net.minecraft.client.Minecraft field_110450_ap # mcDefaultResourcePack
-public net.minecraft.client.Minecraft func_71370_a(II)V # resize
-public net.minecraft.client.Minecraft func_180510_a(Lnet/minecraft/client/renderer/texture/TextureManager;)V # drawSplashScreen
-## ItemBlock
-public net.minecraft.item.ItemBlock field_150939_a
-## DedicatedServer
-public net.minecraft.server.dedicated.DedicatedServer field_71341_l # pendingCommandList
-## SaveFormatOld
-public net.minecraft.world.storage.SaveFormatOld field_75808_a # savesDirectory
-
-protected net.minecraft.util.ObjectIntIdentityMap field_148749_a # internal map
-protected net.minecraft.util.ObjectIntIdentityMap field_148748_b # internal index list
-protected-f net.minecraft.util.RegistryNamespaced field_148759_a # identitymap
-
-# GuiButton
-public net.minecraft.client.gui.GuiButton field_146120_f # width - needed for config GUI stuff
-public net.minecraft.client.gui.GuiButton field_146121_g # height - needed for config GUI stuff
-# GuiTextField
-public-f net.minecraft.client.gui.GuiTextField field_146209_f # xPosition - needed for config GUI stuff
-public-f net.minecraft.client.gui.GuiTextField field_146210_g # yPosition - needed for config GUI stuff
-public-f net.minecraft.client.gui.GuiTextField field_146218_h # width - needed for config GUI stuff
-public-f net.minecraft.client.gui.GuiTextField field_146219_i # height - needed for config GUI stuff
-# GuiSlot
-public net.minecraft.client.gui.GuiSlot field_148149_f # slotHeight - needed for config GUI stuff
-public net.minecraft.client.gui.GuiSlot field_148151_d # right - needed for config GUI stuff
-public net.minecraft.client.gui.GuiSlot field_148152_e # left - needed for config GUI stuff
-public net.minecraft.client.gui.GuiSlot field_148153_b # top - needed for config GUI stuff
-public net.minecraft.client.gui.GuiSlot field_148154_c # bottom - needed for config GUI stuff
-public net.minecraft.client.gui.GuiSlot field_148155_a # width - needed for config GUI stuff
-public net.minecraft.client.gui.GuiSlot field_148158_l # height - needed for config GUI stuff
-public net.minecraft.client.gui.GuiSlot field_148160_j # headerPadding - needed for config GUI stuff
-
-# Villager Traid Classes
-public net.minecraft.entity.passive.EntityVillager$EmeraldForItems
-public net.minecraft.entity.passive.EntityVillager$ITradeList
-public net.minecraft.entity.passive.EntityVillager$ItemAndEmeraldToItem
-public net.minecraft.entity.passive.EntityVillager$ListEnchantedBookForEmeralds
-public net.minecraft.entity.passive.EntityVillager$ListEnchantedItemForEmeralds
-public net.minecraft.entity.passive.EntityVillager$ListItemForEmeralds
-public net.minecraft.entity.passive.EntityVillager$PriceInfo
-
-# Font renderer
-protected net.minecraft.client.gui.FontRenderer field_78288_b # FONT_HEIGHT
-protected net.minecraft.client.gui.FontRenderer field_78286_d # charWidth
-protected net.minecraft.client.gui.FontRenderer field_78287_e # glyphWidth
-protected net.minecraft.client.gui.FontRenderer field_111273_g # locationFontTexture
-protected net.minecraft.client.gui.FontRenderer field_78295_j # posX
-protected net.minecraft.client.gui.FontRenderer field_78296_k # posY
-protected net.minecraft.client.gui.FontRenderer func_78266_a(IZ)F # renderDefaultChar
-protected net.minecraft.client.gui.FontRenderer func_78277_a(CZ)F # renderUnicodeChar
--- a/fml/src/main/resources/fml_marker.cfg
+++ b/fml/src/main/resources/fml_marker.cfg
@ -1,3 +0,0 @@
-# Marker interfaces to add to minecraft - helps in bukkit and client/server unification
-# Only runs at runtime because it's not necessary at compile time
-# has deobf and obf mappings so it runs OK in mcp
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/fml/gradle/wrapper/gradle-wrapper.properties
+++ b/fml/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
-#Wed Jul 02 15:54:47 CDT 2014
+#Sat May 16 19:56:41 CDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
--- a/2
+++ b/2
@ -65,7 +65,7 @@ cd "`dirname \"$PRG\"`/" >&-
 APP_HOME="`pwd -P`"
 cd "$SAVED" >&-

-CLASSPATH=$APP_HOME/fml/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
--- a/gradlew.bat
+++ b/gradlew.bat
@ -69,7 +69,7 @@ set CMD_LINE_ARGS=%$
 :execute
@rem Setup the command line

-set CLASSPATH=%APP_HOME%\fml\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

@rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
--- a/icon.ico
+++ b/icon.ico
--- a/fml/jsons/1.6-dev.json
+++ b/fml/jsons/1.6-dev.json
--- a/fml/jsons/1.6-rel.json
+++ b/fml/jsons/1.6-rel.json
--- a/fml/jsons/1.6.1-dev.json
+++ b/fml/jsons/1.6.1-dev.json
--- a/fml/jsons/1.6.1-rel.json
+++ b/fml/jsons/1.6.1-rel.json
--- a/fml/jsons/1.6.2-dev.json
+++ b/fml/jsons/1.6.2-dev.json
--- a/fml/jsons/1.6.2-rel.json
+++ b/fml/jsons/1.6.2-rel.json
--- a/fml/jsons/1.6.3-dev.json
+++ b/fml/jsons/1.6.3-dev.json
--- a/fml/jsons/1.6.3-rel.json
+++ b/fml/jsons/1.6.3-rel.json
--- a/fml/jsons/1.6.4-dev.json
+++ b/fml/jsons/1.6.4-dev.json
--- a/fml/jsons/1.6.4-rel.json
+++ b/fml/jsons/1.6.4-rel.json
--- a/fml/jsons/1.7.10-dev.json
+++ b/fml/jsons/1.7.10-dev.json
--- a/fml/jsons/1.7.10-pre3-dev.json
+++ b/fml/jsons/1.7.10-pre3-dev.json
--- a/fml/jsons/1.7.10-pre3.json
+++ b/fml/jsons/1.7.10-pre3.json
--- a/fml/jsons/1.7.10-pre4-dev.json
+++ b/fml/jsons/1.7.10-pre4-dev.json
--- a/fml/jsons/1.7.10-pre4-rel.json
+++ b/fml/jsons/1.7.10-pre4-rel.json
--- a/fml/jsons/1.7.10-pre4.json
+++ b/fml/jsons/1.7.10-pre4.json
--- a/fml/jsons/1.7.10-rel.json
+++ b/fml/jsons/1.7.10-rel.json
--- a/fml/jsons/1.7.10.json
+++ b/fml/jsons/1.7.10.json
--- a/fml/jsons/1.7.2-dev.json
+++ b/fml/jsons/1.7.2-dev.json
--- a/fml/jsons/1.7.2-rel.json
+++ b/fml/jsons/1.7.2-rel.json
--- a/fml/jsons/1.7.2.json
+++ b/fml/jsons/1.7.2.json
--- a/fml/jsons/1.7.9-dev.json
+++ b/fml/jsons/1.7.9-dev.json
--- a/Show more
+++ b/Show more