Fix license and naming

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

.gitignore

@@ -14,10 +14,3 @@
 #occupational hazards
 /eclipse/
 /repo/
-/buildSrc
-
-#Patch rejects
-*.rej
-/patches-/
-# FML changelog
-changelog.txt

.gitmodules

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

CREDITS-fml.txt

@@ -0,0 +1,27 @@
+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, minecraft bukkit servers, and minecraft clients.
+
+The code is authored by cpw.
+
+It (partially) implements API defined by the client side ModLoader, authored by Risugami.
+http://www.minecraftforum.net/topic/75440-
+
+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

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

MinecraftForge-Credits.txt

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

MinecraftForge-License.txt

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

Paulscode IBXM Library License.txt

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

Paulscode SoundSystem CodecIBXM License.txt

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

README.txt

@@ -1,31 +1,117 @@
-*** HOW TO INSTALL ***
-For Mod Users:
+This is Forge Mod Loader, or FML for short, by cpw.
 
-Download the latest installer from http://files.minecraftforge.net and follow instructions given by the installer.
+More information can be found at https://github.com/MinecraftForge/FML/wiki
 
+It is a clean reimplementation of a mod loading system for client, server and
+bukkit use, incorporating API implementations of client side ModLoader by
+Risugami.
 
-For Mod Devs:
+It can be installed on its own, or as part of Minecraft Forge.
 
-Download the latest Forge source distribution from http://files.minecraftforge.net and unzip it to a folder.
-Open a command prompt, navigate to the directory where you unzipped the Forge sources, and run:
-If you have Gradle: gradle setupDevWorkspace
-If you DO NOT have Gradle installed:
-Windows: ./gradlew.bat setupDevWorkspace
-MacOS/Linux: ./gradlew setupDevWorkspace
+----------------------
+About Forge Mod Loader
+----------------------
 
-If you wish to use the Eclipse IDE, run gradle eclipse instead of gradle setupDevWorkspace, or install the Gradle plugin for Eclipse and import the Forge source folder as a Gradle project.
+Environments and compatibility
+==============================
+FML covers the three main environments: client, server and bukkit. All
+environments share the main mod loading code base, with additional varying hooks
+based on the specific environment. Compatibility is almost 100% with all 
+ModLoader based mods- any mod with any difficulty (unless noted below) should
+be reported as a ticket to the github, please.
 
+Client side mods should be 100% compatible with ModLoader. The only exception is
+Optifine, however new versions of optifine are compatible. There are some very
+visible changes to the client when FML is installed.
 
