Merge pull request #1184 from bspkrs/patch-2

Fix config category names being quoted to many times.

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

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "fml"]
+	path = fml
+	url = https://github.com/MinecraftForge/FML.git

CONTRIBUTING.md

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

CREDITS-fml.txt

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

LICENSE-fml.txt

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

README.txt

@@ -15,11 +15,6 @@ MacOS/Linux: ./gradlew setupDevWorkspace
 
 If you wish to use the Eclipse IDE, run gradle eclipse instead of gradle setupDevWorkspace, or install the Gradle plugin for Eclipse and import the Forge source folder as a Gradle project.
 
-To get the decompiled classes:
-If you have Gradle: gradle setupDecompWorkspace
-If you DO NOT have Gradle installed:
-Windows: ./gradlew.bat setupDecompWorkspace
-MacOS/Linux: ./gradlew setupDecompWorkspace
 
 For Contributors: (Note: This assumes you have Gradle installed. If you don't, use ./gradlew(.bat) instead of gradle.
 

build.gradle

@@ -1,6 +1,7 @@
 buildscript {
     repositories {
         mavenCentral()
+        mavenLocal()
         maven {
             name = "forge"
             url = "http://files.minecraftforge.net/maven"
@@ -11,240 +12,61 @@ 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.8.9"
-    mappings = 'stable_20'
-    //mappings = "snapshot_nodoc_20151122"
-    workspaceDir = "projects"
-    versionJson = "jsons/1.8.9-dev.json"
-    buildUserdev = true
-    buildInstaller = true
+    version = '1.7.2'
+    mcpVersion = '9.03'
+    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.8.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) {
-
-    // 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,125 +74,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' }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Mon Sep 14 12:28:28 PDT 2015
-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

gradlew

@@ -65,7 +65,7 @@ cd "`dirname \"$PRG\"`/" >&-
 APP_HOME="`pwd -P`"
 cd "$SAVED" >&-
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH=$APP_HOME/fml/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then

gradlew.bat

@@ -69,7 +69,7 @@ set CMD_LINE_ARGS=%$
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=%APP_HOME%\fml\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%

jsons/1.6-dev.json

@@ -1,125 +0,0 @@
-{
-  "id": "FML{version}",
-  "time": "{timestamp}",
-  "releaseTime": "{timestamp}",
-  "type": "release",
-  "processArguments": "username_session_version",
-  "minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "minimumLauncherVersion": 2,
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.3",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.ow2.asm:asm-all:4.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "lzma:lzma:0.0.1"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "argo:argo:2.25_fixed"
-    },
-    {
-      "name": "net.sourceforge.argo:argo:2.25",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "grumble grumble grumble, y u no use proper version/artifact id grumble"
-    },
-    {
-      "name": "org.bouncycastle:bcprov-jdk15on:1.47",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.google.guava:guava:14.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "commons-io:commons-io:2.4",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.client.main.Main"
-}

jsons/1.6-rel.json

@@ -1,93 +0,0 @@
-{
-  "id": "FML{version}",
-  "time": "{timestamp}",
-  "releaseTime": "{timestamp}",
-  "type": "release",
-  "processArguments": "username_session_version",
-  "minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "minimumLauncherVersion": 2,
-  "libraries": [
-    {
-      "name": "cpw.mods:fml:{version}",
-      "devdl" : "false"
-    },
-    {
-      "name": "net.minecraft:launchwrapper:1.3"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0"
-    },
-    {
-      "name": "argo:argo:2.25_fixed"
-    },
-    {
-      "name": "org.bouncycastle:bcprov-jdk15on:1.47"
-    },
-    {
-      "name": "com.google.guava:guava:14.0"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1"
-    },
-    {
-      "name": "commons-io:commons-io:2.4"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.2"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.client.main.Main"
-}

jsons/1.6.1-dev.json

@@ -1,137 +0,0 @@
-{
-  "id": "FML{version}",
-  "time": "{timestamp}",
-  "releaseTime": "{timestamp}",
-  "type": "release",
-  "processArguments": "username_session_version",
-  "minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "minimumLauncherVersion": 2,
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.3",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.ow2.asm:asm-all:4.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "lzma:lzma:0.0.1"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "argo:argo:2.25_fixed"
-    },
-    {
-      "name": "net.sourceforge.argo:argo:2.25",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "grumble grumble grumble, y u no use proper version/artifact id grumble"
-    },
-    {
-      "name": "org.bouncycastle:bcprov-jdk15on:1.47",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.google.guava:guava:14.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "commons-io:commons-io:2.4",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch"
-}

jsons/1.6.1-rel.json

@@ -1,127 +0,0 @@
-{
-  "install": {
-    "profileName": "FML",
-    "target":"FML@version@",
-    "path":"cpw.mods:fml:@version@",
-    "version":"FML @version@",
-    "filePath":"@universal_jar@",
-    "welcome":"Welcome to the simple FML installer.",
-    "minecraft":"@minecraft_version@",
-    "logo":"/big_logo.png"
-  },
-  "versionInfo": {
-    "id": "FML@version@",
-    "time": "@timestamp@",
-    "releaseTime": "1960-01-01T00:00:00-0700",
-    "type": "release",
-    "processArguments": "username_session_version",
-    "minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-    "minimumLauncherVersion": 2,
-    "libraries": [
-      {
-        "name": "cpw.mods:fml:@version@",
-        "url": "http://files.minecraftforge.net/maven/"
-      },
-      {
-        "name": "net.minecraft:launchwrapper:1.3",
-        "serverreq":true
-      },
-      {
-        "name": "org.scala-lang:scala-library:2.10.2",
-        "url" : "http://repo.maven.apache.org/maven2/",
-        "comment" : "Important for FML, we add this",
-        "serverreq":true
-      },
-      {
-        "name": "org.scala-lang:scala-compiler:2.10.2",
-        "url" : "http://repo.maven.apache.org/maven2/",
-        "comment" : "Important for FML, we add this",
-        "serverreq":true
-      },
-      {
-        "name": "org.ow2.asm:asm-all:4.1",
-        "serverreq":true
-      },
-      {
-        "name": "net.sf.jopt-simple:jopt-simple:4.5",
-        "serverreq":true
-      },
-      {
-        "name": "lzma:lzma:0.0.1",
-        "serverreq":true
-      },
-      {
-        "name": "com.paulscode:codecjorbis:20101023"
-      },
-      {
-        "name": "com.paulscode:codecwav:20101023"
-      },
-      {
-        "name": "com.paulscode:libraryjavasound:20101123"
-      },
-      {
-        "name": "com.paulscode:librarylwjglopenal:20100824"
-      },
-      {
-        "name": "com.paulscode:soundsystem:20120107"
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl:2.9.0"
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0"
-      },
-      {
-        "name": "argo:argo:2.25_fixed"
-      },
-      {
-        "name": "org.bouncycastle:bcprov-jdk15on:1.47"
-      },
-      {
-        "name": "com.google.guava:guava:14.0"
-      },
-      {
-        "name": "org.apache.commons:commons-lang3:3.1"
-      },
-      {
-        "name": "commons-io:commons-io:2.4"
-      },
-      {
-        "name": "net.java.jinput:jinput:2.0.5"
-      },
-      {
-        "name": "net.java.jutils:jutils:1.0.0"
-      },
-      {
-        "name": "com.google.code.gson:gson:2.2.2"
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-        "natives": {
-          "linux": "natives-linux",
-          "windows": "natives-windows",
-          "osx": "natives-osx"
-        },
-        "extract": {
-          "exclude": [
-                      "META-INF/"
-                      ]
-        }
-      },
-      {
-        "name": "net.java.jinput:jinput-platform:2.0.5",
-        "natives": {
-          "linux": "natives-linux",
-          "windows": "natives-windows",
-          "osx": "natives-osx"
-        },
-        "extract": {
-          "exclude": [
-                      "META-INF/"
-                      ]
-        }
-      }
-      ],
-      "mainClass": "net.minecraft.launchwrapper.Launch"
-  }
-}

jsons/1.6.2-dev.json

@@ -1,137 +0,0 @@
-{
-  "id": "FML{version}",
-  "time": "{timestamp}",
-  "releaseTime": "{timestamp}",
-  "type": "release",
-  "processArguments": "username_session_version",
-  "minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "minimumLauncherVersion": 2,
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.3",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.ow2.asm:asm-debug-all:4.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "lzma:lzma:0.0.1"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "argo:argo:2.25_fixed"
-    },
-    {
-      "name": "net.sourceforge.argo:argo:2.25",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "grumble grumble grumble, y u no use proper version/artifact id grumble"
-    },
-    {
-      "name": "org.bouncycastle:bcprov-jdk15on:1.47",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.google.guava:guava:14.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "commons-io:commons-io:2.4",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch"
-}

jsons/1.6.2-rel.json

@@ -1,220 +0,0 @@
-{
-  "install": {
-    "profileName": "FML",
-    "target":"@minecraft_version@-FML@version@",
-    "path":"cpw.mods:fml:@version@",
-    "version":"FML @version@",
-    "filePath":"@universal_jar@",
-    "welcome":"Welcome to the simple FML installer.",
-    "minecraft":"@minecraft_version@",
-    "mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
-    "logo":"/big_logo.png"
-  },
-  "versionInfo": {
-    "id": "@minecraft_version@-FML@version@",
-    "time": "@timestamp@",
-    "releaseTime": "1960-01-01T00:00:00-0700",
-    "type": "release",
-    "processArguments": "username_session_version",
-    "minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-    "minimumLauncherVersion": 4,
-    "libraries": [
-      {
-        "name": "cpw.mods:fml:@version@",
-        "url": "http://files.minecraftforge.net/maven/"
-      },
-      {
-        "name": "net.minecraft:launchwrapper:1.3",
-        "serverreq":true
-      },
-      {
-        "name": "org.ow2.asm:asm-all:4.1",
-        "serverreq":true
-      },
-      {
-        "name": "org.scala-lang:scala-library:2.10.2",
-        "url" : "http://files.minecraftforge.net/maven/",
-        "checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "dffc88e804861c9eaba39283757000b6558ea573" ],
-        "comment" : "Important for FML, we add this",
-        "serverreq":true,
-        "clientreq":true
-      },
-      {
-        "name": "org.scala-lang:scala-compiler:2.10.2",
-        "url" : "http://files.minecraftforge.net/maven/",
-        "checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "40281b3ffc69fb385953522c843363ccaf71ba89" ],
-        "comment" : "Important for FML, we add this",
-        "serverreq":true,
-        "clientreq":true
-      },
-      {
-        "name": "net.sf.jopt-simple:jopt-simple:4.5",
-        "serverreq":true
-      },
-      {
-        "name": "lzma:lzma:0.0.1",
-        "serverreq":true
-      },
-      {
-        "name": "com.paulscode:codecjorbis:20101023"
-      },
-      {
-        "name": "com.paulscode:codecwav:20101023"
-      },
-      {
-        "name": "com.paulscode:libraryjavasound:20101123"
-      },
-      {
-        "name": "com.paulscode:librarylwjglopenal:20100824"
-      },
-      {
-        "name": "com.paulscode:soundsystem:20120107"
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl:2.9.0"
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0"
-      },
-      {
-        "name": "argo:argo:2.25_fixed"
-      },
-      {
-        "name": "org.bouncycastle:bcprov-jdk15on:1.47"
-      },
-      {
-        "name": "com.google.guava:guava:14.0"
-      },
-      {
-        "name": "org.apache.commons:commons-lang3:3.1"
-      },
-      {
-        "name": "commons-io:commons-io:2.4"
-      },
-      {
-        "name": "net.java.jinput:jinput:2.0.5"
-      },
-      {
-        "name": "net.java.jutils:jutils:1.0.0"
-      },
-      {
-        "name": "com.google.code.gson:gson:2.2.2"
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-        "rules": [
-          {
-            "action": "allow"
-          },
-          {
-            "action": "disallow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ]
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-        "rules": [
-          {
-            "action": "allow"
-          },
-          {
-            "action": "disallow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ]
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-        "rules": [
-          {
-            "action": "allow"
-          },
-          {
-            "action": "disallow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ],
-        "natives": {
-          "linux": "natives-linux",
-          "windows": "natives-windows",
-          "osx": "natives-osx"
-        },
-        "extract": {
-          "exclude": [
-            "META-INF/"
-          ]
-        }
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20130708-debug3",
-        "rules": [
-          {
-            "action": "allow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ]
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20130708-debug3",
-        "rules": [
-          {
-            "action": "allow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ]
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20130708-debug3",
-        "rules": [
-          {
-            "action": "allow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ],
-        "natives": {
-          "linux": "natives-linux",
-          "windows": "natives-windows",
-          "osx": "natives-osx"
-        },
-        "extract": {
-          "exclude": [
-                      "META-INF/"
-                      ]
-        }
-      },
-      {
-        "name": "net.java.jinput:jinput-platform:2.0.5",
-        "natives": {
-          "linux": "natives-linux",
-          "windows": "natives-windows",
-          "osx": "natives-osx"
-        },
-        "extract": {
-          "exclude": [
-                      "META-INF/"
-                      ]
-        }
-      }
-      ],
-      "mainClass": "net.minecraft.launchwrapper.Launch"
-  }
-}

jsons/1.6.3-dev.json

@@ -1,137 +0,0 @@
-{
-  "id": "FML{version}",
-  "time": "{timestamp}",
-  "releaseTime": "{timestamp}",
-  "type": "release",
-  "processArguments": "username_session_version",
-  "minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "minimumLauncherVersion": 4,
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.7",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.ow2.asm:asm-debug-all:4.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "lzma:lzma:0.0.1"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "argo:argo:2.25_fixed"
-    },
-    {
-      "name": "net.sourceforge.argo:argo:2.25",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "grumble grumble grumble, y u no use proper version/artifact id grumble"
-    },
-    {
-      "name": "org.bouncycastle:bcprov-jdk15on:1.47",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.google.guava:guava:14.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "commons-io:commons-io:2.4",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch"
-}

jsons/1.6.3-rel.json

@@ -1,214 +0,0 @@
-{
-  "install": {
-    "profileName": "FML",
-    "target":"@minecraft_version@-FML@version@",
-    "path":"cpw.mods:fml:@version@",
-    "version":"FML @version@",
-    "filePath":"@universal_jar@",
-    "welcome":"Welcome to the simple FML installer.",
-    "minecraft":"@minecraft_version@",
-    "mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
-    "logo":"/big_logo.png"
-  },
-  "versionInfo": {
-    "id": "@minecraft_version@-FML@version@",
-    "time": "@timestamp@",
-    "releaseTime": "1960-01-01T00:00:00-0700",
-    "type": "release",
-    "processArguments": "username_session_version",
-    "minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-    "minimumLauncherVersion": 4,
-    "libraries": [
-      {
-        "name": "cpw.mods:fml:@version@",
-        "url": "http://files.minecraftforge.net/maven/"
-      },
-      {
-        "name": "net.minecraft:launchwrapper:1.7",
-        "serverreq":true
-      },
-      {
-        "name": "org.ow2.asm:asm-all:4.1",
-        "serverreq":true
-      },
-      {
-        "name": "org.scala-lang:scala-library:2.10.2",
-        "url" : "http://files.minecraftforge.net/maven/",
-        "checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "dffc88e804861c9eaba39283757000b6558ea573" ],
-        "comment" : "Important for FML, we add this",
-        "serverreq":true,
-        "clientreq":true
-      },
-      {
-        "name": "org.scala-lang:scala-compiler:2.10.2",
-        "url" : "http://files.minecraftforge.net/maven/",
-        "checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "40281b3ffc69fb385953522c843363ccaf71ba89" ],
-        "comment" : "Important for FML, we add this",
-        "serverreq":true,
-        "clientreq":true
-      },
-      {
-        "name": "lzma:lzma:0.0.1",
-        "serverreq":true
-      },
-      {
-        "name": "net.sf.jopt-simple:jopt-simple:4.5",
-        "serverreq":true
-      },
-      {
-        "name": "com.paulscode:codecjorbis:20101023"
-      },
-      {
-        "name": "com.paulscode:codecwav:20101023"
-      },
-      {
-        "name": "com.paulscode:libraryjavasound:20101123"
-      },
-      {
-        "name": "com.paulscode:librarylwjglopenal:20100824"
-      },
-      {
-        "name": "com.paulscode:soundsystem:20120107"
-      },
-      {
-        "name": "argo:argo:2.25_fixed"
-      },
-      {
-        "name": "org.bouncycastle:bcprov-jdk15on:1.47"
-      },
-      {
-        "name": "com.google.guava:guava:14.0"
-      },
-      {
-        "name": "org.apache.commons:commons-lang3:3.1"
-      },
-      {
-        "name": "commons-io:commons-io:2.4"
-      },
-      {
-        "name": "net.java.jinput:jinput:2.0.5"
-      },
-      {
-        "name": "net.java.jutils:jutils:1.0.0"
-      },
-      {
-        "name": "com.google.code.gson:gson:2.2.2"
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-        "rules": [
-          {
-            "action": "allow"
-          },
-          {
-            "action": "disallow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ]
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-        "rules": [
-          {
-            "action": "allow"
-          },
-          {
-            "action": "disallow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ]
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-        "rules": [
-          {
-            "action": "allow"
-          },
-          {
-            "action": "disallow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ],
-        "natives": {
-          "linux": "natives-linux",
-          "windows": "natives-windows",
-          "osx": "natives-osx"
-        },
-        "extract": {
-          "exclude": [
-            "META-INF/"
-          ]
-        }
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20130708-debug3",
-        "rules": [
-          {
-            "action": "allow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ]
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20130708-debug3",
-        "rules": [
-          {
-            "action": "allow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ]
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20130708-debug3",
-        "rules": [
-          {
-            "action": "allow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ],
-        "natives": {
-          "linux": "natives-linux",
-          "windows": "natives-windows",
-          "osx": "natives-osx"
-        },
-        "extract": {
-          "exclude": [
-                      "META-INF/"
-                      ]
-        }
-      },
-      {
-        "name": "net.java.jinput:jinput-platform:2.0.5",
-        "natives": {
-          "linux": "natives-linux",
-          "windows": "natives-windows",
-          "osx": "natives-osx"
-        },
-        "extract": {
-          "exclude": [
-                      "META-INF/"
-                      ]
-        }
-      }
-      ],
-      "mainClass": "net.minecraft.launchwrapper.Launch"
-  }
-}

jsons/1.6.4-dev.json

@@ -1,137 +0,0 @@
-{
-  "id": "FML{version}",
-  "time": "{timestamp}",
-  "releaseTime": "{timestamp}",
-  "type": "release",
-  "processArguments": "username_session_version",
-  "minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-  "minimumLauncherVersion": 4,
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.8",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.ow2.asm:asm-debug-all:4.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.10.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "Important for FML, we add this"
-    },
-    {
-      "name": "net.sf.jopt-simple:jopt-simple:4.5",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "lzma:lzma:0.0.1"
-    },
-    {
-      "name": "com.paulscode:codecjorbis:20101023"
-    },
-    {
-      "name": "com.paulscode:codecwav:20101023"
-    },
-    {
-      "name": "com.paulscode:libraryjavasound:20101123"
-    },
-    {
-      "name": "com.paulscode:librarylwjglopenal:20100824"
-    },
-    {
-      "name": "com.paulscode:soundsystem:20120107"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "argo:argo:2.25_fixed"
-    },
-    {
-      "name": "net.sourceforge.argo:argo:2.25",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2",
-      "comment" : "grumble grumble grumble, y u no use proper version/artifact id grumble"
-    },
-    {
-      "name": "org.bouncycastle:bcprov-jdk15on:1.47",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.google.guava:guava:14.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.apache.commons:commons-lang3:3.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "commons-io:commons-io:2.4",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "net.java.jinput:jinput:2.0.5",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "net.java.jutils:jutils:1.0.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.google.code.gson:gson:2.2.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    },
-    {
-      "name": "net.java.jinput:jinput-platform:2.0.5",
-      "natives": {
-        "linux": "natives-linux",
-        "windows": "natives-windows",
-        "osx": "natives-osx"
-      },
-      "extract": {
-        "exclude": [
-          "META-INF/"
-        ]
-      }
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch"
-}

jsons/1.6.4-rel.json

@@ -1,214 +0,0 @@
-{
-  "install": {
-    "profileName": "@project@",
-    "target":"@minecraft_version@-@project@@version@",
-    "path":"@artifact@",
-    "version":"@project@ @version@",
-    "filePath":"@universal_jar@",
-    "welcome":"Welcome to the simple @project@ installer.",
-    "minecraft":"@minecraft_version@",
-    "mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
-    "logo":"/big_logo.png"
-  },
-  "versionInfo": {
-    "id": "@minecraft_version@-@project@@version@",
-    "time": "@timestamp@",
-    "releaseTime": "1960-01-01T00:00:00-0700",
-    "type": "release",
-    "processArguments": "username_session_version",
-    "minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
-    "minimumLauncherVersion": 4,
-    "libraries": [
-      {
-        "name": "@artifact@",
-        "url": "http://files.minecraftforge.net/maven/"
-      },
-      {
-        "name": "net.minecraft:launchwrapper:1.8",
-        "serverreq":true
-      },
-      {
-        "name": "org.ow2.asm:asm-all:4.1",
-        "serverreq":true
-      },
-      {
-        "name": "org.scala-lang:scala-library:2.10.2",
-        "url" : "http://files.minecraftforge.net/maven/",
-        "checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "65de4339eaed1c3675485fb03a3532fecfd8e8cd" ],
-        "comment" : "Important for FML, we add this",
-        "serverreq":true,
-        "clientreq":true
-      },
-      {
-        "name": "org.scala-lang:scala-compiler:2.10.2",
-        "url" : "http://files.minecraftforge.net/maven/",
-        "checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "99fd0ffb66f3088b0cd1071315fd5eb2b2b070ff" ],
-        "comment" : "Important for FML, we add this",
-        "serverreq":true,
-        "clientreq":true
-      },
-      {
-        "name": "lzma:lzma:0.0.1",
-        "serverreq":true
-      },
-      {
-        "name": "net.sf.jopt-simple:jopt-simple:4.5",
-        "serverreq":true
-      },
-      {
-        "name": "com.paulscode:codecjorbis:20101023"
-      },
-      {
-        "name": "com.paulscode:codecwav:20101023"
-      },
-      {
-        "name": "com.paulscode:libraryjavasound:20101123"
-      },
-      {
-        "name": "com.paulscode:librarylwjglopenal:20100824"
-      },
-      {
-        "name": "com.paulscode:soundsystem:20120107"
-      },
-      {
-        "name": "argo:argo:2.25_fixed"
-      },
-      {
-        "name": "org.bouncycastle:bcprov-jdk15on:1.47"
-      },
-      {
-        "name": "com.google.guava:guava:14.0"
-      },
-      {
-        "name": "org.apache.commons:commons-lang3:3.1"
-      },
-      {
-        "name": "commons-io:commons-io:2.4"
-      },
-      {
-        "name": "net.java.jinput:jinput:2.0.5"
-      },
-      {
-        "name": "net.java.jutils:jutils:1.0.0"
-      },
-      {
-        "name": "com.google.code.gson:gson:2.2.2"
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
-        "rules": [
-          {
-            "action": "allow"
-          },
-          {
-            "action": "disallow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ]
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
-        "rules": [
-          {
-            "action": "allow"
-          },
-          {
-            "action": "disallow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ]
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
-        "rules": [
-          {
-            "action": "allow"
-          },
-          {
-            "action": "disallow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ],
-        "natives": {
-          "linux": "natives-linux",
-          "windows": "natives-windows",
-          "osx": "natives-osx"
-        },
-        "extract": {
-          "exclude": [
-            "META-INF/"
-          ]
-        }
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20130708-debug3",
-        "rules": [
-          {
-            "action": "allow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ]
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20130708-debug3",
-        "rules": [
-          {
-            "action": "allow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ]
-      },
-      {
-        "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20130708-debug3",
-        "rules": [
-          {
-            "action": "allow",
-            "os": {
-              "name": "osx",
-              "version": "^10\\.5\\.\\d$"
-            }
-          }
-        ],
-        "natives": {
-          "linux": "natives-linux",
-          "windows": "natives-windows",
-          "osx": "natives-osx"
-        },
-        "extract": {
-          "exclude": [
-                      "META-INF/"
-                      ]
-        }
-      },
-      {
-        "name": "net.java.jinput:jinput-platform:2.0.5",
-        "natives": {
-          "linux": "natives-linux",
-          "windows": "natives-windows",
-          "osx": "natives-osx"
-        },
-        "extract": {
-          "exclude": [
-                      "META-INF/"
-                      ]
-        }
-      }
-      ],
-      "mainClass": "net.minecraft.launchwrapper.Launch"
-  }
-}

jsons/1.7.10-dev.json

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

jsons/1.7.10-pre3-dev.json

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

jsons/1.7.10-pre3.json

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

jsons/1.7.10-pre4-dev.json

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

jsons/1.7.10-pre4-rel.json

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

jsons/1.7.10-pre4.json

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

jsons/1.7.10-rel.json

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

jsons/1.7.10.json

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

jsons/1.7.2-dev.json

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

jsons/1.7.2-rel.json

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

jsons/1.7.2.json

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

jsons/1.7.9-dev.json

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

jsons/1.7.9-rel.json

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

jsons/1.7.9.json

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

jsons/1.8-dev.json

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

jsons/1.8-rel.json

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

jsons/1.8.8-dev.json

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

jsons/1.8.8-rel.json

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

jsons/1.8.8.json

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

jsons/1.8.9-dev.json

@@ -1,95 +0,0 @@
-{
-  "id": "@minecraft_version@-@project@@version@",
-  "time": "@timestamp@",
-  "releaseTime": "1960-01-01T00:00:00-0700",
-  "type": "release",
-  "inheritsFrom": "1.8.9",
-  "minecraftArguments": "--version FML_DEV --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
-  "libraries": [
-    {
-      "name": "net.minecraft:launchwrapper:1.12"
-    },
-    {
-      "name": "jline:jline:2.13",
-      "children": ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.google.code.findbugs:jsr305:1.3.9",
-      "children": ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.ow2.asm:asm-debug-all:5.0.3",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "com.typesafe:config:1.2.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-compiler:2.11.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-library:2.11.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang:scala-reflect:2.11.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang.modules:scala-swing_2.11:1.0.1",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "org.scala-lang.modules:scala-xml_2.11:1.0.2",
-      "children" : ["sources"],
-      "url" : "http://repo.maven.apache.org/maven2"
-    },
-    {
-      "name": "lzma:lzma:0.0.1"
-    },
-    {
-      "name": "java3d:vecmath:1.5.2"
-    },
-    {
-      "name": "net.sf.trove4j:trove4j:3.0.3"
-    }
-  ],
-  "mainClass": "net.minecraft.launchwrapper.Launch",
-  "minimumLauncherVersion": 14,
-  "assets": "1.8"
-}

jsons/1.8.9-rel.json

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

jsons/1.8.9.json

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

jsons/1.8.json

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

l4jManifest.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!--The ID below indicates application support for Windows Vista -->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
-      <!--The ID below indicates application support for Windows 7 -->
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
-      <!--The ID below indicates application support for Windows 8 -->
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-      <!--The ID below indicates application support for Windows 8.1 -->
-      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-      <!--The ID below indicates application supprort for Windows 10 -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-    </application>
-  </compatibility>
-
-  <!-- following stuff is so the EXE doesnt ask for admin access -->
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>

mdk/README.txt

@@ -1,59 +0,0 @@
--------------------------------------------
-Source installation information for modders
--------------------------------------------
-This code follows the Minecraft Forge installation methodology. It will apply
-some small patches to the vanilla MCP source code, giving you and it access 
-to some of the data and functions you need to build a successful mod.
-
-Note also that the patches are built against "unrenamed" MCP source code (aka
-srgnames) - this means that you will not be able to read them directly against
-normal code.
-
-Source pack installation information:
-
-Standalone source installation
-==============================
-
-Step 1: Open your command-line and browse to the folder where you extracted the zip file.
-
-Step 2: Once you have a command window up in the folder that the downloaded material was placed, type:
-
-Windows: "gradlew setupDecompWorkspace"
-Linux/Mac OS: "./gradlew setupDecompWorkspace"
-
-Step 3: After all that finished, you're left with a choice.
-For eclipse, run "gradlew eclipse" (./gradlew eclipse if you are on Mac/Linux)
-
-If you preffer to use IntelliJ, steps are a little different.
-1. Open IDEA, and import project.
-2. Select your build.gradle file and have it import.
-3. Once it's finished you must close IntelliJ and run the following command:
-
-"gradlew genIntellijRuns" (./gradlew genIntellijRuns if you are on Mac/Linux)
-
-Step 4: The final step is to open Eclipse and switch your workspace to /eclipse/ (if you use IDEA, it should automatically start on your project)
-
-If at any point you are missing libraries in your IDE, or you've run into problems you can run "gradlew --refresh-dependencies" to refresh the local cache. "gradlew clean" to reset everything {this does not effect your code} and then start the processs again.
-
-Should it still not work, 
-Refer to #ForgeGradle on EsperNet for more information about the gradle environment.
-
-Tip:
-If you do not care about seeing Minecraft's source code you can replace "setupDecompWorkspace" with one of the following:
-"setupDevWorkspace": Will patch, deobfusicated, and gather required assets to run minecraft, but will not generated human readable source code.
-"setupCIWorkspace": Same as Dev but will not download any assets. This is useful in build servers as it is the fastest because it does the least work.
-
-Tip:
-When using Decomp workspace, the Minecraft source code is NOT added to your workspace in a editable way. Minecraft is treated like a normal Library. Sources are there for documentation and research purposes and usually can be accessed under the 'referenced libraries' section of your IDE.
-
-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.
-
-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

mdk/build.gradle

@@ -1,82 +0,0 @@
-
-// For those who want the bleeding edge
-buildscript {
-    repositories {
-        jcenter()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-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"
-}
-*/
-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.
-}
-
-dependencies {
-    // you may put jars on which you depend on in ./libs
-    // or you may define them like so..
-    //compile "some.group:artifact:version:classifier"
-    //compile "some.group:artifact:version"
-      
-    // real examples
-    //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
-    // 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
-
-}
-
-processResources
-{
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-                
-        // replace version and mcversion
-        expand 'version':project.version, 'mcversion':project.minecraft.version
-    }
-        
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
-}

mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs

@@ -1,4 +0,0 @@
-#Sun Jun 05 18:58:07 CEST 2011
-version=1
-eclipse.preferences.version=1
-refresh.enabled=true

mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs

@@ -1,7 +0,0 @@
-#Sun Jun 05 19:03:53 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.debug.ui.UseContextualLaunch=false
-Console.highWaterMark=88000
-org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\r\n<launchPerspectives/>\r\n
-org.eclipse.debug.ui.user_view_bindings=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\r\n<viewBindings>\r\n<view id\="org.eclipse.ui.console.ConsoleView">\r\n<perspective id\="org.eclipse.jdt.ui.JavaPerspective" userAction\="opened"/>\r\n</view>\r\n</viewBindings>\r\n
-StringVariablePreferencePage=130,107,107,86,

mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.gathering.prefs

@@ -1,3 +0,0 @@
-#Sun Jun 05 18:58:07 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.epp.usagedata.gathering.enabled=false

mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs

@@ -1,14 +0,0 @@
-#Sun Sep 18 16:44:39 NZST 2011
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.source=1.6

mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs

@@ -1,4 +0,0 @@
-#Sun Jun 05 18:58:05 CEST 2011
-spacesForTabs=true
-eclipse.preferences.version=1
-overviewRuler_migration=migrated_3.1

mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs

@@ -1,9 +0,0 @@
-#Sun Jun 05 18:58:07 CEST 2011
-IMPORT_FILES_AND_FOLDERS_MODE=prompt
-IMPORT_FILES_AND_FOLDERS_VIRTUAL_FOLDER_MODE=prompt
-SAVE_ALL_BEFORE_BUILD=true
-eclipse.preferences.version=1
-tipsAndTricks=true
-platformState=1287081747687
-quickStart=false
-PROBLEMS_FILTERS_MIGRATE=true

mdk/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs

@@ -1,3 +0,0 @@
-#Sun Jun 05 18:50:08 CEST 2011
-eclipse.preferences.version=1
-showIntro=false

mdk/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch

@@ -1,13 +0,0 @@
-<?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"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</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.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}/run"/>
-</launchConfiguration>

mdk/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Server.launch

@@ -1,13 +0,0 @@
-<?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"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</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.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}/run"/>
-</launchConfiguration>

mdk/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchHistory>
-<launchGroup id="org.eclipse.ui.externaltools.launchGroup">
-<mruHistory/>
-<favorites/>
-</launchGroup>
-<launchGroup id="org.eclipse.debug.ui.launchGroup.profile">
-<mruHistory/>
-<favorites/>
-</launchGroup>
-<launchGroup id="org.eclipse.debug.ui.launchGroup.debug">
-<mruHistory>
-<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Client&quot;/&gt;&#13;&#10;"/>
-<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Server&quot;/&gt;&#13;&#10;"/>
-</mruHistory>
-<favorites/>
-</launchGroup>
-<launchGroup id="org.eclipse.debug.ui.launchGroup.run">
-<mruHistory>
-<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Client&quot;/&gt;&#13;&#10;"/>
-<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Server&quot;/&gt;&#13;&#10;"/>
-</mruHistory>
-<favorites/>
-</launchGroup>
-</launchHistory>

mdk/gitignore.txt

@@ -1,22 +0,0 @@
-# eclipse
-bin
-*.launch
-.settings
-.metadata
-.classpath
-.project
-
-# idea
-out
-*.ipr
-*.iws
-*.iml
-.idea
-
-# gradle
-build
-.gradle
-
-# other
-eclipse
-run

mdk/src/main/java/com/example/examplemod/ExampleMod.java

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

mdk/src/main/resources/mcmod.info

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

patches/minecraft/net/minecraft/block/BlockBanner.java.patch

@@ -1,54 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockBanner.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockBanner.java
-@@ -85,22 +85,7 @@
- 
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
-     {
--        TileEntity tileentity = p_180653_1_.func_175625_s(p_180653_2_);
--
--        if (tileentity instanceof TileEntityBanner)
-         {
--            ItemStack itemstack = new ItemStack(Items.field_179564_cE, 1, ((TileEntityBanner)tileentity).func_175115_b());
--            NBTTagCompound nbttagcompound = new NBTTagCompound();
--            tileentity.func_145841_b(nbttagcompound);
--            nbttagcompound.func_82580_o("x");
--            nbttagcompound.func_82580_o("y");
--            nbttagcompound.func_82580_o("z");
--            nbttagcompound.func_82580_o("id");
--            itemstack.func_77983_a("BlockEntityTag", nbttagcompound);
--            func_180635_a(p_180653_1_, p_180653_2_, itemstack);
--        }
--        else
--        {
-             super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
-         }
-     }
-@@ -133,6 +118,28 @@
-         }
-     }
- 
-+    @Override
-+    public java.util.List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
-+    {
-+        TileEntity te = world.func_175625_s(pos);
-+
-+        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
-+        if (te instanceof TileEntityBanner)
-+        {
-+            TileEntityBanner banner = (TileEntityBanner)te;
-+            ItemStack item = new ItemStack(Items.field_179564_cE, 1, banner.func_175115_b());
-+            NBTTagCompound nbt = new NBTTagCompound();
-+            TileEntityBanner.func_181020_a(nbt, banner.func_175115_b(), banner.func_181021_d());
-+            item.func_77983_a("BlockEntityTag", nbt);
-+            ret.add(item);
-+        }
-+        else
-+        {
-+            ret.add(new ItemStack(Items.field_179564_cE, 1, 0));
-+        }
-+        return ret;
-+    }
-+
-     public static class BlockBannerHanging extends BlockBanner
-         {
-             public BlockBannerHanging()

patches/minecraft/net/minecraft/block/BlockBush.java.patch

@@ -1,66 +1,73 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockBush.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockBush.java
-@@ -13,7 +13,7 @@
- import net.minecraftforge.fml.relauncher.Side;
- import net.minecraftforge.fml.relauncher.SideOnly;
+@@ -6,8 +6,13 @@
+ import net.minecraft.init.Blocks;
+ import net.minecraft.util.AxisAlignedBB;
+ import net.minecraft.world.World;
++import net.minecraft.world.IBlockAccess;
++import net.minecraftforge.common.EnumPlantType;
++import net.minecraftforge.common.util.ForgeDirection;
++import net.minecraftforge.common.IPlantable;
++import static net.minecraftforge.common.EnumPlantType.*;
  
 -public class BlockBush extends Block
-+public class BlockBush extends Block implements net.minecraftforge.common.IPlantable
++public class BlockBush extends Block implements IPlantable
  {
-     protected BlockBush()
-     {
-@@ -36,7 +36,7 @@
+     private static final String __OBFID = "CL_00000208";
  
-     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
+@@ -27,7 +32,7 @@
+ 
+     public boolean func_149742_c(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
      {
--        return super.func_176196_c(p_176196_1_, p_176196_2_) && this.func_149854_a(p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).func_177230_c());
-+        return super.func_176196_c(p_176196_1_, p_176196_2_) && p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).func_177230_c().canSustainPlant(p_176196_1_, p_176196_2_.func_177977_b(), net.minecraft.util.EnumFacing.UP, this);
+-        return super.func_149742_c(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && this.func_149854_a(p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_ - 1, p_149742_4_));
++        return super.func_149742_c(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && this.func_149718_j(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_);
      }
  
      protected boolean func_149854_a(Block p_149854_1_)
-@@ -66,7 +66,10 @@
+@@ -57,7 +62,7 @@
  
-     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
+     public boolean func_149718_j(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_)
      {
--        return this.func_149854_a(p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()).func_177230_c());
-+        BlockPos down = p_180671_2_.func_177977_b();
-+        Block soil = p_180671_1_.func_180495_p(down).func_177230_c();
-+        if (p_180671_3_.func_177230_c() != this) return this.func_149854_a(soil); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check.
-+        return soil.canSustainPlant(p_180671_1_, down, net.minecraft.util.EnumFacing.UP, this);
+-        return this.func_149854_a(p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_ - 1, p_149718_4_));
++        return  p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_ - 1, p_149718_4_).canSustainPlant(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_, ForgeDirection.UP, this);
      }
  
-     public AxisAlignedBB func_180640_a(World p_180640_1_, BlockPos p_180640_2_, IBlockState p_180640_3_)
-@@ -89,4 +92,33 @@
+     public AxisAlignedBB func_149668_a(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_)
+@@ -79,4 +84,37 @@
      {
-         return EnumWorldBlockLayer.CUTOUT;
+         return 1;
      }
 +
 +    @Override
-+    public net.minecraftforge.common.EnumPlantType getPlantType(net.minecraft.world.IBlockAccess world, BlockPos pos)
++    public EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z)
 +    {
-+        if (this == Blocks.field_150464_aj)          return net.minecraftforge.common.EnumPlantType.Crop;
-+        if (this == Blocks.field_150459_bM)        return net.minecraftforge.common.EnumPlantType.Crop;
-+        if (this == Blocks.field_150469_bN)       return net.minecraftforge.common.EnumPlantType.Crop;
-+        if (this == Blocks.field_150394_bc)     return net.minecraftforge.common.EnumPlantType.Crop;
-+        if (this == Blocks.field_150393_bb)   return net.minecraftforge.common.EnumPlantType.Crop;
-+        if (this == Blocks.field_150330_I)       return net.minecraftforge.common.EnumPlantType.Desert;
-+        if (this == Blocks.field_150392_bi)      return net.minecraftforge.common.EnumPlantType.Water;
-+        if (this == Blocks.field_150337_Q)   return net.minecraftforge.common.EnumPlantType.Cave;
-+        if (this == Blocks.field_150338_P) return net.minecraftforge.common.EnumPlantType.Cave;
-+        if (this == Blocks.field_150388_bm)    return net.minecraftforge.common.EnumPlantType.Nether;
-+        if (this == Blocks.field_150345_g)        return net.minecraftforge.common.EnumPlantType.Plains;
-+        if (this == Blocks.field_150329_H)      return net.minecraftforge.common.EnumPlantType.Plains;
-+        if (this == Blocks.field_150398_cm)   return net.minecraftforge.common.EnumPlantType.Plains;
-+        if (this == Blocks.field_150328_O)     return net.minecraftforge.common.EnumPlantType.Plains;
-+        if (this == Blocks.field_150327_N)  return net.minecraftforge.common.EnumPlantType.Plains;
-+        return net.minecraftforge.common.EnumPlantType.Plains;
++        if (this == Blocks.field_150464_aj)          return Crop;
++        if (this == Blocks.field_150459_bM)        return Crop;
++        if (this == Blocks.field_150469_bN)       return Crop;
++        if (this == Blocks.field_150394_bc)     return Crop;
++        if (this == Blocks.field_150393_bb)   return Crop;
++        if (this == Blocks.field_150330_I)       return Desert;
++        if (this == Blocks.field_150392_bi)      return Water;
++        if (this == Blocks.field_150337_Q)   return Cave;
++        if (this == Blocks.field_150338_P) return Cave;
++        if (this == Blocks.field_150388_bm)    return Nether;
++        if (this == Blocks.field_150345_g)        return Plains;
++        if (this == Blocks.field_150329_H)      return Plains;
++        if (this == Blocks.field_150398_cm)   return Plains;
++        if (this == Blocks.field_150328_O)     return Plains;
++        if (this == Blocks.field_150327_N)  return Plains;        
++        return Plains;
 +    }
 +
 +    @Override
-+    public IBlockState getPlant(net.minecraft.world.IBlockAccess world, BlockPos pos)
++    public Block getPlant(IBlockAccess world, int x, int y, int z)
 +    {
-+        IBlockState state = world.func_180495_p(pos);
-+        if (state.func_177230_c() != this) return func_176223_P();
-+        return state;
++        return this;
++    }
++
++    @Override
++    public int getPlantMetadata(IBlockAccess world, int x, int y, int z)
++    {
++        return world.func_72805_g(x, y, z);
 +    }
  }

patches/minecraft/net/minecraft/block/BlockButton.java.patch

@@ -1,12 +1,100 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockButton.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockButton.java
-@@ -74,8 +74,7 @@
+@@ -14,6 +14,9 @@
+ import net.minecraft.world.IBlockAccess;
+ import net.minecraft.world.World;
  
-     protected static boolean func_181088_a(World p_181088_0_, BlockPos p_181088_1_, EnumFacing p_181088_2_)
++import net.minecraftforge.common.util.ForgeDirection;
++import static net.minecraftforge.common.util.ForgeDirection.*;
++
+ public abstract class BlockButton extends Block
+ {
+     private final boolean field_150047_a;
+@@ -49,12 +52,19 @@
+ 
+     public boolean func_149707_d(World p_149707_1_, int p_149707_2_, int p_149707_3_, int p_149707_4_, int p_149707_5_)
      {
--        BlockPos blockpos = p_181088_1_.func_177972_a(p_181088_2_);
--        return p_181088_2_ == EnumFacing.DOWN ? World.func_175683_a(p_181088_0_, blockpos) : p_181088_0_.func_180495_p(blockpos).func_177230_c().func_149721_r();
-+        return p_181088_2_ == EnumFacing.DOWN && World.func_175683_a(p_181088_0_, p_181088_1_.func_177977_b()) ? true : p_181088_0_.isSideSolid(p_181088_1_.func_177972_a(p_181088_2_), p_181088_2_.func_176734_d());
+-        return p_149707_5_ == 2 && p_149707_1_.func_147439_a(p_149707_2_, p_149707_3_, p_149707_4_ + 1).func_149721_r() ? true : (p_149707_5_ == 3 && p_149707_1_.func_147439_a(p_149707_2_, p_149707_3_, p_149707_4_ - 1).func_149721_r() ? true : (p_149707_5_ == 4 && p_149707_1_.func_147439_a(p_149707_2_ + 1, p_149707_3_, p_149707_4_).func_149721_r() ? true : p_149707_5_ == 5 && p_149707_1_.func_147439_a(p_149707_2_ - 1, p_149707_3_, p_149707_4_).func_149721_r()));
++        ForgeDirection dir = ForgeDirection.getOrientation(p_149707_5_);
++        return (dir == NORTH && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_, p_149707_4_ + 1, NORTH)) ||
++               (dir == SOUTH && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_, p_149707_4_ - 1, SOUTH)) ||
++               (dir == WEST  && p_149707_1_.isSideSolid(p_149707_2_ + 1, p_149707_3_, p_149707_4_, WEST)) ||
++               (dir == EAST  && p_149707_1_.isSideSolid(p_149707_2_ - 1, p_149707_3_, p_149707_4_, EAST));
      }
  
-     public IBlockState func_180642_a(World p_180642_1_, BlockPos p_180642_2_, EnumFacing p_180642_3_, float p_180642_4_, float p_180642_5_, float p_180642_6_, int p_180642_7_, EntityLivingBase p_180642_8_)
+     public boolean func_149742_c(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
+     {
+-        return p_149742_1_.func_147439_a(p_149742_2_ - 1, p_149742_3_, p_149742_4_).func_149721_r() ? true : (p_149742_1_.func_147439_a(p_149742_2_ + 1, p_149742_3_, p_149742_4_).func_149721_r() ? true : (p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_, p_149742_4_ - 1).func_149721_r() ? true : p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_, p_149742_4_ + 1).func_149721_r()));
++        return (p_149742_1_.isSideSolid(p_149742_2_ - 1, p_149742_3_, p_149742_4_, EAST)) ||
++               (p_149742_1_.isSideSolid(p_149742_2_ + 1, p_149742_3_, p_149742_4_, WEST)) ||
++               (p_149742_1_.isSideSolid(p_149742_2_, p_149742_3_, p_149742_4_ - 1, SOUTH)) ||
++               (p_149742_1_.isSideSolid(p_149742_2_, p_149742_3_, p_149742_4_ + 1, NORTH));
+     }
+ 
+     public int func_149660_a(World p_149660_1_, int p_149660_2_, int p_149660_3_, int p_149660_4_, int p_149660_5_, float p_149660_6_, float p_149660_7_, float p_149660_8_, int p_149660_9_)
+@@ -63,19 +73,21 @@
+         int k1 = j1 & 8;
+         j1 &= 7;
+ 
+-        if (p_149660_5_ == 2 && p_149660_1_.func_147439_a(p_149660_2_, p_149660_3_, p_149660_4_ + 1).func_149721_r())
++        ForgeDirection dir = ForgeDirection.getOrientation(p_149660_5_);
++
++        if (dir == NORTH && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ + 1, NORTH))
+         {
+             j1 = 4;
+         }
+-        else if (p_149660_5_ == 3 && p_149660_1_.func_147439_a(p_149660_2_, p_149660_3_, p_149660_4_ - 1).func_149721_r())
++        else if (dir == SOUTH && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ - 1, SOUTH))
+         {
+             j1 = 3;
+         }
+-        else if (p_149660_5_ == 4 && p_149660_1_.func_147439_a(p_149660_2_ + 1, p_149660_3_, p_149660_4_).func_149721_r())
++        else if (dir == WEST && p_149660_1_.isSideSolid(p_149660_2_ + 1, p_149660_3_, p_149660_4_, WEST))
+         {
+             j1 = 2;
+         }
+-        else if (p_149660_5_ == 5 && p_149660_1_.func_147439_a(p_149660_2_ - 1, p_149660_3_, p_149660_4_).func_149721_r())
++        else if (dir == EAST && p_149660_1_.isSideSolid(p_149660_2_ - 1, p_149660_3_, p_149660_4_, EAST))
+         {
+             j1 = 1;
+         }
+@@ -89,7 +101,11 @@
+ 
+     private int func_150045_e(World p_150045_1_, int p_150045_2_, int p_150045_3_, int p_150045_4_)
+     {
+-        return p_150045_1_.func_147439_a(p_150045_2_ - 1, p_150045_3_, p_150045_4_).func_149721_r() ? 1 : (p_150045_1_.func_147439_a(p_150045_2_ + 1, p_150045_3_, p_150045_4_).func_149721_r() ? 2 : (p_150045_1_.func_147439_a(p_150045_2_, p_150045_3_, p_150045_4_ - 1).func_149721_r() ? 3 : (p_150045_1_.func_147439_a(p_150045_2_, p_150045_3_, p_150045_4_ + 1).func_149721_r() ? 4 : 1)));
++        if (p_150045_1_.isSideSolid(p_150045_2_ - 1, p_150045_3_, p_150045_4_, EAST)) return 1;
++        if (p_150045_1_.isSideSolid(p_150045_2_ + 1, p_150045_3_, p_150045_4_, WEST)) return 2;
++        if (p_150045_1_.isSideSolid(p_150045_2_, p_150045_3_, p_150045_4_ - 1, SOUTH)) return 3;
++        if (p_150045_1_.isSideSolid(p_150045_2_, p_150045_3_, p_150045_4_ + 1, NORTH)) return 4;
++        return 1;
+     }
+ 
+     public void func_149695_a(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_)
+@@ -99,22 +115,22 @@
+             int l = p_149695_1_.func_72805_g(p_149695_2_, p_149695_3_, p_149695_4_) & 7;
+             boolean flag = false;
+ 
+-            if (!p_149695_1_.func_147439_a(p_149695_2_ - 1, p_149695_3_, p_149695_4_).func_149721_r() && l == 1)
++            if (!p_149695_1_.isSideSolid(p_149695_2_ - 1, p_149695_3_, p_149695_4_, EAST) && l == 1)
+             {
+                 flag = true;
+             }
+ 
+-            if (!p_149695_1_.func_147439_a(p_149695_2_ + 1, p_149695_3_, p_149695_4_).func_149721_r() && l == 2)
++            if (!p_149695_1_.isSideSolid(p_149695_2_ + 1, p_149695_3_, p_149695_4_, WEST) && l == 2)
+             {
+                 flag = true;
+             }
+ 
+-            if (!p_149695_1_.func_147439_a(p_149695_2_, p_149695_3_, p_149695_4_ - 1).func_149721_r() && l == 3)
++            if (!p_149695_1_.isSideSolid(p_149695_2_, p_149695_3_, p_149695_4_ - 1, SOUTH) && l == 3)
+             {
+                 flag = true;
+             }
+ 
+-            if (!p_149695_1_.func_147439_a(p_149695_2_, p_149695_3_, p_149695_4_ + 1).func_149721_r() && l == 4)
++            if (!p_149695_1_.isSideSolid(p_149695_2_, p_149695_3_, p_149695_4_ + 1, NORTH) && l == 4)
+             {
+                 flag = true;
+             }

patches/minecraft/net/minecraft/block/BlockCactus.java.patch

@@ -1,37 +1,49 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockCactus.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockCactus.java
-@@ -18,7 +18,7 @@
- import net.minecraftforge.fml.relauncher.Side;
- import net.minecraftforge.fml.relauncher.SideOnly;
+@@ -11,9 +11,13 @@
+ import net.minecraft.util.AxisAlignedBB;
+ import net.minecraft.util.DamageSource;
+ import net.minecraft.util.IIcon;
++import net.minecraft.world.IBlockAccess;
+ import net.minecraft.world.World;
++import net.minecraftforge.common.EnumPlantType;
++import net.minecraftforge.common.util.ForgeDirection;
++import net.minecraftforge.common.IPlantable;
  
 -public class BlockCactus extends Block
-+public class BlockCactus extends Block implements net.minecraftforge.common.IPlantable
++public class BlockCactus extends Block implements IPlantable
  {
-     public static final PropertyInteger field_176587_a = PropertyInteger.func_177719_a("age", 0, 15);
- 
-@@ -109,7 +109,7 @@
+     @SideOnly(Side.CLIENT)
+     private IIcon field_150041_a;
+@@ -125,7 +129,7 @@
+         else
+         {
+             Block block = p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_ - 1, p_149718_4_);
+-            return block == Blocks.field_150434_aF || block == Blocks.field_150354_m;
++            return block.canSustainPlant(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_, ForgeDirection.UP, this);
          }
- 
-         Block block = p_176586_1_.func_180495_p(p_176586_2_.func_177977_b()).func_177230_c();
--        return block == Blocks.field_150434_aF || block == Blocks.field_150354_m;
-+        return block.canSustainPlant(p_176586_1_, p_176586_2_.func_177977_b(), EnumFacing.UP, this);
      }
  
-     public void func_180634_a(World p_180634_1_, BlockPos p_180634_2_, IBlockState p_180634_3_, Entity p_180634_4_)
-@@ -137,4 +137,16 @@
-     {
-         return new BlockState(this, new IProperty[] {field_176587_a});
+@@ -141,4 +145,22 @@
+         this.field_150041_a = p_149651_1_.func_94245_a(this.func_149641_N() + "_top");
+         this.field_150040_b = p_149651_1_.func_94245_a(this.func_149641_N() + "_bottom");
      }
 +
 +    @Override
-+    public net.minecraftforge.common.EnumPlantType getPlantType(net.minecraft.world.IBlockAccess world, BlockPos pos)
++    public EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z)
 +    {
-+        return net.minecraftforge.common.EnumPlantType.Desert;
++        return EnumPlantType.Desert;
 +    }
 +
 +    @Override
-+    public IBlockState getPlant(net.minecraft.world.IBlockAccess world, BlockPos pos)
++    public Block getPlant(IBlockAccess world, int x, int y, int z)
 +    {
-+        return func_176223_P();
++        return this;
++    }
++
++    @Override
++    public int getPlantMetadata(IBlockAccess world, int x, int y, int z)
++    {
++        return -1;
 +    }
  }

patches/minecraft/net/minecraft/block/BlockChest.java.patch

@@ -1,11 +1,44 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockChest.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockChest.java
-@@ -527,7 +527,7 @@
+@@ -23,6 +23,8 @@
+ import net.minecraft.world.IBlockAccess;
+ import net.minecraft.world.World;
  
-     private boolean func_176456_n(World p_176456_1_, BlockPos p_176456_2_)
-     {
--        return p_176456_1_.func_180495_p(p_176456_2_.func_177984_a()).func_177230_c().func_149721_r();
-+        return p_176456_1_.isSideSolid(p_176456_2_.func_177984_a(), EnumFacing.DOWN, false);
-     }
- 
-     private boolean func_176453_o(World p_176453_1_, BlockPos p_176453_2_)
++import static net.minecraftforge.common.util.ForgeDirection.*;
++
+ public class BlockChest extends BlockContainer
+ {
+     private final Random field_149955_b = new Random();
+@@ -407,7 +409,7 @@
+         {
+             return null;
+         }
+-        else if (p_149951_1_.func_147439_a(p_149951_2_, p_149951_3_ + 1, p_149951_4_).func_149721_r())
++        else if (p_149951_1_.isSideSolid(p_149951_2_, p_149951_3_ + 1, p_149951_4_, DOWN))
+         {
+             return null;
+         }
+@@ -415,19 +417,19 @@
+         {
+             return null;
+         }
+-        else if (p_149951_1_.func_147439_a(p_149951_2_ - 1, p_149951_3_, p_149951_4_) == this && (p_149951_1_.func_147439_a(p_149951_2_ - 1, p_149951_3_ + 1, p_149951_4_).func_149721_r() || func_149953_o(p_149951_1_, p_149951_2_ - 1, p_149951_3_, p_149951_4_)))
++        else if (p_149951_1_.func_147439_a(p_149951_2_ - 1, p_149951_3_, p_149951_4_) == this && (p_149951_1_.isSideSolid(p_149951_2_ - 1, p_149951_3_ + 1, p_149951_4_, DOWN) || func_149953_o(p_149951_1_, p_149951_2_ - 1, p_149951_3_, p_149951_4_)))
+         {
+             return null;
+         }
+-        else if (p_149951_1_.func_147439_a(p_149951_2_ + 1, p_149951_3_, p_149951_4_) == this && (p_149951_1_.func_147439_a(p_149951_2_ + 1, p_149951_3_ + 1, p_149951_4_).func_149721_r() || func_149953_o(p_149951_1_, p_149951_2_ + 1, p_149951_3_, p_149951_4_)))
++        else if (p_149951_1_.func_147439_a(p_149951_2_ + 1, p_149951_3_, p_149951_4_) == this && (p_149951_1_.isSideSolid(p_149951_2_ + 1, p_149951_3_ + 1, p_149951_4_, DOWN) || func_149953_o(p_149951_1_, p_149951_2_ + 1, p_149951_3_, p_149951_4_)))
+         {
+             return null;
+         }
+-        else if (p_149951_1_.func_147439_a(p_149951_2_, p_149951_3_, p_149951_4_ - 1) == this && (p_149951_1_.func_147439_a(p_149951_2_, p_149951_3_ + 1, p_149951_4_ - 1).func_149721_r() || func_149953_o(p_149951_1_, p_149951_2_, p_149951_3_, p_149951_4_ - 1)))
++        else if (p_149951_1_.func_147439_a(p_149951_2_, p_149951_3_, p_149951_4_ - 1) == this && (p_149951_1_.isSideSolid(p_149951_2_, p_149951_3_ + 1, p_149951_4_ - 1, DOWN) || func_149953_o(p_149951_1_, p_149951_2_, p_149951_3_, p_149951_4_ - 1)))
+         {
+             return null;
+         }
+-        else if (p_149951_1_.func_147439_a(p_149951_2_, p_149951_3_, p_149951_4_ + 1) == this && (p_149951_1_.func_147439_a(p_149951_2_, p_149951_3_ + 1, p_149951_4_ + 1).func_149721_r() || func_149953_o(p_149951_1_, p_149951_2_, p_149951_3_, p_149951_4_ + 1)))
++        else if (p_149951_1_.func_147439_a(p_149951_2_, p_149951_3_, p_149951_4_ + 1) == this && (p_149951_1_.isSideSolid(p_149951_2_, p_149951_3_ + 1, p_149951_4_ + 1, DOWN) || func_149953_o(p_149951_1_, p_149951_2_, p_149951_3_, p_149951_4_ + 1)))
+         {
+             return null;
+         }

patches/minecraft/net/minecraft/block/BlockCocoa.java.patch

@@ -1,29 +1,46 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockCocoa.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockCocoa.java
-@@ -137,7 +137,14 @@
+@@ -2,6 +2,7 @@
  
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
++import java.util.ArrayList;
+ import java.util.Random;
+ import net.minecraft.block.material.Material;
+ import net.minecraft.client.renderer.texture.IIconRegister;
+@@ -160,6 +161,13 @@
+ 
+     public void func_149690_a(World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_, int p_149690_5_, float p_149690_6_, int p_149690_7_)
      {
--        int i = ((Integer)p_180653_3_.func_177229_b(field_176501_a)).intValue();
-+        super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
++        super.func_149690_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, p_149690_7_);
 +    }
 +
 +    @Override
-+    public java.util.List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
++    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int p_149690_5_, int fortune)
 +    {
-+        java.util.List<ItemStack> dropped = super.getDrops(world, pos, state, fortune);
-+        int i = ((Integer)state.func_177229_b(field_176501_a)).intValue();
-         int j = 1;
++        ArrayList<ItemStack> dropped = super.getDrops(world, x, y, z, p_149690_5_, fortune);
+         int j1 = func_149987_c(p_149690_5_);
+         byte b0 = 1;
  
-         if (i >= 2)
-@@ -147,8 +154,9 @@
+@@ -170,8 +178,9 @@
  
-         for (int k = 0; k < j; ++k)
+         for (int k1 = 0; k1 < b0; ++k1)
          {
--            func_180635_a(p_180653_1_, p_180653_2_, new ItemStack(Items.field_151100_aR, 1, EnumDyeColor.BROWN.func_176767_b()));
-+            dropped.add(new ItemStack(Items.field_151100_aR, 1, EnumDyeColor.BROWN.func_176767_b()));
+-            this.func_149642_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, new ItemStack(Items.field_151100_aR, 1, 3));
++            dropped.add(new ItemStack(Items.field_151100_aR, 1, 3));
          }
 +        return dropped;
      }
  
      @SideOnly(Side.CLIENT)
+@@ -216,4 +225,10 @@
+         ++j1;
+         p_149853_1_.func_72921_c(p_149853_3_, p_149853_4_, p_149853_5_, j1 << 2 | i1, 2);
+     }
++
++    @Override
++    public Item func_149650_a(int par1, Random par2Random, int par3)
++    {
++        return null;
++    }
+ }

patches/minecraft/net/minecraft/block/BlockCrops.java.patch

@@ -1,77 +1,79 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockCrops.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockCrops.java
-@@ -81,11 +81,11 @@
-                 float f1 = 0.0F;
-                 IBlockState iblockstate = p_180672_1_.func_180495_p(blockpos.func_177982_a(i, 0, j));
+@@ -2,6 +2,7 @@
  
--                if (iblockstate.func_177230_c() == Blocks.field_150458_ak)
-+                if (iblockstate.func_177230_c().canSustainPlant(p_180672_1_, blockpos.func_177982_a(i, 0, j), net.minecraft.util.EnumFacing.UP, (net.minecraftforge.common.IPlantable)p_180672_0_))
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
++import java.util.ArrayList;
+ import java.util.Random;
+ import net.minecraft.client.renderer.texture.IIconRegister;
+ import net.minecraft.creativetab.CreativeTabs;
+@@ -12,6 +13,7 @@
+ import net.minecraft.util.IIcon;
+ import net.minecraft.util.MathHelper;
+ import net.minecraft.world.World;
++import net.minecraftforge.common.util.ForgeDirection;
+ 
+ public class BlockCrops extends BlockBush implements IGrowable
+ {
+@@ -89,11 +91,11 @@
+             {
+                 float f1 = 0.0F;
+ 
+-                if (p_149864_1_.func_147439_a(l, p_149864_3_ - 1, i1) == Blocks.field_150458_ak)
++                if (p_149864_1_.func_147439_a(l, p_149864_3_ - 1, i1).canSustainPlant(p_149864_1_, l, p_149864_3_ - 1, i1, ForgeDirection.UP, this))
                  {
                      f1 = 1.0F;
  
--                    if (((Integer)iblockstate.func_177229_b(BlockFarmland.field_176531_a)).intValue() > 0)
-+                    if (iblockstate.func_177230_c().isFertile(p_180672_1_, blockpos.func_177982_a(i, 0, j)))
+-                    if (p_149864_1_.func_72805_g(l, p_149864_3_ - 1, i1) > 0)
++                    if (p_149864_1_.func_147439_a(l, p_149864_3_ - 1, i1).isFertile(p_149864_1_, l, p_149864_3_ - 1, i1))
                      {
                          f1 = 3.0F;
                      }
-@@ -126,7 +126,7 @@
- 
-     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
+@@ -145,22 +147,6 @@
+     public void func_149690_a(World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_, int p_149690_5_, float p_149690_6_, int p_149690_7_)
      {
--        return (p_180671_1_.func_175699_k(p_180671_2_) >= 8 || p_180671_1_.func_175678_i(p_180671_2_)) && this.func_149854_a(p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()).func_177230_c());
-+        return (p_180671_1_.func_175699_k(p_180671_2_) >= 8 || p_180671_1_.func_175678_i(p_180671_2_)) && p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()).func_177230_c().canSustainPlant(p_180671_1_, p_180671_2_.func_177977_b(), net.minecraft.util.EnumFacing.UP, this);
-     }
- 
-     protected Item func_149866_i()
-@@ -142,24 +142,6 @@
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
-     {
-         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, 0);
+         super.func_149690_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, 0);
 -
--        if (!p_180653_1_.field_72995_K)
+-        if (!p_149690_1_.field_72995_K)
 -        {
--            int i = ((Integer)p_180653_3_.func_177229_b(field_176488_a)).intValue();
--
--            if (i >= 7)
+-            if (p_149690_5_ >= 7)
 -            {
--                int j = 3 + p_180653_5_;
+-                int j1 = 3 + p_149690_7_;
 -
--                for (int k = 0; k < j; ++k)
+-                for (int k1 = 0; k1 < j1; ++k1)
 -                {
--                    if (p_180653_1_.field_73012_v.nextInt(15) <= i)
+-                    if (p_149690_1_.field_73012_v.nextInt(15) <= p_149690_5_)
 -                    {
--                        func_180635_a(p_180653_1_, p_180653_2_, new ItemStack(this.func_149866_i(), 1, 0));
+-                        this.func_149642_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, new ItemStack(this.func_149866_i(), 1, 0));
 -                    }
 -                }
 -            }
 -        }
      }
  
-     public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
-@@ -202,4 +184,26 @@
+     public Item func_149650_a(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
+@@ -204,4 +190,23 @@
      {
-         return new BlockState(this, new IProperty[] {field_176488_a});
+         this.func_149863_m(p_149853_1_, p_149853_3_, p_149853_4_, p_149853_5_);
      }
 +
 +    @Override
-+    public java.util.List<ItemStack> getDrops(net.minecraft.world.IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
++    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
 +    {
-+        java.util.List<ItemStack> ret = super.getDrops(world, pos, state, fortune);
-+        int age = ((Integer)state.func_177229_b(field_176488_a)).intValue();
-+        Random rand = world instanceof World ? ((World)world).field_73012_v : new Random();
++        ArrayList<ItemStack> ret = super.getDrops(world, x, y, z, metadata, fortune);
 +
-+        if (age >= 7)
++        if (metadata >= 7)
 +        {
-+            int k = 3 + fortune;
-+
 +            for (int i = 0; i < 3 + fortune; ++i)
 +            {
-+                if (rand.nextInt(15) <= age)
++                if (world.field_73012_v.nextInt(15) <= metadata)
 +                {
 +                    ret.add(new ItemStack(this.func_149866_i(), 1, 0));
 +                }
 +            }
 +        }
++
 +        return ret;
 +    }
  }

patches/minecraft/net/minecraft/block/BlockDeadBush.java.patch

@@ -1,33 +1,45 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockDeadBush.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockDeadBush.java
-@@ -14,7 +14,7 @@
- import net.minecraft.util.BlockPos;
+@@ -1,5 +1,7 @@
+ package net.minecraft.block;
+ 
++import java.util.ArrayList;
++import java.util.Arrays;
+ import java.util.Random;
+ import net.minecraft.block.material.Material;
+ import net.minecraft.entity.player.EntityPlayer;
+@@ -8,9 +10,11 @@
+ import net.minecraft.item.Item;
+ import net.minecraft.item.ItemStack;
+ import net.minecraft.stats.StatList;
++import net.minecraft.world.IBlockAccess;
  import net.minecraft.world.World;
++import net.minecraftforge.common.IShearable;
  
 -public class BlockDeadBush extends BlockBush
-+public class BlockDeadBush extends BlockBush implements net.minecraftforge.common.IShearable
++public class BlockDeadBush extends BlockBush implements IShearable
  {
-     protected BlockDeadBush()
-     {
-@@ -45,14 +45,15 @@
+     private static final String __OBFID = "CL_00000224";
  
-     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, TileEntity p_180657_5_)
+@@ -33,14 +37,15 @@
+ 
+     public void func_149636_a(World p_149636_1_, EntityPlayer p_149636_2_, int p_149636_3_, int p_149636_4_, int p_149636_5_, int p_149636_6_)
      {
--        if (!p_180657_1_.field_72995_K && p_180657_2_.func_71045_bC() != null && p_180657_2_.func_71045_bC().func_77973_b() == Items.field_151097_aZ)
+-        if (!p_149636_1_.field_72995_K && p_149636_2_.func_71045_bC() != null && p_149636_2_.func_71045_bC().func_77973_b() == Items.field_151097_aZ)
          {
--            p_180657_2_.func_71029_a(StatList.field_75934_C[Block.func_149682_b(this)]);
--            func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Blocks.field_150330_I, 1, 0));
+-            p_149636_2_.func_71064_a(StatList.field_75934_C[Block.func_149682_b(this)], 1);
+-            this.func_149642_a(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, new ItemStack(Blocks.field_150330_I, 1, p_149636_6_));
 -        }
 -        else
 -        {
-             super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_);
+             super.func_149636_a(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_);
          }
      }
 +
-+    @Override public boolean isShearable(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos){ return true; }
++    @Override public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z) { return true; }
 +    @Override
-+    public java.util.List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
++    public ArrayList<ItemStack> onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune)
 +    {
-+        return new java.util.ArrayList<ItemStack>(java.util.Arrays.asList(new ItemStack(Blocks.field_150330_I)));
++        return new ArrayList<ItemStack>(Arrays.asList(new ItemStack(Blocks.field_150330_I, 1, world.func_72805_g(x, y, z))));
 +    }
  }

patches/minecraft/net/minecraft/block/BlockDoor.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockDoor.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockDoor.java
-@@ -154,7 +154,7 @@
+@@ -249,7 +249,7 @@
      {
          if (this.field_149764_J == Material.field_151573_f)
          {
@@ -9,12 +9,12 @@
          }
          else
          {
-@@ -272,7 +272,7 @@
+@@ -367,7 +367,7 @@
  
-     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
+     public boolean func_149742_c(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
      {
--        return p_176196_2_.func_177956_o() >= 255 ? false : World.func_175683_a(p_176196_1_, p_176196_2_.func_177977_b()) && super.func_176196_c(p_176196_1_, p_176196_2_) && super.func_176196_c(p_176196_1_, p_176196_2_.func_177984_a());
-+        return p_176196_2_.func_177956_o() >= p_176196_1_.func_72800_K() - 1 ? false : World.func_175683_a(p_176196_1_, p_176196_2_.func_177977_b()) && super.func_176196_c(p_176196_1_, p_176196_2_) && super.func_176196_c(p_176196_1_, p_176196_2_.func_177984_a());
+-        return p_149742_3_ >= 255 ? false : World.func_147466_a(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_) && super.func_149742_c(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && super.func_149742_c(p_149742_1_, p_149742_2_, p_149742_3_ + 1, p_149742_4_);
++        return p_149742_3_ >= p_149742_1_.func_72800_K() - 1 ? false : World.func_147466_a(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_) && super.func_149742_c(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && super.func_149742_c(p_149742_1_, p_149742_2_, p_149742_3_ + 1, p_149742_4_);
      }
  
      public int func_149656_h()

patches/minecraft/net/minecraft/block/BlockDoublePlant.java.patch

@@ -1,89 +1,52 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockDoublePlant.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockDoublePlant.java
-@@ -25,7 +25,7 @@
- import net.minecraftforge.fml.relauncher.Side;
- import net.minecraftforge.fml.relauncher.SideOnly;
+@@ -2,6 +2,7 @@
+ 
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
++import java.util.ArrayList;
+ import java.util.List;
+ import java.util.Random;
+ import net.minecraft.block.material.Material;
+@@ -18,8 +19,9 @@
+ import net.minecraft.util.MathHelper;
+ import net.minecraft.world.IBlockAccess;
+ import net.minecraft.world.World;
++import net.minecraftforge.common.IShearable;
  
 -public class BlockDoublePlant extends BlockBush implements IGrowable
-+public class BlockDoublePlant extends BlockBush implements IGrowable, net.minecraftforge.common.IShearable
++public class BlockDoublePlant extends BlockBush implements IGrowable, IShearable
  {
-     public static final PropertyEnum<BlockDoublePlant.EnumPlantType> field_176493_a = PropertyEnum.<BlockDoublePlant.EnumPlantType>func_177709_a("variant", BlockDoublePlant.EnumPlantType.class);
-     public static final PropertyEnum<BlockDoublePlant.EnumBlockHalf> field_176492_b = PropertyEnum.<BlockDoublePlant.EnumBlockHalf>func_177709_a("half", BlockDoublePlant.EnumBlockHalf.class);
-@@ -90,6 +90,8 @@
-             Block block = (Block)(flag ? this : p_176475_1_.func_180495_p(blockpos).func_177230_c());
-             Block block1 = (Block)(flag ? p_176475_1_.func_180495_p(blockpos1).func_177230_c() : this);
+     public static final String[] field_149892_a = new String[] {"sunflower", "syringa", "grass", "fern", "rose", "paeonia"};
+     @SideOnly(Side.CLIENT)
+@@ -81,6 +83,7 @@
  
-+            if (!flag) this.func_176226_b(p_176475_1_, p_176475_2_, p_176475_3_, 0); //Forge move above the setting to air.
+     public boolean func_149718_j(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_)
+     {
++        if (p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_, p_149718_4_) != this) return super.func_149718_j(p_149718_1_, p_149718_2_, p_149718_3_, p_149718_4_); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check.
+         int l = p_149718_1_.func_72805_g(p_149718_2_, p_149718_3_, p_149718_4_);
+         return func_149887_c(l) ? p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_ - 1, p_149718_4_) == this : p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_ + 1, p_149718_4_) == this && super.func_149718_j(p_149718_1_, p_149718_2_, p_149718_3_, p_149718_4_);
+     }
+@@ -262,4 +265,22 @@
+         int l = this.func_149885_e(p_149853_1_, p_149853_3_, p_149853_4_, p_149853_5_);
+         this.func_149642_a(p_149853_1_, p_149853_3_, p_149853_4_, p_149853_5_, new ItemStack(this, 1, l));
+     }
 +
-             if (block == this)
-             {
-                 p_176475_1_.func_180501_a(blockpos, Blocks.field_150350_a.func_176223_P(), 2);
-@@ -98,17 +100,13 @@
-             if (block1 == this)
-             {
-                 p_176475_1_.func_180501_a(blockpos1, Blocks.field_150350_a.func_176223_P(), 3);
--
--                if (!flag)
--                {
--                    this.func_176226_b(p_176475_1_, blockpos1, p_176475_3_, 0);
--                }
-             }
-         }
-     }
- 
-     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
-     {
-+        if (p_180671_3_.func_177230_c() != this) return super.func_180671_f(p_180671_1_, p_180671_2_, p_180671_3_); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check.
-         if (p_180671_3_.func_177229_b(field_176492_b) == BlockDoublePlant.EnumBlockHalf.UPPER)
-         {
-             return p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()).func_177230_c() == this;
-@@ -158,7 +156,6 @@
- 
-     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, TileEntity p_180657_5_)
-     {
--        if (p_180657_1_.field_72995_K || p_180657_2_.func_71045_bC() == null || p_180657_2_.func_71045_bC().func_77973_b() != Items.field_151097_aZ || p_180657_4_.func_177229_b(field_176492_b) != BlockDoublePlant.EnumBlockHalf.LOWER || !this.func_176489_b(p_180657_1_, p_180657_3_, p_180657_4_, p_180657_2_))
-         {
-             super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_);
-         }
-@@ -221,8 +218,6 @@
-         else
-         {
-             p_176489_4_.func_71029_a(StatList.field_75934_C[Block.func_149682_b(this)]);
--            int i = (blockdoubleplant$enumplanttype == BlockDoublePlant.EnumPlantType.GRASS ? BlockTallGrass.EnumType.GRASS : BlockTallGrass.EnumType.FERN).func_177044_a();
--            func_180635_a(p_176489_1_, p_176489_2_, new ItemStack(Blocks.field_150329_H, 2, i));
-             return true;
-         }
-     }
-@@ -293,6 +288,32 @@
-         return Block.EnumOffsetType.XZ;
-     }
- 
 +    @Override
-+    public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos)
++    public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z)
 +    {
-+        IBlockState state = world.func_180495_p(pos);
-+        EnumPlantType type = (EnumPlantType)state.func_177229_b(field_176493_a);
-+        return state.func_177229_b(field_176492_b) == EnumBlockHalf.LOWER && (type == EnumPlantType.FERN || type == EnumPlantType.GRASS);
++        int metadata = world.func_72805_g(x, y, z);
++        int type = func_149890_d(metadata);
++        return func_149887_c(metadata) && (type == 3 || type == 4);
 +    }
++
 +    @Override
-+    public java.util.List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
++    public ArrayList<ItemStack> onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune)
 +    {
-+        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
-+        EnumPlantType type = (EnumPlantType)world.func_180495_p(pos).func_177229_b(field_176493_a);
-+        if (type == EnumPlantType.FERN) ret.add(new ItemStack(Blocks.field_150329_H, 2, BlockTallGrass.EnumType.FERN.func_177044_a()));
-+        if (type == EnumPlantType.GRASS) ret.add(new ItemStack(Blocks.field_150329_H, 2, BlockTallGrass.EnumType.GRASS.func_177044_a()));
++        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
++        int type = func_149890_d(world.func_72805_g(x, y, z));
++        if (type == 3 || type == 2)
++            ret.add(new ItemStack(Blocks.field_150329_H, 2, type == 3 ? 2 : 1));
 +        return ret;
 +    }
-+    @Override
-+    public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest)
-+    {
-+        //Forge: Break both parts on the client to prevent the top part flickering as default type for a few frames.
-+        IBlockState state = world.func_180495_p(pos);
-+        if (state.func_177230_c() ==  this && state.func_177229_b(field_176492_b) == EnumBlockHalf.LOWER && world.func_180495_p(pos.func_177984_a()).func_177230_c() == this)
-+            world.func_175698_g(pos.func_177984_a());
-+        return world.func_175698_g(pos);
-+    }
-+
-     public static enum EnumBlockHalf implements IStringSerializable
-     {
-         UPPER,
+ }

patches/minecraft/net/minecraft/block/BlockDropper.java.patch

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockDropper.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockDropper.java
-@@ -43,7 +43,7 @@
-             {
-                 ItemStack itemstack = tileentitydispenser.func_70301_a(i);
- 
--                if (itemstack != null)
-+                if (itemstack != null && net.minecraftforge.items.VanillaInventoryCodeHooks.dropperInsertHook(p_176439_1_, p_176439_2_, tileentitydispenser, i, itemstack))
-                 {
-                     EnumFacing enumfacing = (EnumFacing)p_176439_1_.func_180495_p(p_176439_2_).func_177229_b(field_176441_a);
-                     BlockPos blockpos = p_176439_2_.func_177972_a(enumfacing);

patches/minecraft/net/minecraft/block/BlockFalling.java.patch

@@ -1,10 +1,19 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockFalling.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockFalling.java
-@@ -86,6 +86,7 @@
- 
-     public static boolean func_180685_d(World p_180685_0_, BlockPos p_180685_1_)
+@@ -84,7 +84,7 @@
      {
-+        if (p_180685_0_.func_175623_d(p_180685_1_)) return true;
-         Block block = p_180685_0_.func_180495_p(p_180685_1_).func_177230_c();
-         Material material = block.field_149764_J;
-         return block == Blocks.field_150480_ab || material == Material.field_151579_a || material == Material.field_151586_h || material == Material.field_151587_i;
+         Block block = p_149831_0_.func_147439_a(p_149831_1_, p_149831_2_, p_149831_3_);
+ 
+-        if (block.field_149764_J == Material.field_151579_a)
++        if (block.isAir(p_149831_0_, p_149831_1_, p_149831_2_, p_149831_3_))
+         {
+             return true;
+         }
+@@ -94,6 +94,7 @@
+         }
+         else
+         {
++            //TODO: King, take a look here when doing liquids!
+             Material material = block.field_149764_J;
+             return material == Material.field_151586_h ? true : material == Material.field_151587_i;
+         }

patches/minecraft/net/minecraft/block/BlockFarmland.java.patch

@@ -1,11 +1,20 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockFarmland.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockFarmland.java
-@@ -89,7 +89,7 @@
-     private boolean func_176529_d(World p_176529_1_, BlockPos p_176529_2_)
-     {
-         Block block = p_176529_1_.func_180495_p(p_176529_2_.func_177984_a()).func_177230_c();
--        return block instanceof BlockCrops || block instanceof BlockStem;
-+        return block instanceof net.minecraftforge.common.IPlantable && canSustainPlant(p_176529_1_, p_176529_2_, net.minecraft.util.EnumFacing.UP, (net.minecraftforge.common.IPlantable)block);
-     }
+@@ -12,6 +12,8 @@
+ import net.minecraft.util.AxisAlignedBB;
+ import net.minecraft.util.IIcon;
+ import net.minecraft.world.World;
++import net.minecraftforge.common.IPlantable;
++import net.minecraftforge.common.util.ForgeDirection;
  
-     private boolean func_176530_e(World p_176530_1_, BlockPos p_176530_2_)
+ public class BlockFarmland extends Block
+ {
+@@ -94,7 +96,7 @@
+             {
+                 Block block = p_149822_1_.func_147439_a(l, p_149822_3_ + 1, i1);
+ 
+-                if (block == Blocks.field_150464_aj || block == Blocks.field_150394_bc || block == Blocks.field_150393_bb || block == Blocks.field_150469_bN || block == Blocks.field_150459_bM)
++                if (block instanceof IPlantable && canSustainPlant(p_149822_1_, p_149822_2_, p_149822_3_, p_149822_4_, ForgeDirection.UP, (IPlantable)block))
+                 {
+                     return true;
+                 }

patches/minecraft/net/minecraft/block/BlockFire.java.patch

@@ -1,211 +1,309 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockFire.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockFire.java
-@@ -41,18 +41,24 @@
-         int j = p_176221_3_.func_177956_o();
-         int k = p_176221_3_.func_177952_p();
+@@ -2,7 +2,10 @@
  
--        if (!World.func_175683_a(p_176221_2_, p_176221_3_.func_177977_b()) && !Blocks.field_150480_ab.func_176535_e(p_176221_2_, p_176221_3_.func_177977_b()))
-+        if (!World.func_175683_a(p_176221_2_, p_176221_3_.func_177977_b()) && !Blocks.field_150480_ab.canCatchFire(p_176221_2_, p_176221_3_.func_177977_b(), EnumFacing.UP))
-         {
-             boolean flag = (i + j + k & 1) == 1;
-             boolean flag1 = (i / 2 + j / 2 + k / 2 & 1) == 1;
-             int l = 0;
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
++import java.util.IdentityHashMap;
++import java.util.Map.Entry;
+ import java.util.Random;
++import com.google.common.collect.Maps;
+ import net.minecraft.block.material.MapColor;
+ import net.minecraft.block.material.Material;
+ import net.minecraft.client.renderer.texture.IIconRegister;
+@@ -12,11 +15,15 @@
+ import net.minecraft.world.IBlockAccess;
+ import net.minecraft.world.World;
+ import net.minecraft.world.WorldProviderEnd;
++import net.minecraftforge.common.util.ForgeDirection;
++import static net.minecraftforge.common.util.ForgeDirection.*;
  
--            if (this.func_176535_e(p_176221_2_, p_176221_3_.func_177984_a()))
-+            if (this.canCatchFire(p_176221_2_, p_176221_3_.func_177984_a(), EnumFacing.DOWN))
-             {
-                 l = flag ? 1 : 2;
-             }
- 
--            return p_176221_1_.func_177226_a(field_176545_N, Boolean.valueOf(this.func_176535_e(p_176221_2_, p_176221_3_.func_177978_c()))).func_177226_a(field_176546_O, Boolean.valueOf(this.func_176535_e(p_176221_2_, p_176221_3_.func_177974_f()))).func_177226_a(field_176541_P, Boolean.valueOf(this.func_176535_e(p_176221_2_, p_176221_3_.func_177968_d()))).func_177226_a(field_176539_Q, Boolean.valueOf(this.func_176535_e(p_176221_2_, p_176221_3_.func_177976_e()))).func_177226_a(field_176542_R, Integer.valueOf(l)).func_177226_a(field_176540_b, Boolean.valueOf(flag1)).func_177226_a(field_176544_M, Boolean.valueOf(flag));
-+            return p_176221_1_.func_177226_a(field_176545_N, Boolean.valueOf(this.canCatchFire(p_176221_2_, p_176221_3_.func_177978_c(), EnumFacing.SOUTH)))
-+                        .func_177226_a(field_176546_O, Boolean.valueOf(this.canCatchFire(p_176221_2_, p_176221_3_.func_177974_f(),  EnumFacing.EAST )))
-+                        .func_177226_a(field_176541_P, Boolean.valueOf(this.canCatchFire(p_176221_2_, p_176221_3_.func_177968_d(), EnumFacing.NORTH)))
-+                        .func_177226_a(field_176539_Q, Boolean.valueOf(this.canCatchFire(p_176221_2_, p_176221_3_.func_177976_e(),  EnumFacing.EAST )))
-+                        .func_177226_a(field_176542_R, Integer.valueOf(l))
-+                        .func_177226_a(field_176540_b, Boolean.valueOf(flag1))
-+                        .func_177226_a(field_176544_M, Boolean.valueOf(flag));
-         }
-         else
-         {
-@@ -108,6 +114,7 @@
- 
-     public void func_180686_a(Block p_180686_1_, int p_180686_2_, int p_180686_3_)
-     {
-+        if (p_180686_1_ == Blocks.field_150350_a) throw new IllegalArgumentException("Tried to set air on fire... This is bad.");
-         this.field_149849_a.put(p_180686_1_, Integer.valueOf(p_180686_2_));
-         this.field_149848_b.put(p_180686_1_, Integer.valueOf(p_180686_3_));
+ public class BlockFire extends Block
+ {
+-    private int[] field_149849_a = new int[256];
+-    private int[] field_149848_b = new int[256];
++    @Deprecated
++    private int[] field_149849_a = new int[4096];
++    @Deprecated
++    private int[] field_149848_b = new int[4096];
+     @SideOnly(Side.CLIENT)
+     private IIcon[] field_149850_M;
+     private static final String __OBFID = "CL_00000245";
+@@ -54,10 +61,10 @@
+         Blocks.field_150480_ab.func_149842_a(func_149682_b(Blocks.field_150404_cg), 60, 20);
      }
-@@ -147,13 +154,8 @@
-             }
  
-             Block block = p_180650_1_.func_180495_p(p_180650_2_.func_177977_b()).func_177230_c();
--            boolean flag = block == Blocks.field_150424_aL;
-+            boolean flag = block.isFireSource(p_180650_1_, p_180650_2_.func_177977_b(), EnumFacing.UP);
++    @Deprecated // Use setFireInfo
+     public void func_149842_a(int p_149842_1_, int p_149842_2_, int p_149842_3_)
+     {
+-        this.field_149849_a[p_149842_1_] = p_149842_2_;
+-        this.field_149848_b[p_149842_1_] = p_149842_3_;
++        this.setFireInfo((Block)Block.field_149771_c.func_148754_a(p_149842_1_), p_149842_2_, p_149842_3_);
+     }
  
--            if (p_180650_1_.field_73011_w instanceof WorldProviderEnd && block == Blocks.field_150357_h)
+     public AxisAlignedBB func_149668_a(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_)
+@@ -94,13 +101,8 @@
+     {
+         if (p_149674_1_.func_82736_K().func_82766_b("doFireTick"))
+         {
+-            boolean flag = p_149674_1_.func_147439_a(p_149674_2_, p_149674_3_ - 1, p_149674_4_) == Blocks.field_150424_aL;
++            boolean flag = p_149674_1_.func_147439_a(p_149674_2_, p_149674_3_ - 1, p_149674_4_).isFireSource(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_, UP);
+ 
+-            if (p_149674_1_.field_73011_w instanceof WorldProviderEnd && p_149674_1_.func_147439_a(p_149674_2_, p_149674_3_ - 1, p_149674_4_) == Blocks.field_150357_h)
 -            {
 -                flag = true;
 -            }
 -
-             if (!flag && p_180650_1_.func_72896_J() && this.func_176537_d(p_180650_1_, p_180650_2_))
+             if (!this.func_149742_c(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_))
              {
-                 p_180650_1_.func_175698_g(p_180650_2_);
-@@ -182,7 +184,7 @@
-                         return;
+                 p_149674_1_.func_147468_f(p_149674_2_, p_149674_3_, p_149674_4_);
+@@ -128,7 +130,7 @@
+                         p_149674_1_.func_147468_f(p_149674_2_, p_149674_3_, p_149674_4_);
+                     }
+                 }
+-                else if (!flag && !this.func_149844_e(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_) && l == 15 && p_149674_5_.nextInt(4) == 0)
++                else if (!flag && !this.canCatchFire(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_, UP) && l == 15 && p_149674_5_.nextInt(4) == 0)
+                 {
+                     p_149674_1_.func_147468_f(p_149674_2_, p_149674_3_, p_149674_4_);
+                 }
+@@ -142,12 +144,12 @@
+                         b0 = -50;
                      }
  
--                    if (!this.func_176535_e(p_180650_1_, p_180650_2_.func_177977_b()) && i == 15 && p_180650_4_.nextInt(4) == 0)
-+                    if (!this.canCatchFire(p_180650_1_, p_180650_2_.func_177977_b(), EnumFacing.UP) && i == 15 && p_180650_4_.nextInt(4) == 0)
+-                    this.func_149841_a(p_149674_1_, p_149674_2_ + 1, p_149674_3_, p_149674_4_, 300 + b0, p_149674_5_, l);
+-                    this.func_149841_a(p_149674_1_, p_149674_2_ - 1, p_149674_3_, p_149674_4_, 300 + b0, p_149674_5_, l);
+-                    this.func_149841_a(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_, 250 + b0, p_149674_5_, l);
+-                    this.func_149841_a(p_149674_1_, p_149674_2_, p_149674_3_ + 1, p_149674_4_, 250 + b0, p_149674_5_, l);
+-                    this.func_149841_a(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_ - 1, 300 + b0, p_149674_5_, l);
+-                    this.func_149841_a(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_ + 1, 300 + b0, p_149674_5_, l);
++                    this.tryCatchFire(p_149674_1_, p_149674_2_ + 1, p_149674_3_, p_149674_4_, 300 + b0, p_149674_5_, l, WEST );
++                    this.tryCatchFire(p_149674_1_, p_149674_2_ - 1, p_149674_3_, p_149674_4_, 300 + b0, p_149674_5_, l, EAST );
++                    this.tryCatchFire(p_149674_1_, p_149674_2_, p_149674_3_ - 1, p_149674_4_, 250 + b0, p_149674_5_, l, UP   );
++                    this.tryCatchFire(p_149674_1_, p_149674_2_, p_149674_3_ + 1, p_149674_4_, 250 + b0, p_149674_5_, l, DOWN );
++                    this.tryCatchFire(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_ - 1, 300 + b0, p_149674_5_, l, SOUTH);
++                    this.tryCatchFire(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_ + 1, 300 + b0, p_149674_5_, l, NORTH);
+ 
+                     for (int i1 = p_149674_2_ - 1; i1 <= p_149674_2_ + 1; ++i1)
                      {
-                         p_180650_1_.func_175698_g(p_180650_2_);
-                         return;
-@@ -197,12 +199,12 @@
-                     j = -50;
-                 }
- 
--                this.func_176536_a(p_180650_1_, p_180650_2_.func_177974_f(), 300 + j, p_180650_4_, i);
--                this.func_176536_a(p_180650_1_, p_180650_2_.func_177976_e(), 300 + j, p_180650_4_, i);
--                this.func_176536_a(p_180650_1_, p_180650_2_.func_177977_b(), 250 + j, p_180650_4_, i);
--                this.func_176536_a(p_180650_1_, p_180650_2_.func_177984_a(), 250 + j, p_180650_4_, i);
--                this.func_176536_a(p_180650_1_, p_180650_2_.func_177978_c(), 300 + j, p_180650_4_, i);
--                this.func_176536_a(p_180650_1_, p_180650_2_.func_177968_d(), 300 + j, p_180650_4_, i);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177974_f(), 300 + j, p_180650_4_, i, EnumFacing.WEST);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177976_e(), 300 + j, p_180650_4_, i, EnumFacing.EAST);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177977_b(), 250 + j, p_180650_4_, i, EnumFacing.UP);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177984_a(), 250 + j, p_180650_4_, i, EnumFacing.DOWN);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177978_c(), 300 + j, p_180650_4_, i, EnumFacing.SOUTH);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177968_d(), 300 + j, p_180650_4_, i, EnumFacing.NORTH);
- 
-                 for (int k = -1; k <= 1; ++k)
-                 {
-@@ -261,22 +263,30 @@
+@@ -201,10 +203,16 @@
          return false;
      }
  
-+    @Deprecated // Use Block.getFlammability
-     public int func_176532_c(Block p_176532_1_)
++    @Deprecated
+     private void func_149841_a(World p_149841_1_, int p_149841_2_, int p_149841_3_, int p_149841_4_, int p_149841_5_, Random p_149841_6_, int p_149841_7_)
      {
-         Integer integer = (Integer)this.field_149848_b.get(p_176532_1_);
-         return integer == null ? 0 : integer.intValue();
-     }
- 
-+    @Deprecated // Use Block.getFlammability
-     public int func_176534_d(Block p_176534_1_)
-     {
-         Integer integer = (Integer)this.field_149849_a.get(p_176534_1_);
-         return integer == null ? 0 : integer.intValue();
-     }
- 
-+    @Deprecated // Use tryCatchFire with face below
-     private void func_176536_a(World p_176536_1_, BlockPos p_176536_2_, int p_176536_3_, Random p_176536_4_, int p_176536_5_)
-     {
--        int i = this.func_176532_c(p_176536_1_.func_180495_p(p_176536_2_).func_177230_c());
-+        this.tryCatchFire(p_176536_1_, p_176536_2_, p_176536_3_, p_176536_4_, p_176536_5_, EnumFacing.UP);
+-        int j1 = this.field_149848_b[Block.func_149682_b(p_149841_1_.func_147439_a(p_149841_2_, p_149841_3_, p_149841_4_))];
++        this.tryCatchFire(p_149841_1_, p_149841_2_, p_149841_3_, p_149841_4_, p_149841_5_, p_149841_6_, p_149841_7_, UP);
 +    }
  
-+    private void tryCatchFire(World p_176536_1_, BlockPos p_176536_2_, int p_176536_3_, Random p_176536_4_, int p_176536_5_, EnumFacing face)
++    private void tryCatchFire(World p_149841_1_, int p_149841_2_, int p_149841_3_, int p_149841_4_, int p_149841_5_, Random p_149841_6_, int p_149841_7_, ForgeDirection face)
 +    {
-+        int i = p_176536_1_.func_180495_p(p_176536_2_).func_177230_c().getFlammability(p_176536_1_, p_176536_2_, face);
++        int j1 = p_149841_1_.func_147439_a(p_149841_2_, p_149841_3_, p_149841_4_).getFlammability(p_149841_1_, p_149841_2_, p_149841_3_, p_149841_4_, face);
 +
-         if (p_176536_4_.nextInt(p_176536_3_) < i)
+         if (p_149841_6_.nextInt(p_149841_5_) < j1)
          {
-             IBlockState iblockstate = p_176536_1_.func_180495_p(p_176536_2_);
-@@ -308,7 +318,7 @@
+             boolean flag = p_149841_1_.func_147439_a(p_149841_2_, p_149841_3_, p_149841_4_) == Blocks.field_150335_W;
+@@ -234,7 +242,12 @@
+ 
+     private boolean func_149847_e(World p_149847_1_, int p_149847_2_, int p_149847_3_, int p_149847_4_)
      {
-         for (EnumFacing enumfacing : EnumFacing.values())
+-        return this.func_149844_e(p_149847_1_, p_149847_2_ + 1, p_149847_3_, p_149847_4_) ? true : (this.func_149844_e(p_149847_1_, p_149847_2_ - 1, p_149847_3_, p_149847_4_) ? true : (this.func_149844_e(p_149847_1_, p_149847_2_, p_149847_3_ - 1, p_149847_4_) ? true : (this.func_149844_e(p_149847_1_, p_149847_2_, p_149847_3_ + 1, p_149847_4_) ? true : (this.func_149844_e(p_149847_1_, p_149847_2_, p_149847_3_, p_149847_4_ - 1) ? true : this.func_149844_e(p_149847_1_, p_149847_2_, p_149847_3_, p_149847_4_ + 1)))));
++        return this.canCatchFire(p_149847_1_, p_149847_2_ + 1, p_149847_3_, p_149847_4_, WEST ) ||
++               this.canCatchFire(p_149847_1_, p_149847_2_ - 1, p_149847_3_, p_149847_4_, EAST ) ||
++               this.canCatchFire(p_149847_1_, p_149847_2_, p_149847_3_ - 1, p_149847_4_, UP   ) ||
++               this.canCatchFire(p_149847_1_, p_149847_2_, p_149847_3_ + 1, p_149847_4_, DOWN ) ||
++               this.canCatchFire(p_149847_1_, p_149847_2_, p_149847_3_, p_149847_4_ - 1, SOUTH) ||
++               this.canCatchFire(p_149847_1_, p_149847_2_, p_149847_3_, p_149847_4_ + 1, NORTH);
+     }
+ 
+     private int func_149845_m(World p_149845_1_, int p_149845_2_, int p_149845_3_, int p_149845_4_)
+@@ -247,12 +260,13 @@
+         }
+         else
          {
--            if (this.func_176535_e(p_176533_1_, p_176533_2_.func_177972_a(enumfacing)))
-+            if (this.canCatchFire(p_176533_1_, p_176533_2_.func_177972_a(enumfacing), enumfacing.func_176734_d()))
-             {
-                 return true;
-             }
-@@ -329,7 +339,7 @@
- 
-             for (EnumFacing enumfacing : EnumFacing.values())
-             {
--                i = Math.max(this.func_176534_d(p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(enumfacing)).func_177230_c()), i);
-+                i = Math.max(p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(enumfacing)).func_177230_c().getFlammability(p_176538_1_, p_176538_2_.func_177972_a(enumfacing), enumfacing.func_176734_d()), i);
-             }
- 
-             return i;
-@@ -341,9 +351,10 @@
+-            int l = this.func_149846_a(p_149845_1_, p_149845_2_ + 1, p_149845_3_, p_149845_4_, b0);
+-            l = this.func_149846_a(p_149845_1_, p_149845_2_ - 1, p_149845_3_, p_149845_4_, l);
+-            l = this.func_149846_a(p_149845_1_, p_149845_2_, p_149845_3_ - 1, p_149845_4_, l);
+-            l = this.func_149846_a(p_149845_1_, p_149845_2_, p_149845_3_ + 1, p_149845_4_, l);
+-            l = this.func_149846_a(p_149845_1_, p_149845_2_, p_149845_3_, p_149845_4_ - 1, l);
+-            l = this.func_149846_a(p_149845_1_, p_149845_2_, p_149845_3_, p_149845_4_ + 1, l);
++            int l = b0;
++            l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_ + 1, p_149845_3_, p_149845_4_, l, WEST );
++            l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_ - 1, p_149845_3_, p_149845_4_, l, EAST );
++            l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_, p_149845_3_ - 1, p_149845_4_, l, UP   );
++            l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_, p_149845_3_ + 1, p_149845_4_, l, DOWN );
++            l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_, p_149845_3_, p_149845_4_ - 1, l, SOUTH);
++            l = this.getChanceToEncourageFire(p_149845_1_, p_149845_2_, p_149845_3_, p_149845_4_ + 1, l, NORTH);
+             return l;
+         }
+     }
+@@ -262,15 +276,16 @@
          return false;
      }
  
-+    @Deprecated // Use canCatchFire with face sensitive version below
-     public boolean func_176535_e(IBlockAccess p_176535_1_, BlockPos p_176535_2_)
++    @Deprecated
+     public boolean func_149844_e(IBlockAccess p_149844_1_, int p_149844_2_, int p_149844_3_, int p_149844_4_)
      {
--        return this.func_176534_d(p_176535_1_.func_180495_p(p_176535_2_).func_177230_c()) > 0;
-+        return canCatchFire(p_176535_1_, p_176535_2_, EnumFacing.UP);
+-        return this.field_149849_a[Block.func_149682_b(p_149844_1_.func_147439_a(p_149844_2_, p_149844_3_, p_149844_4_))] > 0;
++        return canCatchFire(p_149844_1_, p_149844_2_, p_149844_3_, p_149844_4_, UP);
      }
  
-     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-@@ -382,9 +393,9 @@
-             p_180655_1_.func_72980_b((double)((float)p_180655_2_.func_177958_n() + 0.5F), (double)((float)p_180655_2_.func_177956_o() + 0.5F), (double)((float)p_180655_2_.func_177952_p() + 0.5F), "fire.fire", 1.0F + p_180655_4_.nextFloat(), p_180655_4_.nextFloat() * 0.7F + 0.3F, false);
-         }
- 
--        if (!World.func_175683_a(p_180655_1_, p_180655_2_.func_177977_b()) && !Blocks.field_150480_ab.func_176535_e(p_180655_1_, p_180655_2_.func_177977_b()))
-+        if (!World.func_175683_a(p_180655_1_, p_180655_2_.func_177977_b()) && !Blocks.field_150480_ab.canCatchFire(p_180655_1_, p_180655_2_.func_177977_b(), EnumFacing.UP))
-         {
--            if (Blocks.field_150480_ab.func_176535_e(p_180655_1_, p_180655_2_.func_177976_e()))
-+            if (Blocks.field_150480_ab.canCatchFire(p_180655_1_, p_180655_2_.func_177976_e(), EnumFacing.EAST))
-             {
-                 for (int j = 0; j < 2; ++j)
-                 {
-@@ -395,7 +406,7 @@
-                 }
-             }
- 
--            if (Blocks.field_150480_ab.func_176535_e(p_180655_1_, p_180655_2_.func_177974_f()))
-+            if (Blocks.field_150480_ab.canCatchFire(p_180655_1_, p_180655_2_.func_177974_f(), EnumFacing.WEST))
-             {
-                 for (int k = 0; k < 2; ++k)
-                 {
-@@ -406,7 +417,7 @@
-                 }
-             }
- 
--            if (Blocks.field_150480_ab.func_176535_e(p_180655_1_, p_180655_2_.func_177978_c()))
-+            if (Blocks.field_150480_ab.canCatchFire(p_180655_1_, p_180655_2_.func_177978_c(), EnumFacing.SOUTH))
-             {
-                 for (int l = 0; l < 2; ++l)
-                 {
-@@ -417,7 +428,7 @@
-                 }
-             }
- 
--            if (Blocks.field_150480_ab.func_176535_e(p_180655_1_, p_180655_2_.func_177968_d()))
-+            if (Blocks.field_150480_ab.canCatchFire(p_180655_1_, p_180655_2_.func_177968_d(), EnumFacing.NORTH))
-             {
-                 for (int i1 = 0; i1 < 2; ++i1)
-                 {
-@@ -428,7 +439,7 @@
-                 }
-             }
- 
--            if (Blocks.field_150480_ab.func_176535_e(p_180655_1_, p_180655_2_.func_177984_a()))
-+            if (Blocks.field_150480_ab.canCatchFire(p_180655_1_, p_180655_2_.func_177984_a(), EnumFacing.DOWN))
-             {
-                 for (int j1 = 0; j1 < 2; ++j1)
-                 {
-@@ -476,4 +487,19 @@
++    @Deprecated
+     public int func_149846_a(World p_149846_1_, int p_149846_2_, int p_149846_3_, int p_149846_4_, int p_149846_5_)
      {
-         return new BlockState(this, new IProperty[] {field_176543_a, field_176545_N, field_176546_O, field_176541_P, field_176539_Q, field_176542_R, field_176540_b, field_176544_M});
+-        int i1 = this.field_149849_a[Block.func_149682_b(p_149846_1_.func_147439_a(p_149846_2_, p_149846_3_, p_149846_4_))];
+-        return i1 > p_149846_5_ ? i1 : p_149846_5_;
++        return getChanceToEncourageFire(p_149846_1_, p_149846_2_, p_149846_3_, p_149846_4_, p_149846_5_, UP);
+     }
+ 
+     public boolean func_149742_c(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
+@@ -314,9 +329,9 @@
+         float f1;
+         float f2;
+ 
+-        if (!World.func_147466_a(p_149734_1_, p_149734_2_, p_149734_3_ - 1, p_149734_4_) && !Blocks.field_150480_ab.func_149844_e(p_149734_1_, p_149734_2_, p_149734_3_ - 1, p_149734_4_))
++        if (!World.func_147466_a(p_149734_1_, p_149734_2_, p_149734_3_ - 1, p_149734_4_) && !Blocks.field_150480_ab.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_ - 1, p_149734_4_, UP))
+         {
+-            if (Blocks.field_150480_ab.func_149844_e(p_149734_1_, p_149734_2_ - 1, p_149734_3_, p_149734_4_))
++            if (Blocks.field_150480_ab.canCatchFire(p_149734_1_, p_149734_2_ - 1, p_149734_3_, p_149734_4_, EAST))
+             {
+                 for (l = 0; l < 2; ++l)
+                 {
+@@ -327,7 +342,7 @@
+                 }
+             }
+ 
+-            if (Blocks.field_150480_ab.func_149844_e(p_149734_1_, p_149734_2_ + 1, p_149734_3_, p_149734_4_))
++            if (Blocks.field_150480_ab.canCatchFire(p_149734_1_, p_149734_2_ + 1, p_149734_3_, p_149734_4_, WEST))
+             {
+                 for (l = 0; l < 2; ++l)
+                 {
+@@ -338,7 +353,7 @@
+                 }
+             }
+ 
+-            if (Blocks.field_150480_ab.func_149844_e(p_149734_1_, p_149734_2_, p_149734_3_, p_149734_4_ - 1))
++            if (Blocks.field_150480_ab.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_, p_149734_4_ - 1, SOUTH))
+             {
+                 for (l = 0; l < 2; ++l)
+                 {
+@@ -349,7 +364,7 @@
+                 }
+             }
+ 
+-            if (Blocks.field_150480_ab.func_149844_e(p_149734_1_, p_149734_2_, p_149734_3_, p_149734_4_ + 1))
++            if (Blocks.field_150480_ab.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_, p_149734_4_ + 1, NORTH))
+             {
+                 for (l = 0; l < 2; ++l)
+                 {
+@@ -360,7 +375,7 @@
+                 }
+             }
+ 
+-            if (Blocks.field_150480_ab.func_149844_e(p_149734_1_, p_149734_2_, p_149734_3_ + 1, p_149734_4_))
++            if (Blocks.field_150480_ab.canCatchFire(p_149734_1_, p_149734_2_, p_149734_3_ + 1, p_149734_4_, DOWN))
+             {
+                 for (l = 0; l < 2; ++l)
+                 {
+@@ -405,4 +420,101 @@
+     {
+         return MapColor.field_151656_f;
      }
 +
 +    /*================================= Forge Start ======================================*/
++    private static class FireInfo
++    {
++        private int encouragement = 0;
++        private int flammibility = 0;
++    }
++    private IdentityHashMap<Block, FireInfo> blockInfo = Maps.newIdentityHashMap();
++
++    public void setFireInfo(Block block, int encouragement, int flammibility)
++    {
++        if (block == Blocks.field_150350_a) throw new IllegalArgumentException("Tried to set air on fire... This is bad.");
++        int id = Block.func_149682_b(block);
++        this.field_149849_a[id] = encouragement;
++        this.field_149848_b[id] = flammibility;
++
++        FireInfo info = getInfo(block, true);
++        info.encouragement = encouragement;
++        info.flammibility = flammibility;
++    }
++
++    private FireInfo getInfo(Block block, boolean garentee)
++    {
++        FireInfo ret = blockInfo.get(block);
++        if (ret == null && garentee)
++        {
++            ret = new FireInfo();
++            blockInfo.put(block, ret);
++        }
++        return ret;
++    }
++
++    public void rebuildFireInfo()
++    {
++        for (int x = 0; x < 4096; x++)
++        {
++            //If we care.. we could detect changes in here and make sure we keep them, however 
++            //it's my thinking that anyone who hacks into the private variables should DIAF and we don't care about them.
++            field_149849_a[x] = 0;
++            field_149848_b[x] = 0;
++        }
++
++        for (Entry<Block, FireInfo> e : blockInfo.entrySet())
++        {
++            int id = Block.func_149682_b(e.getKey());
++            if (id >= 0 && id < 4096)
++            {
++                field_149849_a[id] = e.getValue().encouragement;
++                field_149848_b[id] = e.getValue().flammibility;
++            }
++        }
++    }
++
++    public int getFlammability(Block block)
++    {
++        int id = Block.func_149682_b(block);
++        return id >= 0 && id < 4096 ? field_149848_b[id] : 0;
++    }
++
++    public int getEncouragement(Block block)
++    {
++        int id = Block.func_149682_b(block);
++        return id >= 0 && id < 4096 ? field_149849_a[id] : 0;
++    }
++
 +    /**
 +     * Side sensitive version that calls the block function.
-+     *
++     * 
 +     * @param world The current world
-+     * @param pos Block position
++     * @param x X Position
++     * @param y Y Position
++     * @param z Z Position
 +     * @param face The side the fire is coming from
 +     * @return True if the face can catch fire.
 +     */
-+    public boolean canCatchFire(IBlockAccess world, BlockPos pos, EnumFacing face)
++    public boolean canCatchFire(IBlockAccess world, int x, int y, int z, ForgeDirection face)
 +    {
-+        return world.func_180495_p(pos).func_177230_c().isFlammable(world, pos, face);
++        return world.func_147439_a(x, y, z).isFlammable(world, x, y, z, face);
++    }
++
++    /**
++     * Side sensitive version that calls the block function.
++     * 
++     * @param world The current world
++     * @param x X Position
++     * @param y Y Position
++     * @param z Z Position
++     * @param oldChance The previous maximum chance.
++     * @param face The side the fire is coming from
++     * @return The chance of the block catching fire, or oldChance if it is higher
++     */
++    public int getChanceToEncourageFire(IBlockAccess world, int x, int y, int z, int oldChance, ForgeDirection face)
++    {
++        int newChance = world.func_147439_a(x, y, z).getFireSpreadSpeed(world, x, y, z, face);
++        return (newChance > oldChance ? newChance : oldChance);
 +    }
 +    /*================================= Forge Start ======================================*/
  }

patches/minecraft/net/minecraft/block/BlockFlowerPot.java.patch

@@ -1,48 +1,38 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockFlowerPot.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockFlowerPot.java
-@@ -169,13 +169,6 @@
+@@ -2,6 +2,7 @@
  
-     public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
++import java.util.ArrayList;
+ import java.util.Random;
+ import net.minecraft.block.material.Material;
+ import net.minecraft.entity.player.EntityPlayer;
+@@ -139,12 +140,6 @@
+     public void func_149690_a(World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_, int p_149690_5_, float p_149690_6_, int p_149690_7_)
      {
--        TileEntityFlowerPot tileentityflowerpot = this.func_176442_d(p_180663_1_, p_180663_2_);
+         super.func_149690_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, p_149690_7_);
+-        TileEntityFlowerPot tileentityflowerpot = this.func_149929_e(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_);
 -
 -        if (tileentityflowerpot != null && tileentityflowerpot.func_145965_a() != null)
 -        {
--            func_180635_a(p_180663_1_, p_180663_2_, new ItemStack(tileentityflowerpot.func_145965_a(), 1, tileentityflowerpot.func_145966_b()));
+-            this.func_149642_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, new ItemStack(tileentityflowerpot.func_145965_a(), 1, tileentityflowerpot.func_145966_b()));
 -        }
--
-         super.func_180663_b(p_180663_1_, p_180663_2_, p_180663_3_);
      }
  
-@@ -395,6 +388,31 @@
-         return EnumWorldBlockLayer.CUTOUT;
-     }
+     public void func_149749_a(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_)
+@@ -242,4 +237,14 @@
  
+         return new TileEntityFlowerPot(Item.func_150898_a((Block)object), b0);
+     }
 +
-+    /*============================FORGE START=====================================*/
 +    @Override
-+    public java.util.List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
++    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
 +    {
-+        java.util.List<ItemStack> ret = super.getDrops(world, pos, state, fortune);
-+        TileEntityFlowerPot te = world.func_175625_s(pos) instanceof TileEntityFlowerPot ? (TileEntityFlowerPot)world.func_175625_s(pos) : null;
++        ArrayList<ItemStack> ret = super.getDrops(world, x, y, z, metadata, fortune);
++        TileEntityFlowerPot te = this.func_149929_e(world, x, y, z);
 +        if (te != null && te.func_145965_a() != null)
 +            ret.add(new ItemStack(te.func_145965_a(), 1, te.func_145966_b()));
 +        return ret;
 +    }
-+    @Override
-+    public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest)
-+    {
-+        if (willHarvest) return true; //If it will harvest, delay deletion of the block until after getDrops
-+        return super.removedByPlayer(world, pos, player, willHarvest);
-+    }
-+    @Override
-+    public void func_180657_a(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te)
-+    {
-+        super.func_180657_a(world, player, pos, state, te);
-+        world.func_175698_g(pos);
-+    }
-+    /*===========================FORGE END==========================================*/
-+
-     public static enum EnumFlowerType implements IStringSerializable
-     {
-         EMPTY("empty"),
+ }

patches/minecraft/net/minecraft/block/BlockGrass.java.patch

@@ -1,29 +1,37 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockGrass.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockGrass.java
-@@ -58,7 +58,7 @@
+@@ -43,7 +43,7 @@
      {
-         if (!p_180650_1_.field_72995_K)
+         if (!p_149674_1_.field_72995_K)
          {
--            if (p_180650_1_.func_175671_l(p_180650_2_.func_177984_a()) < 4 && p_180650_1_.func_180495_p(p_180650_2_.func_177984_a()).func_177230_c().func_149717_k() > 2)
-+            if (p_180650_1_.func_175671_l(p_180650_2_.func_177984_a()) < 4 && p_180650_1_.func_180495_p(p_180650_2_.func_177984_a()).func_177230_c().getLightOpacity(p_180650_1_, p_180650_2_.func_177984_a()) > 2)
+-            if (p_149674_1_.func_72957_l(p_149674_2_, p_149674_3_ + 1, p_149674_4_) < 4 && p_149674_1_.func_147439_a(p_149674_2_, p_149674_3_ + 1, p_149674_4_).func_149717_k() > 2)
++            if (p_149674_1_.func_72957_l(p_149674_2_, p_149674_3_ + 1, p_149674_4_) < 4 && p_149674_1_.getBlockLightOpacity(p_149674_2_, p_149674_3_ + 1, p_149674_4_) > 2)
              {
-                 p_180650_1_.func_175656_a(p_180650_2_, Blocks.field_150346_d.func_176223_P());
+                 p_149674_1_.func_147449_b(p_149674_2_, p_149674_3_, p_149674_4_, Blocks.field_150346_d);
              }
-@@ -72,7 +72,7 @@
-                         Block block = p_180650_1_.func_180495_p(blockpos.func_177984_a()).func_177230_c();
-                         IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos);
+@@ -56,7 +56,7 @@
+                     int k1 = p_149674_4_ + p_149674_5_.nextInt(3) - 1;
+                     Block block = p_149674_1_.func_147439_a(i1, j1 + 1, k1);
  
--                        if (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos.func_177984_a()) >= 4 && block.func_149717_k() <= 2)
-+                        if (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos.func_177984_a()) >= 4 && block.getLightOpacity(p_180650_1_, blockpos.func_177984_a()) <= 2)
-                         {
-                             p_180650_1_.func_175656_a(blockpos, Blocks.field_150349_c.func_176223_P());
-                         }
-@@ -110,7 +110,7 @@
-             {
-                 if (j >= i / 16)
-                 {
--                    if (p_176474_1_.func_180495_p(blockpos1).func_177230_c().field_149764_J == Material.field_151579_a)
-+                    if (p_176474_1_.func_175623_d(blockpos1))
+-                    if (p_149674_1_.func_147439_a(i1, j1, k1) == Blocks.field_150346_d && p_149674_1_.func_72805_g(i1, j1, k1) == 0 && p_149674_1_.func_72957_l(i1, j1 + 1, k1) >= 4 && block.func_149717_k() <= 2)
++                    if (p_149674_1_.func_147439_a(i1, j1, k1) == Blocks.field_150346_d && p_149674_1_.func_72805_g(i1, j1, k1) == 0 && p_149674_1_.func_72957_l(i1, j1 + 1, k1) >= 4 && p_149674_1_.getBlockLightOpacity(i1, j1 + 1, k1) <= 2)
                      {
-                         if (p_176474_2_.nextInt(8) == 0)
-                         {
+                         p_149674_1_.func_147449_b(i1, j1, k1, Blocks.field_150349_c);
+                     }
+@@ -184,15 +184,7 @@
+                     }
+                     else
+                     {
+-                        String s = p_149853_1_.func_72807_a(i1, k1).func_150572_a(p_149853_2_, i1, j1, k1);
+-                        field_149992_a.debug("Flower in " + p_149853_1_.func_72807_a(i1, k1).field_76791_y + ": " + s);
+-                        BlockFlower blockflower = BlockFlower.func_149857_e(s);
+-
+-                        if (blockflower != null && blockflower.func_149718_j(p_149853_1_, i1, j1, k1))
+-                        {
+-                            int i2 = BlockFlower.func_149856_f(s);
+-                            p_149853_1_.func_147465_d(i1, j1, k1, blockflower, i2, 3);
+-                        }
++                        p_149853_1_.func_72807_a(i1, k1).plantFlower(p_149853_1_, p_149853_2_, i1, j1, k1);
+                     }
+                 }
+ 

patches/minecraft/net/minecraft/block/BlockHugeMushroom.java.patch

@@ -1,23 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockHugeMushroom.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockHugeMushroom.java
-@@ -79,6 +79,20 @@
-         return new BlockState(this, new IProperty[] {field_176380_a});
-     }
- 
-+    public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
-+    {
-+        IBlockState state = world.func_180495_p(pos);
-+        for (IProperty prop : (java.util.Set<IProperty>)state.func_177228_b().keySet())
-+        {
-+            if (prop.func_177701_a().equals("variant"))
-+            {
-+                world.func_175656_a(pos, state.func_177231_a(prop));
-+                return true;
-+            }
-+        }
-+        return false;
-+    }
-+
-     public static enum EnumType implements IStringSerializable
-     {
-         NORTH_WEST(1, "north_west"),

patches/minecraft/net/minecraft/block/BlockIce.java.patch

@@ -1,35 +1,50 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockIce.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockIce.java
-@@ -38,14 +38,17 @@
-         p_180657_2_.func_71029_a(StatList.field_75934_C[Block.func_149682_b(this)]);
-         p_180657_2_.func_71020_j(0.025F);
+@@ -2,6 +2,7 @@
  
--        if (this.func_149700_E() && EnchantmentHelper.func_77502_d(p_180657_2_))
-+        if (this.canSilkHarvest(p_180657_1_, p_180657_3_, p_180657_1_.func_180495_p(p_180657_3_), p_180657_2_) && EnchantmentHelper.func_77502_d(p_180657_2_))
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
++import java.util.ArrayList;
+ import java.util.Random;
+ import net.minecraft.block.material.Material;
+ import net.minecraft.creativetab.CreativeTabs;
+@@ -13,6 +14,7 @@
+ import net.minecraft.world.EnumSkyBlock;
+ import net.minecraft.world.IBlockAccess;
+ import net.minecraft.world.World;
++import net.minecraftforge.event.ForgeEventFactory;
+ 
+ public class BlockIce extends BlockBreakable
+ {
+@@ -43,14 +45,16 @@
+         p_149636_2_.func_71064_a(StatList.field_75934_C[Block.func_149682_b(this)], 1);
+         p_149636_2_.func_71020_j(0.025F);
+ 
+-        if (this.func_149700_E() && EnchantmentHelper.func_77502_d(p_149636_2_))
++        if (this.canSilkHarvest(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_) && EnchantmentHelper.func_77502_d(p_149636_2_))
          {
-+            java.util.List<ItemStack> items = new java.util.ArrayList<ItemStack>();
-             ItemStack itemstack = this.func_180643_i(p_180657_4_);
++            ArrayList<ItemStack> items = new ArrayList<ItemStack>();
+             ItemStack itemstack = this.func_149644_j(p_149636_6_);
  
 -            if (itemstack != null)
 -            {
--                func_180635_a(p_180657_1_, p_180657_3_, itemstack);
+-                this.func_149642_a(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, itemstack);
 -            }
 +            if (itemstack != null) items.add(itemstack);
 +
-+            net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, p_180657_1_, p_180657_3_, p_180657_1_.func_180495_p(p_180657_3_), 0, 1.0f, true, p_180657_2_);
-+
++            ForgeEventFactory.fireBlockHarvesting(items, p_149636_1_, this, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_, 0, 1.0f, true, p_149636_2_);
 +            for (ItemStack is : items)
-+                func_180635_a(p_180657_1_, p_180657_3_, is);
++                this.func_149642_a(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, is);
          }
          else
          {
-@@ -56,7 +59,9 @@
+@@ -61,7 +65,9 @@
              }
  
-             int i = EnchantmentHelper.func_77517_e(p_180657_2_);
-+            harvesters.set(p_180657_2_);
-             this.func_176226_b(p_180657_1_, p_180657_3_, p_180657_4_, i);
+             int i1 = EnchantmentHelper.func_77517_e(p_149636_2_);
++            harvesters.set(p_149636_2_);
+             this.func_149697_b(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_, i1);
 +            harvesters.set(null);
-             Material material = p_180657_1_.func_180495_p(p_180657_3_.func_177977_b()).func_177230_c().func_149688_o();
+             Material material = p_149636_1_.func_147439_a(p_149636_3_, p_149636_4_ - 1, p_149636_5_).func_149688_o();
  
              if (material.func_76230_c() || material.func_76224_d())

patches/minecraft/net/minecraft/block/BlockLadder.java.patch

@@ -1,30 +1,93 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockLadder.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockLadder.java
-@@ -78,7 +78,10 @@
+@@ -5,10 +5,14 @@
+ import java.util.Random;
+ import net.minecraft.block.material.Material;
+ import net.minecraft.creativetab.CreativeTabs;
++import net.minecraft.entity.EntityLivingBase;
+ import net.minecraft.util.AxisAlignedBB;
+ import net.minecraft.world.IBlockAccess;
+ import net.minecraft.world.World;
  
-     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
++import net.minecraftforge.common.util.ForgeDirection;
++import static net.minecraftforge.common.util.ForgeDirection.*;
++
+ public class BlockLadder extends Block
+ {
+     private static final String __OBFID = "CL_00000262";
+@@ -79,29 +83,32 @@
+ 
+     public boolean func_149742_c(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
      {
--        return p_176196_1_.func_180495_p(p_176196_2_.func_177976_e()).func_177230_c().func_149721_r() ? true : (p_176196_1_.func_180495_p(p_176196_2_.func_177974_f()).func_177230_c().func_149721_r() ? true : (p_176196_1_.func_180495_p(p_176196_2_.func_177978_c()).func_177230_c().func_149721_r() ? true : p_176196_1_.func_180495_p(p_176196_2_.func_177968_d()).func_177230_c().func_149721_r()));
-+        return p_176196_1_.isSideSolid(p_176196_2_.func_177976_e(), EnumFacing.EAST, true) ||
-+               p_176196_1_.isSideSolid(p_176196_2_.func_177974_f(), EnumFacing.WEST, true) ||
-+               p_176196_1_.isSideSolid(p_176196_2_.func_177978_c(), EnumFacing.SOUTH, true) ||
-+               p_176196_1_.isSideSolid(p_176196_2_.func_177968_d(), EnumFacing.NORTH, true);
+-        return p_149742_1_.func_147439_a(p_149742_2_ - 1, p_149742_3_, p_149742_4_).func_149721_r() ? true : (p_149742_1_.func_147439_a(p_149742_2_ + 1, p_149742_3_, p_149742_4_).func_149721_r() ? true : (p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_, p_149742_4_ - 1).func_149721_r() ? true : p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_, p_149742_4_ + 1).func_149721_r()));
++        return p_149742_1_.isSideSolid(p_149742_2_ - 1, p_149742_3_, p_149742_4_, EAST ) ||
++               p_149742_1_.isSideSolid(p_149742_2_ + 1, p_149742_3_, p_149742_4_, WEST ) ||
++               p_149742_1_.isSideSolid(p_149742_2_, p_149742_3_, p_149742_4_ - 1, SOUTH) ||
++               p_149742_1_.isSideSolid(p_149742_2_, p_149742_3_, p_149742_4_ + 1, NORTH);
      }
  
-     public IBlockState func_180642_a(World p_180642_1_, BlockPos p_180642_2_, EnumFacing p_180642_3_, float p_180642_4_, float p_180642_5_, float p_180642_6_, int p_180642_7_, EntityLivingBase p_180642_8_)
-@@ -116,7 +119,7 @@
- 
-     protected boolean func_176381_b(World p_176381_1_, BlockPos p_176381_2_, EnumFacing p_176381_3_)
+     public int func_149660_a(World p_149660_1_, int p_149660_2_, int p_149660_3_, int p_149660_4_, int p_149660_5_, float p_149660_6_, float p_149660_7_, float p_149660_8_, int p_149660_9_)
      {
--        return p_176381_1_.func_180495_p(p_176381_2_.func_177972_a(p_176381_3_.func_176734_d())).func_177230_c().func_149721_r();
-+        return p_176381_1_.isSideSolid(p_176381_2_.func_177972_a(p_176381_3_.func_176734_d()), p_176381_3_, true);
-     }
+         int j1 = p_149660_9_;
  
-     public IBlockState func_176203_a(int p_176203_1_)
-@@ -146,4 +149,6 @@
+-        if ((p_149660_9_ == 0 || p_149660_5_ == 2) && p_149660_1_.func_147439_a(p_149660_2_, p_149660_3_, p_149660_4_ + 1).func_149721_r())
++        if ((p_149660_9_ == 0 || p_149660_5_ == 2) && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ + 1, NORTH))
+         {
+             j1 = 2;
+         }
+ 
+-        if ((j1 == 0 || p_149660_5_ == 3) && p_149660_1_.func_147439_a(p_149660_2_, p_149660_3_, p_149660_4_ - 1).func_149721_r())
++        if ((j1 == 0 || p_149660_5_ == 3) && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ - 1, SOUTH))
+         {
+             j1 = 3;
+         }
+ 
+-        if ((j1 == 0 || p_149660_5_ == 4) && p_149660_1_.func_147439_a(p_149660_2_ + 1, p_149660_3_, p_149660_4_).func_149721_r())
++        if ((j1 == 0 || p_149660_5_ == 4) && p_149660_1_.isSideSolid(p_149660_2_ + 1, p_149660_3_, p_149660_4_, WEST))
+         {
+             j1 = 4;
+         }
+ 
+-        if ((j1 == 0 || p_149660_5_ == 5) && p_149660_1_.func_147439_a(p_149660_2_ - 1, p_149660_3_, p_149660_4_).func_149721_r())
++        if ((j1 == 0 || p_149660_5_ == 5) && p_149660_1_.isSideSolid(p_149660_2_ - 1, p_149660_3_, p_149660_4_, EAST))
+         {
+             j1 = 5;
+         }
+@@ -114,22 +121,22 @@
+         int l = p_149695_1_.func_72805_g(p_149695_2_, p_149695_3_, p_149695_4_);
+         boolean flag = false;
+ 
+-        if (l == 2 && p_149695_1_.func_147439_a(p_149695_2_, p_149695_3_, p_149695_4_ + 1).func_149721_r())
++        if (l == 2 && p_149695_1_.isSideSolid(p_149695_2_, p_149695_3_, p_149695_4_ + 1, NORTH))
+         {
+             flag = true;
+         }
+ 
+-        if (l == 3 && p_149695_1_.func_147439_a(p_149695_2_, p_149695_3_, p_149695_4_ - 1).func_149721_r())
++        if (l == 3 && p_149695_1_.isSideSolid(p_149695_2_, p_149695_3_, p_149695_4_ - 1, SOUTH))
+         {
+             flag = true;
+         }
+ 
+-        if (l == 4 && p_149695_1_.func_147439_a(p_149695_2_ + 1, p_149695_3_, p_149695_4_).func_149721_r())
++        if (l == 4 && p_149695_1_.isSideSolid(p_149695_2_ + 1, p_149695_3_, p_149695_4_, WEST))
+         {
+             flag = true;
+         }
+ 
+-        if (l == 5 && p_149695_1_.func_147439_a(p_149695_2_ - 1, p_149695_3_, p_149695_4_).func_149721_r())
++        if (l == 5 && p_149695_1_.isSideSolid(p_149695_2_ - 1, p_149695_3_, p_149695_4_, EAST))
+         {
+             flag = true;
+         }
+@@ -147,4 +154,10 @@
      {
-         return new BlockState(this, new IProperty[] {field_176382_a});
+         return 1;
      }
 +
