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

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;
-}

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@.

bin/grep.exe

@@ -1 +0,0 @@
-asdfsnb  -a -v "svn"+

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

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())
+            }
+        }
+    }
+}

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
-
-

client

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

common

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

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/client.exc

@@ -1,228 +0,0 @@
-net/minecraft/client/Minecraft.func_6257_q()V=org/lwjgl/LWJGLException
-net/minecraft/client/Minecraft.func_6271_a()V=org/lwjgl/LWJGLException
-net/minecraft/src/ChunkLoader.func_812_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
-net/minecraft/src/ChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
-net/minecraft/src/ChunkLoader.func_815_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
-net/minecraft/src/CompressedStreamTools.func_1138_a(Ljava/io/InputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
-net/minecraft/src/CompressedStreamTools.func_1139_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/CompressedStreamTools.func_1141_a(Ljava/io/DataInput;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
-net/minecraft/src/CompressedStreamTools.func_1143_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/OutputStream;)V=java/io/IOException
-net/minecraft/src/CompressedStreamTools.func_35620_b(Lnet/minecraft/src/NBTTagCompound;Ljava/io/File;)V=java/io/IOException
-net/minecraft/src/CompressedStreamTools.func_35621_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/File;)V=java/io/IOException
-net/minecraft/src/CompressedStreamTools.func_35622_a(Ljava/io/File;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
-net/minecraft/src/CompressedStreamTools.func_40591_a(Lnet/minecraft/src/NBTTagCompound;)[B=java/io/IOException
-net/minecraft/src/CompressedStreamTools.func_40592_a([B)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
-net/minecraft/src/DataWatcher.func_21125_a(Ljava/util/List;Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/DataWatcher.func_21127_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/DataWatcher.func_21128_a(Ljava/io/DataOutputStream;Lnet/minecraft/src/WatchableObject;)V=java/io/IOException
-net/minecraft/src/DataWatcher.func_21131_a(Ljava/io/DataInputStream;)Ljava/util/List;=java/io/IOException
-net/minecraft/src/GuiMultiplayer.func_35328_b(Lnet/minecraft/src/ServerNBTStorage;)V=java/io/IOException
-net/minecraft/src/GuiMultiplayer.func_35336_a(Lnet/minecraft/src/GuiMultiplayer;Lnet/minecraft/src/ServerNBTStorage;)V=java/io/IOException
-net/minecraft/src/IChunkLoader.func_812_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
-net/minecraft/src/IChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
-net/minecraft/src/IChunkLoader.func_815_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
-net/minecraft/src/J_CompactJsonFormatter.func_27328_a(Lnet/minecraft/src/J_JsonNode;Ljava/io/Writer;)V=java/io/IOException
-net/minecraft/src/J_CompactJsonFormatter.func_27329_a(Lnet/minecraft/src/J_JsonRootNode;Ljava/io/Writer;)V=java/io/IOException
-net/minecraft/src/J_JdomParser.func_27366_a(Ljava/io/Reader;)Lnet/minecraft/src/J_JsonRootNode;=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
-net/minecraft/src/J_JdomParser.func_27367_a(Ljava/lang/String;)Lnet/minecraft/src/J_JsonRootNode;=net/minecraft/src/J_InvalidSyntaxException
-net/minecraft/src/J_PositionTrackingPushbackReader.func_27333_c()I=java/io/IOException
-net/minecraft/src/J_PositionTrackingPushbackReader.func_27334_a(C)V=java/io/IOException
-net/minecraft/src/J_PositionTrackingPushbackReader.func_27336_b([C)I=java/io/IOException
-net/minecraft/src/J_SajParser.func_27448_l(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)I=java/io/IOException
-net/minecraft/src/J_SajParser.func_27449_c(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
-net/minecraft/src/J_SajParser.func_27450_k(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)I=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
-net/minecraft/src/J_SajParser.func_27451_b(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
-net/minecraft/src/J_SajParser.func_27452_i(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
-net/minecraft/src/J_SajParser.func_27453_b(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
-net/minecraft/src/J_SajParser.func_27454_g(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
-net/minecraft/src/J_SajParser.func_27455_a(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
-net/minecraft/src/J_SajParser.func_27456_e(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException
-net/minecraft/src/J_SajParser.func_27457_j(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)C=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
-net/minecraft/src/J_SajParser.func_27458_d(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)C=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
-net/minecraft/src/J_SajParser.func_27459_a(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
-net/minecraft/src/J_SajParser.func_27460_c(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)C=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
-net/minecraft/src/J_SajParser.func_27461_h(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException
-net/minecraft/src/J_SajParser.func_27462_f(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
-net/minecraft/src/J_SajParser.func_27463_a(Ljava/io/Reader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
-net/minecraft/src/J_SajParser.func_27464_d(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
-net/minecraft/src/NBTBase.func_734_b(Ljava/io/DataInput;)Lnet/minecraft/src/NBTBase;=java/io/IOException
-net/minecraft/src/NBTBase.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTBase.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTBase.func_738_a(Lnet/minecraft/src/NBTBase;Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagByte.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagByte.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagByteArray.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagByteArray.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagCompound.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagCompound.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagDouble.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagDouble.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagEnd.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagEnd.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagFloat.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagFloat.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagInt.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagInt.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagList.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagList.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagLong.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagLong.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagShort.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagShort.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagString.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagString.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NetClientHandler.<init>(Lnet/minecraft/client/Minecraft;Ljava/lang/String;I)V=java/net/UnknownHostException,java/io/IOException
-net/minecraft/src/NetworkManager.<init>(Ljava/net/Socket;Ljava/lang/String;Lnet/minecraft/src/NetHandler;)V=java/io/IOException
-net/minecraft/src/Packet.func_27048_a(Ljava/io/DataInputStream;I)Ljava/lang/String;=java/io/IOException
-net/minecraft/src/Packet.func_27049_a(Ljava/lang/String;Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet.func_324_b(Ljava/io/DataInputStream;Z)Lnet/minecraft/src/Packet;=java/io/IOException
-net/minecraft/src/Packet.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet.func_328_a(Lnet/minecraft/src/Packet;Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet.func_40186_c(Ljava/io/DataInputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
-net/minecraft/src/Packet.func_40187_b(Ljava/io/DataInputStream;)Lnet/minecraft/src/ItemStack;=java/io/IOException
-net/minecraft/src/Packet.func_40188_a(Lnet/minecraft/src/ItemStack;Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet.func_40189_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet0KeepAlive.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet0KeepAlive.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet100OpenWindow.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet100OpenWindow.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet101CloseWindow.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet101CloseWindow.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet102WindowClick.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet102WindowClick.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet103SetSlot.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet103SetSlot.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet104WindowItems.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet104WindowItems.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet105UpdateProgressbar.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet105UpdateProgressbar.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet106Transaction.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet106Transaction.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet107CreativeSetSlot.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet107CreativeSetSlot.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet108EnchantItem.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet108EnchantItem.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet10Flying.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet10Flying.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet11PlayerPosition.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet11PlayerPosition.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet12PlayerLook.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet12PlayerLook.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet130UpdateSign.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet130UpdateSign.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet131MapData.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet131MapData.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet13PlayerLookMove.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet13PlayerLookMove.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet14BlockDig.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet14BlockDig.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet15Place.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet15Place.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet16BlockItemSwitch.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet16BlockItemSwitch.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet17Sleep.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet17Sleep.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet18Animation.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet18Animation.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet19EntityAction.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet19EntityAction.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet1Login.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet1Login.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet200Statistic.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet200Statistic.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet201PlayerInfo.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet201PlayerInfo.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet20NamedEntitySpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet20NamedEntitySpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet21PickupSpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet21PickupSpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet22Collect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet22Collect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet23VehicleSpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet23VehicleSpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet24MobSpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet24MobSpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet254ServerPing.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet254ServerPing.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet255KickDisconnect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet255KickDisconnect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet25EntityPainting.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet25EntityPainting.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet26EntityExpOrb.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet26EntityExpOrb.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet27Position.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet27Position.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet28EntityVelocity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet28EntityVelocity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet29DestroyEntity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet29DestroyEntity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet2Handshake.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet2Handshake.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet30Entity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet30Entity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet31RelEntityMove.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet31RelEntityMove.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet32EntityLook.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet32EntityLook.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet33RelEntityMoveLook.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet33RelEntityMoveLook.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet34EntityTeleport.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet34EntityTeleport.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet38EntityStatus.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet38EntityStatus.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet39AttachEntity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet39AttachEntity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet3Chat.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet3Chat.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet40EntityMetadata.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet40EntityMetadata.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet41EntityEffect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet41EntityEffect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet42RemoveEntityEffect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet42RemoveEntityEffect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet43Experience.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet43Experience.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet4UpdateTime.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet4UpdateTime.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet50PreChunk.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet50PreChunk.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet51MapChunk.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet51MapChunk.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet52MultiBlockChange.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet52MultiBlockChange.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet53BlockChange.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet53BlockChange.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet54PlayNoteBlock.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet54PlayNoteBlock.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet5PlayerInventory.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet5PlayerInventory.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet60Explosion.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet60Explosion.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet61DoorChange.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet61DoorChange.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet6SpawnPosition.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet6SpawnPosition.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet70Bed.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet70Bed.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet71Weather.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet71Weather.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet7UseEntity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet7UseEntity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet8UpdateHealth.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet8UpdateHealth.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet9Respawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet9Respawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/RegionFile.func_22196_b()V=java/io/IOException
-net/minecraft/src/RegionFile.func_22198_a(III)V=java/io/IOException
-net/minecraft/src/RegionFile.func_22200_a(I[BI)V=java/io/IOException
-net/minecraft/src/RegionFile.func_22208_b(III)V=java/io/IOException
-net/minecraft/src/RenderEngine.func_6526_a(Ljava/io/InputStream;)Ljava/awt/image/BufferedImage;=java/io/IOException
-net/minecraft/src/StatsSyncher.func_27410_a(Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V=java/io/IOException
-net/minecraft/src/StatsSyncher.func_27412_a(Lnet/minecraft/src/StatsSyncher;Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V=java/io/IOException
-net/minecraft/src/TexturePackBase.func_6485_a(Lnet/minecraft/client/Minecraft;)V=java/io/IOException
-net/minecraft/src/TexturePackCustom.func_6485_a(Lnet/minecraft/client/Minecraft;)V=java/io/IOException
-net/minecraft/src/ThreadDownloadResources.func_1212_a(Ljava/net/URL;Ljava/io/File;J)V=java/io/IOException
-net/minecraft/src/ThreadedChunkLoader.func_40551_a(Lnet/minecraft/src/ThreadedChunkLoaderPending;)V=java/io/IOException
-net/minecraft/src/ThreadedChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
-net/minecraft/src/ThreadedFileIOBase.func_40566_a()V=java/lang/InterruptedException

conf/mcp.cfg

@@ -8,23 +8,38 @@ DirReobf   = reobf
 DirConf    = conf
 DirRuntime = runtime
 DirLib     = lib
-DirFFOut   = temp/ffout
+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]
-Client  = %(DirTemp)s/client_rg.srg
-Server  = %(DirTemp)s/server_rg.srg
+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
-MD5Client  = 3820d222b95d0b8c520d9596a756a6e6
-MD5Server  = 934b6010999daa1f1b1ccdf4cb77e052
+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
@@ -40,34 +55,32 @@ 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/client.exc
-XServerCfg      = %(DirConf)s/server.exc
+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]
-FFClientConf  = -rbr=0 -dgs=1 -asc=1
-FFServerConf  = -rbr=0 -dgs=1 -asc=1
-FFClientOut   = %(DirFFOut)s/client
-FFServerOut   = %(DirFFOut)s/server
-FFClientSrc   = %(DirFFOut)s/minecraft_exc.jar
-FFServerSrc   = %(DirFFOut)s/minecraft_server_exc.jar
+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]
-BinOut     = %(DirTemp)s/bin
-BinClient  = %(DirTemp)s/bin/minecraft
-BinServer  = %(DirTemp)s/bin/minecraft_server
+BinClientTemp = %(DirTempBin)s/minecraft
+BinServerTemp = %(DirTempBin)s/minecraft_server
 SrcClient  = %(DirSrc)s/minecraft
 SrcServer  = %(DirSrc)s/minecraft_server
-
-[PACKAGES]
-PkgClient  = net/minecraft/src,net/minecraft/client
-PkgServer  = net/minecraft/src,net/minecraft/server
+TestClient = net/minecraft/client/main/Main
+TestServer = net/minecraft/server/MinecraftServer
 
 [PATCHES]
 PatchClient   = %(DirConf)s/patches/minecraft.patch
@@ -75,65 +88,76 @@ 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
-ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
-ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
+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]
-SAFFXClient       = %(DirTemp)s/minecraft.saffx
-SAFFXServer       = %(DirTemp)s/minecraft_server.saffx
 MD5Client         = %(DirTemp)s/client.md5
 MD5Server         = %(DirTemp)s/server.md5
 MD5PreReobfClient = %(DirTemp)s/client_reobf.md5
 MD5PreReobfServer = %(DirTemp)s/server_reobf.md5
-ObfSRGClient      = %(DirTemp)s/client_ro.srg
-ObfSRGServer      = %(DirTemp)s/server_ro.srg
 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
-FixSound          = minecraft/me.class
-FixStart          = minecraft/Start.class
-NullPkg           = net/minecraft/src
-IgnorePkg         = paulscode,com/jcraft,isom,ibxm,de/matthiasmann/twl,org/xmlpull,javax/xml
 
 [GETMODSOURCE]
-OutSRCClient	= modsrc/client
-OutSRCServer	= modsrc/server
-OutSRC			= modsrc
+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]
-Patcher       = %(DirRuntime)s/bin/applydiff.exe
+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
-Jadwin        = %(DirRuntime)s/bin/jad.exe
-Jadlinux      = %(DirRuntime)s/bin/jad.exe
-Jadosx        = %(DirRuntime)s/bin/jad-osx
-Exceptor      = %(DirRuntime)s/bin/exceptor.jar
-CmdRG         = %s -cp {classpath} RetroGuard -searge {conffile}
-CmdRGReobf    = %s -cp {classpath} RetroGuard -notch  {conffile}
-CmdJadretro   = %s -jar {jarjr} {targetdir}
-CmdRecompClt  = %s -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs} {fixes}/*.java
-CmdRecompSrv  = %s -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
-CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer
-CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start
-CmdJadwin     = .\{binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff {classes}
-CmdJadlinux   = wine {binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff "{classes}"
-CmdJadosx     = {binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff {classes}
-CmdPatchwin   = .\%(Patcher)s --binary -p1 -u -i ..\..\{patchfile} -d {srcdir}
-CmdPatchlinux = patch --binary -p1 -u -i ../../{patchfile} -d {srcdir}
-CmdPatchosx   = patch --binary -p1 -u -i ../../{patchfile} -d {srcdir}
-CmdFernflower = %s -jar {jarff} {conf} {jarin} {jarout}
-CmdExceptor   = %s -jar {jarexc} {input} {output} {conf} {log}
+Exceptor      = %(DirRuntime)s/bin/mcinjector.jar
+SpecialSource = %(DirRuntime)s/bin/specialsource.jar
+CmdPatch      = %s -p1 -u -i {patchfile} -d {srcdir}
+CmdJad        = %s -b -d {outdir} -dead -o -r -s .java -stat -ff {classes}
+CmdAStyle     = %s --suffix=none --quiet --options={conffile} {classes}
+CmdRG         = %s -cp "{classpath}" RetroGuard -searge {conffile}
+CmdRGReobf    = %s -cp "{classpath}" RetroGuard -notch {conffile}
+CmdSS         = %s -cp "{classpath}" -jar %s -i {injar} -o {outjar} -m {mapfile} --kill-source
+CmdSSReobf    = %s -cp "{classpath}" -jar %s -i {injar} -o {outjar} -r -m {mapfile} -d {identifier} -e %s
+CmdJadretro   = %s -jar %s {targetdir}
+CmdFernflower = %s -Xmx512M -jar %s -din=0 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
+CmdExceptor   = %s -jar %s {input} {output} {conf} {log}
+CmdRecomp     = %s -encoding UTF-8 -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
+CmdRecompScala = %s -encoding UTF-8 -deprecation -target:jvm-1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
+CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" cpw.mods.fml.relauncher.ServerLaunchWrapper {extraargs}
+CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} net.minecraft.launchwrapper.Launch --tweakClass cpw.mods.fml.common.launcher.FMLTweaker --version FML_DEV {extraargs}

conf/patches/Start.java

@@ -1,27 +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)
-	{
-		try
-		{
-			// set new minecraft data folder to prevent it from using the .minecraft folder
-			// this makes it a portable version
-			Field f = Minecraft.class.getDeclaredField("minecraftDir");
-			Field.setAccessible(new Field[] { f }, true);
-			f.set(null, new File("."));
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-			return;
-		}
+    public static void main(String[] args) throws Exception
+    {
+        int userIndex = -1;
+        int passIndex = -1;
+        int sessIndex = -1;
+        int versIndex = -1;
 
-		// start minecraft game application
-		Minecraft.main(args);
-	}
-}
+        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/me.java

@@ -1,10 +0,0 @@
-// this is needed for the sound engine to work with deobfuscated sourcecode without crashing
-
-public class me
-{
-    public static int c(double d)
-    {
-        int i = (int)d;
-        return d >= (double)i ? i : i - 1;
-    }
-}

conf/patches/minecraft_ff.patch

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

conf/patches/minecraft_server_ff.patch

@@ -1,26 +1,155 @@
-diff -r -U 3 minecraft_server\net\minecraft\src\ItemMap.java minecraft_server_patched\net\minecraft\src\ItemMap.java
---- minecraft_server\net\minecraft\src\ItemMap.java	Tue Nov 22 23:21:56 2011
-+++ minecraft_server_patched\net\minecraft\src\ItemMap.java	Wed Nov 23 00:09:45 2011
-@@ -22,7 +22,6 @@
-    }
- 
-    public MapData func_28023_a(ItemStack var1, World var2) {
--      "map_" + var1.func_21125_h();
-       MapData var4 = (MapData)var2.func_28103_a(MapData.class, "map_" + var1.func_21125_h());
-       if(var4 == null) {
-          var1.func_28145_b(var2.func_28104_b("map"));
-diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_server_patched\net\minecraft\src\RConThreadClient.java
-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 Nov 22 23:22:10 2011
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Wed Nov 23 00:09:45 2011
-@@ -21,7 +21,9 @@
-    }
- 
-    public void run() {
--      this.func_40509_b();
-+      while (true) {
-+         this.func_40509_b();
-+      }
-    }
- 
-    private void func_40509_b() {
+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/patches/splashes.txt

@@ -1 +0,0 @@
-Now it is YOURCRAFT!

conf/server.exc

@@ -1,202 +0,0 @@
-net/minecraft/server/MinecraftServer.func_6008_d()Z=java/net/UnknownHostException
-net/minecraft/src/ChunkLoader.func_4104_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
-net/minecraft/src/ChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
-net/minecraft/src/ChunkLoader.func_662_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
-net/minecraft/src/CompressedStreamTools.func_40515_a([B)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
-net/minecraft/src/CompressedStreamTools.func_40516_a(Lnet/minecraft/src/NBTTagCompound;)[B=java/io/IOException
-net/minecraft/src/CompressedStreamTools.func_769_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/OutputStream;)V=java/io/IOException
-net/minecraft/src/CompressedStreamTools.func_770_a(Ljava/io/InputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
-net/minecraft/src/CompressedStreamTools.func_771_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/CompressedStreamTools.func_774_a(Ljava/io/DataInput;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
-net/minecraft/src/DataWatcher.func_21149_a(Ljava/io/DataInputStream;)Ljava/util/List;=java/io/IOException
-net/minecraft/src/DataWatcher.func_21151_a(Ljava/util/List;Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/DataWatcher.func_21152_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/DataWatcher.func_21154_a(Ljava/io/DataOutputStream;Lnet/minecraft/src/WatchableObject;)V=java/io/IOException
-net/minecraft/src/IChunkLoader.func_4104_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
-net/minecraft/src/IChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
-net/minecraft/src/IChunkLoader.func_662_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
-net/minecraft/src/NBTBase.func_380_a(Lnet/minecraft/src/NBTBase;Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTBase.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTBase.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTBase.func_383_b(Ljava/io/DataInput;)Lnet/minecraft/src/NBTBase;=java/io/IOException
-net/minecraft/src/NBTTagByte.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagByte.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagByteArray.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagByteArray.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagCompound.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagCompound.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagDouble.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagDouble.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagEnd.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagEnd.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagFloat.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagFloat.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagInt.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagInt.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagList.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagList.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagLong.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagLong.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagShort.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagShort.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NBTTagString.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
-net/minecraft/src/NBTTagString.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
-net/minecraft/src/NetLoginHandler.<init>(Lnet/minecraft/server/MinecraftServer;Ljava/net/Socket;Ljava/lang/String;)V=java/io/IOException
-net/minecraft/src/NetworkListenThread.<init>(Lnet/minecraft/server/MinecraftServer;Ljava/net/InetAddress;I)V=java/io/IOException
-net/minecraft/src/NetworkManager.<init>(Ljava/net/Socket;Ljava/lang/String;Lnet/minecraft/src/NetHandler;)V=java/io/IOException
-net/minecraft/src/Packet.func_27037_a(Ljava/io/DataInputStream;I)Ljava/lang/String;=java/io/IOException
-net/minecraft/src/Packet.func_27038_a(Ljava/lang/String;Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet.func_40259_c(Ljava/io/DataInputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
-net/minecraft/src/Packet.func_40260_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet.func_40261_a(Lnet/minecraft/src/ItemStack;Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet.func_40262_b(Ljava/io/DataInputStream;)Lnet/minecraft/src/ItemStack;=java/io/IOException
-net/minecraft/src/Packet.func_65_b(Ljava/io/DataInputStream;Z)Lnet/minecraft/src/Packet;=java/io/IOException
-net/minecraft/src/Packet.func_66_a(Lnet/minecraft/src/Packet;Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet0KeepAlive.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet0KeepAlive.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet100OpenWindow.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet100OpenWindow.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet101CloseWindow.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet101CloseWindow.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet102WindowClick.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet102WindowClick.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet103SetSlot.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet103SetSlot.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet104WindowItems.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet104WindowItems.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet105UpdateProgressbar.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet105UpdateProgressbar.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet106Transaction.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet106Transaction.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet107CreativeSetSlot.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet107CreativeSetSlot.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet108EnchantItem.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet108EnchantItem.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet10Flying.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet10Flying.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet11PlayerPosition.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet11PlayerPosition.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet12PlayerLook.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet12PlayerLook.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet130UpdateSign.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet130UpdateSign.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet131MapData.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet131MapData.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet13PlayerLookMove.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet13PlayerLookMove.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet14BlockDig.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet14BlockDig.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet15Place.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet15Place.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet16BlockItemSwitch.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet16BlockItemSwitch.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet17Sleep.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet17Sleep.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet18Animation.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet18Animation.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet19EntityAction.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet19EntityAction.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet1Login.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet1Login.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet200Statistic.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet200Statistic.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet201PlayerInfo.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet201PlayerInfo.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet20NamedEntitySpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet20NamedEntitySpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet21PickupSpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet21PickupSpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet22Collect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet22Collect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet23VehicleSpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet23VehicleSpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet24MobSpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet24MobSpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet255KickDisconnect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet255KickDisconnect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet25EntityPainting.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet25EntityPainting.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet26EntityExpOrb.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet26EntityExpOrb.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet27Position.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet27Position.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet28EntityVelocity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet28EntityVelocity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet29DestroyEntity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet29DestroyEntity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet2Handshake.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet2Handshake.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet30Entity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet30Entity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet31RelEntityMove.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet31RelEntityMove.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet32EntityLook.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet32EntityLook.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet33RelEntityMoveLook.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet33RelEntityMoveLook.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet34EntityTeleport.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet34EntityTeleport.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet38EntityStatus.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet38EntityStatus.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet39AttachEntity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet39AttachEntity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet3Chat.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet3Chat.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet40EntityMetadata.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet40EntityMetadata.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet41EntityEffect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet41EntityEffect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet42RemoveEntityEffect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet42RemoveEntityEffect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet43Experience.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet43Experience.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet4UpdateTime.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet4UpdateTime.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet50PreChunk.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet50PreChunk.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet51MapChunk.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet51MapChunk.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet52MultiBlockChange.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet52MultiBlockChange.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet53BlockChange.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet53BlockChange.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet54PlayNoteBlock.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet54PlayNoteBlock.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet5PlayerInventory.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet5PlayerInventory.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet60Explosion.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet60Explosion.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet61DoorChange.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet61DoorChange.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet6SpawnPosition.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet6SpawnPosition.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet70Bed.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet70Bed.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet71Weather.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet71Weather.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet7UseEntity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet7UseEntity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet8UpdateHealth.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet8UpdateHealth.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/Packet9Respawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
-net/minecraft/src/Packet9Respawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
-net/minecraft/src/RConOutputStream.func_40393_a(I)V=java/io/IOException
-net/minecraft/src/RConOutputStream.func_40394_a(S)V=java/io/IOException
-net/minecraft/src/RConOutputStream.func_40396_a([B)V=java/io/IOException
-net/minecraft/src/RConOutputStream.func_40397_a(Ljava/lang/String;)V=java/io/IOException
-net/minecraft/src/RConThreadClient.func_40453_a(IILjava/lang/String;)V=java/io/IOException
-net/minecraft/src/RConThreadClient.func_40454_e()V=java/io/IOException
-net/minecraft/src/RConThreadClient.func_40455_a(ILjava/lang/String;)V=java/io/IOException
-net/minecraft/src/RConThreadQuery.func_40428_a([BLjava/net/DatagramPacket;)V=java/net/SocketException,java/io/IOException
-net/minecraft/src/RConThreadQuery.func_40430_a(Ljava/net/DatagramPacket;)Z=java/io/IOException
-net/minecraft/src/RConThreadQuery.func_40431_d(Ljava/net/DatagramPacket;)V=java/net/SocketException,java/io/IOException
-net/minecraft/src/RConThreadQuery.func_40434_b(Ljava/net/DatagramPacket;)[B=java/io/IOException
-net/minecraft/src/RegionFile.func_22126_b()V=java/io/IOException
-net/minecraft/src/RegionFile.func_22128_a(III)V=java/io/IOException
-net/minecraft/src/RegionFile.func_22130_a(I[BI)V=java/io/IOException
-net/minecraft/src/RegionFile.func_22138_b(III)V=java/io/IOException
-net/minecraft/src/ThreadedChunkLoader.func_40325_a(Lnet/minecraft/src/ThreadedChunkLoaderPending;)V=java/io/IOException
-net/minecraft/src/ThreadedChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
-net/minecraft/src/ThreadedFileIOBase.func_40508_a()V=java/lang/InterruptedException

conf/version.cfg

@@ -1,4 +1,4 @@
-[VERSION]
-MCPVersion = 5.0
-ClientVersion = 1.0.0
-ServerVersion = 1.0.1
+[VERSION]
+MCPVersion = 8.11
+ClientVersion = 1.6.4
+ServerVersion = 1.6.4

forge_client/.classpath

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry including="*.java" kind="src" path="start"/>
-	<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">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="forge_client/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="../../jars/bin/lwjgl.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="forge_client/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="../../jars/bin/lwjgl_util.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="forge_client/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="../../jars/bin/minecraft.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

forge_client/.project

@@ -1,83 +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>jars</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/jars</locationURI>
-		</link>
-		<link>
-			<name>minecraft</name>
-			<type>2</type>
-			<locationURI>PARENT-1-WORKSPACE_LOC/src_work/minecraft</locationURI>
-		</link>
-		<link>
-			<name>start</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/conf/patches</locationURI>
-		</link>
-	</linkedResources>
-	<filteredResources>
-		<filter>
-			<id>1324024223159</id>
-			<name>jars</name>
-			<type>9</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-bin</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1324024223163</id>
-			<name>jars</name>
-			<type>6</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1324022795404</id>
-			<name>start</name>
-			<type>5</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*.java</arguments>
-			</matcher>
-		</filter>
-		<filter>
-			<id>1324024144075</id>
-			<name>jars/bin</name>
-			<type>5</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*.jar</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-	<variableList>
-		<variable>
-			<name>MCP_LOC</name>
-			<value>$%7BPARENT-1-WORKSPACE_LOC%7D</value>
-		</variable>
-	</variableList>
-</projectDescription>

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_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_client/src/net/minecraft/src/forge/ForgeHooksClient.java

@@ -1,245 +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;
-	}
-
-	public static void onRenderWorldLast(RenderGlobal rg, float f) {
-		for (IRenderWorldLastHandler handler : renderWorldLastHandlers) {
-			handler.onRenderWorldLast(rg,f);
-		}
-	}
-
-	static LinkedList<IHighlightHandler> highlightHandlers =
-		new LinkedList<IHighlightHandler>();
-	static LinkedList<IRenderWorldLastHandler> renderWorldLastHandlers =
-		new LinkedList<IRenderWorldLastHandler>();
-
-	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;
-	}
-
-	private static class TesKey implements Comparable<TesKey> {
-		public TesKey(int t, int s) { tex=t; sub=s; }
-		public int compareTo(TesKey key) {
-			if(sub==key.sub) return tex-key.tex;
-			return sub-key.sub;
-		}
-		public boolean equals(Object obj) {
-			return compareTo((TesKey)obj)==0;
-		}
-		public int hashCode() {
-			int c1=Integer.valueOf(tex).hashCode();
-			int c2=Integer.valueOf(sub).hashCode();
-			return c1+31*c2;
-		}
-		public int tex, sub;
-	}
-
-	static HashMap<TesKey,Tessellator> tessellators=
-		new HashMap<TesKey,Tessellator>();
-	static HashMap<String,Integer> textures=new HashMap<String,Integer>();
-	static boolean inWorld=false;
-	static TreeSet<TesKey> renderTextures=new TreeSet<TesKey>();
-	static Tessellator defaultTessellator=null;
-	static HashMap<TesKey,IRenderContextHandler> renderHandlers=new
-		HashMap<TesKey,IRenderContextHandler>();
-
-	protected static void registerRenderContextHandler(String tex, int sub,
-			IRenderContextHandler handler) {
-		Integer n;
-		n=textures.get(tex);
-		if(n==null) {
-			n=ModLoader.getMinecraftInstance().renderEngine
-				.getTexture(tex);
-			textures.put(tex,n);
-		}
-		renderHandlers.put(new TesKey(n,sub),handler);
-	}
-
-	protected static void bindTessellator(int tex, int sub) {
-		TesKey key=new TesKey(tex,sub);
-		Tessellator t;
-		t=tessellators.get(key);
-		if(t==null) {
-			t=new Tessellator();
-			tessellators.put(key,t);
-		}
-		if(inWorld && !renderTextures.contains(key)) {
-			renderTextures.add(key);
-			t.startDrawingQuads();
-			t.setTranslationD(defaultTessellator.xOffset,
-				defaultTessellator.yOffset,
-				defaultTessellator.zOffset);
-		}
-		Tessellator.instance=t;
-	}
-
-	static IRenderContextHandler unbindContext=null;
-	protected static void bindTexture(String name, int sub) {
-		Integer n;
-		n=textures.get(name);
-		if(n==null) {
-			n=ModLoader.getMinecraftInstance().renderEngine
-				.getTexture(name);
-			textures.put(name,n);
-		}
-		if(!inWorld) {
-			if(unbindContext!=null) {
-				unbindContext.afterRenderContext();
-				unbindContext=null;
-			}
-			if(Tessellator.instance.isDrawing) {
-				int mode=Tessellator.instance.drawMode;
-				Tessellator.instance.draw();
-				Tessellator.instance.startDrawing(mode);
-			}
-			GL11.glBindTexture(3553 /* GL_TEXTURE_2D */,n);
-			unbindContext=renderHandlers.get(new TesKey(n,sub));
-			if(unbindContext!=null) {
-				unbindContext.beforeRenderContext();
-			}
-			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();
-				if(unbindContext!=null) {
-					unbindContext.afterRenderContext();
-					unbindContext=null;
-				}
-				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"));
-		renderTextures.clear();
-		inWorld=true;
-	}
-
-	public static void afterRenderPass(int pass) {
-		renderPass=-1;
-		inWorld=false;
-		for(TesKey tk : renderTextures) {
-			IRenderContextHandler irch=renderHandlers.get(tk);
-			GL11.glBindTexture(GL11.GL_TEXTURE_2D,tk.tex);
-			Tessellator t=tessellators.get(tk);
-			if(irch==null) {
-				t.draw();
-			} else {
-				Tessellator.instance=t;
-				irch.beforeRenderContext();
-				t.draw();
-				irch.afterRenderContext();
-			}
-		}
-		GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader
-			.getMinecraftInstance().renderEngine
-			.getTexture("/terrain.png"));
-		Tessellator.renderingWorldRenderer=false;
-		Tessellator.instance=defaultTessellator;
-	}
-
-	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 String getTexture(String def, Object item) 
-	{
-		if (item instanceof ITextureProvider)
-		{
-			return ((ITextureProvider)item).getTextureFile();
-		}
-		else
-		{
-			return def;
-		}
-	}
-
-	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_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_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_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_client/src/net/minecraft/src/forge/IRenderContextHandler.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;
-
-public interface IRenderContextHandler {
-	/** Run before the specified rendering context.
-	 */
-	public void beforeRenderContext();
-
-	/** Run after the specified rendering context.
-	 */
-	public void afterRenderContext();
-}
-

forge_client/src/net/minecraft/src/forge/IRenderWorldLastHandler.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;
-
-import net.minecraft.src.RenderGlobal;
-
-public interface IRenderWorldLastHandler {
-	/** Called after rendering all the 3D data of the world.  This is
-	 * called before the user's tool is rendered, but otherwise after all
-	 * 3D content.  It is called twice in anaglyph mode.  This is intended
-	 * for rendering visual effect overlays into the world.
-	 */
-	void onRenderWorldLast(RenderGlobal rg, float f);
-}
-

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

@@ -1,90 +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);
-	}
-
-	/** Register a new render context handler.  A render context is a block
-	 * of rendering performed with similar OpenGL modes, for example,
-	 * texture name.
-	 * @param tex The name of the texture for this render context.
-	 * @param sub The subid of this render context.  0 is the default pass
-	 * for normal rendering, higher subids render later.  All subids of 0
-	 * will render before all subids of 1, etc.
-	 * @param handler The handler to register.
-	 */
-	public static void registerRenderContextHandler(String tex, int sub,
-			IRenderContextHandler handler) {
-		ForgeHooksClient.registerRenderContextHandler(tex,sub,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_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_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_common/net/minecraft/src/forge/DungeonLoot.java

@@ -1,51 +0,0 @@
-package net.minecraft.src.forge;
-
-import java.util.Random;
-import net.minecraft.src.ItemStack;
-
-/**
- * 
- * Used to hold a list of all items that can be spawned in a world dungeon
- *
- */
-public class DungeonLoot
-{
-	private ItemStack item;
-	private int minCount = 1;
-	private int maxCount = 1;
-	
-	/**
-	 * @param item A item stack
-	 * @param min Minimum stack size when randomly generating
-	 * @param max Maximum stack size when randomly generating
-	 */
-	public DungeonLoot(ItemStack item, int min, int max)
-	{
-		this.item = item;
-		minCount = min;
-		maxCount = max;
-	}
-	
-	/**
-	 * Grabs a ItemStack ready to be added to the dungeon chest,
-	 * the stack size will be between minCount and maxCount
-	 * @param rand World gen random number generator
-	 * @return The ItemStack to be added to the chest
-	 */
-	public ItemStack generateStack(Random rand)
-	{
-		ItemStack ret = this.item.copy();
-		ret.stackSize = minCount + (rand.nextInt(maxCount - minCount + 1));
-		return ret;    		
-	}
-
-	public boolean equals(ItemStack item, int min, int max)
-	{
-		return (min == minCount && max == maxCount && item.isItemEqual(this.item));
-	}
-	
-	public boolean equals(ItemStack item)
-	{
-		return item.isItemEqual(this.item);
-	}
-}

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().replace('.', '/').equals(valueType)) //Apparently some JVMs return .'s and some don't..
-				{
-					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_common/net/minecraft/src/forge/ForgeHooks.java

@@ -1,316 +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.EntityMinecart;
-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.ModLoader;
-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>();
-	
-
-	public static void onMinecartUpdate(EntityMinecart minecart, int x, int y, int z)
-	{
-		for (IMinecartHandler handler : minecartHandlers)
-		{
-			handler.onMinecartUpdate(minecart, x, y, z);
-		}
-	}
-	
-	public static void onMinecartEntityCollision(EntityMinecart minecart, Entity entity)
-	{
-		for (IMinecartHandler handler : minecartHandlers)
-		{
-			handler.onMinecartEntityCollision(minecart, entity);
-		}
-	}
-	
-	public static boolean onMinecartInteract(EntityMinecart minecart, EntityPlayer player)
-	{
-		boolean canceled = true;
-		for (IMinecartHandler handler : minecartHandlers)
-		{
-			boolean tmp = handler.onMinecartInteract(minecart, player, canceled);
-			canceled = canceled && tmp;
-		}
-		return canceled;
-	}
-	
-	static LinkedList<IMinecartHandler> minecartHandlers = new LinkedList<IMinecartHandler>();
-
-	// 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.obsidian,    "pickaxe");
-		MinecraftForge.removeBlockEffectiveness(Block.oreRedstoneGlowing, "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);
-		}
-		
-		Block[] spadeEff = {
-			Block.grass,     Block.dirt, 
-			Block.sand,      Block.gravel, 
-			Block.snow,      Block.blockSnow, 
-			Block.blockClay, Block.tilledField, 
-			Block.slowSand,  Block.mycelium
-		};
-		for (Block bl : spadeEff) 
-		{
-			MinecraftForge.setBlockHarvestLevel(bl, "shovel", 0);
-		}
-		
-		Block[] axeEff = {
-			Block.planks,      Block.bookShelf, 
-			Block.wood,        Block.chest, 
-			Block.stairDouble, Block.stairSingle, 
-			Block.pumpkin,     Block.pumpkinLantern
-		};
-		for (Block bl : axeEff) 
-		{
-			MinecraftForge.setBlockHarvestLevel(bl, "axe", 0);
-		}
-
-	}
-
-	public static final int majorVersion=1;
-	public static final int minorVersion=2;
-	public static final int revisionVersion=5;
-	static {
-		System.out.printf("MinecraftForge V%d.%d.%d Initialized\n", majorVersion, minorVersion, revisionVersion);
-		ModLoader.getLogger().info(String.format("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_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_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_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_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_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_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_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_common/net/minecraft/src/forge/IMinecartCollisionHandler.java

@@ -1,50 +0,0 @@
-package net.minecraft.src.forge;
-
-import net.minecraft.src.AxisAlignedBB;
-import net.minecraft.src.Entity;
-import net.minecraft.src.EntityMinecart;
-
-/**
- * This class defines a replacement for the default minecart collision code.
- * Only one handler can be registered at a time. It it registered with EntityMinecart.registerCollisionHandler().
- * If you use this, make it a configuration option.
- * @author CovertJaguar
- */
-public interface IMinecartCollisionHandler
-{
-
-    /**
-     * This basically replaces the function of the same name in EnityMinecart.
-     * Code in IMinecartHooks.applyEntityCollisionHook is still run.
-     * @param cart The cart that called the collision.
-     * @param other The object it collided with.
-     */
-    public void onEntityCollision(EntityMinecart cart, Entity other);
-
-    /**
-     * This function replaced the function of the same name in EntityMinecart.
-     * It is used to define whether minecarts collide with specific entities,
-     * for example items.
-     * @param cart The cart for which the collision box was requested.
-     * @param other The entity requesting the collision box.
-     * @return The collision box or null.
-     */
-    public AxisAlignedBB getCollisionBox(EntityMinecart cart, Entity other);
-
-    /**
-     * This function is used to define the box used for detecting minecart collisions.
-     * It is generally bigger that the normal collision box.
-     * @param cart The cart for which the collision box was requested.
-     * @return The collision box, cannot be null.
-     */
-    public AxisAlignedBB getMinecartCollisionBox(EntityMinecart cart);
-
-    /**
-     * This function replaces the function of the same name in EntityMinecart.
-     * It defines whether minecarts are solid to the player.
-     * @param cart The cart for which the bounding box was requested.
-     * @return The bounding box or null.
-     */
-    public AxisAlignedBB getBoundingBox(EntityMinecart cart);
-}
-

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

@@ -1,38 +0,0 @@
-package net.minecraft.src.forge;
-
-import net.minecraft.src.Entity;
-import net.minecraft.src.EntityMinecart;
-import net.minecraft.src.EntityPlayer;
-
-public interface IMinecartHandler {
-
-    /**
-     * This functions is called at the end of every minecart's doUpdate loop.
-     * If you override EntityMinecart.doUpdate(), is recommended that you retain the code that calls this function.
-     * @param cart The cart that called the function.
-     * @param i X coordinate of the rail
-     * @param j Y coordinate of the rail
-     * @param k Z coordinate of the rail
-     */
-	public void onMinecartUpdate(EntityMinecart minecart, int x, int y, int z);
-
-    /**
-     * This function allows several mods to add code into the collision routine at the same time regardless of the collision handler registered.
-     * If you override EntityMinecart.applyEntityCollision(), is recommended that you retain the code that calls this function.
-     * @param cart The cart that called the function.
-     * @param other
-     */
-	public void onMinecartEntityCollision(EntityMinecart minecart, Entity entity);
-
-    /**
-     * This function is called whenever a player attempts to interact with a minecart. 
-     * The primary reason for this hook is to fix a few bugs and put restrictions on how a minecart can be used under certain circumstances.
-     * If you override EntityMinecart.interact(), is recommended that you retain the code that calls this function.
-     * @param cart The cart that called the function.
-     * @param player The player that tried to interact with the minecart.
-     * @param canceled Wither or not a pervious hook has canceled the interaction of a player.
-     * @return Whether the player can interact with the minecart.
-     */
-	public boolean onMinecartInteract(EntityMinecart minecart, EntityPlayer player, boolean canceled);
-	
-}

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_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_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_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_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_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_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_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_common/net/minecraft/src/forge/IUseItemFirst.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.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.
- *
- * @deprecated This interface is no longer used, the function has been moved to
- * Item.  The functionality remains, it simply does not require this interface
- * any further.
- * @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_common/net/minecraft/src/forge/MinecartKey.java

@@ -1,49 +0,0 @@
-package net.minecraft.src.forge;
-
-import net.minecraft.src.EntityMinecart;
-
-/**
- * Used to create hashmap values for Minecart/type pairs
- * Written by CovertJaguar
- */
-public class MinecartKey {
-    public final Class<? extends EntityMinecart> minecart;
-    public final int type;
-
-    public MinecartKey(Class<? extends EntityMinecart> c, int t)
-    {
-        minecart = c;
-        type = t;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if(obj == null) 
-        {
-            return false;
-        }
-        
-        if(getClass() != obj.getClass()) 
-        {
-            return false;
-        }
-        
-        final MinecartKey other = (MinecartKey)obj;
-        if(this.minecart != other.minecart && (this.minecart == null || !this.minecart.equals(other.minecart))) 
-        {
-            return false;
-        }
-        
-        return (this.type == other.type);
-    }
-
-    @Override
-    public int hashCode()
-    {
-        int hash = 7;
-        hash = 59 * hash + (this.minecart != null ? this.minecart.hashCode() : 0);
-        hash = 59 * hash + this.type;
-        return hash;
-    }
-}

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

@@ -1,766 +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.EntityMinecart;
-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);
-    }
-    
-    /**
-     * Registers a new minecart handler
-     * @param handler The Handler to be registered
-     */
-    public static void registerMinecartHandler(IMinecartHandler handler)
-    {
-    	ForgeHooks.minecartHandlers.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);
-	    }
-    }
-
-	private static int dungeonLootAttempts = 8;
-	private static ArrayList<ObjectPair<Float, String>> dungeonMobs = new ArrayList<ObjectPair<Float, String>>();
-	private static ArrayList<ObjectPair<Float, DungeonLoot>> dungeonLoot = new ArrayList<ObjectPair<Float, DungeonLoot>>();
-    /**
-     * Set the number of item stacks that will be attempted to be added to each Dungeon chest.
-     * Note: Due to random number generation, you will not always get this amount per chest.
-     * @param number The maximum number of item stacks to add to a chest.
-     */
-    public static void setDungeonLootTries(int number)
-    {
-    	dungeonLootAttempts = number;
-    }
-    
-    /**
-     * @return The max number of item stacks found in each dungeon chest.
-     */
-    public static int getDungeonLootTries()
-    {
-    	return dungeonLootAttempts;
-    }
-    
-    /**
-     * Adds a mob to the possible list of creatures the spawner will create.
-     * If the mob is already in the spawn list, the rarity will be added to the existing one,
-     * causing the mob to be more common.
-     *  
-     * @param name The name of the monster, use the same name used when registering the entity.
-     * @param rarity The rarity of selecting this mob over others. Must be greater then 0.
-     *        Vanilla Minecraft has the following mobs:
-     *        Spider   1
-     *        Skeleton 1
-     *        Zombie   2
-     *        Meaning, Zombies are twice as common as spiders or skeletons.
-     * @return The new rarity of the monster,         
-     */
-    public static float addDungeonMob(String name, float rarity)
-    {
-    	if (rarity <= 0)
-    	{
-    		throw new IllegalArgumentException("Rarity must be greater then zero");
-    	}
-    	
-    	for(ObjectPair<Float, String> mob : dungeonMobs)
-    	{
-    		if (name.equals(mob.getValue2()))
-    		{
-    			mob.setValue1(mob.getValue1() + rarity);
-    			return mob.getValue1();
-    		}
-    	}
-
-    	dungeonMobs.add(new ObjectPair<Float, String>(rarity, name));
-    	return rarity;
-    }
-    
-    /**
-     * Will completely remove a Mob from the dungeon spawn list.
-     * 
-     * @param name The name of the mob to remove
-     * @return The rarity of the removed mob, prior to being removed.
-     */
-    public static float removeDungeonMob(String name)
-    {
-    	for (ObjectPair<Float, String> mob : dungeonMobs)
-    	{
-    		if (name.equals(name))
-    		{
-    			dungeonMobs.remove(mob);
-    			return mob.getValue1();
-    		}
-    	}
-    	return 0;
-    }
-    
-    /**
-     * Gets a random mob name from the list.
-     * @param rand World generation random number generator
-     * @return The mob name
-     */
-    public static String getRandomDungeonMob(Random rand)
-    {
-    	float maxRarity = 0f;
-    	for (ObjectPair<Float, String> mob : dungeonMobs)
-    	{
-    		maxRarity += mob.getValue1();
-    	}
-    	
-    	float targetRarity = rand.nextFloat() * maxRarity;
-    	for (ObjectPair<Float, String> mob : dungeonMobs)
-    	{
-    		if (targetRarity < mob.getValue1()) 
-    		{
-    			return mob.getValue2();
-    		}
-    		targetRarity -= mob.getValue1();
-    	}
-    	
-    	return "";
-    }
-    
-    /**
-     * Adds a item stack to the dungeon loot list with a stack size
-     * of 1.
-     * 
-     * @param item The ItemStack to be added to the loot list
-     * @param rarity The relative chance that this item will spawn, Vanilla has 
-     * 			most of its items set to 1. Like the saddle, bread, silk, wheat, etc..
-     * 			Rarer items are set to lower values, EXA: Golden Apple 0.01
-     */
-    public static void addDungeonLoot(ItemStack item, float rarity)
-    {
-    	addDungeonLoot(item, rarity, 1, 1);
-    }
-    
-    /**
-     * Adds a item stack, with a range of sizes, to the dungeon loot list.
-     * If a stack matching the same item, and size range, is already in the list
-     * the rarities will be added together making the item more common.
-     * 
-     * @param item The ItemStack to be added to the loot list
-     * @param rarity The relative chance that this item will spawn, Vanilla has 
-     * 			most of its items set to 1. Like the saddle, bread, silk, wheat, etc..
-     * 			Rarer items are set to lower values, EXA: Golden Apple 0.01
-     * @param minCount When this item does generate, the minimum number that is in the stack
-     * @param maxCount When this item does generate, the maximum number that can bein the stack
-     * @return The new rarity of the loot. 
-     */
-    public static float addDungeonLoot(ItemStack item, float rarity, int minCount, int maxCount)
-    {
-    	for (ObjectPair<Float, DungeonLoot> loot : dungeonLoot)
-    	{
-    		if (loot.getValue2().equals(item, minCount, maxCount))
-    		{
-    			loot.setValue1(loot.getValue1() + rarity);
-    			return loot.getValue1();
-    		}
-    	}
-    	
-    	dungeonLoot.add(new ObjectPair<Float, DungeonLoot>(rarity, new DungeonLoot(item, minCount, maxCount)));
-    	return rarity;    	
-    }
-    /**
-     * Removes a item stack from the dungeon loot list, this will remove all items
-     * as long as the item stack matches, it will not care about matching the stack
-     * size ranges perfectly.
-     * 
-     * @param item The item stack to remove
-     * @return The total rarity of all items removed
-     */
-    public static float removeDungeonLoot(ItemStack item)
-    {
-    	return removeDungeonLoot(item, -1, 0);
-    }
-    
-    /**
-     * Removes a item stack from the dungeon loot list. If 'minCount' parameter 
-     * is greater then 0, it will only remove loot items that have the same exact 
-     * stack size range as passed in by parameters.
-     * 
-     * @param item The item stack to remove
-     * @param minCount The minimum count for the match check, if less then 0, 
-     * 			the size check is skipped
-     * @param maxCount The max count used in match check when 'minCount' is >= 0
-     * @return The total rarity of all items removed
-     */
-    public static float removeDungeonLoot(ItemStack item, int minCount, int maxCount)
-    {
-    	float rarity = 0;
-    	ArrayList<ObjectPair<Float, DungeonLoot>> lootTmp = (ArrayList<ObjectPair<Float, DungeonLoot>>)dungeonLoot.clone();
-    	if (minCount < 0)
-    	{
-	    	for (ObjectPair<Float, DungeonLoot> loot : lootTmp)
-	    	{
-	    		if (loot.getValue2().equals(item))
-	    		{
-	    			dungeonLoot.remove(loot);
-	    			rarity += loot.getValue1();
-	    		}
-	    	}
-    	}
-    	else
-    	{
-	    	for (ObjectPair<Float, DungeonLoot> loot : lootTmp)
-	    	{
-	    		if (loot.getValue2().equals(item, minCount, maxCount))
-	    		{
-	    			dungeonLoot.remove(loot);
-	    			rarity += loot.getValue1();
-	    		}
-	    	}
-    	}
-    	
-    	return rarity;  
-    }
-
-    /**
-     * Gets a random item stack to place in a dungeon chest during world generation
-     * @param rand World generation random number generator
-     * @return The item stack
-     */
-    public static ItemStack getRandomDungeonLoot(Random rand)
-    {
-    	float maxRarity = 0f;
-    	for (ObjectPair<Float, DungeonLoot> loot : dungeonLoot)
-    	{
-    		maxRarity += loot.getValue1();
-    	}
-    	
-    	float targetRarity = rand.nextFloat() * maxRarity;
-    	for (ObjectPair<Float, DungeonLoot> loot : dungeonLoot)
-    	{
-    		if (targetRarity < loot.getValue1()) 
-    		{
-    			return loot.getValue2().generateStack(rand);
-    		}
-    		targetRarity -= loot.getValue1();
-    	}
-    	
-    	return null;
-    }
-    
-
-    //Minecart Dictionary --------------------------------------
-    private static Map<MinecartKey, ItemStack> itemForMinecart = new HashMap<MinecartKey, ItemStack>();
-    private static Map<ItemStack, MinecartKey> minecartForItem = new HashMap<ItemStack, MinecartKey>();
-    /**
-     * Registers a custom minecart and its corresponding item.
-     * This should be the item used to place the minecart by the user,
-     * not the item dropped by the cart.
-     * @param cart The minecart.
-     * @param item The item used to place the cart.
-     */
-    public static void registerMinecart(Class<? extends EntityMinecart> cart, ItemStack item)
-    {
-        registerMinecart(cart, 0, item);
-    }
-
-    /**
-     * Registers a minecart and its corresponding item.
-     * This should be the item used to place the minecart by the user,
-     * not the item dropped by the cart.
-     * @param minecart The minecart.
-     * @param type The minecart type, used to differentiate carts that have the same class.
-     * @param item The item used to place the cart.
-     */
-    public static void registerMinecart(Class<? extends EntityMinecart> minecart, int type, ItemStack item)
-    {
-        MinecartKey k = new MinecartKey(minecart, type);
-        itemForMinecart.put(k, item);
-        minecartForItem.put(item, k);
-    }    
-    
-    /**
-     * Removes a previously registered Minecart. Useful for replacing the vanilla minecarts.
-     * @param minecart
-     * @param type 
-     */
-    public static void removeMinecart(Class<? extends EntityMinecart> minecart, int type)
-    {
-        MinecartKey k = new MinecartKey(minecart, type);
-        ItemStack item = itemForMinecart.remove(k);
-        if(item != null) 
-        {
-            minecartForItem.remove(item);
-        }
-    }    
-    
-    /**
-     * This function returns an ItemStack that represents this cart.
-     * The player should be able to use this item to place the minecart.
-     * This is the item that was registered with the cart via the registerMinecart function,
-     * but is not necessary the item the cart drops when destroyed.
-     * @param minecart The cart class
-     * @return An ItemStack that can be used to place the cart.
-     */
-    public static ItemStack getItemForCart(Class<? extends EntityMinecart> minecart)
-    {
-        return getItemForCart(minecart, 0);
-    }
-
-    /**
-     * This function returns an ItemStack that represents this cart.
-     * The player should be able to use this item to place the minecart.
-     * This is the item that was registered with the cart via the registerMinecart function,
-     * but is not necessary the item the cart drops when destroyed.
-     * @param minecart The cart class
-     * @param type The minecartType value
-     * @return An ItemStack that can be used to place the cart.
-     */
-    public static ItemStack getItemForCart(Class<? extends EntityMinecart> minecart, int type)
-    {
-        ItemStack item = itemForMinecart.get(new MinecartKey(minecart, type));
-        if (item == null)
-        {
-        	return null;
-        }
-        return item.copy();
-    }
-
-    /**
-     * This function returns an ItemStack that represents this cart.
-     * The player should be able to use this item to place the minecart.
-     * This is the item that was registered with the cart via the registerMinecart function,
-     * but is not necessary the item the cart drops when destroyed.
-     * @param cart The cart entity
-     * @return An ItemStack that can be used to place the cart.
-     */
-    public static ItemStack getItemForCart(EntityMinecart cart)
-    {
-        if(cart.getClass() == EntityMinecart.class) 
-        {
-            return getItemForCart(cart.getClass(), cart.getMinecartType());
-        }
-        return getItemForCart(cart.getClass(), 0);
-    }
-
-    /**
-     * The function will return the cart class for a given item.
-     * If the item was not registered via the registerMinecart function it will return null.
-     * @param item The item to test.
-     * @return Cart if mapping exists, null if not.
-     */
-    public static Class<? extends EntityMinecart> getCartClassForItem(ItemStack item)
-    {
-        MinecartKey k = minecartForItem.get(item);
-        if(k != null) 
-        {
-            return k.minecart;
-        }
-        return null;
-    }
-
-    /**
-     * The function will return the cart type for a given item.
-     * Will return -1 if the mapping doesn't exist.
-     * If the item was not registered via the registerMinecart function it will return null.
-     * @param item The item to test.
-     * @return the cart minecartType value.
-     */
-    public static int getCartTypeForItem(ItemStack item)
-    {
-        MinecartKey k = minecartForItem.get(item);
-        if(k != null) 
-        {
-            return k.type;
-        }
-        return -1;
-    }
-
-    /**
-     * Will return a set of all registered minecart items.
-     * @return a copy of the set of all minecart items
-     */
-    public static Set<ItemStack> getAllCartItems()
-    {
-    	Set<ItemStack> ret = new HashSet<ItemStack>();
-    	for(ItemStack item : minecartForItem.keySet())
-    	{
-    		ret.add(item.copy());
-    	}
-        return ret;
-    }
-  
-        
-    static 
-    {
-    	addDungeonMob("Skeleton", 1.0f);
-    	addDungeonMob("Zombie",   2.0f);
-    	addDungeonMob("Spider",   1.0f);
-    	
-    	addDungeonLoot(new ItemStack(Item.saddle),          1.00f      );
-    	addDungeonLoot(new ItemStack(Item.ingotIron),       1.00f, 1, 4);
-    	addDungeonLoot(new ItemStack(Item.bread),           1.00f      );
-    	addDungeonLoot(new ItemStack(Item.wheat),           1.00f, 1, 4);
-    	addDungeonLoot(new ItemStack(Item.gunpowder),       1.00f, 1, 4);
-    	addDungeonLoot(new ItemStack(Item.silk),            1.00f, 1, 4);
-    	addDungeonLoot(new ItemStack(Item.bucketEmpty),     1.00f      );
-    	addDungeonLoot(new ItemStack(Item.appleGold),       0.01f      );
-    	addDungeonLoot(new ItemStack(Item.redstone),        0.50f, 1, 4);
-    	addDungeonLoot(new ItemStack(Item.record13),        0.05f      );
-    	addDungeonLoot(new ItemStack(Item.recordCat),       0.05f      );
-    	addDungeonLoot(new ItemStack(Item.dyePowder, 1, 3), 1.00f      );
-    	
-        registerMinecart(EntityMinecart.class, 0, new ItemStack(Item.minecartEmpty));
-        registerMinecart(EntityMinecart.class, 1, new ItemStack(Item.minecartCrate));
-        registerMinecart(EntityMinecart.class, 2, new ItemStack(Item.minecartPowered));
-    }
-
-}

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

@@ -1,40 +0,0 @@
-package net.minecraft.src.forge;
-
-/**
- * A class that holds two generic values, can be used as a Key/Value pair, 
- * but is used in forge as a frequency/object pair.
- *
- * @param <T1> The type of the first value
- * @param <T2> The Type of the second value
- */
-public class ObjectPair<T1, T2> 
-{
-	private T1 object1;
-	private T2 object2;
-	
-	public ObjectPair(T1 obj1, T2 obj2)
-	{
-		this.object1 = obj1;
-		this.object2 = obj2;
-	}
-	
-	public T1 getValue1()
-	{
-		return this.object1;
-	}
-	
-	public T2 getValue2()
-	{
-		return this.object2;
-	}
-	
-	public void setValue1(T1 value)
-	{
-		object1 = value;
-	}
-	
-	public void setValue2(T2 value)
-	{
-		object2 = value;
-	}
-}

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_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_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>

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

gradlew.bat

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

install/README.txt

@@ -1,19 +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 downloaded jars, solely including ModLoader & 
-ModLoaderMP. Anything else can eventually cause conflicts.
-
-Now just start the install.cmd/.sh, MCForge will install itself into the proper
-locations and copy all needed files, as well as modifying the needed baseclasses.
-
-Forge also includes a snapshot of the MCP mapings, this may not be the current 
-version of the mapings. But you must use the provided mapings in order for the 
-patch files to work together.
-
-The install scripts should take care of everything for you, so you should not need
-to run ANY MCP script before installing forge.
-

install/build.gradle

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/Minecraft/lib/net/minecraft/launchwrapper/1.3/launchwrapper-1.3.jar"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.minecraft.launchwrapper.Launch"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--version 1.6 --tweakClass cpw.mods.fml.common.launcher.FMLTweaker"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Minecraft"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:Minecraft/jars}"/>
+</launchConfiguration>

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

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

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

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

install/install.cmd

@@ -1,54 +0,0 @@
-echo off
-
-echo MinecraftForge Windows Setup Program
-echo:
-
-pushd .. >nul
-
-xcopy /Y /E /I forge\conf\* conf
-
-if exist runtime\bin\fernflower.jar move runtime\bin\fernflower.jar runtime\bin\fernflower.jar-backup
-
-cmd /C cleanup.bat
-cmd /C decompile.bat
-
-if exist runtime\bin\fernflower.jar-backup move runtime\bin\fernflower.jar-backup runtime\bin\fernflower.jar
-
-pushd src >nul
-
-    if exist ..\jars\bin\minecraft.jar (
-        del minecraft\net\minecraft\src\MLProp.java
-        copy ..\forge\MLProp.java minecraft\net\minecraft\src\MLProp.java
-        
-        for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches\minecraft') 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
-        )
-    )
-    
-    if exist ..\jars\minecraft_server.jar (
-        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\minecraft_server') 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 updatemcp.bat
-cmd /C updatenames.bat
-cmd /C updatemd5.bat