-For Contributors: (Note: This assumes you have Gradle installed. If you don't, use ./gradlew(.bat) instead of gradle.
+Server side mods are mostly compatible with previous MLMP based incarnations,
+however, this compatibility is not guaranteed. Most mods have adapted to FML 
+and MLMP is not assured and will cause errors. Ask your mod author to update
+to FML.
 
-Clone this repository to a folder. 
-Open a command prompt and navigate to the folder where you cloned this repo.
-Run gradle setupForge to setup your development environment.
+Bukkit side modding is an adaptation of the server side mod code to the bukkit
+environment. Mods need to be recompiled against the bukkit decompilation to work
+however there are guides and tools in development to make this process easier.
+Consult mcportcentral.co.za for more information.
 
-To use Eclipse, point your Eclipse workspace at the eclipse folder inside the repo.
+Minecraft Forge in all cases bundles FML as it's modloading technology of choice
+because FML is open source, freely distributable, and can be easily updated by
+contributors through github.
 
+Notable integrations
+====================
+Optifine has FML compatibility. It varies from Optifine release to release, however
+in general it will work well alongside an FML or 
+Minecraft Forge installation. FML will detect and ensure the good operation of
+Optifine (you can see it in your client as an additional data line on the 
+bottom left).
 
-Requirements (for both mod devs and contributors):
-  You must have a JDK installed and accessible.
-  If you do not wish to use the gradle wrapper, you can install Gradle from http://www.gradle.org/ .
- 
+Client notes
+============
+FML does provide a standard pattern for mods to provide HD textures. This is why
+optifine needed integration code. FML supports HD texture packs
+up to 128x resolution.
+
+Mod information
+===============
+FML exposes the mod information through a mod list visible on the main screen as
+well as some small branding enhancements. For full data mods need to provide an
+information file. This file is a standard format so hopefully tools providing
+launch capabilities can also leverage this content.
+
+-------------------------------
+Binary installation information
+-------------------------------
+If you have downloaded a binary zip file you can install it as follows (client
+or server):
+
+Installation
+============
+To install on a server, simply execute the FML or Forge jar file, with a copy of
+minecraft_server.jar placed in the same directory. FML will launch it's patched
+copy.
+
+To install on a client, FIRST delete META-INF from the minecraft.jar file, then
+copy the contents of the FML or Forge jar file into it. FML and Forge provide 
+their own META-INF data which should *not* be deleted.
+
+Forge Installation
+==================
+This code also ships as a part of Minecraft Forge. You do not need to install it
+separately from your Minecraft Forge installation. Minecraft Forge contains the
+exact same code as this. Generally, you should not install FML if you are also
+installing Minecraft Forge.
+
+-------------------------------------------
+Source installation information for modders
+-------------------------------------------
+This code follows the Minecraft Forge installation methodology. It will apply
+some small patches to your MCP extracted source code, giving you and it access 
+to some of the data and functions you need to build a successful mod.
+
+Note also that the patches are built against "unrenamed" MCP source code- this
+means that you will not be able to read them directly against normal code.
+
+Source pack installation information:
+
+Standalone source installation
+==============================
+
+To install this source code for development purposes, extract this zip file 
+into an mcp installation containing vanilla jars only. It should create a new
+folder "fml" inside that installation.
+
+Be sure that you have both vanilla client jars, and the vanilla server jar installed
+as per the MCP install instructions. Both are required for FML to run properly.
+
+Once extracted, run the install.sh or install.bat script provided from the fml
+directory. It should decompile and patch your MCP source code for the client
+and server.
+
+Forge source installation
+=========================
+MinecraftForge ships with this code and installs it as part of the forge
+installation process, no further action is required on your part.
+
+For reference this is version @MAJOR@.@MINOR@.@REV@.@BUILD@ of FML
+for Minecraft version @MCVERSION@.

build.gradle

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

conf/astyle.cfg

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

conf/mcp.cfg

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

conf/patches/Start.java

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

conf/patches/minecraft_ff.patch

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

conf/patches/minecraft_server_ff.patch

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

conf/version.cfg

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

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Tue Oct 29 18:00:54 CDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip

gradlew

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

gradlew.bat

@@ -69,7 +69,7 @@ set CMD_LINE_ARGS=%$
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\fml\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

install/build.gradle

@@ -0,0 +1,22 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
+    }
+}
+
+apply plugin: '${name}'
+
+version = "1.0"
+group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = "modid"
+
+minecraft {
+	version = "${version}"
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,14 @@
+<?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="/Minecraft/lib/net/minecraft/launchwrapper/1.3/launchwrapper-1.3.jar"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.minecraft.launchwrapper.Launch"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--version 1.6 --tweakClass cpw.mods.fml.common.launcher.FMLTweaker"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Minecraft"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:Minecraft/jars}"/>
+</launchConfiguration>

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

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

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

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

jsons/1.6-dev.json

@@ -0,0 +1,125 @@
+{
+  "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

@@ -0,0 +1,93 @@
+{
+  "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

@@ -0,0 +1,137 @@
+{
+  "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

@@ -0,0 +1,127 @@
+{
+  "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

@@ -0,0 +1,137 @@
+{
+  "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

@@ -0,0 +1,220 @@
+{
+  "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

@@ -0,0 +1,137 @@
+{
+  "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

@@ -0,0 +1,214 @@
+{
+  "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

@@ -0,0 +1,137 @@
+{
+  "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

@@ -0,0 +1,214 @@
+{
+  "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.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"
+  }
+}

mcp_merge.cfg

@@ -0,0 +1,4 @@
+^org/bouncycastle
+^org/apache
+^com/google
+^argo

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

@@ -1,73 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockBush.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockBush.java
-@@ -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 IPlantable
- {
-     private static final String __OBFID = "CL_00000208";
- 
-@@ -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_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_)
-@@ -57,7 +62,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_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_149668_a(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_)
-@@ -79,4 +84,37 @@
-     {
-         return 1;
-     }
-+
-+    @Override
-+    public EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z)
-+    {
-+        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 Block getPlant(IBlockAccess world, int x, int y, int z)
-+    {
-+        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,100 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockButton.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockButton.java
-@@ -14,6 +14,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 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_)
-     {
--        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 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,49 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockCactus.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockCactus.java
-@@ -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 IPlantable
- {
-     @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);
-         }
-     }
- 
-@@ -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 EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z)
-+    {
-+        return EnumPlantType.Desert;
-+    }
-+
-+    @Override
-+    public Block getPlant(IBlockAccess world, int x, int y, int z)
-+    {
-+        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,44 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockChest.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockChest.java
-@@ -23,6 +23,8 @@
- import net.minecraft.world.IBlockAccess;
- import net.minecraft.world.World;
- 
-+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,46 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockCocoa.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockCocoa.java
-@@ -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.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_)
-     {
-+        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 ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int p_149690_5_, int fortune)
-+    {
-+        ArrayList<ItemStack> dropped = super.getDrops(world, x, y, z, p_149690_5_, fortune);
-         int j1 = func_149987_c(p_149690_5_);
-         byte b0 = 1;
- 
-@@ -170,8 +178,9 @@
- 
-         for (int k1 = 0; k1 < b0; ++k1)
-         {
--            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,79 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockCrops.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockCrops.java
-@@ -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.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 (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;
-                     }
-@@ -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_)
-     {
-         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_149690_1_.field_72995_K)
--        {
--            if (p_149690_5_ >= 7)
--            {
--                int j1 = 3 + p_149690_7_;
--
--                for (int k1 = 0; k1 < j1; ++k1)
--                {
--                    if (p_149690_1_.field_73012_v.nextInt(15) <= p_149690_5_)
--                    {
--                        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_149650_a(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
-@@ -204,4 +190,23 @@
-     {
-         this.func_149863_m(p_149853_1_, p_149853_3_, p_149853_4_, p_149853_5_);
-     }
-+
-+    @Override
-+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
-+    {
-+        ArrayList<ItemStack> ret = super.getDrops(world, x, y, z, metadata, fortune);
-+
-+        if (metadata >= 7)
-+        {
-+            for (int i = 0; i < 3 + fortune; ++i)
-+            {
-+                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,45 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockDeadBush.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockDeadBush.java
-@@ -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 IShearable
- {
-     private static final String __OBFID = "CL_00000224";
- 
-@@ -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_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(Blocks.field_150330_I, 1, p_149636_6_));
--        }
--        else
--        {
-             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, IBlockAccess world, int x, int y, int z) { return true; }
-+    @Override
-+    public ArrayList<ItemStack> onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune)
-+    {
-+        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,20 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockDoor.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockDoor.java
-@@ -249,7 +249,7 @@
-     {
-         if (this.field_149764_J == Material.field_151573_f)
-         {
--            return true;
-+            return false; //Allow items to interact with the door
-         }
-         else
-         {
-@@ -367,7 +367,7 @@
- 
-     public boolean func_149742_c(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
-     {
--        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,52 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockDoublePlant.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockDoublePlant.java
-@@ -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, IShearable
- {
-     public static final String[] field_149892_a = new String[] {"sunflower", "syringa", "grass", "fern", "rose", "paeonia"};
-     @SideOnly(Side.CLIENT)
-@@ -81,6 +83,7 @@
- 
-     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));
-     }
-+
-+    @Override
-+    public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z)
-+    {
-+        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 ArrayList<ItemStack> onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune)
-+    {
-+        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;
-+    }
- }

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

@@ -1,19 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockFalling.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockFalling.java
-@@ -84,7 +84,7 @@
-     {
-         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,20 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockFarmland.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockFarmland.java
-@@ -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;
- 
- 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,309 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockFire.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockFire.java
-@@ -2,7 +2,10 @@
- 
- 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.*;
- 
- 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);
-     }
- 
-+    @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_);
-     }
- 
-     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 (!this.func_149742_c(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_))
-             {
-                 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;
-                     }
- 
--                    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)
-                     {
-@@ -201,10 +203,16 @@
-         return false;
-     }
- 
-+    @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_)
-     {
--        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_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 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_149841_6_.nextInt(p_149841_5_) < j1)
-         {
-             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_)
-     {
--        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
-         {
--            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
-     public boolean func_149844_e(IBlockAccess p_149844_1_, int p_149844_2_, int p_149844_3_, int p_149844_4_)
-     {
--        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);
-     }
- 
-+    @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_)
-     {
--        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 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, int x, int y, int z, ForgeDirection 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,38 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockFlowerPot.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockFlowerPot.java
-@@ -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.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_)
-     {
-         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)
--        {
--            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()));
--        }
-     }
- 
-     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);
-     }
-+
-+    @Override
-+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
-+    {
-+        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;
-+    }
- }

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

@@ -1,37 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockGrass.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockGrass.java
-@@ -43,7 +43,7 @@
-     {
-         if (!p_149674_1_.field_72995_K)
-         {
--            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_149674_1_.func_147449_b(p_149674_2_, p_149674_3_, p_149674_4_, Blocks.field_150346_d);
-             }
-@@ -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 (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, 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/BlockIce.java.patch

@@ -1,50 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockIce.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockIce.java
-@@ -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;
-@@ -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_))
-         {
-+            ArrayList<ItemStack> items = new ArrayList<ItemStack>();
-             ItemStack itemstack = this.func_149644_j(p_149636_6_);
- 
--            if (itemstack != null)
--            {
--                this.func_149642_a(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, itemstack);
--            }
-+            if (itemstack != null) items.add(itemstack);
-+
-+            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)
-+                this.func_149642_a(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, is);
-         }
-         else
-         {
-@@ -61,7 +65,9 @@
-             }
- 
-             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_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,93 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockLadder.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockLadder.java
-@@ -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;
- 
-+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_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_)
-     {
-         int j1 = p_149660_9_;
- 
--        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 1;
-     }
-+
-+    @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,171 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockLeaves.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockLeaves.java
-@@ -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 IShearable
- {
-     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))
-                         {
--                            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);
-                         }
-                     }
-                 }
-@@ -127,9 +129,9 @@
-                             {
-                                 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_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_149674_1_, p_149674_2_ + l1, p_149674_3_ + i2, p_149674_4_ + j2))
-                                     {
-                                         this.field_150128_a[(l1 + k1) * j1 + (i2 + k1) * b1 + j2 + k1] = -2;
-                                     }
-@@ -236,40 +238,7 @@
- 
-     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_149690_1_.field_72995_K)
--        {
--            int j1 = this.func_150123_b(p_149690_5_);
--
--            if (p_149690_7_ > 0)
--            {
--                j1 -= 2 << p_149690_7_;
--
--                if (j1 < 10)
--                {
--                    j1 = 10;
--                }
--            }
--
--            if (p_149690_1_.field_73012_v.nextInt(j1) == 0)
--            {
--                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_)));
--            }
--
--            j1 = 200;
--
--            if (p_149690_7_ > 0)
--            {
--                j1 -= 10 << p_149690_7_;
--
--                if (j1 < 40)
--                {
--                    j1 = 40;
--                }
--            }
--
--            this.func_150124_c(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, j1);
--        }
-+        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_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 String[] func_150125_e();
-+
-+
-+    @Override
-+    public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z)
-+    {
-+        return true;
-+    }
-+
-+    @Override
-+    public ArrayList<ItemStack> onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune)
-+    {
-+        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)
-+        {
-+            chance -= 2 << fortune;
-+            if (chance < 10) chance = 10;
-+        }
-+
-+        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)
-+        {
-+            chance -= 10 << fortune;
-+            if (chance < 40) chance = 40;
-+        }
-+
-+        this.captureDrops(true);
-+        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,128 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockLever.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockLever.java
-@@ -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 ));
-     }
- 
-     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() ? 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

