Fix up release jsons to clean up extraneous netty references

Fix bucket replacement not loading the bucket model by itself if repl…

.gitignore

@@ -3,6 +3,9 @@
 /.settings
 /.classpath
 
+#In case people make their workspace in the repo
+/eclipse/
+
 #idea
 /.idea
 *.iml
@@ -12,12 +15,17 @@
 /.gradle
 
 #occupational hazards
-/eclipse/
+/projects/
 /repo/
 /buildSrc
 
 #Patch rejects
 *.rej
 /patches-/
+
 # FML changelog
 changelog.txt
+/patches_old/
+/patches_old_bak/
+*.py
+*.7z

build.gradle

@@ -1,7 +1,6 @@
 buildscript {
     repositories {
         mavenCentral()
-        mavenLocal()
         maven {
             name = "forge"
             url = "http://files.minecraftforge.net/maven"
@@ -12,66 +11,238 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
     }
 }
 
-configurations {
-    deployJars
-}
-
-import static net.minecraftforge.gradle.dev.ForgeDevPlugin.*
-
-apply plugin: 'maven'
-apply plugin: 'forgedev'
-
 repositories {
-    mavenLocal()
-    flatDir {
-        name "fileRepo"
-        dirs "repo"
-    }
+        maven {
+            name = "local"
+            url = "file:///home/cpw/projects/repo"
+        }
 }
+apply plugin: "maven"
+apply plugin: "net.minecraftforge.gradle.patcher"
+apply plugin: "net.minecraftforge.gradle.launch4j"
 
 minecraft {
-    version = '1.7.10'
-    mcpVersion = '9.05'
-    fmlDir = projectDir.getAbsolutePath() + "/fml";
-    mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
-    tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker'
+    version = "1.8.8"
+    //mappings = 'stable_16'
+    mappings = "snapshot_nodoc_20151122"
+    workspaceDir = "projects"
+    versionJson = "jsons/1.8.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 {
+        forge {
+            rootDir "."
+            patchDir "patches/minecraft"
+            patchAfter "clean"
+            genPatchesFrom "clean"
+            genMcpPatches = false
+            applyMcpPatches = false
+            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.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')
+        // Not sure what abrar was trying to do here...
+        //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.output) : null}
+    dependsOn 'crowdin'
+
+    manifest.attributes([
+        "Main-Class": "net.minecraftforge.fml.relauncher.ServerLaunchWrapper",
+        "TweakClass": "net.minecraftforge.fml.common.launcher.FMLTweaker",
+        "Class-Path": getServerClasspath(file("jsons/${minecraft.version}-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'
+    }
+    into ('eclipse') {
+        from 'mdk/eclipse'
+    }
+    from changelog.output
+    from ('mdk') {
+	    filter(ReplaceTokens, tokens: [
+		VERSION: project.version,
+		MAPPINGS: minecraft.mappings.replace('nodoc_', '')
+	    ])
+	    exclude 'eclipse'
+	    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 'CREDITS-fml.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
+}
+
+task ciWriteBuildNumber << {
+    def file = file("src/main/java/net/minecraftforge/common/ForgeVersion.java");
+    def bn = System.getenv("BUILD_NUMBER")?:0;
+    def outfile = "";
+    def ln = System.getProperty('line.separator')
+
+    file.eachLine{ String s ->
+        if (s.contains("buildVersion") && s.contains("= 0;")) {
+            s = "    public static final int buildVersion    = ${bn};";
+        }
+        outfile += (s+ln);
+    }
+    file.write(outfile);
 }
 
 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())
         }
 
@@ -79,49 +250,125 @@ uploadArchives {
             groupId = project.group
             version = project.version
             artifactId = project.archivesBaseName
-        }
-        pom.project {
-            name project.archivesBaseName
-            packaging 'jar'
-            description 'Minecraft Forge API'
-            url 'https://github.com/MinecraftForge/MinecraftForge'
-
-            scm {
+            project {
+                name project.archivesBaseName
+                packaging 'jar'
+                description 'Minecraft Forge API'
                 url 'https://github.com/MinecraftForge/MinecraftForge'
-                connection 'scm:git:git://github.com/MinecraftForge/MinecraftForge.git'
-                developerConnection 'scm:git:[email protected]:MinecraftForge/MinecraftForge.git'
-            }
 
-            issueManagement {
-                system 'github'
-                url 'https://github.com/MinecraftForge/MinecraftForge/issues'
-            }
+                scm {
+                    url 'https://github.com/MinecraftForge/MinecraftForge'
+                    connection 'scm:git:git://github.com/MinecraftForge/MinecraftForge.git'
+                    developerConnection 'scm:git:[email protected]:MinecraftForge/MinecraftForge.git'
+                }
 
-            licenses {
-                license {
-                    name 'Forge Public License'
-                    url 'https://raw.github.com/MinecraftForge/MinecraftForge/master/MinecraftForge-License.txt'
-                    distribution 'repo'
+                issueManagement {
+                    system 'github'
+                    url 'https://github.com/MinecraftForge/MinecraftForge/issues'
                 }
-            }
 
-            developers {
-                developer {
-                    id 'cpw'
-                    name 'cpw'
-                    roles { role 'developer' }
+                licenses {
+                    license {
+                        name 'Forge Public License'
+                        url 'https://raw.github.com/MinecraftForge/MinecraftForge/master/MinecraftForge-License.txt'
+                        distribution 'repo'
+                    }
                 }
-                developer {
-                    id 'LexManos'
-                    name 'Lex Manos'
-                    roles { role 'developer' }
-                }
-                developer {
-                    id 'AbrarSyed'
-                    name 'Abrar Syed'
-                    roles { role 'contributor' }
+
+                developers {
+                    developer {
+                        id 'cpw'
+                        name 'cpw'
+                        roles { role 'developer' }
+                    }
+                    developer {
+                        id 'LexManos'
+                        name 'Lex Manos'
+                        roles { role 'developer' }
+                    }
+                    developer {
+                        id 'AbrarSyed'
+                        name 'Abrar Syed'
+                        roles { role 'contributor' }
+                    }
                 }
             }
         }
     }
 }
+
+// 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' }

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

fml/.gitignore

@@ -1,21 +0,0 @@
-#eclipse
-/bin
-/.settings
-/.classpath
-
-#idea
-/.idea
-*.iml
-
-#gradle
-/build
-/buildSrc
-/.gradle
-
-#occupational hazards
-/eclipse/
-/repo/
-
-
-#Patch reject
-*.rej

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-@[email protected] 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@.

fml/build.gradle

@@ -1,111 +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.7.10'
-    mcpVersion = '9.05'
-    fmlDir = projectDir.getAbsolutePath();
-    mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
-    tweakClass = 'cpw.mods.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:[email protected]:MinecraftForge/FML.git'
-                        }
-
-                        issueManagement {
-                            system 'github'
-                            url 'https://github.com/MinecraftForge/FML/issues'
-                        }
-
-                        licenses {
-                            license {
-                                name 'GNU Lesser Public License (LGPL), Version 2.1'
-                                url 'http://www.gnu.org/licenses/lgpl-2.1.txt'
-                                distribution 'repo'
-                            }
-                        }
-
-                        developers {
-                            developer {
-                                id 'cpw'
-                                name 'cpw'
-                                roles { role 'developer' }
-                            }
-                            developer {
-                                id 'LexManos'
-                                name 'Lex Manos'
-                                roles { role 'developer' }
-                            }
-                        }
-                    }
-                }
-            }
-        } else {
-            logger.info('Publishing to repo folder')
-            
-            mavenDeployer {
-                repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
-            }
-        }
-    }
-}

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

fml/conf/mcp.cfg

