tagged 1.0.3

.gitattributes

@@ -1,14 +0,0 @@
-* text eol=lf
-*.bat text eol=crlf
-*.patch text eol=lf
-*.java text eol=lf
-*.gradle text eol=crlf
-*.png binary
-*.exe binary
-*.dll binary
-*.jar binary
-*.lzma binary
-*.zip binary
-*.pyd binary
-*.cfg text eol=lf
-*.py text eol=lf

.gitignore

@@ -1,16 +0,0 @@
-#eclipse
-/bin
-/.settings
-/.classpath
-
-#idea
-/.idea
-*.iml
-
-#gradle
-/build
-/.gradle
-
-#occupational hazards
-/eclipse/
-/repo/

CREDITS-fml.txt

@@ -1,27 +0,0 @@
-This is Forge Mod Loader.
-
-You can find the source code at all times at https://github.com/MinecraftForge/FML
-
-This minecraft mod is a clean open source implementation of a mod loader for
-minecraft servers, 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

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

README.txt

@@ -1,117 +0,0 @@
-This is Forge Mod Loader, or FML for short, by cpw.
-
-More information can be found at https://github.com/MinecraftForge/FML/wiki
-
-It is a clean reimplementation of a mod loading system for client, server and
-bukkit use, incorporating API implementations of client side ModLoader by
-Risugami.
-
-It can be installed on its own, or as part of Minecraft Forge.
-
-----------------------
-About Forge Mod Loader
-----------------------
-
-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.
-
-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.
-
-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.
-
-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).
-
-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,106 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
-    }
-}
-
-import static net.minecraftforge.gradle.dev.FmlDevPlugin.*
-
-apply plugin: 'maven'
-apply plugin: 'fmldev'
-
-repositories {
-    flatDir {
-        name "fileRepo"
-        dirs "repo"
-    }
-}
-
-minecraft {
-    version = '1.6.4'
-    fmlDir = projectDir.getAbsolutePath();
-    mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
-    installerVersion = "1.4"
-}
-
-group = 'cpw.mods'
-version = getVersionFromGit(project)
-
-jenkins {
-    job = 'fml'
-}
-
-uploadArchives {
-    repositories {
-        if (project.hasProperty("filesmaven")) {
-            logger.info('Publishing to files server')
-            
-            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')
-            
-            mavenDeployer {
-                repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
-            }
-        }
-    }
-}

conf/astyle.cfg

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

conf/mcp.cfg

@@ -1,163 +0,0 @@
-[DEFAULT]
-DirTemp    = temp
-DirSrc     = src
-DirLogs    = logs
-DirBin     = bin
-DirJars    = jars
-DirReobf   = reobf
-DirConf    = conf
-DirRuntime = runtime
-DirLib     = lib
-DirTempSrc = temp/src
-DirTempCls = temp/cls
-DirTempBin = temp/bin
-DirModSrc  = modsrc
-DirEclipse = eclipse
-
-[CSV]
-Classes = %(DirConf)s/classes.csv
-Methods = %(DirConf)s/methods.csv
-Fields  = %(DirConf)s/fields.csv
-Params  = %(DirConf)s/params.csv
-NewIds  = %(DirConf)s/newids.csv
-
-[SRGS]
-ConfClient     = %(DirConf)s/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

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

conf/patches/minecraft_ff.patch

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

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

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

forge/build.bat

@@ -0,0 +1,11 @@
+cd ..
+
+rmdir /S /Q src
+mkdir src
+xcopy  /Y /E src_work\* src\
+
+xcopy /Y /E forge\forge_client\src\net\* src\minecraft\net
+xcopy /Y /E forge\forge_common\net\* src\minecraft\net
+xcopy /Y /E forge\forge_common\net\* src\minecraft_server\net
+
+cmd /C recompile.bat