@@ -1,11 +0,0 @@
---- ../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,45 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockLog.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockLog.java
-@@ -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;
- 
- public abstract class BlockLog extends BlockRotatedPillar
-@@ -53,14 +54,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))
-                         {
--                            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);
-                         }
-                     }
-                 }
-@@ -79,4 +76,16 @@
-     {
-         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,28 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockMobSpawner.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockMobSpawner.java
-@@ -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_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(IBlockAccess world, int metadata, int fortune)
-+    {
-+        return 15 + rand.nextInt(15) + rand.nextInt(15);
-+    }
-+
-     public boolean func_149662_c()
-     {
-         return false;

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

@@ -1,19 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockMushroom.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockMushroom.java
-@@ -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)
-         {
-             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 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockMycelium.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockMycelium.java
-@@ -37,7 +37,7 @@
-     {
-         if (!p_149674_1_.field_72995_K)
-         {
--            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_149674_1_.func_147449_b(p_149674_2_, p_149674_3_, p_149674_4_, Blocks.field_150346_d);
-             }
-@@ -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 (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,65 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockNetherWart.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockNetherWart.java
-@@ -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.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_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_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_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_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 j1 = 1;
- 
-@@ -109,4 +114,23 @@
-             this.field_149883_a[i] = p_149651_1_.func_94245_a(this.func_149641_N() + "_stage_" + i);
-         }
-     }
-+
-+    @Override
-+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
-+    {
-+        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
-+        int count = 1;
-+
-+        if (metadata >= 3)
-+        {
-+            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++)
-+        {
-+            ret.add(new ItemStack(Items.field_151075_bm));
-+        }
-+
-+        return ret;
-+    }
- }

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

@@ -1,24 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockNote.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockNote.java
-@@ -45,7 +45,9 @@
- 
-             if (tileentitynote != null)
-             {
-+                int old = tileentitynote.field_145879_a;
-                 tileentitynote.func_145877_a();
-+                if (old == tileentitynote.field_145879_a) return false;
-                 tileentitynote.func_145878_a(p_149727_1_, p_149727_2_, p_149727_3_, p_149727_4_);
-             }
- 
-@@ -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_)
-     {
-+        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_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/BlockOre.java.patch

@@ -1,58 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockOre.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockOre.java
-@@ -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_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(IBlockAccess p_149690_1_, int p_149690_5_, int p_149690_7_)
-+    {
-+        if (this.func_149650_a(p_149690_5_, rand, p_149690_7_) != Item.func_150898_a(this))
-         {
-             int j1 = 0;
- 
-             if (this == Blocks.field_150365_q)
-             {
--                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)
-             {
--                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)
-             {
--                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)
-             {
--                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)
-             {
--                j1 = MathHelper.func_76136_a(p_149690_1_.field_73012_v, 2, 5);
-+                j1 = MathHelper.func_76136_a(rand, 2, 5);
-             }
- 
--            this.func_149657_c(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, j1);
-+            return j1;
-         }
-+        return 0;
-     }
- 
-     public int func_149692_a(int p_149692_1_)

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

@@ -1,52 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockPane.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockPane.java
-@@ -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 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_)
-     {
--        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))
-         {
-@@ -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, int x, int y, int z, ForgeDirection dir)
-+    {
-+        return func_150098_a(world.func_147439_a(x, y, z)) || 
-+                world.isSideSolid(x, y, z, dir.getOpposite(), false);
-+    }
- }

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

@@ -1,65 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockPistonBase.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockPistonBase.java
-@@ -11,6 +11,7 @@
- import net.minecraft.entity.player.EntityPlayer;
- import net.minecraft.init.Blocks;
- import net.minecraft.item.ItemStack;
-+import net.minecraft.server.management.PlayerManager;
- import net.minecraft.tileentity.TileEntity;
- import net.minecraft.tileentity.TileEntityPiston;
- import net.minecraft.util.AxisAlignedBB;
-@@ -360,7 +361,8 @@
-                 return false;
-             }
- 
--            return !(p_150080_0_ instanceof ITileEntityProvider);
-+            return !(p_150080_1_.func_147439_a(p_150080_2_, p_150080_3_, p_150080_4_).hasTileEntity(p_150080_1_.func_72805_g(p_150080_2_, p_150080_3_, p_150080_4_)));
-+            
-         }
-     }
- 
-@@ -375,14 +377,14 @@
-         {
-             if (l1 < 13)
-             {
--                if (j1 <= 0 || j1 >= 255)
-+                if (j1 <= 0 || j1 >= p_150077_0_.func_72800_K())
-                 {
-                     return false;
-                 }
- 
-                 Block block = p_150077_0_.func_147439_a(i1, j1, k1);
- 
--                if (block.func_149688_o() != Material.field_151579_a)
-+                if (!block.isAir(p_150077_0_, i1, j1, k1))
-                 {
-                     if (!func_150080_a(block, p_150077_0_, i1, j1, k1, true))
-                     {
-@@ -420,14 +422,14 @@
-         {
-             if (l1 < 13)
-             {
--                if (j1 <= 0 || j1 >= 255)
-+                if (j1 <= 0 || j1 >= p_150079_1_.func_72800_K())
-                 {
-                     return false;
-                 }
- 
-                 Block block = p_150079_1_.func_147439_a(i1, j1, k1);
- 
--                if (block.func_149688_o() != Material.field_151579_a)
-+                if (!block.isAir(p_150079_1_, i1, j1, k1))
-                 {
-                     if (!func_150080_a(block, p_150079_1_, i1, j1, k1, true))
-                     {
-@@ -448,7 +450,9 @@
-                         continue;
-                     }
- 
--                    block.func_149697_b(p_150079_1_, i1, j1, k1, p_150079_1_.func_72805_g(i1, j1, k1), 0);
-+                    //With our change to how snowballs are dropped this needs to disallow to mimic vanilla behavior.
-+                    float chance = block instanceof BlockSnow ? -1.0f : 1.0f;
-+                    block.func_149690_a(p_150079_1_, i1, j1, k1, p_150079_1_.func_72805_g(i1, j1, k1), chance, 0);
-                     p_150079_1_.func_147468_f(i1, j1, k1);
-                 }
-             }

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

@@ -1,47 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockPistonMoving.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockPistonMoving.java
-@@ -2,11 +2,13 @@
- 
- 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;
- import net.minecraft.entity.player.EntityPlayer;
- import net.minecraft.item.Item;
-+import net.minecraft.item.ItemStack;
- import net.minecraft.tileentity.TileEntity;
- import net.minecraft.tileentity.TileEntityPiston;
- import net.minecraft.util.AxisAlignedBB;
-@@ -90,15 +92,7 @@
- 
-     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_149690_1_.field_72995_K)
--        {
--            TileEntityPiston tileentitypiston = this.func_149963_e(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_);
--
--            if (tileentitypiston != null)
--            {
--                tileentitypiston.func_145861_a().func_149697_b(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, tileentitypiston.func_145832_p(), 0);
--            }
--        }
-+        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_);
-     }
- 
-     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_)
-@@ -231,4 +225,13 @@
-     {
-         this.field_149761_L = p_149651_1_.func_94245_a("piston_top_normal");
-     }
-+
-+    @Override
-+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
-+    {
-+        TileEntityPiston te = this.func_149963_e(world, x, y, z);
-+        if (te != null)
-+            return te.func_145861_a().getDrops(world, x, y, z, te.func_145832_p(), 0);
-+        return new ArrayList<ItemStack>();
-+    }
- }

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