@@ -1,165 +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/client.srg
-ConfServer     = %(DirConf)s/server.srg
-Client         = %(DirTemp)s/client_rg.srg
-Server         = %(DirTemp)s/server_rg.srg
-DeobfClient    = %(DirTemp)s/client_deobf.srg
-DeobfServer    = %(DirTemp)s/server_deobf.srg
-ReobfClient    = %(DirTemp)s/client_ro.srg
-ReobfServer    = %(DirTemp)s/server_ro.srg
-ReobfClientSrg = %(DirTemp)s/client_ro_srg.srg
-ReobfServerSrg = %(DirTemp)s/server_ro_srg.srg
-
-[JAR]
-DirNatives = %(DirJars)s/bin/natives
-Client     = %(DirJars)s/bin/minecraft.jar
-Server     = %(DirJars)s/minecraft_server.jar
-LWJGL      = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
-MD5Client  = 595007b790548806f66762507203b896
-MD5Server  = a1de2db50b0d8bfac45be3e01e54bddf
-
-[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
-
-[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.patch
-FFPatchServer = %(DirConf)s/patches/minecraft_server_ff.patch
-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           = 154000
-ParamIndex        = 45000
-
-[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
-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

fml/conf/params.csv

@@ -1 +0,0 @@
-param,name,side

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;
-    }
-}

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) {

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
-@@ -695,7 +695,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();

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
-@@ -581,8 +581,6 @@
-          case 10:
-             --var5;
-             break;
--         case 32:
--            var6 = var5;
-          case 167:
-             if(var5 < var3 - 1) {
-                ++var5;
-@@ -596,6 +594,8 @@
-                }
-             }
-             break;
-+         case 32:
-+             var6 = var5;
-          default:
-             var4 += this.func_78263_a(var8);
-             if(var7) {

fml/conf/patches/minecraft_ff/net.minecraft.client.network.NetHandlerHandshakeMemory.java.patch

@@ -1,11 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\network\NetHandlerHandshakeMemory.java minecraft_patched\net\minecraft\client\network\NetHandlerHandshakeMemory.java
---- minecraft\net\minecraft\client\network\NetHandlerHandshakeMemory.java
-+++ minecraft_patched\net\minecraft\client\network\NetHandlerHandshakeMemory.java
-@@ -31,6 +31,7 @@
-       switch(NetHandlerHandshakeMemory.SwitchEnumConnectionState.field_151263_a[p_147232_2_.ordinal()]) {
-       case 1:
-          this.field_147384_b.func_150719_a(new NetHandlerLoginServer(this.field_147385_a, this.field_147384_b));
-+         break;
-       case 2:
-          throw new UnsupportedOperationException("NYI");
-       default:

fml/conf/patches/minecraft_ff/net.minecraft.client.particle.EffectRenderer.java.patch

@@ -1,23 +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
-@@ -53,7 +53,8 @@
-    }
- 
-    public void func_78868_a() {
--      for(final int var1 = 0; var1 < 4; ++var1) {
-+      for(int var11 = 0; var11 < 4; ++var11) {
-+         final int var1 = var11;
-          for(int var2 = 0; var2 < this.field_78876_b[var1].size(); ++var2) {
-             final EntityFX var3 = (EntityFX)this.field_78876_b[var1].get(var2);
- 
-@@ -99,7 +100,8 @@
-       EntityFX.field_70554_ao = p_78874_1_.field_70137_T + (p_78874_1_.field_70163_u - p_78874_1_.field_70137_T) * (double)p_78874_2_;
-       EntityFX.field_70555_ap = p_78874_1_.field_70136_U + (p_78874_1_.field_70161_v - p_78874_1_.field_70136_U) * (double)p_78874_2_;
- 
--      for(final int var8 = 0; var8 < 3; ++var8) {
-+      for(int var88 = 0; var88 < 3; ++var88) {
-+         final int var8 = var88;
-          if(!this.field_78876_b[var8].isEmpty()) {
-             switch(var8) {
-             case 0:

fml/conf/patches/minecraft_ff/net.minecraft.client.renderer.RenderBlocks.java.patch

@@ -1,33 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\renderer\RenderBlocks.java minecraft_patched\net\minecraft\client\renderer\RenderBlocks.java
---- minecraft\net\minecraft\client\renderer\RenderBlocks.java
-+++ minecraft_patched\net\minecraft\client\renderer\RenderBlocks.java
-@@ -1929,16 +1929,16 @@
-       float var24 = (float)(p_147788_2_ + 1);
-       float var25 = (float)(p_147788_4_ + 0);
-       float var26 = (float)(p_147788_4_ + 1);
--      boolean var27 = false;
-+      int var27 = 0;
-       if((var19 || var20) && !var21 && !var22) {
--         var27 = true;
-+         var27 = 1;
-       }
- 
-       if((var21 || var22) && !var20 && !var19) {
--         var27 = true;
-+         var27 = 2;
-       }
- 
--      if(!var27) {
-+      if(var27 == 0) {
-          int var28 = 0;
-          int var29 = 0;
-          int var30 = 16;
-@@ -1985,7 +1985,7 @@
-          var5.func_78374_a((double)var24, (double)p_147788_3_ + 0.015625D, (double)var25, (double)var9.func_94214_a((double)var30), (double)var9.func_94207_b((double)var29));
-          var5.func_78374_a((double)var23, (double)p_147788_3_ + 0.015625D, (double)var25, (double)var9.func_94214_a((double)var28), (double)var9.func_94207_b((double)var29));
-          var5.func_78374_a((double)var23, (double)p_147788_3_ + 0.015625D, (double)var26, (double)var9.func_94214_a((double)var28), (double)var9.func_94207_b((double)var31));
--      } else if(var27) {
-+      } else if(var27 == 1) {
-          var5.func_78374_a((double)var24, (double)p_147788_3_ + 0.015625D, (double)var26, (double)var8.func_94212_f(), (double)var8.func_94210_h());
-          var5.func_78374_a((double)var24, (double)p_147788_3_ + 0.015625D, (double)var25, (double)var8.func_94212_f(), (double)var8.func_94206_g());
-          var5.func_78374_a((double)var23, (double)p_147788_3_ + 0.015625D, (double)var25, (double)var8.func_94209_e(), (double)var8.func_94206_g());

fml/conf/patches/minecraft_ff/net.minecraft.client.renderer.RenderGlobal.java.patch

@@ -1,12 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\renderer\RenderGlobal.java minecraft_patched\net\minecraft\client\renderer\RenderGlobal.java
---- minecraft\net\minecraft\client\renderer\RenderGlobal.java
-+++ minecraft_patched\net\minecraft\client\renderer\RenderGlobal.java
-@@ -1566,7 +1566,7 @@
-          double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
-          double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
-          double var19 = this.field_72777_q.field_71451_h.field_70161_v - p_72726_6_;
--         Object var21 = null;
-+         EntityFX var21 = null;
-          if(p_72726_1_.equals("hugeexplosion")) {
-             this.field_72777_q.field_71452_i.func_78873_a(var21 = new EntityHugeExplodeFX(this.field_72769_h, p_72726_2_, p_72726_4_, p_72726_6_, p_72726_8_, p_72726_10_, p_72726_12_));
-          } else if(p_72726_1_.equals("largeexplode")) {

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
-@@ -72,13 +72,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");
-@@ -95,7 +96,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;
-    }
- 

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) {

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
-@@ -29,7 +29,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) {
-@@ -38,6 +38,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";
-@@ -46,11 +47,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 IIcon func_75212_b() {
--               return ItemArmor.func_94602_b(var4);
-+               return ItemArmor.func_94602_b(var44);
-             }
-          });
-       }

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
-@@ -713,10 +713,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_);
--   }
- }

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
-@@ -21,6 +21,7 @@
-    }
- 
-    public void run() {
-+     while(true)
-       this.func_75736_b();
-    }
- 

fml/conf/version.cfg

@@ -1,4 +0,0 @@
-[VERSION]
-MCPVersion = 9.05
-ClientVersion = 1.7.10
-ServerVersion = 1.7.10

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 "$@"

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

fml/install/README.txt

@@ -1,37 +0,0 @@
--------------------------------------------
-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 'gradlew setupDevWorkspace' to create
-a gradle environment primed with FML. Run 'gradlew eclipse' or 'gradlew idea' to
-create an IDE workspace of your choice.
-Refer to ForgeGradle for more information about the gradle environment
-Note: On macs or linux you run the './gradlew.sh' instead of 'gradlew'
-
-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@.
-
-LexManos' Install Video
-=======================
-https://www.youtube.com/watch?v=8VEdtQLuLO0&feature=youtu.be
-
-For more details update more often refer to the Forge Forums:
-http://www.minecraftforge.net/forum/index.php/topic,14048.0.html

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

fml/patches/minecraft/net/minecraft/block/Block.java.patch

@@ -1,27 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/Block.java
-+++ ../src-work/minecraft/net/minecraft/block/Block.java
-@@ -1,5 +1,6 @@
- package net.minecraft.block;
- 
-+import cpw.mods.fml.common.registry.GameData;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.util.Iterator;
-@@ -32,7 +33,7 @@
- 
- public class Block
- {
--    public static final RegistryNamespaced field_149771_c = new RegistryNamespacedDefaultedByKey("air");
-+    public static final RegistryNamespaced field_149771_c = GameData.getBlockRegistry();
-     private CreativeTabs field_149772_a;
-     protected String field_149768_d;
-     public static final Block.SoundType field_149769_e = new Block.SoundType("stone", 1.0F, 1.0F);
-@@ -102,6 +103,8 @@
-     protected IIcon field_149761_L;
-     private static final String __OBFID = "CL_00000199";
- 
-+    public final cpw.mods.fml.common.registry.RegistryDelegate<Block> delegate = 
-+            ((cpw.mods.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_);

fml/patches/minecraft/net/minecraft/client/ClientBrandRetriever.java.patch

@@ -1,17 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/ClientBrandRetriever.java
-+++ ../src-work/minecraft/net/minecraft/client/ClientBrandRetriever.java
-@@ -1,5 +1,6 @@
- package net.minecraft.client;
- 
-+import cpw.mods.fml.common.FMLCommonHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- 
-@@ -10,6 +11,6 @@
- 
-     public static String getClientModName()
-     {
--        return "vanilla";
-+        return FMLCommonHandler.instance().getModName();
-     }
- }

fml/patches/minecraft/net/minecraft/client/LoadingScreenRenderer.java.patch

@@ -1,26 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/LoadingScreenRenderer.java
-+++ ../src-work/minecraft/net/minecraft/client/LoadingScreenRenderer.java
-@@ -1,5 +1,6 @@
- package net.minecraft.client;
- 
-+import cpw.mods.fml.client.FMLClientHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import net.minecraft.client.gui.Gui;
-@@ -138,6 +139,8 @@
-                     GL11.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT);
-                 }
- 
-+                if (!FMLClientHandler.instance().handleLoadingScreen(scaledresolution))
-+                {
-                 Tessellator tessellator = Tessellator.field_78398_a;
-                 this.field_73725_b.func_110434_K().func_110577_a(Gui.field_110325_k);
-                 float f = 32.0F;
-@@ -175,6 +178,7 @@
-                 OpenGlHelper.func_148821_a(770, 771, 1, 0);
-                 this.field_73725_b.field_71466_p.func_78261_a(this.field_73726_c, (l - this.field_73725_b.field_71466_p.func_78256_a(this.field_73726_c)) / 2, i1 / 2 - 4 - 16, 16777215);
-                 this.field_73725_b.field_71466_p.func_78261_a(this.field_73727_a, (l - this.field_73725_b.field_71466_p.func_78256_a(this.field_73727_a)) / 2, i1 / 2 - 4 + 8, 16777215);
-+                }
-                 this.field_146588_g.func_147609_e();
- 
-                 if (OpenGlHelper.func_148822_b())

fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch

@@ -1,199 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/Minecraft.java
-+++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
-@@ -9,6 +9,9 @@
- import com.google.common.util.concurrent.ListenableFutureTask;
- import com.mojang.authlib.minecraft.MinecraftSessionService;
- import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
-+import cpw.mods.fml.client.FMLClientHandler;
-+import cpw.mods.fml.common.FMLCommonHandler;
-+import cpw.mods.fml.common.StartupQuery;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import io.netty.util.concurrent.GenericFutureListener;
-@@ -169,6 +172,8 @@
- import org.lwjgl.opengl.PixelFormat;
- import org.lwjgl.util.glu.GLU;
- 
-+import com.google.common.collect.MapDifference;
-+
- @SideOnly(Side.CLIENT)
- public class Minecraft implements IPlayerUsage
- {
-@@ -344,21 +349,23 @@
-         File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt");
-         System.out.println(p_71377_1_.func_71502_e());
- 
-+        int retVal;
-         if (p_71377_1_.func_71497_f() != null)
-         {
-             System.out.println("#@!@# 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))
-         {
-             System.out.println("#@!@# Game crashed! Crash report saved to: #@!@# " + file2.getAbsolutePath());
--            System.exit(-1);
-+            retVal = -1;
-         }
-         else
-         {
-             System.out.println("#@?@# Game crashed! Crash report could not be saved. #@?@#");
--            System.exit(-2);
-+            retVal = -2;
-         }
-+        FMLCommonHandler.instance().handleExit(retVal);
-     }
- 
-     public void func_71367_a(String p_71367_1_, int p_71367_2_)
-@@ -471,11 +478,11 @@
-         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();
-+        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.field_152350_aA = new SkinManager(this.field_71446_o, new File(this.field_110446_Y, "skins"), this.field_152355_az);
--        this.func_71357_I();
-+        cpw.mods.fml.client.SplashProgress.drawVanillaScreen();
-         this.field_147127_av = new SoundHandler(this.field_110451_am, this.field_71474_y);
-         this.field_110451_am.func_110542_a(this.field_147127_av);
-         this.field_147126_aw = new MusicTicker(this);
-@@ -492,7 +499,10 @@
-         this.field_110451_am.func_110542_a(this.field_71464_q);
-         this.field_110451_am.func_110542_a(new GrassColorReloadListener());
-         this.field_110451_am.func_110542_a(new FoliageColorReloadListener());
-+        cpw.mods.fml.common.ProgressManager.ProgressBar bar= cpw.mods.fml.common.ProgressManager.push("Rendering Setup", 9, true);
-+        bar.step("Loading Render Manager");
-         RenderManager.field_78727_a.field_78721_f = new ItemRenderer(this);
-+        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);
-         AchievementList.field_76004_f.func_75988_a(new IStatStringFormat()
-@@ -510,6 +520,7 @@
-                 }
-             }
-         });
-+        bar.step("Loading GL properties");
-         this.field_71417_B = new MouseHelper();
-         this.func_71361_d("Pre startup");
-         GL11.glEnable(GL11.GL_TEXTURE_2D);
-@@ -524,30 +535,39 @@
-         GL11.glLoadIdentity();
-         GL11.glMatrixMode(GL11.GL_MODELVIEW);
-         this.func_71361_d("Startup");
-+        bar.step("Render Global instance");
-         this.field_71438_f = new RenderGlobal(this);
--        this.field_147128_au = new TextureMap(0, "textures/blocks");
-+        bar.step("Building Blocks Texture");
-+        this.field_147128_au = new TextureMap(0, "textures/blocks", true);
-+        bar.step("Anisotropy and Mipmaps");
-         this.field_147128_au.func_147632_b(this.field_71474_y.field_151443_J);
-         this.field_147128_au.func_147633_a(this.field_71474_y.field_151442_I);
-+        bar.step("Loading Blocks Texture");
-         this.field_71446_o.func_130088_a(TextureMap.field_110575_b, this.field_147128_au);
--        this.field_71446_o.func_130088_a(TextureMap.field_110576_c, new TextureMap(1, "textures/items"));
-+        bar.step("Loading Items Texture");
-+        this.field_71446_o.func_130088_a(TextureMap.field_110576_c, new TextureMap(1, "textures/items", true));
-+        bar.step("Viewport");
-         GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d);
-         this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
-+        cpw.mods.fml.common.ProgressManager.pop(bar);
-+        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));
-+            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);
-+        cpw.mods.fml.client.SplashProgress.clearVanillaResources(field_71446_o, field_152354_ay);
-         this.field_152354_ay = null;
-         this.field_71461_s = new LoadingScreenRenderer(this);
- 
-+        FMLClientHandler.instance().onInitializationComplete();
-         if (this.field_71474_y.field_74353_u && !this.field_71431_Q)
-         {
-             this.func_71352_k();
-@@ -970,9 +990,11 @@
- 
-         if (!this.field_71454_w)
-         {
-+            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();
-+            FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_74281_c);
-         }
- 
-         GL11.glFlush();
-@@ -1554,6 +1576,8 @@
-             --this.field_71467_ac;
-         }
- 
-+        FMLCommonHandler.instance().onPreClientTick();
-+
-         this.field_71424_I.func_76320_a("gui");
- 
-         if (!this.field_71445_n)
-@@ -1698,6 +1722,7 @@
-                         this.field_71462_r.func_146274_d();
-                     }
-                 }
-+                FMLCommonHandler.instance().fireMouseInput();
-             }
- 
-             if (this.field_71429_W > 0)
-@@ -1835,6 +1860,7 @@
-                         }
-                     }
-                 }
-+                FMLCommonHandler.instance().fireKeyInput();
-             }
- 
-             for (j = 0; j < 9; ++j)
-@@ -2025,12 +2051,15 @@
-             this.field_71453_ak.func_74428_b();
-         }
- 
-+        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_)
-     {
-+        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);
-@@ -2066,6 +2095,12 @@
- 
-         while (!this.field_71437_Z.func_71200_ad())
-         {
-+            if (!StartupQuery.check())
-+            {
-+                func_71403_a(null);
-+                func_147108_a(null);
-+                return;
-+            }
-             String s2 = this.field_71437_Z.func_71195_b_();
- 
-             if (s2 != null)
-@@ -2141,6 +2176,7 @@
-             this.field_110448_aq.func_148529_f();
-             this.func_71351_a((ServerData)null);
-             this.field_71455_al = false;
-+            FMLClientHandler.instance().handleClientWorldClosing(this.field_71441_e);
-         }
- 
-         this.field_147127_av.func_147690_c();

fml/patches/minecraft/net/minecraft/client/gui/FontRenderer.java.patch

@@ -1,124 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/FontRenderer.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/FontRenderer.java
-@@ -54,7 +54,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)
-         {
-@@ -102,7 +102,7 @@
- 
-         try
-         {
--            bufferedimage = ImageIO.read(Minecraft.func_71410_x().func_110442_L().func_110536_a(this.field_111273_g).func_110527_b());
-+            bufferedimage = ImageIO.read(getResourceInputStream(this.field_111273_g));
-         }
-         catch (IOException ioexception)
-         {
-@@ -167,7 +167,7 @@
-     {
-         try
-         {
--            InputStream inputstream = Minecraft.func_71410_x().func_110442_L().func_110536_a(new ResourceLocation("font/glyph_sizes.bin")).func_110527_b();
-+            InputStream inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin"));
-             inputstream.read(this.field_78287_e);
-         }
-         catch (IOException ioexception)
-@@ -186,7 +186,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);
-@@ -213,7 +213,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_)
-@@ -260,7 +260,7 @@
- 
-     public int func_85187_a(String p_85187_1_, int p_85187_2_, int p_85187_3_, int p_85187_4_, boolean p_85187_5_)
-     {
--        GL11.glEnable(GL11.GL_ALPHA_TEST);
-+        enableAlpha();
-         this.func_78265_b();
-         int l;
- 
-@@ -332,7 +332,7 @@
- 
-                     k = this.field_78285_g[j];
-                     this.field_78304_r = k;
--                    GL11.glColor4f((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)
-                 {
-@@ -361,7 +361,7 @@
-                     this.field_78299_w = false;
-                     this.field_78300_v = false;
-                     this.field_78301_u = false;
--                    GL11.glColor4f(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;
-@@ -420,6 +420,15 @@
-                     ++f;
-                 }
- 
-+                doDraw(f);
-+            }
-+        }
-+    }
-+
-+    protected void doDraw(float f)
-+    {
-+        {
-+            {
-                 Tessellator tessellator;
- 
-                 if (this.field_78299_w)
-@@ -492,7 +501,7 @@
-             this.field_78292_o = (float)(p_78258_4_ >> 8 & 255) / 255.0F;
-             this.field_78306_p = (float)(p_78258_4_ & 255) / 255.0F;
-             this.field_78305_q = (float)(p_78258_4_ >> 24 & 255) / 255.0F;
--            GL11.glColor4f(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 = (float)p_78258_2_;
-             this.field_78296_k = (float)p_78258_3_;
-             this.func_78255_a(p_78258_1_, p_78258_5_);
-@@ -829,4 +838,24 @@
-     {
-         return this.field_78294_m;
-     }
-+
-+    protected void setColor(float r, float g, float b, float a)
-+    {
-+        GL11.glColor4f(r, g, b, a);
-+    }
-+
-+    protected void enableAlpha()
-+    {
-+        GL11.glEnable(GL11.GL_ALPHA_TEST);
-+    }
-+
-+    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();
-+    }
- }

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
-@@ -211,6 +211,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);

fml/patches/minecraft/net/minecraft/client/gui/GuiIngame.java.patch

@@ -1,21 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/GuiIngame.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngame.java
-@@ -1,5 +1,6 @@
- package net.minecraft.client.gui;
- 
-+import cpw.mods.fml.common.FMLCommonHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.awt.Color;
-@@ -314,6 +315,11 @@
-             this.func_73731_b(fontrenderer, s, k - fontrenderer.func_78256_a(s) - 2, 2, 14737632);
-             s = "Allocated memory: " + j5 * 100L / i5 + "% (" + j5 / 1024L / 1024L + "MB)";
-             this.func_73731_b(fontrenderer, s, k - fontrenderer.func_78256_a(s) - 2, 12, 14737632);
-+            int offset = 22;
-+            for (String brd : FMLCommonHandler.instance().getBrandings(false))
-+            {
-+                this.func_73731_b(fontrenderer, brd, k - fontrenderer.func_78256_a(brd) - 2, offset+=10, 14737632);
-+            }
-             j3 = MathHelper.func_76128_c(this.field_73839_d.field_71439_g.field_70165_t);
-             k3 = MathHelper.func_76128_c(this.field_73839_d.field_71439_g.field_70163_u);
-             int l3 = MathHelper.func_76128_c(this.field_73839_d.field_71439_g.field_70161_v);

fml/patches/minecraft/net/minecraft/client/gui/GuiIngameMenu.java.patch

@@ -1,31 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
-@@ -1,5 +1,6 @@
- package net.minecraft.client.gui;
- 
-+import cpw.mods.fml.client.FMLClientHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import net.minecraft.client.gui.achievement.GuiAchievements;
-@@ -29,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, "Mod Options..."));
-         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();
-@@ -64,6 +66,10 @@
-                 break;
-             case 7:
-                 this.field_146297_k.func_147108_a(new GuiShareToLan(this));
-+                break;
-+            case 12:
-+                FMLClientHandler.instance().showInGameModOptions(this);
-+                break;
-         }
-     }
- 

fml/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch

