Fix license and naming

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

.gitignore

@@ -14,14 +14,3 @@
 #occupational hazards
 /eclipse/
 /repo/
-/buildSrc
-
-#Patch rejects
-*.rej
-/patches-/
-# FML changelog
-changelog.txt
-/patches_old/
-/patches_old_bak/
-*.py
-*.7z

CONTRIBUTING.md

@@ -1,10 +0,0 @@
-Contributing to Forge
-=====================
-
-1) Keep patches to Minecraft classes minimal. If you need a lot of things done, you may either add to relevant forge classes or make a new class.
-
-2) An example mod must be provided for all PRs adding events/hooks to Forge. Whether it's a full mod using your proposed hooks, or just a pastebin containing a simple example, an example mod is required. Please also explain in detail what your new hook does.
-
-3) Follow Forge coding guidelines (braces on newlines, spaces instead of tabs, etc)
-
-For more information, refer to [the wiki](https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge)

CREDITS-fml.txt

@@ -2,14 +2,13 @@ This is Forge Mod Loader.
 
 You can find the source code at all times at https://github.com/MinecraftForge/FML
 
-This minecraft mod is a clean open source implementation of a mod loader for minecraft servers
-and minecraft clients.
+This minecraft mod is a clean open source implementation of a mod loader for
+minecraft servers, minecraft bukkit servers, and minecraft clients.
 
 The code is authored by cpw.
 
-It began by partially implementing an API defined by the client side ModLoader, authored by Risugami.
+It (partially) implements API defined by the client side ModLoader, authored by Risugami.
 http://www.minecraftforum.net/topic/75440-
-This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader.
 
 It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
 http://www.minecraftforge.net/

MinecraftForge-Credits.txt

@@ -1,26 +0,0 @@
-* Eloraam *
-
-* FlowerChild *
-
-* Hawkye *
-
-* MALfunction84 *
-
-Submitted the sleep handler code for his mod (Somnia) and others to use.
-
-* Scokeev9 *
-
-Gave permission for ScotTools API to be integrated into MCF, and also supported the Forge by converting his mods to use it.
-
-ScotTools Background: ScotTools was an API that enabled modders to add blocks to harvesting levels (and many other ease-of-use features to create new tools), and the first tool API that used block material for block breaking efficiency which allowed blocks from mods that didn't use ScotTools API to break with the correct speed.
-
-* SpaceToad *
-
-* LexManos *
-
-* cpw *
-
-* Minecraft Coder Pack (MCP) *
-Forge Mod Loader and Minecraft Forge have permission to distribute and automatically download components of MCP and distribute MCP data files.
-This permission is not transitive and others wishing to redistribute the Minecraft Forge source independently should seek permission of MCP or
-remove the MCP data files and request their users to download MCP separately.

MinecraftForge-License.txt

@@ -1,70 +0,0 @@
-Minecraft Forge Public Licence
-==============================
-
-Version 1.0
-
-0. Definitions
---------------
-
-Minecraft: Denotes a copy of the Minecraft game licensed by Mojang AB
-
-User: Anybody that interract with the software in one of the following ways:
-   - play
-   - decompile
-   - recompile or compile
-   - modify
-
-Minecraft Forge: The Minecraft Forge code, in source form, class file form, as
-obtained in a standalone fashion or as part of a wider distribution.
-
-Dependency: Code required to have Minecraft Forge working properly. That can
-include dependencies required to compile the code as well as modifications in 
-the Minecraft sources that are required to have Minecraft Forge working.
-
-1. Scope
---------
-
-The present license is granted to any user of Minecraft Forge, for all files included 
-unless stated otherwise in the file itself. As a prerequisite, a user of Minecraft 
-Forge must own a legally aquired copy of Minecraft.
-
-2. Play rights
---------------
-
-The user of Minecraft Forge is allowed to install the software on a client or
-a server and to play it without restriction.
-
-3. Modification rights
-----------------------
-
-The user has the right to decompile the source code, look at either the 
-decompiled version or the original source code, and to modify it.
-
-4. Derivation rights
---------------------
-
-The user has the rights to derive code from Minecraft Forge, that is to say to
-write code that either extends Minecraft Forge class and interfaces, 
-instantiate the objects declared or calls the functions. This code is known as
-"derived" code, and can be licensed with conditions different from Minecraft
-Forge.
-
-
-5. Distribution rights
-----------------------
-
-The user of Minecraft Forge is allowed to redistribute Minecraft Forge in 
-partially, in totallity, or included in a distribution. When distributing 
-binaries or class files, the user must provide means to obtain the sources of
-the distributed version of Minecraft Forge at no costs. This includes the
-files as well as any dependency that the code may rely on, including patches to
-minecraft original sources.
-
-Modification of Minecraft Forge as well as dependencies, including patches to
-minecraft original sources, has to remain under the terms of the present
-license.
-
-The right to distribute Minecraft Forge does not extend to the right to distribute
-MCP data files included within Minecraft Forge. These are the property of the MCP
-project and should be removed from any customized distribution of Minecraft Forge
-or permission sought separately from the MCP team.

Paulscode IBXM Library License.txt

@@ -1,10 +0,0 @@
-IBXM is copyright (c) 2007, Martin Cameron, and is licensed under the BSD License.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Neither the name of mumart nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

Paulscode SoundSystem CodecIBXM License.txt

@@ -1,40 +0,0 @@
-SoundSystem CodecIBXM Class License:
-
-You are free to use this class for any purpose, commercial or otherwise.
-You may modify this class or source code, and distribute it any way you
-like, provided the following conditions are met:
-
-1) You may not falsely claim to be the author of this class or any
-   unmodified portion of it.
-2) You may not copyright this class or a modified version of it and then
-   sue me for copyright infringement.
-3) If you modify the source code, you must clearly document the changes
-   made before redistributing the modified source code, so other users know
-   it is not the original code.
-4) You are not required to give me credit for this class in any derived
-   work, but if you do, you must also mention my website:
-   http://www.paulscode.com
-5) I the author will not be responsible for any damages (physical,
-   financial, or otherwise) caused by the use if this class or any
-   portion of it.
-6) I the author do not guarantee, warrant, or make any representations,
-   either expressed or implied, regarding the use of this class or any
-   portion of it.
-
-Author: Paul Lamb
-http://www.paulscode.com
-
-
-This software is based on or using the IBXM library available from
-http://www.geocities.com/sunet2000/
-
-
-IBXM is copyright (c) 2007, Martin Cameron, and is licensed under the BSD License.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Neither the name of mumart nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.txt

@@ -1,36 +1,117 @@
-*** HOW TO INSTALL ***
-For Mod Users:
+This is Forge Mod Loader, or FML for short, by cpw.
 
-Download the latest installer from http://files.minecraftforge.net and follow instructions given by the installer.
+More information can be found at https://github.com/MinecraftForge/FML/wiki
 
+It is a clean reimplementation of a mod loading system for client, server and
+bukkit use, incorporating API implementations of client side ModLoader by
+Risugami.
 
-For Mod Devs:
+It can be installed on its own, or as part of Minecraft Forge.
 
-Download the latest Forge source distribution from http://files.minecraftforge.net and unzip it to a folder.
-Open a command prompt, navigate to the directory where you unzipped the Forge sources, and run:
-If you have Gradle: gradle setupDevWorkspace
-If you DO NOT have Gradle installed:
-Windows: ./gradlew.bat setupDevWorkspace
-MacOS/Linux: ./gradlew setupDevWorkspace
+----------------------
+About Forge Mod Loader
+----------------------
 
-If you wish to use the Eclipse IDE, run gradle eclipse instead of gradle setupDevWorkspace, or install the Gradle plugin for Eclipse and import the Forge source folder as a Gradle project.
+Environments and compatibility
+==============================
+FML covers the three main environments: client, server and bukkit. All
+environments share the main mod loading code base, with additional varying hooks
+based on the specific environment. Compatibility is almost 100% with all 
+ModLoader based mods- any mod with any difficulty (unless noted below) should
+be reported as a ticket to the github, please.
 
-To get the decompiled classes:
-If you have Gradle: gradle setupDecompWorkspace
-If you DO NOT have Gradle installed:
-Windows: ./gradlew.bat setupDecompWorkspace
-MacOS/Linux: ./gradlew setupDecompWorkspace
+Client side mods should be 100% compatible with ModLoader. The only exception is
+Optifine, however new versions of optifine are compatible. There are some very
+visible changes to the client when FML is installed.
 
-For Contributors: (Note: This assumes you have Gradle installed. If you don't, use ./gradlew(.bat) instead of gradle.
+Server side mods are mostly compatible with previous MLMP based incarnations,
+however, this compatibility is not guaranteed. Most mods have adapted to FML 
+and MLMP is not assured and will cause errors. Ask your mod author to update
+to FML.
 
-Clone this repository to a folder. 
-Open a command prompt and navigate to the folder where you cloned this repo.
-Run gradle setupForge to setup your development environment.
+Bukkit side modding is an adaptation of the server side mod code to the bukkit
+environment. Mods need to be recompiled against the bukkit decompilation to work
+however there are guides and tools in development to make this process easier.
+Consult mcportcentral.co.za for more information.
 
-To use Eclipse, point your Eclipse workspace at the eclipse folder inside the repo.
+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).
 
-Requirements (for both mod devs and contributors):
-  You must have a JDK installed and accessible.
-  If you do not wish to use the gradle wrapper, you can install Gradle from http://www.gradle.org/ .
- 
+Client notes
+============
+FML does provide a standard pattern for mods to provide HD textures. This is why
+optifine needed integration code. FML supports HD texture packs
+up to 128x resolution.
+
+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.jar placed in the same directory. FML will launch it's patched
+copy.
+
+To install on a client, FIRST delete META-INF from the minecraft.jar file, then
+copy the contents of the FML or Forge jar file into it. FML and Forge provide 
+their own META-INF data which should *not* be deleted.
+
+Forge Installation
+==================
+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. Generally, 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 your MCP extracted 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- 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 
+into an mcp installation containing vanilla jars only. It should create a new
+folder "fml" inside that installation.
+
+Be sure that you have both vanilla client jars, and the vanilla server jar installed
+as per the MCP install instructions. Both are required for FML to run properly.
+
+Once extracted, run the install.sh or install.bat script provided from the fml
+directory. It should decompile and patch your MCP source code for the client
+and server.
+
+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@.

build.gradle

@@ -1,40 +1,22 @@
 buildscript {
     repositories {
-        maven {
-            name = "central_mirrior"
-            url = "http://uk.maven.org/maven2"
-        }
         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'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
     }
 }
 
-configurations {
-    deployJars
-}
-
-import static net.minecraftforge.gradle.dev.ForgeDevPlugin.*
+import static net.minecraftforge.gradle.dev.FmlDevPlugin.*
 
 apply plugin: 'maven'
-apply plugin: 'forgedev'
+apply plugin: 'fmldev'
 
 repositories {
-    maven {
-        name = "central_mirrior"
-        url = "http://uk.maven.org/maven2"
-    }
-    mavenLocal()
     flatDir {
         name "fileRepo"
         dirs "repo"
@@ -42,94 +24,82 @@ repositories {
 }
 
 minecraft {
-    version = '1.8'
-    mcpVersion = '9.10'
-    mappings = 'snapshot_nodoc_20141130'
-    fmlDir = projectDir.getAbsolutePath() + "/fml";
-    mainClass = 'net.minecraftforge.fml.relauncher.ServerLaunchWrapper'
-    tweakClass = 'net.minecraftforge.fml.common.launcher.FMLTweaker'
+    version = '1.6.4'
+    fmlDir = projectDir.getAbsolutePath();
+    mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
     installerVersion = "1.4"
 }
 
-group = 'net.minecraftforge'
-version = getVersionFromJava(getProject(), 'src/main/java/net/minecraftforge/common/ForgeVersion.java')
+group = 'cpw.mods'
+version = getVersionFromGit(project)
 
 jenkins {
-    job = 'minecraftforge'
-}
-
-// crowdin stuff
-if (project.hasProperty("crowdinKey"))
-    tasks.getLocalizations.apiKey = project.crowdinKey
-
-
-launch4j {
-    jreMinVersion = '1.6.0'
+    job = 'fml'
 }
 
 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)
+            
+            mavenDeployer {
+                configuration = configurations.deployerJars
+
+                repository(url: project.filesmaven.url) {
+                    authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key)
+                }
+
+                pom {
+                    groupId = project.group
+                    version = project.version
+                    artifactId = project.archivesBaseName
+                    project {
+                        name project.archivesBaseName
+                        packaging 'jar'
+                        description 'ForgeModLoader'
+                        url 'https://github.com/MinecraftForge/FML'
+
+                        scm {
+                            url 'https://github.com/MinecraftForge/FML'
+                            connection 'scm:git:git://github.com/MinecraftForge/FML.git'
+                            developerConnection 'scm:git:[email protected]:MinecraftForge/FML.git'
+                        }
+
+                        issueManagement {
+                            system 'github'
+                            url 'https://github.com/MinecraftForge/FML/issues'
+                        }
+
+                        licenses {
+                            license {
+                                name 'GNU Lesser Public License (LGPL), Version 2.1'
+                                url 'http://www.gnu.org/licenses/lgpl-2.1.txt'
+                                distribution 'repo'
+                            }
+                        }
+
+                        developers {
+                            developer {
+                                id 'cpw'
+                                name 'cpw'
+                                roles { role 'developer' }
+                            }
+                        }
+                        developers {
+                            developer {
+                                id 'LexManos'
+                                name 'Lex Manos'
+                                roles { role 'developer' }
+                            }
+                        }
+                    }
+                }
             }
         } else {
             logger.info('Publishing to repo folder')
-            repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
-        }
-
-        pom {
-            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 {
-                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'
-            }
-
-            licenses {
-                license {
-                    name 'Forge Public License'
-                    url 'https://raw.github.com/MinecraftForge/MinecraftForge/master/MinecraftForge-License.txt'
-                    distribution 'repo'
-                }
-            }
-
-            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' }
-                }
+            
+            mavenDeployer {
+                repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
             }
         }
     }

conf/mcp.cfg

@@ -22,8 +22,8 @@ Params  = %(DirConf)s/params.csv
 NewIds  = %(DirConf)s/newids.csv
 
 [SRGS]
-ConfClient     = %(DirConf)s/joined.srg
-ConfServer     = %(DirConf)s/joined.srg
+ConfClient     = %(DirConf)s/packaged.srg
+ConfServer     = %(DirConf)s/packaged.srg
 Client         = %(DirTemp)s/client_rg.srg
 Server         = %(DirTemp)s/server_rg.srg
 DeobfClient    = %(DirTemp)s/client_deobf.srg