@@ -1,32 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockPotato.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockPotato.java
-@@ -1,5 +1,6 @@
- package net.minecraft.block;
- 
-+import java.util.ArrayList;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import net.minecraft.client.renderer.texture.IIconRegister;
-@@ -46,14 +47,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_149690_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, p_149690_7_);
-+    }
- 
--        if (!p_149690_1_.field_72995_K)
--        {
--            if (p_149690_5_ >= 7 && p_149690_1_.field_73012_v.nextInt(50) == 0)
--            {
--                this.func_149642_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, new ItemStack(Items.field_151170_bI));
--            }
--        }
-+    @Override
-+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune)
-+    {
-+        ArrayList<ItemStack> ret = super.getDrops(world, x, y, z, metadata, fortune);
-+        if (metadata >= 7 && world.field_73012_v.nextInt(50) == 0)
-+            ret.add(new ItemStack(Items.field_151170_bI));
-+        return ret;
-     }
- 
-     @SideOnly(Side.CLIENT)

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

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockPumpkin.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockPumpkin.java
-@@ -113,7 +113,7 @@
- 
-     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_, p_149742_3_, p_149742_4_).field_149764_J.func_76222_j() && World.func_147466_a(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_);
-+        return  p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_, p_149742_4_).isReplaceable(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && World.func_147466_a(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_);
-     }
- 
-     public void func_149689_a(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_)

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

