Fix license and naming

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

.gitattributes

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

.gitignore

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

CREDITS-fml.txt

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

LICENSE-fml.txt

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

README.txt

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

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

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

conf/mcp.cfg

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

conf/patches/Start.java

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

conf/patches/minecraft_ff.patch

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

conf/patches/minecraft_server_ff.patch

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

conf/version.cfg

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

forge/MLProp.java

@@ -1,11 +0,0 @@
-package net.minecraft.src;
-import java.lang.annotation.*;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface MLProp {
-	String name() default "";
-	String info() default "";
-	double min() default Double.NEGATIVE_INFINITY;
-	double max() default Double.POSITIVE_INFINITY;
-}

forge/build.bat

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

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-cd ..
-
-rm -rf src bin src_forge
-
-cp -a src_work src_forge
-
-cp -a forge/forge_client/src/net/* src_forge/minecraft/net/
-cp -a forge/forge_common/net/* src_forge/minecraft/net/
-cp -a forge/forge_common/net/* src_forge/minecraft_server/net/
-
-cp -a src_forge src
-
-./recompile.sh
-
-

forge/client

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

forge/common

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

forge/forge_client/.classpath

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

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

@@ -1,13 +0,0 @@
-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/EnumHelperClient.java

@@ -1,99 +0,0 @@
-package net.minecraft.src.forge;
-
-import net.minecraft.src.EnumJsonNodeType;
-import net.minecraft.src.EnumOS2;
-import net.minecraft.src.EnumOptions;
-import net.minecraft.src.EnumRarity;
-
-public class EnumHelperClient extends EnumHelper {
-
-	private static Class[][] ctrs = {
-			{EnumJsonNodeType.class},
-			{EnumOptions.class, String.class, boolean.class, boolean.class},
-			{EnumOS2.class},
-			{EnumRarity.class, int.class, String.class}			
-	};
-	
-	private static boolean[] decompiled = new boolean[ctrs.length];
-	private static boolean   isSetup    = false;
-	
-	public static EnumJsonNodeType addJsonNodeType(String name)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[0], EnumJsonNodeType.class, name, 
-			new Class[] {},
-			new Object[]{});	
-	}	
-	public static EnumOptions addOptions(String name, String langName, boolean isSlider, boolean isToggle)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[1], EnumOptions.class, name, 
-			new Class[] {String.class, boolean.class, boolean.class},
-			new Object[]{langName,     isSlider,      isToggle     });	
-	}
-	public static EnumOS2 addOS2(String name)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[2], EnumOS2.class, name, 
-			new Class[] {},
-			new Object[]{});	
-	}	
-	public static EnumRarity addRarity(String name, int color, String displayName)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[3], EnumRarity.class, name, 
-			new Class[] {int.class, String.class},
-			new Object[]{color,     displayName });	
-	}		
-	
-	private static void setup()
-	{
-		//System.out.println("Enum Helper Initalizing: ");
-		for(int x = 0; x < ctrs.length; x++)
-		{
-			try {
-				Class<?>[] enumHeaders = new Class[ctrs[x].length + 3];
-				enumHeaders[0] = String.class;
-				enumHeaders[1] = int.class;
-				enumHeaders[2] = String.class;
-				enumHeaders[3] = int.class;
-				
-				for (int y = 1; y < ctrs[x].length; y++)
-					enumHeaders[3 + y] = ctrs[x][y];
-				
-				ctrs[x][0].getDeclaredConstructor(enumHeaders);
-				decompiled[x] = true;				
-				
-			} catch(Exception e) {
-				//Nom Nom Nom
-			}
-			//System.out.format("\t%-25s %s\r\n", ctrs[x][0].getName().replace("net.minecraft.src.", ""), decompiled[x]);
-		}		
-		isSetup = true;		
-	}
-	
-	static 
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-	}
-
-}

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

@@ -1,177 +0,0 @@
-/**
- * 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 net.minecraft.src.RenderGlobal;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.MovingObjectPosition;
-import net.minecraft.src.ItemStack;
-import org.lwjgl.opengl.GL11;
-
-import java.util.*;
-
-public class ForgeHooksClient {
-
-	public static boolean onBlockHighlight(RenderGlobal renderglobal,
-		    EntityPlayer player, MovingObjectPosition mop, int i,
-		    ItemStack itemstack, float f) {
-		for (IHighlightHandler handler : highlightHandlers) {
-			if(handler.onBlockHighlight(renderglobal,player,mop,
-					i,itemstack,f))
-				return true;
-		}
-		return false;
-	}
-
-	static LinkedList<IHighlightHandler> highlightHandlers = new LinkedList<IHighlightHandler>();
-
-	public static boolean canRenderInPass(Block block, int pass) {
-		if(block instanceof IMultipassRender) {
-			IMultipassRender impr = (IMultipassRender) block;
-			return impr.canRenderInPass(pass);
-		}
-		if(pass==block.getRenderBlockPass()) return true;
-		return false;
-	}
-
-	static HashMap tessellators=new HashMap();
-	static HashMap textures=new HashMap();
-	static boolean inWorld=false;
-	static HashSet renderTextureTest=new HashSet();
-	static ArrayList<List> renderTextureList=new ArrayList();
-	static Tessellator defaultTessellator=null;
-
-	protected static void bindTessellator(int tex, int sub) {
-		List key=Arrays.asList(tex,sub);
-		Tessellator t;
-		if(!tessellators.containsKey(key)) {
-			t=new Tessellator();
-			tessellators.put(key,t);
-		} else {
-			t=(Tessellator)tessellators.get(key);
-		}
-		if(inWorld && !renderTextureTest.contains(key)) {
-			renderTextureTest.add(key);
-			renderTextureList.add(key);
-			t.startDrawingQuads();
-			t.setTranslationD(defaultTessellator.xOffset,
-				defaultTessellator.yOffset,
-				defaultTessellator.zOffset);
-		}
-		Tessellator.instance=t;
-	}
-
-	protected static void bindTexture(String name, int sub) {
-		int n;
-		if(!textures.containsKey(name)) {
-			n=ModLoader.getMinecraftInstance().renderEngine
-				.getTexture(name);
-			textures.put(name,n);
-		} else {
-			n=(Integer)textures.get(name);
-		}
-		if(!inWorld) {
-			if(Tessellator.instance.isDrawing) {
-				int mode=Tessellator.instance.drawMode;
-				Tessellator.instance.draw();
-				Tessellator.instance.startDrawing(mode);
-			}
-			GL11.glBindTexture(3553 /* GL_TEXTURE_2D */,n);
-			return;
-		}
-		bindTessellator(n,sub);
-	}
-
-	protected static void unbindTexture() {
-		if(inWorld) {
-			Tessellator.instance=defaultTessellator;
-		} else {
-			if(Tessellator.instance.isDrawing) {
-				int mode=Tessellator.instance.drawMode;
-				Tessellator.instance.draw();
-				Tessellator.instance.startDrawing(mode);
-			}
-			GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
-				.getMinecraftInstance().renderEngine
-				.getTexture("/terrain.png"));
-			return;
-		}
-	}
-
-	static int renderPass=-1;
-	public static void beforeRenderPass(int pass) {
-		renderPass=pass;
-		defaultTessellator=Tessellator.instance;
-		Tessellator.renderingWorldRenderer=true;
-		GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
-			.getMinecraftInstance().renderEngine
-			.getTexture("/terrain.png"));
-		renderTextureTest.clear();
-		renderTextureList.clear();
-		inWorld=true;
-	}
-
-	public static void afterRenderPass(int pass) {
-		renderPass=-1;
-		inWorld=false;
-		for(List l : renderTextureList) {
-			// TODO: call appropriate client hooks
-			Integer[] tn=(Integer[])l.toArray();
-			GL11.glBindTexture(GL11.GL_TEXTURE_2D,tn[0]);
-			Tessellator t=(Tessellator)tessellators.get(l);
-			t.draw();
-		}
-		GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
-			.getMinecraftInstance().renderEngine
-			.getTexture("/terrain.png"));
-		Tessellator.renderingWorldRenderer=false;
-	}
-
-	public static void beforeBlockRender(Block block,
-			RenderBlocks renderblocks) {
-		if (block instanceof ITextureProvider
-				&& renderblocks.overrideBlockTexture == -1) {
-			ITextureProvider itp=(ITextureProvider)block;
-			bindTexture(itp.getTextureFile(),0);
-		}
-	}
-
-	public static void afterBlockRender(Block block,
-			RenderBlocks renderblocks) {
-		if (block instanceof ITextureProvider
-				&& renderblocks.overrideBlockTexture == -1) {
-			unbindTexture();
-		}
-	}
-
-	public static void overrideTexture (Object o) {
-		if (o instanceof ITextureProvider) {
-			GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
-				.getMinecraftInstance().renderEngine
-				.getTexture(((ITextureProvider) (o))
-					.getTextureFile()));
-		}
-	}
-	
-	public static void renderCustomItem(ICustomItemRenderer customRenderer, RenderBlocks renderBlocks,int itemID, int meta, float f) {
-		Tessellator tessellator = Tessellator.instance;
-		if (renderBlocks.useInventoryTint) {
-			int j = 0xffffff;//block.getRenderColor(i);
-			float f1 = (float) (j >> 16 & 0xff) / 255F;
-			float f3 = (float) (j >> 8 & 0xff) / 255F;
-			float f5 = (float) (j & 0xff) / 255F;
-			GL11.glColor4f(f1 * f, f3 * f, f5 * f, 1.0F);
-		}
-
-//		ModLoader.RenderInvBlock(this, block, i, k);
-		customRenderer.renderInventory(renderBlocks, itemID, meta);
-	}
-}
-

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

@@ -1,25 +0,0 @@
-/**
- * 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;
-
-/**
- * This interface has to be implemented by an instance of ItemArmor.
- * It allows for the application of a custom texture file to the player skin
- * when the armor is worn.
- */
-public interface IArmorTextureProvider {
-
-    /**
-     * This interface has to return the path to a file that is the same
-     * format as iron_1.png (or any of the other armor files). It will be
-     * applied to the player skin when the armor is worn.
-     */
-    public String getArmorTextureFile(ItemStack itemstack);
-
-}
-

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

@@ -1,7 +0,0 @@
-package net.minecraft.src.forge;
-
-import net.minecraft.src.RenderBlocks;
-
-public interface ICustomItemRenderer {
-	public void renderInventory (RenderBlocks renderblocks, int itemID, int meta);
-}

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

@@ -1,23 +0,0 @@
-/*
- * 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.EnumStatus;
-import net.minecraft.src.RenderGlobal;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.MovingObjectPosition;
-import net.minecraft.src.ItemStack;
-
-public interface IHighlightHandler {
-    /**
-     * Allow custom handling of highlights.  Return true if the hilight has
-     * been handled.
-     */
-    public boolean onBlockHighlight(RenderGlobal renderglobal,
-		    EntityPlayer player, MovingObjectPosition mop, int i,
-		    ItemStack itemstack, float f);
-}
-

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

@@ -1,76 +0,0 @@
-/**
- * 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.Item;
-import net.minecraft.src.ModLoader;
-import net.minecraft.src.RenderBlocks;
-
-public class MinecraftForgeClient {
-	/**
-	 * Registers a new block highlight handler.
-	 */
-	public static void registerHighlightHandler(IHighlightHandler handler) {
-		ForgeHooksClient.highlightHandlers.add(handler);
-	}
-
-	/** Bind a texture.  This is used to bind a texture file when
-	 * performing your own rendering, rather than using ITextureProvider.
-	 *
-	 * This variation is reserved for future expansion.
-	 */
-	public static void bindTexture(String name, int sub) {
-		ForgeHooksClient.bindTexture(name,sub);
-	}
-
-	/** Bind a texture.  This is used to bind a texture file when
-	 * performing your own rendering, rather than using ITextureProvider.
-	 */
-	public static void bindTexture(String name) {
-		ForgeHooksClient.bindTexture(name,0);
-	}
-
-	/** Unbind a texture.  This binds the default texture, when you are
-	 * finished performing custom rendering.
-	 */
-	public static void unbindTexture() {
-		ForgeHooksClient.unbindTexture();
-	}
-
-	/** Preload a texture.  Textures must be preloaded before the first
-	 * use, or they will cause visual anomalies.
-	 */
-	public static void preloadTexture(String texture) {
-		ModLoader.getMinecraftInstance().renderEngine
-			.getTexture(texture);
-	}
-
-	/** Render a block.  Render a block which may have a custom texture.
-	 */
-	public static void renderBlock(RenderBlocks rb, Block bl, int i, int
-			j, int k) {
-		ForgeHooksClient.beforeBlockRender(bl,rb);
-        	rb.renderBlockByRenderType(bl,i,j,k);
-		ForgeHooksClient.afterBlockRender(bl,rb);
-	}
-
-	/** Get the current render pass.
-	 */
-	public static int getRenderPass() {
-		return ForgeHooksClient.renderPass;
-	}
-	
-	private static ICustomItemRenderer [] customItemRenderers = new ICustomItemRenderer [Item.itemsList.length];
-	
-	public static void registerCustomItemRenderer (int itemID, ICustomItemRenderer renderer) {
-		customItemRenderers [itemID] = renderer;
-	}
-	
-	public static ICustomItemRenderer getCustomItemRenderer (int itemID) {
-		return customItemRenderers [itemID];
-	}
-}

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

@@ -1,20 +0,0 @@
-/**
- * This software is provided under the terms of the Minecraft Forge Public 
- * License v1.0.
- */
-
-package net.minecraft.src.forge;
-
-public class ArmorProperties {
-	public int damageRemove = 0;
-	public boolean allowRegularComputation = false;
-	
-	public ArmorProperties () {
-		
-	}
-	
-	public ArmorProperties (int damageRemove, boolean allowRegularCompuation) {
-		this.damageRemove = damageRemove;
-		this.allowRegularComputation = allowRegularCompuation;
-	}
-}

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