@@ -32,16 +32,14 @@ ReobfClient    = %(DirTemp)s/client_ro.srg
 ReobfServer    = %(DirTemp)s/server_ro.srg
 ReobfClientSrg = %(DirTemp)s/client_ro_srg.srg
 ReobfServerSrg = %(DirTemp)s/server_ro_srg.srg
-ReobfClientCls = %(DirTemp)s/client_ro_cls.srg
-ReobfServerCls = %(DirTemp)s/server_ro_cls.srg
 
 [JAR]
 DirNatives = %(DirJars)s/bin/natives
 Client     = %(DirJars)s/bin/minecraft.jar
 Server     = %(DirJars)s/minecraft_server.jar
 LWJGL      = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
-MD5Client  = 8663a10cecc10eaa683a927ef5371852
-MD5Server  = 5b19d1a562a8a7c5f9a787ad96c8148b
+MD5Client  = 2e5044f5359e82245551167a237f3167
+MD5Server  = ba3145656b1480122bd8759cecd7b7a1
 
 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@@ -60,19 +58,12 @@ 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
+XClientCfg      = %(DirConf)s/packaged.exc
+XServerCfg      = %(DirConf)s/packaged.exc
 XClientOut      = %(DirTemp)s/minecraft_exc.jar
 XServerOut      = %(DirTemp)s/minecraft_server_exc.jar
 XClientLog      = %(DirLogs)s/client_exc.log
 XServerLog      = %(DirLogs)s/server_exc.log
-XClientLogReobf = %(DirLogs)s/client_reobf_exc.log
-XServerLogReobf = %(DirLogs)s/server_reobf_exc.log
-XClientMeta     = %(DirTemp)s/client_meta.log
-XServerMeta     = %(DirTemp)s/server_meta.log
-
 
 [DECOMPILE]
 ClsClientTemp = %(DirTempCls)s/minecraft
@@ -95,8 +86,8 @@ TestServer = net/minecraft/server/MinecraftServer
 PatchClient   = %(DirConf)s/patches/minecraft.patch
 PatchServer   = %(DirConf)s/patches/minecraft_server.patch
 PatchTemp     = %(DirTemp)s/temp.patch
-FFPatchClient = %(DirConf)s/patches/minecraft_ff
-FFPatchServer = %(DirConf)s/patches/minecraft_server_ff
+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
 
@@ -105,11 +96,11 @@ BinClient       = %(DirBin)s/minecraft
 BinServer       = %(DirBin)s/minecraft_server
 LogClient       = %(DirLogs)s/client_compile.log
 LogServer       = %(DirLogs)s/server_compile.log
-ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
-ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
+ClassPathClient = 
+ClassPathServer = 
 ClientFixes     = %(DirConf)s/patches
 FixStart        = Start
-IgnorePkg       = paulscode,com,isom,ibxm,de/matthiasmann/twl,org,javax,argo,gnu,io/netty
+IgnorePkg       = paulscode,com,isom,ibxm,de/matthiasmann/twl,org,javax/xml,javax/ws,argo
 
 [REOBF]
 MD5Client         = %(DirTemp)s/client.md5
@@ -134,9 +125,10 @@ 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}/
+UpdateUrl         = 
 IgnoreUpdate      = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
-RGIndex           = 180425
+RGIndex           = 143000
+ParamIndex        = 43000
 
 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg
@@ -163,10 +155,9 @@ CmdRGReobf    = %s -cp "{classpath}" RetroGuard -notch {conffile}
 CmdSS         = %s -cp "{classpath}" -jar %s -i {injar} -o {outjar} -m {mapfile} --kill-source
 CmdSSReobf    = %s -cp "{classpath}" -jar %s -i {injar} -o {outjar} -r -m {mapfile} -d {identifier} -e %s
 CmdJadretro   = %s -jar %s {targetdir}
-CmdFernflower = %s -jar %s -din=1 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
-CmdExceptor   = %s -jar %s --jarIn {input} --jarOut {output} --mapIn {conf} --log {log} --jsonIn {json} --applyMarkers --generateParams
-CmdExceptorDry = %s -jar %s --jarIn {input} --mapIn {conf} --log {log} --jsonIn {json} --applyMarkers
-CmdRecomp     = %s -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
+CmdFernflower = %s -Xmx512M -jar %s -din=0 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
+CmdExceptor   = %s -jar %s {input} {output} {conf} {log}
+CmdRecomp     = %s -encoding UTF-8 -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
 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
+CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" cpw.mods.fml.relauncher.ServerLaunchWrapper {extraargs}
+CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} net.minecraft.launchwrapper.Launch --tweakClass cpw.mods.fml.common.launcher.FMLTweaker --version FML_DEV {extraargs}

conf/patches/minecraft_ff.patch