@@ -1,208 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockRailBase.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockRailBase.java
-@@ -5,6 +5,7 @@
- import java.util.Random;
- import net.minecraft.block.material.Material;
- import net.minecraft.creativetab.CreativeTabs;
-+import net.minecraft.entity.item.EntityMinecart;
- import net.minecraft.init.Blocks;
- import net.minecraft.util.AxisAlignedBB;
- import net.minecraft.util.MovingObjectPosition;
-@@ -25,7 +26,7 @@
- 
-     public static final boolean func_150051_a(Block p_150051_0_)
-     {
--        return p_150051_0_ == Blocks.field_150448_aq || p_150051_0_ == Blocks.field_150318_D || p_150051_0_ == Blocks.field_150319_E || p_150051_0_ == Blocks.field_150408_cc;
-+        return p_150051_0_ instanceof BlockRailBase;
-     }
- 
-     protected BlockRailBase(boolean p_i45389_1_)
-@@ -78,7 +79,7 @@
- 
-     public int func_149645_b()
-     {
--        return 9;
-+        return renderType;
-     }
- 
-     public int func_149745_a(Random p_149745_1_)
-@@ -193,6 +194,111 @@
-         }
-     }
- 
-+    /* ======================================== FORGE START =====================================*/
-+    /**
-+     * Return true if the rail can make corners.
-+     * Used by placement logic.
-+     * @param world The world.
-+     * @param x The rail X coordinate.
-+     * @param y The rail Y coordinate.
-+     * @param z The rail Z coordinate.
-+     * @return True if the rail can make corners.
-+     */
-+    public boolean isFlexibleRail(IBlockAccess world, int y, int x, int z)
-+    {
-+        return !func_150050_e();
-+    }
-+
-+    /**
-+     * Returns true if the rail can make up and down slopes.
-+     * Used by placement logic.
-+     * @param world The world.
-+     * @param x The rail X coordinate.
-+     * @param y The rail Y coordinate.
-+     * @param z The rail Z coordinate.
-+     * @return True if the rail can make slopes.
-+     */
-+    public boolean canMakeSlopes(IBlockAccess world, int x, int y, int z)
-+    {
-+        return true;
-+    }
-+
-+    /**
-+     * Return the rail's metadata (without the power bit if the rail uses one).
-+     * Can be used to make the cart think the rail something other than it is,
-+     * for example when making diamond junctions or switches.
-+     * The cart parameter will often be null unless it it called from EntityMinecart.
-+     * 
-+     * Valid rail metadata is defined as follows:
-+     * 0x0: flat track going North-South
-+     * 0x1: flat track going West-East
-+     * 0x2: track ascending to the East
-+     * 0x3: track ascending to the West
-+     * 0x4: track ascending to the North
-+     * 0x5: track ascending to the South
-+     * 0x6: WestNorth corner (connecting East and South)
-+     * 0x7: EastNorth corner (connecting West and South)
-+     * 0x8: EastSouth corner (connecting West and North)
-+     * 0x9: WestSouth corner (connecting East and North)
-+     * 
-+     * @param world The world.
-+     * @param cart The cart asking for the metadata, null if it is not called by EntityMinecart.
-+     * @param y The rail X coordinate.
-+     * @param x The rail Y coordinate.
-+     * @param z The rail Z coordinate.
-+     * @return The metadata.
-+     */
-+    public int getBasicRailMetadata(IBlockAccess world, EntityMinecart cart, int x, int y, int z)
-+    {
-+        int meta = world.func_72805_g(x, y, z);
-+        if(func_150050_e())
-+        {
-+            meta = meta & 7;
-+        }
-+        return meta;
-+    }
-+
-+    /**
-+     * Returns the max speed of the rail at the specified position.
-+     * @param world The world.
-+     * @param cart The cart on the rail, may be null.
-+     * @param x The rail X coordinate.
-+     * @param y The rail Y coordinate.
-+     * @param z The rail Z coordinate.
-+     * @return The max speed of the current rail.
-+     */
-+    public float getRailMaxSpeed(World world, EntityMinecart cart, int y, int x, int z)
-+    {
-+        return 0.4f;
-+    }
-+
-+    /**
-+     * This function is called by any minecart that passes over this rail.
-+     * It is called once per update tick that the minecart is on the rail.
-+     * @param world The world.
-+     * @param cart The cart on the rail.
-+     * @param y The rail X coordinate.
-+     * @param x The rail Y coordinate.
-+     * @param z The rail Z coordinate.
-+     */
-+    public void onMinecartPass(World world, EntityMinecart cart, int y, int x, int z)
-+    {
-+    }    
-+    
-+    /**
-+     * Forge: Moved render type to a field and a setter.
-+     * This allows for a mod to change the render type
-+     * for vanilla rails, and any mod rails that extend
-+     * this class.
-+     */
-+    private int renderType = 9;
-+    
-+    public void setRenderType(int value)
-+    {
-+        renderType = value;
-+    }
-+    /* ======================================== FORGE END =====================================*/
-+
-     public class Rail
-     {
-         private World field_150660_b;
-@@ -202,6 +308,7 @@
-         private final boolean field_150656_f;
-         private List field_150657_g = new ArrayList();
-         private static final String __OBFID = "CL_00000196";
-+        private final boolean canMakeSlopes;
- 
-         public Rail(World p_i45388_2_, int p_i45388_3_, int p_i45388_4_, int p_i45388_5_)
-         {
-@@ -209,19 +316,10 @@
-             this.field_150661_c = p_i45388_3_;
-             this.field_150658_d = p_i45388_4_;
-             this.field_150659_e = p_i45388_5_;
--            Block block = p_i45388_2_.func_147439_a(p_i45388_3_, p_i45388_4_, p_i45388_5_);
--            int l = p_i45388_2_.func_72805_g(p_i45388_3_, p_i45388_4_, p_i45388_5_);
--
--            if (((BlockRailBase)block).field_150053_a)
--            {
--                this.field_150656_f = true;
--                l &= -9;
--            }
--            else
--            {
--                this.field_150656_f = false;
--            }
--
-+            BlockRailBase block = (BlockRailBase)p_i45388_2_.func_147439_a(p_i45388_3_, p_i45388_4_, p_i45388_5_);
-+            int l = block.getBasicRailMetadata(p_i45388_2_, null, p_i45388_3_, p_i45388_4_, p_i45388_5_);
-+            this.field_150656_f = !block.isFlexibleRail(p_i45388_2_, p_i45388_3_, p_i45388_4_, p_i45388_5_);
-+            canMakeSlopes = block.canMakeSlopes(p_i45388_2_, p_i45388_3_, p_i45388_4_, p_i45388_5_);
-             this.func_150648_a(l);
-         }
- 
-@@ -412,7 +510,7 @@
-                 }
-             }
- 
--            if (b0 == 0)
-+            if (b0 == 0 && canMakeSlopes)
-             {
-                 if (BlockRailBase.func_150049_b_(this.field_150660_b, this.field_150661_c, this.field_150658_d + 1, this.field_150659_e - 1))
-                 {
-@@ -425,7 +523,7 @@
-                 }
-             }
- 
--            if (b0 == 1)
-+            if (b0 == 1 && canMakeSlopes)
-             {
-                 if (BlockRailBase.func_150049_b_(this.field_150660_b, this.field_150661_c + 1, this.field_150658_d + 1, this.field_150659_e))
-                 {
-@@ -570,7 +668,7 @@
-                 }
-             }
- 
--            if (b0 == 0)
-+            if (b0 == 0 && canMakeSlopes)
-             {
-                 if (BlockRailBase.func_150049_b_(this.field_150660_b, this.field_150661_c, this.field_150658_d + 1, this.field_150659_e - 1))
-                 {
-@@ -583,7 +681,7 @@
-                 }
-             }
- 
--            if (b0 == 1)
-+            if (b0 == 1 && canMakeSlopes)
-             {
-                 if (BlockRailBase.func_150049_b_(this.field_150660_b, this.field_150661_c + 1, this.field_150658_d + 1, this.field_150659_e))
-                 {

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

@@ -1,22 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockRedstoneComparator.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneComparator.java
-@@ -228,4 +228,19 @@
-     {
-         return new TileEntityComparator();
-     }
-+
-+    @Override
-+    public void onNeighborChange(IBlockAccess world, int x, int y, int z, int tileX, int tileY, int tileZ)
-+    {
-+        if (y == tileY && world instanceof World)
-+        {
-+            func_149695_a((World)world, x, y, z, world.func_147439_a(tileX, tileY, tileZ));
-+        }   
-+    }
-+    
-+    @Override
-+    public boolean getWeakChanges(IBlockAccess world, int x, int y, int z)
-+    {
-+        return true;
-+    }
- }

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

@@ -1,31 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockRedstoneOre.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneOre.java
-@@ -10,6 +10,7 @@
- import net.minecraft.init.Items;
- import net.minecraft.item.Item;
- import net.minecraft.item.ItemStack;
-+import net.minecraft.world.IBlockAccess;
- import net.minecraft.world.World;
- 
- public class BlockRedstoneOre extends Block
-@@ -88,12 +89,17 @@
-     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_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 // World, meta, fortune
-+    public int getExpDrop(IBlockAccess p_149690_1_, int p_149690_5_, int p_149690_7_)
-+    {
-+        if (this.func_149650_a(p_149690_5_, rand, p_149690_7_) != Item.func_150898_a(this))
-         {
--            int j1 = 1 + p_149690_1_.field_73012_v.nextInt(5);
--            this.func_149657_c(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, j1);
-+            return 1 + rand.nextInt(5);
-         }
-+        return 0;
-     }
- 
-     @SideOnly(Side.CLIENT)

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

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockRedstoneWire.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneWire.java
-@@ -405,7 +405,7 @@
-         }
-         else if (!Blocks.field_150413_aR.func_149907_e(block))
-         {
--            return block.func_149744_f() && p_150174_4_ != -1;
-+            return block.canConnectRedstone(p_150174_0_, p_150174_1_, p_150174_2_, p_150174_3_, p_150174_4_);
-         }
-         else
-         {

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

@@ -1,47 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockReed.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockReed.java
-@@ -11,7 +11,11 @@
- import net.minecraft.world.IBlockAccess;
- import net.minecraft.world.World;
- 
--public class BlockReed extends Block
-+import net.minecraftforge.common.EnumPlantType;
-+import net.minecraftforge.common.util.ForgeDirection;
-+import net.minecraftforge.common.IPlantable;
-+
-+public class BlockReed extends Block implements IPlantable
- {
-     private static final String __OBFID = "CL_00000300";
- 
-@@ -57,7 +61,7 @@
-     public boolean func_149742_c(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
-     {
-         Block block = p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_ - 1, p_149742_4_);
--        return block == this ? true : (block != Blocks.field_150349_c && block != Blocks.field_150346_d && block != Blocks.field_150354_m ? false : (p_149742_1_.func_147439_a(p_149742_2_ - 1, p_149742_3_ - 1, p_149742_4_).func_149688_o() == Material.field_151586_h ? true : (p_149742_1_.func_147439_a(p_149742_2_ + 1, p_149742_3_ - 1, p_149742_4_).func_149688_o() == Material.field_151586_h ? true : (p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_ - 1, p_149742_4_ - 1).func_149688_o() == Material.field_151586_h ? true : p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_ - 1, p_149742_4_ + 1).func_149688_o() == Material.field_151586_h))));
-+        return block.canSustainPlant(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_, ForgeDirection.UP, this);
-     }
- 
-     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_)
-@@ -120,4 +124,22 @@
-     {
-         return p_149720_1_.func_72807_a(p_149720_2_, p_149720_4_).func_150558_b(p_149720_2_, p_149720_3_, p_149720_4_);
-     }
-+
-+    @Override
-+    public EnumPlantType getPlantType(IBlockAccess world, int x, int y, int z)
-+    {
-+        return EnumPlantType.Beach;
-+    }
-+
-+    @Override
-+    public Block getPlant(IBlockAccess world, int x, int y, int z)
-+    {
-+        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/BlockSapling.java.patch

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockSapling.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockSapling.java
-@@ -71,6 +71,7 @@
- 
-     public void func_149878_d(World p_149878_1_, int p_149878_2_, int p_149878_3_, int p_149878_4_, Random p_149878_5_)
-     {
-+        if (!net.minecraftforge.event.terraingen.TerrainGen.saplingGrowTree(p_149878_1_, p_149878_5_, p_149878_2_, p_149878_3_, p_149878_4_)) return;
-         int l = p_149878_1_.func_72805_g(p_149878_2_, p_149878_3_, p_149878_4_) & 7;
-         Object object = p_149878_5_.nextInt(10) == 0 ? new WorldGenBigTree(true) : new WorldGenTrees(true);
-         int i1 = 0;

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

@@ -1,62 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockSkull.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockSkull.java
-@@ -2,6 +2,7 @@
- 
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
-+import java.util.ArrayList;
- import java.util.Iterator;
- import java.util.Random;
- import net.minecraft.block.material.Material;
-@@ -108,8 +109,6 @@
-         return p_149692_1_;
-     }
- 
--    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_) {}
--
-     public void func_149681_a(World p_149681_1_, int p_149681_2_, int p_149681_3_, int p_149681_4_, int p_149681_5_, EntityPlayer p_149681_6_)
-     {
-         if (p_149681_6_.field_71075_bZ.field_75098_d)
-@@ -118,29 +117,38 @@
-             p_149681_1_.func_72921_c(p_149681_2_, p_149681_3_, p_149681_4_, p_149681_5_, 4);
-         }
- 
-+        this.func_149697_b(p_149681_1_, p_149681_2_, p_149681_3_, p_149681_4_, p_149681_5_, 0);
-+
-         super.func_149681_a(p_149681_1_, p_149681_2_, p_149681_3_, p_149681_4_, p_149681_5_, p_149681_6_);
-     }
- 
-     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_)
-     {
--        if (!p_149749_1_.field_72995_K)
-+        super.func_149749_a(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_);
-+    }
-+
-+    @Override
-+    public ArrayList<ItemStack> getDrops(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, int p_149749_6_, int fortune)
-+    {
-+        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
-         {
-             if ((p_149749_6_ & 8) == 0)
-             {
-                 ItemStack itemstack = new ItemStack(Items.field_151144_bL, 1, this.func_149643_k(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_));
-                 TileEntitySkull tileentityskull = (TileEntitySkull)p_149749_1_.func_147438_o(p_149749_2_, p_149749_3_, p_149749_4_);
- 
-+                if (tileentityskull == null) return ret;
-+
-                 if (tileentityskull.func_145904_a() == 3 && tileentityskull.func_145907_c() != null && tileentityskull.func_145907_c().length() > 0)
-                 {
-                     itemstack.func_77982_d(new NBTTagCompound());
-                     itemstack.func_77978_p().func_74778_a("SkullOwner", tileentityskull.func_145907_c());
-                 }
- 
--                this.func_149642_a(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, itemstack);
-+                ret.add(itemstack);
-             }
--
--            super.func_149749_a(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_);
-         }
-+        return ret;
-     }
- 
-     public Item func_149650_a(int p_149650_1_, Random p_149650_2_, int p_149650_3_)

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