-+    @Override public boolean isLadder(IBlockAccess world, BlockPos pos, EntityLivingBase entity) { return true; }
++    @Override
++    public boolean isLadder(IBlockAccess world, int x, int y, int z, EntityLivingBase entity)
++    {
++        return true;
++    }
  }

patches/minecraft/net/minecraft/block/BlockLeaves.java.patch

@@ -1,104 +1,151 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockLeaves.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockLeaves.java
-@@ -18,7 +18,7 @@
- import net.minecraftforge.fml.relauncher.Side;
- import net.minecraftforge.fml.relauncher.SideOnly;
+@@ -2,6 +2,7 @@
+ 
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
++import java.util.ArrayList;
+ import java.util.Random;
+ import net.minecraft.block.material.Material;
+ import net.minecraft.creativetab.CreativeTabs;
+@@ -15,8 +16,9 @@
+ import net.minecraft.world.ColorizerFoliage;
+ import net.minecraft.world.IBlockAccess;
+ import net.minecraft.world.World;
++import net.minecraftforge.common.IShearable;
  
 -public abstract class BlockLeaves extends BlockLeavesBase
-+public abstract class BlockLeaves extends BlockLeavesBase implements net.minecraftforge.common.IShearable
++public abstract class BlockLeaves extends BlockLeavesBase implements IShearable
  {
-     public static final PropertyBool field_176237_a = PropertyBool.func_177716_a("decayable");
-     public static final PropertyBool field_176236_b = PropertyBool.func_177716_a("check_decay");
-@@ -75,9 +75,9 @@
-                         BlockPos blockpos = p_180663_2_.func_177982_a(j1, k1, l1);
-                         IBlockState iblockstate = p_180663_1_.func_180495_p(blockpos);
- 
--                        if (iblockstate.func_177230_c().func_149688_o() == Material.field_151584_j && !((Boolean)iblockstate.func_177229_b(field_176236_b)).booleanValue())
-+                        if (iblockstate.func_177230_c().isLeaves(p_180663_1_, blockpos))
+     int[] field_150128_a;
+     @SideOnly(Side.CLIENT)
+@@ -82,10 +84,10 @@
+                 {
+                     for (int l1 = -b0; l1 <= b0; ++l1)
+                     {
+-                        if (p_149749_1_.func_147439_a(p_149749_2_ + j1, p_149749_3_ + k1, p_149749_4_ + l1).func_149688_o() == Material.field_151584_j)
++                        Block block = p_149749_1_.func_147439_a(p_149749_2_ + j1, p_149749_3_ + k1, p_149749_4_ + l1);
++                        if (block.isLeaves(p_149749_1_, p_149749_2_ + j1, p_149749_3_ + k1, p_149749_4_ + l1))
                          {
--                            p_180663_1_.func_180501_a(blockpos, iblockstate.func_177226_a(field_176236_b, Boolean.valueOf(true)), 4);
-+                            iblockstate.func_177230_c().beginLeavesDecay(p_180663_1_, blockpos);
+-                            int i2 = p_149749_1_.func_72805_g(p_149749_2_ + j1, p_149749_3_ + k1, p_149749_4_ + l1);
+-                            p_149749_1_.func_72921_c(p_149749_2_ + j1, p_149749_3_ + k1, p_149749_4_ + l1, i2 | 8, 4);
++                            block.beginLeavesDecay(p_149749_1_, p_149749_2_ + j1, p_149749_3_ + k1, p_149749_4_ + l1);
                          }
                      }
                  }
-@@ -117,9 +117,9 @@
+@@ -127,9 +129,9 @@
                              {
-                                 Block block = p_180650_1_.func_180495_p(blockpos$mutableblockpos.func_181079_c(k + i2, l + j2, i1 + k2)).func_177230_c();
+                                 Block block = p_149674_1_.func_147439_a(p_149674_2_ + l1, p_149674_3_ + i2, p_149674_4_ + j2);
  
 -                                if (block != Blocks.field_150364_r && block != Blocks.field_150363_s)
-+                                if (!block.canSustainLeaves(p_180650_1_, blockpos$mutableblockpos.func_181079_c(k + i2, l + j2, i1 + k2)))
++                                if (!block.canSustainLeaves(p_149674_1_, p_149674_2_ + l1, p_149674_3_ + i2, p_149674_4_ + j2))
                                  {
 -                                    if (block.func_149688_o() == Material.field_151584_j)
-+                                    if (block.isLeaves(p_180650_1_, blockpos$mutableblockpos.func_181079_c(k + i2, l + j2, i1 + k2)))
++                                    if (block.isLeaves(p_149674_1_, p_149674_2_ + l1, p_149674_3_ + i2, p_149674_4_ + j2))
                                      {
-                                         this.field_150128_a[(i2 + l1) * k1 + (j2 + l1) * j1 + k2 + l1] = -2;
+                                         this.field_150128_a[(l1 + k1) * j1 + (i2 + k1) * b1 + j2 + k1] = -2;
                                      }
-@@ -226,40 +226,7 @@
+@@ -236,40 +238,7 @@
  
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
+     public void func_149690_a(World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_, int p_149690_5_, float p_149690_6_, int p_149690_7_)
      {
--        if (!p_180653_1_.field_72995_K)
+-        if (!p_149690_1_.field_72995_K)
 -        {
--            int i = this.func_176232_d(p_180653_3_);
+-            int j1 = this.func_150123_b(p_149690_5_);
 -
--            if (p_180653_5_ > 0)
+-            if (p_149690_7_ > 0)
 -            {
--                i -= 2 << p_180653_5_;
+-                j1 -= 2 << p_149690_7_;
 -
--                if (i < 10)
+-                if (j1 < 10)
 -                {
--                    i = 10;
+-                    j1 = 10;
 -                }
 -            }
 -
--            if (p_180653_1_.field_73012_v.nextInt(i) == 0)
+-            if (p_149690_1_.field_73012_v.nextInt(j1) == 0)
 -            {
--                Item item = this.func_180660_a(p_180653_3_, p_180653_1_.field_73012_v, p_180653_5_);
--                func_180635_a(p_180653_1_, p_180653_2_, new ItemStack(item, 1, this.func_180651_a(p_180653_3_)));
+-                Item item = this.func_149650_a(p_149690_5_, p_149690_1_.field_73012_v, p_149690_7_);
+-                this.func_149642_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, new ItemStack(item, 1, this.func_149692_a(p_149690_5_)));
 -            }
 -
--            i = 200;
+-            j1 = 200;
 -
--            if (p_180653_5_ > 0)
+-            if (p_149690_7_ > 0)
 -            {
--                i -= 10 << p_180653_5_;
+-                j1 -= 10 << p_149690_7_;
 -
--                if (i < 40)
+-                if (j1 < 40)
 -                {
--                    i = 40;
+-                    j1 = 40;
 -                }
 -            }
 -
--            this.func_176234_a(p_180653_1_, p_180653_2_, p_180653_3_, i);
+-            this.func_150124_c(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, j1);
 -        }
-+        super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
++        super.func_149690_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, 1.0f, p_149690_7_);
      }
  
-     protected void func_176234_a(World p_176234_1_, BlockPos p_176234_2_, IBlockState p_176234_3_, int p_176234_4_)
-@@ -296,4 +263,48 @@
+     protected void func_150124_c(World p_150124_1_, int p_150124_2_, int p_150124_3_, int p_150124_4_, int p_150124_5_, int p_150124_6_) {}
+@@ -281,13 +250,7 @@
+ 
+     public void func_149636_a(World p_149636_1_, EntityPlayer p_149636_2_, int p_149636_3_, int p_149636_4_, int p_149636_5_, int p_149636_6_)
+     {
+-        if (!p_149636_1_.field_72995_K && p_149636_2_.func_71045_bC() != null && p_149636_2_.func_71045_bC().func_77973_b() == Items.field_151097_aZ)
+         {
+-            p_149636_2_.func_71064_a(StatList.field_75934_C[Block.func_149682_b(this)], 1);
+-            this.func_149642_a(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, new ItemStack(Item.func_150898_a(this), 1, p_149636_6_ & 3));
+-        }
+-        else
+-        {
+             super.func_149636_a(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_);
+         }
+     }
+@@ -318,4 +281,67 @@
      }
  