@@ -1,72 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java
-@@ -1,5 +1,7 @@
- package net.minecraft.client.gui;
- 
-+import cpw.mods.fml.client.GuiModList;
-+import cpw.mods.fml.common.FMLCommonHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.io.BufferedReader;
-@@ -9,6 +11,7 @@
- import java.util.ArrayList;
- import java.util.Calendar;
- import java.util.Date;
-+import java.util.List;
- import java.util.Random;
- import net.minecraft.client.Minecraft;
- import net.minecraft.client.renderer.OpenGlHelper;
-@@ -29,6 +32,9 @@
- import org.lwjgl.opengl.GLContext;
- import org.lwjgl.util.glu.Project;
- 
-+import com.google.common.base.Strings;
-+import com.google.common.collect.Lists;
-+
- @SideOnly(Side.CLIENT)
- public class GuiMainMenu extends GuiScreen implements GuiYesNoCallback
- {
-@@ -190,7 +196,13 @@
-     {
-         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(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 realmsButton = 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, "Mods");
-+        fmlModButton.field_146128_h = this.field_146294_l / 2 + 2;
-+        realmsButton.field_146120_f = 98;
-+        fmlModButton.field_146120_f = 98;
-+        this.field_146292_n.add(realmsButton);
-+        this.field_146292_n.add(fmlModButton);
-     }
- 
-     private void func_73972_b(int p_73972_1_, int p_73972_2_)
-@@ -238,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 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);
-@@ -481,7 +498,15 @@
-             s = s + " Demo";
-         }
- 
--        this.func_73731_b(this.field_146289_q, s, 2, this.field_146295_m - 10, -1);
-+        List<String> brandings = Lists.reverse(FMLCommonHandler.instance().getBrandings(true));
-+        for (int i = 0; i < brandings.size(); i++)
-+        {
-+            String brd = brandings.get(i);
-+            if (!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);
- 

fml/patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch

@@ -1,31 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
-@@ -2,6 +2,7 @@
- 
- import com.google.common.base.Charsets;
- import com.google.common.util.concurrent.ThreadFactoryBuilder;
-+import cpw.mods.fml.client.FMLClientHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import io.netty.buffer.ByteBuf;
-@@ -83,7 +84,7 @@
-         boolean flag2 = this.field_148301_e.field_82821_f < 5;
-         boolean flag3 = flag1 || flag2;
-         this.field_148300_d.field_71466_p.func_78276_b(this.field_148301_e.field_78847_a, p_148279_2_ + 32 + 3, p_148279_3_ + 1, 16777215);
--        List list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_148279_4_ - 32 - 2);
-+        List list = this.field_148300_d.field_71466_p.func_78271_c(FMLClientHandler.instance().fixDescription(this.field_148301_e.field_78843_d), p_148279_4_ - 48 - 2);
- 
-         for (int l1 = 0; l1 < Math.min(list.size(), 2); ++l1)
-         {
-@@ -174,6 +175,11 @@
-         int k2 = p_148279_7_ - p_148279_2_;
-         int l2 = p_148279_8_ - p_148279_3_;
- 
-+        String tooltip = FMLClientHandler.instance().enhanceServerListEntry(this, this.field_148301_e, p_148279_2_, p_148279_4_, p_148279_3_, k2, l2);
-+        if (tooltip != null)
-+        {
-+            this.field_148303_c.func_146793_a(tooltip);
-+        } else
-         if (k2 >= p_148279_4_ - 15 && k2 <= p_148279_4_ - 5 && l2 >= 0 && l2 <= 8)
-         {
-             this.field_148303_c.func_146793_a(s1);

fml/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch

@@ -1,41 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
-+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
-@@ -5,6 +5,9 @@
- import com.mojang.authlib.exceptions.InvalidCredentialsException;
- import com.mojang.authlib.minecraft.MinecraftSessionService;
- import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
-+
-+import cpw.mods.fml.client.FMLClientHandler;
-+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import io.netty.util.concurrent.Future;
-@@ -23,6 +26,7 @@
- import net.minecraft.network.login.server.S00PacketDisconnect;
- import net.minecraft.network.login.server.S01PacketEncryptionRequest;
- import net.minecraft.network.login.server.S02PacketLoginSuccess;
-+import net.minecraft.network.play.client.C17PacketCustomPayload;
- import net.minecraft.util.ChatComponentTranslation;
- import net.minecraft.util.CryptManager;
- import net.minecraft.util.IChatComponent;
-@@ -100,7 +104,7 @@
- 
-     public void func_147390_a(S02PacketLoginSuccess p_147390_1_)
-     {
--        this.field_147393_d.func_150723_a(EnumConnectionState.PLAY);
-+        FMLNetworkHandler.fmlClientHandshake(this.field_147393_d);
-     }
- 
-     public void func_147231_a(IChatComponent p_147231_1_)
-@@ -114,7 +118,10 @@
- 
-         if (p_147232_2_ == EnumConnectionState.PLAY)
-         {
--            this.field_147393_d.func_150719_a(new NetHandlerPlayClient(this.field_147394_b, this.field_147395_c, this.field_147393_d));
-+            NetHandlerPlayClient nhpc = new NetHandlerPlayClient(this.field_147394_b, this.field_147395_c, this.field_147393_d);
-+            this.field_147393_d.func_150719_a(nhpc);
-+            FMLClientHandler.instance().setPlayClient(nhpc);
-+
-         }
-     }
- 

fml/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch

@@ -1,19 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
-+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
-@@ -2,6 +2,7 @@
- 
- import com.google.common.base.Charsets;
- import com.mojang.authlib.GameProfile;
-+import cpw.mods.fml.common.network.handshake.NetworkDispatcher;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import io.netty.buffer.ByteBuf;
-@@ -232,7 +233,7 @@
-     public void func_147282_a(S01PacketJoinGame p_147282_1_)
-     {
-         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()), NetworkDispatcher.get(func_147298_b()).getOverrideDimension(p_147282_1_), p_147282_1_.func_149192_g(), this.field_147299_f.field_71424_I);
-         this.field_147300_g.field_72995_K = true;
-         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();

fml/patches/minecraft/net/minecraft/client/network/OldServerPinger.java.patch

@@ -1,18 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/network/OldServerPinger.java
-+++ ../src-work/minecraft/net/minecraft/client/network/OldServerPinger.java
-@@ -4,6 +4,7 @@
- import com.google.common.base.Splitter;
- import com.google.common.collect.Iterables;
- import com.mojang.authlib.GameProfile;
-+import cpw.mods.fml.client.FMLClientHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import io.netty.bootstrap.Bootstrap;
-@@ -147,6 +148,7 @@
-                     p_147224_1_.func_147407_a((String)null);
-                 }
- 
-+                FMLClientHandler.instance().bindServerListData(p_147224_1_, serverstatusresponse);
-                 networkmanager.func_150725_a(new C01PacketPing(Minecraft.func_71386_F()), new GenericFutureListener[0]);
-                 this.field_147403_d = true;
-             }

fml/patches/minecraft/net/minecraft/client/renderer/RenderBlocks.java.patch

