Fix log4j configuration

Fuel Handling Fix

.gitattributes

@@ -4,7 +4,6 @@
 *.java text eol=lf
 *.gradle text eol=crlf
 *.png binary
-*.gif binary
 *.exe binary
 *.dll binary
 *.jar binary
@@ -12,4 +11,4 @@
 *.zip binary
 *.pyd binary
 *.cfg text eol=lf
-*.py text eol=lf
+*.py text eol=lf

.gitignore

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

LICENSE-new.txt

@@ -1,483 +0,0 @@
-Minecraft Forge is licensed under the terms of the LGPL 2.1 found
-here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and copied
-below.
-
-A note on authorship:
-All source artifacts are property of their original author, with
-the exclusion of the contents of the patches directory and others
-copied from it from time to time. Authorship of the contents of
-the patches directory is retained by the Minecraft Forge project.
-This is because the patches are partially machine generated
-artifacts, and are changed heavily due to the way forge works.
-Individual attribution within them is impossible.
-
-Consent:
-All contributions to Forge must consent to the release of any
-patch content to the Forge project.
-
-A note on infectivity:
-The LGPL is chosen specifically so that projects may depend on Forge
-features without being infected with its license. That is the 
-purpose of the LGPL. Mods and others using this code via ordinary
-Java mechanics for referencing libraries are specifically not bound
-by Forge's license for the Mod code.
-
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS

build.gradle