-     public abstract BlockPlanks.EnumType func_176233_b(int p_176233_1_);
+     public abstract String[] func_150125_e();
 +
-+    @Override public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos){ return true; }
-+    @Override public boolean isLeaves(IBlockAccess world, BlockPos pos){ return true; }
 +
 +    @Override
-+    public void beginLeavesDecay(World world, BlockPos pos)
++    public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z)
 +    {
-+        IBlockState state = world.func_180495_p(pos);
-+        if (!(Boolean)state.func_177229_b(field_176236_b))
-+        {
-+            world.func_180501_a(pos, state.func_177226_a(field_176236_b, true), 4);
-+        }
++        return true;
 +    }
 +
 +    @Override
-+    public java.util.List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
++    public ArrayList<ItemStack> onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune)
 +    {
-+        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
-+        Random rand = world instanceof World ? ((World)world).field_73012_v : new Random();
-+        int chance = this.func_176232_d(state);
++        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
++        ret.add(new ItemStack(this, 1, world.func_72805_g(x, y, z) & 3));
++        return ret;
++    }
++
++    @Override
++    public void beginLeavesDecay(World world, int x, int y, int z)
++    {
++
++        int i2 = world.func_72805_g(x, y, z);
++
++        if ((i2 & 8) == 0)
++        {
++            world.func_72921_c(x, y, z, i2 | 8, 4);
++        }
++        world.func_72921_c(x, y, z, world.func_72805_g(x, y, z) | 8, 4);
++    }
++
++    @Override
++    public boolean isLeaves(IBlockAccess world, int x, int y, int z)
++    {
++        return true;
++    }
++
++
++    @Override
++    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
++    {
++        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
++        int chance = this.func_150123_b(metadata);
 +
 +        if (fortune > 0)
 +        {
@@ -106,8 +153,8 @@
 +            if (chance < 10) chance = 10;
 +        }
 +
-+        if (rand.nextInt(chance) == 0)
-+            ret.add(new ItemStack(func_180660_a(state, rand, fortune), 1, func_180651_a(state)));
++        if (world.field_73012_v.nextInt(chance) == 0)
++            ret.add(new ItemStack(this.func_149650_a(metadata, world.field_73012_v, fortune), 1, this.func_149692_a(metadata)));
 +
 +        chance = 200;
 +        if (fortune > 0)
@@ -117,10 +164,8 @@
 +        }
 +
 +        this.captureDrops(true);