@@ -1,313 +0,0 @@
-/**
- * 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/EnumHelper.java

@@ -1,342 +0,0 @@
-package net.minecraft.src.forge;
-
-import net.minecraft.src.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-public class EnumHelper {
-	private static Object reflectionFactory      = null;
-	private static Method newConstructorAccessor = null;
-	private static Method newInstance            = null;
-	private static Method newFieldAccessor       = null;
-	private static Method fieldAccessorSet       = null;
-	private static boolean isSetup               = false;
-	
-	//Some enums are decompiled with extra arguments, so lets check for that
-	private static Class[][] ctrs = {
-			{EnumAction.class},
-			{EnumArmorMaterial.class, int.class, int[].class, int.class},
-			{EnumArt.class, String.class, int.class, int.class, int.class, int.class},
-			{EnumCreatureAttribute.class},
-			{EnumCreatureType.class, Class.class, int.class, Material.class, boolean.class},
-			{EnumDoor.class},
-			{EnumEnchantmentType.class},
-			{EnumMobType.class},
-			{EnumMovingObjectType.class},
-			{EnumSkyBlock.class, int.class},
-			{EnumStatus.class},
-			{EnumToolMaterial.class, int.class, int.class, float.class, int.class, int.class}				
-	};
-	
-	private static boolean[] decompiled = new boolean[ctrs.length];
-	
-	public static EnumAction addAction(String name)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[0], EnumAction.class, name, 
-			new Class[] {},
-			new Object[]{});	
-	}	
-	public static EnumArmorMaterial addArmorMaterial(String name, int durability, int[] reductionAmounts, int enchantability)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[1], EnumArmorMaterial.class, name, 
-			new Class[] { int.class,  int[].class,      int.class      },
-			new Object[]{ durability, reductionAmounts, enchantability });	
-	}
-	public static EnumArt addArt(String name, String tile, int sizeX, int sizeY, int offsetX, int offsetY)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[2], EnumArt.class, name,
-			new Class[] {String.class, int.class, int.class, int.class, int.class},
-			new Object[]{tile,         sizeX,     sizeY,     offsetX,   offsetY});	
-	}
-	public static EnumCreatureAttribute addCreatureAttribute(String name)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[3], EnumCreatureAttribute.class, name, 
-			new Class[] {},
-			new Object[]{});	
-	}	
-	public static EnumCreatureType addCreatureType(String name, Class typeClass, int maxNumber, Material material, boolean peaceful)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[4], EnumCreatureType.class, name, 
-			new Class[] {Class.class, int.class, Material.class, boolean.class},
-			new Object[]{typeClass,   maxNumber, material,       peaceful});	
-	}
-	public static EnumDoor addDoor(String name)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[5], EnumDoor.class, name, 
-			new Class[] {},
-			new Object[]{});	
-	}	
-	public static EnumEnchantmentType addEnchantmentType(String name)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[6], EnumEnchantmentType.class, name, 
-			new Class[] {},
-			new Object[]{});	
-	}
-	public static EnumMobType addMobType(String name)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[7], EnumMobType.class, name, 
-			new Class[] {},
-			new Object[]{});	
-	}	
-	public static EnumMovingObjectType addMovingObjectType(String name)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[8], EnumMovingObjectType.class, name, 
-			new Class[] {},
-			new Object[]{});	
-	}
-	public static EnumSkyBlock addSkyBlock(String name, int lightValue)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[9], EnumSkyBlock.class, name, 
-			new Class[] {int.class },
-			new Object[]{lightValue});	
-	}
-	public static EnumStatus addStatus(String name)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[10], EnumStatus.class, name, 
-			new Class[] {},
-			new Object[]{});	
-	}	
-	public static EnumToolMaterial addToolMaterial(String name, int harvestLevel, int maxUses, float efficiency, int damage, int enchantability)
-	{
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		return addEnum(decompiled[11], EnumToolMaterial.class, name, 
-			new Class[] { int.class,    int.class, float.class,  int.class, int.class       },
-			new Object[]{ harvestLevel, maxUses,   efficiency,   damage,    enchantability  });	
-	}
-	
-	private static void setup()
-	{
-		if (isSetup)
-		{
-			return;
-		}
-		
-		//System.out.println("Enum Helper Initalizing: ");
-		for(int x = 0; x < ctrs.length; x++)
-		{
-			try {
-				Class<?>[] enumHeaders = new Class[ctrs[x].length + 3];
-				enumHeaders[0] = String.class;
-				enumHeaders[1] = int.class;
-				enumHeaders[2] = String.class;
-				enumHeaders[3] = int.class;
-				
-				for (int y = 1; y < ctrs[x].length; y++)
-					enumHeaders[3 + y] = ctrs[x][y];
-				
-				ctrs[x][0].getDeclaredConstructor(enumHeaders);
-				decompiled[x] = true;				
-				
-			} catch(Exception e) {
-				//Nom Nom Nom
-			}
-			//System.out.format("\t%-25s %s\r\n", ctrs[x][0].getName().replace("net.minecraft.src.", ""), decompiled[x]);
-		}
-
-		
-
-		try {
-			Method getReflectionFactory = Class.forName("sun.reflect.ReflectionFactory").getDeclaredMethod("getReflectionFactory");
-			reflectionFactory      = getReflectionFactory.invoke(null);
-			newConstructorAccessor = Class.forName("sun.reflect.ReflectionFactory").getDeclaredMethod("newConstructorAccessor", Constructor.class);
-			newInstance            = Class.forName("sun.reflect.ConstructorAccessor").getDeclaredMethod("newInstance", Object[].class);
-			newFieldAccessor       = Class.forName("sun.reflect.ReflectionFactory").getDeclaredMethod("newFieldAccessor", Field.class, boolean.class);
-			fieldAccessorSet       = Class.forName("sun.reflect.FieldAccessor").getDeclaredMethod("set", Object.class, Object.class);			
-		} catch (Exception e) {
-			e.printStackTrace();
-		} 
-		
-		isSetup = true;
-	}
-    
-    
-	/*
-	 * Everything below this is found at the site below, and updated to be able to compile in Eclipse/Java 1.6+
-     * Also modified for use in decompiled code.
-	 * Found at: http://niceideas.ch/roller2/badtrash/entry/java_create_enum_instances_dynamically
-	 */
-	
-	private static Object getConstructorAccessor(boolean decompiled, Class<?> enumClass, Class<?>[] additionalParameterTypes) throws Exception {
-		Class<?>[] parameterTypes = null;
-		if (decompiled) 
-		{
-			parameterTypes = new Class[additionalParameterTypes.length + 4];
-			parameterTypes[0] = String.class;
-			parameterTypes[1] = int.class;
-			parameterTypes[2] = String.class;
-			parameterTypes[3] = int.class;
-			System.arraycopy(additionalParameterTypes, 0, parameterTypes, 4, additionalParameterTypes.length);
-		}
-		else
-		{
-			parameterTypes = new Class[additionalParameterTypes.length + 2];
-			parameterTypes[0] = String.class;
-			parameterTypes[1] = int.class;
-			System.arraycopy(additionalParameterTypes, 0, parameterTypes, 2, additionalParameterTypes.length);
-		}
-		return newConstructorAccessor.invoke(reflectionFactory, enumClass.getDeclaredConstructor(parameterTypes));
-	}
-	
-	private static <T extends Enum<?>> T makeEnum(boolean decompiled, Class<T> enumClass, String value, int ordinal, Class<?>[] additionalTypes, Object[] additionalValues) throws Exception {
-		Object[] parms = null;
-		if (decompiled)
-		{
-			parms = new Object[additionalValues.length + 4];
-			parms[0] = value;
-			parms[1] = Integer.valueOf(ordinal);
-			parms[2] = value;
-			parms[3] = Integer.valueOf(ordinal);
-			System.arraycopy(additionalValues, 0, parms, 4, additionalValues.length);
-		}
-		else
-		{
-			parms = new Object[additionalValues.length + 2];
-			parms[0] = value;
-			parms[1] = Integer.valueOf(ordinal);
-			System.arraycopy(additionalValues, 0, parms, 2, additionalValues.length);	
-		}
-		return enumClass.cast(newInstance.invoke(getConstructorAccessor(decompiled, enumClass, additionalTypes), new Object[]{parms}));
-	}
-
-	private static void setFailsafeFieldValue(Field field, Object target, Object value) throws Exception {
-		field.setAccessible(true);
-		Field modifiersField = Field.class.getDeclaredField("modifiers");
-		modifiersField.setAccessible(true);
-		modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-		Object fieldAccessor = newFieldAccessor.invoke(reflectionFactory, field, false);
-		fieldAccessorSet.invoke(fieldAccessor, target, value);
-	}
-	
-	private static void blankField(Class<?> enumClass, String fieldName) throws Exception {
-		for (Field field : Class.class.getDeclaredFields()) {
-			if (field.getName().contains(fieldName)) {
-				field.setAccessible(true);
-				setFailsafeFieldValue(field, enumClass, null);
-				break;
-			}
-		}
-	}
-	
-	private static void cleanEnumCache(Class<?> enumClass) throws Exception {
-		blankField(enumClass, "enumConstantDirectory"); 
-		blankField(enumClass, "enumConstants"); 
-	}
-
-	public static <T extends Enum<?>> T addEnum(Class<T> enumType, String enumName, boolean decompiled) {
-		return addEnum(decompiled, enumType, enumName, new Class<?>[]{}, new Object[]{});
-	}
-	
-	@SuppressWarnings("unchecked")
-	public static <T extends Enum<?>> T addEnum(boolean decompiled, Class<T> enumType, String enumName, Class<?>[] paramTypes, Object[] paramValues) {
-		if (!isSetup)
-		{
-			setup();
-		}
-		
-		Field valuesField = null;
-		Field[] fields = enumType.getDeclaredFields();
-		int flags = Modifier.PRIVATE | Modifier.STATIC | Modifier.FINAL | 0x1000 /*SYNTHETIC*/; 
-		String valueType = String.format("[L%s;", enumType.getName().replace('.', '/'));
-		
-		for (Field field : fields) {
-			if (decompiled)
-			{
-				if (field.getName().contains("$VALUES")) 
-				{
-					valuesField = field;
-					break;
-				}
-			}
-			else
-			{
-				if ((field.getModifiers() & flags) == flags &&
-					field.getType().getName().equals(valueType))
-				{
-					valuesField = field;
-					break;
-				}
-			}
-		}
-		valuesField.setAccessible(true);
-
-		try {
-			T[] previousValues = (T[])valuesField.get(enumType);
-			List<T> values = new ArrayList<T>(Arrays.asList(previousValues));
-			T newValue = (T)makeEnum(decompiled, enumType, enumName, values.size(), paramTypes, paramValues);
-			values.add(newValue);
-			setFailsafeFieldValue(valuesField, null, values.toArray((T[]) Array.newInstance(enumType, 0)));
-			cleanEnumCache(enumType);
-			
-			return newValue;
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new RuntimeException(e.getMessage(), e);
-		}
-	}
-	
-	static {
-		if (!isSetup)
-		{
-			setup();
-		}
-	}
-}

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