@@ -0,0 +1,309 @@
+diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java
+--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Tue Sep 17 13:58:48 2013
++++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Tue Sep 17 14:01:01 2013
+@@ -21,9 +21,14 @@
+ 
+    public String func_85085_a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {
+       StringBuilder var1 = new StringBuilder();
++     ArrayList var3;
++     try {
+       Field var2 = ClassLoader.class.getDeclaredField("classes");
+       var2.setAccessible(true);
+-      ArrayList var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
++      var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
++     } catch(Exception ex) {
++      return "";
++     }
+       boolean var4 = true;
+       boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
+       HashMap var6 = new HashMap();
+@@ -98,6 +103,10 @@
+ 
+    // $FF: synthetic method
+    public Object call() {
++     try {
+       return this.func_85085_a();
++     } catch(Exception ex) {
++      return null;
++     }
+    }
+ }
+diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
+--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Sep 17 13:58:48 2013
++++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Sep 17 14:01:01 2013
+@@ -11,6 +11,10 @@
+ 
+ public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
+ 
++   public ComponentStrongholdRightTurn(int p_i2074_1_, Random p_i2074_2_, StructureBoundingBox p_i2074_3_, int p_i2074_4_) {
++      super(p_i2074_1_, p_i2074_2_, p_i2074_3_, p_i2074_4_);
++   }
++
+    public void func_74861_a(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_) {
+       if(this.field_74885_f != 2 && this.field_74885_f != 3) {
+          this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
+diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java
+--- minecraft\net\minecraft\src\DedicatedServer.java	Tue Sep 17 13:58:48 2013
++++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Tue Sep 17 14:01:01 2013
+@@ -208,7 +208,7 @@
+       System.exit(0);
+    }
+ 
+-   protected void func_71190_q() {
++   public void func_71190_q() {
+       super.func_71190_q();
+       this.func_71333_ah();
+    }
+diff -r -U 3 minecraft\net\minecraft\src\EnumChatFormatting.java minecraft_patched\net\minecraft\src\EnumChatFormatting.java
+--- minecraft\net\minecraft\src\EnumChatFormatting.java	Tue Sep 17 13:58:49 2013
++++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Tue Sep 17 14:01:01 2013
+@@ -38,7 +38,7 @@
+    private final String field_96304_B;
+ 
+    private EnumChatFormatting(char p_i1336_3_) {
+-      this(p_i1336_1_, p_i1336_2_, p_i1336_3_, false);
++      this(p_i1336_3_, false);
+    }
+ 
+    private EnumChatFormatting(char p_i1337_3_, boolean p_i1337_4_) {
+diff -r -U 3 minecraft\net\minecraft\src\FileResourcePack.java minecraft_patched\net\minecraft\src\FileResourcePack.java
+--- minecraft\net\minecraft\src\FileResourcePack.java	Tue Sep 17 13:58:49 2013
++++ minecraft_patched\net\minecraft\src\FileResourcePack.java	Tue Sep 17 14:01:01 2013
+@@ -84,12 +84,18 @@
+ 
+    protected void finalize() {
+       this.close();
++     try {
+       super.finalize();
++     } catch(Throwable t) {
++     }
+    }
+ 
+    public void close() {
+       if(this.field_110600_d != null) {
++        try {
+          this.field_110600_d.close();
++        } catch(Exception ex) {
++        }
+          this.field_110600_d = null;
+       }
+ 
+diff -r -U 3 minecraft\net\minecraft\src\FolderResourcePack.java minecraft_patched\net\minecraft\src\FolderResourcePack.java
+--- minecraft\net\minecraft\src\FolderResourcePack.java	Tue Sep 17 13:58:49 2013
++++ minecraft_patched\net\minecraft\src\FolderResourcePack.java	Tue Sep 17 14:01:01 2013
+@@ -29,7 +29,7 @@
+       HashSet var1 = Sets.newHashSet();
+       File var2 = new File(this.field_110597_b, "assets/");
+       if(var2.isDirectory()) {
+-         File[] var3 = var2.listFiles(DirectoryFileFilter.DIRECTORY);
++         File[] var3 = var2.listFiles((java.io.FileFilter)DirectoryFileFilter.DIRECTORY);
+          int var4 = var3.length;
+ 
+          for(int var5 = 0; var5 < var4; ++var5) {
+diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
+--- minecraft\net\minecraft\src\FontRenderer.java	Tue Sep 17 13:58:49 2013
++++ minecraft_patched\net\minecraft\src\FontRenderer.java	Tue Sep 17 14:01:01 2013
+@@ -630,8 +630,6 @@
+          case 10:
+             --var5;
+             break;
+-         case 32:
+-            var6 = var5;
+          case 167:
+             if(var5 < var3 - 1) {
+                ++var5;
+@@ -645,6 +643,8 @@
+                }
+             }
+             break;
++         case 32:
++            var6 = var5;
+          default:
+             var4 += this.func_78263_a(var8);
+             if(var7) {
+diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java
+--- minecraft\net\minecraft\src\IntegratedServer.java	Tue Sep 17 13:58:50 2013
++++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Tue Sep 17 14:01:01 2013
+@@ -103,7 +103,7 @@
+       return true;
+    }
+ 
+-   protected void func_71217_p() {
++   public void func_71217_p() {
+       boolean var1 = this.field_71348_o;
+       this.field_71348_o = this.field_71347_n.func_71752_f();
+       if(!var1 && this.field_71348_o) {
+diff -r -U 3 minecraft\net\minecraft\src\Minecraft.java minecraft_patched\net\minecraft\src\Minecraft.java
+--- minecraft\net\minecraft\src\Minecraft.java	Tue Sep 17 13:58:50 2013
++++ minecraft_patched\net\minecraft\src\Minecraft.java	Tue Sep 17 14:01:01 2013
+@@ -604,8 +604,8 @@
+          return;
+       }
+ 
+-      while(true) {
+-         try {
++      try {
++         while(this.field_71425_J) {
+             if(this.field_71425_J) {
+                if(this.field_71434_R && this.field_71433_S != null) {
+                   this.func_71377_b(this.field_71433_S);
+@@ -626,23 +626,20 @@
+                }
+                continue;
+             }
+-         } catch (MinecraftError var12) {
+-            ;
+-         } catch (ReportedException var13) {
+-            this.func_71396_d(var13.func_71575_a());
+-            this.func_71398_f();
+-            var13.printStackTrace();
+-            this.func_71377_b(var13.func_71575_a());
+-         } catch (Throwable var14) {
+-            var2 = this.func_71396_d(new CrashReport("Unexpected error", var14));
+-            this.func_71398_f();
+-            var14.printStackTrace();
+-            this.func_71377_b(var2);
+-         } finally {
+-            this.func_71405_e();
+          }
+-
+-         return;
++      } catch (MinecraftError var12) {
++      } catch (ReportedException var13) {
++         this.func_71396_d(var13.func_71575_a());
++         this.func_71398_f();
++         var13.printStackTrace();
++         this.func_71377_b(var13.func_71575_a());
++      } catch (Throwable var14) {
++         var2 = this.func_71396_d(new CrashReport("Unexpected error", var14));
++         this.func_71398_f();
++         var14.printStackTrace();
++         this.func_71377_b(var2);
++      } finally {
++         this.func_71405_e();
+       }
+    }
+ 
+diff -r -U 3 minecraft\net\minecraft\src\RConThreadClient.java minecraft_patched\net\minecraft\src\RConThreadClient.java
+--- minecraft\net\minecraft\src\RConThreadClient.java	Tue Sep 17 13:58:51 2013
++++ minecraft_patched\net\minecraft\src\RConThreadClient.java	Tue Sep 17 14:01:01 2013
+@@ -32,8 +32,8 @@
+    }
+ 
+    public void run() {
+-      while(true) {
+-         try {
++      try {
++         while(true) {
+             if(!this.field_72619_a) {
+                break;
+             }
+@@ -84,20 +84,14 @@
+                   continue;
+                }
+             }
+-         } catch (SocketTimeoutException var17) {
+-            break;
+-         } catch (IOException var18) {
+-            break;
+-         } catch (Exception var19) {
+-            System.out.println(var19);
+-            break;
+-         } finally {
+-            this.func_72653_g();
+          }
+-
+-         return;
++      } catch (SocketTimeoutException var17) {
++      } catch (IOException var18) {
++      } catch (Exception var19) {
++         System.out.println(var19);
++      } finally {
++         this.func_72653_g();
+       }
+-
+    }
+ 
+    private void func_72654_a(int p_72654_1_, int p_72654_2_, String p_72654_3_) throws IOException {
+diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net\minecraft\src\RenderBlocks.java
+--- minecraft\net\minecraft\src\RenderBlocks.java	Tue Sep 17 13:58:51 2013
++++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Tue Sep 17 14:01:01 2013
+@@ -1960,16 +1960,16 @@
+       float var25 = (float)(p_78589_2_ + 1);
+       float var26 = (float)(p_78589_4_ + 0);
+       float var27 = (float)(p_78589_4_ + 1);
+-      boolean var28 = false;
++      int var28 = 0;
+       if((var20 || var21) && !var22 && !var23) {
+-         var28 = true;
++         var28 = 1;
+       }
+ 
+       if((var22 || var23) && !var21 && !var20) {
+-         var28 = true;
++         var28 = 2;
+       }
+ 
+-      if(!var28) {
++      if(var28 == 0) {
+          int var29 = 0;
+          int var30 = 0;
+          int var31 = 16;
+@@ -2016,7 +2016,7 @@
+          var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var9.func_94214_a((double)var31), (double)var9.func_94207_b((double)var30));
+          var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var9.func_94214_a((double)var29), (double)var9.func_94207_b((double)var30));
+          var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var27, (double)var9.func_94214_a((double)var29), (double)var9.func_94207_b((double)var32));
+-      } else if(var28) {
++      } else if(var28 == 1) {
+          var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var27, (double)var8.func_94212_f(), (double)var8.func_94210_h());
+          var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94212_f(), (double)var8.func_94206_g());
+          var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94209_e(), (double)var8.func_94206_g());
+diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
+--- minecraft\net\minecraft\src\RenderGlobal.java	Tue Sep 17 13:58:51 2013
++++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Tue Sep 17 14:01:01 2013
+@@ -1445,7 +1445,7 @@
+          double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
+          double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
+          double var19 = this.field_72777_q.field_71451_h.field_70161_v - p_72726_6_;
+-         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")) {
+diff -r -U 3 minecraft\net\minecraft\src\SoundPoolURLConnection.java minecraft_patched\net\minecraft\src\SoundPoolURLConnection.java
+--- minecraft\net\minecraft\src\SoundPoolURLConnection.java	Tue Sep 17 13:58:51 2013
++++ minecraft_patched\net\minecraft\src\SoundPoolURLConnection.java	Tue Sep 17 14:01:01 2013
+@@ -22,7 +22,11 @@
+    public void connect() {}
+ 
+    public InputStream getInputStream() {
++     try {
+       return SoundPool.func_110655_a(this.field_110660_a).func_110536_a(this.field_110659_b).func_110527_b();
++     } catch(Exception ex) {
++      return null;
++     }
+    }
+ 
+    // $FF: synthetic method
+diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
+--- minecraft\net\minecraft\src\TcpMasterThread.java	Tue Sep 17 13:58:51 2013
++++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Tue Sep 17 14:01:01 2013
+@@ -11,6 +11,7 @@
+       this.field_74504_a = p_i1395_1_;
+    }
+ 
++   @SuppressWarnings("deprecation")
+    public void run() {
+       try {
+          Thread.sleep(5000L);
+diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Tue Sep 17 13:58:52 2013
++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Tue Sep 17 14:01:01 2013
+@@ -20,6 +20,7 @@
+    }
+ 
+    public void run() {
++     while(true)
+       this.func_75736_b();
+    }
+ 

conf/patches/minecraft_server_ff.patch

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

conf/version.cfg

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

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,112 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        mavenLocal()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-    }
-}
-
-import static net.minecraftforge.gradle.dev.FmlDevPlugin.*
-
-apply plugin: 'maven'
-apply plugin: 'fmldev'
-
-repositories {
-    flatDir {
-        name "fileRepo"
-        dirs "repo"
-    }
-}
-
-minecraft {
-    version = '1.8'
-    mcpVersion = '9.10'
-    mappings = 'snapshot_nodoc_20141130'
-    fmlDir = projectDir.getAbsolutePath();
-    mainClass = 'net.minecraftforge.fml.relauncher.ServerLaunchWrapper'
-    tweakClass = 'net.minecraftforge.fml.common.launcher.FMLTweaker'
-    installerVersion = "1.4"
-}
-
-group = 'net.minecraftforge'
-version = getVersionFromGit(getProject())
-
-jenkins {
-    job = 'fml'
-}
-
-uploadArchives {
-    repositories {
-        if (project.hasProperty("filesmaven")) {
-            logger.info('Publishing to files server')
-            
-            mavenDeployer {
-                configuration = configurations.deployJars
-
-                repository(url: project.filesmaven.url) {
-                    authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key)
-                }
-
-                pom {
-                    groupId = project.group
-                    version = project.version
-                    artifactId = project.archivesBaseName
-                    project {
-                        name project.archivesBaseName
-                        packaging 'jar'
-                        description 'ForgeModLoader'
-                        url 'https://github.com/MinecraftForge/FML'
-
-                        scm {
-                            url 'https://github.com/MinecraftForge/FML'
-                            connection 'scm:git:git://github.com/MinecraftForge/FML.git'
-                            developerConnection 'scm:git:[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/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
-@@ -326,7 +326,7 @@
- 
-       while(true) {
-          try {
--            if(this.field_71425_J) {
-+            while(this.field_71425_J) {
-                if(!this.field_71434_R || this.field_71433_S == null) {
-                   try {
-                      this.func_71411_J();

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

@@ -1,21 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\gui\FontRenderer.java minecraft_patched\net\minecraft\client\gui\FontRenderer.java
---- minecraft\net\minecraft\client\gui\FontRenderer.java
-+++ minecraft_patched\net\minecraft\client\gui\FontRenderer.java
-@@ -592,8 +592,6 @@
-          case 10:
-             --var5;
-             break;
--         case 32:
--            var6 = var5;
-          case 167:
-             if(var5 < var3 - 1) {
-                ++var5;
-@@ -607,6 +605,8 @@
-                }
-             }
-             break;
-+         case 32:
-+             var6 = var5;
-          default:
-             var4 += this.func_78263_a(var8);
-             if(var7) {

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

@@ -1,37 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\network\NetHandlerPlayClient.java minecraft_patched\net\minecraft\client\network\NetHandlerPlayClient.java
---- minecraft\net\minecraft\client\network\NetHandlerPlayClient.java
-+++ minecraft_patched\net\minecraft\client\network\NetHandlerPlayClient.java
-@@ -1275,14 +1275,14 @@
-                      private static final String __OBFID = "CL_00002622";
- 
-                      public void func_73878_a(boolean p_73878_1_, int p_73878_2_) {
--                        NetHandlerPlayClient.thisxxx.field_147299_f = Minecraft.func_71410_x();
-+                        NetHandlerPlayClient.this.field_147299_f = Minecraft.func_71410_x();
-                         if(p_73878_1_) {
--                           if(NetHandlerPlayClient.thisxx.field_147299_f.func_147104_D() != null) {
--                              NetHandlerPlayClient.thisxxxxxxx.field_147299_f.func_147104_D().func_152584_a(ServerData.ServerResourceMode.ENABLED);
-+                           if(NetHandlerPlayClient.this.field_147299_f.func_147104_D() != null) {
-+                              NetHandlerPlayClient.this.field_147299_f.func_147104_D().func_152584_a(ServerData.ServerResourceMode.ENABLED);
-                            }
- 
-                            NetHandlerPlayClient.this.field_147302_e.func_179290_a(new C19PacketResourcePackStatus(var3, C19PacketResourcePackStatus.Action.ACCEPTED));
--                           Futures.addCallback(NetHandlerPlayClient.thisx.field_147299_f.func_110438_M().func_180601_a(var2, var3), new FutureCallback() {
-+                           Futures.addCallback(NetHandlerPlayClient.this.field_147299_f.func_110438_M().func_180601_a(var2, var3), new FutureCallback() {
- 
-                               private static final String __OBFID = "CL_00002621";
- 
-@@ -1294,11 +1294,11 @@
-                               }
-                            });
-                         } else {
--                           if(NetHandlerPlayClient.thisxxxx.field_147299_f.func_147104_D() != null) {
--                              NetHandlerPlayClient.thisxxxxx.field_147299_f.func_147104_D().func_152584_a(ServerData.ServerResourceMode.DISABLED);
-+                           if(NetHandlerPlayClient.this.field_147299_f.func_147104_D() != null) {
-+                              NetHandlerPlayClient.this.field_147299_f.func_147104_D().func_152584_a(ServerData.ServerResourceMode.DISABLED);
-                            }
- 
--                           NetHandlerPlayClient.thisxxxxxx.field_147302_e.func_179290_a(new C19PacketResourcePackStatus(var3x, C19PacketResourcePackStatus.Action.DECLINED));
-+                           NetHandlerPlayClient.this.field_147302_e.func_179290_a(new C19PacketResourcePackStatus(var3, C19PacketResourcePackStatus.Action.DECLINED));
-                         }
- 
-                         ServerList.func_147414_b(NetHandlerPlayClient.this.field_147299_f.func_147104_D());

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

@@ -1,13 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\particle\EffectRenderer.java minecraft_patched\net\minecraft\client\particle\EffectRenderer.java
---- minecraft\net\minecraft\client\particle\EffectRenderer.java
-+++ minecraft_patched\net\minecraft\client\particle\EffectRenderer.java
-@@ -242,7 +242,8 @@
-       GlStateManager.func_179112_b(770, 771);
-       GlStateManager.func_179092_a(516, 0.003921569F);
- 
--      for(final int var8 = 0; var8 < 3; ++var8) {
-+      for(int var8_nf = 0; var8_nf < 3; ++var8_nf) {
-+         final int var8 = var8_nf;
-          for(int var9 = 0; var9 < 2; ++var9) {
-             if(!this.field_78876_b[var8][var9].isEmpty()) {
-                switch(var9) {

fml/conf/patches/minecraft_ff/net.minecraft.client.renderer.block.model.ModelBlockDefinition.java.patch

@@ -1,12 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\renderer\block\model\ModelBlockDefinition.java minecraft_patched\net\minecraft\client\renderer\block\model\ModelBlockDefinition.java
---- minecraft\net\minecraft\client\renderer\block\model\ModelBlockDefinition.java
-+++ minecraft_patched\net\minecraft\client\renderer\block\model\ModelBlockDefinition.java
-@@ -82,7 +82,7 @@
-       public ModelBlockDefinition func_178336_a(JsonElement p_178336_1_, Type p_178336_2_, JsonDeserializationContext p_178336_3_) {
-          JsonObject var4 = p_178336_1_.getAsJsonObject();
-          List var5 = this.func_178334_a(p_178336_3_, var4);
--         return new ModelBlockDefinition(var5);
-+         return new ModelBlockDefinition((Collection)var5);
-       }
- 
-       protected List func_178334_a(JsonDeserializationContext p_178334_1_, JsonObject p_178334_2_) {

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

@@ -1,30 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\client\renderer\texture\TextureManager.java minecraft_patched\net\minecraft\client\renderer\texture\TextureManager.java
---- minecraft\net\minecraft\client\renderer\texture\TextureManager.java
-+++ minecraft_patched\net\minecraft\client\renderer\texture\TextureManager.java
-@@ -57,13 +57,14 @@
- 
-    public boolean func_110579_a(ResourceLocation p_110579_1_, final ITextureObject p_110579_2_) {
-       boolean var3 = true;
--
-+      ITextureObject p_110579_2_2 = p_110579_2_;
-+      
-       try {
-          ((ITextureObject)p_110579_2_).func_110551_a(this.field_110582_d);
-       } catch (IOException var8) {
-          field_147646_a.warn("Failed to load texture: " + p_110579_1_, var8);
--         p_110579_2_ = TextureUtil.field_111001_a;
--         this.field_110585_a.put(p_110579_1_, p_110579_2_);
-+         p_110579_2_2 = TextureUtil.field_111001_a;
-+         this.field_110585_a.put(p_110579_1_, p_110579_2_2);
-          var3 = false;
-       } catch (Throwable var9) {
-          CrashReport var5 = CrashReport.func_85055_a(var9, "Registering texture");
-@@ -80,7 +81,7 @@
-          throw new ReportedException(var5);
-       }
- 
--      this.field_110585_a.put(p_110579_1_, p_110579_2_);
-+      this.field_110585_a.put(p_110579_1_, p_110579_2_2);
-       return var3;
-    }
- 

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.command.PlayerSelector.java.patch

@@ -1,100 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\command\PlayerSelector.java minecraft_patched\net\minecraft\command\PlayerSelector.java
---- minecraft\net\minecraft\command\PlayerSelector.java
-+++ minecraft_patched\net\minecraft\command\PlayerSelector.java
-@@ -135,7 +135,7 @@
- 
-    private static List func_179663_a(Map p_179663_0_, String p_179663_1_) {
-       ArrayList var2 = Lists.newArrayList();
--      final String var3 = func_179651_b(p_179663_0_, "type");
-+      String var3 = func_179651_b(p_179663_0_, "type");
-       final boolean var4 = var3 != null && var3.startsWith("!");
-       if(var4) {
-          var3 = var3.substring(1);
-@@ -159,12 +159,13 @@
-             });
-          }
-       } else {
-+         final String var3_f = var3;
-          var2.add(new Predicate() {
- 
-             private static final String __OBFID = "CL_00002362";
- 
-             public boolean func_179613_a(Entity p_179613_1_) {
--               return EntityList.func_180123_a(p_179613_1_, var3) != var4;
-+               return EntityList.func_180123_a(p_179613_1_, var3_f) != var4;
-             }
-             // $FF: synthetic method
-             public boolean apply(Object p_apply_1_) {
-@@ -231,13 +232,14 @@
- 
-    private static List func_179659_d(Map p_179659_0_) {
-       ArrayList var1 = Lists.newArrayList();
--      final String var2 = func_179651_b(p_179659_0_, "team");
-+      String var2 = func_179651_b(p_179659_0_, "team");
-       final boolean var3 = var2 != null && var2.startsWith("!");
-       if(var3) {
-          var2 = var2.substring(1);
-       }
- 
-       if(var2 != null) {
-+         final String var2_f = var2;
-          var1.add(new Predicate() {
- 
-             private static final String __OBFID = "CL_00002355";
-@@ -249,7 +251,7 @@
-                   EntityLivingBase var2x = (EntityLivingBase)p_179621_1_;
-                   Team var3x = var2x.func_96124_cp();
-                   String var4 = var3x == null?"":var3x.func_96661_b();
--                  return var4.equals(var2) != var3;
-+                  return var4.equals(var2_f) != var3;
-                }
-             }
-             // $FF: synthetic method
-@@ -321,19 +323,20 @@
- 
-    private static List func_179647_f(Map p_179647_0_) {
-       ArrayList var1 = Lists.newArrayList();
--      final String var2 = func_179651_b(p_179647_0_, "name");
-+      String var2 = func_179651_b(p_179647_0_, "name");
-       final boolean var3 = var2 != null && var2.startsWith("!");
-       if(var3) {
-          var2 = var2.substring(1);
-       }
- 
-       if(var2 != null) {
-+         final String var2_f = var2;
-          var1.add(new Predicate() {
- 
-             private static final String __OBFID = "CL_00002353";
- 
-             public boolean func_179600_a(Entity p_179600_1_) {
--               return p_179600_1_.func_70005_c_().equals(var2) != var3;
-+               return p_179600_1_.func_70005_c_().equals(var2_f) != var3;
-             }
-             // $FF: synthetic method
-             public boolean apply(Object p_apply_1_) {
-@@ -372,11 +375,9 @@
- 
-    private static List func_179662_g(Map p_179662_0_) {
-       ArrayList var1 = Lists.newArrayList();
--      final int var2;
--      final int var3;
-       if(p_179662_0_.containsKey("rym") || p_179662_0_.containsKey("ry")) {
--         var2 = func_179650_a(func_179653_a(p_179662_0_, "rym", 0));
--         var3 = func_179650_a(func_179653_a(p_179662_0_, "ry", 359));
-+         final int var2 = func_179650_a(func_179653_a(p_179662_0_, "rym", 0));
-+         final int var3 = func_179650_a(func_179653_a(p_179662_0_, "ry", 359));
-          var1.add(new Predicate() {
- 
-             private static final String __OBFID = "CL_00002351";
-@@ -393,8 +394,8 @@
-       }
- 
-       if(p_179662_0_.containsKey("rxm") || p_179662_0_.containsKey("rx")) {
--         var2 = func_179650_a(func_179653_a(p_179662_0_, "rxm", 0));
--         var3 = func_179650_a(func_179653_a(p_179662_0_, "rx", 359));
-+         final int var2 = func_179650_a(func_179653_a(p_179662_0_, "rxm", 0));
-+         final int var3 = func_179650_a(func_179653_a(p_179662_0_, "rx", 359));
-          var1.add(new Predicate() {
- 
-             private static final String __OBFID = "CL_00002361";

fml/conf/patches/minecraft_ff/net.minecraft.inventory.ContainerPlayer.java.patch

@@ -1,34 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\inventory\ContainerPlayer.java minecraft_patched\net\minecraft\inventory\ContainerPlayer.java
---- minecraft\net\minecraft\inventory\ContainerPlayer.java
-+++ minecraft_patched\net\minecraft\inventory\ContainerPlayer.java
-@@ -28,7 +28,7 @@
-       this.field_82862_h = p_i1819_3_;
-       this.func_75146_a(new SlotCrafting(p_i1819_1_.field_70458_d, this.field_75181_e, this.field_75179_f, 0, 144, 36));
- 
--      final int var4;
-+      int var4;
-       int var5;
-       for(var4 = 0; var4 < 2; ++var4) {
-          for(var5 = 0; var5 < 2; ++var5) {
-@@ -37,6 +37,7 @@
-       }
- 
-       for(var4 = 0; var4 < 4; ++var4) {
-+         final int var44 = var4;
-          this.func_75146_a(new Slot(p_i1819_1_, p_i1819_1_.func_70302_i_() - 1 - var4, 8, 8 + var4 * 18) {
- 
-             private static final String __OBFID = "CL_00001755";
-@@ -45,11 +46,11 @@
-                return 1;
-             }
-             public boolean func_75214_a(ItemStack p_75214_1_) {
--               return p_75214_1_ == null?false:(p_75214_1_.func_77973_b() instanceof ItemArmor?((ItemArmor)p_75214_1_.func_77973_b()).field_77881_a == var4:(p_75214_1_.func_77973_b() != Item.func_150898_a(Blocks.field_150423_aK) && p_75214_1_.func_77973_b() != Items.field_151144_bL?false:var4 == 0));
-+               return p_75214_1_ == null?false:(p_75214_1_.func_77973_b() instanceof ItemArmor?((ItemArmor)p_75214_1_.func_77973_b()).field_77881_a == var44:(p_75214_1_.func_77973_b() != Item.func_150898_a(Blocks.field_150423_aK) && p_75214_1_.func_77973_b() != Items.field_151144_bL?false:var44 == 0));
-             }
-             @SideOnly(Side.CLIENT)
-             public String func_178171_c() {
--               return ItemArmor.field_94603_a[var4];
-+               return ItemArmor.field_94603_a[var44];
-             }
-          });
-       }

fml/conf/patches/minecraft_ff/net.minecraft.network.PacketBuffer.java.patch

@@ -1,14 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\network\PacketBuffer.java minecraft_patched\net\minecraft\network\PacketBuffer.java
---- minecraft\net\minecraft\network\PacketBuffer.java
-+++ minecraft_patched\net\minecraft\network\PacketBuffer.java
-@@ -799,10 +799,4 @@
-    public boolean release(int p_release_1_) {
-       return this.field_150794_a.release(p_release_1_);
-    }
--
--   // $FF: synthetic method
--   // $FF: bridge method
--   public int compareTo(Object p_compareTo_1_) {
--      return this.compareTo((ByteBuf)p_compareTo_1_);
--   }
- }

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

@@ -1,14 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\server\network\NetHandlerLoginServer.java minecraft_patched\net\minecraft\server\network\NetHandlerLoginServer.java
---- minecraft\net\minecraft\server\network\NetHandlerLoginServer.java
-+++ minecraft_patched\net\minecraft\server\network\NetHandlerLoginServer.java
-@@ -95,10 +95,6 @@
-                public void operationComplete(ChannelFuture p_operationComplete_1_) {
-                   NetHandlerLoginServer.this.field_147333_a.func_179289_a(NetHandlerLoginServer.this.field_147327_f.func_175577_aI());
-                }
--               // $FF: synthetic method
--               public void operationComplete(Future p_operationComplete_1_) {
--                  this.operationComplete((ChannelFuture)p_operationComplete_1_);
--               }
-             }, new GenericFutureListener[0]);
-          }
- 

fml/conf/patches/minecraft_ff/net.minecraft.util.BlockPos.java.patch

@@ -1,12 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\util\BlockPos.java minecraft_patched\net\minecraft\util\BlockPos.java
---- minecraft\net\minecraft\util\BlockPos.java
-+++ minecraft_patched\net\minecraft\util\BlockPos.java
-@@ -194,7 +194,7 @@
- 
-                protected BlockPos.MutableBlockPos func_179313_a() {
-                   if(this.field_179314_b == null) {
--                     this.field_179314_b = new BlockPos.MutableBlockPos(var2xxx.func_177958_n(), var2.func_177956_o(), var2x.func_177952_p(), null);
-+                     this.field_179314_b = new BlockPos.MutableBlockPos(var2.func_177958_n(), var2.func_177956_o(), var2.func_177952_p(), null);
-                      return this.field_179314_b;
-                   } else if(this.field_179314_b.equals(var3)) {
-                      return (BlockPos.MutableBlockPos)this.endOfData();

fml/conf/patches/minecraft_ff/net.minecraft.world.storage.ThreadedFileIOBase.java.patch

@@ -1,11 +0,0 @@
-diff -r -U 3 minecraft\net\minecraft\world\storage\ThreadedFileIOBase.java minecraft_patched\net\minecraft\world\storage\ThreadedFileIOBase.java
---- minecraft\net\minecraft\world\storage\ThreadedFileIOBase.java
-+++ minecraft_patched\net\minecraft\world\storage\ThreadedFileIOBase.java
-@@ -25,6 +25,7 @@
-    }
- 
-    public void run() {
-+     while(true)
-       this.func_75736_b();
-    }
- 

fml/conf/version.cfg

@@ -1,4 +0,0 @@
-[VERSION]
-MCPVersion = 9.10
-ClientVersion = 1.8
-ServerVersion = 1.8

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/install/build.gradle

@@ -1,70 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        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'
-    }
-}
-
-apply plugin: '${name}'
-
-version = "1.0"
-group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "modid"
-
-minecraft {
-    version = "${version}"
-    runDir = "eclipse"
-    
-    // the mappings can be changed at any time, and must be in the following format.
-    // snapshot_YYYYMMDD   snapshot are built nightly.
-    // stable_#            stables are built at the discretion of the MCP team.
-    // Use non-default mappings at your own risk. they may not allways work.
-    // simply re-run your setup task after changing the mappings to update your workspace.
-    mappings = "${mappings}"
-}
-
-dependencies {
-    // you may put jars on which you depend on in ./libs
-    // or you may define them like so..
-    //compile "some.group:artifact:version:classifier"
-    //compile "some.group:artifact:version"
-      
-    // real examples
-    //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
-    // for more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
-
-}
-
-processResources
-{
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-                
-        // replace version and mcversion
-        expand 'version':project.version, 'mcversion':project.minecraft.version
-    }
-        
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
-}

fml/install/src/main/java/com/example/examplemod/ExampleMod.java

@@ -1,20 +0,0 @@
-package com.example.examplemod;
-
-import net.minecraft.init.Blocks;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.Mod.EventHandler;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-
-@Mod(modid = ExampleMod.MODID, version = ExampleMod.VERSION)
-public class ExampleMod
-{
-    public static final String MODID = "examplemod";
-    public static final String VERSION = "1.0";
-    
-    @EventHandler
-    public void init(FMLInitializationEvent event)
-    {
-		// some example code
-        System.out.println("DIRT BLOCK >> "+Blocks.dirt.getUnlocalizedName());
-    }
-}

fml/install/src/main/resources/mcmod.info

@@ -1,16 +0,0 @@
-[
-{
-  "modid": "examplemod",
-  "name": "Example Mod",
-  "description": "Example placeholder mod.",
-  "version": "${version}",
-  "mcversion": "${mcversion}",
-  "url": "",
-  "updateUrl": "",
-  "authorList": ["ExampleDude"],
-  "credits": "The Forge and FML guys, for making this example",
-  "logoFile": "",
-  "screenshots": [],
-  "dependencies": []
-}
-]

fml/jsons/1.7.10-dev.json

@@ -1,238 +0,0 @@
-{
-  "id": "@minecraft_version@-@project@@version@",
-  "time": "@timestamp@",
-  "releaseTime": "1960-01-01T00:00:00-0700",
-  "type": "release",
-  "minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "minimumLauncherVersion": 13,
-  "assets": "1.7.10",
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.11"
-    },
-    {
-      "name": "com.google.code.findbugs:jsr305:1.3.9",
-      "children": ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.ow2.asm:asm-debug-all:5.0.3",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.typesafe:config:1.2.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.11.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.11.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-reflect:2.11.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-swing_2.11:1.0.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-xml_2.11:1.0.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "lzma:lzma:0.0.1"
-    },
-    {
-      "name": "com.mojang:realms:1.3.5"
-    },
-    {
-      "name": "org.apache.commons:commons-compress:1.8.1"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpclient:4.3.3"
-    },
-    {
-      "name": "commons-logging:commons-logging:1.1.3"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpcore:4.3.2"
-    },
-    {
-      "name": "java3d:vecmath:1.3.1"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.10.Final"
-    },
-    {
-      "name": "com.google.guava:guava:17.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.3.2"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "commons-codec:commons-codec:1.9"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.5.16"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch:5.16"
-    },
-    {
-      "name": "tv.twitch:twitch-platform:5.16",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "linux"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows-${arch}",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch-external-platform:4.5",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "windows"
-          }
-        }
-      ],
-      "natives": {
-        "windows": "natives-windows-${arch}"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch"
-}

fml/jsons/1.7.10-pre3-dev.json

@@ -1,195 +0,0 @@
-{
-  "id": "@minecraft_version@-@project@@version@",
-  "time": "@timestamp@",
-  "releaseTime": "1960-01-01T00:00:00-0700",
-  "type": "release",
-  "minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.9",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.ow2.asm:asm-debug-all:4.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "lzma:lzma:0.0.1"
-    },
-    {
-      "name": "com.mojang:realms:1.2"
-    },
-    {
-      "name": "org.apache.commons:commons-compress:1.8.1"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpclient:4.3.3"
-    },
-    {
-      "name": "commons-logging:commons-logging:1.1.3"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpcore:4.3.2"
-    },
-    {
-      "name": "java3d:vecmath:1.3.1"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.10.Final"
-    },
-    {
-      "name": "com.google.guava:guava:15.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "commons-codec:commons-codec:1.9"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.5.13"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch:5.16"
-    },
-    {
-      "name": "tv.twitch:twitch-platform:5.16",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "linux"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows-${arch}",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch-external-platform:4.5",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "windows"
-          }
-        }
-      ],
-      "natives": {
-        "windows": "natives-windows-${arch}"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch",
-  "minimumLauncherVersion": 13,
-  "assets": "1.7.4"
-}

fml/jsons/1.7.10-pre3.json

@@ -1,165 +0,0 @@
-{
-  "id": "1.7.10-pre3",
-  "time": "2014-05-14T17:29:23+02:00",
-  "releaseTime": "2014-05-14T17:29:23+02:00",
-  "type": "snapshot",
-  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}",
-  "minimumLauncherVersion": 13,
-  "assets": "1.7.4",
-  "libraries": [
-    {
-      "name": "com.mojang:realms:1.2.1"
-    },
-    {
-      "name": "org.apache.commons:commons-compress:1.8.1"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpclient:4.3.3"
-    },
-    {
-      "name": "commons-logging:commons-logging:1.1.3"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpcore:4.3.2"
-    },
-    {
-      "name": "java3d:vecmath:1.3.1"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.10.Final"
-    },
-    {
-      "name": "com.google.guava:guava:15.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "commons-codec:commons-codec:1.9"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.5.13"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch:5.16"
-    },
-    {
-      "name": "tv.twitch:twitch-platform:5.16",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "linux"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows-${arch}",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch-external-platform:4.5",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "windows"
-          }
-        }
-      ],
-      "natives": {
-        "windows": "natives-windows-${arch}"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.client.main.Main"
-}

fml/jsons/1.7.10-pre4-dev.json

@@ -1,188 +0,0 @@
-{
-  "id": "@minecraft_version@-@project@@version@",
-  "time": "@timestamp@",
-  "releaseTime": "1960-01-01T00:00:00-0700",
-  "type": "release",
-  "minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "minimumLauncherVersion": 13,
-  "assets": "1.7.10",
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.9"
-    },
-    {
-      "name": "org.ow2.asm:asm-debug-all:4.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "lzma:lzma:0.0.1"
-    },
-    {
-      "name": "com.mojang:realms:1.2.3"
-    },
-    {
-      "name": "org.apache.commons:commons-compress:1.8.1"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpclient:4.3.3"
-    },
-    {
-      "name": "commons-logging:commons-logging:1.1.3"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpcore:4.3.2"
-    },
-    {
-      "name": "java3d:vecmath:1.3.1"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.10.Final"
-    },
-    {
-      "name": "com.google.guava:guava:16.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.2.1"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "commons-codec:commons-codec:1.9"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.5.13"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch:5.16"
-    },
-    {
-      "name": "tv.twitch:twitch-platform:5.16",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "linux"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows-${arch}",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch-external-platform:4.5",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "windows"
-          }
-        }
-      ],
-      "natives": {
-        "windows": "natives-windows-${arch}"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch"
-}

fml/jsons/1.7.10-pre4-rel.json

@@ -1,209 +0,0 @@
-{
-"install": {
-  "profileName": "@project@",
-  "target":"@minecraft_version@-@project@@version@",
-  "path":"@artifact@",
-  "version":"@project@ @version@",
-  "filePath":"@universal_jar@",
-  "welcome":"Welcome to the simple @project@ installer.",
-  "minecraft":"@minecraft_version@",
-  "mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
-  "logo":"/big_logo.png"
-},
-"versionInfo": {
-  "id": "@minecraft_version@-@project@@version@",
-  "time": "@timestamp@",
-  "releaseTime": "1960-01-01T00:00:00-0700",
-  "type": "release",
-  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "minimumLauncherVersion": 13,
-  "assets": "1.7.10",
-  "libraries": [
-    {
-      "name": "@artifact@",
-      "url": "http://files.minecraftforge.net/maven/"
-    },
-    {
-      "name": "net.minecraft:launchwrapper:1.9",
-      "serverreq":true
-    },
-    {
-      "name": "org.ow2.asm:asm-all:4.1",
-      "serverreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.10.2",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "65de4339eaed1c3675485fb03a3532fecfd8e8cd" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.10.2",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "99fd0ffb66f3088b0cd1071315fd5eb2b2b070ff" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "serverreq":true
-    },
-    {
-      "name": "lzma:lzma:0.0.1",
-      "serverreq":true
-    },
-    {
-      "name": "com.mojang:realms:1.2.4"
-    },
-    {
-      "name": "org.apache.commons:commons-compress:1.8.1"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpclient:4.3.3"
-    },
-    {
-      "name": "commons-logging:commons-logging:1.1.3"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpcore:4.3.2"
-    },
-    {
-      "name": "java3d:vecmath:1.3.1"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.10.Final"
-    },
-    {
-      "name": "com.google.guava:guava:16.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.2.1"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "commons-codec:commons-codec:1.9"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.5.13"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch:5.16"
-    },
-    {
-      "name": "tv.twitch:twitch-platform:5.16",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "linux"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows-${arch}",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch-external-platform:4.5",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "windows"
-          }
-        }
-      ],
-      "natives": {
-        "windows": "natives-windows-${arch}"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch"
-}
-}

fml/jsons/1.7.10-pre4.json

@@ -1,165 +0,0 @@
-{
-  "id": "1.7.10-pre4",
-  "time": "2014-05-14T18:29:23+02:00",
-  "releaseTime": "2014-05-14T18:29:23+02:00",
-  "type": "snapshot",
-  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}",
-  "minimumLauncherVersion": 13,
-  "assets": "1.7.10",
-  "libraries": [
-    {
-      "name": "com.mojang:realms:1.2.4"
-    },
-    {
-      "name": "org.apache.commons:commons-compress:1.8.1"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpclient:4.3.3"
-    },
-    {
-      "name": "commons-logging:commons-logging:1.1.3"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpcore:4.3.2"
-    },
-    {
-      "name": "java3d:vecmath:1.3.1"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.10.Final"
-    },
-    {
-      "name": "com.google.guava:guava:15.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "commons-codec:commons-codec:1.9"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.5.13"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch:5.16"
-    },
-    {
-      "name": "tv.twitch:twitch-platform:5.16",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "linux"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows-${arch}",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch-external-platform:4.5",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "windows"
-          }
-        }
-      ],
-      "natives": {
-        "windows": "natives-windows-${arch}"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.client.main.Main"
-}

fml/jsons/1.7.10-rel.json

@@ -1,132 +0,0 @@
-{
-"install": {
-  "profileName": "@project@",
-  "target":"@minecraft_version@-@project@@version@",
-  "path":"@artifact@",
-  "version":"@project@ @version@",
-  "filePath":"@universal_jar@",
-  "welcome":"Welcome to the simple @project@ installer.",
-  "minecraft":"@minecraft_version@",
-  "mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
-  "logo":"/big_logo.png"
-},
-"versionInfo": {
-  "id": "@minecraft_version@-@project@@version@",
-  "time": "@timestamp@",
-  "releaseTime": "1960-01-01T00:00:00-0700",
-  "type": "release",
-  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "mainClass": "net.minecraft.launchwrapper.Launch",
-  "minimumLauncherVersion": 14,
-  "assets": "@minecraft_version@",
-  "inheritsFrom": "@minecraft_version@",
-  "jar": "@minecraft_version@",
-  "libraries": [
-    {
-      "name": "@artifact@",
-      "url": "http://files.minecraftforge.net/maven/"
-    },
-    {
-      "name": "net.minecraft:launchwrapper:1.11",
-      "serverreq":true
-    },
-    {
-      "name": "org.ow2.asm:asm-all:5.0.3",
-      "serverreq":true
-    },
-    {
-      "name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "com.typesafe:config:1.2.1",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.11.1",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.11.1",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-reflect:2.11.1",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-swing_2.11:1.0.1",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-xml_2.11:1.0.2",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "lzma:lzma:0.0.1",
-      "serverreq":true
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "serverreq":true
-    },
-    {
-      "name": "com.google.guava:guava:17.0",
-      "serverreq":true
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.3.2",
-      "serverreq":true
-    }
-  ]
-}
-}

fml/jsons/1.7.10.json

@@ -1,165 +0,0 @@
-{
-  "id": "1.7.10",
-  "time": "2014-05-14T19:29:23+02:00",
-  "releaseTime": "2014-05-14T19:29:23+02:00",
-  "type": "release",
-  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}",
-  "minimumLauncherVersion": 13,
-  "assets": "1.7.10",
-  "libraries": [
-    {
-      "name": "com.mojang:realms:1.3.5"
-    },
-    {
-      "name": "org.apache.commons:commons-compress:1.8.1"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpclient:4.3.3"
-    },
-    {
-      "name": "commons-logging:commons-logging:1.1.3"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpcore:4.3.2"
-    },
-    {
-      "name": "java3d:vecmath:1.3.1"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.10.Final"
-    },
-    {
-      "name": "com.google.guava:guava:15.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "commons-codec:commons-codec:1.9"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.5.21"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch:5.16"
-    },
-    {
-      "name": "tv.twitch:twitch-platform:5.16",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "linux"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows-${arch}",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch-external-platform:4.5",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "windows"
-          }
-        }
-      ],
-      "natives": {
-        "windows": "natives-windows-${arch}"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.client.main.Main"
-}

fml/jsons/1.7.2-dev.json

@@ -1,203 +0,0 @@
-{
-  "id": "@minecraft_version@-@project@@version@",
-  "time": "@timestamp@",
-  "releaseTime": "1960-01-01T00:00:00-0700",
-  "type": "release",
-  "minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.9",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.ow2.asm:asm-debug-all:4.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "java3d:vecmath:1.3.1"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5"
-    },
-    {
-      "name": "lzma:lzma:0.0.1"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.10.Final"
-    },
-    {
-      "name": "com.google.guava:guava:15.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.3"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20131017",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20131017",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20131017",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ],
-      "natives": {
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch",
-  "minimumLauncherVersion": 9
-}

fml/jsons/1.7.2-rel.json

@@ -1,219 +0,0 @@
-{
-"install": {
-  "profileName": "@project@",
-  "target":"@minecraft_version@-@project@@version@",
-  "path":"@artifact@",
-  "version":"@project@ @version@",
-  "filePath":"@universal_jar@",
-  "welcome":"Welcome to the simple @project@ installer.",
-  "minecraft":"@minecraft_version@",
-  "mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
-  "logo":"/big_logo.png"
-},
-"versionInfo": {
-  "id": "@minecraft_version@-@project@@version@",
-  "time": "@timestamp@",
-  "releaseTime": "1960-01-01T00:00:00-0700",
-  "type": "release",
-  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --uuid ${auth_uuid} --accessToken ${auth_access_token} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "libraries": [
-    {
-      "name": "@artifact@",
-      "url": "http://files.minecraftforge.net/maven/"
-    },
-    {
-      "name": "net.minecraft:launchwrapper:1.9",
-      "serverreq":true
-    },
-    {
-      "name": "org.ow2.asm:asm-all:4.1",
-      "serverreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.10.2",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "65de4339eaed1c3675485fb03a3532fecfd8e8cd" ],
-      "comment" : "Important for FML, we add this",
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.10.2",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "99fd0ffb66f3088b0cd1071315fd5eb2b2b070ff" ],
-      "comment" : "Important for FML, we add this",
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "java3d:vecmath:1.3.1"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "serverreq":true
-    },
-    {
-      "name": "lzma:lzma:0.0.1",
-      "serverreq":true
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.10.Final"
-    },
-    {
-      "name": "com.google.guava:guava:15.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.3"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20131017",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20131017",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20131017",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ],
-      "natives": {
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch",
-  "minimumLauncherVersion": 9
-}
-}

fml/jsons/1.7.2.json

@@ -1,173 +0,0 @@
-{
-  "id": "1.7.2",
-  "time": "2014-04-02T12:00:00+02:00",
-  "releaseTime": "2013-10-25T15:00:00+02:00",
-  "type": "release",
-  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --uuid ${auth_uuid} --accessToken ${auth_access_token}",
-  "minimumLauncherVersion": 9,
-  "libraries": [
-    {
-      "name": "java3d:vecmath:1.3.1"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.10.Final"
-    },
-    {
-      "name": "com.google.guava:guava:15.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.3"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      },
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20131017",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20131017",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20131017",
-      "natives": {
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      },
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.client.main.Main"
-}

fml/jsons/1.7.9-dev.json

@@ -1,179 +0,0 @@
-{
-  "id": "@minecraft_version@-@project@@version@",
-  "time": "@timestamp@",
-  "releaseTime": "1960-01-01T00:00:00-0700",
-  "type": "release",
-  "minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.9",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.ow2.asm:asm-debug-all:4.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "java3d:vecmath:1.3.1"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5"
-    },
-    {
-      "name": "lzma:lzma:0.0.1"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.10.Final"
-    },
-    {
-      "name": "com.google.guava:guava:15.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "commons-codec:commons-codec:1.9"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.5.13"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch:5.16"
-    },
-    {
-      "name": "tv.twitch:twitch-platform:5.16",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "linux"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows-${arch}",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch-external-platform:4.5",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "windows"
-          }
-        }
-      ],
-      "natives": {
-        "windows": "natives-windows-${arch}"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch",
-  "minimumLauncherVersion": 9
-}

fml/jsons/1.7.9-rel.json

@@ -1,219 +0,0 @@
-{
-"install": {
-  "profileName": "@project@",
-  "target":"@minecraft_version@-@project@@version@",
-  "path":"@artifact@",
-  "version":"@project@ @version@",
-  "filePath":"@universal_jar@",
-  "welcome":"Welcome to the simple @project@ installer.",
-  "minecraft":"@minecraft_version@",
-  "mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
-  "logo":"/big_logo.png"
-},
-"versionInfo": {
-  "id": "@minecraft_version@-@project@@version@",
-  "time": "@timestamp@",
-  "releaseTime": "1960-01-01T00:00:00-0700",
-  "type": "release",
-  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --uuid ${auth_uuid} --accessToken ${auth_access_token} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "libraries": [
-    {
-      "name": "@artifact@",
-      "url": "http://files.minecraftforge.net/maven/"
-    },
-    {
-      "name": "net.minecraft:launchwrapper:1.9",
-      "serverreq":true
-    },
-    {
-      "name": "org.ow2.asm:asm-all:4.1",
-      "serverreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.10.2",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "65de4339eaed1c3675485fb03a3532fecfd8e8cd" ],
-      "comment" : "Important for FML, we add this",
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.10.2",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "99fd0ffb66f3088b0cd1071315fd5eb2b2b070ff" ],
-      "comment" : "Important for FML, we add this",
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "java3d:vecmath:1.3.1"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "serverreq":true
-    },
-    {
-      "name": "lzma:lzma:0.0.1",
-      "serverreq":true
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.10.Final"
-    },
-    {
-      "name": "com.google.guava:guava:15.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.3"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20131017",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20131017",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20131017",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ],
-      "natives": {
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch",
-  "minimumLauncherVersion": 9
-}
-}

fml/jsons/1.7.9.json

@@ -1,150 +0,0 @@
-{
-  "id": "1.7.9",
-  "time": "2014-04-14T15:29:23+02:00",
-  "releaseTime": "2014-04-14T15:29:23+02:00",
-  "type": "release",
-  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}",
-  "minimumLauncherVersion": 13,
-  "assets": "1.7.4",
-  "libraries": [
-    {
-      "name": "java3d:vecmath:1.3.1"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.10.Final"
-    },
-    {
-      "name": "com.google.guava:guava:15.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "commons-codec:commons-codec:1.9"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.5.13"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch:5.16"
-    },
-    {
-      "name": "tv.twitch:twitch-platform:5.16",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "linux"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows-${arch}",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch-external-platform:4.5",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "windows"
-          }
-        }
-      ],
-      "natives": {
-        "windows": "natives-windows-${arch}"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.client.main.Main"
-}

fml/jsons/1.8-dev.json

@@ -1,314 +0,0 @@
-{
-  "id": "@minecraft_version@-@project@@version@",
-  "time": "@timestamp@",
-  "releaseTime": "1960-01-01T00:00:00-0700",
-  "type": "release",
-  "minecraftArguments": "--version FML_DEV --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.11"
-    },
-    {
-      "name": "com.google.code.findbugs:jsr305:1.3.9",
-      "children": ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.ow2.asm:asm-debug-all:5.0.3",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.typesafe:config:1.2.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.11.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.11.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-reflect:2.11.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang.modules:scala-swing_2.11:1.0.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang.modules:scala-xml_2.11:1.0.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "lzma:lzma:0.0.1"
-    },
-    {
-      "name": "java3d:vecmath:1.5.2"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.6",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.15.Final"
-    },
-    {
-      "name": "com.google.guava:guava:17.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.3.2"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "commons-codec:commons-codec:1.9"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.5.17"
-    },
-    {
-      "name": "com.mojang:realms:1.6.1"
-    },
-    {
-      "name": "org.apache.commons:commons-compress:1.8.1"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpclient:4.3.3"
-    },
-    {
-      "name": "commons-logging:commons-logging:1.1.3"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpcore:4.3.2"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch:6.5"
-    },
-    {
-      "name": "tv.twitch:twitch-platform:6.5",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "linux"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows-${arch}",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch-external-platform:4.5",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "windows"
-          }
-        }
-      ],
-      "natives": {
-        "windows": "natives-windows-${arch}"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch",
-  "minimumLauncherVersion": 14,
-  "assets": "1.8"
-}

fml/jsons/1.8-rel.json

@@ -1,124 +0,0 @@
-{
-"install": {
-  "profileName": "@project@",
-  "target":"@minecraft_version@-@project@@version@",
-  "path":"@artifact@",
-  "version":"@project@ @version@",
-  "filePath":"@universal_jar@",
-  "welcome":"Welcome to the simple @project@ installer.",
-  "minecraft":"@minecraft_version@",
-  "mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
-  "logo":"/big_logo.png"
-},
-"versionInfo": {
-  "id": "@minecraft_version@-@project@@version@",
-  "time": "@timestamp@",
-  "releaseTime": "1960-01-01T00:00:00-0700",
-  "type": "release",
-  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
-  "mainClass": "net.minecraft.launchwrapper.Launch",
-  "minimumLauncherVersion": 14,
-  "assets": "1.8",
-  "inheritsFrom": "1.8",
-  "jar": "1.8",
-  "libraries": [
-    {
-      "name": "@artifact@",
-      "url": "http://files.minecraftforge.net/maven/"
-    },
-    {
-      "name": "net.minecraft:launchwrapper:1.11",
-      "serverreq":true
-    },
-    {
-      "name": "org.ow2.asm:asm-all:5.0.3",
-      "serverreq":true
-    },
-    {
-      "name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "com.typesafe:config:1.2.1",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.11.1",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.11.1",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-reflect:2.11.1",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-swing_2.11:1.0.1",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "org.scala-lang:scala-xml_2.11:1.0.2",
-      "url" : "http://files.minecraftforge.net/maven/",
-      "checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ],
-      "serverreq":true,
-      "clientreq":true
-    },
-    {
-      "name": "lzma:lzma:0.0.1",
-      "serverreq":true
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "serverreq":true
-    }
-  ]
-}
-}

fml/jsons/1.8.json

@@ -1,241 +0,0 @@
-{
-  "id": "1.8",
-  "time": "2014-09-02T08:24:35+00:00",
-  "releaseTime": "2014-09-02T08:24:35+00:00",
-  "type": "release",
-  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}",
-  "minimumLauncherVersion": 14,
-  "assets": "1.8",
-  "libraries": [
-    {
-      "name": "java3d:vecmath:1.5.2"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    },
-    {
-      "name": "com.ibm.icu:icu4j-core-mojang:51.2"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.6"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "io.netty:netty-all:4.0.15.Final"
-    },
-    {
-      "name": "com.google.guava:guava:17.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.3.2"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "commons-codec:commons-codec:1.9"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.4"
-    },
-    {
-      "name": "com.mojang:authlib:1.5.21"
-    },
-    {
-      "name": "com.mojang:realms:1.6.1"
-    },
-    {
-      "name": "org.apache.commons:commons-compress:1.8.1"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpclient:4.3.3"
-    },
-    {
-      "name": "commons-logging:commons-logging:1.1.3"
-    },
-    {
-      "name": "org.apache.httpcomponents:httpcore:4.3.2"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
-    },
-    {
-      "name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.1",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      },
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      },
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "osx"
-          }
-        }
-      ]
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch:6.5"
-    },
-    {
-      "name": "tv.twitch:twitch-platform:6.5",
-      "rules": [
-        {
-          "action": "allow"
-        },
-        {
-          "action": "disallow",
-          "os": {
-            "name": "linux"
-          }
-        }
-      ],
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows-${arch}",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "tv.twitch:twitch-external-platform:4.5",
-      "rules": [
-        {
-          "action": "allow",
-          "os": {
-            "name": "windows"
-          }
-        }
-      ],
-      "natives": {
-        "windows": "natives-windows-${arch}"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.client.main.Main"
-}

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,24 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/Block.java
-+++ ../src-work/minecraft/net/minecraft/block/Block.java
-@@ -39,8 +39,9 @@
- public class Block
- {
-     private static final ResourceLocation field_176230_a = new ResourceLocation("air");
--    public static final RegistryNamespacedDefaultedByKey field_149771_c = new RegistryNamespacedDefaultedByKey(field_176230_a);
--    public static final ObjectIntIdentityMap field_176229_d = new ObjectIntIdentityMap();
-+    public static final RegistryNamespacedDefaultedByKey field_149771_c = net.minecraftforge.fml.common.registry.GameData.getBlockRegistry();
-+    @Deprecated //Modders: DO NOT use this! Use GameRegistry
-+    public static final ObjectIntIdentityMap field_176229_d = net.minecraftforge.fml.common.registry.GameData.getBlockStateIDMap();
-     private CreativeTabs field_149772_a;
-     public static final Block.SoundType field_149769_e = new Block.SoundType("stone", 1.0F, 1.0F);
-     public static final Block.SoundType field_149766_f = new Block.SoundType("wood", 1.0F, 1.0F);
-@@ -124,6 +125,9 @@
-     private String field_149770_b;
-     private static final String __OBFID = "CL_00000199";
- 
-+    public final net.minecraftforge.fml.common.registry.RegistryDelegate<Block> delegate =
-+            ((net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry)field_149771_c).getDelegate(this, Block.class);
-+
-     public static int func_149682_b(Block p_149682_0_)
-     {
-         return field_149771_c.func_148757_b(p_149682_0_);

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/ClientBrandRetriever.java
-+++ ../src-work/minecraft/net/minecraft/client/ClientBrandRetriever.java
-@@ -10,6 +10,6 @@
- 
-     public static String getClientModName()
-     {
--        return "vanilla";
-+        return net.minecraftforge.fml.common.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
-@@ -139,6 +139,10 @@
-                     GlStateManager.func_179086_m(16640);
-                 }
- 
-+                try
-+                {
-+                if (!net.minecraftforge.fml.client.FMLClientHandler.instance().handleLoadingScreen(scaledresolution)) //FML Don't render while FML's pre-screen is rendering
-+                {
-                 Tessellator tessellator = Tessellator.func_178181_a();
-                 WorldRenderer worldrenderer = tessellator.func_178180_c();
-                 this.field_73725_b.func_110434_K().func_110577_a(Gui.field_110325_k);
-@@ -177,6 +181,12 @@
-                 GlStateManager.func_179120_a(770, 771, 1, 0);
-                 this.field_73725_b.field_71466_p.func_175063_a(this.field_73726_c, (float)((l - this.field_73725_b.field_71466_p.func_78256_a(this.field_73726_c)) / 2), (float)(i1 / 2 - 4 - 16), 16777215);
-                 this.field_73725_b.field_71466_p.func_175063_a(this.field_73727_a, (float)((l - this.field_73725_b.field_71466_p.func_78256_a(this.field_73727_a)) / 2), (float)(i1 / 2 - 4 + 8), 16777215);
-+                }
-+                }
-+                catch (java.io.IOException e)
-+                {
-+                    com.google.common.base.Throwables.propagate(e);
-+                } //FML End
-                 this.field_146588_g.func_147609_e();
- 
-                 if (OpenGlHelper.func_148822_b())

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

@@ -1,197 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/Minecraft.java
-+++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
-@@ -410,10 +410,10 @@
-         this.field_110451_am = new SimpleReloadableResourceManager(this.field_110452_an);
-         this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab);
-         this.field_110451_am.func_110542_a(this.field_135017_as);
--        this.func_110436_a();
-+        net.minecraftforge.fml.client.FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am);
-         this.field_71446_o = new TextureManager(this.field_110451_am);
-         this.field_110451_am.func_110542_a(this.field_71446_o);
--        this.func_180510_a(this.field_71446_o);
-+        net.minecraftforge.fml.client.SplashProgress.drawVanillaScreen(this.field_71446_o);
-         this.func_175595_al();
-         this.field_152350_aA = new SkinManager(this.field_71446_o, new File(this.field_110446_Y, "skins"), this.field_152355_az);
-         this.field_71469_aa = new AnvilSaveConverter(new File(this.field_71412_D, "saves"));
-@@ -449,6 +449,8 @@
-             }
-         });
-         this.field_71417_B = new MouseHelper();
-+        net.minecraftforge.fml.common.ProgressManager.ProgressBar bar= net.minecraftforge.fml.common.ProgressManager.push("Rendering Setup", 9);
-+        bar.step("GL Setup");
-         this.func_71361_d("Pre startup");
-         GlStateManager.func_179098_w();
-         GlStateManager.func_179103_j(7425);
-@@ -462,17 +464,21 @@
-         GlStateManager.func_179096_D();
-         GlStateManager.func_179128_n(5888);
-         this.func_71361_d("Startup");
-+        bar.step("Loading Texture Map");
-         this.field_147128_au = new TextureMap("textures");
-         this.field_147128_au.func_147633_a(this.field_71474_y.field_151442_I);
-         this.field_71446_o.func_110580_a(TextureMap.field_110575_b, this.field_147128_au);
-         this.field_71446_o.func_110577_a(TextureMap.field_110575_b);
-         this.field_147128_au.func_174937_a(false, this.field_71474_y.field_151442_I > 0);
-+        bar.step("Loading Model Manager");
-         this.field_175617_aL = new ModelManager(this.field_147128_au);
-         this.field_110451_am.func_110542_a(this.field_175617_aL);
-+        bar.step("Loading Item Renderer");
-         this.field_175621_X = new RenderItem(this.field_71446_o, this.field_175617_aL);
-         this.field_175616_W = new RenderManager(this.field_71446_o, this.field_175621_X);
-         this.field_175620_Y = new ItemRenderer(this);
-         this.field_110451_am.func_110542_a(this.field_175621_X);
-+        bar.step("Loading Entity Renderer");
-         this.field_71460_t = new EntityRenderer(this, this.field_110451_am);
-         this.field_110451_am.func_110542_a(this.field_71460_t);
-         this.field_175618_aM = new BlockRendererDispatcher(this.field_175617_aL.func_174954_c(), this.field_71474_y);
-@@ -482,19 +488,21 @@
-         this.field_71458_u = new GuiAchievement(this);
-         GlStateManager.func_179083_b(0, 0, this.field_71443_c, this.field_71440_d);
-         this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
-+        net.minecraftforge.fml.common.ProgressManager.pop(bar);
-+        net.minecraftforge.fml.client.FMLClientHandler.instance().finishMinecraftLoading();
-         this.func_71361_d("Post startup");
-         this.field_71456_v = new GuiIngame(this);
- 
-         if (this.field_71475_ae != null)
-         {
--            this.func_147108_a(new GuiConnecting(new GuiMainMenu(), this, this.field_71475_ae, this.field_71477_af));
-+            net.minecraftforge.fml.client.FMLClientHandler.instance().connectToServerAtStartup(this.field_71475_ae, this.field_71477_af);
-         }
-         else
-         {
-             this.func_147108_a(new GuiMainMenu());
-         }
- 
--        this.field_71446_o.func_147645_c(this.field_152354_ay);
-+        net.minecraftforge.fml.client.SplashProgress.clearVanillaResources(field_71446_o, field_152354_ay);
-         this.field_152354_ay = null;
-         this.field_71461_s = new LoadingScreenRenderer(this);
- 
-@@ -503,6 +511,7 @@
-             this.func_71352_k();
-         }
- 
-+        net.minecraftforge.fml.client.FMLClientHandler.instance().onInitializationComplete();
-         try
-         {
-             Display.setVSyncEnabled(this.field_71474_y.field_74352_v);
-@@ -681,21 +690,23 @@
-         File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt");
-         Bootstrap.func_179870_a(p_71377_1_.func_71502_e());
- 
-+        int retVal;
-         if (p_71377_1_.func_71497_f() != null)
-         {
-             Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + p_71377_1_.func_71497_f());
--            System.exit(-1);
-+            retVal = -1;
-         }
-         else if (p_71377_1_.func_147149_a(file2))
-         {
-             Bootstrap.func_179870_a("#@!@# Game crashed! Crash report saved to: #@!@# " + file2.getAbsolutePath());
--            System.exit(-1);
-+            retVal = -1;
-         }
-         else
-         {
-             Bootstrap.func_179870_a("#@?@# Game crashed! Crash report could not be saved. #@?@#");
--            System.exit(-2);
-+            retVal = -2;
-         }
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().handleExit(retVal);
-     }
- 
-     public boolean func_152349_b()
-@@ -999,7 +1010,7 @@
-         {
-             while (!this.field_152351_aB.isEmpty())
-             {
--                ((FutureTask)this.field_152351_aB.poll()).run();
-+                net.minecraftforge.fml.common.FMLCommonHandler.callFuture(((FutureTask)this.field_152351_aB.poll()));
-             }
-         }
- 
-@@ -1034,9 +1045,11 @@
- 
-         if (!this.field_71454_w)
-         {
-+            net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_74281_c);
-             this.field_71424_I.func_76318_c("gameRenderer");
-             this.field_71460_t.func_78480_b(this.field_71428_T.field_74281_c);
-             this.field_71424_I.func_76319_b();
-+            net.minecraftforge.fml.common.FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_74281_c);
-         }
- 
-         this.field_71424_I.func_76319_b();
-@@ -1591,6 +1604,8 @@
-             --this.field_71467_ac;
-         }
- 
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().onPreClientTick();
-+
-         this.field_71424_I.func_76320_a("gui");
- 
-         if (!this.field_71445_n)
-@@ -1744,6 +1759,7 @@
-                         this.field_71462_r.func_146274_d();
-                     }
-                 }
-+                net.minecraftforge.fml.common.FMLCommonHandler.instance().fireMouseInput();
-             }
- 
-             if (this.field_71429_W > 0)
-@@ -1920,6 +1936,7 @@
-                         }
-                     }
-                 }
-+                net.minecraftforge.fml.common.FMLCommonHandler.instance().fireKeyInput();
-             }
- 
-             for (i = 0; i < 9; ++i)
-@@ -2120,12 +2137,15 @@
-             this.field_71453_ak.func_74428_b();
-         }
- 
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostClientTick();
-+
-         this.field_71424_I.func_76319_b();
-         this.field_71423_H = func_71386_F();
-     }
- 
-     public void func_71371_a(String p_71371_1_, String p_71371_2_, WorldSettings p_71371_3_)
-     {
-+        net.minecraftforge.fml.client.FMLClientHandler.instance().startIntegratedServer(p_71371_1_, p_71371_2_, p_71371_3_);
-         this.func_71403_a((WorldClient)null);
-         System.gc();
-         ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
-@@ -2161,6 +2181,12 @@
- 
-         while (!this.field_71437_Z.func_71200_ad())
-         {
-+            if (!net.minecraftforge.fml.common.StartupQuery.check())
-+            {
-+                func_71403_a(null);
-+                func_147108_a(null);
-+                return;
-+            }
-             String s2 = this.field_71437_Z.func_71195_b_();
- 
-             if (s2 != null)
-@@ -2186,7 +2212,7 @@
-         SocketAddress socketaddress = this.field_71437_Z.func_147137_ag().func_151270_a();
-         NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress);
-         networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null));
--        networkmanager.func_179290_a(new C00Handshake(47, socketaddress.toString(), 0, EnumConnectionState.LOGIN));
-+        networkmanager.func_179290_a(new C00Handshake(47, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true));
-         networkmanager.func_179290_a(new C00PacketLoginStart(this.func_110432_I().func_148256_e()));
-         this.field_71453_ak = networkmanager;
-     }
-@@ -2237,6 +2263,7 @@
- 
-             this.func_71351_a((ServerData)null);
-             this.field_71455_al = false;
-+            net.minecraftforge.fml.client.FMLClientHandler.instance().handleClientWorldClosing(this.field_71441_e);
-         }
- 
-         this.field_147127_av.func_147690_c();

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

@@ -1,126 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/FontRenderer.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/FontRenderer.java
-@@ -57,7 +57,7 @@
-         this.field_111273_g = p_i1035_2_;
-         this.field_78298_i = p_i1035_3_;
-         this.field_78293_l = p_i1035_4_;
--        p_i1035_3_.func_110577_a(this.field_111273_g);
-+        bindTexture(this.field_111273_g);
- 
-         for (int i = 0; i < 32; ++i)
-         {
-@@ -105,7 +105,7 @@
- 
-         try
-         {
--            bufferedimage = TextureUtil.func_177053_a(Minecraft.func_71410_x().func_110442_L().func_110536_a(this.field_111273_g).func_110527_b());
-+            bufferedimage = TextureUtil.func_177053_a(getResourceInputStream(this.field_111273_g));
-         }
-         catch (IOException ioexception)
-         {
-@@ -172,7 +172,7 @@
- 
-         try
-         {
--            inputstream = Minecraft.func_71410_x().func_110442_L().func_110536_a(new ResourceLocation("font/glyph_sizes.bin")).func_110527_b();
-+            inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin"));
-             inputstream.read(this.field_78287_e);
-         }
-         catch (IOException ioexception)
-@@ -195,7 +195,7 @@
-         float f = (float)(p_78266_1_ % 16 * 8);
-         float f1 = (float)(p_78266_1_ / 16 * 8);
-         float f2 = p_78266_2_ ? 1.0F : 0.0F;
--        this.field_78298_i.func_110577_a(this.field_111273_g);
-+        bindTexture(this.field_111273_g);
-         float f3 = (float)this.field_78286_d[p_78266_1_] - 0.01F;
-         GL11.glBegin(GL11.GL_TRIANGLE_STRIP);
-         GL11.glTexCoord2f(f / 128.0F, f1 / 128.0F);
-@@ -222,7 +222,7 @@
- 
-     private void func_78257_a(int p_78257_1_)
-     {
--        this.field_78298_i.func_110577_a(this.func_111271_a(p_78257_1_));
-+        bindTexture(this.func_111271_a(p_78257_1_));
-     }
- 
-     protected float func_78277_a(char p_78277_1_, boolean p_78277_2_)
-@@ -269,7 +269,7 @@
- 
-     public int func_175065_a(String p_175065_1_, float p_175065_2_, float p_175065_3_, int p_175065_4_, boolean p_175065_5_)
-     {
--        GlStateManager.func_179141_d();
-+        enableAlpha();
-         this.func_78265_b();
-         int j;
- 
-@@ -341,7 +341,7 @@
- 
-                     k = this.field_78285_g[j];
-                     this.field_78304_r = k;
--                    GlStateManager.func_179131_c((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.field_78305_q);
-+                    setColor((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.field_78305_q);
-                 }
-                 else if (j == 16)
-                 {
-@@ -370,7 +370,7 @@
-                     this.field_78299_w = false;
-                     this.field_78300_v = false;
-                     this.field_78301_u = false;
--                    GlStateManager.func_179131_c(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
-+                    setColor(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
-                 }
- 
-                 ++i;
-@@ -429,6 +429,15 @@
-                     ++f;
-                 }
- 
-+                doDraw(f);
-+            }
-+        }
-+    }
-+
-+    protected void doDraw(float f)
-+    {
-+        {
-+            {
-                 Tessellator tessellator;
-                 WorldRenderer worldrenderer;
- 
-@@ -504,7 +513,7 @@
-             this.field_78292_o = (float)(p_180455_4_ >> 8 & 255) / 255.0F;
-             this.field_78306_p = (float)(p_180455_4_ & 255) / 255.0F;
-             this.field_78305_q = (float)(p_180455_4_ >> 24 & 255) / 255.0F;
--            GlStateManager.func_179131_c(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
-+            setColor(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
-             this.field_78295_j = p_180455_2_;
-             this.field_78296_k = p_180455_3_;
-             this.func_78255_a(p_180455_1_, p_180455_5_);
-@@ -842,6 +851,26 @@
-         return this.field_78294_m;
-     }
- 
-+    protected void setColor(float r, float g, float b, float a)
-+    {
-+        GlStateManager.func_179131_c(r,g,b,a);
-+    }
-+
-+    protected void enableAlpha()
-+    {
-+        GlStateManager.func_179141_d();
-+    }
-+
-+    protected void bindTexture(ResourceLocation location)
-+    {
-+        field_78298_i.func_110577_a(location);
-+    }
-+
-+    protected InputStream getResourceInputStream(ResourceLocation location) throws IOException
-+    {
-+        return Minecraft.func_71410_x().func_110442_L().func_110536_a(location).func_110527_b();
-+    }
-+
-     public int func_175064_b(char p_175064_1_)
-     {
-         return this.field_78285_g["0123456789abcdef".indexOf(p_175064_1_)];

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

@@ -1,24 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/GuiButton.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiButton.java
-@@ -22,6 +22,7 @@
-     public boolean field_146125_m;
-     protected boolean field_146123_n;
-     private static final String __OBFID = "CL_00000668";
-+    public int packedFGColour; //FML
- 
-     public GuiButton(int p_i1020_1_, int p_i1020_2_, int p_i1020_3_, String p_i1020_4_)
-     {
-@@ -75,8 +76,12 @@
-             this.func_146119_b(p_146112_1_, p_146112_2_, p_146112_3_);
-             int l = 14737632;
- 
--            if (!this.field_146124_l)
-+            if (packedFGColour != 0)
-             {
-+                l = packedFGColour;
-+            }
-+            else if (!this.field_146124_l)
-+            {
-                 l = 10526880;
-             }
-             else if (this.field_146123_n)

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

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
-@@ -213,6 +213,8 @@
-                     }
-                 }
- 
-+                WorldType.field_77139_a[this.field_146331_K].onGUICreateWorldPress();
-+
-                 WorldSettings.GameType gametype = WorldSettings.GameType.func_77142_a(this.field_146342_r);
-                 WorldSettings worldsettings = new WorldSettings(i, gametype, this.field_146341_s, this.field_146337_w, WorldType.field_77139_a[this.field_146331_K]);
-                 worldsettings.func_82750_a(this.field_146334_a);

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

@@ -1,24 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
-@@ -30,8 +30,9 @@
- 
-         this.field_146292_n.add(new GuiButton(4, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 24 + b0, I18n.func_135052_a("menu.returnToGame", new Object[0])));
-         this.field_146292_n.add(new GuiButton(0, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 96 + b0, 98, 20, I18n.func_135052_a("menu.options", new Object[0])));
-+        this.field_146292_n.add(new GuiButton(12, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + b0, 98, 20, I18n.func_135052_a("fml.menu.modoptions")));
-         GuiButton guibutton;
--        this.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + b0, 98, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
-+        this.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 72 + b0, 200, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
-         this.field_146292_n.add(new GuiButton(5, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 48 + b0, 98, 20, I18n.func_135052_a("gui.achievements", new Object[0])));
-         this.field_146292_n.add(new GuiButton(6, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 48 + b0, 98, 20, I18n.func_135052_a("gui.stats", new Object[0])));
-         guibutton.field_146124_l = this.field_146297_k.func_71356_B() && !this.field_146297_k.func_71401_C().func_71344_c();
-@@ -65,6 +66,10 @@
-                 break;
-             case 7:
-                 this.field_146297_k.func_147108_a(new GuiShareToLan(this));
-+                break;
-+            case 12:
-+                net.minecraftforge.fml.client.FMLClientHandler.instance().showInGameModOptions(this);
-+                break;
-         }
-     }
- 

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

@@ -1,43 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java
-@@ -198,6 +198,11 @@
-         this.field_146292_n.add(new GuiButton(1, this.field_146294_l / 2 - 100, p_73969_1_, I18n.func_135052_a("menu.singleplayer", new Object[0])));
-         this.field_146292_n.add(new GuiButton(2, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 1, I18n.func_135052_a("menu.multiplayer", new Object[0])));
-         this.field_146292_n.add(this.field_175372_K = new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0])));
-+        GuiButton fmlModButton = new GuiButton(6, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("fml.menu.mods"));
-+        fmlModButton.field_146128_h = this.field_146294_l / 2 + 2;
-+        field_175372_K.field_146120_f = 98;
-+        fmlModButton.field_146120_f = 98;
-+        this.field_146292_n.add(fmlModButton);
-     }
- 
-     private void func_73972_b(int p_73972_1_, int p_73972_2_)
-@@ -245,6 +250,11 @@
-             this.field_146297_k.func_71400_g();
-         }
- 
-+        if (p_146284_1_.field_146127_k == 6)
-+        {
-+            this.field_146297_k.func_147108_a(new net.minecraftforge.fml.client.GuiModList(this));
-+        }
-+
-         if (p_146284_1_.field_146127_k == 11)
-         {
-             this.field_146297_k.func_71371_a("Demo_World", "Demo_World", DemoWorldServer.field_73071_a);
-@@ -492,7 +502,15 @@
-             s = s + " Demo";
-         }
- 
--        this.func_73731_b(this.field_146289_q, s, 2, this.field_146295_m - 10, -1);
-+        java.util.List<String> brandings = com.google.common.collect.Lists.reverse(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(true));
-+        for (int i = 0; i < brandings.size(); i++)
-+        {
-+            String brd = brandings.get(i);
-+            if (!com.google.common.base.Strings.isNullOrEmpty(brd))
-+            {
-+                this.func_73731_b(this.field_146289_q, brd, 2, this.field_146295_m - ( 10 + i * (this.field_146289_q.field_78288_b + 1)), 16777215);
-+            }
-+        }
-         String s1 = "Copyright Mojang AB. Do not distribute!";
-         this.func_73731_b(this.field_146289_q, s1, this.field_146294_l - this.field_146289_q.func_78256_a(s1) - 2, this.field_146295_m - 10, -1);
- 

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

@@ -1,19 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/GuiMultiplayer.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMultiplayer.java
-@@ -41,6 +41,7 @@
-     public GuiMultiplayer(GuiScreen p_i1040_1_)
-     {
-         this.field_146798_g = p_i1040_1_;
-+        net.minecraftforge.fml.client.FMLClientHandler.instance().setupServerList();
-     }
- 
-     public void func_73866_w_()
-@@ -373,7 +374,7 @@
- 
-     private void func_146791_a(ServerData p_146791_1_)
-     {
--        this.field_146297_k.func_147108_a(new GuiConnecting(this, this.field_146297_k, p_146791_1_));
-+        net.minecraftforge.fml.client.FMLClientHandler.instance().connectToServer(this, p_146791_1_);
-     }
- 
-     public void func_146790_a(int p_146790_1_)

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

@@ -1,12 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
-@@ -170,6 +170,9 @@
-         long l = j - k;
-         ArrayList arraylist = Lists.newArrayList(new String[] {String.format("Java: %s %dbit", new Object[]{System.getProperty("java.version"), Integer.valueOf(this.field_175242_a.func_147111_S() ? 64 : 32)}), String.format("Mem: % 2d%% %03d/%03dMB", new Object[]{Long.valueOf(l * 100L / i), Long.valueOf(func_175240_a(l)), Long.valueOf(func_175240_a(i))}), String.format("Allocated: % 2d%% %03dMB", new Object[]{Long.valueOf(j * 100L / i), Long.valueOf(func_175240_a(j))}), "", String.format("Display: %dx%d (%s)", new Object[]{Integer.valueOf(Display.getWidth()), Integer.valueOf(Display.getHeight()), GL11.glGetString(GL11.GL_VENDOR)}), GL11.glGetString(GL11.GL_RENDERER), GL11.glGetString(GL11.GL_VERSION)});
- 
-+        arraylist.add("");
-+        arraylist.addAll(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(false));
-+
-         if (this.func_175236_d())
-         {
-             return arraylist;

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

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
-@@ -187,7 +187,7 @@
- 
-             if (this.field_146297_k.func_71359_d().func_90033_f(s))
-             {
--                this.field_146297_k.func_71371_a(s, s1, (WorldSettings)null);
-+                net.minecraftforge.fml.client.FMLClientHandler.instance().tryLoadExistingWorld(this, s, s1);
-             }
-         }
-     }

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