-+        if (world instanceof World)
-+            this.func_176234_a((World)world, pos, state, chance); // Dammet mojang
++        this.func_150124_c(world, x, y, z, metadata, chance); // Dammet mojang
 +        ret.addAll(this.captureDrops(false));
 +        return ret;
 +    }
-+
  }

patches/minecraft/net/minecraft/block/BlockLever.java.patch

@@ -1,15 +1,128 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockLever.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockLever.java
-@@ -237,6 +237,12 @@
-         return new BlockState(this, new IProperty[] {field_176360_a, field_176359_b});
+@@ -10,6 +10,9 @@
+ import net.minecraft.world.IBlockAccess;
+ import net.minecraft.world.World;
+ 
++import net.minecraftforge.common.util.ForgeDirection;
++import static net.minecraftforge.common.util.ForgeDirection.*;
++
+ public class BlockLever extends Block
+ {
+     private static final String __OBFID = "CL_00000264";
+@@ -42,12 +45,23 @@
+ 
+     public boolean func_149707_d(World p_149707_1_, int p_149707_2_, int p_149707_3_, int p_149707_4_, int p_149707_5_)
+     {
+-        return p_149707_5_ == 0 && p_149707_1_.func_147439_a(p_149707_2_, p_149707_3_ + 1, p_149707_4_).func_149721_r() ? true : (p_149707_5_ == 1 && World.func_147466_a(p_149707_1_, p_149707_2_, p_149707_3_ - 1, p_149707_4_) ? true : (p_149707_5_ == 2 && p_149707_1_.func_147439_a(p_149707_2_, p_149707_3_, p_149707_4_ + 1).func_149721_r() ? true : (p_149707_5_ == 3 && p_149707_1_.func_147439_a(p_149707_2_, p_149707_3_, p_149707_4_ - 1).func_149721_r() ? true : (p_149707_5_ == 4 && p_149707_1_.func_147439_a(p_149707_2_ + 1, p_149707_3_, p_149707_4_).func_149721_r() ? true : p_149707_5_ == 5 && p_149707_1_.func_147439_a(p_149707_2_ - 1, p_149707_3_, p_149707_4_).func_149721_r()))));
++        ForgeDirection dir = ForgeDirection.getOrientation(p_149707_5_);
++        return (dir == DOWN  && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_ + 1, p_149707_4_, DOWN )) ||
++               (dir == UP    && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_ - 1, p_149707_4_, UP   )) ||
++               (dir == NORTH && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_, p_149707_4_ + 1, NORTH)) ||
++               (dir == SOUTH && p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_, p_149707_4_ - 1, SOUTH)) ||
++               (dir == WEST  && p_149707_1_.isSideSolid(p_149707_2_ + 1, p_149707_3_, p_149707_4_, WEST )) ||
++               (dir == EAST  && p_149707_1_.isSideSolid(p_149707_2_ - 1, p_149707_3_, p_149707_4_, EAST ));
      }
  