@@ -1,255 +0,0 @@
-/**
- * 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.EntityPlayer;
-import net.minecraft.src.IInventory;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.Item;
-import net.minecraft.src.EnumStatus;
-import net.minecraft.src.World;
-
-import java.util.*;
-
-public class ForgeHooks {
-	// TODO: move all app-side hooks from MinecraftForge
-
-
-	// List Handling Hooks
-	// ------------------------------------------------------------
-	public static void onTakenFromCrafting(EntityPlayer player, ItemStack ist,
-			IInventory craftMatrix) {
-		for (ICraftingHandler handler : craftingHandlers) {
-			handler.onTakenFromCrafting(player,ist,craftMatrix);
-		}
-	}
-
-	static LinkedList<ICraftingHandler> craftingHandlers = new LinkedList<ICraftingHandler>();
-
-	public static void onDestroyCurrentItem(EntityPlayer player, ItemStack orig) {
-		for (IDestroyToolHandler handler : destroyToolHandlers) {
-			handler.onDestroyCurrentItem(player,orig);
-		}
-	}
-
-	static LinkedList<IDestroyToolHandler> destroyToolHandlers = new LinkedList<IDestroyToolHandler>();
-
-	public static boolean onUseBonemeal(World world,
-			int bid, int i, int j, int k) {
-		for(IBonemealHandler handler : bonemealHandlers) {
-			if(handler.onUseBonemeal(world,bid,i,j,k))
-				return true;
-		}
-		return false;
-	}
-
-	static LinkedList<IBonemealHandler> bonemealHandlers = new LinkedList<IBonemealHandler>();
-
-	public static boolean onUseHoe(ItemStack hoe, EntityPlayer player,
-			World world, int i, int j, int k) {
-		for(IHoeHandler handler : hoeHandlers) {
-			if(handler.onUseHoe(hoe,player,world,i,j,k))
-				return true;
-		}
-		return false;
-	}
-
-	static LinkedList<IHoeHandler> hoeHandlers = new LinkedList<IHoeHandler>();
-
-	public static EnumStatus sleepInBedAt(EntityPlayer player, int i, int j, int k) {
-		for (ISleepHandler handler : sleepHandlers) {
-			EnumStatus status = handler.sleepInBedAt(player, i, j, k);
-			if (status != null)
-				return status;
-		}
-		return null;
-	}
-
-	static LinkedList<ISleepHandler> sleepHandlers = new LinkedList<ISleepHandler>();
-
-	// Plant Management
-	// ------------------------------------------------------------
-	static class ProbableItem {
-		public ProbableItem(int item, int md, int q, int st, int e) {
-			wstart=st; wend=e;
-			itemid=item; meta=md;
-			qty=q;
-		}
-		int wstart, wend;
-		int itemid, meta;
-		int qty;
-	}
-
-	static ProbableItem getRandomItem(List<ProbableItem> list, int prop) {
-		int n=Collections.binarySearch(list,prop,new Comparator(){
-			public int compare(Object o1, Object o2) {
-				ProbableItem pi=(ProbableItem)o1;
-				Integer i1=(Integer)o2;
-				if(i1<pi.wstart) return 1;
-				if(i1>=pi.wend) return -1;
-				return 0;
-			}
-		});
-		if(n<0) return null;
-		return list.get(n);
-	}
-
-	static List<ProbableItem> plantGrassList;
-	static int plantGrassWeight;
-
-	static List<ProbableItem> seedGrassList;
-	static int seedGrassWeight;
-
-	static {
-		plantGrassList=new ArrayList<ProbableItem>();
-		plantGrassList.add(new ProbableItem(
-			Block.plantYellow.blockID,0,1,0,20));
-		plantGrassList.add(new ProbableItem(
-			Block.plantRed.blockID,0,1,20,30));
-		plantGrassWeight=30;
-
-		seedGrassList=new ArrayList<ProbableItem>();
-		seedGrassList.add(new ProbableItem(
-			Item.seeds.shiftedIndex,0,1,0,10));
-		seedGrassWeight=10;
-	}
-
-	public static void plantGrassPlant(World world, int i, int j, int k) {
-		int n=world.rand.nextInt(plantGrassWeight);
-		ProbableItem pi=getRandomItem(plantGrassList,n);
-		if(pi==null) return;
-		world.setBlockAndMetadataWithNotify(i,j,k,pi.itemid,pi.meta);
-	}
-
-	public static void addPlantGrass(int item, int md, int prop) {
-		plantGrassList.add(new ProbableItem(
-			item,md,1,plantGrassWeight,plantGrassWeight+prop));
-		plantGrassWeight+=prop;
-	}
-
-	public static ItemStack getGrassSeed(World world) {
-		int n=world.rand.nextInt(seedGrassWeight);
-		ProbableItem pi=getRandomItem(seedGrassList,n);
-		if(pi==null) return null;
-		return new ItemStack(pi.itemid,pi.qty,pi.meta);
-	}
-
-	public static void addGrassSeed(int item, int md, int qty, int prop) {
-		seedGrassList.add(new ProbableItem(
-			item,md,qty,seedGrassWeight,seedGrassWeight+prop));
-		seedGrassWeight+=prop;
-	}
-
-	// Tool Path
-	// ------------------------------------------------------------
-	public static boolean canHarvestBlock(Block bl,
-			EntityPlayer player, int md) {
-		if(bl.blockMaterial.getIsHarvestable())
-			return true;
-		ItemStack itemstack = player.inventory.getCurrentItem();
-		if(itemstack == null) return false;
-
-		List tc=(List)toolClasses.get(itemstack.itemID);
-		if(tc==null) return itemstack.canHarvestBlock(bl);
-		Object[] ta=tc.toArray();
-		String cls=(String)ta[0]; int hvl=(Integer)ta[1];
-
-		Integer bhl=(Integer)toolHarvestLevels.get(Arrays.asList(
-			bl.blockID,md,cls));
-		if(bhl==null) return itemstack.canHarvestBlock(bl);
-		if(bhl>hvl) return false;
-		return true;
-	}
-
-	public static float blockStrength(Block bl,
-			EntityPlayer player, int md) {
-		float bh=bl.getHardness(md);
-		if(bh < 0.0F) return 0.0F;
-
-		if(!canHarvestBlock(bl,player,md)) {
-			return 1.0F / bh / 100F;
-		} else {
-			return player.getCurrentPlayerStrVsBlock(bl,md) /
-				bh / 30F;
-		}
-	}
-
-	public static boolean isToolEffective(ItemStack ist, Block bl, int md) {
-		List tc=(List)toolClasses.get(ist.itemID);
-		if(tc==null) return false;
-		Object[] ta=tc.toArray();
-		String cls=(String)ta[0];
-
-		return toolEffectiveness.contains(Arrays.asList(
-			bl.blockID,md,cls));
-	}
-
-	static void initTools() {
-		if(toolInit) return;
-		toolInit=true;
-
-		MinecraftForge.setToolClass(Item.pickaxeWood,"pickaxe",0);
-		MinecraftForge.setToolClass(Item.pickaxeStone,"pickaxe",1);
-		MinecraftForge.setToolClass(Item.pickaxeSteel,"pickaxe",2);
-		MinecraftForge.setToolClass(Item.pickaxeGold,"pickaxe",0);
-		MinecraftForge.setToolClass(Item.pickaxeDiamond,"pickaxe",3);
-
-		MinecraftForge.setToolClass(Item.axeWood,"axe",0);
-		MinecraftForge.setToolClass(Item.axeStone,"axe",1);
-		MinecraftForge.setToolClass(Item.axeSteel,"axe",2);
-		MinecraftForge.setToolClass(Item.axeGold,"axe",0);
-		MinecraftForge.setToolClass(Item.axeDiamond,"axe",3);
-
-		MinecraftForge.setToolClass(Item.shovelWood,"shovel",0);
-		MinecraftForge.setToolClass(Item.shovelStone,"shovel",1);
-		MinecraftForge.setToolClass(Item.shovelSteel,"shovel",2);
-		MinecraftForge.setToolClass(Item.shovelGold,"shovel",0);
-		MinecraftForge.setToolClass(Item.shovelDiamond,"shovel",3);
-
-		MinecraftForge.setBlockHarvestLevel(Block.obsidian,"pickaxe",3);
-		MinecraftForge.setBlockHarvestLevel(Block.oreDiamond,"pickaxe",2);
-		MinecraftForge.setBlockHarvestLevel(Block.blockDiamond,"pickaxe",2);
-		MinecraftForge.setBlockHarvestLevel(Block.oreGold,"pickaxe",2);
-		MinecraftForge.setBlockHarvestLevel(Block.blockGold,"pickaxe",2);
-		MinecraftForge.setBlockHarvestLevel(Block.oreIron,"pickaxe",1);
-		MinecraftForge.setBlockHarvestLevel(Block.blockSteel,"pickaxe",1);
-		MinecraftForge.setBlockHarvestLevel(Block.oreLapis,"pickaxe",1);
-		MinecraftForge.setBlockHarvestLevel(Block.blockLapis,"pickaxe",1);
-		MinecraftForge.setBlockHarvestLevel(Block.oreRedstone,"pickaxe",2);
-		MinecraftForge.setBlockHarvestLevel(Block.oreRedstoneGlowing,"pickaxe",2);
-		MinecraftForge.removeBlockEffectiveness(Block.oreRedstone,"pickaxe");
-		MinecraftForge.removeBlockEffectiveness(Block.oreRedstoneGlowing,"pickaxe");
-		MinecraftForge.removeBlockEffectiveness(Block.obsidian,"pickaxe");
-
-		Block[] pickeff ={
-			Block.cobblestone, Block.stairDouble,
-			Block.stairSingle, Block.stone, Block.sandStone,
-			Block.cobblestoneMossy,
-			Block.oreCoal,
-			Block.ice, Block.netherrack, Block.oreLapis,
-			Block.blockLapis
-				};
-		for(Block bl : pickeff) {
-			MinecraftForge.setBlockHarvestLevel(bl,"pickaxe",0);
-		}
-
-		// TODO: add other tool tables.
-	}
-
-	public static final int majorVersion=1;
-	public static final int minorVersion=2;
-	public static final int revisionVersion=1;
-	static {
-		System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion);
-	}
-
-	static boolean toolInit=false;
-	static HashMap toolClasses=new HashMap();
-	static HashMap toolHarvestLevels=new HashMap();
-	static HashSet toolEffectiveness=new HashSet();
-}
-

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

@@ -1,54 +0,0 @@
-/**
- * This software is provided under the terms of the Minecraft Forge Public 
- * License v1.0.
- */
-
-package net.minecraft.src.forge;
-
-import net.minecraft.src.World;
-
-/**
- * This interface provides access to a number of secondary block properties through providing  
- * overrides to methods within world.class.
- *
- * This interface is DEPRECATED.  The functions are now provided directly by
- * Block.
- */
-
-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/IBonemealHandler.java

@@ -1,18 +0,0 @@
-/**
- * This software is provided under the terms of the Minecraft Forge Public 
- * License v1.0.
- */
-
-package net.minecraft.src.forge;
-
-import net.minecraft.src.World;
-
-public interface IBonemealHandler {
-	/** Called when bonemeal is used on a block.  This is also called for
-	 * multiplayer servers, which must still return true if appropriate but
-	 * shouldn't actually perform world manipulation.
-	 * @return true to use up the bonemeal and stop processing.
-	 */
-	public boolean onUseBonemeal(World world, int bid, int i, int j, int k);
-}
-

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

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

@@ -1,27 +0,0 @@
-/**
- * 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/ICraftingHandler.java

@@ -1,20 +0,0 @@
-/**
- * This software is provided under the terms of the Minecraft Forge Public 
- * License v1.0.
- */
-
-package net.minecraft.src.forge;
-
-import net.minecraft.src.IInventory;
-import net.minecraft.src.EntityPlayer;
-import net.minecraft.src.ItemStack;
-
-public interface ICraftingHandler {
-
-    /**
-     * Called after an item is taken from crafting.
-     */
-    public void onTakenFromCrafting(EntityPlayer player, ItemStack ist,
-	    IInventory craftMatrix);
-
-}

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

@@ -1,16 +0,0 @@
-/**
- * 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.EntityPlayer;
-
-public interface IDestroyToolHandler {
-	/** Called when the user's currently equipped item is destroyed.
-	 */
-	public void onDestroyCurrentItem(EntityPlayer player, ItemStack orig);
-}
-

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

@@ -1,21 +0,0 @@
-/**
- * This software is provided under the terms of the Minecraft Forge Public 
- * License v1.0.
- */
-
-package net.minecraft.src.forge;
-
-import net.minecraft.src.World;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.EntityPlayer;
-
-public interface IHoeHandler {
-	/** Called when a hoe is used on a block.  This is called on both sides
-	 * in SMP.
-	 * @return true to consume a use of the hoe and return.
-	 */
-	public boolean onUseHoe(ItemStack hoe, EntityPlayer player, World world,
-			int i, int j, int k);
-
-}
-

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

@@ -1,17 +0,0 @@
-/**
- * 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/IOreHandler.java

@@ -1,27 +0,0 @@
-/**
- * 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;
-
-/** The current list of known classes.
- * oreTin, oreCopper, oreSilver, oreUranium
- * ingotTin, ingotCopper, ingotSilver, ingotBrass, ingotBronze
- * ingotUranium, ingotRefinedIron
- * dyeBlue
- * gemRuby, gemEmerald, gemSapphire
- * itemDropUranium
- * woodRubber
- * itemRubber
- */
-
-public interface IOreHandler {
-	/** Called when a new ore is registered with the ore dictionary.
-	 * @param oreClass The string class of the ore.
-	 * @param ore The ItemStack for the ore.
-	 */
-	public void registerOre(String oreClass, ItemStack ore);
-}

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

@@ -1,31 +0,0 @@
-/**
- * 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
- * @deprecated.  This functionality will be removed soon.
- */
-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/ISidedInventory.java

@@ -1,33 +0,0 @@
-/**
- * This software is provided under the terms of the Minecraft Forge Public 
- * License v1.0.
- */
-
-package net.minecraft.src.forge;
-
-import net.minecraft.src.IInventory;
-
-/** Inventory ranges mapped by side.  This class is implemented by TileEntities
- * that provide different inventory slot ranges to different sides.
- */
-public interface ISidedInventory extends IInventory {
-
-	/** 
-	 * Get the start of the side inventory.
-	 * @param side The global side to get the start of range.
-	 *      0: -Y (bottom side)
-	 *      1: +Y (top side)
-	 *      2: -Z
-	 *      3: +Z
-	 *      4: -X
-	 *      5: +x
-	 */
-	int getStartInventorySide(int side);
-
-	/**
-	 * Get the size of the side inventory.
-	 * @param side The global side.
-	 */
-	int getSizeInventorySide(int side);
-}
-

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

@@ -1,22 +0,0 @@
-/**
- * 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.EnumStatus;
-
-public interface ISleepHandler {
-    /**
-     * This is called before a player sleeps in a bed.  If it returns a
-     * non-null result, then the normal sleeping process will be skipped, and
-     * the value returned by this method will be returned to
-     * BlockBed.blockActivated.
-     *
-     * @see MinecraftForge#registerSleepHandler(ISleepHandler)
-     */
-    public EnumStatus sleepInBedAt(EntityPlayer player, int i, int j, int k);
-}
-

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

@@ -1,25 +0,0 @@
-/**
- * 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.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 {
-    
-    /**
-     * Return extra properties for the armor
-     */
-	public ArmorProperties getProperties(EntityPlayer player,
-			int intitialDamage, int currentDamage);
-}

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

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

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

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