@@ -1,23 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
-@@ -84,7 +84,7 @@
-         boolean flag2 = this.field_148301_e.field_82821_f < 47;
-         boolean flag3 = flag1 || flag2;
-         this.field_148300_d.field_71466_p.func_78276_b(this.field_148301_e.field_78847_a, p_180790_2_ + 32 + 3, p_180790_3_ + 1, 16777215);
--        List list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_180790_4_ - 32 - 2);
-+        List list = this.field_148300_d.field_71466_p.func_78271_c(net.minecraftforge.fml.client.FMLClientHandler.instance().fixDescription(this.field_148301_e.field_78843_d), p_180790_4_ - 48 - 2);
- 
-         for (int l1 = 0; l1 < Math.min(list.size(), 2); ++l1)
-         {
-@@ -178,6 +178,11 @@
-         int k2 = p_180790_6_ - p_180790_2_;
-         int l2 = p_180790_7_ - p_180790_3_;
- 
-+        String tooltip = net.minecraftforge.fml.client.FMLClientHandler.instance().enhanceServerListEntry(this, this.field_148301_e, p_180790_2_, p_180790_4_, p_180790_3_, k2, l2);
-+        if (tooltip != null)
-+        {
-+            this.field_148303_c.func_146793_a(tooltip);
-+        } else
-         if (k2 >= p_180790_4_ - 15 && k2 <= p_180790_4_ - 5 && l2 >= 0 && l2 <= 8)
-         {
-             this.field_148303_c.func_146793_a(s1);

fml/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java
-+++ ../src-work/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java
-@@ -69,7 +69,7 @@
-                     inetaddress = InetAddress.getByName(p_146367_1_);
-                     GuiConnecting.this.field_146371_g = NetworkManager.func_150726_a(inetaddress, p_146367_2_);
-                     GuiConnecting.this.field_146371_g.func_150719_a(new NetHandlerLoginClient(GuiConnecting.this.field_146371_g, GuiConnecting.this.field_146297_k, GuiConnecting.this.field_146374_i));
--                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(47, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN));
-+                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(47, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN, true));
-                     GuiConnecting.this.field_146371_g.func_179290_a(new C00PacketLoginStart(GuiConnecting.this.field_146297_k.func_110432_I().func_148256_e()));
-                 }
-                 catch (UnknownHostException unknownhostexception)

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java
-+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerHandshakeMemory.java
-@@ -24,6 +24,7 @@
- 
-     public void func_147383_a(C00Handshake p_147383_1_)
-     {
-+        if (!net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerHandshake(p_147383_1_, this.field_147384_b)) return;
-         this.field_147384_b.func_150723_a(p_147383_1_.func_149594_c());
-         this.field_147384_b.func_150719_a(new NetHandlerLoginServer(this.field_147385_a, this.field_147384_b));
-     }

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