@@ -1,82 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockSnow.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockSnow.java
-@@ -73,7 +73,7 @@
-     public boolean func_149742_c(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
-     {
-         Block block = p_149742_1_.func_147439_a(p_149742_2_, p_149742_3_ - 1, p_149742_4_);
--        return block != Blocks.field_150432_aD && block != Blocks.field_150403_cj ? (block.func_149688_o() == Material.field_151584_j ? true : (block == this && (p_149742_1_.func_72805_g(p_149742_2_, p_149742_3_ - 1, p_149742_4_) & 7) == 7 ? true : block.func_149662_c() && block.field_149764_J.func_76230_c())) : false;
-+        return block != Blocks.field_150432_aD && block != Blocks.field_150403_cj ? (block.isLeaves(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_) ? true : (block == this && (p_149742_1_.func_72805_g(p_149742_2_, p_149742_3_ - 1, p_149742_4_) & 7) == 7 ? true : block.func_149662_c() && block.field_149764_J.func_76230_c())) : false;
-     }
- 
-     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_)
-@@ -85,7 +85,6 @@
-     {
-         if (!this.func_149742_c(p_150155_1_, p_150155_2_, p_150155_3_, p_150155_4_))
-         {
--            this.func_149697_b(p_150155_1_, p_150155_2_, p_150155_3_, p_150155_4_, p_150155_1_.func_72805_g(p_150155_2_, p_150155_3_, p_150155_4_), 0);
-             p_150155_1_.func_147468_f(p_150155_2_, p_150155_3_, p_150155_4_);
-             return false;
-         }
-@@ -97,10 +96,8 @@
- 
-     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_)
-     {
--        int i1 = p_149636_6_ & 7;
--        this.func_149642_a(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, new ItemStack(Items.field_151126_ay, i1 + 1, 0));
-+        super.func_149636_a(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_);
-         p_149636_1_.func_147468_f(p_149636_3_, p_149636_4_, p_149636_5_);
--        p_149636_2_.func_71064_a(StatList.field_75934_C[Block.func_149682_b(this)], 1);
-     }
- 
-     public Item func_149650_a(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
-@@ -110,14 +107,13 @@
- 
-     public int func_149745_a(Random p_149745_1_)
-     {
--        return 0;
-+        return 1;
-     }
- 
-     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_)
-     {
-         if (p_149674_1_.func_72972_b(EnumSkyBlock.Block, p_149674_2_, p_149674_3_, p_149674_4_) > 11)
-         {
--            this.func_149697_b(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_, p_149674_1_.func_72805_g(p_149674_2_, p_149674_3_, p_149674_4_), 0);
-             p_149674_1_.func_147468_f(p_149674_2_, p_149674_3_, p_149674_4_);
-         }
-     }
-@@ -127,4 +123,34 @@
-     {
-         return p_149646_5_ == 1 ? true : super.func_149646_a(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_);
-     }
-+
-+    /**
-+     * Metadata and fortune sensitive version, this replaces the old (int meta, Random rand)
-+     * version in 1.1.
-+     *
-+     * @param meta Blocks Metadata
-+     * @param fortune Current item fortune level
-+     * @param random Random number generator
-+     * @return The number of items to drop
-+     */
-+    public int quantityDropped(int meta, int fortune, Random random)
-+    {
-+        return (meta & 7) + 1;
-+    }
-+
-+    /**
-+     * Determines if a new block can be replace the space occupied by this one,
-+     * Used in the player's placement code to make the block act like water, and lava.
-+     *
-+     * @param world The current world
-+     * @param x X Position
-+     * @param y Y position
-+     * @param z Z position
-+     * @return True if the block is replaceable by another block
-+     */
-+    public boolean isReplaceable(IBlockAccess world, int x, int y, int z)
-+    {
-+        int meta = world.func_72805_g(x, y, z);
-+        return meta >= 7 ? false : field_149764_J.func_76222_j();
-+    }
- }

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

@@ -1,79 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockStem.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockStem.java
-@@ -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.client.renderer.texture.IIconRegister;
-@@ -14,6 +15,7 @@
- import net.minecraft.util.MathHelper;
- import net.minecraft.world.IBlockAccess;
- import net.minecraft.world.World;
-+import static net.minecraftforge.common.util.ForgeDirection.*;
- 
- public class BlockStem extends BlockBush implements IGrowable
- {
-@@ -101,7 +103,7 @@
- 
-                     Block block = p_149674_1_.func_147439_a(j1, p_149674_3_ - 1, k1);
- 
--                    if (p_149674_1_.func_147439_a(j1, p_149674_3_, k1).field_149764_J == Material.field_151579_a && (block == Blocks.field_150458_ak || block == Blocks.field_150346_d || block == Blocks.field_150349_c))
-+                    if (p_149674_1_.func_147437_c(j1, p_149674_3_, k1) && (block.canSustainPlant(p_149674_1_, j1, p_149674_3_ - 1, k1, UP, this) || block == Blocks.field_150346_d || block == Blocks.field_150349_c))
-                     {
-                         p_149674_1_.func_147449_b(j1, p_149674_3_, k1, this.field_149877_a);
-                     }
-@@ -144,11 +146,11 @@
-                 Block block8 = p_149875_1_.func_147439_a(l, p_149875_3_ - 1, i1);
-                 float f1 = 0.0F;
- 
--                if (block8 == Blocks.field_150458_ak)
-+                if (block8.canSustainPlant(p_149875_1_, l, p_149875_3_ - 1, i1, UP, this))
-                 {
-                     f1 = 1.0F;
- 
--                    if (p_149875_1_.func_72805_g(l, p_149875_3_ - 1, i1) > 0)
-+                    if (block8.isFertile(p_149875_1_, l, p_149875_3_ - 1, i1))
-                     {
-                         f1 = 3.0F;
-                     }
-@@ -211,11 +213,12 @@
-         return l < 7 ? -1 : (p_149873_1_.func_147439_a(p_149873_2_ - 1, p_149873_3_, p_149873_4_) == this.field_149877_a ? 0 : (p_149873_1_.func_147439_a(p_149873_2_ + 1, p_149873_3_, p_149873_4_) == this.field_149877_a ? 1 : (p_149873_1_.func_147439_a(p_149873_2_, p_149873_3_, p_149873_4_ - 1) == this.field_149877_a ? 2 : (p_149873_1_.func_147439_a(p_149873_2_, p_149873_3_, p_149873_4_ + 1) == this.field_149877_a ? 3 : -1))));
-     }
- 
-+    @SuppressWarnings("unused")
-     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_149690_a(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, p_149690_7_);
- 
--        if (!p_149690_1_.field_72995_K)
-+        if (false && !p_149690_1_.field_72995_K)
-         {
-             Item item = null;
- 
-@@ -282,4 +285,23 @@
-     {
-         this.func_149874_m(p_149853_1_, p_149853_3_, p_149853_4_, p_149853_5_);
-     }
-+
-+
-+    @Override
-+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int meta, int fortune)
-+    {
-+        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
-+
-+        Item item = null;
-+        item = field_149877_a == Blocks.field_150423_aK ? Items.field_151080_bb : item;
-+        item = field_149877_a == Blocks.field_150440_ba ? Items.field_151081_bc : item;
-+
-+        for (int i = 0; item != null && i < 3; i++)
-+        {
-+            if (world.field_73012_v.nextInt(15) <= meta)
-+                ret.add(new ItemStack(item));
-+        }
-+
-+        return ret;
-+    }
- }

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