@@ -1,368 +0,0 @@
-/**
- * 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.Item;
-import net.minecraft.src.ItemStack;
-import net.minecraft.src.World;
-
-import java.util.*;
-
-public class MinecraftForge {
-
-    private static LinkedList<IBucketHandler> bucketHandlers = new LinkedList<IBucketHandler>();
-    /**
-     * Register a new custom bucket handler.
-     */
-    public static void registerCustomBucketHandler(IBucketHandler handler) {
-        bucketHandlers.add(handler);
-    }
-
-    /**
-     * Registers a new sleeping handler.
-     */
-    public static void registerSleepHandler(ISleepHandler handler) {
-	ForgeHooks.sleepHandlers.add(handler);
-    }
-
-    /**
-     * Registers a new bonemeal handler.
-     */
-    public static void registerBonemealHandler(IBonemealHandler handler) {
-	ForgeHooks.bonemealHandlers.add(handler);
-    }
-
-    /**
-     * Registers a new hoe handler.
-     */
-    public static void registerHoeHandler(IHoeHandler handler) {
-	ForgeHooks.hoeHandlers.add(handler);
-    }
-
-    /**
-     * Registers a new destroy tool handler.
-     */
-    public static void registerDestroyToolHandler(IDestroyToolHandler handler) {
-	ForgeHooks.destroyToolHandlers.add(handler);
-    }
-
-    /**
-     * Registers a new crafting handler.
-     */
-    public static void registerCraftingHandler(ICraftingHandler handler) {
-        ForgeHooks.craftingHandlers.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;
-    }
-
-    // Ore Dictionary
-    // ------------------------------------------------------------
-    private static LinkedList<IOreHandler> oreHandlers = new LinkedList<IOreHandler>();
-    private static TreeMap<String,List<ItemStack>> oreDict=
-	    new TreeMap<String,List<ItemStack>>();
-
-    /** Register a new ore handler.  This will automatically call the handler
-     * with all current ores during registration, and every time a new ore is
-     * added later.
-     */
-    public static void registerOreHandler(IOreHandler handler) {
-	    oreHandlers.add(handler);
-
-	    for(String key : oreDict.keySet()) {
-		    List<ItemStack> val=oreDict.get(key);
-		    for(ItemStack ist : val) {
-			    handler.registerOre(key,ist);
-		    }
-	    }
-    }
-
-    /** Register a new item with the ore dictionary.
-     * @param oreClass The string class of the ore.
-     * @param ore The ItemStack for the ore.
-     */
-    public static void registerOre(String oreClass, ItemStack ore) {
-	    List<ItemStack> orelist=oreDict.get(oreClass);
-	    if(orelist==null) {
-		    orelist=new ArrayList<ItemStack>();
-		    oreDict.put(oreClass,orelist);
-	    }
-	    orelist.add(ore);
-	    for(IOreHandler ioh : oreHandlers) {
-		    ioh.registerOre(oreClass,ore);
-	    }
-    }
-
-    /** Get the list of ores in a given class.
-     */
-    public static List<ItemStack> getOreClass(String oreClass) {
-	    return oreDict.get(oreClass);
-    }
-
-    public static class OreQuery implements Iterable<Object[]> {
-	    Object[] proto;
-
-	    public class OreQueryIterator implements Iterator<Object[]> {
-		    LinkedList itering;
-		    LinkedList output;
-
-		    private OreQueryIterator() {
-			    itering=new LinkedList();
-			    output=new LinkedList();
-
-			    for(int i=0; i<proto.length; i++) {
-				    if(proto[i] instanceof Collection) {
-					    Iterator it=((Collection)proto[i])
-						    .iterator();
-					    if(!it.hasNext()) {
-						    output=null; break;
-					    }
-					    itering.addLast(it);
-					    output.addLast(it.next());
-				    } else {
-					    itering.addLast(proto[i]);
-					    output.addLast(proto[i]);
-				    }
-			    }
-		    }
-
-		    public boolean hasNext() {
-			    return output!=null;
-		    }
-
-		    public Object[] next() {
-			    Object[] tr=output.toArray();
-
-			    Object to;
-			    while(true) {
-				    if(itering.size()==0) {
-					    output=null;
-					    return tr;
-				    }
-				    to=itering.getLast();
-				    output.removeLast();
-				    if(to instanceof Iterator) {
-					    Iterator it=(Iterator)to;
-					    if(it.hasNext()) {
-						    output.addLast(it.next());
-						    break;
-					    }
-				    }
-				    itering.removeLast();
-			    }
-			    for(int i=itering.size(); i<proto.length; i++) {
-				    if(proto[i] instanceof Collection) {
-					    Iterator it=((Collection)proto[i])
-						    .iterator();
-					    if(!it.hasNext()) {
-						    output=null; break;
-					    }
-					    itering.addLast(it);
-					    output.addLast(it.next());
-				    } else {
-					    itering.addLast(proto[i]);
-					    output.addLast(proto[i]);
-				    }
-			    }
-			    return tr;
-		    }
-
-		    public void remove() {}
-	    }
-
-	    private OreQuery(Object[] pattern) {
-		    proto=pattern;
-	    }
-
-	    public Iterator<Object[]> iterator() {
-		    return new OreQueryIterator();
-	    }
-    }
-
-    /** Generate all valid legal recipe combinations.  Any Lists in pattern
-     * will be fully expanded to all valid combinations.
-     */
-    public static OreQuery generateRecipes(Object... pattern) {
-	    return new OreQuery(pattern);
-    }
-
-    // ------------------------------------------------------------
-
-    /** Register a new plant to be planted when bonemeal is used on grass.
-     * @param bid The block ID to plant.
-     * @param md The metadata to plant.
-     * @param prop The relative probability of the plant, where red flowers are
-     * 10 and yellow flowers are 20.
-     */
-    public static void addGrassPlant(int item, int md, int prop) {
-	    ForgeHooks.addPlantGrass(item,md,prop);
-    }
-
-    /** Register a new seed to be dropped when breaking tall grass.
-     * @param bid The item ID of the seeds.
-     * @param md The metadata of the seeds.
-     * @param qty The quantity of seeds to drop.
-     * @param prop The relative probability of the seeds, where wheat seeds are
-     * 10.
-     */
-    public static void addGrassSeed(int item, int md, int qty, int prop) {
-	    ForgeHooks.addGrassSeed(item,md,qty,prop);
-    }
-
-    /** Register a tool as a tool class with a given harvest level.
-     *
-     * @param tool The custom tool to register.
-     * @param tclass The tool class to register as.  The predefined tool
-     * clases are "pickaxe", "shovel", "axe".  You can add others for custom
-     * tools.
-     * @param hlevel The harvest level of the tool.
-     */
-    public static void setToolClass(Item tool, String tclass, int hlevel) {
-	    ForgeHooks.initTools();
-	    ForgeHooks.toolClasses.put(tool.shiftedIndex,
-		Arrays.asList(tclass,hlevel));
-    }
-
-    /** Register a block to be harvested by a tool class.  This is the metadata
-     * sensitive version, use it if your blocks are using metadata variants.
-     * By default, this sets the block class as effective against that type.
-     *
-     * @param bl The block to register.
-     * @param md The metadata for the block subtype.
-     * @param tclass The tool class to register as able to remove this block.
-     * You may register the same block multiple times with different tool
-     * classes, if multiple tool types can be used to harvest this block.
-     * @param hlevel The minimum tool harvest level required to successfully
-     * harvest the block.
-     * @see setToolClass for details on tool classes.
-     */
-    public static void setBlockHarvestLevel(Block bl, int md, String tclass, 
-		int hlevel) {
-	    ForgeHooks.initTools();
-	    List key=Arrays.asList(bl.blockID,md,tclass);
-	    ForgeHooks.toolHarvestLevels.put(key,hlevel);
-	    ForgeHooks.toolEffectiveness.add(key);
-    }
-
-    /** Remove a block effectiveness mapping.  Since setBlockHarvestLevel
-     * makes the tool class effective against the block by default, this can be
-     * used to remove that mapping.  This will force a block to be harvested at
-     * the same speed regardless of tool quality, while still requiring a given
-     * harvesting level.
-     * @param bl The block to remove effectiveness from.
-     * @param md The metadata for the block subtype.
-     * @param tclass The tool class to remove the effectiveness mapping from.
-     * @see setToolClass for details on tool classes.
-     */
-    public static void removeBlockEffectiveness(Block bl, int md,
-		    String tclass) {
-	    ForgeHooks.initTools();
-	    List key=Arrays.asList(bl.blockID,md,tclass);
-	    ForgeHooks.toolEffectiveness.remove(key);
-    }
-
-    /** Register a block to be harvested by a tool class.
-     * By default, this sets the block class as effective against that type.
-     *
-     * @param bl The block to register.
-     * @param tclass The tool class to register as able to remove this block.
-     * You may register the same block multiple times with different tool
-     * classes, if multiple tool types can be used to harvest this block.
-     * @param hlevel The minimum tool harvest level required to successfully
-     * harvest the block.
-     * @see setToolClass for details on tool classes.
-     */
-    public static void setBlockHarvestLevel(Block bl, String tclass, 
-		int hlevel) {
-	    ForgeHooks.initTools();
-	    for(int md=0; md<16; md++) {
-		    List key=Arrays.asList(bl.blockID,md,tclass);
-		    ForgeHooks.toolHarvestLevels.put(key,hlevel);
-		    ForgeHooks.toolEffectiveness.add(key);
-	    }
-    }
-
-    /** Remove a block effectiveness mapping.  Since setBlockHarvestLevel
-     * makes the tool class effective against the block by default, this can be
-     * used to remove that mapping.  This will force a block to be harvested at
-     * the same speed regardless of tool quality, while still requiring a given
-     * harvesting level.
-     * @param bl The block to remove effectiveness from.
-     * @param tclass The tool class to remove the effectiveness mapping from.
-     * @see setToolClass for details on tool classes.
-     */
-    public static void removeBlockEffectiveness(Block bl, String tclass) {
-	    ForgeHooks.initTools();
-	    for(int md=0; md<16; md++) {
-		    List key=Arrays.asList(bl.blockID,md,tclass);
-		    ForgeHooks.toolEffectiveness.remove(key);
-	    }
-    }
-
-    /**
-     * Kill minecraft with an error message.
-     */
-    public static void killMinecraft(String modname, String msg) {
-	    throw new RuntimeException(modname+": "+msg);
-    }
-
-    /**
-     * Version checking.  Ensures that a sufficiently recent version of Forge
-     * is installed.  Will result in a fatal error if the major versions
-     * mismatch or if the version is too old.  Will print a warning message if
-     * the minor versions don't match.
-     */
-    public static void versionDetect(String modname,
-		    int major, int minor, int revision) {
-	    if(major!=ForgeHooks.majorVersion) {
-		    killMinecraft(modname,"MinecraftForge Major Version Mismatch, expecting "+major+".x.x");
-	    } else if(minor!=ForgeHooks.minorVersion) {
-		    if(minor>ForgeHooks.minorVersion) {
-			    killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision);
-		    } else {
-			    System.out.println(modname + ": MinecraftForge minor version mismatch, expecting "+major+"."+minor+".x, may lead to unexpected behavior");
-		    }
-	    } else if(revision>ForgeHooks.revisionVersion) {
-		    killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision);
-	    }
-    }
-
-    /**
-     * Strict version checking.  Ensures that a sufficiently recent version of
-     * Forge is installed.  Will result in a fatal error if the major or minor 
-     * versions mismatch or if the version is too old.  Use this function for
-     * mods that use recent, new, or unstable APIs to prevent
-     * incompatibilities.
-     */
-    public static void versionDetectStrict(String modname,
-		    int major, int minor, int revision) {
-	    if(major!=ForgeHooks.majorVersion) {
-		    killMinecraft(modname,"MinecraftForge Major Version Mismatch, expecting "+major+".x.x");
-	    } else if(minor!=ForgeHooks.minorVersion) {
-		    if(minor>ForgeHooks.minorVersion) {
-			    killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision);
-		    } else {
-			    killMinecraft(modname,"MinecraftForge minor version mismatch, expecting "+major+"."+minor+".x");
-		    }
-	    } else if(revision>ForgeHooks.revisionVersion) {
-		    killMinecraft(modname,"MinecraftForge Too Old, need at least "+major+"."+minor+"."+revision);
-	    }
-    }
-
-}

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

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

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

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

@@ -1,12 +0,0 @@
-*** HOW TO INSTALL ***
-
-Extract the download archive directly into your MCP-directiory.
-It should create a folder "forge" within that directory, containing all 
-extracted files.
-
-You should use freshly decompiled jars, solely including ModLoader & 
-ModLoaderMP respectively. Anything else can eventually cause conflicts.
-
-Now just start the install-bat, MCForge will install itself into the proper
-locations and copy all ned files, as well as modifying the ned baseclasses.
-

forge/install/install.cmd

@@ -1,31 +0,0 @@
-echo off
-
-echo MinecraftForge Windows Setup Program
-echo:
-
-pushd .. >nul
-
-cmd /C cleanup.bat
-cmd /C decompile.bat
-
-pushd src >nul
-    del minecraft\net\minecraft\src\MLProp.java
-    copy ..\forge\MLProp.java minecraft\net\minecraft\src\MLProp.java
-    del minecraft_server\net\minecraft\src\MLProp.java
-    copy ..\forge\MLProp.java minecraft_server\net\minecraft\src\MLProp.java
-
-    ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/modLoaderMP.patch ../forge/modLoaderMP.patch
-    ..\runtime\bin\applydiff.exe -uf -p2 -i ../forge/modLoaderMP.patch
-
-    for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches') do (
-        pushd "%%a" 2>nul
-        if errorlevel 1 (
-            ..\runtime\bin\python\python_mcp ..\forge\lfcr.py "%%a" "%%a"
-            ..\runtime\bin\applydiff.exe -uf -p2 -i "%%a"
-        ) else popd
-    )
-popd >nul
-
-xcopy /Y /E forge\src\* src
-
-cmd /C updatemd5.bat