@@ -1,14 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
-+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
-@@ -92,7 +92,10 @@
-     {
-         this.field_175091_e = p_147390_1_.func_179730_a();
-         this.field_147393_d.func_150723_a(EnumConnectionState.PLAY);
--        this.field_147393_d.func_150719_a(new NetHandlerPlayClient(this.field_147394_b, this.field_147395_c, this.field_147393_d, this.field_175091_e));
-+        net.minecraftforge.fml.common.network.internal.FMLNetworkHandler.fmlClientHandshake(this.field_147393_d);
-+        NetHandlerPlayClient nhpc = new NetHandlerPlayClient(this.field_147394_b, this.field_147395_c, this.field_147393_d, this.field_175091_e);
-+        this.field_147393_d.func_150719_a(nhpc);
-+        net.minecraftforge.fml.client.FMLClientHandler.instance().setPlayClient(nhpc);
-     }
- 
-     public void func_147231_a(IChatComponent p_147231_1_)

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

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
-+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
-@@ -247,7 +247,7 @@
-     {
-         PacketThreadUtil.func_180031_a(p_147282_1_, this, this.field_147299_f);
-         this.field_147299_f.field_71442_b = new PlayerControllerMP(this.field_147299_f, this);
--        this.field_147300_g = new WorldClient(this, new WorldSettings(0L, p_147282_1_.func_149198_e(), false, p_147282_1_.func_149195_d(), p_147282_1_.func_149196_i()), p_147282_1_.func_149194_f(), p_147282_1_.func_149192_g(), this.field_147299_f.field_71424_I);
-+        this.field_147300_g = new WorldClient(this, new WorldSettings(0L, p_147282_1_.func_149198_e(), false, p_147282_1_.func_149195_d(), p_147282_1_.func_149196_i()), net.minecraftforge.fml.common.network.handshake.NetworkDispatcher.get(func_147298_b()).getOverrideDimension(p_147282_1_), p_147282_1_.func_149192_g(), this.field_147299_f.field_71424_I);
-         this.field_147299_f.field_71474_y.field_74318_M = p_147282_1_.func_149192_g();
-         this.field_147299_f.func_71403_a(this.field_147300_g);
-         this.field_147299_f.field_71439_g.field_71093_bK = p_147282_1_.func_149194_f();

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/network/OldServerPinger.java
-+++ ../src-work/minecraft/net/minecraft/client/network/OldServerPinger.java
-@@ -148,6 +148,7 @@
-                     p_147224_1_.func_147407_a((String)null);
-                 }
- 
-+                net.minecraftforge.fml.client.FMLClientHandler.instance().bindServerListData(p_147224_1_, serverstatusresponse);
-                 this.field_175092_e = Minecraft.func_71386_F();
-                 networkmanager.func_179290_a(new C01PacketPing(this.field_175092_e));
-                 this.field_147403_d = true;

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

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderVillager.java
-@@ -48,7 +48,7 @@
-             case 4:
-                 return field_110906_m;
-             default:
--                return field_110903_f;
-+                return net.minecraftforge.fml.common.registry.VillagerRegistry.getVillagerSkin(p_110775_1_.func_70946_n(), field_110903_f);
-         }
-     }
- 

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