forge/build.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+pushd ..
+
+rm -rf src
+cp -a src_work src
+rm -rf bin
+
+popd
+
+cp -a forge_client/src/net/* ../src/minecraft/net/
+cp -a forge_common/net/* ../src/minecraft/net/
+cp -a forge_common/net/* ../src/minecraft_server/net/
+
+pushd ..
+
+./recompile.sh
+
+

forge/client

@@ -0,0 +1 @@
+forge_client/src/net/minecraft/src/forge/

forge/common

@@ -0,0 +1 @@
+forge_common/net/minecraft/src/forge

forge/forge_client/.classpath

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="forge_common"/>
+	<classpathentry kind="src" path="minecraft"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="lib" path="../../jars/bin/jinput.jar"/>
+	<classpathentry kind="lib" path="../../jars/bin/lwjgl.jar"/>
+	<classpathentry kind="lib" path="../../jars/bin/lwjgl_util.jar"/>
+	<classpathentry kind="lib" path="../../jars/bin/minecraft.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

forge/forge_client/.project

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>forge_client</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>forge_common</name>
+			<type>2</type>
+			<locationURI>PARENT-1-PROJECT_LOC/forge_common</locationURI>
+		</link>
+		<link>
+			<name>minecraft</name>
+			<type>2</type>
+			<locationURI>PARENT-1-WORKSPACE_LOC/src_work/minecraft</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>

forge/forge_client/src/net/minecraft/src/forge/BlockTextureParticles.java

@@ -0,0 +1,13 @@
+package net.minecraft.src.forge;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BlockTextureParticles {
+    public String texture;
+    public List effects;
+    
+    public BlockTextureParticles(){
+        effects = new ArrayList();
+    }
+}

forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java

@@ -0,0 +1,52 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.ModLoader;
+import net.minecraft.src.RenderBlocks;
+import net.minecraft.src.Tessellator;
+import org.lwjgl.opengl.GL11;
+
+public class MinecraftForgeClient {
+    
+    public static void beforeBlockRender(Block block, RenderBlocks renderblocks) {
+        if (block instanceof ITextureProvider
+                && renderblocks.overrideBlockTexture == -1) {
+            Tessellator tessellator = Tessellator.instance;
+            tessellator.draw();
+            tessellator.startDrawingQuads();
+            tessellator.setNormal(0.0F, -1F, 0.0F);
+
+            GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
+                    .getMinecraftInstance().renderEngine
+                    .getTexture(((ITextureProvider) (block)).getTextureFile()));
+
+        }
+    }
+    
+    public static void afterBlockRender(Block block, RenderBlocks renderblocks) {
+        if (block instanceof ITextureProvider
+                && renderblocks.overrideBlockTexture == -1) {
+            Tessellator tessellator = Tessellator.instance;
+            tessellator.draw();
+            tessellator.startDrawingQuads();
+
+            GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
+                    .getMinecraftInstance().renderEngine
+                    .getTexture("/terrain.png"));
+        }
+    }
+    
+    public static void overrideTexture (Object o) {
+        if (o instanceof ITextureProvider) {
+            GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
+                    .getMinecraftInstance().renderEngine
+                    .getTexture(((ITextureProvider) (o))
+                            .getTextureFile()));
+        }
+    }
+}

forge/forge_common/net/minecraft/src/forge/Configuration.java

@@ -0,0 +1,313 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.text.DateFormat;
+import java.util.Collection;
+import java.util.Date;
+import java.util.TreeMap;
+
+import net.minecraft.src.Block;
+
+/** 
+ * This class offers advanced configurations capabilities, allowing to provide
+ * various categories for configuration variables.
+ */
+public class Configuration {
+
+    private boolean configBlocks[] = null;
+
+    public static final int GENERAL_PROPERTY = 0;
+    public static final int BLOCK_PROPERTY = 1;
+    public static final int ITEM_PROPERTY = 2;
+    
+    File file;
+
+    public TreeMap<String, Property> blockProperties = new TreeMap<String, Property>();
+    public TreeMap<String, Property> itemProperties = new TreeMap<String, Property>();
+    public TreeMap<String, Property> generalProperties = new TreeMap<String, Property>();
+
+    /**
+     * Create a configuration file for the file given in parameter.
+     */
+    public Configuration(File file) {
+        this.file = file;
+    }
+
+    /**
+     * Gets or create a block id property. If the block id property key is
+     * already in the configuration, then it will be used. Otherwise, 
+     * defaultId will be used, except if already taken, in which case this
+     * will try to determine a free default id. 
+     */
+    public Property getOrCreateBlockIdProperty(String key, int defaultId) {
+        if (configBlocks == null) {
+            configBlocks = new boolean[Block.blocksList.length];
+
+            for (int i = 0; i < configBlocks.length; ++i) {
+                configBlocks[i] = false;
+            }
+        }
+
+        if (blockProperties.containsKey(key)) {
+			Property property = getOrCreateIntProperty(key,
+					Configuration.BLOCK_PROPERTY, defaultId);
+            configBlocks[Integer.parseInt(property.value)] = true;
+            return property;
+        } else {
+            Property property = new Property();
+
+            blockProperties.put(key, property);
+            property.name = key;
+
+            if (Block.blocksList[defaultId] == null
+                    && !configBlocks[defaultId]) {
+                property.value = Integer.toString(defaultId);
+                configBlocks[defaultId] = true;
+                return property;
+            } else {
+                for (int j = Block.blocksList.length - 1; j >= 0; --j) {
+                    if (Block.blocksList[j] == null && !configBlocks[j]) {
+                        property.value = Integer.toString(j);
+                        configBlocks[j] = true;
+                        return property;
+                    }
+                }
+
+                throw new RuntimeException("No more block ids available for "
+                        + key);
+            }
+        }
+    }
+
+    public Property getOrCreateIntProperty(String key, int kind,
+            int defaultValue) {
+        Property prop = getOrCreateProperty(key, kind,
+                Integer.toString(defaultValue));
+
+        try {
+            Integer.parseInt(prop.value);
+
+            return prop;
+        } catch (NumberFormatException e) {
+            prop.value = Integer.toString(defaultValue);
+            return prop;
+        }
+    }
+
+    public Property getOrCreateBooleanProperty(String key, int kind,
+            boolean defaultValue) {
+        Property prop = getOrCreateProperty(key, kind,
+                Boolean.toString(defaultValue));
+
+        if ("true".equals(prop.value.toLowerCase())
+                || "false".equals(prop.value.toLowerCase())) {
+            return prop;
+        } else {
+            prop.value = Boolean.toString(defaultValue);
+            return prop;
+        }
+    }
+
+    public Property getOrCreateProperty(String key, int kind,
+            String defaultValue) {
+        TreeMap<String, Property> source = null;
+
+        switch (kind) {
+        case GENERAL_PROPERTY:
+            source = generalProperties;
+            break;
+        case BLOCK_PROPERTY:
+            source = blockProperties;
+            break;
+        case ITEM_PROPERTY:
+            source = itemProperties;
+            break;
+        }
+
+        if (source.containsKey(key)) {
+            return source.get(key);
+        } else if (defaultValue != null) {
+            Property property = new Property();
+
+            source.put(key, property);
+            property.name = key;
+
+            property.value = defaultValue;
+            return property;
+        } else {
+            return null;
+        }
+    }
+
+    public void load() {
+        try {
+            if (file.getParentFile() != null) {
+                file.getParentFile().mkdirs();
+            }
+
+            if (!file.exists() && !file.createNewFile()) {
+                return;
+            }
+
+            if (file.canRead()) {
+                FileInputStream fileinputstream = new FileInputStream(file);
+
+                BufferedReader buffer = new BufferedReader(
+                        new InputStreamReader(fileinputstream, "8859_1"));
+
+                String line;
+                TreeMap<String, Property> currentMap = null;
+
+                while (true) {
+                    line = buffer.readLine();
+
+                    if (line == null) {
+                        break;
+                    }
+
+                    int nameStart = -1, nameEnd = -1;
+                    boolean skip = false;
+
+                    for (int i = 0; i < line.length() && !skip; ++i) {
+                        if (Character.isLetterOrDigit(line.charAt(i))
+                                || line.charAt(i) == '.') {
+                            if (nameStart == -1) {
+                                nameStart = i;
+                            }
+
+                            nameEnd = i;
+                        } else if (Character.isWhitespace(line.charAt(i))) {
+                            // ignore space charaters
+                        } else {
+                            switch (line.charAt(i)) {
+                            case '#':
+                                skip = true;
+                                continue;
+                            case '{':
+                                String scopeName = line.substring(nameStart,
+                                        nameEnd + 1);
+
+                                if (scopeName.equals("general")) {
+                                    currentMap = generalProperties;
+                                } else if (scopeName.equals("block")) {
+                                    currentMap = blockProperties;
+                                } else if (scopeName.equals("item")) {
+                                    currentMap = itemProperties;
+                                } else {
+                                    throw new RuntimeException(
+                                            "unknown section " + scopeName);
+                                }
+
+                                break;
+                            case '}':
+                                currentMap = null;
+                                break;
+                            case '=':
+                                String propertyName = line.substring(nameStart,
+                                        nameEnd + 1);
+
+                                if (currentMap == null) {
+                                    throw new RuntimeException("property "
+                                            + propertyName + " has no scope");
+                                }
+
+                                Property prop = new Property();
+                                prop.name = propertyName;
+                                prop.value = line.substring(i + 1);
+                                i = line.length();
+
+                                currentMap.put(propertyName, prop);
+
+                                break;
+                            default:
+                                throw new RuntimeException("unknown character "
+                                        + line.charAt(i));
+                            }
+                        }
+                    }
+                }
+
+            }
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+
+    public void save() {
+        try {
+            if (file.getParentFile() != null) {
+                file.getParentFile().mkdirs();
+            }
+
+            if (!file.exists() && !file.createNewFile()) {
+                return;
+            }
+
+            if (file.canWrite()) {
+                FileOutputStream fileoutputstream = new FileOutputStream(file);
+
+                BufferedWriter buffer = new BufferedWriter(
+                        new OutputStreamWriter(fileoutputstream, "8859_1"));
+
+                buffer.write("# Configuration file\r\n");
+                buffer.write("# Generated on "
+                        + DateFormat.getInstance().format(new Date()) + "\r\n");
+                buffer.write("\r\n");
+                buffer.write("###########\r\n");
+                buffer.write("# General #\r\n");
+                buffer.write("###########\r\n\r\n");
+
+                buffer.write("general {\r\n");
+                writeProperties(buffer, generalProperties.values());
+                buffer.write("}\r\n\r\n");
+
+                buffer.write("#########\r\n");
+                buffer.write("# Block #\r\n");
+                buffer.write("#########\r\n\r\n");
+
+                buffer.write("block {\r\n");
+                writeProperties(buffer, blockProperties.values());
+                buffer.write("}\r\n\r\n");
+
+                buffer.write("########\r\n");
+                buffer.write("# Item #\r\n");
+                buffer.write("########\r\n\r\n");
+
+                buffer.write("item {\r\n");
+                writeProperties(buffer, itemProperties.values());
+                buffer.write("}\r\n\r\n");
+
+                buffer.close();
+                fileoutputstream.close();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void writeProperties(BufferedWriter buffer,
+            Collection<Property> props) throws IOException {
+        for (Property property : props) {
+            if (property.comment != null) {
+                buffer.write("   # " + property.comment + "\r\n");
+            }
+
+            buffer.write("   " + property.name + "=" + property.value);
+            buffer.write("\r\n");
+        }
+    }
+
+}

forge/forge_common/net/minecraft/src/forge/IBlockSecondaryProperties.java

@@ -0,0 +1,52 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.World;
+
+/**
+ * This interface provides access to a number of secondary block properties through providing  
+ * overrides to methods within world.class.
+ */
+
+public interface IBlockSecondaryProperties 
+{
+	/**
+	 * Return true if this block should be treated as a normal cube by game logic 
+	 * (this is independant of rendering), false otherwise.  This allows for things like secondary
+	 * blocks (torches, rails, redstone dust, etc.) being attached to the surface of
+	 * the block regardless of whether it is opaque, or posesses other rendering properties that
+	 * would not normally make this possible.
+	 */
+	public boolean isBlockNormalCube( World world, int i, int j, int k );
+	
+	/**
+	 * Return true if this block can be replaced by another by the player, false otherwise.  This provides
+	 * a means of allowing blocks to not be considered when the player attempts to place another within
+	 * their bounds, in the same way that water, lava, fire, and some other blocks behave within the game.
+	 * Provides an override to the coresponding section in canBlockBePlacedAt() in world.class
+	 */
+	public boolean isBlockReplaceable( World world, int i, int j, int k );
+	
+	/**
+	 * Return true if this block should set fire and deal fire damage to entities coming into contact with
+	 * it, false otherwise.  Provides an override to the related test within isBoundingBoxBurning() within
+	 * world.class
+	 */
+	public boolean isBlockBurning( World world, int i, int j, int k );
+	
+	/**
+	 * Return true if this block should be treated as an air block by the rest of the code, false
+	 * otherwise.  This method is primarily useful for creating pure logic-blocks that will be invisible 
+	 * to the player and otherwise interact as air would.  
+	 * Provides an override to isAirBlock() within world.class
+	 */	
+	public boolean isAirBlock( World world, int i, int j, int k );
+	
+}
+
+

forge/forge_common/net/minecraft/src/forge/IBucketHandler.java

@@ -0,0 +1,23 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.World;
+
+public interface IBucketHandler {
+
+    /**
+     * This is called before Minecraft tries to fill a bucket with water or
+     * lava. If it returns a non-null result, then the filling process will
+     * be stopped and the empty bucket will be changed to the result of this
+     * subprogram.
+     * 
+     * @see MinecraftForge#registerCustomBucketHander(IBucketHandler)
+     */
+    public ItemStack fillCustomBucket(World w, int i, int j, int k);
+
+}

forge/forge_common/net/minecraft/src/forge/IConnectRedstone.java

@@ -0,0 +1,27 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.IBlockAccess;
+
+/**
+ * This interface is to be implemented by Block classes. It will override
+ * standard algorithms controlling connection between two blocks by redstone
+ * 
+ * @see Block
+ */
+public interface IConnectRedstone {
+    
+    /**
+     * When this returns false, the block at location i, j, k cannot make
+     * a redstone connection in the direction given in parameter, otherwise
+     * it can.  Use to control which sides are inputs and outputs for redstone
+     * wires.
+     */
+    public boolean canConnectRedstone(IBlockAccess iba, int i, int j, int k,
+            int dir);
+}

forge/forge_common/net/minecraft/src/forge/IHarvestHandler.java

@@ -0,0 +1,23 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.ItemTool;
+
+public interface IHarvestHandler {
+    
+    /**
+     * Return true if the tool in parameter is known to be able to harvest
+     * the given block, false if this handler does not know of any particular
+     * harvesting. Other rules may activate the harvesting outside of this
+     * handler. This is typically used to add e.g. blocks only extracted by 
+     * diamond pickaxe
+     * 
+     * @see MinecraftForge#registerHarvestHandler(IHarvestHandler)
+     */
+    public boolean canHarvestBlock(ItemTool item, Block block);
+}

forge/forge_common/net/minecraft/src/forge/IMultipassRender.java

@@ -0,0 +1,17 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+/** This interface is to be implemented by a Block class.  Allows a block
+ * type to perform rendering in both render passes, in case some parts of the
+ * block are solid and others are transparent.
+ */
+public interface IMultipassRender {
+	/** Returns true when the block has things to render in this render
+	 * pass.
+	 */
+	public boolean canRenderInPass(int n);
+}

forge/forge_common/net/minecraft/src/forge/IOverrideReplace.java

@@ -0,0 +1,30 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.World;
+
+/**
+ * This interface is to be implemented by block classes. It will allow a block
+ * to control how it can be replaced
+ *
+ * @see Block
+ */
+public interface IOverrideReplace {
+    
+    /**
+     * Return true if this block has to take control over replacement, for
+     * the intended replacement given by the parameter bid. If false, then
+     * the block replacement will be prevented.
+     */
+	public boolean canReplaceBlock(World world, int i, int j, int k, int bid);
+	
+	/**
+	 * Return the status of the actual replacement. 
+	 */
+	public boolean getReplacedSuccess();
+}

forge/forge_common/net/minecraft/src/forge/ISpecialArmor.java

@@ -0,0 +1,27 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.ItemArmor;
+
+/**
+ * This interface is to be implemented by ItemArmor classes. It will allow to
+ * modify computation of damage and health loss. Computation will be called
+ * before the actual armor computation, which can then be cancelled.
+ *
+ * @see ItemArmor
+ */
+public interface ISpecialArmor {
+    /**
+     * This interface will adjust the amount of damage received by the entity.
+     */
+    public int adjustArmorDamage (int damage);
+    
+    /**
+     * When this return true, the regular armor computation will be cancelled
+     */
+    public boolean allowRegularComputation ();
+}

forge/forge_common/net/minecraft/src/forge/ISpecialResistance.java

@@ -0,0 +1,26 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.Entity;
+import net.minecraft.src.World;
+
+/**
+ * This interface is to be implemented by block classes. It will allow a block
+ * to control how it resists to explosion
+ *
+ * @see Block
+ */
+public interface ISpecialResistance {
+    
+    /**
+     * Return the explosion resistance of the block located at position i, j, 
+     * k, from an exploder explosing on src_x, src_y, src_z.
+     */
+	public float getSpecialExplosionResistance(World world, int i, int j, int k,
+		double src_x, double src_y, double src_z, Entity exploder);
+}

forge/forge_common/net/minecraft/src/forge/ITextureProvider.java

@@ -0,0 +1,21 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+/**
+ * This interface has to be implemented either by an instance of Block or Item.
+ * It allow to use texture files different from terrain.png or items.png.
+ */
+public interface ITextureProvider {
+
+    /**
+     * This interface has to return the path to a file that is the same size as
+     * terrain.png, but not named terrain.png. It will be used instead of the
+     * regular terrain file to render blocks and items.
+     */
+    public String getTextureFile();
+
+}

forge/forge_common/net/minecraft/src/forge/IUseItemFirst.java

@@ -0,0 +1,28 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import net.minecraft.src.EntityPlayer;
+import net.minecraft.src.Item;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.World;
+
+/**
+ * This interface is to be implemented by item classes. It will allow an item
+ * to perform a use before the block is activated.
+ *
+ * @see Item
+ */
+public interface IUseItemFirst {
+    
+    /**
+     * This is called when the item is used, before the block is activated.
+     * Stop the computation when return true.
+     */
+	public boolean onItemUseFirst(ItemStack ist,
+			EntityPlayer player, World world,
+			int i, int j, int k, int l);
+}

forge/forge_common/net/minecraft/src/forge/MinecraftForge.java

@@ -0,0 +1,75 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+import java.util.LinkedList;
+
+import net.minecraft.src.BiomeGenBase;
+import net.minecraft.src.Block;
+import net.minecraft.src.Item;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.ItemTool;
+import net.minecraft.src.World;
+
+public class MinecraftForge {
+
+    private static LinkedList<IBucketHandler> bucketHandlers = new LinkedList<IBucketHandler>();
+    private static LinkedList<IHarvestHandler> harvestHandlers = new LinkedList<IHarvestHandler>();
+
+    /**
+     * Registers a new custom bucket handler.
+     */
+    public static void registerCustomBucketHander(IBucketHandler handler) {
+        bucketHandlers.add(handler);
+    }
+    
+    /**
+     * Registers a new harvest handler.
+     */
+    public static void registerHarvestHandler(IHarvestHandler handler) {
+        harvestHandlers.add(handler);
+    }
+
+    /**
+     * This is not supposed to be called outside of Minecraft internals.
+     */
+    public static ItemStack fillCustomBucket(World w, int i, int j, int k) {
+        for (IBucketHandler handler : bucketHandlers) {
+            ItemStack stack = handler.fillCustomBucket(w, i, j, k);
+
+            if (stack != null) {
+                return stack;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * This is not supposed to be called outside of Minecraft internals.
+     */
+    public static boolean canHarvestBlock(ItemTool item, Block block) {
+        for (IHarvestHandler handler : harvestHandlers) {
+            if (handler.canHarvestBlock(item, block)) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
+
+    /**
+     * Add a block to the list of blocks to which the pickaxe is know to be
+     * effective.
+     */
+    public static void addPickaxeBlockEffectiveAgainst (Block block) {
+        ((ItemTool) Item.pickaxeWood).addBlockEffectiveAgainst(block);
+        ((ItemTool) Item.pickaxeStone).addBlockEffectiveAgainst(block);
+        ((ItemTool) Item.pickaxeSteel).addBlockEffectiveAgainst(block);
+        ((ItemTool) Item.pickaxeGold).addBlockEffectiveAgainst(block);
+        ((ItemTool) Item.pickaxeDiamond).addBlockEffectiveAgainst(block);
+    }
+}

forge/forge_common/net/minecraft/src/forge/Property.java

@@ -0,0 +1,12 @@
+/**
+ * This software is provided under the terms of the Minecraft Forge Public 
+ * License v1.0.
+ */
+
+package net.minecraft.src.forge;
+
+public class Property {
+    public String name;
+    public String value;
+    public String comment;
+}

forge/forge_server/.classpath

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="forge_common"/>
+	<classpathentry kind="src" path="minecraft_server"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="lib" path="../../jars/bin/jinput.jar"/>
+	<classpathentry kind="lib" path="../../jars/bin/lwjgl.jar"/>
+	<classpathentry kind="lib" path="../../jars/bin/lwjgl_util.jar"/>
+	<classpathentry kind="lib" path="../../jars/minecraft_server.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

forge/forge_server/.project

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>forge_server</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>forge_common</name>
+			<type>2</type>
+			<locationURI>PARENT-1-PROJECT_LOC/forge_common</locationURI>
+		</link>
+		<link>
+			<name>minecraft_server</name>
+			<type>2</type>
+			<locationURI>PARENT-1-WORKSPACE_LOC/src_work/minecraft_server</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>

forge/install/README.txt

@@ -0,0 +1,10 @@
+*** HOW TO INSTALL ***
+
+The forge directory should have been uncompacted right under your MCP root 
+directory.
+
+You should a a fresh minecraft and minecraft_server.jar freshly decompiled 
+with ModLoader and ModLoaderMP.
+
+Just run the script install.bat. It will copy the Minecraft Forge source on your
+src directory, and modify the Minecraft source files.

forge/install/install.cmd

@@ -0,0 +1,8 @@
+set HOME=%CD%
+set MCP=%HOME%\..
+xcopy  /Y /E src\* ..\src
+
+cd %MCP%\src
+%MCP%\runtime\bin\python\python_mcp %HOME%\lfcr.py %HOME%\minecraft.patch %HOME%\minecraft-win.patch
+%MCP%\runtime\bin\applydiff.exe -uf -p2 < %HOME%\minecraft-win.patch
+pause

forge/lfcr.py

@@ -0,0 +1,8 @@
+#! /usr/bin/env python
+
+import sys, re, os
+data = open(sys.argv[1], "rb").read()
+newdata = re.sub("\r?\n", "\r\n", data)
+f = open(sys.argv[2], "wb")
+f.write(newdata)
+f.close()

forge/licence.txt

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

forge/minecraft.patch

@@ -0,0 +1,924 @@
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java
+--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java	2011-08-02 16:05:38.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java	2011-08-02 16:07:39.000000000 -0400
+@@ -3,6 +3,7 @@
+ // Decompiler options: packimports(3) braces deadcode 
+ 
+ package net.minecraft.src;
++import net.minecraft.src.forge.*;
+ 
+ import java.util.*;
+ 
+@@ -451,6 +452,10 @@
+         {
+             return false;
+         }
++        if (Block.blocksList[i1] instanceof IConnectRedstone) {
++            IConnectRedstone icr = (IConnectRedstone) Block.blocksList[i1];
++            return icr.canConnectRedstone(iblockaccess, i, j, k, l);
++        }
+         if(Block.blocksList[i1].canProvidePower())
+         {
+             return true;
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.java ../src_work/minecraft/net/minecraft/src/Chunk.java
+--- ../src_base/minecraft/net/minecraft/src/Chunk.java	2011-08-02 16:05:38.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/Chunk.java	2011-08-02 16:07:39.000000000 -0400
+@@ -3,6 +3,7 @@
+ // Decompiler options: packimports(3) braces deadcode 
+ 
+ package net.minecraft.src;
++import net.minecraft.src.forge.*;
+ 
+ import java.io.PrintStream;
+ import java.util.*;
+@@ -249,6 +250,13 @@
+         }
+         int l1 = xPosition * 16 + i;
+         int i2 = zPosition * 16 + k;
++
++        if (Block.blocksList[k1] instanceof IOverrideReplace) {
++            IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[k1];
++            if (!iovr.canReplaceBlock(worldObj, l1, j, i2, l))
++                return iovr.getReplacedSuccess();
++        }
++
+         blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff);
+         if(k1 != 0 && !worldObj.multiplayerWorld)
+         {
+@@ -292,6 +300,13 @@
+         }
+         int k1 = xPosition * 16 + i;
+         int l1 = zPosition * 16 + k;
++
++        if (Block.blocksList[j1] instanceof IOverrideReplace) {
++            IOverrideReplace iovr = (IOverrideReplace) Block.blocksList[j1];
++            if (!iovr.canReplaceBlock(worldObj, k1, j, l1, l))
++                return iovr.getReplacedSuccess();
++        }
++
+         blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff);
+         if(j1 != 0)
+         {
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRenderer.java ../src_work/minecraft/net/minecraft/src/EffectRenderer.java
+--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java	2011-08-02 16:05:39.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java	2011-08-02 16:07:40.000000000 -0400
+@@ -7,6 +7,9 @@
+ import java.util.*;
+ import org.lwjgl.opengl.GL11;
+ 
++import net.minecraft.src.forge.BlockTextureParticles;
++import net.minecraft.src.forge.ITextureProvider;
++
+ // Referenced classes of package net.minecraft.src:
+ //            EntityFX, Entity, MathHelper, RenderEngine, 
+ //            Tessellator, Block, EntityDiggingFX, World
+@@ -16,6 +19,7 @@
+ 
+     public EffectRenderer(World world, RenderEngine renderengine)
+     {
++        effectList = new ArrayList();
+         fxLayers = new List[4];
+         rand = new Random();
+         if(world != null)
+@@ -55,6 +59,18 @@
+             }
+ 
+         }
++        for (int x = 0; x < effectList.size(); x++) {
++            BlockTextureParticles entry = (BlockTextureParticles) effectList
++                    .get(x);
++            for (int y = 0; y < entry.effects.size(); y++) {
++                EntityFX entityfx = (EntityFX) entry.effects.get(y);
++                if (entityfx.isDead) {
++                    entry.effects.remove(y--);
++                }
++            }
++            if (effectList.size() == 0)
++                effectList.remove(x--);
++        }
+ 
+     }
+ 
+@@ -93,11 +109,26 @@
+             for(int k = 0; k < fxLayers[i].size(); k++)
+             {
+                 EntityFX entityfx = (EntityFX)fxLayers[i].get(k);
++				if(entityfx instanceof EntityDiggingFX) continue;
+                 entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4);
+             }
+ 
+             tessellator.draw();
+         }
++        Tessellator tessellator = Tessellator.instance;
++
++        for (int x = 0; x < effectList.size(); x++) {
++            BlockTextureParticles entry = (BlockTextureParticles) effectList
++                    .get(x);
++            GL11.glBindTexture(3553 /* GL_TEXTURE_2D */,
++                    renderer.getTexture(entry.texture));
++            tessellator.startDrawingQuads();
++            for (int y = 0; y < entry.effects.size(); y++) {
++                EntityFX entityfx = (EntityFX) entry.effects.get(y);
++                entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4);
++            }
++            tessellator.draw();
++        }
+ 
+     }
+ 
+@@ -124,6 +155,13 @@
+         {
+             fxLayers[i].clear();
+         }
++		
++        for (int x = 0; x < effectList.size(); x++) {
++            BlockTextureParticles entry = (BlockTextureParticles) effectList
++                    .get(x);
++            entry.effects.clear();
++        }
++        effectList.clear();
+ 
+     }
+ 
+@@ -145,7 +183,12 @@
+                     double d1 = (double)j + ((double)l1 + 0.5D) / (double)j1;
+                     double d2 = (double)k + ((double)i2 + 0.5D) / (double)j1;
+                     int j2 = rand.nextInt(6);
+-                    addEffect((new EntityDiggingFX(worldObj, d, d1, d2, d - (double)i - 0.5D, d1 - (double)j - 0.5D, d2 - (double)k - 0.5D, block, j2, i1)).func_4041_a(i, j, k));
++                    EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj,
++                            d, d1, d2, d - (double) i - 0.5D, d1 - (double) j
++                                    - 0.5D, d2 - (double) k - 0.5D, block, j2,
++                            i1);
++                    dig_effect.func_4041_a(i, j, k);
++                    addDigParticleEffect(dig_effect, block);
+                 }
+ 
+             }
+@@ -190,16 +233,48 @@
+         {
+             d = (double)i + block.maxX + (double)f;
+         }
+-        addEffect((new EntityDiggingFX(worldObj, d, d1, d2, 0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k))).func_4041_a(i, j, k).func_407_b(0.2F).func_405_d(0.6F));
++        EntityDiggingFX dig_effect = new EntityDiggingFX(worldObj, d, d1, d2,
++                0.0D, 0.0D, 0.0D, block, l, worldObj.getBlockMetadata(i, j, k));
++        dig_effect.func_4041_a(i, j, k);
++        dig_effect.func_407_b(0.2F);
++        dig_effect.func_405_d(0.6F);
++        addDigParticleEffect(dig_effect, block);
+     }
+ 
+     public String getStatistics()
+     {
+         return (new StringBuilder()).append("").append(fxLayers[0].size() + fxLayers[1].size() + fxLayers[2].size()).toString();
+     }
++	
++    public void addDigParticleEffect(EntityDiggingFX dig_effect, Block block) {
++        boolean added = false;
++        String comp;
++
++        if (block instanceof ITextureProvider) {
++            comp = ((ITextureProvider) block).getTextureFile();
++        } else {
++            comp = "/terrain.png";
++        }
++        for (int x = 0; x < effectList.size(); x++) {
++            BlockTextureParticles entry = (BlockTextureParticles) effectList
++                    .get(x);
++            if (entry.texture.equals(comp)) {
++                entry.effects.add(dig_effect);
++                added = true;
++            }
++        }
++        if (!added) {
++            BlockTextureParticles entry = new BlockTextureParticles();
++            entry.texture = comp;
++            entry.effects.add(dig_effect);
++            effectList.add(entry);
++        }
++        addEffect(dig_effect);
++    }
+ 
+     protected World worldObj;
+     private List fxLayers[];
++    private List effectList;
+     private RenderEngine renderer;
+     private Random rand;
+ }
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPlayer.java ../src_work/minecraft/net/minecraft/src/EntityPlayer.java
+--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java	2011-08-02 16:05:39.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java	2011-08-02 16:07:41.000000000 -0400
+@@ -6,6 +6,8 @@
+ 
+ import java.util.*;
+ 
++import net.minecraft.src.forge.ISpecialArmor;
++
+ // Referenced classes of package net.minecraft.src:
+ //            EntityLiving, InventoryPlayer, ContainerPlayer, World, 
+ //            ChunkCoordinates, DataWatcher, Container, StatList, 
+@@ -477,6 +479,21 @@
+ 
+     protected void damageEntity(int i)
+     {
++        boolean doRegularComputation = true;
++        for (ItemStack stack : inventory.armorInventory) {
++            if (stack != null && stack.getItem() instanceof ISpecialArmor) {
++                ISpecialArmor armor = (ISpecialArmor) stack.getItem();
++                
++                i = armor.adjustArmorDamage(i);
++                doRegularComputation = doRegularComputation
++                        && armor.allowRegularComputation();
++            }
++        }
++        
++        if (!doRegularComputation) {
++            super.damageEntity(i);
++        }
++        
+         int j = 25 - inventory.getTotalArmorValue();
+         int k = i * j + damageRemainder;
+         inventory.damageArmor(i);
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion.java ../src_work/minecraft/net/minecraft/src/Explosion.java
+--- ../src_base/minecraft/net/minecraft/src/Explosion.java	2011-08-02 16:05:38.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/Explosion.java	2011-08-02 16:07:42.000000000 -0400
+@@ -3,6 +3,7 @@
+ // Decompiler options: packimports(3) braces deadcode 
+ 
+ package net.minecraft.src;
++import net.minecraft.src.forge.ISpecialResistance;
+ 
+ import java.util.*;
+ 
+@@ -65,7 +66,17 @@
+                         int i5 = worldObj.getBlockId(j4, k4, l4);
+                         if(i5 > 0)
+                         {
+-                            f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2;
++                            if (Block.blocksList[i5] instanceof ISpecialResistance) {
++                                ISpecialResistance isr = (ISpecialResistance) Block.blocksList[i5];
++                                f1 -= (isr.getSpecialExplosionResistance(
++                                        worldObj, j4, k4, l4, explosionX,
++                                        explosionY, explosionZ, exploder) + 0.3F)
++                                        * f2;
++                            } else {
++                                f1 -= (Block.blocksList[i5]
++                                        .getExplosionResistance(exploder) + 0.3F)
++                                        * f2;
++                            }
+                         }
+                         if(f1 > 0.0F)
+                         {
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucket.java ../src_work/minecraft/net/minecraft/src/ItemBucket.java
+--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java	2011-08-02 16:05:39.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java	2011-08-02 16:07:42.000000000 -0400
+@@ -6,6 +6,8 @@
+ 
+ import java.util.Random;
+ 
++import net.minecraft.src.forge.MinecraftForge;
++
+ // Referenced classes of package net.minecraft.src:
+ //            Item, EntityPlayer, Vec3D, MathHelper, 
+ //            World, MovingObjectPosition, EnumMovingObjectType, Material, 
+@@ -55,6 +57,13 @@
+             }
+             if(isFull == 0)
+             {
++                ItemStack customBucket = MinecraftForge.fillCustomBucket(world,
++                        i, j, k);
++            	
++                if (customBucket != null) {
++                   return customBucket;
++                }
++
+                 if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0)
+                 {
+                     world.setBlockWithNotify(i, j, k, 0);
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java
+--- ../src_base/minecraft/net/minecraft/src/ItemPickaxe.java	2011-08-02 16:05:38.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/ItemPickaxe.java	2011-08-02 16:07:42.000000000 -0400
+@@ -4,6 +4,8 @@
+ 
+ package net.minecraft.src;
+ 
++import net.minecraft.src.forge.MinecraftForge;
++
+ 
+ // Referenced classes of package net.minecraft.src:
+ //            ItemTool, Block, EnumToolMaterial, Material
+@@ -42,6 +44,9 @@
+         {
+             return toolMaterial.getHarvestLevel() >= 2;
+         }
++        if (MinecraftForge.canHarvestBlock(this, block)) {
++            return true;
++        }
+         if(block.blockMaterial == Material.rock)
+         {
+             return true;
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRenderer.java ../src_work/minecraft/net/minecraft/src/ItemRenderer.java
+--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java	2011-08-02 16:05:38.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java	2011-08-02 16:07:42.000000000 -0400
+@@ -5,6 +5,8 @@
+ package net.minecraft.src;
+ 
+ import net.minecraft.client.Minecraft;
++import net.minecraft.src.forge.MinecraftForgeClient;
++
+ import org.lwjgl.opengl.GL11;
+ 
+ // Referenced classes of package net.minecraft.src:
+@@ -34,15 +36,18 @@
+         if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType()))
+         {
+             GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png"));
++            MinecraftForgeClient.overrideTexture (Block.blocksList[itemstack.itemID]);
+             renderBlocksInstance.renderBlockOnInventory(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F));
+         } else
+         {
+             if(itemstack.itemID < 256)
+             {
+                 GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png"));
++                MinecraftForgeClient.overrideTexture (Block.blocksList[itemstack.itemID]);
+             } else
+             {
+                 GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/gui/items.png"));
++                MinecraftForgeClient.overrideTexture (Item.itemsList[itemstack.itemID]);
+             }
+             Tessellator tessellator = Tessellator.instance;
+             int i = entityliving.getItemIcon(itemstack);
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.java ../src_work/minecraft/net/minecraft/src/ItemTool.java
+--- ../src_base/minecraft/net/minecraft/src/ItemTool.java	2011-08-02 16:05:38.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java	2011-08-02 16:07:42.000000000 -0400
+@@ -4,6 +4,7 @@
+ 
+ package net.minecraft.src;
+ 
++import java.util.Arrays;
+ 
+ // Referenced classes of package net.minecraft.src:
+ //            Item, EnumToolMaterial, ItemStack, Block, 
+@@ -63,4 +64,11 @@
+     private float efficiencyOnProperMaterial;
+     private int damageVsEntity;
+     protected EnumToolMaterial toolMaterial;
++    
++    public void addBlockEffectiveAgainst (Block block) {    
++        blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst,
++                blocksEffectiveAgainst.length + 1);
++        
++        blocksEffectiveAgainst [blocksEffectiveAgainst.length-1] = block;
++    }
+ }
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerController.java ../src_work/minecraft/net/minecraft/src/PlayerController.java
+--- ../src_base/minecraft/net/minecraft/src/PlayerController.java	2011-08-02 16:05:39.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java	2011-08-02 16:07:42.000000000 -0400
+@@ -3,6 +3,7 @@
+ // Decompiler options: packimports(3) braces deadcode 
+ 
+ package net.minecraft.src;
++import net.minecraft.src.forge.*;
+ 
+ import net.minecraft.client.Minecraft;
+ 
+@@ -98,6 +99,12 @@
+ 
+     public boolean sendPlaceBlock(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l)
+     {
++        if (itemstack != null && itemstack.getItem() instanceof IUseItemFirst) {
++            IUseItemFirst iuif = (IUseItemFirst) itemstack.getItem();
++            if (iuif.onItemUseFirst(itemstack, entityplayer, world, i, j, k, l)) {
++                return true;
++            }
++        }
+         int i1 = world.getBlockId(i, j, k);
+         if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer))
+         {
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderItem.java ../src_work/minecraft/net/minecraft/src/RenderItem.java
+--- ../src_base/minecraft/net/minecraft/src/RenderItem.java	2011-08-02 16:05:39.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java	2011-08-02 16:07:42.000000000 -0400
+@@ -5,6 +5,9 @@
+ package net.minecraft.src;
+ 
+ import java.util.Random;
++
++import net.minecraft.src.forge.MinecraftForgeClient;
++
+ import org.lwjgl.opengl.GL11;
+ 
+ // Referenced classes of package net.minecraft.src:
+@@ -51,6 +54,7 @@
+         {
+             GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F);
+             loadTexture("/terrain.png");
++            MinecraftForgeClient.overrideTexture(Block.blocksList[itemstack.itemID]);
+             float f4 = 0.25F;
+             if(!Block.blocksList[itemstack.itemID].renderAsNormalBlock() && itemstack.itemID != Block.stairSingle.blockID && Block.blocksList[itemstack.itemID].getRenderType() != 16)
+             {
+@@ -78,10 +82,12 @@
+             if(itemstack.itemID < 256)
+             {
+                 loadTexture("/terrain.png");
++                MinecraftForgeClient.overrideTexture(Block.blocksList[itemstack.itemID]);
+             } else
+             {
+                 loadTexture("/gui/items.png");
+-            }
++                MinecraftForgeClient.overrideTexture(Item.itemsList[itemstack.itemID]);
++            }            
+             Tessellator tessellator = Tessellator.instance;
+             float f6 = (float)((i % 16) * 16 + 0) / 256F;
+             float f8 = (float)((i % 16) * 16 + 16) / 256F;
+@@ -92,6 +98,7 @@
+             float f14 = 0.25F;
+             if(field_27004_a)
+             {
++            	
+                 int k = Item.itemsList[itemstack.itemID].getColorFromDamage(itemstack.getItemDamage());
+                 float f15 = (float)(k >> 16 & 0xff) / 255F;
+                 float f17 = (float)(k >> 8 & 0xff) / 255F;
+@@ -131,6 +138,7 @@
+         {
+             int j1 = i;
+             renderengine.bindTexture(renderengine.getTexture("/terrain.png"));
++            MinecraftForgeClient.overrideTexture (Block.blocksList[i]);
+             Block block = Block.blocksList[j1];
+             GL11.glPushMatrix();
+             GL11.glTranslatef(l - 2, i1 + 3, -3F);
+@@ -159,9 +167,11 @@
+             if(i < 256)
+             {
+                 renderengine.bindTexture(renderengine.getTexture("/terrain.png"));
++                MinecraftForgeClient.overrideTexture (Block.blocksList[i]);
+             } else
+             {
+                 renderengine.bindTexture(renderengine.getTexture("/gui/items.png"));
++                MinecraftForgeClient.overrideTexture(Item.itemsList[i]);
+             }
+             int k1 = Item.itemsList[i].getColorFromDamage(j);
+             float f = (float)(k1 >> 16 & 0xff) / 255F;
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.java ../src_work/minecraft/net/minecraft/src/World.java
+--- ../src_base/minecraft/net/minecraft/src/World.java	2011-08-02 16:05:38.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/World.java	2011-08-03 01:10:53.000000000 -0400
+@@ -7,6 +7,8 @@
+ import java.io.PrintStream;
+ import java.util.*;
+ 
++import net.minecraft.src.forge.IBlockSecondaryProperties;
++
+ // Referenced classes of package net.minecraft.src:
+ //            IBlockAccess, WorldProvider, WorldInfo, MapStorage, 
+ //            ISaveHandler, ChunkProvider, EntityPlayer, ChunkProviderLoadOrGenerate, 
+@@ -313,7 +315,25 @@
+ 
+     public boolean isAirBlock(int i, int j, int k)
+     {
+-        return getBlockId(i, j, k) == 0;
++    	int iBlockID = getBlockId( i, j, k );
++
++    	if ( iBlockID == 0 )
++    	{
++    		return true;
++    	}
++    	else
++    	{
++    		Block block = Block.blocksList[iBlockID];
++    		
++    		if ( block instanceof IBlockSecondaryProperties )
++    		{
++    			return ((IBlockSecondaryProperties)block).isAirBlock( this, i, j, k );
++    		}
++    		else
++    		{
++    			return false;
++    		}
++    	}
+     }
+ 
+     public boolean blockExists(int i, int j, int k)
+@@ -1608,6 +1628,18 @@
+                         {
+                             return true;
+                         }
++                        else
++                        {
++                        	Block block = Block.blocksList[j2];
++                        	
++                        	if ( block instanceof IBlockSecondaryProperties )
++                        	{
++                        		if ( ((IBlockSecondaryProperties)block).isBlockBurning( this, k1, i1, i2 ) )
++                        		{
++                        			return true;
++                        		}
++                        	}
++                        }
+                     }
+ 
+                 }
+@@ -1900,7 +1932,14 @@
+             return false;
+         } else
+         {
+-            return block.blockMaterial.getIsTranslucent() && block.renderAsNormalBlock();
++        	if ( block instanceof IBlockSecondaryProperties )
++        	{
++        		return ((IBlockSecondaryProperties)block).isBlockNormalCube( this, i, j, k );
++        	}
++        	else
++        	{
++		    return block.blockMaterial.getIsTranslucent() && block.renderAsNormalBlock();
++		}
+         }
+     }
+ 
+@@ -2425,6 +2464,16 @@
+         {
+             block = null;
+         }
++        else
++        {
++        	if ( block instanceof IBlockSecondaryProperties )
++        	{
++        		if ( ((IBlockSecondaryProperties)block).isBlockReplaceable( this, j, k, l ) )
++        		{
++        			block = null;
++        		}
++        	}
++        }
+         return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1);
+     }
+ 
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRenderer.java ../src_work/minecraft/net/minecraft/src/WorldRenderer.java
+--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java	2011-08-02 16:05:39.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java	2011-08-02 16:07:42.000000000 -0400
+@@ -3,8 +3,12 @@
+ // Decompiler options: packimports(3) braces deadcode 
+ 
+ package net.minecraft.src;
++import net.minecraft.src.forge.*;
+ 
+ import java.util.*;
++
++import net.minecraft.src.forge.MinecraftForgeClient;
++
+ import org.lwjgl.opengl.GL11;
+ 
+ // Referenced classes of package net.minecraft.src:
+@@ -138,14 +142,27 @@
+                         }
+                         Block block = Block.blocksList[i3];
+                         int j3 = block.getRenderBlockPass();
++
++                        if (block instanceof IMultipassRender) {
++                            if (j3 != i2) {
++                                flag = true;
++                            }
++                            IMultipassRender impr = (IMultipassRender) block;
++                            if (impr.canRenderInPass(i2)) {
++                                j3 = i2;
++                            }
++                        }
++
+                         if(j3 != i2)
+                         {
+                             flag = true;
+                             continue;
+                         }
+                         if(j3 == i2)
+-                        {
++                        {                        	                            
++                            MinecraftForgeClient.beforeBlockRender(block, renderblocks);
+                             flag1 |= renderblocks.renderBlockByRenderType(block, l2, j2, k2);
++                            MinecraftForgeClient.afterBlockRender(block, renderblocks);                           
+                         }
+                     }
+ 
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java
+--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java	2011-08-02 16:05:40.000000000 -0400
++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java	2011-08-02 16:07:43.000000000 -0400
+@@ -3,6 +3,7 @@
+ // Decompiler options: packimports(3) braces deadcode 
+ 
+ package net.minecraft.src;
++import net.minecraft.src.forge.*;
+ 
+ import java.util.*;
+ 
+@@ -413,6 +414,10 @@
+         {
+             return false;
+         }
++	if(Block.blocksList[i1] instanceof IConnectRedstone) {
++		IConnectRedstone icr=(IConnectRedstone)Block.blocksList[i1];
++		return icr.canConnectRedstone(iblockaccess,i,j,k,l);
++	}
+         if(Block.blocksList[i1].canProvidePower())
+         {
+             return true;
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Chunk.java ../src_work/minecraft_server/net/minecraft/src/Chunk.java
+--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java	2011-08-02 16:05:39.000000000 -0400
++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java	2011-08-02 16:07:43.000000000 -0400
+@@ -3,6 +3,7 @@
+ // Decompiler options: packimports(3) braces deadcode 
+ 
+ package net.minecraft.src;
++import net.minecraft.src.forge.*;
+ 
+ import java.io.PrintStream;
+ import java.util.*;
+@@ -227,6 +228,13 @@
+         }
+         int l1 = xPosition * 16 + i;
+         int i2 = zPosition * 16 + k;
++
++	if(Block.blocksList[k1] instanceof IOverrideReplace) {
++		IOverrideReplace iovr=(IOverrideReplace)Block.blocksList[k1];
++		if(!iovr.canReplaceBlock(worldObj,l1,j,i2,l))
++			return iovr.getReplacedSuccess();
++	}
++
+         blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff);
+         if(k1 != 0 && !worldObj.singleplayerWorld)
+         {
+@@ -270,6 +278,13 @@
+         }
+         int k1 = xPosition * 16 + i;
+         int l1 = zPosition * 16 + k;
++
++	if(Block.blocksList[j1] instanceof IOverrideReplace) {
++		IOverrideReplace iovr=(IOverrideReplace)Block.blocksList[j1];
++		if(!iovr.canReplaceBlock(worldObj,k1,j,l1,l))
++			return iovr.getReplacedSuccess();
++	}
++
+         blocks[i << 11 | k << 7 | j] = (byte)(byte0 & 0xff);
+         if(j1 != 0)
+         {
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java
+--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java	2011-08-02 16:05:40.000000000 -0400
++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java	2011-08-02 16:07:43.000000000 -0400
+@@ -6,6 +6,8 @@
+ 
+ import java.util.*;
+ 
++import net.minecraft.src.forge.ISpecialArmor;
++
+ // Referenced classes of package net.minecraft.src:
+ //            EntityLiving, InventoryPlayer, ContainerPlayer, World, 
+ //            ChunkCoordinates, DataWatcher, Container, StatList, 
+@@ -457,6 +459,21 @@
+ 
+     protected void damageEntity(int i)
+     {
++        boolean doRegularComputation = true;
++        for (ItemStack stack : inventory.armorInventory) {
++            if (stack != null && stack.getItem() instanceof ISpecialArmor) {
++                ISpecialArmor armor = (ISpecialArmor) stack.getItem();
++                
++                i = armor.adjustArmorDamage(i);
++                doRegularComputation = doRegularComputation
++                        && armor.allowRegularComputation();
++            }
++        }
++        
++        if (!doRegularComputation) {
++            super.damageEntity(i);
++        }
++        
+         int j = 25 - inventory.getTotalArmorValue();
+         int k = i * j + damageRemainder;
+         inventory.damageArmor(i);
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Explosion.java ../src_work/minecraft_server/net/minecraft/src/Explosion.java
+--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java	2011-08-02 16:05:39.000000000 -0400
++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java	2011-08-02 16:07:43.000000000 -0400
+@@ -3,6 +3,7 @@
+ // Decompiler options: packimports(3) braces deadcode 
+ 
+ package net.minecraft.src;
++import net.minecraft.src.forge.ISpecialResistance;
+ 
+ import java.util.*;
+ 
+@@ -65,7 +66,16 @@
+                         int i5 = worldObj.getBlockId(j4, k4, l4);
+                         if(i5 > 0)
+                         {
+-                            f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2;
++			    if(Block.blocksList[i5] instanceof ISpecialResistance) {
++				    ISpecialResistance isr=(ISpecialResistance)
++					   Block.blocksList[i5];
++				    f1-=(isr.getSpecialExplosionResistance(
++					worldObj,j4,k4,l4,
++					explosionX,explosionY,explosionZ,
++					exploder) + 0.3F) * f2;
++			    } else {
++				    f1 -= (Block.blocksList[i5].getExplosionResistance(exploder) + 0.3F) * f2;
++			    }
+                         }
+                         if(f1 > 0.0F)
+                         {
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java
+--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java	2011-08-02 16:05:40.000000000 -0400
++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java	2011-08-02 16:07:43.000000000 -0400
+@@ -6,6 +6,8 @@
+ 
+ import java.util.Random;
+ 
++import net.minecraft.src.forge.MinecraftForge;
++
+ // Referenced classes of package net.minecraft.src:
+ //            Item, EntityPlayer, Vec3D, MathHelper, 
+ //            World, MovingObjectPosition, EnumMovingObjectType, Material, 
+@@ -55,6 +57,13 @@
+             }
+             if(isFull == 0)
+             {
++                ItemStack customBucket = MinecraftForge.fillCustomBucket(world,
++                        i, j, k);
++            	
++            	if (customBucket != null) {
++            		return customBucket;
++            	}
++
+                 if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0)
+                 {
+                     world.setBlockWithNotify(i, j, k, 0);
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java
+--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java	2011-08-02 16:05:39.000000000 -0400
++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java	2011-08-02 16:07:43.000000000 -0400
+@@ -3,6 +3,7 @@
+ // Decompiler options: packimports(3) braces deadcode 
+ 
+ package net.minecraft.src;
++import net.minecraft.src.forge.*;
+ 
+ 
+ // Referenced classes of package net.minecraft.src:
+@@ -145,6 +146,11 @@
+ 
+     public boolean activeBlockOrUseItem(EntityPlayer entityplayer, World world, ItemStack itemstack, int i, int j, int k, int l)
+     {
++	if(itemstack!=null && itemstack.getItem() instanceof IUseItemFirst) {
++		IUseItemFirst iuif=(IUseItemFirst)itemstack.getItem();
++		if(iuif.onItemUseFirst(itemstack,entityplayer,world,i,j,k,l))
++			return true;
++	}
+         int i1 = world.getBlockId(i, j, k);
+         if(i1 > 0 && Block.blocksList[i1].blockActivated(world, i, j, k, entityplayer))
+         {
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java
+--- ../src_base/minecraft_server/net/minecraft/src/ItemPickaxe.java	2011-08-02 16:05:39.000000000 -0400
++++ ../src_work/minecraft_server/net/minecraft/src/ItemPickaxe.java	2011-08-02 16:07:43.000000000 -0400
+@@ -4,6 +4,8 @@
+ 
+ package net.minecraft.src;
+ 
++import net.minecraft.src.forge.MinecraftForge;
++
+ 
+ // Referenced classes of package net.minecraft.src:
+ //            ItemTool, Block, EnumToolMaterial, Material
+@@ -42,6 +44,9 @@
+         {
+             return toolMaterial.getHarvestLevel() >= 2;
+         }
++        if (MinecraftForge.canHarvestBlock(this, block)) {
++            return true;
++        }
+         if(block.blockMaterial == Material.rock)
+         {
+             return true;
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemTool.java ../src_work/minecraft_server/net/minecraft/src/ItemTool.java
+--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java	2011-08-02 16:05:39.000000000 -0400
++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java	2011-08-02 16:07:43.000000000 -0400
+@@ -4,6 +4,8 @@
+ 
+ package net.minecraft.src;
+ 
++import java.util.Arrays;
++
+ 
+ // Referenced classes of package net.minecraft.src:
+ //            Item, EnumToolMaterial, ItemStack, Block, 
+@@ -58,4 +60,11 @@
+     private float efficiencyOnProperMaterial;
+     private int damageVsEntity;
+     protected EnumToolMaterial toolMaterial;
++    
++    public void addBlockEffectiveAgainst (Block block) {    
++        blocksEffectiveAgainst = Arrays.copyOf(blocksEffectiveAgainst,
++                blocksEffectiveAgainst.length + 1);
++        
++        blocksEffectiveAgainst [blocksEffectiveAgainst.length-1] = block;
++    }
+ }
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java
+--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java	2011-08-02 16:05:40.000000000 -0400
++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java	2011-08-02 16:07:43.000000000 -0400
+@@ -169,12 +169,11 @@
+             sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver));
+             for(int k = 0; k < numBlocksToUpdate; k++)
+             {
+-                int j1 = chunkX * 16 + (numBlocksToUpdate >> 12 & 0xf);
+-                int i2 = numBlocksToUpdate & 0xff;
+-                int k2 = chunkZ * 16 + (numBlocksToUpdate >> 8 & 0xf);
++                int j1 = chunkX * 16 + (blocksToUpdate[k] >> 12 & 0xf);
++                int i2 = blocksToUpdate[k] & 0xff;
++                int k2 = chunkZ * 16 + (blocksToUpdate[k] >> 8 & 0xf);
+                 if(Block.isBlockContainer[worldserver.getBlockId(j1, i2, k2)])
+                 {
+-                    System.out.println("Sending!");
+                     updateTileEntity(worldserver.getBlockTileEntity(j1, i2, k2));
+                 }
+             }
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/World.java ../src_work/minecraft_server/net/minecraft/src/World.java
+--- ../src_base/minecraft_server/net/minecraft/src/World.java	2011-08-02 16:05:39.000000000 -0400
++++ ../src_work/minecraft_server/net/minecraft/src/World.java	2011-08-03 01:10:51.000000000 -0400
+@@ -7,6 +7,8 @@
+ import java.io.PrintStream;
+ import java.util.*;
+ 
++import net.minecraft.src.forge.IBlockSecondaryProperties;
++
+ // Referenced classes of package net.minecraft.src:
+ //            IBlockAccess, WorldProvider, MapStorage, ISaveHandler, 
+ //            WorldInfo, ChunkProvider, IChunkProvider, IProgressUpdate, 
+@@ -166,7 +168,25 @@
+ 
+     public boolean isAirBlock(int i, int j, int k)
+     {
+-        return getBlockId(i, j, k) == 0;
++    	int iBlockID = getBlockId( i, j, k );
++
++    	if ( iBlockID == 0 )
++    	{
++    		return true;
++    	}
++    	else
++    	{
++    		Block block = Block.blocksList[iBlockID];
++    		
++    		if ( block instanceof IBlockSecondaryProperties )
++    		{
++    			return ((IBlockSecondaryProperties)block).isAirBlock( this, i, j, k );
++    		}
++    		else
++    		{
++    			return false;
++    		}
++    	}
+     }
+ 
+     public boolean blockExists(int i, int j, int k)
+@@ -1409,6 +1429,18 @@
+                         {
+                             return true;
+                         }
++                        else
++                        {
++                        	Block block = Block.blocksList[j2];
++                        	
++                        	if ( block instanceof IBlockSecondaryProperties )
++                        	{
++                        		if ( ((IBlockSecondaryProperties)block).isBlockBurning( this, k1, i1, i2 ) )
++                        		{
++                        			return true;
++                        		}
++                        	}
++                        }
+                     }
+ 
+                 }
+@@ -1686,7 +1718,14 @@
+             return false;
+         } else
+         {
+-            return block.blockMaterial.getIsOpaque() && block.isACube();
++        	if ( block instanceof IBlockSecondaryProperties )
++        	{
++        		return ((IBlockSecondaryProperties)block).isBlockNormalCube( this, i, j, k );
++        	}
++        	else
++        	{
++		    return block.blockMaterial.getIsOpaque() && block.isACube();
++		}
+         }
+     }
+ 
+@@ -2178,6 +2217,16 @@
+         {
+             block = null;
+         }
++        else
++        {
++        	if ( block instanceof IBlockSecondaryProperties )
++        	{
++        		if ( ((IBlockSecondaryProperties)block).isBlockReplaceable( this, j, k, l ) )
++        		{
++        			block = null;
++        		}
++        	}
++        }
+         return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1);
+     }
+ 