forge/install/install.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-echo "MinecraftForge Linux Setup Program"
-echo 
-
-pushd .. > /dev/null
-
-./cleanup.sh
-./decompile.sh
-
-pushd src > /dev/null
-	find . -name *.java -exec sed -i 's/\r//g' \{\} \;
-    cp ../forge/MLProp.java minecraft/net/minecraft/src/MLProp.java
-    cp ../forge/MLProp.java minecraft_server/net/minecraft/src/MLProp.java
-	patch -p2 -i ../forge/modLoaderMP.patch
-	#patch -p1 -i ../forge/mlprop.patch
-	for i in `find ../forge/patches/ -type f`
-	do
-		patch -p2 -i $i
-	done
-popd > /dev/null
-
-cp -r forge/src/* src
-
-./updatemd5.sh

forge/lfcr.py

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

@@ -1,65 +0,0 @@
-Minecraft Forge Public Licence
-==============================
-
-Version 1.0
-
-0. Definitions
---------------
-
-Minecraft: Denotes a copy of the Minecraft game licensed by Mojang AB
-
-User: Anybody that interract with the software in one of the following ways:
-   - play
-   - decompile
-   - recompile or compile
-   - modify
-
-Minecraft Forge: The Minecraft Forge code, in source form, class file form, as
-obtained in a standalone fashion or as part of a wider distribution.
-
-Dependency: Code required to have Minecraft Forge working properly. That can
-include dependencies required to compile the code as well as modifications in 
-the Minecraft sources that are required to have Minecraft Forge working.
-
-1. Scope
---------
-
-The present license is granted to any user of Minecraft Forge. 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/minecraftforge_credits.txt

@@ -1,18 +0,0 @@
-* Eloraam *
-
-* FlowerChild *
-
-* Hawkye *
-
-* MALfunction84 *
-
-Submitted the sleep handler code for his mod (Somnia) and others to use.
-
-* Scokeev9 *
-
-Gave permission for ScotTools API to be integrated into MCF, and also supported the Forge by converting his mods to use it.
-
-ScotTools Background: ScotTools was an API that enabled modders to add blocks to harvesting levels (and many other ease-of-use features to create new tools), and the first tool API that used block material for block breaking efficiency which allowed blocks from mods that didn't use ScotTools API to break with the correct speed.
-
-* SpaceToad *
-

forge/modLoaderMP.patch

@@ -1,70 +0,0 @@
-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()
-     {
-diff U3 ../src_base/minecraft_server/net/minecraft/src/MLProp.java ../src_work/minecraft_server/net/minecraft/src/MLProp.java
---- ../src_base/minecraft_server/net/minecraft/src/MLProp.java	Wed Nov 30 22:27:22 2011
-+++ ../src_work/minecraft_server/net/minecraft/src/MLProp.java	Sun Dec 04 14:31:04 2011
-@@ -8,4 +8,6 @@
- 	String info() default "";
- 	double min() default Double.NEGATIVE_INFINITY;
- 	double max() default Double.POSITIVE_INFINITY;
-+    
-+    public int reobf() default 0;
- }
-\ No newline at end of file

forge/package.sh

@@ -1,81 +0,0 @@
-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
-
-   cp $build_dir/minecraftforge_credits.txt .
-
-   zip -r $dir/minecraftforge$qual-$version.zip \
-      minecraftforge_credits.txt \
-      *.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
-mkdir patches
-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 -r ../patches/* patches
-cp ../lfcr.py .
-cp ../install/install.cmd .
-cp ../install/install.sh .
-cp ../modLoaderMP.patch .
-cp ../MLProp.java .
-cp ../install/README.txt .
-cp ../minecraftforge_credits.txt .
-cp -r ../doc .
-
-cd src
-remove_svn .
-cd ../patches
-remove_svn .
-cd ..
-
-cd ..
-
-zip -r $dir/minecraftforge-src-$version.zip forge
-rm -rf forge

forge/patches/minecraft/net/minecraft/src/Block.java.patch

@@ -1,226 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/Block.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/Block.java	0000-00-00 00:00:00.000000000 -0000
-@@ -4,6 +4,7 @@
- 
- package net.minecraft.src;
- 
-+import net.minecraft.src.forge.ForgeHooks;
- import java.util.ArrayList;
- import java.util.Random;
- 
-@@ -312,12 +313,14 @@
- 
-     public float getBlockBrightness(IBlockAccess iblockaccess, int i, int j, int k)
-     {
--        return iblockaccess.getBrightness(i, j, k, lightValue[blockID]);
-+        return iblockaccess.getBrightness(i, j, k,
-+        		getLightValue(iblockaccess,i,j,k));
-     }
- 
-     public int getMixedBrightnessForBlock(IBlockAccess iblockaccess, int i, int j, int k)
-     {
--        return iblockaccess.getLightBrightnessForSkyBlocks(i, j, k, lightValue[blockID]);
-+        return iblockaccess.getLightBrightnessForSkyBlocks(i, j, k,
-+        		getLightValue(iblockaccess,i,j,k));
-     }
- 
-     public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l)
-@@ -438,25 +441,56 @@
-     {
-         return 1;
-     }
--
-+    
-+    /* FORGE: Metadata-sensitive version.
-+     */
-+    public int quantityDropped(int meta, int fortune, Random random)
-+    {
-+        return func_40198_a(fortune, random);
-+    }
-+    
-+    /* FORGE: Metadata-sensitive version.
-+     */
-+    public int quantityDropped(int meta, Random random)
-+    {
-+        return quantityDropped(meta, 0, random);
-+    }
-+    
-     public int idDropped(int i, Random random, int j)
-     {
-         return blockID;
-     }
- 
-+    /* FORGE: This function isnt called by Minecraft anymore.  Use
-+     * blockStrength(EntityPlayer,int) instead.
-+     */
-     public float blockStrength(EntityPlayer entityplayer)
-     {
--        if(blockHardness < 0.0F)
--        {
--            return 0.0F;
--        }
--        if(!entityplayer.canHarvestBlock(this))
--        {
--            return 1.0F / blockHardness / 100F;
--        } else
--        {
--            return entityplayer.getCurrentPlayerStrVsBlock(this) / blockHardness / 30F;
--        }
-+        return blockStrength(entityplayer,0);
-+    }
-+
-+    /* FORGE: This function returns the complete list of drops for a block.
-+     */
-+    public ArrayList<ItemStack> getBlockDropped(World world,
-+        	    int i, int j, int k, int md, int fortune) {
-+    	
-+    	ArrayList<ItemStack> tr = new ArrayList<ItemStack>();
-+
-+    	int q = quantityDropped(md, fortune, world.rand);
-+    	for (int n = 0; n < q; n++) {
-+    		int id = idDropped(md, world.rand, 0);
-+    		if(id > 0) {
-+    			tr.add(new ItemStack(id, 1, damageDropped(md)));
-+    		}
-+    	}
-+    	return tr;
-+    }
-+    
-+    /* FORGE: This function returns the complete list of drops for a block.
-+     */
-+    public ArrayList<ItemStack> getBlockDropped(World world,
-+        	    int i, int j, int k, int md) {
-+    	return getBlockDropped (world, i, j, k, md);
-     }
- 
-     public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1)
-@@ -470,18 +504,13 @@
-         {
-             return;
-         }
--        int j1 = func_40198_a(i1, world.rand);
--        for(int k1 = 0; k1 < j1; k1++)
--        {
-+        ArrayList<ItemStack> ar = getBlockDropped(world, i, j, k, l, i1);
-+        for (ItemStack ist : ar) {
-             if(world.rand.nextFloat() > f)
-             {
-                 continue;
-             }
--            int l1 = idDropped(l, world.rand, i1);
--            if(l1 > 0)
--            {
--                dropBlockAsItem_do(world, i, j, k, new ItemStack(l1, 1, damageDropped(l)));
--            }
-+        	dropBlockAsItem_do(world, i, j, k, ist);
-         }
- 
-     }
-@@ -805,6 +834,107 @@
-         return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F;
-     }
- 
-+    /* FORGE: Allow a block to set illumination on a coordinate basis.
-+     */
-+    public int getLightValue(IBlockAccess iba, int i, int j, int k) {
-+	    return lightValue[blockID];
-+    }
-+
-+    /* FORGE: Implement and return true if you wish this block to behave
-+     * like a ladder when the player is inside.
-+     */
-+    public boolean isLadder() {
-+	return false;
-+    }
-+
-+    /* FORGE: Return true if the block is a normal, solid cube.  This
-+     * determines indirect power state, entity ejection from blocks, and a few
-+     * others.
-+     */
-+    public boolean isBlockNormalCube(World world, int i, int j, int k) {
-+	    return blockMaterial.getIsOpaque() && renderAsNormalBlock();
-+    }
-+
-+    /* FORGE: Return true if the block is solid on the given side.  This
-+     * is used by placement logic. */
-+    public boolean isBlockSolidOnSide( World world, int i, int j, int k,
-+		    int side ) {
-+	    return isBlockNormalCube(world,i,j,k);
-+    }
-+
-+    /* FORGE: Return true if the player can place a new block in the block
-+     * occupied by this one, like water, lava, fire, etc.
-+     */
-+    public boolean isBlockReplaceable( World world, int i, int j, int k ) {
-+	    return false;
-+    }
-+
-+    /* FORGE: Return true if this block should set fire and deal fire damage
-+     * to entities coming into contact with it, false otherwise.
-+     */
-+    public boolean isBlockBurning( World world, int i, int j, int k ) {
-+	    return false;
-+    }
-+
-+    /* FORGE: 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.  
-+     */	
-+    public boolean isAirBlock( World world, int i, int j, int k ) {
-+	    return false;
-+    }
-+
-+    /* FORGE: Return the block hardness with metadata md.
-+     */
-+    public float getHardness(int md) {
-+	    return blockHardness;
-+    }
-+
-+    /* FORGE: Return the block strength of the block at i,j,k against the
-+     * player.
-+     */
-+    public float blockStrength(World world, EntityPlayer player,
-+		    int i, int j, int k) {
-+	    int md=world.getBlockMetadata(i,j,k);
-+	    return blockStrength(player,md);
-+    }
-+
-+    /* FORGE: Return the block strength of a prototypical block with metadata
-+     * md against the player.
-+     */
-+    public float blockStrength(EntityPlayer player, int md) {
-+	    return ForgeHooks.blockStrength(this,player,md);
-+    }
-+
-+    /* FORGE: Return true if the player can harvest a prototypical block with
-+     * metadata md.
-+     */
-+    public boolean canHarvestBlock(EntityPlayer player, int md) {
-+	    return ForgeHooks.canHarvestBlock(this,player,md);
-+    }
-+
-+    /* FORGE: Called when a player removes a block.  This is responsible for
-+     * actually destroying the block, and the block is intact at time of call.
-+     * This is called regardless of whether the player can harvest the block or
-+     * not.  Return true if the block is actually destroyed.
-+     *
-+     * Note: When used in multiplayer, this is called on both client and
-+     * server sides!
-+     */
-+    public boolean removeBlockByPlayer(World world, EntityPlayer player,
-+		    int i, int j, int k) {
-+        return world.setBlockWithNotify(i, j, k, 0);
-+    }
-+    
-+    /* FORGE: Called when a new CreativeContainer is opened, populate the list 
-+     * with all of the items for this block you want a player in creative mode
-+     * to have access to.
-+     */
-+    public void addCreativeItems(ArrayList itemList)
-+    {    	
-+    }
-+
-     static Class _mthclass$(String s)
-     {
-         try

forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch

@@ -1,119 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/BlockButton.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java	0000-00-00 00:00:00.000000000 -0000
-@@ -41,36 +41,36 @@
- 
-     public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
-     {
--        if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
-+	if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
-         {
-             return true;
-         }
--        if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
-+	if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
-         {
-             return true;
-         }
--        if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
-+        if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
-         {
-             return true;
-         }
--        return l == 5 && world.isBlockNormalCube(i - 1, j, k);
-+        return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5);
-     }
- 
-     public boolean canPlaceBlockAt(World world, int i, int j, int k)
-     {
--        if(world.isBlockNormalCube(i - 1, j, k))
-+        if(world.isBlockSolidOnSide(i - 1, j, k,5))
-         {
-             return true;
-         }
--        if(world.isBlockNormalCube(i + 1, j, k))
-+	if(world.isBlockSolidOnSide(i + 1, j, k,4))
-         {
-             return true;
-         }
--        if(world.isBlockNormalCube(i, j, k - 1))
-+        if(world.isBlockSolidOnSide(i, j, k - 1,3))
-         {
-             return true;
-         }
--        return world.isBlockNormalCube(i, j, k + 1);
-+        return world.isBlockSolidOnSide(i, j, k + 1,2);
-     }
- 
-     public void onBlockPlaced(World world, int i, int j, int k, int l)
-@@ -78,19 +78,19 @@
-         int i1 = world.getBlockMetadata(i, j, k);
-         int j1 = i1 & 8;
-         i1 &= 7;
--        if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
-+        if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
-         {
-             i1 = 4;
-         } else
--        if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
-+        if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
-         {
-             i1 = 3;
-         } else
--        if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
-+        if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
-         {
-             i1 = 2;
-         } else
--        if(l == 5 && world.isBlockNormalCube(i - 1, j, k))
-+        if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5))
-         {
-             i1 = 1;
-         } else
-@@ -102,19 +102,19 @@
- 
-     private int getOrientation(World world, int i, int j, int k)
-     {
--        if(world.isBlockNormalCube(i - 1, j, k))
-+        if(world.isBlockSolidOnSide(i - 1, j, k,5))
-         {
-             return 1;
-         }
--        if(world.isBlockNormalCube(i + 1, j, k))
-+        if(world.isBlockSolidOnSide(i + 1, j, k,4))
-         {
-             return 2;
-         }
--        if(world.isBlockNormalCube(i, j, k - 1))
-+        if(world.isBlockSolidOnSide(i, j, k - 1,3))
-         {
-             return 3;
-         }
--        return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4;
-+        return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4;
-     }
- 
-     public void onNeighborBlockChange(World world, int i, int j, int k, int l)
-@@ -123,19 +123,19 @@
-         {
-             int i1 = world.getBlockMetadata(i, j, k) & 7;
-             boolean flag = false;
--            if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1)
-+            if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1)
-             {
-                 flag = true;
-             }
--            if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2)
-+            if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2)
-             {
-                 flag = true;
-             }
--            if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3)
-+            if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3)
-             {
-                 flag = true;
-             }
--            if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4)
-+            if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4)
-             {
-                 flag = true;
-             }

forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch

@@ -1,31 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/BlockChest.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java	0000-00-00 00:00:00.000000000 -0000
-@@ -429,23 +429,23 @@
-         {
-             return true;
-         }
--        if(world.isBlockNormalCube(i, j + 1, k))
-+        if(world.isBlockSolidOnSide(i, j + 1, k,0))
-         {
-             return true;
-         }
--        if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k))
-+        if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0))
-         {
-             return true;
-         }
--        if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k))
-+        if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0))
-         {
-             return true;
-         }
--        if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1))
-+        if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0))
-         {
-             return true;
-         }
--        if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1))
-+        if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0))
-         {
-             return true;
-         }

forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch

@@ -1,24 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/BlockContainer.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java	0000-00-00 00:00:00.000000000 -0000
-@@ -26,7 +26,7 @@
-     public void onBlockAdded(World world, int i, int j, int k)
-     {
-         super.onBlockAdded(world, i, j, k);
--        world.setBlockTileEntity(i, j, k, getBlockEntity());
-+        world.setBlockTileEntity(i, j, k, getBlockEntity(world.getBlockMetadata(i,j,k)));
-     }
- 
-     public void onBlockRemoval(World world, int i, int j, int k)
-@@ -37,6 +37,12 @@
- 
-     public abstract TileEntity getBlockEntity();
- 
-+    /* FORGE: Metadata-sensitive version, to fix 1.8.1 regression.
-+     */
-+    public TileEntity getBlockEntity(int md) {
-+	    return getBlockEntity();
-+    }
-+ 
-     public void powerBlock(World world, int i, int j, int k, int l, int i1)
-     {
-         super.powerBlock(world, i, j, k, l, i1);

forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch

@@ -1,48 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/BlockCrops.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockCrops.java	0000-00-00 00:00:00.000000000 -0000
-@@ -5,6 +5,7 @@
- package net.minecraft.src;
- 
- import java.util.Random;
-+import java.util.ArrayList;
- 
- // Referenced classes of package net.minecraft.src:
- //            BlockFlower, Block, World, EntityItem, 
-@@ -108,28 +109,16 @@
-         return 6;
-     }
- 
--    public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f, int i1)
--    {
--        super.dropBlockAsItemWithChance(world, i, j, k, l, f, 0);
--        if(world.multiplayerWorld)
--        {
--            return;
-+    public ArrayList<ItemStack> getBlockDropped(World world,
-+        	    int i, int j, int k, int md) {
-+        ArrayList<ItemStack> tr = new ArrayList<ItemStack>();
-+        if (md == 7) tr.add(new ItemStack(Item.wheat));
-+            
-+        for(int n = 0; n < 3; n++) {
-+            if (world.rand.nextInt(15) <= md)
-+                tr.add(new ItemStack(Item.seeds));
-         }
--        int j1 = 3 + i1;
--        for(int k1 = 0; k1 < j1; k1++)
--        {
--            if(world.rand.nextInt(15) <= l)
--            {
--                float f1 = 0.7F;
--                float f2 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
--                float f3 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
--                float f4 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
--                EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds));
--                entityitem.delayBeforeCanPickup = 10;
--                world.entityJoinedWorld(entityitem);
--            }
--        }
--
-+        return tr;
-     }
- 
-     public int idDropped(int i, Random random, int j)

forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch

@@ -1,29 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/BlockDoor.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java	0000-00-00 00:00:00.000000000 -0000
-@@ -111,7 +111,7 @@
-     {
-         if(blockMaterial == Material.iron)
-         {
--            return true;
-+            return false;
-         }
-         int l = world.getBlockMetadata(i, j, k);
-         if((l & 8) != 0)
-@@ -178,7 +178,7 @@
-                 world.setBlockWithNotify(i, j, k, 0);
-                 flag = true;
-             }
--            if(!world.isBlockNormalCube(i, j - 1, k))
-+            if(!world.isBlockSolidOnSide(i, j - 1, k,1))
-             {
-                 world.setBlockWithNotify(i, j, k, 0);
-                 flag = true;
-@@ -241,7 +241,7 @@
-             return false;
-         } else
-         {
--            return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k);
-+            return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k);
-         }
-     }
- 

forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch

@@ -1,84 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/BlockLadder.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java	0000-00-00 00:00:00.000000000 -0000
-@@ -63,6 +63,11 @@
-         return super.getSelectedBoundingBoxFromPool(world, i, j, k);
-     }
- 
-+    /* FORGE: Implemented base method, see Block.isLadder */
-+    public boolean isLadder() {
-+	return true;
-+    }
-+
-     public boolean isOpaqueCube()
-     {
-         return false;
-@@ -80,37 +85,37 @@
- 
-     public boolean canPlaceBlockAt(World world, int i, int j, int k)
-     {
--        if(world.isBlockNormalCube(i - 1, j, k))
-+        if(world.isBlockSolidOnSide(i - 1, j, k,5))
-         {
-             return true;
-         }
--        if(world.isBlockNormalCube(i + 1, j, k))
-+        if(world.isBlockSolidOnSide(i + 1, j, k,4))
-         {
-             return true;
-         }
--        if(world.isBlockNormalCube(i, j, k - 1))
-+        if(world.isBlockSolidOnSide(i, j, k - 1,3))
-         {
-             return true;
-         }
--        return world.isBlockNormalCube(i, j, k + 1);
-+        return world.isBlockSolidOnSide(i, j, k + 1,2);
-     }
- 
-     public void onBlockPlaced(World world, int i, int j, int k, int l)
-     {
-         int i1 = world.getBlockMetadata(i, j, k);
--        if((i1 == 0 || l == 2) && world.isBlockNormalCube(i, j, k + 1))
-+        if((i1 == 0 || l == 2) && world.isBlockSolidOnSide(i, j, k + 1,2))
-         {
-             i1 = 2;
-         }
--        if((i1 == 0 || l == 3) && world.isBlockNormalCube(i, j, k - 1))
-+        if((i1 == 0 || l == 3) && world.isBlockSolidOnSide(i, j, k - 1,3))
-         {
-             i1 = 3;
-         }
--        if((i1 == 0 || l == 4) && world.isBlockNormalCube(i + 1, j, k))
-+        if((i1 == 0 || l == 4) && world.isBlockSolidOnSide(i + 1, j, k,4))
-         {
-             i1 = 4;
-         }
--        if((i1 == 0 || l == 5) && world.isBlockNormalCube(i - 1, j, k))
-+        if((i1 == 0 || l == 5) && world.isBlockSolidOnSide(i - 1, j, k,5))
-         {
-             i1 = 5;
-         }
-@@ -121,19 +126,19 @@
-     {
-         int i1 = world.getBlockMetadata(i, j, k);
-         boolean flag = false;
--        if(i1 == 2 && world.isBlockNormalCube(i, j, k + 1))
-+        if(i1 == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
-         {
-             flag = true;
-         }
--        if(i1 == 3 && world.isBlockNormalCube(i, j, k - 1))
-+        if(i1 == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
-         {
-             flag = true;
-         }
--        if(i1 == 4 && world.isBlockNormalCube(i + 1, j, k))
-+        if(i1 == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
-         {
-             flag = true;
-         }
--        if(i1 == 5 && world.isBlockNormalCube(i - 1, j, k))
-+        if(i1 == 5 && world.isBlockSolidOnSide(i - 1, j, k,5))
-         {
-             flag = true;
-         }

forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch

@@ -1,120 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/BlockLever.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java	0000-00-00 00:00:00.000000000 -0000
-@@ -40,44 +40,44 @@
- 
-     public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
-     {
--        if(l == 1 && world.isBlockNormalCube(i, j - 1, k))
-+        if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1))
-         {
-             return true;
-         }
--        if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
-+        if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
-         {
-             return true;
-         }
--        if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
-+        if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
-         {
-             return true;
-         }
--        if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
-+        if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
-         {
-             return true;
-         }
--        return l == 5 && world.isBlockNormalCube(i - 1, j, k);
-+        return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5);
-     }
- 
-     public boolean canPlaceBlockAt(World world, int i, int j, int k)
-     {
--        if(world.isBlockNormalCube(i - 1, j, k))
-+        if(world.isBlockSolidOnSide(i - 1, j, k,5))
-         {
-             return true;
-         }
--        if(world.isBlockNormalCube(i + 1, j, k))
-+        if(world.isBlockSolidOnSide(i + 1, j, k,4))
-         {
-             return true;
-         }
--        if(world.isBlockNormalCube(i, j, k - 1))
-+        if(world.isBlockSolidOnSide(i, j, k - 1,3))
-         {
-             return true;
-         }
--        if(world.isBlockNormalCube(i, j, k + 1))
-+        if(world.isBlockSolidOnSide(i, j, k + 1,2))
-         {
-             return true;
-         }
--        return world.isBlockNormalCube(i, j - 1, k);
-+        return world.isBlockSolidOnSide(i, j - 1, k,1);
-     }
- 
-     public void onBlockPlaced(World world, int i, int j, int k, int l)
-@@ -86,23 +86,23 @@
-         int j1 = i1 & 8;
-         i1 &= 7;
-         i1 = -1;
--        if(l == 1 && world.isBlockNormalCube(i, j - 1, k))
-+        if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1))
-         {
-             i1 = 5 + world.rand.nextInt(2);
-         }
--        if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
-+        if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
-         {
-             i1 = 4;
-         }
--        if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
-+        if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
-         {
-             i1 = 3;
-         }
--        if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
-+        if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
-         {
-             i1 = 2;
-         }
--        if(l == 5 && world.isBlockNormalCube(i - 1, j, k))
-+        if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5))
-         {
-             i1 = 1;
-         }
-@@ -124,27 +124,27 @@
-         {
-             int i1 = world.getBlockMetadata(i, j, k) & 7;
-             boolean flag = false;
--            if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1)
-+            if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1)
-             {
-                 flag = true;
-             }
--            if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2)
-+            if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2)
-             {
-                 flag = true;
-             }
--            if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3)
-+            if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3)
-             {
-                 flag = true;
-             }
--            if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4)
-+            if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4)
-             {
-                 flag = true;
-             }
--            if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 5)
-+            if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 5)
-             {
-                 flag = true;
-             }
--            if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 6)
-+            if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 6)
-             {
-                 flag = true;
-             }

forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch

@@ -1,22 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java	0000-00-00 00:00:00.000000000 -0000
-@@ -48,7 +48,8 @@
- 
-     public boolean canPlaceBlockAt(World world, int i, int j, int k)
-     {
--        return world.isBlockNormalCube(i, j - 1, k) || world.getBlockId(i, j - 1, k) == Block.fence.blockID;
-+        return world.isBlockSolidOnSide(i, j - 1, k,1)
-+		|| world.getBlockId(i, j - 1, k) == Block.fence.blockID;
-     }
- 
-     public void onBlockAdded(World world, int i, int j, int k)
-@@ -58,7 +59,8 @@
-     public void onNeighborBlockChange(World world, int i, int j, int k, int l)
-     {
-         boolean flag = false;
--        if(!world.isBlockNormalCube(i, j - 1, k) && world.getBlockId(i, j - 1, k) != Block.fence.blockID)
-+        if(!world.isBlockSolidOnSide(i, j - 1, k,1)
-+			&& world.getBlockId(i, j - 1, k) != Block.fence.blockID)
-         {
-             flag = true;
-         }

forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch

@@ -1,55 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/BlockRail.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java	0000-00-00 00:00:00.000000000 -0000
-@@ -18,12 +18,12 @@
-     public static final boolean isRailBlockAt(World world, int i, int j, int k)
-     {
-         int l = world.getBlockId(i, j, k);
--        return l == Block.rail.blockID || l == Block.railPowered.blockID || l == Block.railDetector.blockID;
-+	return Block.blocksList[l] instanceof BlockRail;
-     }
- 
-     public static final boolean isRailBlock(int i)
-     {
--        return i == Block.rail.blockID || i == Block.railPowered.blockID || i == Block.railDetector.blockID;
-+	return Block.blocksList[i] instanceof BlockRail;
-     }
- 
-     protected BlockRail(int i, int j, boolean flag)
-@@ -99,7 +99,7 @@
- 
-     public boolean canPlaceBlockAt(World world, int i, int j, int k)
-     {
--        return world.isBlockNormalCube(i, j - 1, k);
-+        return world.isBlockSolidOnSide(i, j - 1, k,1);
-     }
- 
-     public void onBlockAdded(World world, int i, int j, int k)
-@@ -123,23 +123,23 @@
-             j1 &= 7;
-         }
-         boolean flag = false;
--        if(!world.isBlockNormalCube(i, j - 1, k))
-+        if(!world.isBlockSolidOnSide(i, j - 1, k,1))
-         {
-             flag = true;
-         }
--        if(j1 == 2 && !world.isBlockNormalCube(i + 1, j, k))
-+        if(j1 == 2 && !world.isBlockSolidOnSide(i + 1, j, k,1))
-         {
-             flag = true;
-         }
--        if(j1 == 3 && !world.isBlockNormalCube(i - 1, j, k))
-+        if(j1 == 3 && !world.isBlockSolidOnSide(i - 1, j, k,1))
-         {
-             flag = true;
-         }
--        if(j1 == 4 && !world.isBlockNormalCube(i, j, k - 1))
-+        if(j1 == 4 && !world.isBlockSolidOnSide(i, j, k - 1,1))
-         {
-             flag = true;
-         }
--        if(j1 == 5 && !world.isBlockNormalCube(i, j, k + 1))
-+        if(j1 == 5 && !world.isBlockSolidOnSide(i, j, k + 1,1))
-         {
-             flag = true;
-         }

forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch

@@ -1,20 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java	0000-00-00 00:00:00.000000000 -0000
-@@ -35,7 +35,7 @@
- 
-     public boolean canPlaceBlockAt(World world, int i, int j, int k)
-     {
--        if(!world.isBlockNormalCube(i, j - 1, k))
-+        if(!world.isBlockSolidOnSide(i, j - 1, k,1))
-         {
-             return false;
-         } else
-@@ -46,7 +46,7 @@
- 
-     public boolean canBlockStay(World world, int i, int j, int k)
-     {
--        if(!world.isBlockNormalCube(i, j - 1, k))
-+        if(!world.isBlockSolidOnSide(i, j - 1, k,1))
-         {
-             return false;
-         } else

forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch

@@ -1,31 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java	0000-00-00 00:00:00.000000000 -0000
-@@ -6,6 +6,8 @@
- 
- import java.util.*;
- 
-+import net.minecraft.src.forge.*;
-+
- // Referenced classes of package net.minecraft.src:
- //            Block, Material, World, ChunkPosition, 
- //            Item, IBlockAccess, Direction, AxisAlignedBB
-@@ -56,7 +58,7 @@
- 
-     public boolean canPlaceBlockAt(World world, int i, int j, int k)
-     {
--        return world.isBlockNormalCube(i, j - 1, k);
-+        return world.isBlockSolidOnSide(i, j - 1, k, 1);
-     }
- 
-     private void updateAndPropagateCurrentStrength(World world, int i, int j, int k)
-@@ -454,6 +456,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() && l != -1)
-         {
-             return true;

forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch

@@ -1,38 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/BlockTallGrass.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockTallGrass.java	0000-00-00 00:00:00.000000000 -0000
-@@ -4,7 +4,10 @@
- 
- package net.minecraft.src;
- 
-+import net.minecraft.src.forge.ForgeHooks;
-+
- import java.util.Random;
-+import java.util.ArrayList;
- 
- // Referenced classes of package net.minecraft.src:
- //            BlockFlower, ColorizerGrass, ColorizerFoliage, IBlockAccess, 
-@@ -73,13 +76,17 @@
- 
-     public int idDropped(int i, Random random, int j)
-     {
--        if(random.nextInt(8) == 0)
--        {
--            return Item.seeds.shiftedIndex;
--        } else
--        {
--            return -1;
--        }
-+	    return -1;
-+    }
-+
-+    public ArrayList<ItemStack> getBlockDropped(World world,
-+		    int i, int j, int k, int md) {
-+	    ArrayList<ItemStack> tr=new ArrayList<ItemStack>();
-+	    if(world.rand.nextInt(8)!=0)
-+		    return tr;
-+	    ItemStack ist=ForgeHooks.getGrassSeed(world);
-+	    if(ist!=null) tr.add(ist);
-+	    return tr;
-     }
- 
-     public int func_40198_a(int i, Random random)

forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch

@@ -1,107 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/BlockTorch.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java	0000-00-00 00:00:00.000000000 -0000
-@@ -41,7 +41,7 @@
- 
-     private boolean func_31032_h(World world, int i, int j, int k)
-     {
--        if(world.func_41082_b(i, j, k, true))
-+        if(world.isBlockSolidOnSide(i, j, k, 1))
-         {
-             return true;
-         } else
-@@ -53,19 +53,19 @@
- 
-     public boolean canPlaceBlockAt(World world, int i, int j, int k)
-     {
--        if(world.func_41082_b(i - 1, j, k, true))
-+        if(world.isBlockSolidOnSide(i - 1, j, k,5))
-         {
-             return true;
-         }
--        if(world.func_41082_b(i + 1, j, k, true))
-+        if(world.isBlockSolidOnSide(i + 1, j, k,4))
-         {
-             return true;
-         }
--        if(world.func_41082_b(i, j, k - 1, true))
-+        if(world.isBlockSolidOnSide(i, j, k-1,3))
-         {
-             return true;
-         }
--        if(world.func_41082_b(i, j, k + 1, true))
-+        if(world.isBlockSolidOnSide(i, j, k+1,2))
-         {
-             return true;
-         }
-@@ -79,19 +79,19 @@
-         {
-             i1 = 5;
-         }
--        if(l == 2 && world.func_41082_b(i, j, k + 1, true))
-+        if(l == 2 && world.isBlockSolidOnSide(i, j, k+1,2))
-         {
-             i1 = 4;
-         }
--        if(l == 3 && world.func_41082_b(i, j, k - 1, true))
-+        if(l == 3 && world.isBlockSolidOnSide(i, j, k-1,3))
-         {
-             i1 = 3;
-         }
--        if(l == 4 && world.func_41082_b(i + 1, j, k, true))
-+        if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
-         {
-             i1 = 2;
-         }
--        if(l == 5 && world.func_41082_b(i - 1, j, k, true))
-+        if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5))
-         {
-             i1 = 1;
-         }
-@@ -109,19 +109,19 @@
- 
-     public void onBlockAdded(World world, int i, int j, int k)
-     {
--        if(world.func_41082_b(i - 1, j, k, true))
-+        if(world.isBlockSolidOnSide(i - 1, j, k,5))
-         {
-             world.setBlockMetadataWithNotify(i, j, k, 1);
-         } else
--        if(world.func_41082_b(i + 1, j, k, true))
-+        if(world.isBlockSolidOnSide(i + 1, j, k,4))
-         {
-             world.setBlockMetadataWithNotify(i, j, k, 2);
-         } else
--        if(world.func_41082_b(i, j, k - 1, true))
-+        if(world.isBlockSolidOnSide(i, j, k-1,3))
-         {
-             world.setBlockMetadataWithNotify(i, j, k, 3);
-         } else
--        if(world.func_41082_b(i, j, k + 1, true))
-+        if(world.isBlockSolidOnSide(i, j, k+1,2))
-         {
-             world.setBlockMetadataWithNotify(i, j, k, 4);
-         } else
-@@ -138,19 +138,19 @@
-         {
-             int i1 = world.getBlockMetadata(i, j, k);
-             boolean flag = false;
--            if(!world.func_41082_b(i - 1, j, k, true) && i1 == 1)
-+            if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1)
-             {
-                 flag = true;
-             }
--            if(!world.func_41082_b(i + 1, j, k, true) && i1 == 2)
-+            if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2)
-             {
-                 flag = true;
-             }
--            if(!world.func_41082_b(i, j, k - 1, true) && i1 == 3)
-+            if(!world.isBlockSolidOnSide(i, j, k-1,3) && i1 == 3)
-             {
-                 flag = true;
-             }
--            if(!world.func_41082_b(i, j, k + 1, true) && i1 == 4)
-+            if(!world.isBlockSolidOnSide(i, j, k+1,2) && i1 == 4)
-             {
-                 flag = true;
-             }

forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch

@@ -1,51 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java	0000-00-00 00:00:00.000000000 -0000
-@@ -11,7 +11,10 @@
- 
- public class BlockTrapDoor extends Block
- {
--
-+	/* FORGE: Set this to allow trapdoors to remain free-floating
-+	 */
-+	public static boolean disableValidation=false;
-+	
-     protected BlockTrapDoor(int i, Material material)
-     {
-         super(i, material);
-@@ -147,7 +150,7 @@
-         {
-             j1--;
-         }
--        if(!func_41052_f(world.getBlockId(j1, j, k1)))
-+        if(!(func_41052_f(world.getBlockId(j1, j, k1)) || world.isBlockSolidOnSide(j1, j, k1, (i1&3)+2)))
-         {
-             world.setBlockWithNotify(i, j, k, 0);
-             dropBlockAsItem(world, i, j, k, i1, 0);
-@@ -192,6 +195,7 @@
- 
-     public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
-     {
-+        if(disableValidation) return true;
-         if(l == 0)
-         {
-             return false;
-@@ -216,7 +220,7 @@
-         {
-             i--;
-         }
--        return func_41052_f(world.getBlockId(i, j, k));
-+        return func_41052_f(world.getBlockId(i, j, k)) || world.isBlockSolidOnSide(i, j, k, l);
-     }
- 
-     public static boolean isTrapdoorOpen(int i)
-@@ -226,6 +230,10 @@
- 
-     private static boolean func_41052_f(int i)
-     {
-+    	if  (disableValidation)
-+    	{
-+    		return true;
-+    	}
-         if(i <= 0)
-         {
-             return false;

forge/patches/minecraft/net/minecraft/src/Chunk.java.patch

@@ -1,179 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/Chunk.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/Chunk.java	0000-00-00 00:00:00.000000000 -0000
-@@ -3,6 +3,7 @@
- // Decompiler options: packimports(3) braces deadcode fieldsfirst 
- 
- package net.minecraft.src;
-+import net.minecraft.src.forge.*;
- 
- import java.io.PrintStream;
- import java.util.*;
-@@ -390,7 +391,7 @@
-                 TileEntity tileentity = getChunkBlockTileEntity(i, j, k);
-                 if(tileentity == null)
-                 {
--                    tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity();
-+                    tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(i1);
-                     worldObj.setBlockTileEntity(i, j, k, tileentity);
-                 }
-                 if(tileentity != null)
-@@ -398,14 +399,6 @@
-                     tileentity.func_35144_b();
-                 }
-             }
--        } else
--        if(l1 > 0 && (Block.blocksList[l1] instanceof BlockContainer))
--        {
--            TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k);
--            if(tileentity1 != null)
--            {
--                tileentity1.func_35144_b();
--            }
-         }
-         isModified = true;
-         return true;
-@@ -430,7 +423,11 @@
-         blocks[i << worldObj.xShift | k << worldObj.heightShift | j] = (byte)(byte0 & 0xff);
-         if(k1 != 0)
-         {
--            Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2);
-+        	if (!worldObj.multiplayerWorld) 
-+        	{
-+        		Block.blocksList[k1].onBlockRemoval(worldObj, l1, j, i2);
-+        	}
-+        	removeChunkBlockTileEntity(i, j, k);
-         }
-         data.setNibble(i, j, k, 0);
-         if(Block.lightOpacity[byte0 & 0xff] != 0)
-@@ -458,7 +455,7 @@
-                 TileEntity tileentity = getChunkBlockTileEntity(i, j, k);
-                 if(tileentity == null)
-                 {
--                    tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity();
-+                    tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(0);
-                     worldObj.setBlockTileEntity(i, j, k, tileentity);
-                 }
-                 if(tileentity != null)
-@@ -466,14 +463,6 @@
-                     tileentity.func_35144_b();
-                 }
-             }
--        } else
--        if(k1 > 0 && (Block.blocksList[k1] instanceof BlockContainer))
--        {
--            TileEntity tileentity1 = getChunkBlockTileEntity(i, j, k);
--            if(tileentity1 != null)
--            {
--                tileentity1.func_35144_b();
--            }
-         }
-         isModified = true;
-         return true;
-@@ -609,6 +598,11 @@
-     {
-         ChunkPosition chunkposition = new ChunkPosition(i, j, k);
-         TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition);
-+        if(tileentity != null && tileentity.isInvalid())
-+        {
-+            chunkTileEntityMap.remove(chunkposition);
-+            tileentity=null;
-+        }
-         if(tileentity == null)
-         {
-             int l = getBlockID(i, j, k);
-@@ -618,18 +612,23 @@
-             }
-             if(tileentity == null)
-             {
--                tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity();
-+                tileentity = ((BlockContainer)Block.blocksList[l]).getBlockEntity(getBlockMetadata(i,j,k));
-                 worldObj.setBlockTileEntity(xPosition * 16 + i, j, zPosition * 16 + k, tileentity);
-             }
-             tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition);
-         }
--        if(tileentity != null && tileentity.isInvalid())
--        {
--            chunkTileEntityMap.remove(chunkposition);
--            return null;
--        } else
-+        return tileentity;
-+    }
-+
-+    /* FORGE: Used to remove only invalid TileEntities */
-+    public void cleanChunkBlockTileEntity(int i, int j, int k)
-+    {
-+        ChunkPosition chunkposition = new ChunkPosition(i, j, k);
-+        if(isChunkLoaded)
-         {
--            return tileentity;
-+            TileEntity tileentity = (TileEntity)chunkTileEntityMap.get(chunkposition);
-+            if(tileentity != null && tileentity.isInvalid())
-+            	chunkTileEntityMap.remove(chunkposition);
-         }
-     }
- 
-@@ -641,7 +640,7 @@
-         setChunkBlockTileEntity(i, j, k, tileentity);
-         if(isChunkLoaded)
-         {
--            worldObj.loadedTileEntityList.add(tileentity);
-+            worldObj.addTileEntity(tileentity);
-         }
-     }
- 
-@@ -657,6 +656,8 @@
-             return;
-         } else
-         {
-+        	TileEntity old = (TileEntity)chunkTileEntityMap.get(chunkposition);
-+        	if (old != null) old.invalidate();
-             tileentity.validate();
-             chunkTileEntityMap.put(chunkposition, tileentity);
-             return;
-@@ -810,6 +811,15 @@
-     public int setChunkData(byte abyte0[], int i, int j, int k, int l, int i1, int j1, 
-             int k1)
-     {
-+    	TileEntity te;
-+    	Iterator iterator = chunkTileEntityMap.values().iterator();
-+    	while (iterator.hasNext()){
-+    		te = (TileEntity)iterator.next();
-+    		te.func_35144_b();
-+    		te.getBlockMetadata();
-+    		te.getBlockType();
-+    	}
-+    	
-         for(int l1 = i; l1 < l; l1++)
-         {
-             for(int l2 = k; l2 < j1; l2++)
-@@ -859,12 +869,25 @@
- 
-         }
- 
--        TileEntity tileentity;
--        for(Iterator iterator = chunkTileEntityMap.values().iterator(); iterator.hasNext(); tileentity.func_35144_b())
--        {
--            tileentity = (TileEntity)iterator.next();
-+        List<TileEntity> invalidList=new ArrayList();
-+        iterator = chunkTileEntityMap.values().iterator(); 
-+        while(iterator.hasNext()) {
-+            te = (TileEntity)iterator.next();
-+            if ((te.xCoord & 15) >= i && (te.xCoord & 15) <= l &&
-+		        (te.yCoord >= j) && (te.yCoord <= i1) &&
-+		        (te.zCoord & 15) >= k && (te.zCoord & 15) <=j1) {
-+            	
-+			    Block bl = te.getBlockType();
-+			    if (bl != null && 
-+			        bl.blockID == worldObj.getBlockId(te.xCoord, te.yCoord, te.zCoord) &&
-+				    te.getBlockMetadata() == worldObj.getBlockMetadata(te.xCoord, te.yCoord, te.zCoord))
-+				    continue;
-+			    
-+			    invalidList.add(te);
-+            }
-         }
--
-+        for(TileEntity te2 : invalidList)
-+        	te2.invalidate();
-         return k1;
-     }
- 

forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch

@@ -1,33 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/ContainerCreative.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/ContainerCreative.java	0000-00-00 00:00:00.000000000 -0000
-@@ -74,20 +74,23 @@
-             }
-             itemList.add(new ItemStack(ablock[l1], 1, k2));
-         }
-+        
-+        for(int x = 0; x < 256; x++)
-+        {
-+        	if (Block.blocksList[x] != null)
-+        	{
-+        		Block.blocksList[x].addCreativeItems((ArrayList)itemList);
-+        	}
-+        }
- 
-         for(int i2 = 256; i2 < Item.itemsList.length; i2++)
-         {
--            if(Item.itemsList[i2] != null && Item.itemsList[i2].shiftedIndex != Item.potion.shiftedIndex)
-+            if(Item.itemsList[i2] != null)
-             {
--                itemList.add(new ItemStack(Item.itemsList[i2]));
-+            	Item.itemsList[i2].addCreativeItems((ArrayList)itemList);
-             }
-         }
- 
--        for(int j2 = 1; j2 < 16; j2++)
--        {
--            itemList.add(new ItemStack(Item.dyePowder.shiftedIndex, 1, j2));
--        }
--
-         InventoryPlayer inventoryplayer = entityplayer.inventory;
-         for(int l2 = 0; l2 < 9; l2++)
-         {

forge/patches/minecraft/net/minecraft/src/CraftingManager.java.patch

@@ -1,11 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/CraftingManager.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/CraftingManager.java	0000-00-00 00:00:00.000000000 -0000
-@@ -363,7 +363,7 @@
-             i++;
-         }
- 
--        if(i == 2 && itemstack.itemID == itemstack1.itemID && itemstack.stackSize == 1 && itemstack1.stackSize == 1 && Item.itemsList[itemstack.itemID].isDamageable())
-+        if(i == 2 && itemstack.itemID == itemstack1.itemID && itemstack.stackSize == 1 && itemstack1.stackSize == 1 && Item.itemsList[itemstack.itemID].isRepairable())
-         {
-             Item item = Item.itemsList[itemstack.itemID];
-             int l = item.getMaxDamage() - itemstack.getItemDamageForDisplay();

forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch

@@ -1,145 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java	0000-00-00 00:00:00.000000000 -0000
-@@ -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, ActiveRenderInfo, Entity, RenderEngine, 
- //            Tessellator, MathHelper, Block, EntityDiggingFX, 
-@@ -17,11 +20,13 @@
- 
-     protected World worldObj;
-     private List fxLayers[];
-+    private List effectList;
-     private RenderEngine renderer;
-     private Random rand;
- 
-     public EffectRenderer(World world, RenderEngine renderengine)
-     {
-+        effectList = new ArrayList();
-         fxLayers = new List[4];
-         rand = new Random();
-         if(world != null)
-@@ -61,7 +66,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--);
-+        }
-     }
- 
-     public void renderParticles(Entity entity, float f)
-@@ -100,6 +116,7 @@
-             for(int k = 0; k < fxLayers[i].size(); k++)
-             {
-                 EntityFX entityfx = (EntityFX)fxLayers[i].get(k);
-+                if (entityfx instanceof EntityDiggingFX) continue;
-                 tessellator.setBrightness(entityfx.getEntityBrightnessForRender(f));
-                 entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4);
-             }
-@@ -107,6 +124,21 @@
-             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);
-+                tessellator.setBrightness(entityfx.getEntityBrightnessForRender(f));
-+                entityfx.renderParticle(tessellator, f, f1, f5, f2, f3, f4);
-+            }
-+            tessellator.draw();
-+        }
-+
-     }
- 
-     public void func_1187_b(Entity entity, float f)
-@@ -138,7 +170,12 @@
-         {
-             fxLayers[i].clear();
-         }
--
-+        for (int x = 0; x < effectList.size(); x++) {
-+            BlockTextureParticles entry = (BlockTextureParticles) effectList
-+                    .get(x);
-+            entry.effects.clear();
-+        }
-+        effectList.clear();
-     }
- 
-     public void addBlockDestroyEffects(int i, int j, int k, int l, int i1)
-@@ -159,7 +196,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);
-                 }
- 
-             }
-@@ -204,11 +246,39 @@
-         {
-             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).multiplyVelocity(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.multiplyVelocity(0.4F);
-+        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 = "/terrain.png";
-+
-+        if (block instanceof ITextureProvider) {
-+            comp = ((ITextureProvider) block).getTextureFile();
-+        }
-+        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);
-+    }
- }

forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch

@@ -1,13 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java	0000-00-00 00:00:00.000000000 -0000
-@@ -794,7 +794,9 @@
-         int i = MathHelper.floor_double(posX);
-         int j = MathHelper.floor_double(boundingBox.minY);
-         int k = MathHelper.floor_double(posZ);
--        return worldObj.getBlockId(i, j, k) == Block.ladder.blockID;
-+	Block block=Block.blocksList[worldObj.getBlockId(i,j,k)];
-+	if(block==null) return false;
-+	return block.isLadder();
-     }
- 
-     public void writeEntityToNBT(NBTTagCompound nbttagcompound)

forge/patches/minecraft/net/minecraft/src/EntityPigZombie.java.patch

@@ -1,11 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/EntityPigZombie.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/EntityPigZombie.java	0000-00-00 00:00:00.000000000 -0000
-@@ -94,7 +94,7 @@
-         return super.attackEntityFrom(damagesource, i);
-     }
- 
--    private void becomeAngryAt(Entity entity)
-+    public void becomeAngryAt(Entity entity)
-     {
-         entityToAttack = entity;
-         angerLevel = 400 + rand.nextInt(400);

forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch

@@ -1,115 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java	0000-00-00 00:00:00.000000000 -0000
-@@ -4,6 +4,10 @@
- 
- package net.minecraft.src;
- 
-+import net.minecraft.src.forge.ArmorProperties;
-+import net.minecraft.src.forge.ISpecialArmor;
-+import net.minecraft.src.forge.ForgeHooks;
-+
- import java.util.*;
- 
- // Referenced classes of package net.minecraft.src:
-@@ -548,6 +552,8 @@
-         worldObj.entityJoinedWorld(entityitem);
-     }
- 
-+    /* FORGE: This isnt called anymore
-+     */
-     public float getCurrentPlayerStrVsBlock(Block block)
-     {
-         float f = inventory.getStrVsBlock(block);
-@@ -576,6 +582,45 @@
-         return f1;
-     }
- 
-+    /* FORGE: Extended to allow metadata.
-+     */
-+    public float getCurrentPlayerStrVsBlock(Block block, int md)
-+    {
-+        float f = 1.0F;
-+        ItemStack ist = inventory.getCurrentItem();
-+        if(ist != null)
-+        {
-+        	f = ist.getItem().getStrVsBlock(ist, block, md);
-+        }
-+        
-+        int i = EnchantmentHelper.getEfficiencyModifier(inventory);
-+        if (i > 0 && ForgeHooks.canHarvestBlock(block, this, md))
-+        {
-+        	f += i * i + 1;
-+        }
-+        
-+        if(isPotionActive(Potion.digSpeed))
-+        {
-+            f *= 1.0F + (float)(getActivePotionEffect(Potion.digSpeed).getAmplifier() + 1) * 0.2F;
-+        }
-+        
-+        if(isPotionActive(Potion.digSlowdown))
-+        {
-+            f *= 1.0F - (float)(getActivePotionEffect(Potion.digSlowdown).getAmplifier() + 1) * 0.2F;
-+        }
-+        
-+        if(isInsideOfMaterial(Material.water) && !EnchantmentHelper.getAquaAffinityModifier(inventory))
-+        {
-+            f /= 5F;
-+        }
-+        
-+        if(!onGround)
-+        {
-+            f /= 5F;
-+        }
-+        return f;
-+    }
-+
-     public boolean canHarvestBlock(Block block)
-     {
-         return inventory.canHarvestBlock(block);
-@@ -774,6 +819,25 @@
- 
-     protected void damageEntity(DamageSource damagesource, int i)
-     {
-+    	boolean doRegularComputation = true;
-+        int initialDamage = i;
-+        
-+        for (ItemStack stack : inventory.armorInventory) {
-+            if (stack != null && stack.getItem() instanceof ISpecialArmor) {
-+                ISpecialArmor armor = (ISpecialArmor) stack.getItem();
-+                
-+                ArmorProperties props = armor.getProperties(this, initialDamage, i);                            
-+                i = i - props.damageRemove;
-+                doRegularComputation = doRegularComputation
-+                        && props.allowRegularComputation;
-+            }
-+        }
-+        
-+        if (!doRegularComputation) {
-+            super.damageEntity(damagesource, i);
-+            return;
-+        }
-+    	
-         if(!damagesource.unblockable() && func_35162_ad())
-         {
-             i = 1 + i >> 1;
-@@ -825,7 +889,9 @@
- 
-     public void destroyCurrentEquippedItem()
-     {
-+	ItemStack orig=inventory.getCurrentItem();
-         inventory.setInventorySlotContents(inventory.currentItem, null);
-+	ForgeHooks.onDestroyCurrentItem(this,orig);
-     }
- 
-     public double getYOffset()
-@@ -957,6 +1023,10 @@
- 
-     public EnumStatus sleepInBedAt(int i, int j, int k)
-     {
-+	EnumStatus customSleep = ForgeHooks.sleepInBedAt(this, i, j, k);
-+	if (customSleep != null) {
-+	    return customSleep;
-+	}
-         if(!worldObj.multiplayerWorld)
-         {
-             if(isPlayerSleeping() || !isEntityAlive())

forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch

@@ -1,36 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java	0000-00-00 00:00:00.000000000 -0000
-@@ -4,6 +4,7 @@
- 
- package net.minecraft.src;
- 
-+import net.minecraft.src.forge.ForgeHooksClient;
- import java.awt.image.BufferedImage;
- import java.nio.FloatBuffer;
- import java.util.Random;
-@@ -916,8 +917,10 @@
-                     EntityPlayer entityplayer = (EntityPlayer)entityliving;
-                     GL11.glDisable(3008 /*GL_ALPHA_TEST*/);
-                     Profiler.endStartSection("outline");
--                    renderglobal.drawBlockBreaking(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f);
--                    renderglobal.drawSelectionBox(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f);
-+                    if (!ForgeHooksClient.onBlockHighlight(renderglobal, entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f)) {
-+	                    renderglobal.drawBlockBreaking(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f);
-+	                    renderglobal.drawSelectionBox(entityplayer, mc.objectMouseOver, 0, entityplayer.inventory.getCurrentItem(), f);
-+                    }
-                     GL11.glEnable(3008 /*GL_ALPHA_TEST*/);
-                 }
-             }
-@@ -969,8 +972,10 @@
-                 EntityPlayer entityplayer1 = (EntityPlayer)entityliving;
-                 GL11.glDisable(3008 /*GL_ALPHA_TEST*/);
-                 Profiler.endStartSection("outline");
--                renderglobal.drawBlockBreaking(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f);
--                renderglobal.drawSelectionBox(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f);
-+                if (!ForgeHooksClient.onBlockHighlight(renderglobal, entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f)) {
-+	                renderglobal.drawBlockBreaking(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f);
-+	                renderglobal.drawSelectionBox(entityplayer1, mc.objectMouseOver, 0, entityplayer1.inventory.getCurrentItem(), f);
-+                }
-                 GL11.glEnable(3008 /*GL_ALPHA_TEST*/);
-             }
-             Profiler.endStartSection("weather");

forge/patches/minecraft/net/minecraft/src/Explosion.java.patch

@@ -1,26 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/Explosion.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/Explosion.java	0000-00-00 00:00:00.000000000 -0000
-@@ -5,6 +5,7 @@
- package net.minecraft.src;
- 
- import java.util.*;
-+import net.minecraft.src.forge.ISpecialResistance;
- 
- // Referenced classes of package net.minecraft.src:
- //            World, MathHelper, Block, ChunkPosition, 
-@@ -76,7 +77,14 @@
-                         int k3 = worldObj.getBlockId(l2, i3, j3);
-                         if(k3 > 0)
-                         {
--                            f1 -= (Block.blocksList[k3].getExplosionResistance(exploder) + 0.3F) * f2;
-+                            if (Block.blocksList[k3] instanceof ISpecialResistance){
-+                            	ISpecialResistance isr = (ISpecialResistance)Block.blocksList[k3];
-+                            	f1 -= (isr.getSpecialExplosionResistance(worldObj, l2, i3, j3, 
-+                            			explosionX, explosionY, explosionZ, exploder) + 0.3F) * f2;
-+                            } else {
-+                                f1 -= (Block.blocksList[k3].getExplosionResistance(exploder) + 0.3F) * f2;
-+                            }
-+                            
-                         }
-                         if(f1 > 0.0F)
-                         {

forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch

@@ -1,59 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java	0000-00-00 00:00:00.000000000 -0000
-@@ -6,6 +6,7 @@
- 
- import java.util.HashMap;
- import java.util.Map;
-+import java.util.Arrays;
- 
- // Referenced classes of package net.minecraft.src:
- //            Block, ItemStack, Item
-@@ -15,6 +16,7 @@
- 
-     private static final FurnaceRecipes smeltingBase = new FurnaceRecipes();
-     private Map smeltingList;
-+    private Map metaSmeltingList;
- 
-     public static final FurnaceRecipes smelting()
-     {
-@@ -24,6 +26,7 @@
-     private FurnaceRecipes()
-     {
-         smeltingList = new HashMap();
-+        metaSmeltingList = new HashMap();
-         addSmelting(Block.oreIron.blockID, new ItemStack(Item.ingotIron));
-         addSmelting(Block.oreGold.blockID, new ItemStack(Item.ingotGold));
-         addSmelting(Block.oreDiamond.blockID, new ItemStack(Item.diamond));
-@@ -46,11 +49,32 @@
-         smeltingList.put(Integer.valueOf(i), itemstack);
-     }
- 
-+    /* FORGE: Add a metadata-sensitive furnace recipe.
-+     */
-+    public void addSmelting(int i, int meta, ItemStack itemstack)
-+    {
-+        metaSmeltingList.put(Arrays.asList(i,meta), itemstack);
-+    }
-+
-+    /* FORGE: Not used anymore.
-+     */
-     public ItemStack getSmeltingResult(int i)
-     {
-         return (ItemStack)smeltingList.get(Integer.valueOf(i));
-     }
- 
-+    /* FORGE: Added to allow metadata-sensitive smelting.
-+     */
-+    public ItemStack getSmeltingResult(ItemStack src) {
-+	    ItemStack tr;
-+
-+	    if(src==null) return null;
-+	    tr=(ItemStack)metaSmeltingList.get(
-+		Arrays.asList(src.itemID,src.getItemDamage()));
-+	    if(tr!=null) return tr;
-+	    return (ItemStack)smeltingList.get(Integer.valueOf(src.itemID));
-+    }
-+
-     public Map getSmeltingList()
-     {
-         return smeltingList;

forge/patches/minecraft/net/minecraft/src/Item.java.patch

@@ -1,83 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/Item.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/Item.java	0000-00-00 00:00:00.000000000 -0000
-@@ -5,6 +5,7 @@
- package net.minecraft.src;
- 
- import java.io.PrintStream;
-+import java.util.ArrayList;
- import java.util.List;
- import java.util.Random;
- 
-@@ -177,6 +178,9 @@
-     private String field_39010_c;
-     private String itemName;
- 
-+    // FORGE: To disable repair recipes.
-+    protected boolean canRepair=true;
-+
-     protected Item(int i)
-     {
-         maxStackSize = 64;
-@@ -231,6 +235,13 @@
-         return 1.0F;
-     }
- 
-+    /* FORGE: Metadata-sensitive version of getStrVsBlock
-+     */
-+    public float getStrVsBlock(ItemStack itemstack, Block block, int md)
-+    {
-+	    return getStrVsBlock(itemstack,block);
-+    }
-+
-     public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer)
-     {
-         return itemstack;
-@@ -278,6 +289,29 @@
-         return maxDamage > 0 && !hasSubtypes;
-     }
- 
-+    /* FORGE: Called by CraftingManager to determine if an item is repairable.
-+     */
-+    public boolean isRepairable() {
-+	    return canRepair && isDamageable();
-+    }
-+
-+    /* FORGE: Call to disable repair recipes.
-+     */
-+    public Item setNoRepair() {
-+	    canRepair=false;
-+	    return this;
-+    }
-+
-+    /* FORGE: Called before a block is broken.  Return true to prevent default
-+     * block harvesting.
-+     *
-+     * Note: In SMP, this is called on both client and server sides!
-+     */
-+    public boolean onBlockStartBreak(ItemStack itemstack, int i, int j, int k,
-+		    EntityPlayer player) {
-+	    return false;
-+    }
-+
-     public boolean hitEntity(ItemStack itemstack, EntityLiving entityliving, EntityLiving entityliving1)
-     {
-         return false;
-@@ -473,6 +507,18 @@
-     {
-         return 0;
-     }
-+    
-+    /* FORGE: Called when a new CreativeContainer is opened, populate the list 
-+     * with all of the items for this item you want a player in creative mode
-+     * to have access to.
-+     */
-+    public void addCreativeItems(ArrayList itemList)
-+    {    	
-+    	if (this.shiftedIndex != Item.potion.shiftedIndex)
-+    	{
-+			itemList.add(new ItemStack(this, 1));
-+    	}
-+    }
- 
-     static 
-     {

forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch

@@ -1,23 +0,0 @@
---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java	0000-00-00 00:00:00.000000000 -0000
-+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java	0000-00-00 00:00:00.000000000 -0000
-@@ -6,6 +6,8 @@
- 
- import java.util.Random;
- 
-+import net.minecraft.src.forge.MinecraftForge;
-+
- // Referenced classes of package net.minecraft.src:
- //            Item, EntityPlayer, MovingObjectPosition, EnumMovingObjectType, 
- //            World, Material, PlayerCapabilities, ItemStack, 
-@@ -50,6 +52,11 @@
-                 {
-                     return itemstack;
-                 }
-+                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);