@@ -1,91 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureMap.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureMap.java
-@@ -91,6 +91,7 @@
-         this.field_94258_i.clear();
-         int j = Integer.MAX_VALUE;
-         int k = 1 << this.field_147636_j;
-+        net.minecraftforge.fml.common.ProgressManager.ProgressBar bar = net.minecraftforge.fml.common.ProgressManager.push("Texture stitching", this.field_110574_e.size());
-         Iterator iterator = this.field_110574_e.entrySet().iterator();
- 
-         while (iterator.hasNext())
-@@ -99,6 +100,7 @@
-             TextureAtlasSprite textureatlassprite = (TextureAtlasSprite)entry.getValue();
-             ResourceLocation resourcelocation = new ResourceLocation(textureatlassprite.func_94215_i());
-             ResourceLocation resourcelocation1 = this.func_147634_a(resourcelocation, 0);
-+            bar.step(resourcelocation1.func_110623_a());
- 
-             try
-             {
-@@ -150,12 +152,14 @@
-             }
-             catch (RuntimeException runtimeexception)
-             {
--                field_147635_d.error("Unable to parse metadata from " + resourcelocation1, runtimeexception);
-+                //logger.error("Unable to parse metadata from " + resourcelocation1, runtimeexception);
-+                net.minecraftforge.fml.client.FMLClientHandler.instance().trackBrokenTexture(resourcelocation1, runtimeexception.getMessage());
-                 continue;
-             }
-             catch (IOException ioexception1)
-             {
--                field_147635_d.error("Using missing texture, unable to load " + resourcelocation1, ioexception1);
-+                //logger.error("Using missing texture, unable to load " + resourcelocation1, ioexception1);
-+                net.minecraftforge.fml.client.FMLClientHandler.instance().trackMissingTexture(resourcelocation1);
-                 continue;
-             }
- 
-@@ -171,6 +175,7 @@
-             stitcher.func_110934_a(textureatlassprite);
-         }
- 
-+        net.minecraftforge.fml.common.ProgressManager.pop(bar);
-         int j1 = Math.min(j, k);
-         int k1 = MathHelper.func_151239_c(j1);
- 
-@@ -181,10 +186,12 @@
-         }
- 
-         Iterator iterator1 = this.field_110574_e.values().iterator();
-+        bar = net.minecraftforge.fml.common.ProgressManager.push("Mipmap generation", this.field_110574_e.size());
- 
-         while (iterator1.hasNext())
-         {
-             final TextureAtlasSprite textureatlassprite1 = (TextureAtlasSprite)iterator1.next();
-+            bar.step(textureatlassprite1.func_94215_i());
- 
-             try
-             {
-@@ -225,9 +232,12 @@
- 
-         this.field_94249_f.func_147963_d(this.field_147636_j);
-         stitcher.func_110934_a(this.field_94249_f);
-+        net.minecraftforge.fml.common.ProgressManager.pop(bar);
-+        bar = net.minecraftforge.fml.common.ProgressManager.push("Texture creation", 3);
- 
-         try
-         {
-+            bar.step("Stitching");
-             stitcher.func_94305_f();
-         }
-         catch (StitcherException stitcherexception)
-@@ -236,11 +246,13 @@
-         }
- 
-         field_147635_d.info("Created: {}x{} {}-atlas", new Object[] {Integer.valueOf(stitcher.func_110935_a()), Integer.valueOf(stitcher.func_110936_b()), this.field_94254_c});
-+        bar.step("Allocating GL texture");
-         TextureUtil.func_180600_a(this.func_110552_b(), this.field_147636_j, stitcher.func_110935_a(), stitcher.func_110936_b());
-         HashMap hashmap = Maps.newHashMap(this.field_110574_e);
-         Iterator iterator2 = stitcher.func_94309_g().iterator();
-         TextureAtlasSprite textureatlassprite2;
- 
-+        bar.step("Uploading GL texture");
-         while (iterator2.hasNext())
-         {
-             textureatlassprite2 = (TextureAtlasSprite)iterator2.next();
-@@ -276,6 +288,7 @@
-         }
- 
-         TextureUtil.func_177055_a(this.field_94254_c.replaceAll("/", "_"), this.func_110552_b(), this.field_147636_j, stitcher.func_110935_a(), stitcher.func_110936_b());
-+        net.minecraftforge.fml.common.ProgressManager.pop(bar);
-     }
- 
-     private ResourceLocation func_147634_a(ResourceLocation p_147634_1_, int p_147634_2_)

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