@@ -1,83 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockTallGrass.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockTallGrass.java
-@@ -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;
-@@ -17,8 +18,10 @@
- import net.minecraft.world.ColorizerGrass;
- import net.minecraft.world.IBlockAccess;
- import net.minecraft.world.World;
-+import net.minecraftforge.common.ForgeHooks;
-+import net.minecraftforge.common.IShearable;
- 
--public class BlockTallGrass extends BlockBush implements IGrowable
-+public class BlockTallGrass extends BlockBush implements IGrowable, IShearable
- {
-     private static final String[] field_149871_a = new String[] {"deadbush", "tallgrass", "fern"};
-     @SideOnly(Side.CLIENT)
-@@ -53,7 +56,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_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_);
-     }
- 
-     @SideOnly(Side.CLIENT)
-@@ -71,7 +74,7 @@
- 
-     public Item func_149650_a(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
-     {
--        return p_149650_2_.nextInt(8) == 0 ? Items.field_151014_N : null;
-+        return null;
-     }
- 
-     public int func_149679_a(int p_149679_1_, Random p_149679_2_)
-@@ -81,13 +84,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(Blocks.field_150329_H, 1, p_149636_6_));
--        }
--        else
--        {
-             super.func_149636_a(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_);
-         }
-     }
-@@ -143,4 +140,28 @@
-             Blocks.field_150398_cm.func_149889_c(p_149853_1_, p_149853_3_, p_149853_4_, p_149853_5_, b0, 2);
-         }
-     }
-+
-+    @Override
-+    public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int meta, int fortune)
-+    {
-+        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
-+        if (world.field_73012_v.nextInt(8) != 0) return ret;
-+        ItemStack seed = ForgeHooks.getGrassSeed(world);
-+        if (seed != null) ret.add(seed);
-+        return ret;
-+    }
-+
-+    @Override
-+    public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z)
-+    {
-+        return true;
-+    }
-+
-+    @Override
-+    public ArrayList<ItemStack> onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune)
-+    {
-+        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
-+        ret.add(new ItemStack(this, 1, world.func_72805_g(x, y, z)));
-+        return ret;
-+    }
- }

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

@@ -1,108 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockTorch.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockTorch.java
-@@ -10,6 +10,7 @@
- import net.minecraft.util.MovingObjectPosition;
- import net.minecraft.util.Vec3;
- import net.minecraft.world.World;
-+import static net.minecraftforge.common.util.ForgeDirection.*;
- 
- public class BlockTorch extends Block
- {
-@@ -51,13 +52,17 @@
-         else
-         {
-             Block block = p_150107_1_.func_147439_a(p_150107_2_, p_150107_3_, p_150107_4_);
--            return block == Blocks.field_150422_aJ || block == Blocks.field_150386_bk || block == Blocks.field_150359_w || block == Blocks.field_150463_bK;
-+            return block.canPlaceTorchOnTop(p_150107_1_, p_150107_2_, p_150107_3_, p_150107_4_);
-         }
-     }
- 
-     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_147445_c(p_149742_2_ - 1, p_149742_3_, p_149742_4_, true) ? true : (p_149742_1_.func_147445_c(p_149742_2_ + 1, p_149742_3_, p_149742_4_, true) ? true : (p_149742_1_.func_147445_c(p_149742_2_, p_149742_3_, p_149742_4_ - 1, true) ? true : (p_149742_1_.func_147445_c(p_149742_2_, p_149742_3_, p_149742_4_ + 1, true) ? true : this.func_150107_m(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_))));
-+        return p_149742_1_.isSideSolid(p_149742_2_ - 1, p_149742_3_, p_149742_4_, EAST,  true) ||
-+               p_149742_1_.isSideSolid(p_149742_2_ + 1, p_149742_3_, p_149742_4_, WEST,  true) ||
-+               p_149742_1_.isSideSolid(p_149742_2_, p_149742_3_, p_149742_4_ - 1, SOUTH, true) ||
-+               p_149742_1_.isSideSolid(p_149742_2_, p_149742_3_, p_149742_4_ + 1, NORTH, true) ||
-+               func_150107_m(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_);
-     }
- 
-     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_)
-@@ -69,22 +74,22 @@
-             j1 = 5;
-         }
- 
--        if (p_149660_5_ == 2 && p_149660_1_.func_147445_c(p_149660_2_, p_149660_3_, p_149660_4_ + 1, true))
-+        if (p_149660_5_ == 2 && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ + 1, NORTH, true))
-         {
-             j1 = 4;
-         }
- 
--        if (p_149660_5_ == 3 && p_149660_1_.func_147445_c(p_149660_2_, p_149660_3_, p_149660_4_ - 1, true))
-+        if (p_149660_5_ == 3 && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ - 1, SOUTH, true))
-         {
-             j1 = 3;
-         }
- 
--        if (p_149660_5_ == 4 && p_149660_1_.func_147445_c(p_149660_2_ + 1, p_149660_3_, p_149660_4_, true))
-+        if (p_149660_5_ == 4 && p_149660_1_.isSideSolid(p_149660_2_ + 1, p_149660_3_, p_149660_4_, WEST, true))
-         {
-             j1 = 2;
-         }
- 
--        if (p_149660_5_ == 5 && p_149660_1_.func_147445_c(p_149660_2_ - 1, p_149660_3_, p_149660_4_, true))
-+        if (p_149660_5_ == 5 && p_149660_1_.isSideSolid(p_149660_2_ - 1, p_149660_3_, p_149660_4_, EAST, true))
-         {
-             j1 = 1;
-         }
-@@ -106,19 +111,19 @@
-     {
-         if (p_149726_1_.func_72805_g(p_149726_2_, p_149726_3_, p_149726_4_) == 0)
-         {
--            if (p_149726_1_.func_147445_c(p_149726_2_ - 1, p_149726_3_, p_149726_4_, true))
-+            if (p_149726_1_.isSideSolid(p_149726_2_ - 1, p_149726_3_, p_149726_4_, EAST, true))
-             {
-                 p_149726_1_.func_72921_c(p_149726_2_, p_149726_3_, p_149726_4_, 1, 2);
-             }
--            else if (p_149726_1_.func_147445_c(p_149726_2_ + 1, p_149726_3_, p_149726_4_, true))
-+            else if (p_149726_1_.isSideSolid(p_149726_2_ + 1, p_149726_3_, p_149726_4_, WEST, true))
-             {
-                 p_149726_1_.func_72921_c(p_149726_2_, p_149726_3_, p_149726_4_, 2, 2);
-             }
--            else if (p_149726_1_.func_147445_c(p_149726_2_, p_149726_3_, p_149726_4_ - 1, true))
-+            else if (p_149726_1_.isSideSolid(p_149726_2_, p_149726_3_, p_149726_4_ - 1, SOUTH, true))
-             {
-                 p_149726_1_.func_72921_c(p_149726_2_, p_149726_3_, p_149726_4_, 3, 2);
-             }
--            else if (p_149726_1_.func_147445_c(p_149726_2_, p_149726_3_, p_149726_4_ + 1, true))
-+            else if (p_149726_1_.isSideSolid(p_149726_2_, p_149726_3_, p_149726_4_ + 1, NORTH, true))
-             {
-                 p_149726_1_.func_72921_c(p_149726_2_, p_149726_3_, p_149726_4_, 4, 2);
-             }
-@@ -143,22 +148,22 @@
-             int l = p_150108_1_.func_72805_g(p_150108_2_, p_150108_3_, p_150108_4_);
-             boolean flag = false;
- 
--            if (!p_150108_1_.func_147445_c(p_150108_2_ - 1, p_150108_3_, p_150108_4_, true) && l == 1)
-+            if (!p_150108_1_.isSideSolid(p_150108_2_ - 1, p_150108_3_, p_150108_4_, EAST, true) && l == 1)
-             {
-                 flag = true;
-             }
- 
--            if (!p_150108_1_.func_147445_c(p_150108_2_ + 1, p_150108_3_, p_150108_4_, true) && l == 2)
-+            if (!p_150108_1_.isSideSolid(p_150108_2_ + 1, p_150108_3_, p_150108_4_, WEST, true) && l == 2)
-             {
-                 flag = true;
-             }
- 
--            if (!p_150108_1_.func_147445_c(p_150108_2_, p_150108_3_, p_150108_4_ - 1, true) && l == 3)
-+            if (!p_150108_1_.isSideSolid(p_150108_2_, p_150108_3_, p_150108_4_ - 1, SOUTH, true) && l == 3)
-             {
-                 flag = true;
-             }
- 
--            if (!p_150108_1_.func_147445_c(p_150108_2_, p_150108_3_, p_150108_4_ + 1, true) && l == 4)
-+            if (!p_150108_1_.isSideSolid(p_150108_2_, p_150108_3_, p_150108_4_ + 1, NORTH, true) && l == 4)
-             {
-                 flag = true;
-             }

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

@@ -1,49 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockTrapDoor.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockTrapDoor.java
-@@ -11,9 +11,12 @@
- import net.minecraft.util.Vec3;
- import net.minecraft.world.IBlockAccess;
- import net.minecraft.world.World;
-+import net.minecraftforge.common.util.ForgeDirection;
- 
- public class BlockTrapDoor extends Block
- {
-+    /** Set this to allow trapdoors to remain free-floating */
-+    public static boolean disableValidation = false;
-     private static final String __OBFID = "CL_00000327";
- 
-     protected BlockTrapDoor(Material p_i45434_1_)
-@@ -163,7 +166,7 @@
-                 --i1;
-             }
- 
--            if (!func_150119_a(p_149695_1_.func_147439_a(i1, p_149695_3_, j1)))
-+            if (!(func_150119_a(p_149695_1_.func_147439_a(i1, p_149695_3_, j1)) || p_149695_1_.isSideSolid(i1, p_149695_3_, j1, ForgeDirection.getOrientation((l & 3) + 2))))
-             {
-                 p_149695_1_.func_147468_f(p_149695_2_, p_149695_3_, p_149695_4_);
-                 this.func_149697_b(p_149695_1_, p_149695_2_, p_149695_3_, p_149695_4_, l, 0);
-@@ -218,6 +221,7 @@
- 
-     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_)
-     {
-+        if (disableValidation) return true;
-         if (p_149707_5_ == 0)
-         {
-             return false;
-@@ -248,7 +252,7 @@
-                 --p_149707_2_;
-             }
- 
--            return func_150119_a(p_149707_1_.func_147439_a(p_149707_2_, p_149707_3_, p_149707_4_));
-+            return func_150119_a(p_149707_1_.func_147439_a(p_149707_2_, p_149707_3_, p_149707_4_)) || p_149707_1_.isSideSolid(p_149707_2_, p_149707_3_, p_149707_4_, ForgeDirection.UP);
-         }
-     }
- 
-@@ -259,6 +263,7 @@
- 
-     private static boolean func_150119_a(Block p_150119_0_)
-     {
-+        if (disableValidation) return true;
-         return p_150119_0_.field_149764_J.func_76218_k() && p_150119_0_.func_149686_d() || p_150119_0_ == Blocks.field_150426_aN || p_150119_0_ instanceof BlockSlab || p_150119_0_ instanceof BlockStairs;
-     }
- }

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