-+
-+    private boolean canAttach(World world, BlockPos pos, EnumFacing side)
-+    {
-+        return world.isSideSolid(pos, side);
-+    }
-+
-     public static enum EnumOrientation implements IStringSerializable
+     public boolean func_149742_c(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
      {
-         DOWN_X(0, "down_x", EnumFacing.DOWN),
+-        return p_149742_1_.func_147439_a(p_149742_2_ - 1, p_149742_3_, p_149742_4_).func_149721_r() ? true : (p_149742_1_.func_147439_a(p_149742_2_ + 1, p_149742_3_, p_149742_4_).func_149721_r() ? true : (p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_, p_149742_4_ - 1).func_149721_r() ? true : (p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_, p_149742_4_ + 1).func_149721_r() ? true : (World.func_147466_a(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_) ? true : p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_ + 1, p_149742_4_).func_149721_r()))));
++        return p_149742_1_.isSideSolid(p_149742_2_ - 1, p_149742_3_, p_149742_4_, EAST ) ||
++               p_149742_1_.isSideSolid(p_149742_2_ + 1, p_149742_3_, p_149742_4_, WEST ) ||
++               p_149742_1_.isSideSolid(p_149742_2_, p_149742_3_, p_149742_4_ - 1, SOUTH) ||
++               p_149742_1_.isSideSolid(p_149742_2_, p_149742_3_, p_149742_4_ + 1, NORTH) ||
++               p_149742_1_.isSideSolid(p_149742_2_, p_149742_3_ - 1, p_149742_4_, UP   ) ||
++               p_149742_1_.isSideSolid(p_149742_2_, p_149742_3_ + 1, p_149742_4_, DOWN );
+     }
+ 
+     public int func_149660_a(World p_149660_1_, int p_149660_2_, int p_149660_3_, int p_149660_4_, int p_149660_5_, float p_149660_6_, float p_149660_7_, float p_149660_8_, int p_149660_9_)
+@@ -56,32 +70,32 @@
+         int j1 = p_149660_9_ & 7;
+         byte b0 = -1;
+ 
+-        if (p_149660_5_ == 0 && p_149660_1_.func_147439_a(p_149660_2_, p_149660_3_ + 1, p_149660_4_).func_149721_r())
++        if (p_149660_5_ == 0 && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_ + 1, p_149660_4_, DOWN))
+         {
+             b0 = 0;
+         }
+ 
+-        if (p_149660_5_ == 1 && World.func_147466_a(p_149660_1_, p_149660_2_, p_149660_3_ - 1, p_149660_4_))
++        if (p_149660_5_ == 1 && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_ - 1, p_149660_4_, UP))
+         {
+             b0 = 5;
+         }
+ 
+-        if (p_149660_5_ == 2 && p_149660_1_.func_147439_a(p_149660_2_, p_149660_3_, p_149660_4_ + 1).func_149721_r())
++        if (p_149660_5_ == 2 && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ + 1, NORTH))
+         {
+             b0 = 4;
+         }
+ 
+-        if (p_149660_5_ == 3 && p_149660_1_.func_147439_a(p_149660_2_, p_149660_3_, p_149660_4_ - 1).func_149721_r())
++        if (p_149660_5_ == 3 && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ - 1, SOUTH))
+         {
+             b0 = 3;
+         }
+ 
+-        if (p_149660_5_ == 4 && p_149660_1_.func_147439_a(p_149660_2_ + 1, p_149660_3_, p_149660_4_).func_149721_r())
++        if (p_149660_5_ == 4 && p_149660_1_.isSideSolid(p_149660_2_ + 1, p_149660_3_, p_149660_4_, WEST))
+         {
+             b0 = 2;
+         }
+ 
+-        if (p_149660_5_ == 5 && p_149660_1_.func_147439_a(p_149660_2_ - 1, p_149660_3_, p_149660_4_).func_149721_r())
++        if (p_149660_5_ == 5 && p_149660_1_.isSideSolid(p_149660_2_ - 1, p_149660_3_, p_149660_4_, EAST))
+         {
+             b0 = 1;
+         }
+@@ -147,42 +161,42 @@
+             int l = p_149695_1_.func_72805_g(p_149695_2_, p_149695_3_, p_149695_4_) & 7;
+             boolean flag = false;
+ 
+-            if (!p_149695_1_.func_147439_a(p_149695_2_ - 1, p_149695_3_, p_149695_4_).func_149721_r() && l == 1)
++            if (!p_149695_1_.isSideSolid(p_149695_2_ - 1, p_149695_3_, p_149695_4_, EAST) && l == 1)
+             {
+                 flag = true;
+             }
+ 
+-            if (!p_149695_1_.func_147439_a(p_149695_2_ + 1, p_149695_3_, p_149695_4_).func_149721_r() && l == 2)
++            if (!p_149695_1_.isSideSolid(p_149695_2_ + 1, p_149695_3_, p_149695_4_, WEST) && l == 2)
+             {
+                 flag = true;
+             }
+ 
+-            if (!p_149695_1_.func_147439_a(p_149695_2_, p_149695_3_, p_149695_4_ - 1).func_149721_r() && l == 3)
++            if (!p_149695_1_.isSideSolid(p_149695_2_, p_149695_3_, p_149695_4_ - 1, SOUTH) && l == 3)
+             {
+                 flag = true;
+             }
+ 
+-            if (!p_149695_1_.func_147439_a(p_149695_2_, p_149695_3_, p_149695_4_ + 1).func_149721_r() && l == 4)
++            if (!p_149695_1_.isSideSolid(p_149695_2_, p_149695_3_, p_149695_4_ + 1, NORTH) && l == 4)
+             {
+                 flag = true;
+             }
+ 
+-            if (!World.func_147466_a(p_149695_1_, p_149695_2_, p_149695_3_ - 1, p_149695_4_) && l == 5)
++            if (!p_149695_1_.isSideSolid(p_149695_2_, p_149695_3_ - 1, p_149695_4_, UP) && l == 5)
+             {
+                 flag = true;
+             }
+ 
+-            if (!World.func_147466_a(p_149695_1_, p_149695_2_, p_149695_3_ - 1, p_149695_4_) && l == 6)
++            if (!p_149695_1_.isSideSolid(p_149695_2_, p_149695_3_ - 1, p_149695_4_, UP) && l == 6)
+             {
+                 flag = true;
+             }
+ 
+-            if (!p_149695_1_.func_147439_a(p_149695_2_, p_149695_3_ + 1, p_149695_4_).func_149721_r() && l == 0)
++            if (!p_149695_1_.isSideSolid(p_149695_2_, p_149695_3_ + 1, p_149695_4_, DOWN) && l == 0)
+             {
+                 flag = true;
+             }
+ 
+-            if (!p_149695_1_.func_147439_a(p_149695_2_, p_149695_3_ + 1, p_149695_4_).func_149721_r() && l == 7)
++            if (!p_149695_1_.isSideSolid(p_149695_2_, p_149695_3_ + 1, p_149695_4_, DOWN) && l == 7)
+             {
+                 flag = true;
+             }