@@ -1,15 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java
-@@ -202,9 +202,11 @@
- 
-     public static void func_180600_a(int p_180600_0_, int p_180600_1_, int p_180600_2_, int p_180600_3_)
-     {
-+        synchronized (net.minecraftforge.fml.client.SplashProgress.class)
-+        {
-         func_147942_a(p_180600_0_);
-         func_94277_a(p_180600_0_);
--
-+        }
-         if (p_180600_1_ >= 0)
-         {
-             GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL12.GL_TEXTURE_MAX_LEVEL, p_180600_1_);

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

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/resources/AbstractResourcePack.java
-+++ ../src-work/minecraft/net/minecraft/client/resources/AbstractResourcePack.java
-@@ -58,7 +58,7 @@
- 
-     protected void func_110594_c(String p_110594_1_)
-     {
--        field_110598_a.warn("ResourcePack: ignored non-lowercase namespace: %s in %s", new Object[] {p_110594_1_, this.field_110597_b});
-+        field_110598_a.warn("ResourcePack: ignored non-lowercase namespace: {} in {}", new Object[] {p_110594_1_, this.field_110597_b});
-     }
- 
-     public IMetadataSection func_135058_a(IMetadataSerializer p_135058_1_, String p_135058_2_) throws IOException

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/resources/FallbackResourceManager.java
-+++ ../src-work/minecraft/net/minecraft/client/resources/FallbackResourceManager.java
-@@ -70,6 +70,7 @@
-         throw new FileNotFoundException(p_110536_1_.toString());
-     }
- 
-+    @SuppressWarnings("resource")
-     protected InputStream func_177245_a(ResourceLocation p_177245_1_, IResourcePack p_177245_2_) throws IOException
-     {
-         InputStream inputstream = p_177245_2_.func_110590_a(p_177245_1_);

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/resources/LanguageManager.java
-+++ ../src-work/minecraft/net/minecraft/client/resources/LanguageManager.java
-@@ -83,6 +83,7 @@
-         }
- 
-         field_135049_a.func_135022_a(p_110549_1_, arraylist);
-+        net.minecraftforge.fml.common.registry.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/Locale.java.patch

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/resources/Locale.java
-+++ ../src-work/minecraft/net/minecraft/client/resources/Locale.java
-@@ -107,6 +107,8 @@
- 
-     private void func_135021_a(InputStream p_135021_1_) throws IOException
-     {
-+        p_135021_1_ = net.minecraftforge.fml.common.FMLCommonHandler.instance().loadLanguage(field_135032_a, p_135021_1_);
-+        if (p_135021_1_ == null) return;
-         Iterator iterator = IOUtils.readLines(p_135021_1_, Charsets.UTF_8).iterator();
- 
-         while (iterator.hasNext())

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();
-+        net.minecraftforge.fml.common.ProgressManager.ProgressBar resReload = net.minecraftforge.fml.common.ProgressManager.push("Loading Resources", p_110541_1_.size()+1);
-         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();
-+        net.minecraftforge.fml.common.ProgressManager.pop(resReload);
-     }
- 
-     public void func_110542_a(IResourceManagerReloadListener p_110542_1_)
-     {
-         this.field_110546_b.add(p_110542_1_);
-+        net.minecraftforge.fml.common.ProgressManager.ProgressBar resReload = net.minecraftforge.fml.common.ProgressManager.push("Loading Resource", 1);
-+        resReload.step(p_110542_1_.getClass());
-         p_110542_1_.func_110549_a(this);
-+        net.minecraftforge.fml.common.ProgressManager.pop(resReload);
-     }
- 
-     private void func_110544_b()
-     {
-         Iterator iterator = this.field_110546_b.iterator();
- 
-+        net.minecraftforge.fml.common.ProgressManager.ProgressBar resReload = net.minecraftforge.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);
-         }
-+        net.minecraftforge.fml.common.ProgressManager.pop(resReload);
-     }
- }