forge/modLoaderMP.patch

@@ -0,0 +1,59 @@
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java
+--- ../src_base/minecraft_server/net/minecraft/server/MinecraftServer.java	2011-07-17 00:28:07.755771900 +0200
++++ ../src_work/minecraft_server/net/minecraft/server/MinecraftServer.java	2011-07-17 00:28:09.485870900 +0200
+@@ -333,41 +333,22 @@
+             }
+             finally
+             {
+-                System.exit(0);
++                    try
++                    {
++                            stopServer();
++                            serverStopped = true;
++                    }
++                    catch(Throwable throwable2)
++                    {
++                            throwable2.printStackTrace();
++                    }
++                    finally
++                    {
++                            System.exit(0);
++                    }
+             }
+-            break MISSING_BLOCK_LABEL_350;
+-        }
+-        try
+-        {
+-            stopServer();
+-            serverStopped = true;
+-        }
+-        catch(Throwable throwable)
+-        {
+-            throwable.printStackTrace();
+-        }
+-        finally
+-        {
+-            System.exit(0);
+-        }
+-        break MISSING_BLOCK_LABEL_350;
+-        Exception exception2;
+-        exception2;
+-        try
+-        {
+-            stopServer();
+-            serverStopped = true;
+-        }
+-        catch(Throwable throwable3)
+-        {
+-            throwable3.printStackTrace();
+-        }
+-        finally
+-        {
+-            System.exit(0);
+-        }
+-        throw exception2;
+     }
++}
+ 
+     private void doTick()
+     {

forge/package.sh

@@ -0,0 +1,71 @@
+version=$1
+build_dir=`pwd`
+dir=`pwd`/../forge-$version
+
+function remove_svn () {
+  (
+  cd $1
+
+  if [ -d .svn ]; then
+     rm -rf .svn
+  fi
+
+  for j in `ls`
+  do
+     if [ -d $j ]; then
+        remove_svn $j
+     fi
+  done
+  )
+}
+
+function package_all () {
+   qual=$1
+
+   zip -r $dir/minecraftforge$qual-$version.zip \
+      *.class \
+      forge
+}
+
+cd ../reobf
+
+remove_svn .
+
+rm -rf $dir
+mkdir $dir
+
+cd minecraft
+package_all "-client"
+
+cd ../minecraft_server
+package_all "-server"
+
+cd ../..
+
+rm -rf reobf
+
+cd $build_dir
+
+mkdir forge
+cd forge
+mkdir src
+mkdir src/minecraft
+mkdir src/minecraft_server
+cp -r ../forge_client/src/* src/minecraft
+cp -r ../forge_server/src/* src/minecraft_server
+cp -r ../forge_common/* src/minecraft
+cp -r ../forge_common/* src/minecraft_server
+cp ../minecraft.patch .
+cp ../lfcr.py .
+cp ../install/install.cmd .
+cp ../install/README.txt .
+cp -r ../doc .
+
+cd src
+remove_svn .
+cd ..
+
+cd ..
+
+zip -r $dir/minecraftforge-src-$version.zip forge
+rm -rf forge

forge/release.bat

@@ -0,0 +1,13 @@
+cmd /C build.bat
+
+cd ..
+
+cmd /C reobfuscate.bat
+
+set PATH=E:\cygwin\bin;%PATH%
+
+cd forge
+
+sh package.sh 1.0.3
+
+pause

forge/setup.bat

@@ -0,0 +1,25 @@
+cd ..
+
+rmdir /S /Q src
+
+IF EXIST src_base (
+move src_base src
+rmdir /S /Q src_work
+) ELSE (
+cmd /C decompile.bat
+cd src
+..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\modLoaderMP.patch ..\forge\modLoaderMP-win.patch
+..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP-win.patch
+cd ..
+cmd /C recompile.bat
+cmd /C updatemd5.bat
+)
+
+mkdir src_base
+mkdir src_work
+xcopy  /Y /E src\* src_base
+xcopy  /Y /E src\* src_work
+cd src_work
+..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\minecraft.patch ..\forge\minecraft-win.patch
+..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\minecraft-win.patch
+pause

forge/update_patch.sh

@@ -0,0 +1,5 @@
+rm minecraft.patch
+touch minecraft.patch
+
+diff -u ../src_base ../src_work -r --strip-trailing-cr | tr -d '\r' \
+      >> minecraft.patch

gradle/wrapper/gradle-wrapper.properties

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

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

gradlew.bat

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

install/build.gradle

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/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

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/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

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

jsons/1.6-dev.json

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

jsons/1.6-rel.json

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

jsons/1.6.1-dev.json

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

jsons/1.6.1-rel.json

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

jsons/1.6.2-dev.json

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

jsons/1.6.2-rel.json

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

jsons/1.6.3-dev.json

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

jsons/1.6.3-rel.json

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

jsons/1.6.4-dev.json

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

jsons/1.6.4-rel.json

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

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

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

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

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

@@ -1,124 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/Minecraft.java
-+++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
-@@ -1,6 +1,11 @@
- package net.minecraft.client;
- 
- import com.google.common.collect.Lists;
-+
-+import cpw.mods.fml.client.FMLClientHandler;
-+import cpw.mods.fml.common.FMLCommonHandler;
-+import cpw.mods.fml.common.registry.GameData;
-+import cpw.mods.fml.common.registry.ItemData;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.awt.image.BufferedImage;
-@@ -130,6 +135,8 @@
- import org.lwjgl.opengl.PixelFormat;
- import org.lwjgl.util.glu.GLU;
- 
-+import com.google.common.collect.MapDifference;
-+
- @SideOnly(Side.CLIENT)
- public class Minecraft implements IPlayerUsage
- {
-@@ -362,9 +369,12 @@
-         this.field_71446_o = new TextureManager(this.field_110451_am);
-         this.field_110451_am.func_110542_a(this.field_71446_o);
-         this.field_71416_A = new SoundManager(this.field_110451_am, this.field_71474_y, this.field_110446_Y);
-+        this.field_71416_A.LOAD_SOUND_SYSTEM = false;
-         this.field_110451_am.func_110542_a(this.field_71416_A);
-         this.func_71357_I();
-         this.field_71466_p = new FontRenderer(this.field_71474_y, new ResourceLocation("textures/font/ascii.png"), this.field_71446_o, false);
-+
-+        FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am);
- 
-         if (this.field_71474_y.field_74363_ab != null)
-         {
-@@ -400,6 +410,7 @@
-         this.field_71446_o.func_130088_a(TextureMap.field_110576_c, new TextureMap(1, "textures/items"));
-         GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d);
-         this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
-+        FMLClientHandler.instance().finishMinecraftLoading();
-         this.func_71361_d("Post startup");
-         this.field_71456_v = new GuiIngame(this);
- 
-@@ -418,6 +429,7 @@
-         {
-             this.func_71352_k();
-         }
-+        FMLClientHandler.instance().onInitializationComplete();
-     }
- 
-     public void func_110436_a()
-@@ -733,6 +745,7 @@
-         {
-             this.func_71405_e();
-         }
-+
-     }
- 
-     private void func_71411_J()
-@@ -801,9 +814,11 @@
- 
-         if (!this.field_71454_w)
-         {
-+                FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_74281_c);
-             this.field_71424_I.func_76318_c("gameRenderer");
-             this.field_71460_t.func_78480_b(this.field_71428_T.field_74281_c);
-             this.field_71424_I.func_76319_b();
-+                FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_74281_c);
-         }
- 
-         GL11.glFlush();
-@@ -1325,10 +1340,14 @@
- 
-     public void func_71407_l()
-     {
-+        FMLCommonHandler.instance().rescheduleTicks(Side.CLIENT);
-+
-         if (this.field_71467_ac > 0)
-         {
-             --this.field_71467_ac;
-         }
-+
-+        FMLCommonHandler.instance().onPreClientTick();
- 
-         this.field_71424_I.func_76320_a("stats");
-         this.field_71413_E.func_77449_e();
-@@ -1785,6 +1804,8 @@
-             this.field_71453_ak.func_74428_b();
-         }
- 
-+        FMLCommonHandler.instance().onPostClientTick();
-+
-         this.field_71424_I.func_76319_b();
-         this.field_71423_H = func_71386_F();
-     }
-@@ -1808,8 +1829,27 @@
-         }
- 
-         this.field_71413_E.func_77450_a(StatList.field_75936_f, 1);
-+
-+        GameData.initializeServerGate(2);
-+
-         this.field_71437_Z = new IntegratedServer(this, p_71371_1_, p_71371_2_, p_71371_3_);
-         this.field_71437_Z.func_71256_s();
-+
-+        MapDifference<Integer, ItemData> idDifferences = GameData.gateWorldLoadingForValidation();
-+        if (idDifferences!=null)
-+        {
-+            FMLClientHandler.instance().warnIDMismatch(idDifferences, true);
-+        }
-+        else
-+        {
-+            GameData.releaseGate(true);
-+            continueWorldLoading();
-+        }
-+
-+    }
-+
-+    public void continueWorldLoading()
-+    {
-         this.field_71455_al = true;
-         this.field_71461_s.func_73720_a(I18n.func_135053_a("menu.loadingLevel"));
- 

patches/minecraft/net/minecraft/client/audio/SoundManager.java.patch

@@ -1,18 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/audio/SoundManager.java
-+++ ../src-work/minecraft/net/minecraft/client/audio/SoundManager.java
-@@ -27,6 +27,7 @@
- @SideOnly(Side.CLIENT)
- public class SoundManager implements ResourceManagerReloadListener
- {
-+    public boolean LOAD_SOUND_SYSTEM = true;
-     private static final String[] field_130084_a = new String[] {"ogg"};
-     private SoundSystem field_77381_a;
-     private boolean field_77376_g;
-@@ -67,6 +68,7 @@
- 
-     public void func_110549_a(ResourceManager p_110549_1_)
-     {
-+        if (!this.LOAD_SOUND_SYSTEM) return; //Stop the sound system from initializing three times at startup. Causing race conditions on some machines.
-         this.func_82464_d();
-         this.func_77370_b();
-         this.func_77363_d();

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

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
-@@ -212,6 +212,8 @@
-                     }
-                 }
- 
-+                WorldType.field_77139_a[this.field_73916_E].onGUICreateWorldPress();
-+
-                 EnumGameType enumgametype = EnumGameType.func_77142_a(this.field_73927_m);
-                 WorldSettings worldsettings = new WorldSettings(i, enumgametype, this.field_73925_n, this.field_73933_r, WorldType.field_77139_a[this.field_73916_E]);
-                 worldsettings.func_82750_a(this.field_82290_a);

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

@@ -1,91 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java
-@@ -1,5 +1,7 @@
- package net.minecraft.client.gui;
- 
-+import cpw.mods.fml.client.GuiModList;
-+import cpw.mods.fml.common.FMLCommonHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.io.BufferedReader;
-@@ -9,6 +11,7 @@
- import java.util.ArrayList;
- import java.util.Calendar;
- import java.util.Date;
-+import java.util.List;
- import java.util.Random;
- import net.minecraft.client.Minecraft;
- import net.minecraft.client.mco.ExceptionMcoService;
-@@ -26,6 +29,9 @@
- import org.apache.commons.io.Charsets;
- import org.lwjgl.opengl.GL11;
- import org.lwjgl.util.glu.Project;
-+
-+import com.google.common.base.Strings;
-+import com.google.common.collect.Lists;
- 
- @SideOnly(Side.CLIENT)
- public class GuiMainMenu extends GuiScreen
-@@ -55,6 +61,8 @@
-     private ResourceLocation field_110351_G;
-     private GuiButton field_130023_H;
- 
-+    private GuiButton fmlModButton = null;
-+
-     public GuiMainMenu()
-     {
-         BufferedReader bufferedreader = null;
-@@ -206,13 +214,22 @@
-     private void func_130022_h()
-     {
-         this.field_130023_H.field_73748_h = true;
-+        fmlModButton.field_73747_a = 98;
-+        fmlModButton.field_73746_c = this.field_73880_f / 2 + 2;
-     }
- 
-     private void func_73969_a(int p_73969_1_, int p_73969_2_)
-     {
-         this.field_73887_h.add(new GuiButton(1, this.field_73880_f / 2 - 100, p_73969_1_, I18n.func_135053_a("menu.singleplayer")));
-         this.field_73887_h.add(new GuiButton(2, this.field_73880_f / 2 - 100, p_73969_1_ + p_73969_2_ * 1, I18n.func_135053_a("menu.multiplayer")));
--        this.field_73887_h.add(this.field_130023_H = new GuiButton(14, this.field_73880_f / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135053_a("menu.online")));
-+        //If Minecraft Realms is enabled, halve the size of both buttons and set them next to eachother.
-+        fmlModButton = new GuiButton(6, this.field_73880_f / 2 - 100, p_73969_1_ + p_73969_2_ * 2, "Mods");
-+        this.field_73887_h.add(fmlModButton);
-+
-+        field_130023_H = new GuiButton(14, this.field_73880_f / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135053_a("menu.online"));
-+        field_130023_H.field_73747_a = 98;
-+        field_130023_H.field_73746_c = this.field_73880_f / 2 - 100;
-+        this.field_73887_h.add(field_130023_H);
-         this.field_130023_H.field_73748_h = false;
-     }
- 
-@@ -259,6 +276,11 @@
-         if (p_73875_1_.field_73741_f == 4)
-         {
-             this.field_73882_e.func_71400_g();
-+        }
-+
-+        if (p_73875_1_.field_73741_f == 6)
-+        {
-+            this.field_73882_e.func_71373_a(new GuiModList(this));
-         }
- 
-         if (p_73875_1_.field_73741_f == 11)
-@@ -520,7 +542,16 @@
-             s = s + " Demo";
-         }
- 
--        this.func_73731_b(this.field_73886_k, s, 2, this.field_73881_g - 10, 16777215);
-+        List<String> brandings = Lists.reverse(FMLCommonHandler.instance().getBrandings());
-+        for (int i = 0; i < brandings.size(); i++)
-+        {
-+            String brd = brandings.get(i);
-+            if (!Strings.isNullOrEmpty(brd))
-+            {
-+                this.func_73731_b(this.field_73886_k, brd, 2, this.field_73881_g - ( 10 + i * (this.field_73886_k.field_78288_b + 1)), 16777215);
-+            }
-+        }
-+
-         String s1 = "Copyright Mojang AB. Do not distribute!";
-         this.func_73731_b(this.field_73886_k, s1, this.field_73880_f - this.field_73886_k.func_78256_a(s1) - 2, this.field_73881_g - 10, 16777215);
- 

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

@@ -1,13 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java
-+++ ../src-work/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java
-@@ -131,4 +131,10 @@
-     {
-         return p_98096_0_.field_73882_e;
-     }
-+    
-+    public static void forceTermination(GuiConnecting gui)
-+    {
-+        gui.field_74258_b = true;
-+        gui.field_74259_a = null;
-+    }
- }

patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch

@@ -1,119 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java
-+++ ../src-work/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java
-@@ -1,6 +1,8 @@
- package net.minecraft.client.multiplayer;
- 
- import com.google.common.base.Charsets;
-+
-+import cpw.mods.fml.common.network.FMLNetworkHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.io.BufferedReader;
-@@ -205,11 +207,14 @@
-     private GuiScreen field_98183_l;
-     Random field_72557_e = new Random();
- 
-+    private static byte connectionCompatibilityLevel;
-+
-     public NetClientHandler(Minecraft p_i1176_1_, String p_i1176_2_, int p_i1176_3_) throws IOException
-     {
-         this.field_72563_h = p_i1176_1_;
-         Socket socket = new Socket(InetAddress.getByName(p_i1176_2_), p_i1176_3_);
-         this.field_72555_g = new TcpConnection(p_i1176_1_.func_98033_al(), socket, "Client", this);
-+        FMLNetworkHandler.onClientConnectionToRemoteServer(this, p_i1176_2_, p_i1176_3_, this.field_72555_g);
-     }
- 
-     public NetClientHandler(Minecraft p_i1177_1_, String p_i1177_2_, int p_i1177_3_, GuiScreen p_i1177_4_) throws IOException
-@@ -218,6 +223,7 @@
-         this.field_98183_l = p_i1177_4_;
-         Socket socket = new Socket(InetAddress.getByName(p_i1177_2_), p_i1177_3_);
-         this.field_72555_g = new TcpConnection(p_i1177_1_.func_98033_al(), socket, "Client", this);
-+        FMLNetworkHandler.onClientConnectionToRemoteServer(this, p_i1177_2_, p_i1177_3_, this.field_72555_g);
-     }
- 
-     public NetClientHandler(Minecraft p_i1178_1_, IntegratedServer p_i1178_2_) throws IOException
-@@ -225,6 +231,7 @@
-         this.field_72563_h = p_i1178_1_;
-         this.field_72555_g = new MemoryConnection(p_i1178_1_.func_98033_al(), this);
-         p_i1178_2_.func_71343_a().func_71754_a((MemoryConnection)this.field_72555_g, p_i1178_1_.func_110432_I().func_111285_a());
-+        FMLNetworkHandler.onClientConnectionToIntegratedServer(this, p_i1178_2_, this.field_72555_g);
-     }
- 
-     public void func_72547_c()
-@@ -296,6 +303,7 @@
- 
-     public void func_72513_a(Packet252SharedKey p_72513_1_)
-     {
-+        this.func_72552_c(FMLNetworkHandler.getFMLFakeLoginPacket());
-         this.func_72552_c(new Packet205ClientCommand(0));
-     }
- 
-@@ -311,6 +319,7 @@
-         this.field_72563_h.field_71439_g.field_70157_k = p_72455_1_.field_73561_a;
-         this.field_72556_d = p_72455_1_.field_73562_h;
-         this.field_72563_h.field_71442_b.func_78746_a(p_72455_1_.field_73557_d);
-+        FMLNetworkHandler.onConnectionEstablishedToServer(this, field_72555_g, p_72455_1_);
-         this.field_72563_h.field_71474_y.func_82879_c();
-         this.field_72555_g.func_74429_a(new Packet250CustomPayload("MC|Brand", ClientBrandRetriever.getClientModName().getBytes(Charsets.UTF_8)));
-     }
-@@ -765,6 +774,7 @@
-         {
-             this.field_72555_g.func_74429_a(p_72546_1_);
-             this.field_72555_g.func_74423_d();
-+            FMLNetworkHandler.onConnectionClosed(this.field_72555_g, this.getPlayer());
-         }
-     }
- 
-@@ -804,6 +814,7 @@
- 
-     public void func_72481_a(Packet3Chat p_72481_1_)
-     {
-+        p_72481_1_ = FMLNetworkHandler.handleChatMessage(this, p_72481_1_);
-         this.field_72563_h.field_71456_v.func_73827_b().func_73765_a(ChatMessageComponent.func_111078_c(p_72481_1_.field_73476_b).func_111068_a(true));
-     }
- 
-@@ -1403,6 +1414,11 @@
- 
-     public void func_72494_a(Packet131MapData p_72494_1_)
-     {
-+        FMLNetworkHandler.handlePacket131Packet(this, p_72494_1_);
-+    }
-+
-+    public void fmlPacket131Callback(Packet131MapData p_72494_1_)
-+    {
-         if (p_72494_1_.field_73438_a == Item.field_77744_bd.field_77779_bT)
-         {
-             ItemMap.func_77874_a(p_72494_1_.field_73436_b, this.field_72563_h.field_71441_e).func_76192_a(p_72494_1_.field_73437_c);
-@@ -1514,6 +1530,11 @@
- 
-     public void func_72501_a(Packet250CustomPayload p_72501_1_)
-     {
-+    FMLNetworkHandler.handlePacket250Packet(p_72501_1_, field_72555_g, this);
-+    }
-+
-+    public void handleVanilla250Packet(Packet250CustomPayload p_72501_1_)
-+    {
-         if ("MC|TrList".equals(p_72501_1_.field_73630_a))
-         {
-             DataInputStream datainputstream = new DataInputStream(new ByteArrayInputStream(p_72501_1_.field_73629_c));
-@@ -1707,4 +1728,20 @@
-     {
-         return this.field_72555_g;
-     }
-+
-+    @Override
-+    public EntityPlayer getPlayer()
-+    {
-+        return field_72563_h.field_71439_g;
-+    }
-+
-+    public static void setConnectionCompatibilityLevel(byte connectionCompatibilityLevel)
-+    {
-+        NetClientHandler.connectionCompatibilityLevel = connectionCompatibilityLevel;
-+    }
-+
-+    public static byte getConnectionCompatibilityLevel()
-+    {
-+        return connectionCompatibilityLevel;
-+    }
- }

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

@@ -1,101 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/renderer/RenderBlocks.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/RenderBlocks.java
-@@ -35,6 +35,7 @@
- import net.minecraft.block.material.Material;
- import net.minecraft.client.Minecraft;
- import net.minecraft.client.renderer.texture.TextureMap;
-+import net.minecraft.src.FMLRenderAccessLibrary;
- import net.minecraft.util.Direction;
- import net.minecraft.util.Icon;
- import net.minecraft.util.MathHelper;
-@@ -223,7 +224,51 @@
-         {
-             p_78612_1_.func_71902_a(this.field_78669_a, p_78612_2_, p_78612_3_, p_78612_4_);
-             this.func_83018_a(p_78612_1_);
--            return l == 0 ? this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 4 ? this.func_78621_p(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 31 ? this.func_78581_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 1 ? this.func_78620_l(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 2 ? this.func_78572_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 20 ? this.func_78598_k(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 11 ? this.func_78582_a((BlockFence)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 39 ? this.func_96445_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 5 ? this.func_78589_i(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 13 ? this.func_78584_s(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 9 ? this.func_78586_a((BlockRailBase)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 19 ? this.func_78603_m(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 23 ? this.func_78566_o(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 6 ? this.func_78614_n(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 3 ? this.func_78590_h((BlockFire)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 8 ? this.func_78576_j(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 7 ? this.func_78601_u(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 10 ? this.func_78565_t((BlockStairs)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 27 ? this.func_78618_a((BlockDragonEgg)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 32 ? this.func_82779_a((BlockWall)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 12 ? this.func_78594_e(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 29 ? this.func_78577_f(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 30 ? this.func_78619_g(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 14 ? this.func_78574_w(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 15 ? this.func_78610_x((BlockRedstoneRepeater)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 36 ? this.func_94176_a((BlockRedstoneLogic)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 37 ? this.func_94171_a((BlockComparator)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 16 ? this.func_78593_b(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, false) : (l == 17 ? this.func_78608_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, true) : (l == 18 ? this.func_78592_a((BlockPane)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 21 ? this.func_78580_a((BlockFenceGate)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 24 ? this.func_78615_a((BlockCauldron)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 33 ? this.func_82780_a((BlockFlowerPot)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 35 ? this.func_82775_a((BlockAnvil)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 25 ? this.func_78585_a((BlockBrewingStand)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 26 ? this.func_78567_v((BlockEndPortalFrame)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 28 ? this.func_78616_a((BlockCocoa)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 34 ? this.func_82778_a((BlockBeacon)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (l == 38 ? this.func_94172_a((BlockHopper)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : false))))))))))))))))))))))))))))))))))))));
-+
-+            switch (l)
-+            {
-+                //regex: ' : \(l == ([\d]+) \?' replace: ';\ncase \1: return' ::: IMPORTANT: REMEMBER THIS ON FIRST line!
-+                case 0: return this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 4: return this.func_78621_p(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 31: return this.func_78581_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 1: return this.func_78620_l(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 2: return this.func_78572_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 20: return this.func_78598_k(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 11: return this.func_78582_a((BlockFence)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 39: return this.func_96445_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 5: return this.func_78589_i(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 13: return this.func_78584_s(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 9: return this.func_78586_a((BlockRailBase)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 19: return this.func_78603_m(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 23: return this.func_78566_o(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 6: return this.func_78614_n(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 3: return this.func_78590_h((BlockFire)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 8: return this.func_78576_j(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 7: return this.func_78601_u(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 10: return this.func_78565_t((BlockStairs)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 27: return this.func_78618_a((BlockDragonEgg)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 32: return this.func_82779_a((BlockWall)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 12: return this.func_78594_e(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 29: return this.func_78577_f(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 30: return this.func_78619_g(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 14: return this.func_78574_w(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 15: return this.func_78610_x((BlockRedstoneRepeater)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 36: return this.func_94176_a((BlockRedstoneLogic)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 37: return this.func_94171_a((BlockComparator)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 16: return this.func_78593_b(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, false);
-+                case 17: return this.func_78608_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, true);
-+                case 18: return this.func_78592_a((BlockPane)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 21: return this.func_78580_a((BlockFenceGate)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 24: return this.func_78615_a((BlockCauldron)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 33: return this.func_82780_a((BlockFlowerPot)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 35: return this.func_82775_a((BlockAnvil)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 25: return this.func_78585_a((BlockBrewingStand)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 26: return this.func_78567_v((BlockEndPortalFrame)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 28: return this.func_78616_a((BlockCocoa)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 34: return this.func_82778_a((BlockBeacon)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                case 38: return this.func_94172_a((BlockHopper)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_);
-+                default: return FMLRenderAccessLibrary.renderWorldBlock(this, field_78669_a, p_78612_2_, p_78612_3_, p_78612_4_, p_78612_1_, l);
-+            }
-         }
-     }
- 
-@@ -7636,6 +7681,10 @@
-                 this.func_96447_a((BlockHopper)p_78600_1_, 0, 0, 0, 0, true);
-                 GL11.glTranslatef(0.5F, 0.5F, 0.5F);
-             }
-+            else
-+            {
-+                FMLRenderAccessLibrary.renderInventoryBlock(this, p_78600_1_, p_78600_2_, j);
-+            }
-         }
-         else
-         {
-@@ -7694,7 +7743,25 @@
- 
-     public static boolean func_78597_b(int p_78597_0_)
-     {
--        return p_78597_0_ == 0 ? true : (p_78597_0_ == 31 ? true : (p_78597_0_ == 39 ? true : (p_78597_0_ == 13 ? true : (p_78597_0_ == 10 ? true : (p_78597_0_ == 11 ? true : (p_78597_0_ == 27 ? true : (p_78597_0_ == 22 ? true : (p_78597_0_ == 21 ? true : (p_78597_0_ == 16 ? true : (p_78597_0_ == 26 ? true : (p_78597_0_ == 32 ? true : (p_78597_0_ == 34 ? true : p_78597_0_ == 35))))))))))));
-+        switch (p_78597_0_)
-+        {
-+        case 0: return true;
-+        case 31: return true ;
-+        case 39: return true ;
-+        case 13: return true ;
-+        case 10: return true ;
-+        case 11: return true ;
-+        case 27: return true ;
-+        case 22: return true ;
-+        case 21: return true ;
-+        case 16: return true ;
-+        case 26: return true ;
-+        case 32: return true ;
-+        case 34: return true ;
-+        case 35: return true ;
-+        default: return FMLRenderAccessLibrary.renderItemAsFull3DBlock(p_78597_0_);
-+        }
-+
-     }
- 
-     public Icon func_94170_a(Block p_94170_1_, IBlockAccess p_94170_2_, int p_94170_3_, int p_94170_4_, int p_94170_5_, int p_94170_6_)

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

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

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

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

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

@@ -1,17 +0,0 @@
---- ../src-base/minecraft/net/minecraft/client/settings/GameSettings.java
-+++ ../src-work/minecraft/net/minecraft/client/settings/GameSettings.java
-@@ -1,5 +1,6 @@
- package net.minecraft.client.settings;
- 
-+import cpw.mods.fml.client.FMLClientHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.io.BufferedReader;
-@@ -705,6 +706,7 @@
- 
-     public void func_74303_b()
-     {
-+        if (FMLClientHandler.instance().isLoading()) return;
-         try
-         {
-             PrintWriter printwriter = new PrintWriter(new FileWriter(this.field_74354_ai));

patches/minecraft/net/minecraft/crash/CallableSuspiciousClasses.java.patch

@@ -1,17 +0,0 @@
---- ../src-base/minecraft/net/minecraft/crash/CallableSuspiciousClasses.java
-+++ ../src-work/minecraft/net/minecraft/crash/CallableSuspiciousClasses.java
-@@ -130,13 +130,6 @@
- 
-     public Object call()
-     {
--        try
--        {
--            return this.func_85085_a();
--        }
--        catch (Exception ex)
--        {
--            return null;
--        }
-+        return "FML is installed";
-     }
- }

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

@@ -1,17 +0,0 @@
---- ../src-base/minecraft/net/minecraft/crash/CrashReport.java
-+++ ../src-work/minecraft/net/minecraft/crash/CrashReport.java
-@@ -1,5 +1,6 @@
- package net.minecraft.crash;
- 
-+import cpw.mods.fml.common.FMLCommonHandler;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.io.File;
-@@ -43,6 +44,7 @@
-         this.field_85061_c.func_71500_a("AABB Pool Size", new CallableCrashMemoryReport(this));
-         this.field_85061_c.func_71500_a("Suspicious classes", new CallableSuspiciousClasses(this));
-         this.field_85061_c.func_71500_a("IntCache", new CallableIntCache(this));
-+        FMLCommonHandler.instance().enhanceCrashReport(this, this.field_85061_c);
-     }
- 
-     public String func_71501_a()

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

@@ -1,43 +0,0 @@
---- ../src-base/minecraft/net/minecraft/entity/EntityList.java
-+++ ../src-work/minecraft/net/minecraft/entity/EntityList.java
-@@ -3,6 +3,9 @@
- import java.util.HashMap;
- import java.util.LinkedHashMap;
- import java.util.Map;
-+import java.util.logging.Level;
-+
-+import cpw.mods.fml.common.FMLLog;
- import net.minecraft.entity.ai.EntityMinecartMobSpawner;
- import net.minecraft.entity.boss.EntityDragon;
- import net.minecraft.entity.boss.EntityWither;
-@@ -126,9 +129,10 @@
-             p_75615_0_.func_82580_o("Type");
-         }
- 
-+        Class oclass = null;
-         try
-         {
--            Class oclass = (Class)field_75625_b.get(p_75615_0_.func_74779_i("id"));
-+            oclass = (Class)field_75625_b.get(p_75615_0_.func_74779_i("id"));
- 
-             if (oclass != null)
-             {
-@@ -142,7 +146,17 @@
- 
-         if (entity != null)
-         {
--            entity.func_70020_e(p_75615_0_);
-+            try
-+            {
-+                entity.func_70020_e(p_75615_0_);
-+            }
-+            catch (Exception e)
-+            {
-+                FMLLog.log(Level.SEVERE, e,
-+                        "An Entity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author",
-+                        p_75615_0_.func_74779_i("id"), oclass.getName());
-+                entity = null;
-+            }
-         }
-         else
-         {

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

@@ -1,23 +0,0 @@
---- ../src-base/minecraft/net/minecraft/entity/EntityTracker.java
-+++ ../src-work/minecraft/net/minecraft/entity/EntityTracker.java
-@@ -4,6 +4,8 @@
- import java.util.HashSet;
- import java.util.Iterator;
- import java.util.Set;
-+
-+import cpw.mods.fml.common.registry.EntityRegistry;
- import net.minecraft.crash.CrashReport;
- import net.minecraft.crash.CrashReportCategory;
- import net.minecraft.entity.boss.EntityDragon;
-@@ -51,6 +53,11 @@
- 
-     public void func_72786_a(Entity p_72786_1_)
-     {
-+        if (EntityRegistry.instance().tryTrackingEntity(this, p_72786_1_))
-+        {
-+            return;
-+        }
-+
-         if (p_72786_1_ instanceof EntityPlayerMP)
-         {
-             this.func_72791_a(p_72786_1_, 512, 2);

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

@@ -1,40 +0,0 @@
---- ../src-base/minecraft/net/minecraft/entity/EntityTrackerEntry.java
-+++ ../src-work/minecraft/net/minecraft/entity/EntityTrackerEntry.java
-@@ -5,6 +5,8 @@
- import java.util.Iterator;
- import java.util.List;
- import java.util.Set;
-+
-+import cpw.mods.fml.common.network.FMLNetworkHandler;
- import net.minecraft.entity.ai.attributes.ServersideAttributeMap;
- import net.minecraft.entity.boss.EntityDragon;
- import net.minecraft.entity.item.EntityBoat;
-@@ -378,6 +380,14 @@
-                     this.field_73138_k = this.field_73132_a.field_70181_x;
-                     this.field_73135_l = this.field_73132_a.field_70179_y;
- 
-+                    int posX = MathHelper.func_76128_c(this.field_73132_a.field_70165_t * 32.0D);
-+                    int posY = MathHelper.func_76128_c(this.field_73132_a.field_70163_u * 32.0D);
-+                    int posZ = MathHelper.func_76128_c(this.field_73132_a.field_70161_v * 32.0D);
-+                    if (posX != this.field_73128_d || posY != this.field_73129_e || posZ != this.field_73126_f)
-+                    {
-+                        FMLNetworkHandler.makeEntitySpawnAdjustment(this.field_73132_a.field_70157_k, p_73117_1_, this.field_73128_d, this.field_73129_e, this.field_73126_f);
-+                    }
-+
-                     if (this.field_73143_t && !(packet instanceof Packet24MobSpawn))
-                     {
-                         p_73117_1_.field_71135_a.func_72567_b(new Packet28EntityVelocity(this.field_73132_a.field_70157_k, this.field_73132_a.field_70159_w, this.field_73132_a.field_70181_x, this.field_73132_a.field_70179_y));
-@@ -455,6 +465,13 @@
-         if (this.field_73132_a.field_70128_L)
-         {
-             this.field_73132_a.field_70170_p.func_98180_V().func_98236_b("Fetching addPacket for removed entity");
-+        }
-+
-+        Packet pkt = FMLNetworkHandler.getEntitySpawningPacket(this.field_73132_a);
-+
-+        if (pkt != null)
-+        {
-+            return pkt;
-         }
- 
-         if (this.field_73132_a instanceof EntityItem)

patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch

@@ -1,12 +0,0 @@
---- ../src-base/minecraft/net/minecraft/entity/boss/IBossDisplayData.java
-+++ ../src-work/minecraft/net/minecraft/entity/boss/IBossDisplayData.java
-@@ -1,9 +1,5 @@
- package net.minecraft.entity.boss;
- 
--import cpw.mods.fml.relauncher.Side;
--import cpw.mods.fml.relauncher.SideOnly;
--
--@SideOnly(Side.CLIENT)
- public interface IBossDisplayData
- {
-     float func_110138_aP();

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

@@ -1,20 +0,0 @@
---- ../src-base/minecraft/net/minecraft/entity/item/EntityItem.java
-+++ ../src-work/minecraft/net/minecraft/entity/item/EntityItem.java
-@@ -1,6 +1,8 @@
- package net.minecraft.entity.item;
- 
- import java.util.Iterator;
-+
-+import cpw.mods.fml.common.registry.GameRegistry;
- import net.minecraft.block.Block;
- import net.minecraft.block.material.Material;
- import net.minecraft.entity.Entity;
-@@ -277,6 +279,8 @@
-                     p_70100_1_.func_71029_a(AchievementList.field_76027_z);
-                 }
- 
-+                GameRegistry.onPickupNotification(p_70100_1_, this);
-+
-                 this.func_85030_a("random.pop", 0.2F, ((this.field_70146_Z.nextFloat() - this.field_70146_Z.nextFloat()) * 0.7F + 1.0F) * 2.0F);
-                 p_70100_1_.func_71001_a(this, i);
- 

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

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