patches/minecraft/net/minecraft/block/BlockLiquid.java.patch

@@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockLiquid.java
++++ ../src-work/minecraft/net/minecraft/block/BlockLiquid.java
+@@ -67,7 +67,7 @@
+             {
+                 for (int l1 = -1; l1 <= 1; ++l1)
+                 {
+-                    int i2 = p_149720_1_.func_72807_a(p_149720_2_ + l1, p_149720_4_ + k1).field_76759_H;
++                    int i2 = p_149720_1_.func_72807_a(p_149720_2_ + l1, p_149720_4_ + k1).getWaterColorMultiplier();
+                     l += (i2 & 16711680) >> 16;
+                     i1 += (i2 & 65280) >> 8;
+                     j1 += i2 & 255;

patches/minecraft/net/minecraft/block/BlockLog.java.patch

@@ -1,24 +1,45 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockLog.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockLog.java
-@@ -33,9 +33,9 @@
-             {
-                 IBlockState iblockstate = p_180663_1_.func_180495_p(blockpos);
+@@ -7,6 +7,7 @@
+ import net.minecraft.creativetab.CreativeTabs;
+ import net.minecraft.item.Item;
+ import net.minecraft.util.IIcon;
++import net.minecraft.world.IBlockAccess;
+ import net.minecraft.world.World;
  
--                if (iblockstate.func_177230_c().func_149688_o() == Material.field_151584_j && !((Boolean)iblockstate.func_177229_b(BlockLeaves.field_176236_b)).booleanValue())
-+                if (iblockstate.func_177230_c().isLeaves(p_180663_1_, blockpos))
+ public abstract class BlockLog extends BlockRotatedPillar
+@@ -53,14 +54,10 @@
                  {
--                    p_180663_1_.func_180501_a(blockpos, iblockstate.func_177226_a(BlockLeaves.field_176236_b, Boolean.valueOf(true)), 4);
-+                    iblockstate.func_177230_c().beginLeavesDecay(p_180663_1_, blockpos);
+                     for (int l1 = -b0; l1 <= b0; ++l1)
+                     {
+-                        if (p_149749_1_.func_147439_a(p_149749_2_ + j1, p_149749_3_ + k1, p_149749_4_ + l1).func_149688_o() == Material.field_151584_j)
++                        Block block = p_149749_1_.func_147439_a(p_149749_2_ + j1, p_149749_3_ + k1, p_149749_4_ + l1);
++                        if (block.isLeaves(p_149749_1_, p_149749_2_ + j1, p_149749_3_ + k1, p_149749_4_ + l1))
+                         {
+-                            int i2 = p_149749_1_.func_72805_g(p_149749_2_ + j1, p_149749_3_ + k1, p_149749_4_ + l1);
+-
+-                            if ((i2 & 8) == 0)
+-                            {
+-                                p_149749_1_.func_72921_c(p_149749_2_ + j1, p_149749_3_ + k1, p_149749_4_ + l1, i2 | 8, 4);
+-                            }
++                            block.beginLeavesDecay(p_149749_1_, p_149749_2_ + j1, p_149749_3_ + k1, p_149749_4_ + l1);
+                         }
+                     }
                  }
-             }
-         }
-@@ -46,6 +46,9 @@
-         return super.func_180642_a(p_180642_1_, p_180642_2_, p_180642_3_, p_180642_4_, p_180642_5_, p_180642_6_, p_180642_7_, p_180642_8_).func_177226_a(field_176299_a, BlockLog.EnumAxis.func_176870_a(p_180642_3_.func_176740_k()));
-     }
- 
-+    @Override public boolean canSustainLeaves(net.minecraft.world.IBlockAccess world, BlockPos pos){ return true; }
-+    @Override public boolean isWood(net.minecraft.world.IBlockAccess world, BlockPos pos){ return true; }
-+
-     public static enum EnumAxis implements IStringSerializable
+@@ -79,4 +76,16 @@
      {
-         X("x"),
+         return this.field_150166_b[p_150161_1_ % this.field_150166_b.length];
+     }
++
++    @Override
++    public boolean canSustainLeaves(IBlockAccess world, int x, int y, int z)
++    {
++        return true;
++    }
++
++    @Override
++    public boolean isWood(IBlockAccess world, int x, int y, int z)
++    {
++        return true;
++    }
+ }