fml/patches/minecraft/net/minecraft/client/resources/model/ModelBakery.java.patch

@@ -1,41 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/resources/model/ModelBakery.java
-+++ ../src-work/minecraft/net/minecraft/client/resources/model/ModelBakery.java
-@@ -318,6 +318,7 @@
- 
-     private void func_177592_e()
-     {
-+        this.field_177613_u.clear(); //FML clear this to prevent double ups.
-         this.field_177613_u.put(Item.func_150898_a(Blocks.field_150348_b), Lists.newArrayList(new String[] {"stone", "granite", "granite_smooth", "diorite", "diorite_smooth", "andesite", "andesite_smooth"}));
-         this.field_177613_u.put(Item.func_150898_a(Blocks.field_150346_d), Lists.newArrayList(new String[] {"dirt", "coarse_dirt", "podzol"}));
-         this.field_177613_u.put(Item.func_150898_a(Blocks.field_150344_f), Lists.newArrayList(new String[] {"oak_planks", "spruce_planks", "birch_planks", "jungle_planks", "acacia_planks", "dark_oak_planks"}));
-@@ -360,6 +361,10 @@
-         this.field_177613_u.put(Item.func_150898_a(Blocks.field_180390_bo), Lists.newArrayList(new String[] {"oak_fence_gate"}));
-         this.field_177613_u.put(Item.func_150898_a(Blocks.field_180407_aO), Lists.newArrayList(new String[] {"oak_fence"}));
-         this.field_177613_u.put(Items.field_179570_aq, Lists.newArrayList(new String[] {"oak_door"}));
-+        for (Entry<net.minecraftforge.fml.common.registry.RegistryDelegate<Item>, Set<String>> e : customVariantNames.entrySet())
-+        {
-+            this.field_177613_u.put(e.getKey().get(), Lists.newArrayList(e.getValue().iterator()));
-+        }
-     }
- 
-     private List func_177596_a(Item p_177596_1_)
-@@ -809,4 +814,19 @@
-         field_177617_q.field_178317_b = "class generation marker";
-         field_177616_r.field_178317_b = "block entity marker";
-     }
-+    
-+    /***********************************************************
-+     * FML Start
-+     ***********************************************************/
-+    private static Map<net.minecraftforge.fml.common.registry.RegistryDelegate<Item>, Set<String>> customVariantNames = Maps.newHashMap();
-+    public static void addVariantName(Item item, String... names)
-+    {
-+        if (customVariantNames.containsKey(item.delegate))
-+            customVariantNames.get(item.delegate).addAll(Lists.newArrayList(names));
-+        else
-+            customVariantNames.put(item.delegate, Sets.newHashSet(names));
-+    }
-+    /***********************************************************
-+     * FML End
-+     ***********************************************************/
- }

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

@@ -1,19 +0,0 @@
---- ../src-base/minecraft/net/minecraft/crash/CrashReport.java
-+++ ../src-work/minecraft/net/minecraft/crash/CrashReport.java
-@@ -126,6 +126,7 @@
-                 return IntCache.func_85144_b();
-             }
-         });
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().enhanceCrashReport(this, this.field_85061_c);
-     }
- 
-     public String func_71501_a()
-@@ -220,6 +221,8 @@
-     {
-         StringBuilder stringbuilder = new StringBuilder();
-         stringbuilder.append("---- Minecraft Crash Report ----\n");
-+        net.minecraftforge.fml.common.asm.transformers.BlamingTransformer.onCrash(stringbuilder);
-+        net.minecraftforge.fml.relauncher.CoreModManager.onCrash(stringbuilder);
-         stringbuilder.append("// ");
-         stringbuilder.append(func_71503_h());
-         stringbuilder.append("\n\n");

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

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/entity/EntityTracker.java
-+++ ../src-work/minecraft/net/minecraft/entity/EntityTracker.java
-@@ -58,6 +58,8 @@
- 
-     public void func_72786_a(Entity p_72786_1_)
-     {
-+        if (net.minecraftforge.fml.common.registry.EntityRegistry.instance().tryTrackingEntity(this, p_72786_1_)) return;
-+
-         if (p_72786_1_ instanceof EntityPlayerMP)
-         {
-             this.func_72791_a(p_72786_1_, 512, 2);