@@ -1,102 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/renderer/RenderBlocks.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/RenderBlocks.java
-@@ -40,6 +40,7 @@
- import net.minecraft.init.Blocks;
- import net.minecraft.item.Item;
- import net.minecraft.item.ItemBlock;
-+import net.minecraft.src.FMLRenderAccessLibrary;
- import net.minecraft.tileentity.TileEntity;
- import net.minecraft.tileentity.TileEntityFlowerPot;
- import net.minecraft.util.Direction;
-@@ -245,7 +246,53 @@
-         {
-             p_147805_1_.func_149719_a(this.field_147845_a, p_147805_2_, p_147805_3_, p_147805_4_);
-             this.func_147775_a(p_147805_1_);
--            return l == 0 ? this.func_147784_q(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 4 ? this.func_147721_p(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 31 ? this.func_147742_r(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 1 ? this.func_147746_l(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 40 ? this.func_147774_a((BlockDoublePlant)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 2 ? this.func_147791_c(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 20 ? this.func_147726_j(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 11 ? this.func_147735_a((BlockFence)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 39 ? this.func_147779_s(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 5 ? this.func_147788_h(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 13 ? this.func_147755_t(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 9 ? this.func_147766_a((BlockRailBase)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 19 ? this.func_147724_m(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 23 ? this.func_147783_o(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 6 ? this.func_147796_n(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 3 ? this.func_147801_a((BlockFire)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 8 ? this.func_147794_i(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 7 ? this.func_147760_u(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 10 ? this.func_147722_a((BlockStairs)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 27 ? this.func_147802_a((BlockDragonEgg)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 32 ? this.func_147807_a((BlockWall)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 12 ? this.func_147790_e(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 29 ? this.func_147723_f(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 30 ? this.func_147756_g(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 14 ? this.func_147773_v(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 15 ? this.func_147759_a((BlockRedstoneRepeater)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 36 ? this.func_147748_a((BlockRedstoneDiode)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 37 ? this.func_147781_a((BlockRedstoneComparator)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 16 ? this.func_147731_b(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_, false) : (l == 17 ? this.func_147809_c(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_, true) : (l == 18 ? this.func_147767_a((BlockPane)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 41 ? this.func_147733_k(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 21 ? this.func_147776_a((BlockFenceGate)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 24 ? this.func_147785_a((BlockCauldron)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 33 ? this.func_147752_a((BlockFlowerPot)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 35 ? this.func_147725_a((BlockAnvil)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 25 ? this.func_147741_a((BlockBrewingStand)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 26 ? this.func_147743_a((BlockEndPortalFrame)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 28 ? this.func_147772_a((BlockCocoa)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 34 ? this.func_147797_a((BlockBeacon)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 38 ? this.func_147803_a((BlockHopper)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : false))))))))))))))))))))))))))))))))))))))));
-+
-+            switch (l)
-+            {
-+            //regex: ' : \(l == ([\d]+) \?' replace: ';\ncase \1: return' ::: IMPORTANT: REMEMBER THIS ON FIRST line!
-+            case 0 : return this.func_147784_q(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 4: return this.func_147721_p(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 31: return this.func_147742_r(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 1: return this.func_147746_l(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 40: return this.func_147774_a((BlockDoublePlant)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 2: return this.func_147791_c(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 20: return this.func_147726_j(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 11: return this.func_147735_a((BlockFence)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 39: return this.func_147779_s(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 5: return this.func_147788_h(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 13: return this.func_147755_t(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 9: return this.func_147766_a((BlockRailBase)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 19: return this.func_147724_m(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 23: return this.func_147783_o(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 6: return this.func_147796_n(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 3: return this.func_147801_a((BlockFire)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 8: return this.func_147794_i(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 7: return this.func_147760_u(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 10: return this.func_147722_a((BlockStairs)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 27: return this.func_147802_a((BlockDragonEgg)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 32: return this.func_147807_a((BlockWall)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 12: return this.func_147790_e(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 29: return this.func_147723_f(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 30: return this.func_147756_g(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 14: return this.func_147773_v(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 15: return this.func_147759_a((BlockRedstoneRepeater)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 36: return this.func_147748_a((BlockRedstoneDiode)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 37: return this.func_147781_a((BlockRedstoneComparator)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 16: return this.func_147731_b(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_, false) ;
-+            case 17: return this.func_147809_c(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_, true) ;
-+            case 18: return this.func_147767_a((BlockPane)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 41: return this.func_147733_k(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 21: return this.func_147776_a((BlockFenceGate)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 24: return this.func_147785_a((BlockCauldron)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 33: return this.func_147752_a((BlockFlowerPot)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 35: return this.func_147725_a((BlockAnvil)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 25: return this.func_147741_a((BlockBrewingStand)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 26: return this.func_147743_a((BlockEndPortalFrame)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 28: return this.func_147772_a((BlockCocoa)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 34: return this.func_147797_a((BlockBeacon)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
-+            case 38: return this.func_147803_a((BlockHopper)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_);
-+            default: return FMLRenderAccessLibrary.renderWorldBlock(this, field_147845_a, p_147805_2_, p_147805_3_, p_147805_4_, p_147805_1_, l);
-+            }
-         }
-     }
- 
-@@ -8089,6 +8136,10 @@
-                 this.func_147799_a((BlockHopper)p_147800_1_, 0, 0, 0, 0, true);
-                 GL11.glTranslatef(0.5F, 0.5F, 0.5F);
-             }
-+            else
-+            {
-+                FMLRenderAccessLibrary.renderInventoryBlock(this, p_147800_1_, p_147800_2_, j);
-+            }
-         }
-         else
-         {
-@@ -8147,7 +8198,24 @@
- 
-     public static boolean func_147739_a(int p_147739_0_)
-     {
--        return p_147739_0_ == 0 ? true : (p_147739_0_ == 31 ? true : (p_147739_0_ == 39 ? true : (p_147739_0_ == 13 ? true : (p_147739_0_ == 10 ? true : (p_147739_0_ == 11 ? true : (p_147739_0_ == 27 ? true : (p_147739_0_ == 22 ? true : (p_147739_0_ == 21 ? true : (p_147739_0_ == 16 ? true : (p_147739_0_ == 26 ? true : (p_147739_0_ == 32 ? true : (p_147739_0_ == 34 ? true : (p_147739_0_ == 35 ? true : (p_147739_0_ == -1 ? false : false))))))))))))));
-+        switch (p_147739_0_)
-+        {
-+        case 0 : return true ;
-+        case 31: return true ;
-+        case 39: return true ;
-+        case 13: return true ;
-+        case 10: return true ;
-+        case 11: return true ;
-+        case 27: return true ;
-+        case 22: return true ;
-+        case 21: return true ;
-+        case 16: return true ;
-+        case 26: return true ;
-+        case 32: return true ;
-+        case 34: return true ;
-+        case 35: return true ;
-+        default: return FMLRenderAccessLibrary.renderItemAsFull3DBlock(p_147739_0_);
-+        }
-     }
- 
-     public IIcon func_147793_a(Block p_147793_1_, IBlockAccess p_147793_2_, int p_147793_3_, int p_147793_4_, int p_147793_5_, int p_147793_6_)

fml/patches/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java.patch

@@ -1,18 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java
-@@ -1,5 +1,6 @@
- package net.minecraft.client.renderer.entity;
- 
-+import cpw.mods.fml.common.registry.VillagerRegistry;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import net.minecraft.client.model.ModelVillager;
-@@ -53,7 +54,7 @@
-             case 4:
-                 return field_110906_m;
-             default:
--                return field_110903_f;
-+                return VillagerRegistry.getVillagerSkin(p_110775_1_.func_70946_n(), field_110903_f);
-         }
-     }
- 

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()]);
-+        cpw.mods.fml.common.ProgressManager.ProgressBar bar = cpw.mods.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);
-         }
-+        cpw.mods.fml.common.ProgressManager.pop(bar);
-     }
- 
-     public List func_94309_g()

fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch

@@ -1,122 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureMap.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureMap.java
-@@ -35,6 +35,7 @@
- @SideOnly(Side.CLIENT)
- public class TextureMap extends AbstractTexture implements ITickableTextureObject, IIconRegister
- {
-+    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_110575_b = new ResourceLocation("textures/atlas/blocks.png");
-     public static final ResourceLocation field_110576_c = new ResourceLocation("textures/atlas/items.png");
-@@ -47,12 +48,18 @@
-     private int field_147637_k = 1;
-     private final TextureAtlasSprite field_94249_f = new TextureAtlasSprite("missingno");
-     private static final String __OBFID = "CL_00001058";
-+    private boolean skipFirst = false;
- 
-     public TextureMap(int p_i1281_1_, String p_i1281_2_)
-     {
-+        this(p_i1281_1_, p_i1281_2_, false);
-+    }
-+    public TextureMap(int p_i1281_1_, String p_i1281_2_, boolean skipFirst)
-+    {
-         this.field_94255_a = p_i1281_1_;
-         this.field_94254_c = p_i1281_2_;
-         this.func_110573_f();
-+        this.skipFirst = skipFirst && ENABLE_SKIP;
-     }
- 
-     private void func_110569_e()
-@@ -96,15 +103,17 @@
-         this.field_94252_e.clear();
-         this.field_94258_i.clear();
-         int j = Integer.MAX_VALUE;
-+        cpw.mods.fml.common.ProgressManager.ProgressBar bar = cpw.mods.fml.common.ProgressManager.push("Texture Loading", skipFirst ? 0 : this.field_110574_e.size());
-         Iterator iterator = this.field_110574_e.entrySet().iterator();
-         TextureAtlasSprite textureatlassprite;
- 
--        while (iterator.hasNext())
-+        while (!skipFirst && iterator.hasNext())
-         {
-             Entry entry = (Entry)iterator.next();
-             ResourceLocation resourcelocation = new ResourceLocation((String)entry.getKey());
-             textureatlassprite = (TextureAtlasSprite)entry.getValue();
-             ResourceLocation resourcelocation1 = this.func_147634_a(resourcelocation, 0);
-+            bar.step(resourcelocation1.func_110623_a());
- 
-             try
-             {
-@@ -156,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);
-+                cpw.mods.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);
-+                cpw.mods.fml.client.FMLClientHandler.instance().trackMissingTexture(resourcelocation1);
-                 continue;
-             }
- 
-@@ -169,6 +180,7 @@
-             stitcher.func_110934_a(textureatlassprite);
-         }
- 
-+        cpw.mods.fml.common.ProgressManager.pop(bar);
-         int i1 = MathHelper.func_151239_c(j);
- 
-         if (i1 < this.field_147636_j)
-@@ -178,10 +190,12 @@
-         }
- 
-         Iterator iterator1 = this.field_110574_e.values().iterator();
-+        bar = cpw.mods.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
-             {
-@@ -222,9 +236,13 @@
- 
-         this.field_94249_f.func_147963_d(this.field_147636_j);
-         stitcher.func_110934_a(this.field_94249_f);
-+        cpw.mods.fml.common.ProgressManager.pop(bar);
-+        skipFirst = false;
-+        bar = cpw.mods.fml.common.ProgressManager.push("Texture creation", 3);
- 
-         try
-         {
-+            bar.step("Stitching");
-             stitcher.func_94305_f();
-         }
-         catch (StitcherException stitcherexception)
-@@ -233,10 +251,12 @@
-         }
- 
-         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_147946_a(this.func_110552_b(), this.field_147636_j, stitcher.func_110935_a(), stitcher.func_110936_b(), (float)this.field_147637_k);
-         HashMap hashmap = Maps.newHashMap(this.field_110574_e);
-         Iterator iterator2 = stitcher.func_94309_g().iterator();
- 
-+        bar.step("Uploading GL texture");
-         while (iterator2.hasNext())
-         {
-             textureatlassprite = (TextureAtlasSprite)iterator2.next();
-@@ -274,6 +294,7 @@
-             textureatlassprite = (TextureAtlasSprite)iterator2.next();
-             textureatlassprite.func_94217_a(this.field_94249_f);
-         }
-+        cpw.mods.fml.common.ProgressManager.pop(bar);
-     }
- 
-     private ResourceLocation func_147634_a(ResourceLocation p_147634_1_, int p_147634_2_)

fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java.patch

@@ -1,14 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java
-@@ -201,8 +201,11 @@
- 
-     public static void func_147946_a(int p_147946_0_, int p_147946_1_, int p_147946_2_, int p_147946_3_, float p_147946_4_)
-     {
-+        synchronized(cpw.mods.fml.client.SplashProgress.class)
-+        {
-         func_147942_a(p_147946_0_);
-         func_94277_a(p_147946_0_);
-+        }
- 
-         if (OpenGlHelper.field_148825_d)
-         {

fml/patches/minecraft/net/minecraft/client/resources/LanguageManager.java.patch

@@ -1,19 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/resources/LanguageManager.java
-+++ ../src-work/minecraft/net/minecraft/client/resources/LanguageManager.java
-@@ -3,6 +3,8 @@
- import com.google.common.collect.Lists;
- import com.google.common.collect.Maps;
- import com.google.common.collect.Sets;
-+
-+import cpw.mods.fml.common.registry.LanguageRegistry;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.io.IOException;
-@@ -83,6 +85,7 @@
-         }
- 
-         field_135049_a.func_135022_a(p_110549_1_, arraylist);
-+        LanguageRegistry.instance().mergeLanguageTable(field_135049_a.field_135032_a, this.field_135048_c);
-         StringTranslate.func_135063_a(field_135049_a.field_135032_a);
-     }
- 

fml/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch

@@ -1,46 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java
-+++ ../src-work/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java
-@@ -95,6 +95,7 @@
-     public void func_110541_a(List p_110541_1_)
-     {
-         this.func_110543_a();
-+        cpw.mods.fml.common.ProgressManager.ProgressBar resReload = cpw.mods.fml.common.ProgressManager.push("Loading Resources", p_110541_1_.size()+1, true);
-         field_147967_a.info("Reloading ResourceManager: " + field_130074_a.join(Iterables.transform(p_110541_1_, new Function()
-         {
-             private static final String __OBFID = "CL_00001092";
-@@ -112,26 +113,35 @@
-         while (iterator.hasNext())
-         {
-             IResourcePack iresourcepack = (IResourcePack)iterator.next();
-+            resReload.step(iresourcepack.func_130077_b());
-             this.func_110545_a(iresourcepack);
-         }
- 
-+        resReload.step("Reloading listeners");
-         this.func_110544_b();
-+        cpw.mods.fml.common.ProgressManager.pop(resReload);
-     }
- 
-     public void func_110542_a(IResourceManagerReloadListener p_110542_1_)
-     {
-         this.field_110546_b.add(p_110542_1_);
-+        cpw.mods.fml.common.ProgressManager.ProgressBar resReload = cpw.mods.fml.common.ProgressManager.push("Loading Resource", 1);
-+        resReload.step(p_110542_1_.getClass());
-         p_110542_1_.func_110549_a(this);
-+        cpw.mods.fml.common.ProgressManager.pop(resReload);
-     }
- 
-     private void func_110544_b()
-     {
-         Iterator iterator = this.field_110546_b.iterator();
- 
-+        cpw.mods.fml.common.ProgressManager.ProgressBar resReload = cpw.mods.fml.common.ProgressManager.push("Reloading", this.field_110546_b.size());
-         while (iterator.hasNext())
-         {
-             IResourceManagerReloadListener iresourcemanagerreloadlistener = (IResourceManagerReloadListener)iterator.next();
-+            resReload.step(iresourcemanagerreloadlistener.getClass());
-             iresourcemanagerreloadlistener.func_110549_a(this);
-         }
-+        cpw.mods.fml.common.ProgressManager.pop(resReload);
-     }
- }

fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch

@@ -1,19 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/settings/GameSettings.java
-+++ ../src-work/minecraft/net/minecraft/client/settings/GameSettings.java
-@@ -2,6 +2,8 @@
- 
- import com.google.common.collect.Maps;
- import com.google.gson.Gson;
-+
-+import cpw.mods.fml.client.FMLClientHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.io.BufferedReader;
-@@ -1049,6 +1051,7 @@
- 
-     public void func_74303_b()
-     {
-+        if (FMLClientHandler.instance().isLoading()) return;
-         try
-         {
-             PrintWriter printwriter = new PrintWriter(new FileWriter(this.field_74354_ai));

fml/patches/minecraft/net/minecraft/crash/CrashReport.java.patch

@@ -1,17 +0,0 @@
---- ../src-base/minecraft/net/minecraft/crash/CrashReport.java
-+++ ../src-work/minecraft/net/minecraft/crash/CrashReport.java
-@@ -1,5 +1,6 @@
- package net.minecraft.crash;
- 
-+import cpw.mods.fml.common.FMLCommonHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.io.File;
-@@ -140,6 +141,7 @@
-                 return IntCache.func_85144_b();
-             }
-         });
-+        FMLCommonHandler.instance().enhanceCrashReport(this, this.field_85061_c);
-     }
- 
-     public String func_71501_a()

fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch

@@ -1,55 +0,0 @@
---- ../src-base/minecraft/net/minecraft/entity/EntityList.java
-+++ ../src-work/minecraft/net/minecraft/entity/EntityList.java
-@@ -5,6 +5,7 @@
- import java.util.LinkedHashMap;
- import java.util.Map;
- import java.util.Set;
-+
- import net.minecraft.entity.ai.EntityMinecartMobSpawner;
- import net.minecraft.entity.boss.EntityDragon;
- import net.minecraft.entity.boss.EntityWither;
-@@ -63,9 +64,13 @@
- import net.minecraft.stats.StatBase;
- import net.minecraft.stats.StatList;
- import net.minecraft.world.World;
-+
-+import org.apache.logging.log4j.Level;
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
- 
-+import cpw.mods.fml.common.FMLLog;
-+
- public class EntityList
- {
-     private static final Logger field_151516_b = LogManager.getLogger();
-@@ -145,9 +150,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)
-             {
-@@ -161,7 +167,17 @@
- 
-         if (entity != null)
-         {
--            entity.func_70020_e(p_75615_0_);
-+            try
-+            {
-+                entity.func_70020_e(p_75615_0_);
-+            }
-+            catch (Exception e)
-+            {
-+                FMLLog.log(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
-         {

fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch

@@ -1,23 +0,0 @@
---- ../src-base/minecraft/net/minecraft/entity/EntityTracker.java
-+++ ../src-work/minecraft/net/minecraft/entity/EntityTracker.java
-@@ -39,6 +39,8 @@
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
- 
-+import cpw.mods.fml.common.registry.EntityRegistry;
-+
- public class EntityTracker
- {
-     private static final Logger field_151249_a = LogManager.getLogger();
-@@ -56,6 +58,11 @@
- 
-     public void func_72786_a(Entity p_72786_1_)
-     {
-+        if (EntityRegistry.instance().tryTrackingEntity(this, p_72786_1_))
-+        {
-+            return;
-+        }
-+
-         if (p_72786_1_ instanceof EntityPlayerMP)
-         {
-             this.func_72791_a(p_72786_1_, 512, 2);

fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch

@@ -1,39 +0,0 @@
---- ../src-base/minecraft/net/minecraft/entity/EntityTrackerEntry.java
-+++ ../src-work/minecraft/net/minecraft/entity/EntityTrackerEntry.java
-@@ -57,6 +57,8 @@
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
- 
-+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
-+
- public class EntityTrackerEntry
- {
-     private static final Logger field_151262_p = LogManager.getLogger();
-@@ -377,6 +379,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)
-+                    {
-+                        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));
-@@ -456,6 +466,12 @@
-             field_151262_p.warn("Fetching addPacket for removed entity");
-         }
- 
-+        Packet pkt = 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);

fml/patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch

@@ -1,20 +0,0 @@
---- ../src-base/minecraft/net/minecraft/entity/item/EntityItem.java
-+++ ../src-work/minecraft/net/minecraft/entity/item/EntityItem.java
-@@ -17,6 +17,8 @@
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
- 
-+import cpw.mods.fml.common.FMLCommonHandler;
-+
- public class EntityItem extends Entity
- {
-     private static final Logger field_145803_d = LogManager.getLogger();
-@@ -325,6 +327,8 @@
-                     }
-                 }
- 
-+                FMLCommonHandler.instance().firePlayerItemPickupEvent(p_70100_1_, this);
-+
-                 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);
-                 p_70100_1_.func_71001_a(this, i);
- 

fml/patches/minecraft/net/minecraft/entity/monster/EntitySlime.java.patch

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/entity/monster/EntitySlime.java
-+++ ../src-work/minecraft/net/minecraft/entity/monster/EntitySlime.java
-@@ -247,7 +247,7 @@
-     {
-         Chunk chunk = this.field_70170_p.func_72938_d(MathHelper.func_76128_c(this.field_70165_t), MathHelper.func_76128_c(this.field_70161_v));
- 
--        if (this.field_70170_p.func_72912_H().func_76067_t() == WorldType.field_77138_c && this.field_70146_Z.nextInt(4) != 1)
-+        if (this.field_70170_p.func_72912_H().func_76067_t().handleSlimeSpawnReduction(field_70146_Z, field_70170_p))
-         {
-             return false;
-         }

fml/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch

@@ -1,26 +0,0 @@
---- ../src-base/minecraft/net/minecraft/entity/passive/EntityVillager.java
-+++ ../src-work/minecraft/net/minecraft/entity/passive/EntityVillager.java
-@@ -1,5 +1,6 @@
- package net.minecraft.entity.passive;
- 
-+import cpw.mods.fml.common.registry.VillagerRegistry;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.util.Collections;
-@@ -422,6 +423,7 @@
- 
-         MerchantRecipeList merchantrecipelist;
-         merchantrecipelist = new MerchantRecipeList();
-+        VillagerRegistry.manageVillagerTrades(merchantrecipelist, this, this.func_70946_n(), this.field_70146_Z);
-         int k;
-         label50:
- 
-@@ -626,7 +628,7 @@
-     public IEntityLivingData func_110161_a(IEntityLivingData p_110161_1_)
-     {
-         p_110161_1_ = super.func_110161_a(p_110161_1_);
--        this.func_70938_b(this.field_70170_p.field_73012_v.nextInt(5));
-+        VillagerRegistry.applyRandomTrade(this, field_70170_p.field_73012_v);
-         return p_110161_1_;
-     }
- 

fml/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch

@@ -1,40 +0,0 @@
---- ../src-base/minecraft/net/minecraft/entity/player/EntityPlayer.java
-+++ ../src-work/minecraft/net/minecraft/entity/player/EntityPlayer.java
-@@ -2,6 +2,9 @@
- 
- import com.google.common.base.Charsets;
- import com.mojang.authlib.GameProfile;
-+
-+import cpw.mods.fml.common.FMLCommonHandler;
-+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.util.Collection;
-@@ -193,6 +196,7 @@
- 
-     public void func_70071_h_()
-     {
-+        FMLCommonHandler.instance().onPlayerPreTick(this);
-         if (this.field_71074_e != null)
-         {
-             ItemStack itemstack = this.field_71071_by.func_70448_g();
-@@ -316,6 +320,7 @@
-             this.field_71100_bB.func_75118_a(this);
-             this.func_71064_a(StatList.field_75948_k, 1);
-         }
-+        FMLCommonHandler.instance().onPlayerPostTick(this);
-     }
- 
-     public int func_82145_z()
-@@ -2031,6 +2036,11 @@
-         }
-     }
- 
-+    public void openGui(Object mod, int modGuiId, World world, int x, int y, int z)
-+    {
-+        FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z);
-+    }
-+
-     public static enum EnumStatus
-     {
-         OK,

fml/patches/minecraft/net/minecraft/inventory/SlotCrafting.java.patch

@@ -1,17 +0,0 @@
---- ../src-base/minecraft/net/minecraft/inventory/SlotCrafting.java
-+++ ../src-work/minecraft/net/minecraft/inventory/SlotCrafting.java
-@@ -1,5 +1,6 @@
- package net.minecraft.inventory;
- 
-+import cpw.mods.fml.common.FMLCommonHandler;
- import net.minecraft.entity.player.EntityPlayer;
- import net.minecraft.init.Blocks;
- import net.minecraft.init.Items;
-@@ -103,6 +104,7 @@
- 
-     public void func_82870_a(EntityPlayer p_82870_1_, ItemStack p_82870_2_)
-     {
-+        FMLCommonHandler.instance().firePlayerCraftingEvent(p_82870_1_, p_82870_2_, field_75239_a);
-         this.func_75208_c(p_82870_2_);
- 
-         for (int i = 0; i < this.field_75239_a.func_70302_i_(); ++i)

fml/patches/minecraft/net/minecraft/inventory/SlotFurnace.java.patch

@@ -1,18 +0,0 @@
---- ../src-base/minecraft/net/minecraft/inventory/SlotFurnace.java
-+++ ../src-work/minecraft/net/minecraft/inventory/SlotFurnace.java
-@@ -1,5 +1,6 @@
- package net.minecraft.inventory;
- 
-+import cpw.mods.fml.common.FMLCommonHandler;
- import net.minecraft.entity.item.EntityXPOrb;
- import net.minecraft.entity.player.EntityPlayer;
- import net.minecraft.init.Items;
-@@ -83,6 +84,8 @@
- 
-         this.field_75228_b = 0;
- 
-+        FMLCommonHandler.instance().firePlayerSmeltedEvent(field_75229_a, p_75208_1_);
-+
-         if (p_75208_1_.func_77973_b() == Items.field_151042_j)
-         {
-             this.field_75229_a.func_71064_a(AchievementList.field_76016_k, 1);

fml/patches/minecraft/net/minecraft/item/Item.java.patch

@@ -1,29 +0,0 @@
---- ../src-base/minecraft/net/minecraft/item/Item.java
-+++ ../src-work/minecraft/net/minecraft/item/Item.java
-@@ -3,6 +3,8 @@
- import com.google.common.collect.HashMultimap;
- import com.google.common.collect.Multimap;
- import com.google.common.collect.Sets;
-+
-+import cpw.mods.fml.common.registry.GameData;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.util.HashSet;
-@@ -46,7 +48,7 @@
- 
- public class Item
- {
--    public static final RegistryNamespaced field_150901_e = new RegistryNamespaced();
-+    public static final RegistryNamespaced field_150901_e = GameData.getItemRegistry();
-     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();
-@@ -62,6 +64,8 @@
-     protected String field_111218_cA;
-     private static final String __OBFID = "CL_00000041";
- 
-+    public final cpw.mods.fml.common.registry.RegistryDelegate<Item> delegate = 
-+            ((cpw.mods.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_);

fml/patches/minecraft/net/minecraft/item/ItemEmptyMap.java.patch

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/item/ItemEmptyMap.java
-+++ ../src-work/minecraft/net/minecraft/item/ItemEmptyMap.java
-@@ -25,7 +25,7 @@
-         int i = 128 * (1 << mapdata.field_76197_d);
-         mapdata.field_76201_a = (int)(Math.round(p_77659_3_.field_70165_t / (double)i) * (long)i);
-         mapdata.field_76199_b = (int)(Math.round(p_77659_3_.field_70161_v / (double)i) * (long)i);
--        mapdata.field_76200_c = (byte)p_77659_2_.field_73011_w.field_76574_g;
-+        mapdata.field_76200_c = p_77659_2_.field_73011_w.field_76574_g;
-         mapdata.func_76185_a();
-         --p_77659_1_.field_77994_a;
- 

fml/patches/minecraft/net/minecraft/item/ItemMap.java.patch

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/item/ItemMap.java
-+++ ../src-work/minecraft/net/minecraft/item/ItemMap.java
-@@ -57,7 +57,7 @@
-             int i = 128 * (1 << mapdata.field_76197_d);
-             mapdata.field_76201_a = Math.round((float)p_77873_2_.func_72912_H().func_76079_c() / (float)i) * i;
-             mapdata.field_76199_b = Math.round((float)(p_77873_2_.func_72912_H().func_76074_e() / i)) * i;
--            mapdata.field_76200_c = (byte)p_77873_2_.field_73011_w.field_76574_g;
-+            mapdata.field_76200_c = p_77873_2_.field_73011_w.field_76574_g;
-             mapdata.func_76185_a();
-             p_77873_2_.func_72823_a(s, mapdata);
-         }

fml/patches/minecraft/net/minecraft/item/ItemStack.java.patch

@@ -1,45 +0,0 @@
---- ../src-base/minecraft/net/minecraft/item/ItemStack.java
-+++ ../src-work/minecraft/net/minecraft/item/ItemStack.java
-@@ -45,6 +45,7 @@
-     private EntityItemFrame field_82843_f;
-     private static final String __OBFID = "CL_00000043";
- 
-+    private cpw.mods.fml.common.registry.RegistryDelegate<Item> delegate;
-     public ItemStack(Block p_i1876_1_)
-     {
-         this(p_i1876_1_, 1);
-@@ -72,7 +73,7 @@
- 
-     public ItemStack(Item p_i1881_1_, int p_i1881_2_, int p_i1881_3_)
-     {
--        this.field_151002_e = p_i1881_1_;
-+        func_150996_a(p_i1881_1_);
-         this.field_77994_a = p_i1881_2_;
-         this.field_77991_e = p_i1881_3_;
- 
-@@ -106,7 +107,7 @@
- 
-     public Item func_77973_b()
-     {
--        return this.field_151002_e;
-+        return this.delegate != null ? this.delegate.get() : null;
-     }
- 
-     @SideOnly(Side.CLIENT)
-@@ -164,7 +165,7 @@
- 
-     public void func_77963_c(NBTTagCompound p_77963_1_)
-     {
--        this.field_151002_e = Item.func_150899_d(p_77963_1_.func_74765_d("id"));
-+        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");
-         this.field_77991_e = p_77963_1_.func_74765_d("Damage");
- 
-@@ -744,6 +745,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_;
-     }
- 

fml/patches/minecraft/net/minecraft/network/NetworkSystem.java.patch

@@ -1,20 +0,0 @@
---- ../src-base/minecraft/net/minecraft/network/NetworkSystem.java
-+++ ../src-work/minecraft/net/minecraft/network/NetworkSystem.java
-@@ -1,6 +1,8 @@
- package net.minecraft.network;
- 
- import com.google.common.util.concurrent.ThreadFactoryBuilder;
-+
-+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import io.netty.bootstrap.ServerBootstrap;
-@@ -84,7 +86,7 @@
-                         ;
-                     }
- 
--                    p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(30)).addLast("legacy_query", new PingResponseHandler(NetworkSystem.this)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer(NetworkManager.field_152462_h)).addLast("prepender", new MessageSerializer2()).addLast("encoder", new MessageSerializer(NetworkManager.field_152462_h));
-+                    p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(FMLNetworkHandler.READ_TIMEOUT)).addLast("legacy_query", new PingResponseHandler(NetworkSystem.this)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer(NetworkManager.field_152462_h)).addLast("prepender", new MessageSerializer2()).addLast("encoder", new MessageSerializer(NetworkManager.field_152462_h));
-                     NetworkManager networkmanager = new NetworkManager(false);
-                     NetworkSystem.this.field_151272_f.add(networkmanager);
-                     p_initChannel_1_.pipeline().addLast("packet_handler", networkmanager);

fml/patches/minecraft/net/minecraft/network/ServerStatusResponse.java.patch

@@ -1,27 +0,0 @@
---- ../src-base/minecraft/net/minecraft/network/ServerStatusResponse.java
-+++ ../src-work/minecraft/net/minecraft/network/ServerStatusResponse.java
-@@ -8,6 +8,8 @@
- import com.google.gson.JsonSerializationContext;
- import com.google.gson.JsonSerializer;
- import com.mojang.authlib.GameProfile;
-+import cpw.mods.fml.client.FMLClientHandler;
-+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
- import java.lang.reflect.Type;
- import java.util.UUID;
- import net.minecraft.util.IChatComponent;
-@@ -233,6 +235,7 @@
-                     serverstatusresponse.func_151320_a(JsonUtils.func_151200_h(jsonobject, "favicon"));
-                 }
- 
-+                FMLClientHandler.instance().captureAdditionalData(serverstatusresponse, jsonobject);
-                 return serverstatusresponse;
-             }
- 
-@@ -260,6 +263,7 @@
-                     jsonobject.addProperty("favicon", p_serialize_1_.func_151316_d());
-                 }
- 
-+                FMLNetworkHandler.enhanceStatusQuery(jsonobject);
-                 return jsonobject;
-             }
- 

fml/patches/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java.patch

@@ -1,31 +0,0 @@
---- ../src-base/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java
-+++ ../src-work/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java
-@@ -27,23 +27,24 @@
-         this.field_149172_a = p_i45190_1_;
-         this.field_149171_b = p_i45190_2_;
- 
--        if (p_i45190_2_.length >= 1048576)
-+        //TODO: Remove this when FML protocol is re-written. To restore vanilla compatibility.
-+        if (p_i45190_2_.length > 0x1FFF9A) // Max size of ANY MC packet is 0x1FFFFF minus max size of this packet (101)
-         {
--            throw new IllegalArgumentException("Payload may not be larger than 1048576 bytes");
-+            throw new IllegalArgumentException("Payload may not be larger than 2097050 bytes");
-         }
-     }
- 
-     public void func_148837_a(PacketBuffer p_148837_1_) throws IOException
-     {
-         this.field_149172_a = p_148837_1_.func_150789_c(20);
--        this.field_149171_b = new byte[p_148837_1_.readUnsignedShort()];
-+        this.field_149171_b = new byte[cpw.mods.fml.common.network.ByteBufUtils.readVarShort(p_148837_1_)];
-         p_148837_1_.readBytes(this.field_149171_b);
-     }
- 
-     public void func_148840_b(PacketBuffer p_148840_1_) throws IOException
-     {
-         p_148840_1_.func_150785_a(this.field_149172_a);
--        p_148840_1_.writeShort(this.field_149171_b.length);
-+        cpw.mods.fml.common.network.ByteBufUtils.writeVarShort(p_148840_1_, this.field_149171_b.length);
-         p_148840_1_.writeBytes(this.field_149171_b);
-     }
- 

fml/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/realms/RealmsConnect.java
-+++ ../src-work/minecraft/net/minecraft/realms/RealmsConnect.java
-@@ -40,6 +40,7 @@
- 
-                 try
-                 {
-+                    cpw.mods.fml.client.FMLClientHandler.instance().connectToRealmsServer(p_connect_1_, p_connect_2_);
-                     inetaddress = InetAddress.getByName(p_connect_1_);
- 
-                     if (RealmsConnect.this.aborted)

fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch

@@ -1,118 +0,0 @@
---- ../src-base/minecraft/net/minecraft/server/MinecraftServer.java
-+++ ../src-work/minecraft/net/minecraft/server/MinecraftServer.java
-@@ -5,6 +5,11 @@
- import com.mojang.authlib.GameProfileRepository;
- import com.mojang.authlib.minecraft.MinecraftSessionService;
- import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
-+
-+import cpw.mods.fml.common.FMLCommonHandler;
-+import cpw.mods.fml.common.Loader;
-+import cpw.mods.fml.common.LoaderState;
-+import cpw.mods.fml.common.StartupQuery;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import io.netty.buffer.ByteBuf;
-@@ -343,7 +348,7 @@
- 
-     public void func_71260_j()
-     {
--        if (!this.field_71290_O)
-+        if (!this.field_71290_O && Loader.instance().hasReachedState(LoaderState.SERVER_STARTED) && !field_71316_v) // make sure the save is valid and we don't save twice
-         {
-             field_147145_h.info("Stopping server");
- 
-@@ -394,6 +399,7 @@
-         {
-             if (this.func_71197_b())
-             {
-+                FMLCommonHandler.instance().handleServerStarted();
-                 long i = func_130071_aq();
-                 long l = 0L;
-                 this.field_147147_p.func_151315_a(new ChatComponentText(this.field_71286_C));
-@@ -438,12 +444,20 @@
-                     Thread.sleep(Math.max(1L, 50L - l));
-                     this.field_71296_Q = true;
-                 }
-+                FMLCommonHandler.instance().handleServerStopping();
-+                FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
-             }
-             else
-             {
-+                FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
-                 this.func_71228_a((CrashReport)null);
-             }
-         }
-+        catch (StartupQuery.AbortedException e)
-+        {
-+            // ignore silently
-+            FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
-+        }
-         catch (Throwable throwable1)
-         {
-             field_147145_h.error("Encountered an unexpected exception", throwable1);
-@@ -469,6 +483,7 @@
-                 field_147145_h.error("We were unable to save this crash report to disk.");
-             }
- 
-+            FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
-             this.func_71228_a(crashreport);
-         }
-         finally
-@@ -484,6 +499,8 @@
-             }
-             finally
-             {
-+                FMLCommonHandler.instance().handleServerStopped();
-+                this.field_71316_v = true;
-                 this.func_71240_o();
-             }
-         }
-@@ -529,6 +546,7 @@
-     public void func_71217_p()
-     {
-         long i = System.nanoTime();
-+        FMLCommonHandler.instance().onPreServerTick();
-         ++this.field_71315_w;
- 
-         if (this.field_71295_T)
-@@ -582,6 +600,7 @@
- 
-         this.field_71304_b.func_76319_b();
-         this.field_71304_b.func_76319_b();
-+        FMLCommonHandler.instance().onPostServerTick();
-     }
- 
-     public void func_71190_q()
-@@ -608,6 +627,7 @@
-                 }
- 
-                 this.field_71304_b.func_76320_a("tick");
-+                FMLCommonHandler.instance().onPreWorldTick(worldserver);
-                 CrashReport crashreport;
- 
-                 try
-@@ -632,6 +652,7 @@
-                     throw new ReportedException(crashreport);
-                 }
- 
-+                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();
-@@ -663,6 +684,7 @@
- 
-     public void func_71256_s()
-     {
-+        StartupQuery.reset();
-         (new Thread("Server thread")
-         {
-             private static final String __OBFID = "CL_00001418";
-@@ -715,7 +737,7 @@
- 
-     public String getServerModName()
-     {
--        return "vanilla";
-+        return FMLCommonHandler.instance().getModName();
-     }
- 
-     public CrashReport func_71230_b(CrashReport p_71230_1_)

fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch

@@ -1,21 +0,0 @@
---- ../src-base/minecraft/net/minecraft/server/integrated/IntegratedServer.java
-+++ ../src-work/minecraft/net/minecraft/server/integrated/IntegratedServer.java
-@@ -1,5 +1,6 @@
- package net.minecraft.server.integrated;
- 
-+import cpw.mods.fml.common.FMLCommonHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.io.File;
-@@ -105,9 +106,10 @@
-         this.func_71245_h(true);
-         field_147148_h.info("Generating keypair");
-         this.func_71253_a(CryptManager.func_75891_b());
-+        if (!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 FMLCommonHandler.instance().handleServerStarting(this);
-     }
- 
-     public void func_71217_p()

fml/patches/minecraft/net/minecraft/server/management/PlayerProfileCache.java.patch

@@ -1,50 +0,0 @@
---- ../src-base/minecraft/net/minecraft/server/management/PlayerProfileCache.java
-+++ ../src-work/minecraft/net/minecraft/server/management/PlayerProfileCache.java
-@@ -224,26 +224,12 @@
-     {
-         List list = null;
-         BufferedReader bufferedreader = null;
--        label81:
-         {
-             try
-             {
-                 bufferedreader = Files.newReader(this.field_152665_g, Charsets.UTF_8);
-                 list = (List)this.field_152660_b.fromJson(bufferedreader, field_152666_h);
--                break label81;
--            }
--            catch (FileNotFoundException filenotfoundexception)
--            {
--                ;
--            }
--            finally
--            {
--                IOUtils.closeQuietly(bufferedreader);
--            }
- 
--            return;
--        }
--
-         if (list != null)
-         {
-             this.field_152661_c.clear();
-@@ -268,6 +254,20 @@
-                 }
-             }
-         }
-+            }
-+            catch (FileNotFoundException filenotfoundexception)
-+            {
-+                ;
-+            }
-+            catch (com.google.gson.JsonParseException parsefail)
-+            {
-+                // No op - the cache can quietly rebuild if it's junk
-+            }
-+            finally
-+            {
-+                IOUtils.closeQuietly(bufferedreader);
-+            }
-+        }
-     }
- 
-     public void func_152658_c()

fml/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch

@@ -1,93 +0,0 @@
---- ../src-base/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
-+++ ../src-work/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
-@@ -4,6 +4,8 @@
- import com.google.common.collect.Lists;
- import com.google.common.collect.Maps;
- import com.mojang.authlib.GameProfile;
-+
-+import cpw.mods.fml.common.FMLCommonHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.io.File;
-@@ -58,6 +60,7 @@
- import net.minecraft.world.WorldSettings;
- import net.minecraft.world.demo.DemoWorldManager;
- import net.minecraft.world.storage.IPlayerFileData;
-+import net.minecraft.world.storage.SaveHandler;
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
- 
-@@ -98,7 +101,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();
-@@ -119,7 +122,7 @@
-         WorldServer worldserver = this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK);
-         ChunkCoordinates chunkcoordinates = worldserver.func_72861_E();
-         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(), worldserver.func_72912_H().func_76093_s(), worldserver.field_73011_w.field_76574_g, worldserver.field_73013_u, this.func_72352_l(), worldserver.func_72912_H().func_76067_t()));
-         nethandlerplayserver.func_147359_a(new S3FPacketCustomPayload("MC|Brand", this.func_72365_p().getServerModName().getBytes(Charsets.UTF_8)));
-         nethandlerplayserver.func_147359_a(new S05PacketSpawnPosition(chunkcoordinates.field_71574_a, chunkcoordinates.field_71572_b, chunkcoordinates.field_71573_c));
-@@ -161,6 +164,7 @@
- 
-         p_72355_2_.func_71116_b();
- 
-+        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);
-@@ -248,8 +252,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 ((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());
- 
-@@ -281,6 +300,7 @@
- 
-     public void func_72367_e(EntityPlayerMP p_72367_1_)
-     {
-+        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();
-@@ -436,6 +456,7 @@
-         this.field_72404_b.add(entityplayermp1);
-         entityplayermp1.func_71116_b();
-         entityplayermp1.func_70606_j(entityplayermp1.func_110143_aJ());
-+        FMLCommonHandler.instance().firePlayerRespawnEvent(entityplayermp1);
-         return entityplayermp1;
-     }
- 
-@@ -461,6 +482,7 @@
-             PotionEffect potioneffect = (PotionEffect)iterator.next();
-             p_72356_1_.field_71135_a.func_147359_a(new S1DPacketEntityEffect(p_72356_1_.func_145782_y(), potioneffect));
-         }
-+        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_)

fml/patches/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java.patch

@@ -1,24 +0,0 @@
---- ../src-base/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java
-+++ ../src-work/minecraft/net/minecraft/server/network/NetHandlerHandshakeTCP.java
-@@ -1,5 +1,6 @@
- package net.minecraft.server.network;
- 
-+import cpw.mods.fml.common.FMLCommonHandler;
- import io.netty.util.concurrent.GenericFutureListener;
- import net.minecraft.network.EnumConnectionState;
- import net.minecraft.network.NetworkManager;
-@@ -24,6 +25,14 @@
- 
-     public void func_147383_a(C00Handshake p_147383_1_)
-     {
-+        if (!FMLCommonHandler.instance().shouldAllowPlayerLogins())
-+        {
-+            ChatComponentText chatcomponenttext = new ChatComponentText("Server is still starting! Please wait before reconnecting.");
-+            this.field_147386_b.func_150725_a(new S00PacketDisconnect(chatcomponenttext), new GenericFutureListener[0]);
-+            this.field_147386_b.func_150718_a(chatcomponenttext);
-+            return;
-+        }
-+
-         switch (NetHandlerHandshakeTCP.SwitchEnumConnectionState.field_151291_a[p_147383_1_.func_149594_c().ordinal()])
-         {
-             case 1:

fml/patches/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java.patch

@@ -1,29 +0,0 @@
---- ../src-base/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java
-+++ ../src-work/minecraft/net/minecraft/server/network/NetHandlerLoginServer.java
-@@ -3,6 +3,8 @@
- import com.google.common.base.Charsets;
- import com.mojang.authlib.GameProfile;
- import com.mojang.authlib.exceptions.AuthenticationUnavailableException;
-+
-+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
- import io.netty.util.concurrent.GenericFutureListener;
- import java.math.BigInteger;
- import java.security.PrivateKey;
-@@ -58,7 +60,7 @@
-             this.func_147326_c();
-         }
- 
--        if (this.field_147336_h++ == 600)
-+        if (this.field_147336_h++ == FMLNetworkHandler.LOGIN_TIMEOUT)
-         {
-             this.func_147322_a("Took too long to log in");
-         }
-@@ -96,7 +98,7 @@
-         {
-             this.field_147328_g = NetHandlerLoginServer.LoginState.ACCEPTED;
-             this.field_147333_a.func_150725_a(new S02PacketLoginSuccess(this.field_147337_i), new GenericFutureListener[0]);
--            this.field_147327_f.func_71203_ab().func_72355_a(this.field_147333_a, this.field_147327_f.func_71203_ab().func_148545_a(this.field_147337_i));
-+            FMLNetworkHandler.fmlServerHandshake(this.field_147327_f.func_71203_ab(), this.field_147333_a, this.field_147327_f.func_71203_ab().func_148545_a(this.field_147337_i));
-         }
-     }
- 

fml/patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch

@@ -1,62 +0,0 @@
---- ../src-base/minecraft/net/minecraft/tileentity/TileEntity.java
-+++ ../src-work/minecraft/net/minecraft/tileentity/TileEntity.java
-@@ -1,10 +1,12 @@
- package net.minecraft.tileentity;
- 
-+import cpw.mods.fml.common.FMLLog;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.util.HashMap;
- import java.util.Map;
- import java.util.concurrent.Callable;
-+
- import net.minecraft.block.Block;
- import net.minecraft.block.BlockJukebox;
- import net.minecraft.crash.CrashReportCategory;
-@@ -12,6 +14,8 @@
- import net.minecraft.nbt.NBTTagCompound;
- import net.minecraft.network.Packet;
- import net.minecraft.world.World;
-+
-+import org.apache.logging.log4j.Level;
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
- 
-@@ -87,9 +91,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)
-             {
-@@ -103,7 +108,17 @@
- 
-         if (tileentity != null)
-         {
-+            try
-+            {
-             tileentity.func_145839_a(p_145827_0_);
-+            }
-+            catch (Exception ex)
-+            {
-+                FMLLog.log(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;
-+            }
-         }
-         else
-         {
-@@ -137,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_145851_c + 0.5D - p_145835_1_;

fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch

@@ -1,26 +0,0 @@
---- ../src-base/minecraft/net/minecraft/tileentity/TileEntityFurnace.java
-+++ ../src-work/minecraft/net/minecraft/tileentity/TileEntityFurnace.java
-@@ -1,5 +1,6 @@
- package net.minecraft.tileentity;
- 
-+import cpw.mods.fml.common.registry.GameRegistry;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import net.minecraft.block.Block;
-@@ -322,7 +323,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 GameRegistry.getFuelValue(p_145952_0_);
-         }
-     }
- 

fml/patches/minecraft/net/minecraft/util/ResourceLocation.java.patch

@@ -1,13 +0,0 @@
---- ../src-base/minecraft/net/minecraft/util/ResourceLocation.java
-+++ ../src-work/minecraft/net/minecraft/util/ResourceLocation.java
-@@ -1,10 +1,7 @@
- package net.minecraft.util;
- 
--import cpw.mods.fml.relauncher.Side;
--import cpw.mods.fml.relauncher.SideOnly;
- import org.apache.commons.lang3.Validate;
- 
--@SideOnly(Side.CLIENT)
- public class ResourceLocation
- {
-     private final String field_110626_a;

fml/patches/minecraft/net/minecraft/util/StringTranslate.java.patch

@@ -1,75 +0,0 @@
---- ../src-base/minecraft/net/minecraft/util/StringTranslate.java
-+++ ../src-work/minecraft/net/minecraft/util/StringTranslate.java
-@@ -3,10 +3,13 @@
- import com.google.common.base.Splitter;
- import com.google.common.collect.Iterables;
- import com.google.common.collect.Maps;
-+
-+import cpw.mods.fml.common.registry.LanguageRegistry;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.io.IOException;
- import java.io.InputStream;
-+import java.util.HashMap;
- import java.util.IllegalFormatException;
- import java.util.Iterator;
- import java.util.Map;
-@@ -18,16 +21,35 @@
- {
-     private static final Pattern field_111053_a = Pattern.compile("%(\\d+\\$)?[\\d\\.]*[df]");
-     private static final Splitter field_135065_b = Splitter.on('=').limit(2);
-+    private final Map field_74816_c;
-     private static StringTranslate field_74817_a = new StringTranslate();
--    private final Map field_74816_c = Maps.newHashMap();
-     private long field_150511_e;
-     private static final String __OBFID = "CL_00001212";
- 
-     public StringTranslate()
-     {
-+        InputStream inputstream = StringTranslate.class.getResourceAsStream("/assets/minecraft/lang/en_US.lang");
-+        field_74816_c = Maps.newHashMap();
-+        inject(this, inputstream);
-+    }
-+
-+    public static void inject(InputStream inputstream)
-+    {
-+        inject(field_74817_a, inputstream);
-+    }
-+
-+    private static void inject(StringTranslate inst, InputStream inputstream)
-+    {
-+        HashMap<String, String> map = parseLangFile(inputstream);
-+        inst.field_74816_c.putAll(map);
-+        inst.field_150511_e = System.currentTimeMillis();
-+    }
-+
-+    public static HashMap<String,String> parseLangFile(InputStream inputstream)
-+    {
-+        HashMap<String,String> table = Maps.newHashMap();
-         try
-         {
--            InputStream inputstream = StringTranslate.class.getResourceAsStream("/assets/minecraft/lang/en_US.lang");
-             Iterator iterator = IOUtils.readLines(inputstream, Charsets.UTF_8).iterator();
- 
-             while (iterator.hasNext())
-@@ -42,17 +64,17 @@
-                     {
-                         String s1 = astring[0];
-                         String s2 = field_111053_a.matcher(astring[1]).replaceAll("%$1s");
--                        this.field_74816_c.put(s1, s2);
-+                        table.put(s1, s2);
-                     }
-                 }
-             }
- 
--            this.field_150511_e = System.currentTimeMillis();
-         }
--        catch (IOException ioexception)
-+        catch (Exception ioexception)
-         {
-             ;
-         }
-+        return table;
-     }
- 
-     static StringTranslate func_74808_a()

fml/patches/minecraft/net/minecraft/world/World.java.patch

@@ -1,28 +0,0 @@
---- ../src-base/minecraft/net/minecraft/world/World.java
-+++ ../src-work/minecraft/net/minecraft/world/World.java
-@@ -1800,14 +1800,14 @@
-             }
-         }
- 
--        this.field_147481_N = false;
--
-         if (!this.field_147483_b.isEmpty())
-         {
-             this.field_147482_g.removeAll(this.field_147483_b);
-             this.field_147483_b.clear();
-         }
- 
-+        this.field_147481_N = false;
-+
-         this.field_72984_F.func_76318_c("pendingBlockEntities");
- 
-         if (!this.field_147484_a.isEmpty())
-@@ -3598,7 +3598,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 CrashReportCategory func_72914_a(CrashReport p_72914_1_)

fml/patches/minecraft/net/minecraft/world/WorldProvider.java.patch

@@ -1,48 +0,0 @@
---- ../src-base/minecraft/net/minecraft/world/WorldProvider.java
-+++ ../src-work/minecraft/net/minecraft/world/WorldProvider.java
-@@ -50,20 +50,12 @@
- 
-     protected void func_76572_b()
-     {
--        if (this.field_76579_a.func_72912_H().func_76067_t() == 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_150568_d(flatgeneratorinfo.func_82648_a()), 0.5F);
--        }
--        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) : new ChunkProviderGenerate(this.field_76579_a, this.field_76579_a.func_72905_C(), this.field_76579_a.func_72912_H().func_76089_r()));
-+        return field_76577_b.getChunkGenerator(field_76579_a, field_82913_c);
-     }
- 
-     public boolean func_76566_a(int p_76566_1_, int p_76566_2_)
-@@ -179,19 +171,19 @@
- 
-     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 boolean func_76564_j()
-     {
--        return this.field_76577_b != WorldType.field_77138_c && !this.field_76576_e;
-+        return this.field_76577_b.hasVoidParticles(this.field_76576_e);
-     }
- 
-     @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)

fml/patches/minecraft/net/minecraft/world/WorldType.java.patch

@@ -1,88 +0,0 @@
---- ../src-base/minecraft/net/minecraft/world/WorldType.java
-+++ ../src-work/minecraft/net/minecraft/world/WorldType.java
-@@ -1,5 +1,14 @@
- package net.minecraft.world;
- 
-+import java.util.Random;
-+
-+import net.minecraft.world.biome.BiomeGenBase;
-+import net.minecraft.world.biome.WorldChunkManager;
-+import net.minecraft.world.biome.WorldChunkManagerHell;
-+import net.minecraft.world.chunk.IChunkProvider;
-+import net.minecraft.world.gen.ChunkProviderFlat;
-+import net.minecraft.world.gen.ChunkProviderGenerate;
-+import net.minecraft.world.gen.FlatGeneratorInfo;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- 
-@@ -112,4 +121,70 @@
-         this.field_151361_l = true;
-         return this;
-     }
-+
-+    public WorldChunkManager getChunkManager(World world)
-+    {
-+        if (this == field_77138_c)
-+        {
-+            FlatGeneratorInfo flatgeneratorinfo = FlatGeneratorInfo.func_82651_a(world.func_72912_H().func_82571_y());
-+            return new WorldChunkManagerHell(BiomeGenBase.func_150568_d(flatgeneratorinfo.func_82648_a()), 0.5F);
-+        }
-+        else
-+        {
-+            return new WorldChunkManager(world);
-+        }
-+    }
-+
-+    public IChunkProvider getChunkGenerator(World world, String generatorOptions)
-+    {
-+        return (this == field_77138_c ? new ChunkProviderFlat(world, world.func_72905_C(), world.func_72912_H().func_76089_r(), generatorOptions) : new ChunkProviderGenerate(world, world.func_72905_C(), world.func_72912_H().func_76089_r()));
-+    }
-+
-+    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 boolean hasVoidParticles(boolean flag)
-+    {
-+        return this != field_77138_c && !flag;
-+    }
-+
-+    public double voidFadeMagnitude()
-+    {
-+        return this == field_77138_c ? 1.0D : 0.03125D;
-+    }
-+
-+/*    public BiomeGenBase[] getBiomesForWorldType() {
-+        return biomesForWorldType;
-+    }
-+
-+    public void addNewBiome(BiomeGenBase biome)
-+    {
-+        Set<BiomeGenBase> newBiomesForWorld = Sets.newLinkedHashSet(Arrays.asList(biomesForWorldType));
-+        newBiomesForWorld.add(biome);
-+       biomesForWorldType = newBiomesForWorld.toArray(new BiomeGenBase[0]);
-+    }
-+
-+    public void removeBiome(BiomeGenBase biome)
-+    {
-+        Set<BiomeGenBase> newBiomesForWorld = Sets.newLinkedHashSet(Arrays.asList(biomesForWorldType));
-+        newBiomesForWorld.remove(biome);
-+        biomesForWorldType = newBiomesForWorld.toArray(new BiomeGenBase[0]);
-+    }
-+*/
-+    public boolean handleSlimeSpawnReduction(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() { }
- }

fml/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch

@@ -1,65 +0,0 @@
---- ../src-base/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
-+++ ../src-work/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
-@@ -9,6 +9,7 @@
- import java.util.Iterator;
- import java.util.List;
- import java.util.Set;
-+
- import net.minecraft.block.Block;
- import net.minecraft.entity.Entity;
- import net.minecraft.entity.EntityList;
-@@ -24,9 +25,13 @@
- import net.minecraft.world.chunk.NibbleArray;
- import net.minecraft.world.storage.IThreadedFileIO;
- import net.minecraft.world.storage.ThreadedFileIOBase;
-+
-+import org.apache.logging.log4j.Level;
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
- 
-+import cpw.mods.fml.common.FMLLog;
-+
- public class AnvilChunkLoader implements IChunkLoader, IThreadedFileIO
- {
-     private static final Logger field_151505_a = LogManager.getLogger();
-@@ -260,11 +265,20 @@
-                 Entity entity = (Entity)iterator1.next();
-                 nbttagcompound1 = new NBTTagCompound();
- 
--                if (entity.func_70039_c(nbttagcompound1))
-+                try
-                 {
--                    p_75820_1_.field_76644_m = true;
--                    nbttaglist2.func_74742_a(nbttagcompound1);
-+                    if (entity.func_70039_c(nbttagcompound1))
-+                    {
-+                        p_75820_1_.field_76644_m = true;
-+                        nbttaglist2.func_74742_a(nbttagcompound1);
-+                    }
-                 }
-+                catch (Exception e)
-+                {
-+                    FMLLog.log(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());
-+                }
-             }
-         }
- 
-@@ -276,8 +290,16 @@
-         {
-             TileEntity tileentity = (TileEntity)iterator1.next();
-             nbttagcompound1 = new NBTTagCompound();
-+            try {
-             tileentity.func_145841_b(nbttagcompound1);
-             nbttaglist3.func_74742_a(nbttagcompound1);
-+            }
-+            catch (Exception e)
-+            {
-+                FMLLog.log(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", nbttaglist3);

fml/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.java.patch

@@ -1,18 +0,0 @@
---- ../src-base/minecraft/net/minecraft/world/gen/ChunkProviderServer.java
-+++ ../src-work/minecraft/net/minecraft/world/gen/ChunkProviderServer.java
-@@ -1,6 +1,7 @@
- package net.minecraft.world.gen;
- 
- import com.google.common.collect.Lists;
-+import cpw.mods.fml.common.registry.GameRegistry;
- import java.io.IOException;
- import java.util.ArrayList;
- import java.util.Collections;
-@@ -216,6 +217,7 @@
-             if (this.field_73246_d != null)
-             {
-                 this.field_73246_d.func_73153_a(p_73153_1_, p_73153_2_, p_73153_3_);
-+                GameRegistry.generateWorld(p_73153_2_, p_73153_3_, field_73251_h, field_73246_d, p_73153_1_);
-                 chunk.func_76630_e();
-             }
-         }

fml/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java.patch

@@ -1,31 +0,0 @@
---- ../src-base/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java
-+++ ../src-work/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java
-@@ -4,6 +4,8 @@
- import java.util.Iterator;
- import java.util.List;
- import java.util.Random;
-+
-+import cpw.mods.fml.common.registry.VillagerRegistry;
- import net.minecraft.block.Block;
- import net.minecraft.block.material.Material;
- import net.minecraft.entity.passive.EntityVillager;
-@@ -50,6 +52,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)));
-+        VillagerRegistry.addExtraVillageComponents(arraylist, p_75084_0_, p_75084_1_);
-+
-         Iterator iterator = arraylist.iterator();
- 
-         while (iterator.hasNext())
-@@ -123,6 +127,10 @@
-         {
-             object = StructureVillagePieces.House3.func_74921_a(p_75083_0_, p_75083_2_, p_75083_3_, p_75083_4_, p_75083_5_, p_75083_6_, p_75083_7_, p_75083_8_);
-         }
-+        else
-+        {
-+            object = VillagerRegistry.getVillageComponent(p_75083_1_, p_75083_0_ , p_75083_2_, p_75083_3_, p_75083_4_, p_75083_5_, p_75083_6_, p_75083_7_, p_75083_8_);
-+        }
- 
-         return (StructureVillagePieces.Village)object;
-     }

fml/patches/minecraft/net/minecraft/world/storage/MapData.java.patch

@@ -1,48 +0,0 @@
---- ../src-base/minecraft/net/minecraft/world/storage/MapData.java
-+++ ../src-work/minecraft/net/minecraft/world/storage/MapData.java
-@@ -10,7 +10,7 @@
- import java.util.Map;
- import net.minecraft.entity.player.EntityPlayer;
- import net.minecraft.item.ItemStack;
--import net.minecraft.nbt.NBTTagCompound;
-+import net.minecraft.nbt.*;
- import net.minecraft.world.World;
- import net.minecraft.world.WorldSavedData;
- 
-@@ -18,7 +18,7 @@
- {
-     public int field_76201_a;
-     public int field_76199_b;
--    public byte field_76200_c;
-+    public int field_76200_c;
-     public byte field_76197_d;
-     public byte[] field_76198_e = new byte[16384];
-     public List field_76196_g = new ArrayList();
-@@ -33,7 +33,17 @@
- 
-     public void func_76184_a(NBTTagCompound p_76184_1_)
-     {
--        this.field_76200_c = p_76184_1_.func_74771_c("dimension");
-+        NBTBase dimension = p_76184_1_.func_74781_a("dimension");
-+
-+        if (dimension instanceof NBTTagByte)
-+        {
-+            this.field_76200_c = ((NBTTagByte)dimension).func_150290_f();
-+        }
-+        else
-+        {
-+            this.field_76200_c = ((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");
-@@ -84,7 +94,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);

fml/patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch

@@ -1,109 +0,0 @@
---- ../src-base/minecraft/net/minecraft/world/storage/SaveHandler.java
-+++ ../src-work/minecraft/net/minecraft/world/storage/SaveHandler.java
-@@ -6,13 +6,18 @@
- import java.io.FileInputStream;
- import java.io.FileOutputStream;
- import java.io.IOException;
-+
-+import cpw.mods.fml.common.FMLCommonHandler;
-+import cpw.mods.fml.common.StartupQuery;
- import net.minecraft.entity.player.EntityPlayer;
-+import net.minecraft.entity.player.EntityPlayerMP;
- import net.minecraft.nbt.CompressedStreamTools;
- import net.minecraft.nbt.NBTTagCompound;
- import net.minecraft.server.MinecraftServer;
- import net.minecraft.world.MinecraftException;
- import net.minecraft.world.WorldProvider;
- import net.minecraft.world.chunk.storage.IChunkLoader;
-+
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
- 
-@@ -107,20 +112,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);
-+                FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound);
-+                return worldInfo;
-             }
-+            catch (StartupQuery.AbortedException e)
-+            {
-+                throw e;
-+            }
-             catch (Exception exception1)
-             {
-                 exception1.printStackTrace();
-             }
-         }
- 
-+        FMLCommonHandler.instance().confirmBackupLevelDatUse(this);
-         file1 = new File(this.field_75770_b, "level.dat_old");
- 
-         if (file1.exists())
-@@ -129,8 +143,14 @@
-             {
-                 nbttagcompound = CompressedStreamTools.func_74796_a(new FileInputStream(file1));
-                 nbttagcompound1 = nbttagcompound.func_74775_l("Data");
--                return new WorldInfo(nbttagcompound1);
-+                worldInfo = new WorldInfo(nbttagcompound1);
-+                FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound);
-+                return worldInfo;
-             }
-+            catch (StartupQuery.AbortedException e)
-+            {
-+                throw e;
-+            }
-             catch (Exception exception)
-             {
-                 exception.printStackTrace();
-@@ -146,6 +166,8 @@
-         NBTTagCompound nbttagcompound2 = new NBTTagCompound();
-         nbttagcompound2.func_74782_a("Data", nbttagcompound1);
- 
-+        FMLCommonHandler.instance().handleWorldDataSave(this, p_75755_1_, nbttagcompound2);
-+
-         try
-         {
-             File file1 = new File(this.field_75770_b, "level.dat_new");
-@@ -184,6 +206,8 @@
-         NBTTagCompound nbttagcompound1 = new NBTTagCompound();
-         nbttagcompound1.func_74782_a("Data", nbttagcompound);
- 
-+        FMLCommonHandler.instance().handleWorldDataSave(this, p_75761_1_, nbttagcompound1);
-+
-         try
-         {
-             File file1 = new File(this.field_75770_b, "level.dat_new");
-@@ -296,4 +320,22 @@
-     {
-         return this.field_75767_f;
-     }
-+
-+    public NBTTagCompound getPlayerNBT(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;
-+    }
- }

fml/patches/minecraft/net/minecraft/world/storage/WorldInfo.java.patch

@@ -1,47 +0,0 @@
---- ../src-base/minecraft/net/minecraft/world/storage/WorldInfo.java
-+++ ../src-work/minecraft/net/minecraft/world/storage/WorldInfo.java
-@@ -2,8 +2,11 @@
- 
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
-+
-+import java.util.Map;
- import java.util.concurrent.Callable;
- import net.minecraft.crash.CrashReportCategory;
-+import net.minecraft.nbt.NBTBase;
- import net.minecraft.nbt.NBTTagCompound;
- import net.minecraft.server.MinecraftServer;
- import net.minecraft.world.GameRules;
-@@ -36,6 +39,7 @@
-     private boolean field_76110_t;
-     private boolean field_76109_u;
-     private GameRules field_82577_x;
-+    private Map<String, NBTBase> additionalProperties;
-     private static final String __OBFID = "CL_00000587";
- 
-     protected WorldInfo()
-@@ -532,4 +536,24 @@
-             }
-         });
-     }
-+
-+    /**
-+     * Allow access to additional mod specific world based properties
-+     * Used by FML to store mod list associated with a world, and maybe an id map
-+     * Used by Forge to store the dimensions available to a world
-+     * @param additionalProperties
-+     */
-+    public void setAdditionalProperties(Map<String,NBTBase> additionalProperties)
-+    {
-+        // one time set for this
-+        if (this.additionalProperties == null)
-+        {
-+            this.additionalProperties = additionalProperties;
-+        }
-+    }
-+
-+    public NBTBase getAdditionalProperty(String additionalProperty)
-+    {
-+        return this.additionalProperties!=null? this.additionalProperties.get(additionalProperty) : null;
-+    }
- }

fml/settings.gradle

@@ -1 +0,0 @@
-rootProject.name = 'fml'

fml/src/main/java/cpw/mods/fml/client/FMLConfigGuiFactory.java

@@ -1,140 +0,0 @@
-package cpw.mods.fml.client;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import com.google.common.collect.ImmutableSet;
-
-import cpw.mods.fml.client.config.ConfigGuiType;
-import cpw.mods.fml.client.config.DummyConfigElement;
-import cpw.mods.fml.client.config.GuiConfig;
-import cpw.mods.fml.client.config.GuiConfigEntries.NumberSliderEntry;
-import cpw.mods.fml.client.config.IConfigElement;
-import cpw.mods.fml.client.config.DummyConfigElement.DummyCategoryElement;
-import cpw.mods.fml.client.config.DummyConfigElement.DummyListElement;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.resources.I18n;
-
-public class FMLConfigGuiFactory implements IModGuiFactory 
-{
-    public static class FMLConfigGuiScreen extends GuiConfig 
-    {
-
-        public FMLConfigGuiScreen(GuiScreen parent)
-        {
-            super(parent, getConfigElements(), "FML", false, false, I18n.format("fml.config.sample.title"));
-        }
-        
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        private static List<IConfigElement> getConfigElements()
-        {
-            List<IConfigElement> list = new ArrayList<IConfigElement>();
-            List<IConfigElement> listsList = new ArrayList<IConfigElement>();
-            List<IConfigElement> stringsList = new ArrayList<IConfigElement>();
-            List<IConfigElement> numbersList = new ArrayList<IConfigElement>();
-            Pattern commaDelimitedPattern = Pattern.compile("([A-Za-z]+((,){1}( )*|$))+?");
-            
-            // Top Level Settings
-            list.add(new DummyConfigElement<Boolean>("imABoolean", true, ConfigGuiType.BOOLEAN, "fml.config.sample.imABoolean").setRequiresMcRestart(true));
-            list.add(new DummyConfigElement<Integer>("imAnInteger", 42, ConfigGuiType.INTEGER, "fml.config.sample.imAnInteger", -1, 256).setRequiresMcRestart(true));
-            list.add(new DummyConfigElement<Double>("imADouble", 42.4242D, ConfigGuiType.DOUBLE, "fml.config.sample.imADouble", -1.0D, 256.256D).setRequiresMcRestart(true));
-            list.add(new DummyConfigElement<String>("imAString", "http://www.montypython.net/scripts/string.php", ConfigGuiType.STRING, "fml.config.sample.imAString").setRequiresMcRestart(true));
-            
-            // Lists category
-            listsList.add(new DummyListElement<Boolean>("booleanList", new Boolean[] {true, false, true, false, true, false, true, false}, ConfigGuiType.BOOLEAN, "fml.config.sample.booleanList"));
-            listsList.add(new DummyListElement<Boolean>("booleanListFixed", new Boolean[] {true, false, true, false, true, false, true, false}, ConfigGuiType.BOOLEAN, "fml.config.sample.booleanListFixed", true));
-            listsList.add(new DummyListElement<Boolean>("booleanListMax", new Boolean[] {true, false, true, false, true, false, true, false}, ConfigGuiType.BOOLEAN, "fml.config.sample.booleanListMax", 10));
-            listsList.add(new DummyListElement<Double>("doubleList", new Double[] {0.0D, 1.1D, 2.2D, 3.3D, 4.4D, 5.5D, 6.6D, 7.7D, 8.8D, 9.9D}, ConfigGuiType.DOUBLE, "fml.config.sample.doubleList"));
-            listsList.add(new DummyListElement<Double>("doubleListFixed", new Double[] {0.0D, 1.1D, 2.2D, 3.3D, 4.4D, 5.5D, 6.6D, 7.7D, 8.8D, 9.9D}, ConfigGuiType.DOUBLE, "fml.config.sample.doubleListFixed", true));
-            listsList.add(new DummyListElement<Double>("doubleListMax", new Double[] {0.0D, 1.1D, 2.2D, 3.3D, 4.4D, 5.5D, 6.6D, 7.7D, 8.8D, 9.9D}, ConfigGuiType.DOUBLE, "fml.config.sample.doubleListMax", 15));
-            listsList.add(new DummyListElement<Double>("doubleListBounded", new Double[] {0.0D, 1.1D, 2.2D, 3.3D, 4.4D, 5.5D, 6.6D, 7.7D, 8.8D, 9.9D}, ConfigGuiType.DOUBLE, "fml.config.sample.doubleListBounded", -1.0D, 10.0D));
-            listsList.add(new DummyListElement<Integer>("integerList", new Integer[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, ConfigGuiType.INTEGER, "fml.config.sample.integerList"));
-            listsList.add(new DummyListElement<Integer>("integerListFixed", new Integer[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, ConfigGuiType.INTEGER, "fml.config.sample.integerListFixed", true));
-            listsList.add(new DummyListElement<Integer>("integerListMax", new Integer[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, ConfigGuiType.INTEGER, "fml.config.sample.integerListMax", 15));
-            listsList.add(new DummyListElement<Integer>("integerListBounded", new Integer[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, ConfigGuiType.INTEGER, "fml.config.sample.integerListBounded", -1, 10));
-            listsList.add(new DummyListElement<String>("stringList", new String[] {"An", "array", "of", "string", "values"}, ConfigGuiType.STRING, "fml.config.sample.stringList"));
-            listsList.add(new DummyListElement<String>("stringListFixed", new String[] {"A", "fixed", "length", "array", "of", "string", "values"}, ConfigGuiType.STRING, "fml.config.sample.stringListFixed", true));
-            listsList.add(new DummyListElement<String>("stringListMax", new String[] {"An", "array", "of", "string", "values", "with", "a", "max", "length", "of", "15"}, ConfigGuiType.STRING, "fml.config.sample.stringListMax", 15));
-            listsList.add(new DummyListElement<String>("stringListPattern", new String[] {"Valid", "Not Valid", "Is, Valid", "Comma, Separated, Value"}, ConfigGuiType.STRING, "fml.config.sample.stringListPattern", commaDelimitedPattern));
-            
-            list.add(new DummyCategoryElement("lists", "fml.config.sample.ctgy.lists", listsList));
-            
-            // Strings category
-            stringsList.add(new DummyConfigElement<String>("basicString", "Just a regular String value, anything goes.", ConfigGuiType.STRING, "fml.config.sample.basicString"));
-            stringsList.add(new DummyConfigElement<String>("cycleString", "this", ConfigGuiType.STRING, "fml.config.sample.cycleString", new String[] {"this", "property", "cycles", "through", "a", "list", "of", "valid", "choices"}));
-            stringsList.add(new DummyConfigElement<String>("patternString", "only, comma, separated, words, can, be, entered, in, this, box", ConfigGuiType.STRING, "fml.config.sample.patternString", commaDelimitedPattern));
-            stringsList.add(new DummyConfigElement<String>("chatColorPicker", "c", ConfigGuiType.COLOR, "fml.config.sample.chatColorPicker", new String[] {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"}));
-            stringsList.add(new DummyConfigElement<String>("modIDSelector", "FML", ConfigGuiType.MOD_ID, "fml.config.sample.modIDSelector"));
-            
-            list.add(new DummyCategoryElement("strings", "fml.config.sample.ctgy.strings", stringsList));
-            
-            // Numbers category
-            numbersList.add((new DummyConfigElement<Integer>("basicInteger", 42, ConfigGuiType.INTEGER, "fml.config.sample.basicInteger")));
-            numbersList.add((new DummyConfigElement<Integer>("boundedInteger", 42, ConfigGuiType.INTEGER, "fml.config.sample.boundedInteger", -1, 256)));
-            numbersList.add((new DummyConfigElement<Integer>("sliderInteger", 2000, ConfigGuiType.INTEGER, "fml.config.sample.sliderInteger", 100, 10000)).setCustomListEntryClass(NumberSliderEntry.class));
-            numbersList.add(new DummyConfigElement<Double>("basicDouble", 42.4242D, ConfigGuiType.DOUBLE, "fml.config.sample.basicDouble"));
-            numbersList.add(new DummyConfigElement<Double>("boundedDouble", 42.4242D, ConfigGuiType.DOUBLE, "fml.config.sample.boundedDouble", -1.0D, 256.256D));
-            numbersList.add(new DummyConfigElement<Double>("sliderDouble", 42.4242D, ConfigGuiType.DOUBLE, "fml.config.sample.sliderDouble", -1.0D, 256.256D).setCustomListEntryClass(NumberSliderEntry.class));
-
-            list.add(new DummyCategoryElement("numbers", "fml.config.sample.ctgy.numbers", numbersList));
-            
-            return list;
-        }
-    }
-
-    @Override
-    public void initialize(Minecraft minecraftInstance)
-    {
-    }
-
-    @Override
-    public Class<? extends GuiScreen> mainConfigGuiClass()
-    {
-        return FMLConfigGuiScreen.class;
-    }
-
-    private static final Set<RuntimeOptionCategoryElement> fmlCategories = ImmutableSet.of(new RuntimeOptionCategoryElement("HELP", "FML"));
-
-    @Override
-    public Set<RuntimeOptionCategoryElement> runtimeGuiCategories()
-    {
-        return fmlCategories;
-    }
-
-    @Override
-    public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element)
-    {
-        return new RuntimeOptionGuiHandler() {
-            @Override
-            public void paint(int x, int y, int w, int h)
-            {
-                // TODO Auto-generated method stub
-
-            }
-
-            @Override
-            public void close()
-            {
-            }
-
-            @Override
-            public void addWidgets(List<Gui> widgets, int x, int y, int w, int h)
-            {
-                widgets.add(new GuiButton(100, x+10, y+10, "HELLO"));
-            }
-
-            @Override
-            public void actionCallback(int actionId)
-            {
-                // TODO Auto-generated method stub
-
-            }
-        };
-    }
-
-}

fml/src/main/java/cpw/mods/fml/client/GuiIngameModOptions.java

@@ -1,55 +0,0 @@
-package cpw.mods.fml.client;
-
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.resources.I18n;
-
-public class GuiIngameModOptions extends GuiScreen
-{
-    private final GuiScreen parentScreen;
-    protected String title = "Mod Options";
-    private GuiModOptionList optionList;
-
-    public GuiIngameModOptions(GuiScreen parentScreen)
-    {
-        this.parentScreen = parentScreen;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void initGui()
-    {
-        this.optionList=new GuiModOptionList(this);
-        this.optionList.registerScrollButtons(this.buttonList, 7, 8);
-        this.buttonList.add(new GuiButton(200, this.width / 2 - 100, this.height / 6 + 168, I18n.format("gui.done", new Object[0])));
-    }
-
-    @Override
-    protected void actionPerformed(GuiButton p_146284_1_)
-    {
-        if (p_146284_1_.enabled)
-        {
-            if (p_146284_1_.id == 200)
-            {
-                this.mc.gameSettings.saveOptions();
-                this.mc.displayGuiScreen(this.parentScreen);
-            }
-        }
-    }
-
-    @Override
-    public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)
-    {
-        // force a non-transparent background
-        this.drawDefaultBackground();
-        this.optionList.drawScreen(p_73863_1_, p_73863_2_, p_73863_3_);
-        this.drawCenteredString(this.fontRendererObj, this.title, this.width / 2, 15, 0xFFFFFF);
-        super.drawScreen(p_73863_1_, p_73863_2_, p_73863_3_);
-    }
-
-    FontRenderer getFontRenderer() {
-        return fontRendererObj;
-    }
-
-}

fml/src/main/java/cpw/mods/fml/client/GuiModList.java

@@ -1,304 +0,0 @@
-/*
- * The FML Forge Mod Loader suite.
- * Copyright (C) 2012 cpw
- *
- * This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package cpw.mods.fml.client;
-
-import java.awt.Dimension;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-
-import javax.imageio.ImageIO;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.texture.DynamicTexture;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.client.resources.IResourcePack;
-import net.minecraft.util.ResourceLocation;
-
-import org.apache.logging.log4j.Level;
-import org.lwjgl.opengl.GL11;
-
-import com.google.common.base.Strings;
-
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.common.ModContainer.Disableable;
-
-/**
- * @author cpw
- *
- */
-public class GuiModList extends GuiScreen
-{
-    private GuiScreen mainMenu;
-    private GuiSlotModList modList;
-    private int selected = -1;
-    private ModContainer selectedMod;
-    private int listWidth;
-    private ArrayList<ModContainer> mods;
-    private GuiButton configModButton;
-    private GuiButton disableModButton;
-    private ResourceLocation cachedLogo;
-    private Dimension cachedLogoDimensions;
-
-    /**
-     * @param mainMenu
-     */
-    public GuiModList(GuiScreen mainMenu)
-    {
-        this.mainMenu=mainMenu;
-        this.mods=new ArrayList<ModContainer>();
-        FMLClientHandler.instance().addSpecialModEntries(mods);
-        for (ModContainer mod : Loader.instance().getModList()) {
-            if (mod.getMetadata()!=null && mod.getMetadata().parentMod==null && !Strings.isNullOrEmpty(mod.getMetadata().parent)) {
-                String parentMod = mod.getMetadata().parent;
-                ModContainer parentContainer = Loader.instance().getIndexedModList().get(parentMod);
-                if (parentContainer != null)
-                {
-                    mod.getMetadata().parentMod = parentContainer;
-                    parentContainer.getMetadata().childMods.add(mod);
-                    continue;
-                }
-            }
-            else if (mod.getMetadata()!=null && mod.getMetadata().parentMod!=null)
-            {
-            	 continue;
-            }
-            mods.add(mod);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void initGui()
-    {
-        for (ModContainer mod : mods) {
-            listWidth=Math.max(listWidth,getFontRenderer().getStringWidth(mod.getName()) + 10);
-            listWidth=Math.max(listWidth,getFontRenderer().getStringWidth(mod.getVersion()) + 10);
-        }
-        listWidth=Math.min(listWidth, 150);
-        this.buttonList.add(new GuiButton(6, this.width / 2 - 75, this.height - 38, I18n.format("gui.done")));
-        configModButton = new GuiButton(20, 10, this.height - 60, this.listWidth, 20, "Config");
-        disableModButton = new GuiButton(21, 10, this.height - 38, this.listWidth, 20, "Disable");
-        this.buttonList.add(configModButton);
-        this.buttonList.add(disableModButton);
-        this.modList=new GuiSlotModList(this, mods, listWidth);
-        this.modList.registerScrollButtons(this.buttonList, 7, 8);
-    }
-
-    @Override
-    protected void actionPerformed(GuiButton button) {
-        if (button.enabled)
-        {
-            switch (button.id)
-            {
-                case 6:
-                    this.mc.displayGuiScreen(this.mainMenu);
-                    return;
-                case 20:
-                    try
-                    {
-                        IModGuiFactory guiFactory = FMLClientHandler.instance().getGuiFactoryFor(selectedMod);
-                        GuiScreen newScreen = guiFactory.mainConfigGuiClass().getConstructor(GuiScreen.class).newInstance(this);
-                        this.mc.displayGuiScreen(newScreen);
-                    }
-                    catch (Exception e)
-                    {
-                        FMLLog.log(Level.ERROR, e, "There was a critical issue trying to build the config GUI for %s", selectedMod.getModId());
-                    }
-                    return;
-            }
-        }
-        super.actionPerformed(button);
-    }
-
-    public int drawLine(String line, int offset, int shifty)
-    {
-        this.fontRendererObj.drawString(line, offset, shifty, 0xd7edea);
-        return shifty + 10;
-    }
-
-    @Override
-    public void drawScreen(int p_571_1_, int p_571_2_, float p_571_3_)
-    {
-        this.modList.drawScreen(p_571_1_, p_571_2_, p_571_3_);
-        this.drawCenteredString(this.fontRendererObj, "Mod List", this.width / 2, 16, 0xFFFFFF);
-        int offset = this.listWidth  + 20;
-        if (selectedMod != null) {
-            GL11.glEnable(GL11.GL_BLEND);
-            if (!selectedMod.getMetadata().autogenerated) {
-                configModButton.visible = true;
-                disableModButton.visible = true;
-                disableModButton.packedFGColour = 0xFF3377;
-                configModButton.enabled = false;
-                int shifty = 35;
-                String logoFile = selectedMod.getMetadata().logoFile;
-                if (!logoFile.isEmpty())
-                {
-                    GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-                    TextureManager tm = mc.getTextureManager();
-                    IResourcePack pack = FMLClientHandler.instance().getResourcePackFor(selectedMod.getModId());
-                    try
-                    {
-                        if (cachedLogo == null)
-                        {
-                            BufferedImage logo = null;
-                            if (pack!=null)
-                            {
-                                logo = pack.getPackImage();
-                            }
-                            else
-                            {
-                                InputStream logoResource = getClass().getResourceAsStream(logoFile);
-                                if (logoResource != null)
-                                {
-                                    logo = ImageIO.read(logoResource);
-                                }
-                            }
-                            if (logo != null)
-                            {
-                                cachedLogo = tm.getDynamicTextureLocation("modlogo", new DynamicTexture(logo));
-                                cachedLogoDimensions = new Dimension(logo.getWidth(), logo.getHeight());
-                            }
-                        }
-                        if (cachedLogo != null)
-                        {
-                            this.mc.renderEngine.bindTexture(cachedLogo);
-                            double scaleX = cachedLogoDimensions.width / 200.0;
-                            double scaleY = cachedLogoDimensions.height / 65.0;
-                            double scale = 1.0;
-                            if (scaleX > 1 || scaleY > 1)
-                            {
-                                scale = 1.0 / Math.max(scaleX, scaleY);
-                            }
-                            cachedLogoDimensions.width *= scale;
-                            cachedLogoDimensions.height *= scale;
-                            int top = 32;
-                            Tessellator tess = Tessellator.instance;
-                            tess.startDrawingQuads();
-                            tess.addVertexWithUV(offset,                               top + cachedLogoDimensions.height,  zLevel, 0, 1);
-                            tess.addVertexWithUV(offset + cachedLogoDimensions.width,  top + cachedLogoDimensions.height,  zLevel, 1, 1);
-                            tess.addVertexWithUV(offset + cachedLogoDimensions.width,  top,                                zLevel, 1, 0);
-                            tess.addVertexWithUV(offset,                               top,                                zLevel, 0, 0);
-                            tess.draw();
-
-                            shifty += 65;
-                        }
-                    }
-                    catch (IOException e)
-                    {
-                        ;
-                    }
-                }
-                this.fontRendererObj.drawStringWithShadow(selectedMod.getMetadata().name, offset, shifty, 0xFFFFFF);
-                shifty += 12;
-
-                shifty = drawLine(String.format("Version: %s (%s)", selectedMod.getDisplayVersion(), selectedMod.getVersion()), offset, shifty);
-                shifty = drawLine(String.format("Mod ID: '%s' Mod State: %s", selectedMod.getModId(), Loader.instance().getModState(selectedMod)), offset, shifty);
-                if (!selectedMod.getMetadata().credits.isEmpty()) {
-                   shifty = drawLine(String.format("Credits: %s", selectedMod.getMetadata().credits), offset, shifty);
-                }
-                shifty = drawLine(String.format("Authors: %s", selectedMod.getMetadata().getAuthorList()), offset, shifty);
-                shifty = drawLine(String.format("URL: %s", selectedMod.getMetadata().url), offset, shifty);
-                shifty = drawLine(selectedMod.getMetadata().childMods.isEmpty() ? "No child mods for this mod" : String.format("Child mods: %s", selectedMod.getMetadata().getChildModList()), offset, shifty);
-                int rightSide = this.width - offset - 20;
-                if (rightSide > 20)
-                {
-                    this.getFontRenderer().drawSplitString(selectedMod.getMetadata().description, offset, shifty + 10, rightSide, 0xDDDDDD);
-                }
-                Disableable disableable = selectedMod.canBeDisabled();
-                if (disableable == Disableable.RESTART)
-                {
-                    disableModButton.enabled = true;
-                    disableModButton.visible = true;
-                    disableModButton.packedFGColour = 0xFF3377;
-                }
-                else if (disableable == Disableable.YES)
-                {
-                    disableModButton.enabled = true;
-                    disableModButton.visible = true;
-                    disableModButton.packedFGColour = 0;
-                }
-                else
-                {
-                    disableModButton.packedFGColour = 0;
-                    disableModButton.visible = true;
-                    disableModButton.enabled = false;
-                }
-                IModGuiFactory guiFactory = FMLClientHandler.instance().getGuiFactoryFor(selectedMod);
-                if (guiFactory == null || guiFactory.mainConfigGuiClass() == null)
-                {
-                    configModButton.visible = true;
-                    configModButton.enabled = false;
-                }
-                else
-                {
-                    configModButton.visible = true;
-                    configModButton.enabled = true;
-                }
-            } else {
-                offset = ( this.listWidth + this.width ) / 2;
-                this.drawCenteredString(this.fontRendererObj, selectedMod.getName(), offset, 35, 0xFFFFFF);
-                this.drawCenteredString(this.fontRendererObj, String.format("Version: %s",selectedMod.getVersion()), offset, 45, 0xFFFFFF);
-                this.drawCenteredString(this.fontRendererObj, String.format("Mod State: %s",Loader.instance().getModState(selectedMod)), offset, 55, 0xFFFFFF);
-                this.drawCenteredString(this.fontRendererObj, "No mod information found", offset, 65, 0xDDDDDD);
-                this.drawCenteredString(this.fontRendererObj, "Ask your mod author to provide a mod mcmod.info file", offset, 75, 0xDDDDDD);
-                configModButton.visible = false;
-                disableModButton.visible = false;
-            }
-            GL11.glDisable(GL11.GL_BLEND);
-        }
-        else
-        {
-            configModButton.visible = false;
-            disableModButton.visible = false;
-        }
-        super.drawScreen(p_571_1_, p_571_2_, p_571_3_);
-    }
-
-    Minecraft getMinecraftInstance() {
-        return mc;
-    }
-
-    FontRenderer getFontRenderer() {
-        return fontRendererObj;
-    }
-
-    /**
-     * @param var1
-     */
-    public void selectModIndex(int var1)
-    {
-        this.selected=var1;
-        if (var1>=0 && var1<=mods.size()) {
-            this.selectedMod=mods.get(selected);
-        } else {
-            this.selectedMod=null;
-        }
-        cachedLogo = null;
-    }
-
-    public boolean modIndexSelected(int var1)
-    {
-        return var1==selected;
-    }
-}