patches/minecraft/net/minecraft/block/BlockMobSpawner.java.patch

@@ -1,17 +1,26 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockMobSpawner.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockMobSpawner.java
-@@ -37,10 +37,14 @@
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
+@@ -7,6 +7,7 @@
+ import net.minecraft.item.Item;
+ import net.minecraft.tileentity.TileEntity;
+ import net.minecraft.tileentity.TileEntityMobSpawner;
++import net.minecraft.world.IBlockAccess;
+ import net.minecraft.world.World;
+ 
+ public class BlockMobSpawner extends BlockContainer
+@@ -36,10 +37,15 @@
+     public void func_149690_a(World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_, int p_149690_5_, float p_149690_6_, int p_149690_7_)
      {
-         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
--        int i = 15 + p_180653_1_.field_73012_v.nextInt(15) + p_180653_1_.field_73012_v.nextInt(15);
--        this.func_180637_b(p_180653_1_, p_180653_2_, i);
+         super.func_149690_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, p_149690_7_);
+-        int j1 = 15 + p_149690_1_.field_73012_v.nextInt(15) + p_149690_1_.field_73012_v.nextInt(15);
+-        this.func_149657_c(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, j1);
      }
  
++    private Random rand = new Random();
 +    @Override
-+    public int getExpDrop(net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
++    public int getExpDrop(IBlockAccess world, int metadata, int fortune)
 +    {
-+        return 15 + RANDOM.nextInt(15) + RANDOM.nextInt(15);
++        return 15 + rand.nextInt(15) + rand.nextInt(15);
 +    }
 +
      public boolean func_149662_c()

patches/minecraft/net/minecraft/block/BlockMushroom.java.patch

@@ -1,11 +1,19 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockMushroom.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockMushroom.java
-@@ -71,7 +71,7 @@
-         if (p_180671_2_.func_177956_o() >= 0 && p_180671_2_.func_177956_o() < 256)
+@@ -4,6 +4,7 @@
+ import net.minecraft.init.Blocks;
+ import net.minecraft.world.World;
+ import net.minecraft.world.gen.feature.WorldGenBigMushroom;
++import net.minecraftforge.common.util.ForgeDirection;
+ 
+ public class BlockMushroom extends BlockBush implements IGrowable
+ {
+@@ -85,7 +86,7 @@
+         if (p_149718_3_ >= 0 && p_149718_3_ < 256)
          {
-             IBlockState iblockstate = p_180671_1_.func_180495_p(p_180671_2_.func_177977_b());
--            return iblockstate.func_177230_c() == Blocks.field_150391_bh ? true : (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.PODZOL ? true : p_180671_1_.func_175699_k(p_180671_2_) < 13 && this.func_149854_a(iblockstate.func_177230_c()));
-+            return iblockstate.func_177230_c() == Blocks.field_150391_bh ? true : (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.PODZOL ? true : p_180671_1_.func_175699_k(p_180671_2_) < 13 && iblockstate.func_177230_c().canSustainPlant(p_180671_1_, p_180671_2_.func_177977_b(), net.minecraft.util.EnumFacing.UP, this));
+             Block block = p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_ - 1, p_149718_4_);
+-            return block == Blocks.field_150391_bh || block == Blocks.field_150346_d && p_149718_1_.func_72805_g(p_149718_2_, p_149718_3_ - 1, p_149718_4_) == 2 || p_149718_1_.func_72883_k(p_149718_2_, p_149718_3_, p_149718_4_) < 13 && this.func_149854_a(block);
++            return block == Blocks.field_150391_bh || block == Blocks.field_150346_d && p_149718_1_.func_72805_g(p_149718_2_, p_149718_3_ - 1, p_149718_4_) == 2 || p_149718_1_.func_72883_k(p_149718_2_, p_149718_3_, p_149718_4_) < 13 && block.canSustainPlant(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_, ForgeDirection.UP, this);
          }
          else
          {

patches/minecraft/net/minecraft/block/BlockMycelium.java.patch

@@ -1,20 +1,20 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockMycelium.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockMycelium.java
-@@ -39,7 +39,7 @@
+@@ -37,7 +37,7 @@
      {
-         if (!p_180650_1_.field_72995_K)
+         if (!p_149674_1_.field_72995_K)
          {
--            if (p_180650_1_.func_175671_l(p_180650_2_.func_177984_a()) < 4 && p_180650_1_.func_180495_p(p_180650_2_.func_177984_a()).func_177230_c().func_149717_k() > 2)
-+            if (p_180650_1_.func_175671_l(p_180650_2_.func_177984_a()) < 4 && p_180650_1_.func_180495_p(p_180650_2_.func_177984_a()).func_177230_c().getLightOpacity(p_180650_1_, p_180650_2_.func_177984_a()) > 2)
+-            if (p_149674_1_.func_72957_l(p_149674_2_, p_149674_3_ + 1, p_149674_4_) < 4 && p_149674_1_.func_147439_a(p_149674_2_, p_149674_3_ + 1, p_149674_4_).func_149717_k() > 2)
++            if (p_149674_1_.func_72957_l(p_149674_2_, p_149674_3_ + 1, p_149674_4_) < 4 && p_149674_1_.getBlockLightOpacity(p_149674_2_, p_149674_3_ + 1, p_149674_4_) > 2)
              {
-                 p_180650_1_.func_175656_a(p_180650_2_, Blocks.field_150346_d.func_176223_P().func_177226_a(BlockDirt.field_176386_a, BlockDirt.DirtType.DIRT));
+                 p_149674_1_.func_147449_b(p_149674_2_, p_149674_3_, p_149674_4_, Blocks.field_150346_d);
              }
-@@ -53,7 +53,7 @@
-                         IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos);
-                         Block block = p_180650_1_.func_180495_p(blockpos.func_177984_a()).func_177230_c();
+@@ -50,7 +50,7 @@
+                     int k1 = p_149674_4_ + p_149674_5_.nextInt(3) - 1;
+                     Block block = p_149674_1_.func_147439_a(i1, j1 + 1, k1);
  
--                        if (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos.func_177984_a()) >= 4 && block.func_149717_k() <= 2)
-+                        if (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos.func_177984_a()) >= 4 && block.getLightOpacity(p_180650_1_, blockpos.func_177984_a()) <= 2)
-                         {
-                             p_180650_1_.func_175656_a(blockpos, this.func_176223_P());
-                         }
+-                    if (p_149674_1_.func_147439_a(i1, j1, k1) == Blocks.field_150346_d && p_149674_1_.func_72805_g(i1, j1, k1) == 0 && p_149674_1_.func_72957_l(i1, j1 + 1, k1) >= 4 && block.func_149717_k() <= 2)
++                    if (p_149674_1_.func_147439_a(i1, j1, k1) == Blocks.field_150346_d && p_149674_1_.func_72805_g(i1, j1, k1) == 0 && p_149674_1_.func_72957_l(i1, j1 + 1, k1) >= 4 && p_149674_1_.getBlockLightOpacity(i1, j1 + 1, k1) <= 2)
+                     {
+                         p_149674_1_.func_147449_b(i1, j1, k1, this);
+                     }

patches/minecraft/net/minecraft/block/BlockNetherWart.java.patch

@@ -1,42 +1,58 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockNetherWart.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockNetherWart.java
-@@ -38,7 +38,7 @@
+@@ -2,6 +2,7 @@
  
-     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
++import java.util.ArrayList;
+ import java.util.Random;
+ import net.minecraft.client.renderer.texture.IIconRegister;
+ import net.minecraft.creativetab.CreativeTabs;
+@@ -11,6 +12,7 @@
+ import net.minecraft.item.ItemStack;
+ import net.minecraft.util.IIcon;
+ import net.minecraft.world.World;
++import net.minecraftforge.common.util.ForgeDirection;
+ 
+ public class BlockNetherWart extends BlockBush
+ {
+@@ -33,7 +35,7 @@
+ 
+     public boolean func_149718_j(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_)
      {
--        return this.func_149854_a(p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()).func_177230_c());
-+        return super.func_180671_f(p_180671_1_, p_180671_2_, p_180671_3_);
+-        return this.func_149854_a(p_149718_1_.func_147439_a(p_149718_2_, p_149718_3_ - 1, p_149718_4_));
++        return super.func_149718_j(p_149718_1_, p_149718_2_, p_149718_3_, p_149718_4_);
      }
  
-     public void func_180650_b(World p_180650_1_, BlockPos p_180650_2_, IBlockState p_180650_3_, Random p_180650_4_)
-@@ -54,9 +54,11 @@
-         super.func_180650_b(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_);
+     public void func_149674_a(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_)
+@@ -60,9 +62,12 @@
+         return 6;
      }
  
 +    @SuppressWarnings("unused")
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
+     public void func_149690_a(World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_, int p_149690_5_, float p_149690_6_, int p_149690_7_)
      {
--        if (!p_180653_1_.field_72995_K)
-+        super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
-+        if (false && !p_180653_1_.field_72995_K)
+-        if (!p_149690_1_.field_72995_K)
++        super.func_149690_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, p_149690_7_);
++        
++        if (false && !p_149690_1_.field_72995_K)
          {
-             int i = 1;
+             int j1 = 1;
  
-@@ -107,4 +109,24 @@
-     {
-         return new BlockState(this, new IProperty[] {field_176486_a});
+@@ -109,4 +114,23 @@
+             this.field_149883_a[i] = p_149651_1_.func_94245_a(this.func_149641_N() + "_stage_" + i);
+         }
      }
 +
 +    @Override