@@ -1,96 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockTripWireHook.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockTripWireHook.java
-@@ -9,6 +9,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 BlockTripWireHook extends Block
- {
-     private static final String __OBFID = "CL_00000329";
-@@ -47,34 +50,41 @@
- 
-     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_ == 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 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_)
-     {
-         byte b0 = 0;
- 
--        if (p_149660_5_ == 2 && p_149660_1_.func_147445_c(p_149660_2_, p_149660_3_, p_149660_4_ + 1, true))
-+        if (p_149660_5_ == 2 && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ + 1, NORTH, true))
-         {
-             b0 = 2;
-         }
- 
--        if (p_149660_5_ == 3 && p_149660_1_.func_147445_c(p_149660_2_, p_149660_3_, p_149660_4_ - 1, true))
-+        if (p_149660_5_ == 3 && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ - 1, SOUTH, true))
-         {
-             b0 = 0;
-         }
- 
--        if (p_149660_5_ == 4 && p_149660_1_.func_147445_c(p_149660_2_ + 1, p_149660_3_, p_149660_4_, true))
-+        if (p_149660_5_ == 4 && p_149660_1_.isSideSolid(p_149660_2_ + 1, p_149660_3_, p_149660_4_, WEST, true))
-         {
-             b0 = 1;
-         }
- 
--        if (p_149660_5_ == 5 && p_149660_1_.func_147445_c(p_149660_2_ - 1, p_149660_3_, p_149660_4_, true))
-+        if (p_149660_5_ == 5 && p_149660_1_.isSideSolid(p_149660_2_ - 1, p_149660_3_, p_149660_4_, EAST, true))
-         {
-             b0 = 3;
-         }
-@@ -97,22 +107,22 @@
-                 int i1 = l & 3;
-                 boolean flag = false;
- 
--                if (!p_149695_1_.func_147439_a(p_149695_2_ - 1, p_149695_3_, p_149695_4_).func_149721_r() && i1 == 3)
-+                if (!p_149695_1_.isSideSolid(p_149695_2_ - 1, p_149695_3_, p_149695_4_, EAST) && i1 == 3)
-                 {
-                     flag = true;
-                 }
- 
--                if (!p_149695_1_.func_147439_a(p_149695_2_ + 1, p_149695_3_, p_149695_4_).func_149721_r() && i1 == 1)
-+                if (!p_149695_1_.isSideSolid(p_149695_2_ + 1, p_149695_3_, p_149695_4_, WEST) && i1 == 1)
-                 {
-                     flag = true;
-                 }
- 
--                if (!p_149695_1_.func_147439_a(p_149695_2_, p_149695_3_, p_149695_4_ - 1).func_149721_r() && i1 == 0)
-+                if (!p_149695_1_.isSideSolid(p_149695_2_, p_149695_3_, p_149695_4_ - 1, SOUTH) && i1 == 0)
-                 {
-                     flag = true;
-                 }
- 
--                if (!p_149695_1_.func_147439_a(p_149695_2_, p_149695_3_, p_149695_4_ + 1).func_149721_r() && i1 == 2)
-+                if (!p_149695_1_.isSideSolid(p_149695_2_, p_149695_3_, p_149695_4_ + 1, NORTH) && i1 == 2)
-                 {
-                     flag = true;
-                 }
-@@ -133,7 +143,7 @@
-         boolean flag3 = (p_150136_6_ & 8) == 8;
-         boolean flag4 = !p_150136_5_;
-         boolean flag5 = false;
--        boolean flag6 = !World.func_147466_a(p_150136_1_, p_150136_2_, p_150136_3_ - 1, p_150136_4_);
-+        boolean flag6 = !p_150136_1_.isSideSolid(p_150136_2_, p_150136_3_ - 1, p_150136_4_, UP);
-         int l1 = Direction.field_71583_a[k1];
-         int i2 = Direction.field_71581_b[k1];
-         int j2 = 0;

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

@@ -1,61 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockVine.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockVine.java
-@@ -2,9 +2,11 @@
- 
- 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;
-+import net.minecraft.entity.EntityLivingBase;
- import net.minecraft.entity.player.EntityPlayer;
- import net.minecraft.init.Blocks;
- import net.minecraft.init.Items;
-@@ -16,8 +18,10 @@
- import net.minecraft.world.ColorizerFoliage;
- import net.minecraft.world.IBlockAccess;
- import net.minecraft.world.World;
-+import net.minecraftforge.common.ForgeHooks;
-+import net.minecraftforge.common.IShearable;
- 
--public class BlockVine extends Block
-+public class BlockVine extends Block implements IShearable
- {
-     private static final String __OBFID = "CL_00000330";
- 
-@@ -375,14 +379,28 @@
- 
-     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(Blocks.field_150395_bd, 1, 0));
--        }
--        else
--        {
-             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, IBlockAccess world, int x, int y, int z)
-+    {
-+        return true;
-+    }
-+
-+    @Override
-+    public ArrayList<ItemStack> onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune)
-+    {
-+        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
-+        ret.add(new ItemStack(this, 1));
-+        return ret;
-+    }
-+
-+    @Override
-+    public boolean isLadder(IBlockAccess world, int x, int y, int z, EntityLivingBase entity)
-+    {
-+        return true;
-+    }
- }

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

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