@@ -1,6 +1,7 @@
 buildscript {
     repositories {
         mavenCentral()
+        mavenLocal()
         maven {
             name = "forge"
             url = "http://files.minecraftforge.net/maven"
@@ -11,240 +12,66 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
     }
 }
 
+configurations {
+    deployJars
+}
+
+import static net.minecraftforge.gradle.dev.ForgeDevPlugin.*
+
+apply plugin: 'maven'
+apply plugin: 'forgedev'
+
 repositories {
-        maven {
-            name = "local"
-            url = "file:///home/cpw/projects/repo"
-        }
+    mavenLocal()
+    flatDir {
+        name "fileRepo"
+        dirs "repo"
+    }
 }
-apply plugin: "maven"
-apply plugin: "net.minecraftforge.gradle.patcher"
-apply plugin: "net.minecraftforge.gradle.launch4j"
 
 minecraft {
-    version = "1.9"
-    mappings = 'snapshot_nodoc_20160312'
-    //mappings = "snapshot_nodoc_20151122"
-    workspaceDir = "projects"
-    versionJson = "jsons/1.9-dev.json"
-    buildUserdev = true
-    buildInstaller = true
+    version = '1.7.10'
+    mcpVersion = '9.05'
+    fmlDir = projectDir.getAbsolutePath() + "/fml";
+    mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
+    tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker'
     installerVersion = "1.4"
-
-    def common = {
-        patchPrefixOriginal "../src-base/minecraft"
-        patchPrefixChanged "../src-work/minecraft"
-        mainClassClient "net.minecraft.launchwrapper.Launch"
-        tweakClassClient "net.minecraftforge.fml.common.launcher.FMLTweaker"
-        mainClassServer "net.minecraft.launchwrapper.Launch"
-        tweakClassServer "net.minecraftforge.fml.common.launcher.FMLServerTweaker"
-    }
-
-    projects {
-        forge {
-            rootDir "."
-            patchDir "patches/minecraft"
-            patchAfter "clean"
-            genPatchesFrom "clean"
-            genMcpPatches = false
-            applyMcpPatches = false
-            with common
-        }
-    }
 }
 
 group = 'net.minecraftforge'
-version = getVersionFromJava(file("src/main/java/net/minecraftforge/common/ForgeVersion.java"))
+version = getVersionFromJava(getProject(), 'src/main/java/net/minecraftforge/common/ForgeVersion.java')
 
-extractForgeSources { exclude "**/SideOnly.java", "**/Side.java" }
-extractForgeResources { exclude "**/log4j2.xml" }
-
-genGradleProjects { addTestCompileDep "junit:junit:4.12" }
-
-processJson {
-    releaseJson = "jsons/1.9-rel.json"
-    addReplacements([
-        "@minecraft_version@": project.minecraft.version,
-        "@version@": project.version,
-        "@project@": "forge",
-        "@artifact@": "net.minecraftforge:forge:${project.version}",
-        "@universal_jar@": { outputJar.archiveName },
-        "@timestamp@": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
-    ])
+jenkins {
+    job = 'minecraftforge'
 }
 
-task changelog(type: JenkinsChangelog) {
+// crowdin stuff
+if (project.hasProperty("crowdinKey"))
+    tasks.getLocalizations.apiKey = project.crowdinKey
 
-    // skip if there is no forge jenkins pass
-    onlyIf {
-        project.hasProperty('forgeJenkinsPass')
-        // Not sure what abrar was trying to do here...
-        //project.file("build/distributions/${project.name}-${project.version}-changelog.txt").text = ""
-    }
-
-    outputs.upToDateWhen { false } // never up to date
-    serverRoot = "http://ci.jenkins.minecraftforge.net/"
-    jobName = "minecraftforge"
-    targetBuild = System.env['BUILD_NUMBER'] ?: 0;
-    authName = "console_script"
-    authPassword = project.hasProperty('forgeJenkinsPass') ? project.getProperty('forgeJenkinsPass') : "";
-    output = "build/distributions/${project.name}-${project.version}-changelog.txt"
-}
-
-task crowdin(type: CrowdinDownload) {
-    output = "build/crowdin.zip"
-    projectId = 'minecraft-forge'
-    extract = false // we wanna keep it as a zip. not extract it to a folder named "crowdin.zip"
-    
-    // task auomatically skips if this is null
-    if (project.hasProperty('crowdinKey'))
-        apiKey = project.crowdinKey
-}
-
-def extraTxts = [
-    changelog, // yeah we can do thi, because gradle and groovy are awesome
-    "LICENSE-fml.txt",
-    "CREDITS-fml.txt",
-    "MinecraftForge-Credits.txt",
-    "MinecraftForge-License.txt",
-    "Paulscode SoundSystem CodecIBXM License.txt",
-    "Paulscode IBXM Library License.txt"
-]
-
-outputJar {
-    classifier = 'universal'
-    from extraTxts
-
-    // add crowdin locales
-    from { crowdin.getDidWork() ? zipTree(crowdin.output) : null}
-    dependsOn 'crowdin'
-
-    manifest.attributes([
-        "Main-Class": "net.minecraftforge.fml.relauncher.ServerLaunchWrapper",
-        "TweakClass": "net.minecraftforge.fml.common.launcher.FMLTweaker",
-        "Class-Path": getServerClasspath(file("jsons/${minecraft.version}-rel.json"))
-    ])
-}
-
-installer {
-    classifier = 'installer'
-    from extraTxts
-    from "src/main/resources/forge_logo.png"
-    rename "forge_logo\\.png", "big_logo.png"
-}
-
-task signUniversal(type: SignJar, dependsOn: 'outputJar') {
-    onlyIf {
-        project.hasProperty('jarsigner')
-    }
-
-    def jarsigner = [:];
-
-    if (project.hasProperty('jarsigner'))
-        jarsigner = project.jarsigner;
-
-    alias = 'forge'
-    exclude "paulscode/**"
-    storePass = jarsigner.storepass
-    keyPass = jarsigner.keypass
-    keyStore = jarsigner.keystore
-    inputFile = outputJar.archivePath
-    outputFile = outputJar.archivePath
-}
-uploadArchives.dependsOn signUniversal
-build.dependsOn signUniversal
-installer.dependsOn signUniversal
-
-// MDK package
-
-import org.apache.tools.ant.filters.ReplaceTokens
-task makeMdk(type: Zip) {
-    baseName = project.name
-    classifier = "mdk"
-    version = project.version
-    destinationDir = file('build/distributions')
-
-    from 'gradlew'
-    from 'gradlew.bat'
-    into ('gradle') {
-        from 'gradle'
-    }
-    into ('eclipse') {
-        from 'mdk/eclipse'
-    }
-    from changelog.output
-    from ('mdk') {
-        filter(ReplaceTokens, tokens: [
-        VERSION: project.version,
-        MAPPINGS: minecraft.mappings.replace('nodoc_', '')
-        ])
-        exclude 'eclipse'
-        rename 'gitignore\\.txt', '.gitignore'
-        from 'MinecraftForge-Credits.txt'
-        from 'MinecraftForge-License.txt'
-        from 'Paulscode IBXM Library License.txt'
-        from 'Paulscode SoundSystem CodecIBXM License.txt'
-        from 'CREDITS-fml.txt'
-        from 'LICENSE-fml.txt'
-    }
-}
-tasks.build.dependsOn makeMdk
-
-// launch4j
 
 launch4j {
-    jar = installer.archivePath.canonicalPath
-    outfile = file("build/distributions/${project.name}-${project.version}-installer-win.exe").canonicalPath
-    icon = file('icon.ico').canonicalPath
-    manifest = file('l4jManifest.xml').canonicalPath
     jreMinVersion = '1.6.0'
-    initialHeapPercent = 5;
-    maxHeapPercent = 100;
-}
-tasks.generateXmlConfig.dependsOn installer
-tasks.build.dependsOn 'launch4j'
-
-// MAVEN
-
-artifacts {
-    archives changelog.output
-    archives file("build/distributions/${project.name}-${project.version}-installer-win.exe")
-    archives makeMdk
-}
-
-task ciWriteBuildNumber << {
-    def file = file("src/main/java/net/minecraftforge/common/ForgeVersion.java");
-    def bn = System.getenv("BUILD_NUMBER")?:0;
-    def outfile = "";
-    def ln = System.getProperty('line.separator')
-
-    file.eachLine{ String s ->
-        if (s.contains("buildVersion") && s.contains("= 0;")) {
-            s = "    public static final int buildVersion    = ${bn};";
-        }
-        outfile += (s+ln);
-    }
-    file.write(outfile);
 }
 
 uploadArchives {
+    repositories {
+        add getProject().repositories.mavenLocal()
+    }
     repositories.mavenDeployer {
+        configuration = configurations.deployJars
 
-        dependsOn 'build'
-
-        if (project.hasProperty('forgeMavenPass'))
-        {
-            repository(url: "http://files.minecraftforge.net/maven/manage/upload") {
-                authentication(userName: "forge", password: project.getProperty('forgeMavenPass')) // the elvis operator. look it up.
+        if (project.hasProperty("filesmaven")) {
+            logger.info('Publishing to files server')
+            repository(url: project.filesmaven.url) {
+                authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key)
             }
-        }
-        else
-        {
-            // local repo folder. Might wanna juset use  gradle install   if you wanans end it to maven-local
+        } else {
+            logger.info('Publishing to repo folder')
             repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
         }
 
@@ -252,136 +79,49 @@ uploadArchives {
             groupId = project.group
             version = project.version
             artifactId = project.archivesBaseName
-            project {
-                name project.archivesBaseName
-                packaging 'jar'
-                description 'Minecraft Forge API'
+        }
+        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'
+            }
 
-                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'
                 }
+            }
 
-                issueManagement {
-                    system 'github'
-                    url 'https://github.com/MinecraftForge/MinecraftForge/issues'
+            developers {
+                developer {
+                    id 'cpw'
+                    name 'cpw'
+                    roles { role 'developer' }
                 }
-
-                licenses {
-                    license {
-                        name 'Forge Public License'
-                        url 'https://raw.github.com/MinecraftForge/MinecraftForge/master/MinecraftForge-License.txt'
-                        distribution 'repo'
-                    }
+                developer {
+                    id 'LexManos'
+                    name 'Lex Manos'
+                    roles { role 'developer' }
                 }
-
-                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' }
-                    }
+                developer {
+                    id 'AbrarSyed'
+                    name 'Abrar Syed'
+                    roles { role 'contributor' }
                 }
             }
         }
     }
 }
-
-// HELPER METHODS
-
-import groovy.json.JsonSlurper;
-
-String getServerClasspath(File file)
-{
-    def node = new JsonSlurper().parse(file);
-    def out = new StringBuilder()
-    node.versionInfo.libraries.each { lib ->
-        if (lib.serverreq)
-        {
-            // group : artifact : version
-            def split = lib.name.split(':')
-            def group = split[0].replace('.', '/')
-            def artifact = split[1]
-            def version = split[2]
-            out += "libraries/$group/$artifact/$version/$artifact-${version}.jar "
-        }
-    }
-    out += "minecraft_server.${minecraft.version}.jar"
-
-    return out.toString();
-}
-
-String getVersionFromJava(File file)
-{
-    String major = "0";
-    String minor = "0";
-    String revision = "0";
-    String build = "0";
-
-    String prefix = "public static final int";
-    file.eachLine{ String s ->
-        s = s.trim();
-        if (s.startsWith(prefix))
-        {
-            s = s.substring(prefix.length(), s.length() - 1);
-            s = s.replace('=', ' ').replace("Version", "").replaceAll(" +", " ").trim();
-            String[] pts = s.split(" ");
-
-            if (pts[0].equals("major")) major = pts[pts.length - 1];
-            else if (pts[0] == "minor") minor = pts[pts.length - 1];
-            else if (pts[0] == "revision") revision = pts[pts.length - 1];
-        }
-    }
-
-    if (System.getenv().containsKey("BUILD_NUMBER"))
-    {
-        build = System.getenv("BUILD_NUMBER");
-    }
-
-    String branch = null;
-    if (!System.getenv().containsKey("GIT_BRANCH"))
-    {
-        // TODO: use grgit
-        branch = "git rev-parse --abbrev-ref HEAD".execute().text.trim()
-    }
-    else
-    {
-        branch = System.getenv("GIT_BRANCH");
-        branch = branch.substring(branch.lastIndexOf('/') + 1);
-    }
-
-    def out = "${minecraft.version.replace('-', '_')}-$major.$minor.$revision.$build"
-
-    if (branch && branch != 'master' && branch != 'HEAD')
-        out += "-$branch"
-
-    return out;
-}
-
-// re-add old tasks for jenkins compat
-// should be remvoed, and the jenkisn fixed when no longer building with FG 1.2
-task setupForge { dependsOn 'setup' }
-task buildPackages { dependsOn 'build' }
-
-//Temporary hack to fix compile errors caused by mappings shading in Bootstrap
-task fixParams << {
-    logger.lifecycle('Fixing param names!')
-    def params = new File(extractMcpMappings.destinationDir, 'params.csv')
-    def text = params.text
-    text = text.replaceAll('p_82499_3_,stack,', 'p_82499_3_,stackIn,')
-    params.write(text)
-}
-fixParams.dependsOn('extractMcpMappings')
-extractMcpMappings.finalizedBy('fixParams')

fml/.gitattributes

@@ -0,0 +1,14 @@
+* 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

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

fml/README.txt

@@ -0,0 +1,94 @@
+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

@@ -0,0 +1,111 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        mavenLocal()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+    }
+}
+
+import static net.minecraftforge.gradle.dev.FmlDevPlugin.*
+
+apply plugin: 'maven'
+apply plugin: 'fmldev'
+
+repositories {
+    flatDir {
+        name "fileRepo"
+        dirs "repo"
+    }
+}
+
+minecraft {
+    version = '1.7.10'
+    mcpVersion = '9.05'
+    fmlDir = projectDir.getAbsolutePath();
+    mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
+    tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker'
+    installerVersion = "1.4"
+}
+
+group = 'net.minecraftforge'
+version = getVersionFromGit(getProject())
+
+jenkins {
+    job = 'fml'
+}
+
+uploadArchives {
+    repositories {
+        if (project.hasProperty("filesmaven")) {
+            logger.info('Publishing to files server')
+            
+            mavenDeployer {
+                configuration = configurations.deployJars
+
+                repository(url: project.filesmaven.url) {
+                    authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key)
+                }
+
+                pom {
+                    groupId = project.group
+                    version = project.version
+                    artifactId = project.archivesBaseName
+                    project {
+                        name project.archivesBaseName
+                        packaging 'jar'
+                        description 'ForgeModLoader'
+                        url 'https://github.com/MinecraftForge/FML'
+
+                        scm {
+                            url 'https://github.com/MinecraftForge/FML'
+                            connection 'scm:git:git://github.com/MinecraftForge/FML.git'
+                            developerConnection 'scm:git:[email protected]:MinecraftForge/FML.git'
+                        }
+
+                        issueManagement {
+                            system 'github'
+                            url 'https://github.com/MinecraftForge/FML/issues'
+                        }
+
+                        licenses {
+                            license {
+                                name 'GNU Lesser Public License (LGPL), Version 2.1'
+                                url 'http://www.gnu.org/licenses/lgpl-2.1.txt'
+                                distribution 'repo'
+                            }
+                        }
+
+                        developers {
+                            developer {
+                                id 'cpw'
+                                name 'cpw'
+                                roles { role 'developer' }
+                            }
+                            developer {
+                                id 'LexManos'
+                                name 'Lex Manos'
+                                roles { role 'developer' }
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            logger.info('Publishing to repo folder')
+            
+            mavenDeployer {
+                repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
+            }
+        }
+    }
+}

fml/conf/astyle.cfg

@@ -0,0 +1,19 @@
+# Artistic Style format configuration
+# see http://astyle.sourceforge.net/astyle.html
+
+style=allman
+
+add-brackets
+break-closing-brackets
+
+indent-switches
+
+max-instatement-indent=40
+
+pad-oper
+pad-header
+unpad-paren
+
+break-blocks
+
+delete-empty-lines

fml/conf/mcp.cfg

@@ -0,0 +1,165 @@
+[DEFAULT]
+DirTemp    = temp
+DirSrc     = src
+DirLogs    = logs
+DirBin     = bin
+DirJars    = jars
+DirReobf   = reobf
+DirConf    = conf
+DirRuntime = runtime
+DirLib     = lib
+DirTempSrc = temp/src
+DirTempCls = temp/cls
+DirTempBin = temp/bin
+DirModSrc  = modsrc
+DirEclipse = eclipse
+
+[CSV]
+Classes = %(DirConf)s/classes.csv
+Methods = %(DirConf)s/methods.csv
+Fields  = %(DirConf)s/fields.csv
+Params  = %(DirConf)s/params.csv
+NewIds  = %(DirConf)s/newids.csv
+
+[SRGS]
+ConfClient     = %(DirConf)s/client.srg
+ConfServer     = %(DirConf)s/server.srg
+Client         = %(DirTemp)s/client_rg.srg
+Server         = %(DirTemp)s/server_rg.srg
+DeobfClient    = %(DirTemp)s/client_deobf.srg
+DeobfServer    = %(DirTemp)s/server_deobf.srg
+ReobfClient    = %(DirTemp)s/client_ro.srg
+ReobfServer    = %(DirTemp)s/server_ro.srg
+ReobfClientSrg = %(DirTemp)s/client_ro_srg.srg
+ReobfServerSrg = %(DirTemp)s/server_ro_srg.srg
+
+[JAR]
+DirNatives = %(DirJars)s/bin/natives
+Client     = %(DirJars)s/bin/minecraft.jar
+Server     = %(DirJars)s/minecraft_server.jar
+LWJGL      = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
+MD5Client  = 595007b790548806f66762507203b896
+MD5Server  = a1de2db50b0d8bfac45be3e01e54bddf
+
+[RETROGUARD]
+Location       = %(DirRuntime)s/bin/retroguard.jar
+RetroConf      = %(DirTemp)s/retroguard.cfg
+RetroReobConf  = %(DirTemp)s/retroguard_ro.cfg
+ClientConf     = %(DirTemp)s/client_rg.cfg
+ServerConf     = %(DirTemp)s/server_rg.cfg
+ClientReobConf = %(DirTemp)s/client_ro.cfg
+ServerReobConf = %(DirTemp)s/server_ro.cfg
+ClientOut      = %(DirTemp)s/minecraft_rg.jar
+ServerOut      = %(DirTemp)s/minecraft_server_rg.jar
+ClientLog      = %(DirLogs)s/client_rg.log
+ServerLog      = %(DirLogs)s/server_rg.log
+ClientDeobLog  = %(DirLogs)s/client_deob.log
+ServerDeobLog  = %(DirLogs)s/server_deob.log
+NullPkg        = net/minecraft/src
+
+[EXCEPTOR]
+XClientJson     = %(DirConf)s/exceptor.json
+XServerJson     = %(DirConf)s/exceptor.json
+XClientCfg      = %(DirConf)s/joined.exc
+XServerCfg      = %(DirConf)s/joined.exc
+XClientOut      = %(DirTemp)s/minecraft_exc.jar
+XServerOut      = %(DirTemp)s/minecraft_server_exc.jar
+XClientLog      = %(DirLogs)s/client_exc.log
+XServerLog      = %(DirLogs)s/server_exc.log
+
+[DECOMPILE]
+ClsClientTemp = %(DirTempCls)s/minecraft
+ClsServerTemp = %(DirTempCls)s/minecraft_server
+SrcClientTemp = %(DirTempSrc)s/minecraft
+SrcServerTemp = %(DirTempSrc)s/minecraft_server
+FFSource      = net
+FFClientIn    = %(DirTemp)s/minecraft_ff_in.jar
+FFServerIn    = %(DirTemp)s/minecraft_server_ff_in.jar
+
+[OUTPUT]
+BinClientTemp = %(DirTempBin)s/minecraft
+BinServerTemp = %(DirTempBin)s/minecraft_server
+SrcClient  = %(DirSrc)s/minecraft
+SrcServer  = %(DirSrc)s/minecraft_server
+TestClient = net/minecraft/client/main/Main
+TestServer = net/minecraft/server/MinecraftServer
+
+[PATCHES]
+PatchClient   = %(DirConf)s/patches/minecraft.patch
+PatchServer   = %(DirConf)s/patches/minecraft_server.patch
+PatchTemp     = %(DirTemp)s/temp.patch
+FFPatchClient = %(DirConf)s/patches/minecraft_ff.patch
+FFPatchServer = %(DirConf)s/patches/minecraft_server_ff.patch
+PatchClient_osx = %(DirConf)s/patches/minecraft_osx.patch
+PatchServer_osx = %(DirConf)s/patches/minecraft_server_osx.patch
+
+[RECOMPILE]
+BinClient       = %(DirBin)s/minecraft
+BinServer       = %(DirBin)s/minecraft_server
+LogClient       = %(DirLogs)s/client_compile.log
+LogServer       = %(DirLogs)s/server_compile.log
+ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
+ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
+ClientFixes     = %(DirConf)s/patches
+FixStart        = Start
+IgnorePkg       = paulscode,com,isom,ibxm,de/matthiasmann/twl,org,javax,argo,gnu,io/netty
+
+[REOBF]
+MD5Client         = %(DirTemp)s/client.md5
+MD5Server         = %(DirTemp)s/server.md5
+MD5PreReobfClient = %(DirTemp)s/client_reobf.md5
+MD5PreReobfServer = %(DirTemp)s/server_reobf.md5
+RecompJarClient   = %(DirTemp)s/client_recomp.jar
+RecompJarServer   = %(DirTemp)s/server_recomp.jar
+ObfJarClient      = %(DirTemp)s/client_reobf.jar
+ObfJarServer      = %(DirTemp)s/server_reobf.jar
+ReobfDirClient    = %(DirReobf)s/minecraft
+ReobfDirServer    = %(DirReobf)s/minecraft_server
+ClientRoLog       = %(DirLogs)s/client_ro.log
+ServerRoLog       = %(DirLogs)s/server_ro.log
+ReobfClientLog    = %(DirLogs)s/client_reob.log
+ReobfServerLog    = %(DirLogs)s/server_reob.log
+
+[GETMODSOURCE]
+OutSRCClient      = %(DirModSrc)s/minecraft
+OutSRCServer      = %(DirModSrc)s/minecraft_server
+
+[MCP]
+LogFile           = %(DirLogs)s/mcp.log
+LogFileErr        = %(DirLogs)s/mcperr.log
+UpdateUrl         = http://mcp.ocean-labs.de/files/mcprolling_{version}/
+IgnoreUpdate      = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
+RGIndex           = 154000
+ParamIndex        = 45000
+
+[ASTYLE]
+AstyleConfig  = %(DirConf)s/astyle.cfg
+
+[COMMANDS]
+Wine          = wine
+Patcher_win   = %(DirRuntime)s/bin/applydiff.exe
+Patcher_linux = patch
+Patcher_osx   = patch
+Jad_win       = %(DirRuntime)s/bin/jad.exe
+Jad_osx       = %(DirRuntime)s/bin/jad-osx
+AStyle_win    = %(DirRuntime)s/bin/astyle.exe
+AStyle_linux  = astyle
+AStyle_osx    = %(DirRuntime)s/bin/astyle-osx
+JadRetro      = %(DirRuntime)s/bin/jadretro.jar
+Fernflower    = %(DirRuntime)s/bin/fernflower.jar
+Exceptor      = %(DirRuntime)s/bin/mcinjector.jar
+SpecialSource = %(DirRuntime)s/bin/specialsource.jar
+CmdPatch      = %s -p1 -u -i {patchfile} -d {srcdir}
+CmdJad        = %s -b -d {outdir} -dead -o -r -s .java -stat -ff {classes}
+CmdAStyle     = %s --suffix=none --quiet --options={conffile} {classes}
+CmdRG         = %s -cp "{classpath}" RetroGuard -searge {conffile}
+CmdRGReobf    = %s -cp "{classpath}" RetroGuard -notch {conffile}
+CmdSS         = %s -cp "{classpath}" -jar %s -i {injar} -o {outjar} -m {mapfile} --kill-source
+CmdSSReobf    = %s -cp "{classpath}" -jar %s -i {injar} -o {outjar} -r -m {mapfile} -d {identifier} -e %s
+CmdJadretro   = %s -jar %s {targetdir}
+CmdFernflower = %s -jar %s -din=1 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
+CmdExceptor   = %s -jar %s --jarIn {input} --jarOut {output} --mapIn {conf} --log {log} --jsonIn {json} --applyMarkers
+CmdRecomp     = %s -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
+CmdRecompScala = %s -encoding UTF-8 -deprecation -target:jvm-1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
+CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer
+CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start

fml/conf/params.csv

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

fml/conf/patches/Start.java

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

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

@@ -0,0 +1,22 @@
+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

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
+--- minecraft\net\minecraft\client\Minecraft.java
++++ minecraft_patched\net\minecraft\client\Minecraft.java
+@@ -695,7 +695,7 @@
+ 
+       while(true) {
+          try {
+-            if(this.field_71425_J) {
++            while(this.field_71425_J) {
+                if(!this.field_71434_R || this.field_71433_S == null) {
+                   try {
+                      this.func_71411_J();

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

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

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

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

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

@@ -0,0 +1,23 @@
+diff -r -U 3 minecraft\net\minecraft\client\particle\EffectRenderer.java minecraft_patched\net\minecraft\client\particle\EffectRenderer.java
+--- minecraft\net\minecraft\client\particle\EffectRenderer.java
++++ minecraft_patched\net\minecraft\client\particle\EffectRenderer.java
+@@ -53,7 +53,8 @@
+    }
+ 
+    public void func_78868_a() {
+-      for(final int var1 = 0; var1 < 4; ++var1) {
++      for(int var11 = 0; var11 < 4; ++var11) {
++         final int var1 = var11;
+          for(int var2 = 0; var2 < this.field_78876_b[var1].size(); ++var2) {
+             final EntityFX var3 = (EntityFX)this.field_78876_b[var1].get(var2);
+ 
+@@ -99,7 +100,8 @@
+       EntityFX.field_70554_ao = p_78874_1_.field_70137_T + (p_78874_1_.field_70163_u - p_78874_1_.field_70137_T) * (double)p_78874_2_;
+       EntityFX.field_70555_ap = p_78874_1_.field_70136_U + (p_78874_1_.field_70161_v - p_78874_1_.field_70136_U) * (double)p_78874_2_;
+ 
+-      for(final int var8 = 0; var8 < 3; ++var8) {
++      for(int var88 = 0; var88 < 3; ++var88) {
++         final int var8 = var88;
+          if(!this.field_78876_b[var8].isEmpty()) {
+             switch(var8) {
+             case 0:

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

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

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

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

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

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

fml/conf/patches/minecraft_ff/net.minecraft.client.resources.FolderResourcePack.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\client\resources\FolderResourcePack.java minecraft_patched\net\minecraft\client\resources\FolderResourcePack.java
+--- minecraft\net\minecraft\client\resources\FolderResourcePack.java
++++ minecraft_patched\net\minecraft\client\resources\FolderResourcePack.java
+@@ -31,7 +31,7 @@
+       HashSet var1 = Sets.newHashSet();
+       File var2 = new File(this.field_110597_b, "assets/");
+       if(var2.isDirectory()) {
+-         File[] var3 = var2.listFiles(DirectoryFileFilter.DIRECTORY);
++         File[] var3 = var2.listFiles((java.io.FileFilter)DirectoryFileFilter.DIRECTORY);
+          int var4 = var3.length;
+ 
+          for(int var5 = 0; var5 < var4; ++var5) {

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

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

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

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

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

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

fml/conf/version.cfg

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

fml/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Sep 14 12:28:28 PDT 2015
+#Wed Jul 02 15:54:47 CDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip

fml/gradlew

@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

fml/gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

fml/install/README.txt

@@ -0,0 +1,37 @@
+-------------------------------------------
+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,40 +1,29 @@
-
-// For those who want the bleeding edge
 buildscript {
     repositories {
-        jcenter()
+        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:2.1-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
     }
 }
-apply plugin: 'net.minecraftforge.gradle.forge'
 
-/*
-// for people who want stable - not yet functional for MC 1.8.8 - we require the forgegradle 2.1 snapshot
-plugins {
-    id "net.minecraftforge.gradle.forge" version "2.0.2"
-}
-*/
+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 = "run"
-    
-    // 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@"
-    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+    version = "${version}"
+    runDir = "eclipse"
 }
 
 dependencies {
@@ -47,14 +36,6 @@ dependencies {
     //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
 
-    // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
-    //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // the deobf configurations:  'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided,
-    // except that these dependencies get remapped to your current MCP mappings
-    //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-    //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
     // for more info...
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html

fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/MDKExample"/>
+<listEntry value="/Minecraft/lib/net/minecraft/launchwrapper/1.8/launchwrapper-1.8.jar"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
+<listEntry value="1"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStart"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MDKExample"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Minecraft"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}/run"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
 </launchConfiguration>

fml/install/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/MDKExample"/>
+<listEntry value="/Minecraft/src/net/minecraft/server/MinecraftServer.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
+<listEntry value="1"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStartServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MDKExample"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Minecraft"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}/run"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
 </launchConfiguration>

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

@@ -1,9 +1,9 @@
 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;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
 
 @Mod(modid = ExampleMod.MODID, version = ExampleMod.VERSION)
 public class ExampleMod

fml/mcp_merge.cfg

@@ -0,0 +1,9 @@
+^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

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

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

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

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

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

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

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

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

@@ -0,0 +1,124 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/FontRenderer.java
++++ ../src-work/minecraft/net/minecraft/client/gui/FontRenderer.java
+@@ -54,7 +54,7 @@
+         this.field_111273_g = p_i1035_2_;
+         this.field_78298_i = p_i1035_3_;
+         this.field_78293_l = p_i1035_4_;
+-        p_i1035_3_.func_110577_a(this.field_111273_g);
++        bindTexture(this.field_111273_g);
+ 
+         for (int i = 0; i < 32; ++i)
+         {
+@@ -102,7 +102,7 @@
+ 
+         try
+         {
+-            bufferedimage = ImageIO.read(Minecraft.func_71410_x().func_110442_L().func_110536_a(this.field_111273_g).func_110527_b());
++            bufferedimage = ImageIO.read(getResourceInputStream(this.field_111273_g));
+         }
+         catch (IOException ioexception)
+         {
+@@ -167,7 +167,7 @@
+     {
+         try
+         {
+-            InputStream inputstream = Minecraft.func_71410_x().func_110442_L().func_110536_a(new ResourceLocation("font/glyph_sizes.bin")).func_110527_b();
++            InputStream inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin"));
+             inputstream.read(this.field_78287_e);
+         }
+         catch (IOException ioexception)
+@@ -186,7 +186,7 @@
+         float f = (float)(p_78266_1_ % 16 * 8);
+         float f1 = (float)(p_78266_1_ / 16 * 8);
+         float f2 = p_78266_2_ ? 1.0F : 0.0F;
+-        this.field_78298_i.func_110577_a(this.field_111273_g);
++        bindTexture(this.field_111273_g);
+         float f3 = (float)this.field_78286_d[p_78266_1_] - 0.01F;
+         GL11.glBegin(GL11.GL_TRIANGLE_STRIP);
+         GL11.glTexCoord2f(f / 128.0F, f1 / 128.0F);
+@@ -213,7 +213,7 @@
+ 
+     private void func_78257_a(int p_78257_1_)
+     {
+-        this.field_78298_i.func_110577_a(this.func_111271_a(p_78257_1_));
++        bindTexture(this.func_111271_a(p_78257_1_));
+     }
+ 
+     protected float func_78277_a(char p_78277_1_, boolean p_78277_2_)
+@@ -260,7 +260,7 @@
+ 
+     public int func_85187_a(String p_85187_1_, int p_85187_2_, int p_85187_3_, int p_85187_4_, boolean p_85187_5_)
+     {
+-        GL11.glEnable(GL11.GL_ALPHA_TEST);
++        enableAlpha();
+         this.func_78265_b();
+         int l;
+ 
+@@ -332,7 +332,7 @@
+ 
+                     k = this.field_78285_g[j];
+                     this.field_78304_r = k;
+-                    GL11.glColor4f((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.field_78305_q);
++                    setColor((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.field_78305_q);
+                 }
+                 else if (j == 16)
+                 {
+@@ -361,7 +361,7 @@
+                     this.field_78299_w = false;
+                     this.field_78300_v = false;
+                     this.field_78301_u = false;
+-                    GL11.glColor4f(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
++                    setColor(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
+                 }
+ 
+                 ++i;
+@@ -420,6 +420,15 @@
+                     ++f;
+                 }
+ 
++                doDraw(f);
++            }
++        }
++    }
++
++    protected void doDraw(float f)
++    {
++        {
++            {
+                 Tessellator tessellator;
+ 
+                 if (this.field_78299_w)
+@@ -492,7 +501,7 @@
+             this.field_78292_o = (float)(p_78258_4_ >> 8 & 255) / 255.0F;
+             this.field_78306_p = (float)(p_78258_4_ & 255) / 255.0F;
+             this.field_78305_q = (float)(p_78258_4_ >> 24 & 255) / 255.0F;
+-            GL11.glColor4f(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
++            setColor(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
+             this.field_78295_j = (float)p_78258_2_;
+             this.field_78296_k = (float)p_78258_3_;
+             this.func_78255_a(p_78258_1_, p_78258_5_);
+@@ -829,4 +838,24 @@
+     {
+         return this.field_78294_m;
+     }
++
++    protected void setColor(float r, float g, float b, float a)
++    {
++        GL11.glColor4f(r, g, b, a);
++    }
++
++    protected void enableAlpha()
++    {
++        GL11.glEnable(GL11.GL_ALPHA_TEST);
++    }
++
++    protected void bindTexture(ResourceLocation location)
++    {
++        field_78298_i.func_110577_a(location);
++    }
++
++    protected InputStream getResourceInputStream(ResourceLocation location) throws IOException
++    {
++        return Minecraft.func_71410_x().func_110442_L().func_110536_a(location).func_110527_b();
++    }
+ }

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

@@ -1,22 +1,24 @@
 --- ../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_146124_l;
+@@ -23,6 +23,7 @@
      public boolean field_146125_m;
      protected boolean field_146123_n;
-+    public int packedFGColour; //FML
+     private static final String __OBFID = "CL_00000668";
++    public int packedFGColour;
  
      public GuiButton(int p_i1020_1_, int p_i1020_2_, int p_i1020_3_, String p_i1020_4_)
      {
-@@ -75,6 +76,11 @@
+@@ -76,8 +77,12 @@
              this.func_146119_b(p_146112_1_, p_146112_2_, p_146112_3_);
-             int j = 14737632;
+             int l = 14737632;
  
+-            if (!this.field_146124_l)
 +            if (packedFGColour != 0)
-+            {
-+                j = packedFGColour;
-+            }
-+            else
-             if (!this.field_146124_l)
              {
-                 j = 10526880;
++                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

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

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

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

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

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

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

@@ -0,0 +1,72 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java
++++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java
+@@ -1,5 +1,7 @@
+ package net.minecraft.client.gui;
+ 
++import cpw.mods.fml.client.GuiModList;
++import cpw.mods.fml.common.FMLCommonHandler;
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
+ import java.io.BufferedReader;
+@@ -9,6 +11,7 @@
+ import java.util.ArrayList;
+ import java.util.Calendar;
+ import java.util.Date;
++import java.util.List;
+ import java.util.Random;
+ import net.minecraft.client.Minecraft;
+ import net.minecraft.client.renderer.OpenGlHelper;
+@@ -29,6 +32,9 @@
+ import org.lwjgl.opengl.GLContext;
+ import org.lwjgl.util.glu.Project;
+ 
++import com.google.common.base.Strings;
++import com.google.common.collect.Lists;
++
+ @SideOnly(Side.CLIENT)
+ public class GuiMainMenu extends GuiScreen implements GuiYesNoCallback
+ {
+@@ -190,7 +196,13 @@
+     {
+         this.field_146292_n.add(new GuiButton(1, this.field_146294_l / 2 - 100, p_73969_1_, I18n.func_135052_a("menu.singleplayer", new Object[0])));
+         this.field_146292_n.add(new GuiButton(2, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 1, I18n.func_135052_a("menu.multiplayer", new Object[0])));
+-        this.field_146292_n.add(new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0])));
++        GuiButton realmsButton = new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0]));
++        GuiButton fmlModButton = new GuiButton(6, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, "Mods");
++        fmlModButton.field_146128_h = this.field_146294_l / 2 + 2;
++        realmsButton.field_146120_f = 98;
++        fmlModButton.field_146120_f = 98;
++        this.field_146292_n.add(realmsButton);
++        this.field_146292_n.add(fmlModButton);
+     }
+ 
+     private void func_73972_b(int p_73972_1_, int p_73972_2_)
+@@ -238,6 +250,11 @@
+             this.field_146297_k.func_71400_g();
+         }
+ 
++        if (p_146284_1_.field_146127_k == 6)
++        {
++            this.field_146297_k.func_147108_a(new GuiModList(this));
++        }
++
+         if (p_146284_1_.field_146127_k == 11)
+         {
+             this.field_146297_k.func_71371_a("Demo_World", "Demo_World", DemoWorldServer.field_73071_a);
+@@ -481,7 +498,15 @@
+             s = s + " Demo";
+         }
+ 
+-        this.func_73731_b(this.field_146289_q, s, 2, this.field_146295_m - 10, -1);
++        List<String> brandings = Lists.reverse(FMLCommonHandler.instance().getBrandings(true));
++        for (int i = 0; i < brandings.size(); i++)
++        {
++            String brd = brandings.get(i);
++            if (!Strings.isNullOrEmpty(brd))
++            {
++                this.func_73731_b(this.field_146289_q, brd, 2, this.field_146295_m - ( 10 + i * (this.field_146289_q.field_78288_b + 1)), 16777215);
++            }
++        }
+         String s1 = "Copyright Mojang AB. Do not distribute!";
+         this.func_73731_b(this.field_146289_q, s1, this.field_146294_l - this.field_146289_q.func_78256_a(s1) - 2, this.field_146295_m - 10, -1);
+ 

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

@@ -1,19 +1,27 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiMultiplayer.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiMultiplayer.java
-@@ -40,6 +40,7 @@
+@@ -2,6 +2,7 @@
+ 
+ import com.google.common.base.Splitter;
+ import com.google.common.collect.Lists;
++import cpw.mods.fml.client.FMLClientHandler;
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
+ import java.util.List;
+@@ -40,6 +41,7 @@
      public GuiMultiplayer(GuiScreen p_i1040_1_)
      {
          this.field_146798_g = p_i1040_1_;
-+        net.minecraftforge.fml.client.FMLClientHandler.instance().setupServerList();
++        FMLClientHandler.instance().setupServerList();
      }
  
      public void func_73866_w_()
-@@ -372,7 +373,7 @@
+@@ -366,7 +368,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_);
++        FMLClientHandler.instance().connectToServer(this, p_146791_1_);
      }
  
      public void func_146790_a(int p_146790_1_)

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

@@ -0,0 +1,18 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
++++ ../src-work/minecraft/net/minecraft/client/gui/GuiSelectWorld.java
+@@ -1,5 +1,6 @@
+ package net.minecraft.client.gui;
+ 
++import cpw.mods.fml.client.FMLClientHandler;
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
+ import java.text.DateFormat;
+@@ -179,7 +180,7 @@
+ 
+             if (this.field_146297_k.func_71359_d().func_90033_f(s))
+             {
+-                this.field_146297_k.func_71371_a(s, s1, (WorldSettings)null);
++                FMLClientHandler.instance().tryLoadExistingWorld(this, s, s1);
+             }
+         }
+     }

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

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

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

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

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

@@ -0,0 +1,19 @@
+--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
++++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
+@@ -2,6 +2,7 @@
+ 
+ import com.google.common.base.Charsets;
+ import com.mojang.authlib.GameProfile;
++import cpw.mods.fml.common.network.handshake.NetworkDispatcher;
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
+ import io.netty.buffer.ByteBuf;
+@@ -232,7 +233,7 @@
+     public void func_147282_a(S01PacketJoinGame p_147282_1_)
+     {
+         this.field_147299_f.field_71442_b = new PlayerControllerMP(this.field_147299_f, this);
+-        this.field_147300_g = new WorldClient(this, new WorldSettings(0L, p_147282_1_.func_149198_e(), false, p_147282_1_.func_149195_d(), p_147282_1_.func_149196_i()), p_147282_1_.func_149194_f(), p_147282_1_.func_149192_g(), this.field_147299_f.field_71424_I);
++        this.field_147300_g = new WorldClient(this, new WorldSettings(0L, p_147282_1_.func_149198_e(), false, p_147282_1_.func_149195_d(), p_147282_1_.func_149196_i()), NetworkDispatcher.get(func_147298_b()).getOverrideDimension(p_147282_1_), p_147282_1_.func_149192_g(), this.field_147299_f.field_71424_I);
+         this.field_147300_g.field_72995_K = true;
+         this.field_147299_f.func_71403_a(this.field_147300_g);
+         this.field_147299_f.field_71439_g.field_71093_bK = p_147282_1_.func_149194_f();

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

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

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

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

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

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

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

@@ -0,0 +1,26 @@
+--- ../src-base/minecraft/net/minecraft/client/renderer/texture/Stitcher.java
++++ ../src-work/minecraft/net/minecraft/client/renderer/texture/Stitcher.java
+@@ -60,6 +60,7 @@
+     public void func_94305_f()
+     {
+         Stitcher.Holder[] aholder = (Stitcher.Holder[])this.field_94319_a.toArray(new Stitcher.Holder[this.field_94319_a.size()]);
++        cpw.mods.fml.common.ProgressManager.ProgressBar bar = cpw.mods.fml.common.ProgressManager.push("Texture stitching", aholder.length);
+         Arrays.sort(aholder);
+         Stitcher.Holder[] aholder1 = aholder;
+         int i = aholder.length;
+@@ -67,6 +68,7 @@
+         for (int j = 0; j < i; ++j)
+         {
+             Stitcher.Holder holder = aholder1[j];
++            bar.step(holder.func_98150_a().func_94215_i());
+ 
+             if (!this.func_94310_b(holder))
+             {
+@@ -80,6 +82,7 @@
+             this.field_94318_c = MathHelper.func_151236_b(this.field_94318_c);
+             this.field_94315_d = MathHelper.func_151236_b(this.field_94315_d);
+         }
++        cpw.mods.fml.common.ProgressManager.pop(bar);
+     }
+ 
+     public List func_94309_g()

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

@@ -1,15 +1,18 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureManager.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureManager.java
-@@ -137,9 +137,12 @@
+@@ -162,12 +162,15 @@
  
      public void func_110549_a(IResourceManager p_110549_1_)
      {
-+        net.minecraftforge.fml.common.ProgressManager.ProgressBar bar = net.minecraftforge.fml.common.ProgressManager.push("Reloading Texture Manager", this.field_110585_a.keySet().size(), true);
-         for (Entry<ResourceLocation, ITextureObject> entry : this.field_110585_a.entrySet())
++        cpw.mods.fml.common.ProgressManager.ProgressBar bar = cpw.mods.fml.common.ProgressManager.push("Reloading Texture Manager", this.field_110585_a.keySet().size(), true);
+         Iterator iterator = this.field_110585_a.entrySet().iterator();
+ 
+         while (iterator.hasNext())
          {
+             Entry entry = (Entry)iterator.next();
 +            bar.step(entry.getKey().toString());
              this.func_110579_a((ResourceLocation)entry.getKey(), (ITextureObject)entry.getValue());
          }
-+        net.minecraftforge.fml.common.ProgressManager.pop(bar);
++        cpw.mods.fml.common.ProgressManager.pop(bar);
      }
  }