-+    public java.util.List<ItemStack> getDrops(net.minecraft.world.IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
++    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
 +    {
-+        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
-+        Random rand = world instanceof World ? ((World)world).field_73012_v : new Random();
++        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
 +        int count = 1;
 +
-+        if (((Integer)state.func_177229_b(field_176486_a)) >= 3)
++        if (metadata >= 3)
 +        {
-+            count = 2 + rand.nextInt(3) + (fortune > 0 ? rand.nextInt(fortune + 1) : 0);
++            count = 2 + world.field_73012_v.nextInt(3) + (fortune > 0 ? world.field_73012_v.nextInt(fortune + 1) : 0);
 +        }
 +
 +        for (int i = 0; i < count; i++)

patches/minecraft/net/minecraft/block/BlockNewLeaf.java.patch

@@ -1,24 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockNewLeaf.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockNewLeaf.java
-@@ -99,14 +99,15 @@
- 
-     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, TileEntity p_180657_5_)
-     {
--        if (!p_180657_1_.field_72995_K && p_180657_2_.func_71045_bC() != null && p_180657_2_.func_71045_bC().func_77973_b() == Items.field_151097_aZ)
-         {
--            p_180657_2_.func_71029_a(StatList.field_75934_C[Block.func_149682_b(this)]);
--            func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Item.func_150898_a(this), 1, ((BlockPlanks.EnumType)p_180657_4_.func_177229_b(field_176240_P)).func_176839_a() - 4));
--        }
--        else
--        {
-             super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_);
-         }
-     }
-+
-+    @Override
-+    public List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
-+    {
-+        IBlockState state = world.func_180495_p(pos);
-+        return new java.util.ArrayList(java.util.Arrays.asList(new ItemStack(this, 1, ((BlockPlanks.EnumType)state.func_177229_b(field_176240_P)).func_176839_a() - 4)));
-+    }
- }

patches/minecraft/net/minecraft/block/BlockNote.java.patch

@@ -1,23 +1,24 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockNote.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockNote.java
-@@ -58,7 +58,9 @@
-             if (tileentity instanceof TileEntityNote)
+@@ -45,7 +45,9 @@
+ 
+             if (tileentitynote != null)
              {
-                 TileEntityNote tileentitynote = (TileEntityNote)tileentity;
 +                int old = tileentitynote.field_145879_a;
                  tileentitynote.func_145877_a();
 +                if (old == tileentitynote.field_145879_a) return false;
-                 tileentitynote.func_175108_a(p_180639_1_, p_180639_2_);
-                 p_180639_4_.func_71029_a(StatList.field_181735_S);
+                 tileentitynote.func_145878_a(p_149727_1_, p_149727_2_, p_149727_3_, p_149727_4_);
              }
-@@ -98,6 +100,10 @@
  
-     public boolean func_180648_a(World p_180648_1_, BlockPos p_180648_2_, IBlockState p_180648_3_, int p_180648_4_, int p_180648_5_)
+@@ -73,6 +75,11 @@
+ 
+     public boolean func_149696_a(World p_149696_1_, int p_149696_2_, int p_149696_3_, int p_149696_4_, int p_149696_5_, int p_149696_6_)
      {
-+        net.minecraftforge.event.world.NoteBlockEvent.Play e = new net.minecraftforge.event.world.NoteBlockEvent.Play(p_180648_1_, p_180648_2_, p_180648_3_, p_180648_5_, p_180648_4_);
++        int meta = p_149696_1_.func_72805_g(p_149696_2_, p_149696_3_, p_149696_4_);
++        net.minecraftforge.event.world.NoteBlockEvent.Play e = new net.minecraftforge.event.world.NoteBlockEvent.Play(p_149696_1_, p_149696_2_, p_149696_3_, p_149696_4_, meta, p_149696_6_, p_149696_5_);
 +        if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(e)) return false;
-+        p_180648_4_ = e.instrument.ordinal();
-+        p_180648_5_ = e.getVanillaNoteId();
-         float f = (float)Math.pow(2.0D, (double)(p_180648_5_ - 12) / 12.0D);
-         p_180648_1_.func_72908_a((double)p_180648_2_.func_177958_n() + 0.5D, (double)p_180648_2_.func_177956_o() + 0.5D, (double)p_180648_2_.func_177952_p() + 0.5D, "note." + this.func_176433_b(p_180648_4_), 3.0F, f);
-         p_180648_1_.func_175688_a(EnumParticleTypes.NOTE, (double)p_180648_2_.func_177958_n() + 0.5D, (double)p_180648_2_.func_177956_o() + 1.2D, (double)p_180648_2_.func_177952_p() + 0.5D, (double)p_180648_5_ / 24.0D, 0.0D, 0.0D, new int[0]);
++        p_149696_5_ = e.instrument.ordinal();
++        p_149696_6_ = e.getVanillaNoteId(); 
+         float f = (float)Math.pow(2.0D, (double)(p_149696_6_ - 12) / 12.0D);
+         String s = "harp";
+ 

patches/minecraft/net/minecraft/block/BlockOldLeaf.java.patch

@@ -1,21 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockOldLeaf.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockOldLeaf.java
-@@ -142,11 +142,17 @@
-         if (!p_180657_1_.field_72995_K && p_180657_2_.func_71045_bC() != null && p_180657_2_.func_71045_bC().func_77973_b() == Items.field_151097_aZ)
-         {
-             p_180657_2_.func_71029_a(StatList.field_75934_C[Block.func_149682_b(this)]);
--            func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Item.func_150898_a(this), 1, ((BlockPlanks.EnumType)p_180657_4_.func_177229_b(field_176239_P)).func_176839_a()));
-         }
-         else
-         {
-             super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_);
-         }
-     }
-+
-+    @Override
-+    public List<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune)
-+    {
-+        IBlockState state = world.func_180495_p(pos);
-+        return new java.util.ArrayList(java.util.Arrays.asList(new ItemStack(this, 1, ((BlockPlanks.EnumType)state.func_177229_b(field_176239_P)).func_176839_a())));
-+    }
- }

patches/minecraft/net/minecraft/block/BlockOre.java.patch

@@ -1,51 +1,58 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockOre.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockOre.java
-@@ -58,34 +58,40 @@
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
+@@ -7,6 +7,7 @@
+ import net.minecraft.init.Items;
+ import net.minecraft.item.Item;
+ import net.minecraft.util.MathHelper;
++import net.minecraft.world.IBlockAccess;
+ import net.minecraft.world.World;
+ 
+ public class BlockOre extends Block
+@@ -51,34 +52,40 @@
+     public void func_149690_a(World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_, int p_149690_5_, float p_149690_6_, int p_149690_7_)
      {
-         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
--
--        if (this.func_180660_a(p_180653_3_, p_180653_1_.field_73012_v, p_180653_5_) != Item.func_150898_a(this))
+         super.func_149690_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, p_149690_7_);
 +    }
+ 
+-        if (this.func_149650_a(p_149690_5_, p_149690_1_.field_73012_v, p_149690_7_) != Item.func_150898_a(this))
++    private Random rand = new Random();
 +    @Override
-+    public int getExpDrop(net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
++    public int getExpDrop(IBlockAccess p_149690_1_, int p_149690_5_, int p_149690_7_)
 +    {
-+        IBlockState state = world.func_180495_p(pos);
-+        Random rand = world instanceof World ? ((World)world).field_73012_v : new Random();
-+        if (this.func_180660_a(state, rand, fortune) != Item.func_150898_a(this))
++        if (this.func_149650_a(p_149690_5_, rand, p_149690_7_) != Item.func_150898_a(this))
          {
-             int i = 0;
+             int j1 = 0;
  
              if (this == Blocks.field_150365_q)
              {
--                i = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 0, 2);
-+                i = MathHelper.func_76136_a(rand, 0, 2);
+-                j1 = MathHelper.func_76136_a(p_149690_1_.field_73012_v, 0, 2);
++                j1 = MathHelper.func_76136_a(rand, 0, 2);
              }
              else if (this == Blocks.field_150482_ag)
              {
--                i = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 3, 7);
-+                i = MathHelper.func_76136_a(rand, 3, 7);
+-                j1 = MathHelper.func_76136_a(p_149690_1_.field_73012_v, 3, 7);
++                j1 = MathHelper.func_76136_a(rand, 3, 7);
              }
              else if (this == Blocks.field_150412_bA)
              {
--                i = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 3, 7);
-+                i = MathHelper.func_76136_a(rand, 3, 7);
+-                j1 = MathHelper.func_76136_a(p_149690_1_.field_73012_v, 3, 7);
++                j1 = MathHelper.func_76136_a(rand, 3, 7);
              }
              else if (this == Blocks.field_150369_x)
              {
--                i = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 2, 5);
-+                i = MathHelper.func_76136_a(rand, 2, 5);
+-                j1 = MathHelper.func_76136_a(p_149690_1_.field_73012_v, 2, 5);
++                j1 = MathHelper.func_76136_a(rand, 2, 5);
              }
              else if (this == Blocks.field_150449_bY)
              {
--                i = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 2, 5);
-+                i = MathHelper.func_76136_a(rand, 2, 5);
+-                j1 = MathHelper.func_76136_a(p_149690_1_.field_73012_v, 2, 5);
++                j1 = MathHelper.func_76136_a(rand, 2, 5);
              }
  
--            this.func_180637_b(p_180653_1_, p_180653_2_, i);
-+            return i;
+-            this.func_149657_c(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, j1);
++            return j1;
          }
 +        return 0;
      }
  
-     public int func_176222_j(World p_176222_1_, BlockPos p_176222_2_)
+     public int func_149692_a(int p_149692_1_)

patches/minecraft/net/minecraft/block/BlockPane.java.patch

@@ -1,41 +1,52 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockPane.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockPane.java
-@@ -38,7 +38,10 @@
+@@ -15,6 +15,8 @@
+ import net.minecraft.util.IIcon;
+ import net.minecraft.world.IBlockAccess;
+ import net.minecraft.world.World;
++import net.minecraftforge.common.util.ForgeDirection;
++import static net.minecraftforge.common.util.ForgeDirection.*;
  
-     public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
+ public class BlockPane extends Block
+ {
+@@ -62,10 +64,10 @@
+ 
+     public void func_149743_a(World p_149743_1_, int p_149743_2_, int p_149743_3_, int p_149743_4_, AxisAlignedBB p_149743_5_, List p_149743_6_, Entity p_149743_7_)
      {
--        return p_176221_1_.func_177226_a(field_176241_b, Boolean.valueOf(this.func_150098_a(p_176221_2_.func_180495_p(p_176221_3_.func_177978_c()).func_177230_c()))).func_177226_a(field_176243_N, Boolean.valueOf(this.func_150098_a(p_176221_2_.func_180495_p(p_176221_3_.func_177968_d()).func_177230_c()))).func_177226_a(field_176244_O, Boolean.valueOf(this.func_150098_a(p_176221_2_.func_180495_p(p_176221_3_.func_177976_e()).func_177230_c()))).func_177226_a(field_176242_M, Boolean.valueOf(this.func_150098_a(p_176221_2_.func_180495_p(p_176221_3_.func_177974_f()).func_177230_c())));
-+        return p_176221_1_.func_177226_a(field_176241_b, canPaneConnectTo(p_176221_2_, p_176221_3_, EnumFacing.NORTH))
-+                .func_177226_a(field_176243_N, canPaneConnectTo(p_176221_2_, p_176221_3_, EnumFacing.SOUTH))
-+                .func_177226_a(field_176244_O, canPaneConnectTo(p_176221_2_, p_176221_3_, EnumFacing.WEST))
-+                .func_177226_a(field_176242_M, canPaneConnectTo(p_176221_2_, p_176221_3_, EnumFacing.EAST));
-     }
- 
-     public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
-@@ -64,10 +67,10 @@
- 
-     public void func_180638_a(World p_180638_1_, BlockPos p_180638_2_, IBlockState p_180638_3_, AxisAlignedBB p_180638_4_, List<AxisAlignedBB> p_180638_5_, Entity p_180638_6_)
-     {
--        boolean flag = this.func_150098_a(p_180638_1_.func_180495_p(p_180638_2_.func_177978_c()).func_177230_c());
--        boolean flag1 = this.func_150098_a(p_180638_1_.func_180495_p(p_180638_2_.func_177968_d()).func_177230_c());
--        boolean flag2 = this.func_150098_a(p_180638_1_.func_180495_p(p_180638_2_.func_177976_e()).func_177230_c());
--        boolean flag3 = this.func_150098_a(p_180638_1_.func_180495_p(p_180638_2_.func_177974_f()).func_177230_c());
-+        boolean flag = this.canPaneConnectTo(p_180638_1_, p_180638_2_, EnumFacing.NORTH);
-+        boolean flag1 = this.canPaneConnectTo(p_180638_1_, p_180638_2_, EnumFacing.SOUTH);
-+        boolean flag2 = this.canPaneConnectTo(p_180638_1_, p_180638_2_, EnumFacing.WEST);
-+        boolean flag3 = this.canPaneConnectTo(p_180638_1_, p_180638_2_, EnumFacing.EAST);
+-        boolean flag = this.func_150098_a(p_149743_1_.func_147439_a(p_149743_2_, p_149743_3_, p_149743_4_ - 1));
+-        boolean flag1 = this.func_150098_a(p_149743_1_.func_147439_a(p_149743_2_, p_149743_3_, p_149743_4_ + 1));
+-        boolean flag2 = this.func_150098_a(p_149743_1_.func_147439_a(p_149743_2_ - 1, p_149743_3_, p_149743_4_));
+-        boolean flag3 = this.func_150098_a(p_149743_1_.func_147439_a(p_149743_2_ + 1, p_149743_3_, p_149743_4_));
++        boolean flag  = this.canPaneConnectTo(p_149743_1_, p_149743_2_, p_149743_3_, p_149743_4_ - 1, NORTH);
++        boolean flag1 = this.canPaneConnectTo(p_149743_1_, p_149743_2_, p_149743_3_, p_149743_4_ + 1, SOUTH);
++        boolean flag2 = this.canPaneConnectTo(p_149743_1_, p_149743_2_ - 1, p_149743_3_, p_149743_4_, WEST );
++        boolean flag3 = this.canPaneConnectTo(p_149743_1_, p_149743_2_ + 1, p_149743_3_, p_149743_4_, EAST );
  
          if ((!flag2 || !flag3) && (flag2 || flag3 || flag || flag1))
          {
-@@ -186,4 +189,11 @@
-     {
-         return new BlockState(this, new IProperty[] {field_176241_b, field_176242_M, field_176244_O, field_176243_N});
+@@ -117,10 +119,10 @@
+         float f1 = 0.5625F;
+         float f2 = 0.4375F;
+         float f3 = 0.5625F;
+-        boolean flag = this.func_150098_a(p_149719_1_.func_147439_a(p_149719_2_, p_149719_3_, p_149719_4_ - 1));
+-        boolean flag1 = this.func_150098_a(p_149719_1_.func_147439_a(p_149719_2_, p_149719_3_, p_149719_4_ + 1));
+-        boolean flag2 = this.func_150098_a(p_149719_1_.func_147439_a(p_149719_2_ - 1, p_149719_3_, p_149719_4_));
+-        boolean flag3 = this.func_150098_a(p_149719_1_.func_147439_a(p_149719_2_ + 1, p_149719_3_, p_149719_4_));
++        boolean flag  = this.canPaneConnectTo(p_149719_1_, p_149719_2_, p_149719_3_, p_149719_4_ - 1, NORTH);
++        boolean flag1 = this.canPaneConnectTo(p_149719_1_, p_149719_2_, p_149719_3_, p_149719_4_ + 1, SOUTH);
++        boolean flag2 = this.canPaneConnectTo(p_149719_1_, p_149719_2_ - 1, p_149719_3_, p_149719_4_, WEST );
++        boolean flag3 = this.canPaneConnectTo(p_149719_1_, p_149719_2_ + 1, p_149719_3_, p_149719_4_, EAST );
+ 
+         if ((!flag2 || !flag3) && (flag2 || flag3 || flag || flag1))
+         {
+@@ -186,4 +188,10 @@
+         this.field_149761_L = p_149651_1_.func_94245_a(this.field_150101_M);
+         this.field_150102_N = p_149651_1_.func_94245_a(this.field_150100_a);
      }
 +
-+    public boolean canPaneConnectTo(IBlockAccess world, BlockPos pos, EnumFacing dir)
++    public boolean canPaneConnectTo(IBlockAccess world, int x, int y, int z, ForgeDirection dir)
 +    {
-+        BlockPos off = pos.func_177972_a(dir);
-+        Block block = world.func_180495_p(off).func_177230_c();
-+        return func_150098_a(block) || block.isSideSolid(world, off, dir.func_176734_d());
++        return func_150098_a(world.func_147439_a(x, y, z)) || 
++                world.isSideSolid(x, y, z, dir.getOpposite(), false);
 +    }
  }