Initial 1.13.2 update. Major thing to note is that Dimensions have been completely revamped.

DimensionType is not unique per Dimension. See DimensionManager for more details.
Vanilla now has a chunk loading system, so Forge's will need to be deprecated/adapted.

.gitattributes

@@ -13,3 +13,4 @@
 *.pyd binary
 *.cfg text eol=lf
 *.py text eol=lf
+*.jks binary

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,4 @@
+<!-- Thank you for reporting! -->
+
+<!-- Please go to the forum first for support with crashes and issues. -->
+<!-- http://www.minecraftforge.net/forum/forum/18-support-bug-reports/ -->

.github/stale.yml

@@ -0,0 +1,43 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Label to use when marking as stale
+staleLabel: Stale
+# Comment to post when removing the stale label. Set to `false` to disable
+unmarkComment: false
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 1
+# Issues with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - Assigned
+
+pulls:
+  # Number of days of inactivity before a Pull Request becomes stale
+  daysUntilStale: 60
+  # Number of days of inactivity before a stale Pull Request is closed
+  daysUntilClose: 14
+  # Comment to post when marking as stale. Set to `false` to disable
+  markComment: >
+    This pull request has been automatically marked as stale because it has not had recent
+    activity, and will be closed if no further activity occurs. If this pull request was
+    overlooked, forgotten, or should remain open for any other reason, please reply
+    here to call attention to it and remove the stale status. Thank you for your contributions.
+  # Comment to post when closing a stale Pull Request. Set to `false` to disable
+  closeComment: >
+    This pull request has been automatically closed because it has not had
+    recent activity. Please feel free to update or reopen it.
+issues:
+  # Number of days of inactivity before an Issue becomes stale
+  daysUntilStale: 180
+  # Number of days of inactivity before a stale Issue is closed
+  daysUntilClose: 14
+  # Comment to post when marking as stale. Set to `false` to disable
+  markComment: >
+    This issue has been automatically marked as stale because it has not had activity
+    in a long time. If this issue is still relevant and should remain open, please reply
+    with a short explanation (e.g. "I have checked the code and this issue is still relevant because ___."
+    or "Here's a screenshot of this issue on the latest version").
+    Thank you for your contributions!
+  # Comment to post when closing a stale Issue. Set to `false` to disable
+  closeComment: >
+    This issue has been automatically closed because it has not had
+    activity in a long time. Please feel free to reopen it or create a new issue.

.github/support.yml

@@ -0,0 +1,16 @@
+# Configuration for support-requests - https://github.com/dessant/support-requests
+
+# Label used to mark issues as support requests
+supportLabel: Forum
+# Comment to post on issues marked as support requests. Add a link
+# to a support page, or set to `false` to disable
+supportComment: >
+  👋 We use the issue tracker exclusively for final bug reports and feature requests.
+  However, this issue appears to be better suited for the
+  [Forge Support Forums](http://www.minecraftforge.net/forum/forum/18-support-bug-reports/).
+  Please create a new topic on the support forum with this issue, and the conversation can
+  continue there.
+# Whether to close issues marked as support requests
+close: true
+# Whether to lock issues marked as support requests
+lock: true

.gitignore

@@ -1,7 +1,8 @@
 #eclipse
-/bin
-/.settings
-/.classpath
+**/bin
+**/.settings
+**/.classpath
+*.project
 
 #In case people make their workspace in the repo
 /eclipse/
@@ -14,6 +15,8 @@
 #gradle
 /build
 /.gradle
+/mdk/.gradle
+/mdk/build
 
 #occupational hazards
 /projects/
@@ -26,7 +29,9 @@
 
 # FML changelog
 changelog.txt
-/patches_old/
-/patches_old_bak/
 *.py
 *.7z
+/logs/
+
+gradle.properties
+!/mdk/gradle.properties

.travis.yml

@@ -24,7 +24,12 @@ install:
   - ./gradlew ciWriteBuildNumber
 script:
   - travis_wait ./gradlew build -x createExe -S
-  - ./gradlew -p projects/Forge test -S
+  - ./gradlew -p projects/Forge test -S -i
 
 notifications:
   email: false
+
+# skip building travis on 1.13 - it doesn't work there
+branches:
+  except:
+    - 1.13-pre

CREDITS-fml.txt

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

CREDITS.txt

@@ -0,0 +1,65 @@
+Minecraft Forge: Credits/Thank You
+
+Forge is a set of tools and modifications to the Minecraft base game code to assist 
+mod developers in creating new and exciting content. It has been in development for 
+several years now, but I would like to take this time thank a few people who have 
+helped it along it's way.
+
+First, the people who originally created the Forge projects way back in Minecraft 
+alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance 
+of me taking over the project, who knows what Minecraft modding would be today.
+
+Secondly, someone who has worked with me, and developed some of the core features
+that allow modding to be as functional, and as simple as it is, cpw. For developing
+FML, which stabelized the client and server modding ecosystem. As well as the base
+loading system that allows us to modify Minecraft's code as elegently as possible.
+
+Mezz, who has stepped up as the issue and pull request manager. Helping to keep me
+sane as well as guiding the community into creating better additions to Forge.
+
+Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which 
+I am a part}. For creating some of the core tools needed to make Minecraft modding 
+both possible, and as stable as can be.
+  On that note, here is some specific information of the MCP data we use:
+    * Minecraft Coder Pack (MCP) *
+      Forge Mod Loader and Minecraft Forge have permission to distribute and automatically 
+      download components of MCP and distribute MCP data files. This permission is not 
+      transitive and others wishing to redistribute the Minecraft Forge source independently
+      should seek permission of MCP or remove the MCP data files and request their users 
+      to download MCP separately.
+      
+And lastly, the countless community members who have spent time submitting bug reports, 
+pull requests, and just helping out the community in general. Thank you.
+
+--LexManos
+
+=========================================================================
+
+This is Forge Mod Loader.
+
+You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml
+
+This minecraft mod is a clean open source implementation of a mod loader for minecraft servers
+and minecraft clients.
+
+The code is authored by cpw.
+
+It began by partially implementing an API defined by the client side ModLoader, authored by Risugami.
+http://www.minecraftforum.net/topic/75440-
+This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader.
+
+It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
+http://www.minecraftforge.net/
+
+Additionally, it contains an implementation of topological sort based on that 
+published at http://keithschwarz.com/interesting/code/?dir=topological-sort
+
+It also contains code from the Maven project for performing versioned dependency
+resolution. http://maven.apache.org/
+
+It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/
+with credit to it's authors.
+
+Forge Mod Loader downloads components from the Minecraft Coder Pack
+(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team.
+

Jenkinsfile

@@ -0,0 +1,82 @@
+@Library('forge-shared-library')_
+
+pipeline {
+    options {
+        disableConcurrentBuilds()
+    }
+    agent {
+        docker {
+            image 'gradlewrapper:latest'
+            args '-v gradlecache:/gradlecache'
+        }
+    }
+    environment {
+        GRADLE_ARGS = '--no-daemon --console=plain' // No daemon for now as FG3 kinda derps. //'-Dorg.gradle.daemon.idletimeout=5000'
+    }
+
+    stages {
+        stage('fetch') {
+            steps {
+                checkout scm
+            }
+        }
+        stage('setup') {
+            steps {
+                sh './gradlew ${GRADLE_ARGS} --refresh-dependencies --continue setup'
+                script {
+                    env.MYVERSION = sh(returnStdout: true, script: './gradlew :forge:properties -q | grep "version:" | awk \'{print $2}\'').trim()
+                }
+            }
+            post {
+                success {
+                    writeChangelog(currentBuild, 'build/changelog.txt')
+                }
+            }
+        }
+        stage('publish') {
+            when {
+                not {
+                    changeRequest()
+                }
+            }
+            environment {
+                FORGE_MAVEN = credentials('forge-maven-forge-user')
+                CROWDIN = credentials('forge-crowdin')
+                KEYSTORE = credentials('forge-jenkins-keystore-old')
+                KEYSTORE_KEYPASS = credentials('forge-jenkins-keystore-old-keypass')
+                KEYSTORE_STOREPASS = credentials('forge-jenkins-keystore-old-keypass')
+            }
+            steps {
+                cache(maxCacheSize: 250/*MB*/, caches: [
+                    [$class: 'ArbitraryFileCache', excludes: '', includes: 'output.txt', path: '${WORKSPACE}/projects/forge/build/extractRangeMap/'] //Cache the rangemap to help speed up builds
+                ]){
+                    sh './gradlew ${GRADLE_ARGS} :forge:publish -PforgeMavenUser=${FORGE_MAVEN_USR} -PforgeMavenPassword=${FORGE_MAVEN_PSW} -PkeystoreKeyPass=${KEYSTORE_KEYPASS} -PkeystoreStorePass=${KEYSTORE_STOREPASS} -Pkeystore=${KEYSTORE} -PcrowdinKey=${CROWDIN}'
+                }
+                //We're testing so use the test group
+                sh 'curl --user ${FORGE_MAVEN} http://files.minecraftforge.net/maven/manage/promote/latest/net.minecraftforge.test.forge/${MYVERSION}'
+            }
+        }
+        stage('test_publish_pr') { //Publish to local repo to test full process, but don't include credentials so it can't sign/publish to maven
+            when {
+                changeRequest()
+            }
+            environment {
+                CROWDIN = credentials('forge-crowdin')
+            }
+            steps {
+                cache(maxCacheSize: 250/*MB*/, caches: [
+                    [$class: 'ArbitraryFileCache', excludes: '', includes: 'output.txt', path: '${WORKSPACE}/projects/forge/build/extractRangeMap/'] //Cache the rangemap to help speed up builds
+                ]){
+                    sh './gradlew ${GRADLE_ARGS} :forge:publish -PcrowdinKey=${CROWDIN}'
+                }
+            }
+        }
+    }
+    post {
+        always {
+            archiveArtifacts artifacts: 'projects/forge/build/libs/**/*.*', fingerprint: true
+            //junit 'build/test-results/*/*.xml'
+            //jacoco sourcePattern: '**/src/*/java'
+        }
+    }
+}

LICENSE-header.txt

@@ -0,0 +1,16 @@
+Minecraft Forge
+Copyright (c) 2016-2019.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation version 2.1
+of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

LICENSE-new.txt

@@ -1,483 +0,0 @@
-Minecraft Forge is licensed under the terms of the LGPL 2.1 found
-here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and copied
-below.
-
-A note on authorship:
-All source artifacts are property of their original author, with
-the exclusion of the contents of the patches directory and others
-copied from it from time to time. Authorship of the contents of
-the patches directory is retained by the Minecraft Forge project.
-This is because the patches are partially machine generated
-artifacts, and are changed heavily due to the way forge works.
-Individual attribution within them is impossible.
-
-Consent:
-All contributions to Forge must consent to the release of any
-patch content to the Forge project.
-
-A note on infectivity:
-The LGPL is chosen specifically so that projects may depend on Forge
-features without being infected with its license. That is the 
-purpose of the LGPL. Mods and others using this code via ordinary
-Java mechanics for referencing libraries are specifically not bound
-by Forge's license for the Mod code.
-
-
-                  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.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            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

LICENSE.txt

@@ -1,18 +1,31 @@
-This minecraft mod, Forge Mod Loader, including all parts herein except as noted below,
-is licensed under the GNU LGPL v2.1 or later.
+Unless noted below, Minecraft Forge, Forge Mod Loader, and all 
+parts herein are licensed under the terms of the LGPL 2.1 found
+here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and 
+copied below.
 
-Homepage: https://github.com/MinecraftForge/FML
+Homepage: http://minecraftforge.net/
+          https://github.com/MinecraftForge/MinecraftForge
+          
 
-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.
+A note on authorship:
+All source artifacts are property of their original author, with
+the exclusion of the contents of the patches directory and others
+copied from it from time to time. Authorship of the contents of
+the patches directory is retained by the Minecraft Forge project.
+This is because the patches are partially machine generated
+artifacts, and are changed heavily due to the way forge works.
+Individual attribution within them is impossible.
 
-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.
+Consent:
+All contributions to Forge must consent to the release of any
+patch content to the Forge project.
+
+A note on infectivity:
+The LGPL is chosen specifically so that projects may depend on Forge
+features without being infected with its license. That is the 
+purpose of the LGPL. Mods and others using this code via ordinary
+Java mechanics for referencing libraries are specifically not bound
+by Forge's license for the Mod code.
 
 
 === MCP Data ===
@@ -26,14 +39,26 @@ I grant permission for some parts of FML to be redistributed outside the terms o
 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)
+License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/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)
+License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories)
 under any alternative open source license as classified by the OSI (http://opensource.org/licenses)
 
-========
+=========================================================================
+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.
+=========================================================================
+
 
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
@@ -43,6 +68,10 @@ under any alternative open source license as classified by the OSI (http://opens
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
                             Preamble
 
   The licenses for most software are designed to take away your
@@ -88,7 +117,7 @@ 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
@@ -144,7 +173,7 @@ 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
 
@@ -191,7 +220,7 @@ 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
@@ -249,7 +278,7 @@ 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.
@@ -300,7 +329,7 @@ Library will still fall under Section 6.)
 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
@@ -362,7 +391,7 @@ 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
@@ -403,7 +432,7 @@ 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
@@ -455,7 +484,7 @@ 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

MinecraftForge-Credits.txt

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

MinecraftForge-License.txt

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

NewFML.md

@@ -0,0 +1,127 @@
+# FML
+
+Entrypoint : ```FMLServiceProvider.onLoad```
+
+- Verify environment
+-- Check all libraries are present: ```accesstransformer```, ```coremod```, ```deobfuscator```
+-- Check versions are suitable: ```modlauncher```, ```accesstransformer```, ```coremod```, ```deobfuscator```
+- Find deobfuscated and patched MC
+-- If not found, trigger job to generate that (loaded later at FMLLaunchProvider.launch)
+
+Injected arguments:
+
+- ```mods``` : CSV list of mod files to load
+- ```modlist``` : JSON formatted list of mod files in a maven-like repository format
+
+Entrypoint : ```FMLServiceProvider.initializer```
+- Setup paths
+-- ```mods``` folder
+-- ```config``` folder
+- FML config file read (JSON?)
+- Trigger initial loading
+
+Entrypoint : ```FMLLaunchProvider.launch```
+- Launches the patched and deobfuscated game
+- - If that wasn't found it'll be generated from the vanilla jar and patch/deobf files (see above)
+- Possible we'll use an alternative launch for the development environment
+
+(A goal is that we pre-generate this JAR during forge installation or modpack installation)
+
+## Loading
+
+- First we discover all mods
+- - IModLocator instances present in system are found and queried to compile a master list of all mod artifacts of the three types
+- LANGPROVIDERs are added to the supported language system : IModLanguageProvider
+- The MODS from the list have their META-INF/mods.json file queried for mod instances to load
+- - MODS are cross-referenced for their language being available
+- - MODS are cross-referenced for their libraries being available
+- - MODS are cross-referenced for their MOD dependencies being available
+- - MODS with META-INF/coremods.json specification are loaded into the COREMOD system
+- - MODS with META-INF/accesstransformer.json are loaded into the ACCESSTRANSFORMER system
+- - MODS are enqueued to the background loading system
+- FMLLaunchProvider will be triggered from the ModLauncher to start the game
+
+## Game loading
+
+- Events triggered from loadGame will launch various phases of modloading as before
+-- Deprecation of old "FML" events in favour of Forge events
+-- If a mod hasn't completed scanning there might be a pause waiting for it to complete before loading (testing indicates this should be a very rare occurrence and isn't worse than existing status quo where all scanning and loading is on-thread)
+
+### ```IModLocator```
+
+Finds mods from various sources of various types
+manifest is queried for type: FMLModType
+
+- MOD : this file will be scanned as a mod. This is default if nothing is present
+- LIBRARY : this file will be added to the classpath and no further processing is done
+- LANGPROVIDER : this file will be loaded as a language provider
+
+#### ```ModsFolderLocator```
+
+- scans for jar files from mods folder
+-- able to load all types
+-- loads in all environments
+-- maybe able to do runtime name transformation for dev time?
+
+Standard mechanism to find and load mods
+
+#### ```ExplodedDirectoryLocator```
+
+- loads a directory as a mod
+-- only able to load mods
+-- should only load in dev env
+
+Intended as a mechanism to allow development of mods easily by pointing at a compiled output directory
+
+#### ```ArgumentModsLocator``` : NYI
+
+- loads mods from the arguments on the command line
+-- able to load all types
+-- loads in all environments
+
+### ```IModLanguageProvider```
+
+Provides mod and language provider services
+
+- Provides a means to transform a Mod File (from the IModLocator) into a list of modcontainer objects based on mods.json
+- Scanning work will be done in background threads
+- Language providers can be provided as JARs via the modlocator for ease of distribution
+
+#### ```FMLModLanguageProvider```
+
+This is the standard Java @Mod implementation provider
+
+- provided by default (always supported)
+- All scanning for @Mod will be done in the background thread
+
+#### ```ScalaModLanguageProvider```
+
+This is the scala language provider. It'll be provided separately as a JAR mod download.
+
+- API contract will need definition
+
+Other languages? Kotlin? Alternative Scala versions? Javascript?
+
+## Coremods
+
+Coremods are now forcefully separated into _injection_ and _runtime_ phases.
+
+### Injection
+
+Injection is the act of intercepting the loading of a class and modifying the inbound class with alterations such as additions, replacements and deletions
+
+Injections will be written using Javascript. Two functions are required: a function providing the list of injection sites, and the function to transform the injection site.
+
+All injection sites will need to be pre-specified by the coremod in their metadata. Lookup services should be provided in the Javascript API.
+
+Javascript API for common coremod injection tasks needs to be developed, to allow common best-practice tooling for these complex tasks.
+
+Runtime coremod code (code that has been injected) is Java as usual.
+
+## Background loading thread
+
+Early in loading, a background thread is triggered which will perform scanning tasks for common resources, such as @Mod instances and other annotations. This thread will also be responsible for loading any cached resources, either those defined at build time or pre-computed from previous runs. It may also be tasked with writing those precomputed resources.
+
+There will be a IPreLoaderJobProvider that will allow extension of the scope of these tasks
+
+

Paulscode IBXM Library License.txt

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

Paulscode SoundSystem CodecIBXM License.txt

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

README.md

@@ -1,63 +1,37 @@
 # How to install Forge: For Players
 
-Go to [http://files.minecraftforge.net](http://files.minecraftforge.net)
+Go to [the Forge website](http://files.minecraftforge.net)
  and select the minecraft version you wish to get forge for from the list.
 
 You can download the installer for the *Recommended Build* or the
- *Lastest build* there. Latest builds may have newer features  but may be
+ *Latest build* there. Latest builds may have newer features but may be
  more unstable as a result. The installer will attempt to install forge
  into your vanilla launcher environment, where you can then create a new
  profile using that version and play the game!
+ 
+For support and questions, visit [the Support Forum](http://www.minecraftforge.net/forum/forum/18-support-bug-reports/).
 
-Here is a short video from Rorax showing how to install and setup Forge.
+Here is a short video from Rorax showing how to install and setup Forge:
 
 [![HOWTO Install Forge](https://img.youtube.com/vi/lB3ArN_-3Oc/0.jpg)](https://www.youtube.com/watch?v=lB3ArN_-3Oc)
 
-For support and user questions, visit [http://www.minecraftforge.net](http://www.minecraftforge.net).
- 
 # How to install Forge: For Modders
 
-If you wish to setup a new mod for Forge, visit
- [http://files.minecraftforge.net](http://files.minecraftforge.net) and
- select the **MDK** download.
+[See the "Getting Started" section in the Forge Documentation](http://mcforge.readthedocs.io/en/latest/gettingstarted/).
 
-This is the `Modder Developer Kit` - basically, an example mod with all
- the tooling needed to create a Forge mod workspace ready for use in your
- IDE of choice.
-
-Here is a short video from @cpw showing how to install and setup the MDK
- in Intellij.
-
-[![HOWTO Install MDK](https://img.youtube.com/vi/PfmlNiHonV0/0.jpg)](https://www.youtube.com/watch?v=PfmlNiHonV0)
- 
 # How to install Forge: For those wishing to work on Forge itself
 
 If you wish to actually inspect Forge, submit PRs or otherwise work
- with Forge itself, you're in the right place! Clone this (either
- directly, or make a Fork first if you want to make a PR) and run
- ```gradlew.bat setupForge``` or ```gradlew setupForge```. This will download and 
- setup all the bits you need to have a functional Forge workspace.
-
-After that, open a workspace in your favorite IDE and import existing projects
- the projects folder. 
+ with Forge itself, you're in the right place!
  
-Here is a short video from @cpw showing how to install and setup Forge
- in Intellij.
- 
-[![HOWTO Install MDK](https://img.youtube.com/vi/yanCpy8p2ZE/0.jpg)](https://www.youtube.com/watch?v=yanCpy8p2ZE)
+ [See the guide to setting up a Forge workspace](http://mcforge.readthedocs.io/en/latest/forgedev/).
 
 ## Pull requests
 
-Pull requests should target the current default branch. Currently, that is 
- the 1.10.x branch for Minecraft 1.10.2.
-
-If you intend to modify a minecraft patch, or add a new one, always run
-```gradlew genPatches``` to generate your patch and validate that you
-are not doing anything unexpected in your patch.
+[See the "Making Changes and Pull Requests" section in the Forge documentation](http://mcforge.readthedocs.io/en/latest/forgedev/#making-changes-and-pull-requests).
 
 ### Contributor License Agreement
-As stated in the (https://github.com/MinecraftForge/MinecraftForge/blob/1.10.x/LICENSE-new.txt)
- file, we require all contributors to acknowledge the Forge Contributor
- License Agreement. Please ensure you have a valid email address
+We require all contributors to acknowledge the [Forge Contributor
+ License Agreement](https://cla-assistant.io/MinecraftForge/MinecraftForge). Please ensure you have a valid email address
  associated with your github account to do this. If you have previously
- signed it, you should be OK.
+ signed it, you should be OK.

SUPPORT.md

@@ -0,0 +1,146 @@
+Getting Support Surrounding Forge
+=================================
+
+**If you do not want to read the following wall of text, no matter its relevance for helping get your issue resolved quickly, please refer to the [Forge Forums](http://www.minecraftforge.net/forum/forum/18-support-bug-reports/) for support.**
+
+Before reporting an issue on this repository's bug tracker, please carefully read this document. There are various resources that are more likely to be able to help you with certain kinds of issues. This document provides instructions on how to determine which place best to report to.
+
+*Note: While this guide generally is more geared towards end-user problems, modders should also read it before reporting any issue with Forge in order to ensure it actually is one. This does of course not cover feature suggestions.*
+
+### Contents
+
+ 1. [Identifying the Source of a Problem](#identifying-the-source-of-a-problem)
+    1. [Analyzing a Stacktrace](#analyzing-a-stacktrace)
+    2. [Isolating an Issue](#isolating-an-issue)
+ 2. [Choosing the Correct Support Channel](#choosing-the-correct-support-channel)
+    1. [Forge Support](#forge-support)
+    2. [Mod Support](#mod-support)
+    3. [Vanilla Support](#vanilla-support)
+ 3. [Writing a Helpful Bug Report](#writing-a-helpful-bug-report)
+    1. [Preventing Duplicates and Unnecessary Reports](#preventing-duplicates-and-unnecessary-reports)
+    2. [Required Information](#required-information)
+    3. [Markdown Issue Template](#markdown-issue-template)
+    4. [Waiting for an Issue to Be Resolved](#waiting-for-an-issue-to-be-resolved)
+
+Identifying the Source of a Problem
+-----------------------------------
+
+You're most likely to get fast and valuable responses to your issues if you report them in the correct place. For this, you need to find the root cause of the problem.
+
+The most important source for this information are the log files Forge creates for every run of the game. You can find them in the `logs` subdirectory of your Minecraft game directory. The most important log file is `latest.log` which contains all of Forge's and any mod's output for `info` of above. `debug.log` contains all the logs in `latest.log` plus the `debug` logs for more detailed debugging.
+
+If you're faced by a crash, consult these logs files first. Near the end of the log should be a section labelled 'Minecraft Crash Report', and after it, one about `a detailed walkthrough of the error, ...`. In these sections, you'll see a bunch of lines that look like
+
+```
+at some.words.related.to.a.mod.MoreWords(MoreWords.java:number)
+```
+
+These lines are the most important part of a crash log, called the stacktrace, because they pinpoint the place in the code where something went irrecoverably wrong. Mod authors usually name their code so that these lines describe what the game was doing when it crashed. The further down one of these lines is, the earlier that piece of code ran, so at the bottom you'll see the place where Minecraft started, and at the top is where it stopped. You should use this information to figure out who to report the bug to.
+
+### Analyzing a Stacktrace
+
+You can generally tell pretty quickly what caused the error at the head of your stacktrace, simply follow these rules:
+
+ 1. If you can find the name of a mod in the trace, that mod most likely is the culprit.
+    - Be aware that you may find multiple mods as participants of a crash. In that case, you can either report to both or try to reason (using the names in the stacktrace) about which mod is at fault.
+ 2. If you can only find Forge (usually starting with `net.minecraftforge`) alongside Vanilla (usually starting with `net.minecraft`) references, chances are that you have found a bug in Forge. In this case, use one of the various [support channels](#forge-support) listed below.
+    - The occurence of a single call to Forge somewhere in the stacktrace *does not* warrant a report to Forge if there are mods present in the crash report.
+ 3. If there's no mention of Forge or a mod, but any Vanilla class, you might have found a Vanilla bug. You should probably still report it via the Forge channels first, however, due the nature of modded environments and the rarity of Vanilla crash bugs.
+ 4. Always check whether there's a mention of coremods at the beginning of a crash report. If there is and you can't find any clear culprit, consider reporting to these coremods first, since they are free to change any of the code executed in your environment.
+
+The rules are numbered in decreasing priority, which means that you should always prefer finding a mod in a crash report over directly jumping to conclusions about Forge or even Vanilla.
+
+### Isolating an Issue
+
+A significant step of reporting an issue, after having found the involved parties, is reliably reproducing it to identify potential incompatibilities or weird interactions between mods. If you're unable to pinpoint a bug to a set of mods and just randomly report it to any mod, chances are it won't get much attention and hence not a fix.
+
+Reliable methods of isolating the issue are listed below:
+
+ - **Retrace your last steps before the crash/bug occurred.** It might sound too simple, but a big part of reliably reproducing an issue is determining the steps required to trigger it. If you can't exactly remember what you last did, looking at the stacktrace again can also help you a bit, since there are often descriptive names in there which reflect an action you could take, such as using an item or placing a block.
+ - **Reduce the number of mod interactions.** You can achieve this in multiple ways. One of them is simply disabling any compatibility layers between involved mods via configuration files. The other one, which takes a little more effort, is actually removing mods from your instance. But don't be afraid, you won't have to remove mods one-by-one if you follow these steps (known as a binary search):
+   1. Move half the mods out of your instance (obviously keep those definitely participating in the issue).
+   2. If the issue persists after another try of reproducing it, repeat from step 1 one by halving the mod list again.
+   3. If the issue does not occur anymore without the other half, repeat from step 1 but instead discard the half you just used and split the other one (plus any definitely required mods).
+   4. Repeat these steps until you can't remove any more mods from your instance without also 'solving' the issue. This set of mods can serve as a basis for your issue report.
+
+Choosing the Correct Support Channel
+-------------------------------------
+
+The place you need to report issues to varies depending on the source of the problem. Below you can find a list of support channels you can usually consult for each of the sources listed in the previous section.
+
+Please note that this list has to be considered incomplete as there is a large number of sub-communities within the Minecraft modding world. You should always prefer channels you know and have access to over any of those listed below which would require extra effort on your part.
+
+### Forge Support
+
+If you're certain you've found an issue that is directly caused by Forge, you have the following three platforms available for dealing with it, with decreasing relevance for end-users:
+
+ 1. **Forge Forums:** There's a dedicated [Support & Bug Report](http://www.minecraftforge.net/forum/forum/18-support-bug-reports/) section on the Forge forums, which is led by team of moderators and volunteers who will try to deal with your reports as quickly as possible. *As a player you should probably report here first.*
+   - For modders, there also is a separate [Modder Support](http://www.minecraftforge.net/forum/forum/70-modder-support/) section where you can ask all your development-related questions. *You should prefer this section for coding help.*
+ 2. **Forge IRC Channel:** You can find a lot of help on the official [`#minecraftforge`](irc://irc.esper.net:6667/minecraftforge) channel on EsperNet. Especially smaller issues that you quickly need help with could be reported there. *Be aware that the channel is more suited towards development questions, so while you may get support there as a player, you should almost always prefer the forums.*
+ 3. **Forge Issue Tracker:** If you're absolutely certain that you've found an issue in the Forge codebase (e.g. you're a modder yourself and have analyzed the stacktrace and relevant code), don't refrain from reporting it on this repository's [issue tracker](https://github.com/MinecraftForge/MinecraftForge/issues). *Please do not use the issues as a means of getting coding help. For developers, the IRC and the [official documentation](https://mcforge.readthedocs.io) are the best sources of information.*
+
+### Mod Support
+
+A lot of mods also use GitHub or other source management systems and their integrated issue trackers. The following options will give you the best chances of reporting your issue in the right place:
+
+ - **CurseForge:** Many mods are hosted on the [CurseForge platform](https://minecraft.curseforge.com) nowadays. Chances are you already downloaded them from there or as a part of a modpack hosted there. Projects may specify an issue reporting link on their own page, so simply look for it on the mod's project page and you should be directed to the preferred means of error reporting.
+ - **Searching for a repository directly:** You may need to try and find a repository directly on source control sites. The most common ones are [GitHub](https://github.com) and [BitBucket](https://bitbucket.org). Both come with search capabilities, so simply try to search for the mod's name.
+
+### Vanilla Support
+
+Just like Forge or mods, Mojang has its own issue tracker for Vanilla Minecraft. This official [bug tracker](https://bugs.mojang.com/projects/MC/issues/) has the exclusive purpose of managing any concrete issues with the game's code and functionality. It is *not* a place for requesting any features or getting help with playing the game, similar to the Forge issue tracker.
+
+Writing a Helpful Bug Report
+----------------------------
+
+Now that you've identified the source of your issue and decided on the correct support channel, it's time to actually write your report. Before you actually try to blindly create it, however, you should first check if the problem was noticed or even fixed already.
+
+### Preventing Duplicates and Unnecessary Reports
+Use the target issue tracker's search functionality to look for issues which have descriptions similar to yours, but make sure to also search for already closed issues. If you can find one, verify it is in fact the same (or a very similar issue) and simply comment on it if you have anything else to contribute to the discussion, such as other steps to reproduce it. *Do not create duplicates of an existing issue, since it only puts extra effort on maintainers to recognize and close/mark them.*
+
+Additionally, always check the *latest* changelogs of Forge and participating mods to find out if the bug was already noticed and fixed by the developer. Often the maintainer may only support newer versions of the game, so also check the changelogs for versions of Minecraft you don't actually actively play. If the issue was adressed already, *do not report it*, even if the fix only exists for a newer version of the game, since the developer probably had a good reason to do so. If your issue only exists with versions of a mod that are for very old versions of the game, also refrain from reporting them, considering most modders only support the two latest versions of Minecraft, if at all.
+
+### Required Information
+If you're certain that your issue went unnoticed up until now, you can get to actually writing up the report. Below you can find a list of the *required* information any bug report should contain:
+
+ - **Minecraft Version:** Although many developers can deduce the Minecraft version in use from the mod's version, it is still an important piece of information to include, since it helps maintainers more easily decide whether to look into your issue at all or whether to close it right away due to being for an outdated version.
+ - **Forge Version:** The Forge API is in constant flux and while breaking changes are limited to major Minecraft updates, new bugs or regressions might creep in during active development or newer versions than a mod was built with might change semantics slightly that manifest themselves for this mod.
+ - **Mod Version:** Just like the Forge and Minecraft version, this is crucial for quickly telling where an issue might come from. *If you're reporting an issue caused by Forge that only occurs with a certain mod installed, include this mod here. No mod version is required if it's a pure Forge bug.*
+ - **Complete List of Mods:** In order to reliably analyze a bug, developers need the exact same context as you do when trying to find its cause. Hence, you should always include a *full list of mods with their corresponding version* in your report. Note that you should probably only include the ones you found by [isolating the issue](#isolating-an-issue).
+ - **Steps to Reproduce:** You should always include a list of steps required to provoke an issue to occur. Without it, developers can only take rough guesses at what might cause the bug. Try to reduce the amount of steps to a bare minimum, to make reproducing the issue easier. If you require a sophisticated setup to get even close to the issue, you might want to consider including your save file in your report.
+ - **Full Log:** This is probably the most important part of your bug report. You *always* have to include the full log (`debug.log` from earlier), since it is the only way of telling what has caused an issue in code. *Do not* paste the full log as plain text in your report, but use [GitHub Gist](https://gist.github.com) instead and link to that from your report.
+
+### Markdown Issue Template
+GitHub and BitBucket allow you to use the Markdown format for writing your issues. Below you can find a simple template that you can copy and fill in with your data. `{variables}` are written in braces and are supposed to be replaced by you with the information the variable name indicates. Everything behind two slashes (`//`) has to be interpreted as a comment and should be removed. If you want to include any link, you have to write in the `[title](url)` form. For further information on Markdown, see [this cheatsheet](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet).
+
+```markdown
+**Minecraft Version:** {mc version}
+
+**Forge Version:** {forge version}
+
+**Mod Version:** {mod version} // Remove this line if you're reporting to Forge and no specific mod is involved
+
+[**Full Log**]({link to gist/pastebin with full log})
+
+**Mods in This Instance:**
+| Name                     | Version     |
+| ------------------------ | ----------- |
+| [{mod 1}]({download 1})  | {version 1} | // The download links are entirely optional
+| {mod 2}                  | {version 2} |
+| {mod 3}                  | {version 3} |
+| ...                      | ...         |
+
+**Steps to Reproduce:**
+ 1. Do this
+ 2. Then do that
+ 3. ...
+```
+
+*Note: The mod list here is formatted as table for easy reading (when displayed) and to look nice in text. Markdown does not care about any alignment of the spaces, so you can simply write individual rows of the table as* `| {mod name} | {version} |` *without having to care about the spacing.*
+
+### Waiting for an Issue to Be Resolved
+After you have written your bug report, it is time to *wait*. Please be *patient* after submitting your issue, since it probably isn't the only one. If there's no response after 5 minutes or even a day of writing it, *do not* try to bump the issue by commenting on it, people *will* read it in due time. The only excuse for bumping a report is if it is a *critical* bug that prevents you from playing the game.
+
+Every project has a different way of dealing with issues, so don't wonder if there's no comment on it, but somebody "labels" it with certain markers. This helps developers to more easily keep track of bugs and priorities. When any further input from you is required, you will be asked specifically. Do not bug anyone through other channels about resolving your issue.
+
+Once your issue is closed, you will know whether it was valid or turned out to be irreproducible. If you included all of the data from above in your report, chances are that the latter won't be the case.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Sep 14 12:28:28 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,47 +6,6 @@
 ##
 ##############################################################################
 
-# 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"
@@ -61,9 +20,49 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# 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
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     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=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @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 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=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows 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.
@@ -60,11 +59,6 @@ set _SKIP=2
 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

jsons/1.12-dev.json

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

jsons/1.12-rel.json

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

jsons/1.12.1-dev.json

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

jsons/1.12.1-rel.json

@@ -0,0 +1,157 @@
+{
+"install": {
+  "profileName": "@project@",
+  "target":"@minecraft_version@-@project@@version@",
+  "path":"@artifact@",
+  "version":"@project@ @version@",
+  "filePath":"@universal_jar@",
+  "welcome":"Welcome to the simple @project@ installer.",
+  "minecraft":"@minecraft_version@",
+  "mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
+  "logo":"/big_logo.png",
+  "modList":"none"
+},
+"versionInfo": {
+  "id": "@minecraft_version@-@project@@version@",
+  "time": "@timestamp@",
+  "releaseTime": "1960-01-01T00:00:00-0700",
+  "type": "release",
+  "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker --versionType Forge",
+  "mainClass": "net.minecraft.launchwrapper.Launch",
+  "inheritsFrom": "1.12.1",
+  "jar": "1.12.1",
+  "logging": {},
+  "libraries": [
+    {
+      "name": "@artifact@",
+      "url": "http://files.minecraftforge.net/maven/"
+    },
+    {
+      "name": "net.minecraft:launchwrapper:1.12",
+      "serverreq":true
+    },
+    {
+      "name": "org.ow2.asm:asm-all:5.2",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "2ea49e08b876bbd33e0a7ce75c8f371d29e1f10a" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "jline:jline:2.13",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "2d9530d0a25daffaffda7c35037b046b627bb171" ],
+      "serverreq":true,
+      "clientreq":false
+    },
+    {
+      "name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "com.typesafe:config:1.2.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-compiler:2.11.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-library:2.11.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-reflect:2.11.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-swing_2.11:1.0.1",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "org.scala-lang:scala-xml_2.11:1.0.2",
+      "url" : "http://files.minecraftforge.net/maven/",
+      "checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ],
+      "serverreq":true,
+      "clientreq":true
+    },
+    {
+      "name": "lzma:lzma:0.0.1",
+      "serverreq":true
+    },
+    {
+      "name": "net.sf.jopt-simple:jopt-simple:5.0.3",
+      "serverreq":true
+    },
+    {
+      "name": "java3d:vecmath:1.5.2",
+      "clientreq":true,
+      "serverreq":true
+    },
+    {
+      "name": "net.sf.trove4j:trove4j:3.0.3",
+      "clientreq":true,
+      "serverreq":true
+    }
+  ]
+},
+"optionals": [
+    {
+        "name": "Mercurius",
+        "client": true,
+        "server": true,
+        "default": true,
+        "inject": true,
+        "desc": "A mod that collects statistics about Minecraft and your system.<br>Useful for Forge to understand how Minecraft/Forge are used.",
+        "url": "http://www.minecraftforge.net/forum/index.php?topic=43278.0",
+        "artifact": "net.minecraftforge:MercuriusUpdater:1.12.1",
+        "maven": "http://files.minecraftforge.net/maven/"
+    }
+]
+}

jsons/1.12.1.json

@@ -0,0 +1,724 @@
+{
+    "assetIndex": {
+        "id": "1.12",
+        "sha1": "c2ba0c4da30cce204c70db2ebc32a942cea8c7dd",
+        "size": 169015,
+        "url": "https://launchermeta.mojang.com/mc/assets/1.12/c2ba0c4da30cce204c70db2ebc32a942cea8c7dd/1.12.json",
+        "totalSize": 127300317
+    },
+    "assets": "1.12",
+    "downloads": {
+        "client": {
+            "sha1": "83385d346cf7f97d1e447b888750fb88e9928b93",
+            "size": 10178558,
+            "url": "https://launcher.mojang.com/mc/game/1.12.1/client/83385d346cf7f97d1e447b888750fb88e9928b93/client.jar"
+        },
+        "server": {
+            "sha1": "561c7b2d54bae80cc06b05d950633a9ac95da816",
+            "size": 30221337,
+            "url": "https://launcher.mojang.com/mc/game/1.12.1/server/561c7b2d54bae80cc06b05d950633a9ac95da816/server.jar"
+        }
+    },
+    "id": "1.12.1",
+    "libraries": [
+        {
+            "name": "com.mojang:patchy:1.1",
+            "downloads": {
+                "artifact": {
+                    "size": 15817,
+                    "sha1": "aef610b34a1be37fa851825f12372b78424d8903",
+                    "path": "com/mojang/patchy/1.1/patchy-1.1.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/patchy/1.1/patchy-1.1.jar"
+                }
+            }
+        },
+        {
+            "name": "oshi-project:oshi-core:1.1",
+            "downloads": {
+                "artifact": {
+                    "size": 30973,
+                    "sha1": "9ddf7b048a8d701be231c0f4f95fd986198fd2d8",
+                    "path": "oshi-project/oshi-core/1.1/oshi-core-1.1.jar",
+                    "url": "https://libraries.minecraft.net/oshi-project/oshi-core/1.1/oshi-core-1.1.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.dev.jna:jna:4.4.0",
+            "downloads": {
+                "artifact": {
+                    "size": 1091208,
+                    "sha1": "cb208278274bf12ebdb56c61bd7407e6f774d65a",
+                    "path": "net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar",
+                    "url": "https://libraries.minecraft.net/net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.dev.jna:platform:3.4.0",
+            "downloads": {
+                "artifact": {
+                    "size": 913436,
+                    "sha1": "e3f70017be8100d3d6923f50b3d2ee17714e9c13",
+                    "path": "net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar",
+                    "url": "https://libraries.minecraft.net/net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar"
+                }
+            }
+        },
+        {
+            "name": "com.ibm.icu:icu4j-core-mojang:51.2",
+            "downloads": {
+                "artifact": {
+                    "size": 1634692,
+                    "sha1": "63d216a9311cca6be337c1e458e587f99d382b84",
+                    "path": "com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar",
+                    "url": "https://libraries.minecraft.net/com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar"
+                }
+            }
+        },
+        {
+            "name": "net.sf.jopt-simple:jopt-simple:5.0.3",
+            "downloads": {
+                "artifact": {
+                    "size": 78175,
+                    "sha1": "cdd846cfc4e0f7eefafc02c0f5dce32b9303aa2a",
+                    "path": "net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.jar",
+                    "url": "https://libraries.minecraft.net/net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:codecjorbis:20101023",
+            "downloads": {
+                "artifact": {
+                    "size": 103871,
+                    "sha1": "c73b5636faf089d9f00e8732a829577de25237ee",
+                    "path": "com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:codecwav:20101023",
+            "downloads": {
+                "artifact": {
+                    "size": 5618,
+                    "sha1": "12f031cfe88fef5c1dd36c563c0a3a69bd7261da",
+                    "path": "com/paulscode/codecwav/20101023/codecwav-20101023.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/codecwav/20101023/codecwav-20101023.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:libraryjavasound:20101123",
+            "downloads": {
+                "artifact": {
+                    "size": 21679,
+                    "sha1": "5c5e304366f75f9eaa2e8cca546a1fb6109348b3",
+                    "path": "com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:librarylwjglopenal:20100824",
+            "downloads": {
+                "artifact": {
+                    "size": 18981,
+                    "sha1": "73e80d0794c39665aec3f62eee88ca91676674ef",
+                    "path": "com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:soundsystem:20120107",
+            "downloads": {
+                "artifact": {
+                    "size": 65020,
+                    "sha1": "419c05fe9be71f792b2d76cfc9b67f1ed0fec7f6",
+                    "path": "com/paulscode/soundsystem/20120107/soundsystem-20120107.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"
+                }
+            }
+        },
+        {
+            "name": "io.netty:netty-all:4.1.9.Final",
+            "downloads": {
+                "artifact": {
+                    "size": 3511093,
+                    "sha1": "0097860965d6a0a6b98e7f569f3f966727b8db75",
+                    "path": "io/netty/netty-all/4.1.9.Final/netty-all-4.1.9.Final.jar",
+                    "url": "https://libraries.minecraft.net/io/netty/netty-all/4.1.9.Final/netty-all-4.1.9.Final.jar"
+                }
+            }
+        },
+        {
+            "name": "com.google.guava:guava:21.0",
+            "downloads": {
+                "artifact": {
+                    "size": 2521113,
+                    "sha1": "3a3d111be1be1b745edfa7d91678a12d7ed38709",
+                    "path": "com/google/guava/guava/21.0/guava-21.0.jar",
+                    "url": "https://libraries.minecraft.net/com/google/guava/guava/21.0/guava-21.0.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.commons:commons-lang3:3.5",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 780282,
+                        "sha1": "8ca309192f104265c67a1570245ae827a8650af9",
+                        "path": "org/apache/commons/commons-lang3/3.5/commons-lang3-3.5-tests.jar",
+                        "url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 479881,
+                    "sha1": "6c6c702c89bfff3cd9e80b04d668c5e190d588c6",
+                    "path": "org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-io:commons-io:2.5",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 372821,
+                        "sha1": "32b15369c83e9435ced8cd3fbe652dfba9c497ef",
+                        "path": "commons-io/commons-io/2.5/commons-io-2.5-tests.jar",
+                        "url": "https://libraries.minecraft.net/commons-io/commons-io/2.5/commons-io-2.5-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 208700,
+                    "sha1": "2852e6e05fbb95076fc091f6d1780f1f8fe35e0f",
+                    "path": "commons-io/commons-io/2.5/commons-io-2.5.jar",
+                    "url": "https://libraries.minecraft.net/commons-io/commons-io/2.5/commons-io-2.5.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-codec:commons-codec:1.10",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 256617,
+                        "sha1": "df86446f0fe79f15ce8048c0ed04d1a92fa8d265",
+                        "path": "commons-codec/commons-codec/1.10/commons-codec-1.10-tests.jar",
+                        "url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.10/commons-codec-1.10-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 284184,
+                    "sha1": "4b95f4897fa13f2cd904aee711aeafc0c5295cd8",
+                    "path": "commons-codec/commons-codec/1.10/commons-codec-1.10.jar",
+                    "url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.10/commons-codec-1.10.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.jinput:jinput:2.0.5",
+            "downloads": {
+                "artifact": {
+                    "size": 208338,
+                    "sha1": "39c7796b469a600f72380316f6b1f11db6c2c7c4",
+                    "path": "net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar",
+                    "url": "https://libraries.minecraft.net/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.jutils:jutils:1.0.0",
+            "downloads": {
+                "artifact": {
+                    "size": 7508,
+                    "sha1": "e12fe1fda814bd348c1579329c86943d2cd3c6a6",
+                    "path": "net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar",
+                    "url": "https://libraries.minecraft.net/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"
+                }
+            }
+        },
+        {
+            "name": "com.google.code.gson:gson:2.8.0",
+            "downloads": {
+                "artifact": {
+                    "size": 231952,
+                    "sha1": "c4ba5371a29ac9b2ad6129b1d39ea38750043eff",
+                    "path": "com/google/code/gson/gson/2.8.0/gson-2.8.0.jar",
+                    "url": "https://libraries.minecraft.net/com/google/code/gson/gson/2.8.0/gson-2.8.0.jar"
+                }
+            }
+        },
+        {
+            "name": "com.mojang:authlib:1.5.25",
+            "downloads": {
+                "artifact": {
+                    "size": 65621,
+                    "sha1": "9834cdf236c22e84b946bba989e2f94ef5897c3c",
+                    "path": "com/mojang/authlib/1.5.25/authlib-1.5.25.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/authlib/1.5.25/authlib-1.5.25.jar"
+                }
+            }
+        },
+        {
+            "name": "com.mojang:realms:1.10.17",
+            "downloads": {
+                "artifact": {
+                    "size": 3257404,
+                    "sha1": "e6a623bf93a230b503b0e3ae18c196fcd5aa3299",
+                    "path": "com/mojang/realms/1.10.17/realms-1.10.17.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/realms/1.10.17/realms-1.10.17.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.commons:commons-compress:1.8.1",
+            "downloads": {
+                "artifact": {
+                    "size": 365552,
+                    "sha1": "a698750c16740fd5b3871425f4cb3bbaa87f529d",
+                    "path": "org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.httpcomponents:httpclient:4.3.3",
+            "downloads": {
+                "artifact": {
+                    "size": 589512,
+                    "sha1": "18f4247ff4572a074444572cee34647c43e7c9c7",
+                    "path": "org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-logging:commons-logging:1.1.3",
+            "downloads": {
+                "artifact": {
+                    "size": 62050,
+                    "sha1": "f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f",
+                    "path": "commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar",
+                    "url": "https://libraries.minecraft.net/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.httpcomponents:httpcore:4.3.2",
+            "downloads": {
+                "artifact": {
+                    "size": 282269,
+                    "sha1": "31fbbff1ddbf98f3aa7377c94d33b0447c646b6e",
+                    "path": "org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar"
+                }
+            }
+        },
+        {
+            "name": "it.unimi.dsi:fastutil:7.1.0",
+            "downloads": {
+                "artifact": {
+                    "size": 17655579,
+                    "sha1": "9835253257524c1be7ab50c057aa2d418fb72082",
+                    "path": "it/unimi/dsi/fastutil/7.1.0/fastutil-7.1.0.jar",
+                    "url": "https://libraries.minecraft.net/it/unimi/dsi/fastutil/7.1.0/fastutil-7.1.0.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.logging.log4j:log4j-api:2.8.1",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 192791,
+                        "sha1": "9d0c48c6186ea7f7f443803801ee7c9469129b85",
+                        "path": "org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1-tests.jar",
+                        "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 228859,
+                    "sha1": "e801d13612e22cad62a3f4f3fe7fdbe6334a8e72",
+                    "path": "org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.logging.log4j:log4j-core:2.8.1",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 1412295,
+                        "sha1": "ef19122d4ad5de8da81fafabd007403007c8a832",
+                        "path": "org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1-tests.jar",
+                        "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 1402925,
+                    "sha1": "4ac28ff2f1ddf05dae3043a190451e8c46b73c31",
+                    "path": "org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209",
+            "rules": [
+                {
+                    "action": "allow"
+                },
+                {
+                    "action": "disallow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 1047168,
+                    "sha1": "697517568c68e78ae0b4544145af031c81082dfe",
+                    "path": "org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209",
+            "rules": [
+                {
+                    "action": "allow"
+                },
+                {
+                    "action": "disallow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 173887,
+                    "sha1": "d51a7c040a721d13efdfbd34f8b257b2df882ad0",
+                    "path": "org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209",
+            "natives": {
+                "linux": "natives-linux",
+                "osx": "natives-osx",
+                "windows": "natives-windows"
+            },
+            "rules": [
+                {
+                    "action": "allow"
+                },
+                {
+                    "action": "disallow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 578680,
+                        "sha1": "931074f46c795d2f7b30ed6395df5715cfd7675b",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar"
+                    },
+                    "natives-osx": {
+                        "size": 426822,
+                        "sha1": "bcab850f8f487c3f4c4dbabde778bb82bd1a40ed",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"
+                    },
+                    "natives-windows": {
+                        "size": 613748,
+                        "sha1": "b84d5102b9dbfabfeb5e43c7e2828d98a7fc80e0",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 22,
+                    "sha1": "b04f3ee8f5e43fa3b162981b50bb72fe1acabb33",
+                    "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 1045632,
+                    "sha1": "7707204c9ffa5d91662de95f0a224e2f721b22af",
+                    "path": "org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 173887,
+                    "sha1": "f0e612c840a7639c1f77f68d72a28dae2f0c8490",
+                    "path": "org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
+            "natives": {
+                "linux": "natives-linux",
+                "osx": "natives-osx",
+                "windows": "natives-windows"
+            },
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 578539,
+                        "sha1": "d898a33b5d0a6ef3fed3a4ead506566dce6720a5",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar"
+                    },
+                    "natives-osx": {
+                        "size": 468116,
+                        "sha1": "79f5ce2fea02e77fe47a3c745219167a542121d7",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar"
+                    },
+                    "natives-windows": {
+                        "size": 613680,
+                        "sha1": "78b2a55ce4dc29c6b3ec4df8ca165eba05f9b341",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar"
+                    }
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "net.java.jinput:jinput-platform:2.0.5",
+            "natives": {
+                "linux": "natives-linux",
+                "osx": "natives-osx",
+                "windows": "natives-windows"
+            },
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 10362,
+                        "sha1": "7ff832a6eb9ab6a767f1ade2b548092d0fa64795",
+                        "path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar"
+                    },
+                    "natives-osx": {
+                        "size": 12186,
+                        "sha1": "53f9c919f34d2ca9de8c51fc4e1e8282029a9232",
+                        "path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar"
+                    },
+                    "natives-windows": {
+                        "size": 155179,
+                        "sha1": "385ee093e01f587f30ee1c8a2ee7d408fd732e16",
+                        "path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar"
+                    }
+                }
+            }
+        },
+        {
+            "name": "com.mojang:text2speech:1.10.3",
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 7833,
+                        "sha1": "ab7896aec3b3dd272b06194357f2d98f832c0cfc",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar"
+                    },
+                    "natives-windows": {
+                        "size": 81217,
+                        "sha1": "84a4b856389cc4f485275b1f63497a95a857a443",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 11055,
+                    "sha1": "48fd510879dff266c3815947de66e3d4809f8668",
+                    "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "com.mojang:text2speech:1.10.3",
+            "natives": {
+                "linux": "natives-linux",
+                "windows": "natives-windows"
+            },
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 7833,
+                        "sha1": "ab7896aec3b3dd272b06194357f2d98f832c0cfc",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar"
+                    },
+                    "natives-windows": {
+                        "size": 81217,
+                        "sha1": "84a4b856389cc4f485275b1f63497a95a857a443",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 11055,
+                    "sha1": "48fd510879dff266c3815947de66e3d4809f8668",
+                    "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "ca.weblite:java-objc-bridge:1.0.0",
+            "natives": {
+                "osx": "natives-osx"
+            },
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-osx": {
+                        "size": 5629,
+                        "sha1": "08befab4894d55875f33c3d300f4f71e6e828f64",
+                        "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 40502,
+                    "sha1": "6ef160c3133a78de015830860197602ca1c855d3",
+                    "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar",
+                    "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar"
+                }
+            }
+        },
+        {
+            "name": "ca.weblite:java-objc-bridge:1.0.0",
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-osx": {
+                        "size": 5629,
+                        "sha1": "08befab4894d55875f33c3d300f4f71e6e828f64",
+                        "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 40502,
+                    "sha1": "6ef160c3133a78de015830860197602ca1c855d3",
+                    "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar",
+                    "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar"
+                }
+            }
+        }
+    ],
+    "logging": {
+        "client": {
+            "file": {
+                "id": "client-1.12.xml",
+                "sha1": "ef4f57b922df243d0cef096efe808c72db042149",
+                "size": 877,
+                "url": "https://launchermeta.mojang.com/mc/log_configs/client-1.12.xml/ef4f57b922df243d0cef096efe808c72db042149/client-1.12.xml"
+            },
+            "argument": "-Dlog4j.configurationFile=${path}",
+            "type": "log4j2-xml"
+        }
+    },
+    "mainClass": "net.minecraft.client.main.Main",
+    "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}",
+    "minimumLauncherVersion": 18,
+    "releaseTime": "2017-08-03T12:40:39+00:00",
+    "time": "2017-08-03T12:41:21+00:00",
+    "type": "release"
+}

jsons/1.12.2-dev.json

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

jsons/1.12.2-rel.json

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

jsons/1.12.2.json

@@ -0,0 +1,724 @@
+{
+    "assetIndex": {
+        "id": "1.12",
+        "sha1": "4bdf1632edbb01b4fee0e1311b8f3821cbcff2fc",
+        "size": 171856,
+        "url": "https://launchermeta.mojang.com/mc/assets/1.12/4bdf1632edbb01b4fee0e1311b8f3821cbcff2fc/1.12.json",
+        "totalSize": 129113854
+    },
+    "assets": "1.12",
+    "downloads": {
+        "client": {
+            "sha1": "0f275bc1547d01fa5f56ba34bdc87d981ee12daf",
+            "size": 10180113,
+            "url": "https://launcher.mojang.com/mc/game/1.12.2/client/0f275bc1547d01fa5f56ba34bdc87d981ee12daf/client.jar"
+        },
+        "server": {
+            "sha1": "886945bfb2b978778c3a0288fd7fab09d315b25f",
+            "size": 30222121,
+            "url": "https://launcher.mojang.com/mc/game/1.12.2/server/886945bfb2b978778c3a0288fd7fab09d315b25f/server.jar"
+        }
+    },
+    "id": "1.12.2",
+    "libraries": [
+        {
+            "name": "com.mojang:patchy:1.1",
+            "downloads": {
+                "artifact": {
+                    "size": 15817,
+                    "sha1": "aef610b34a1be37fa851825f12372b78424d8903",
+                    "path": "com/mojang/patchy/1.1/patchy-1.1.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/patchy/1.1/patchy-1.1.jar"
+                }
+            }
+        },
+        {
+            "name": "oshi-project:oshi-core:1.1",
+            "downloads": {
+                "artifact": {
+                    "size": 30973,
+                    "sha1": "9ddf7b048a8d701be231c0f4f95fd986198fd2d8",
+                    "path": "oshi-project/oshi-core/1.1/oshi-core-1.1.jar",
+                    "url": "https://libraries.minecraft.net/oshi-project/oshi-core/1.1/oshi-core-1.1.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.dev.jna:jna:4.4.0",
+            "downloads": {
+                "artifact": {
+                    "size": 1091208,
+                    "sha1": "cb208278274bf12ebdb56c61bd7407e6f774d65a",
+                    "path": "net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar",
+                    "url": "https://libraries.minecraft.net/net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.dev.jna:platform:3.4.0",
+            "downloads": {
+                "artifact": {
+                    "size": 913436,
+                    "sha1": "e3f70017be8100d3d6923f50b3d2ee17714e9c13",
+                    "path": "net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar",
+                    "url": "https://libraries.minecraft.net/net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar"
+                }
+            }
+        },
+        {
+            "name": "com.ibm.icu:icu4j-core-mojang:51.2",
+            "downloads": {
+                "artifact": {
+                    "size": 1634692,
+                    "sha1": "63d216a9311cca6be337c1e458e587f99d382b84",
+                    "path": "com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar",
+                    "url": "https://libraries.minecraft.net/com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar"
+                }
+            }
+        },
+        {
+            "name": "net.sf.jopt-simple:jopt-simple:5.0.3",
+            "downloads": {
+                "artifact": {
+                    "size": 78175,
+                    "sha1": "cdd846cfc4e0f7eefafc02c0f5dce32b9303aa2a",
+                    "path": "net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.jar",
+                    "url": "https://libraries.minecraft.net/net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:codecjorbis:20101023",
+            "downloads": {
+                "artifact": {
+                    "size": 103871,
+                    "sha1": "c73b5636faf089d9f00e8732a829577de25237ee",
+                    "path": "com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:codecwav:20101023",
+            "downloads": {
+                "artifact": {
+                    "size": 5618,
+                    "sha1": "12f031cfe88fef5c1dd36c563c0a3a69bd7261da",
+                    "path": "com/paulscode/codecwav/20101023/codecwav-20101023.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/codecwav/20101023/codecwav-20101023.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:libraryjavasound:20101123",
+            "downloads": {
+                "artifact": {
+                    "size": 21679,
+                    "sha1": "5c5e304366f75f9eaa2e8cca546a1fb6109348b3",
+                    "path": "com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:librarylwjglopenal:20100824",
+            "downloads": {
+                "artifact": {
+                    "size": 18981,
+                    "sha1": "73e80d0794c39665aec3f62eee88ca91676674ef",
+                    "path": "com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:soundsystem:20120107",
+            "downloads": {
+                "artifact": {
+                    "size": 65020,
+                    "sha1": "419c05fe9be71f792b2d76cfc9b67f1ed0fec7f6",
+                    "path": "com/paulscode/soundsystem/20120107/soundsystem-20120107.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"
+                }
+            }
+        },
+        {
+            "name": "io.netty:netty-all:4.1.9.Final",
+            "downloads": {
+                "artifact": {
+                    "size": 3511093,
+                    "sha1": "0097860965d6a0a6b98e7f569f3f966727b8db75",
+                    "path": "io/netty/netty-all/4.1.9.Final/netty-all-4.1.9.Final.jar",
+                    "url": "https://libraries.minecraft.net/io/netty/netty-all/4.1.9.Final/netty-all-4.1.9.Final.jar"
+                }
+            }
+        },
+        {
+            "name": "com.google.guava:guava:21.0",
+            "downloads": {
+                "artifact": {
+                    "size": 2521113,
+                    "sha1": "3a3d111be1be1b745edfa7d91678a12d7ed38709",
+                    "path": "com/google/guava/guava/21.0/guava-21.0.jar",
+                    "url": "https://libraries.minecraft.net/com/google/guava/guava/21.0/guava-21.0.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.commons:commons-lang3:3.5",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 780282,
+                        "sha1": "8ca309192f104265c67a1570245ae827a8650af9",
+                        "path": "org/apache/commons/commons-lang3/3.5/commons-lang3-3.5-tests.jar",
+                        "url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 479881,
+                    "sha1": "6c6c702c89bfff3cd9e80b04d668c5e190d588c6",
+                    "path": "org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-io:commons-io:2.5",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 372821,
+                        "sha1": "32b15369c83e9435ced8cd3fbe652dfba9c497ef",
+                        "path": "commons-io/commons-io/2.5/commons-io-2.5-tests.jar",
+                        "url": "https://libraries.minecraft.net/commons-io/commons-io/2.5/commons-io-2.5-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 208700,
+                    "sha1": "2852e6e05fbb95076fc091f6d1780f1f8fe35e0f",
+                    "path": "commons-io/commons-io/2.5/commons-io-2.5.jar",
+                    "url": "https://libraries.minecraft.net/commons-io/commons-io/2.5/commons-io-2.5.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-codec:commons-codec:1.10",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 256617,
+                        "sha1": "df86446f0fe79f15ce8048c0ed04d1a92fa8d265",
+                        "path": "commons-codec/commons-codec/1.10/commons-codec-1.10-tests.jar",
+                        "url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.10/commons-codec-1.10-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 284184,
+                    "sha1": "4b95f4897fa13f2cd904aee711aeafc0c5295cd8",
+                    "path": "commons-codec/commons-codec/1.10/commons-codec-1.10.jar",
+                    "url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.10/commons-codec-1.10.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.jinput:jinput:2.0.5",
+            "downloads": {
+                "artifact": {
+                    "size": 208338,
+                    "sha1": "39c7796b469a600f72380316f6b1f11db6c2c7c4",
+                    "path": "net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar",
+                    "url": "https://libraries.minecraft.net/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.jutils:jutils:1.0.0",
+            "downloads": {
+                "artifact": {
+                    "size": 7508,
+                    "sha1": "e12fe1fda814bd348c1579329c86943d2cd3c6a6",
+                    "path": "net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar",
+                    "url": "https://libraries.minecraft.net/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"
+                }
+            }
+        },
+        {
+            "name": "com.google.code.gson:gson:2.8.0",
+            "downloads": {
+                "artifact": {
+                    "size": 231952,
+                    "sha1": "c4ba5371a29ac9b2ad6129b1d39ea38750043eff",
+                    "path": "com/google/code/gson/gson/2.8.0/gson-2.8.0.jar",
+                    "url": "https://libraries.minecraft.net/com/google/code/gson/gson/2.8.0/gson-2.8.0.jar"
+                }
+            }
+        },
+        {
+            "name": "com.mojang:authlib:1.5.25",
+            "downloads": {
+                "artifact": {
+                    "size": 65621,
+                    "sha1": "9834cdf236c22e84b946bba989e2f94ef5897c3c",
+                    "path": "com/mojang/authlib/1.5.25/authlib-1.5.25.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/authlib/1.5.25/authlib-1.5.25.jar"
+                }
+            }
+        },
+        {
+            "name": "com.mojang:realms:1.10.22",
+            "downloads": {
+                "artifact": {
+                    "size": 7135057,
+                    "sha1": "bd0dccebdf3744c75f1ca20063f16e8f7d5e663f",
+                    "path": "com/mojang/realms/1.10.22/realms-1.10.22.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/realms/1.10.22/realms-1.10.22.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.commons:commons-compress:1.8.1",
+            "downloads": {
+                "artifact": {
+                    "size": 365552,
+                    "sha1": "a698750c16740fd5b3871425f4cb3bbaa87f529d",
+                    "path": "org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.httpcomponents:httpclient:4.3.3",
+            "downloads": {
+                "artifact": {
+                    "size": 589512,
+                    "sha1": "18f4247ff4572a074444572cee34647c43e7c9c7",
+                    "path": "org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-logging:commons-logging:1.1.3",
+            "downloads": {
+                "artifact": {
+                    "size": 62050,
+                    "sha1": "f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f",
+                    "path": "commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar",
+                    "url": "https://libraries.minecraft.net/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.httpcomponents:httpcore:4.3.2",
+            "downloads": {
+                "artifact": {
+                    "size": 282269,
+                    "sha1": "31fbbff1ddbf98f3aa7377c94d33b0447c646b6e",
+                    "path": "org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar"
+                }
+            }
+        },
+        {
+            "name": "it.unimi.dsi:fastutil:7.1.0",
+            "downloads": {
+                "artifact": {
+                    "size": 17655579,
+                    "sha1": "9835253257524c1be7ab50c057aa2d418fb72082",
+                    "path": "it/unimi/dsi/fastutil/7.1.0/fastutil-7.1.0.jar",
+                    "url": "https://libraries.minecraft.net/it/unimi/dsi/fastutil/7.1.0/fastutil-7.1.0.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.logging.log4j:log4j-api:2.8.1",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 192791,
+                        "sha1": "9d0c48c6186ea7f7f443803801ee7c9469129b85",
+                        "path": "org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1-tests.jar",
+                        "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 228859,
+                    "sha1": "e801d13612e22cad62a3f4f3fe7fdbe6334a8e72",
+                    "path": "org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.logging.log4j:log4j-core:2.8.1",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 1412295,
+                        "sha1": "ef19122d4ad5de8da81fafabd007403007c8a832",
+                        "path": "org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1-tests.jar",
+                        "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 1402925,
+                    "sha1": "4ac28ff2f1ddf05dae3043a190451e8c46b73c31",
+                    "path": "org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209",
+            "rules": [
+                {
+                    "action": "allow"
+                },
+                {
+                    "action": "disallow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 1047168,
+                    "sha1": "697517568c68e78ae0b4544145af031c81082dfe",
+                    "path": "org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209",
+            "rules": [
+                {
+                    "action": "allow"
+                },
+                {
+                    "action": "disallow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 173887,
+                    "sha1": "d51a7c040a721d13efdfbd34f8b257b2df882ad0",
+                    "path": "org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209",
+            "natives": {
+                "linux": "natives-linux",
+                "osx": "natives-osx",
+                "windows": "natives-windows"
+            },
+            "rules": [
+                {
+                    "action": "allow"
+                },
+                {
+                    "action": "disallow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 578680,
+                        "sha1": "931074f46c795d2f7b30ed6395df5715cfd7675b",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar"
+                    },
+                    "natives-osx": {
+                        "size": 426822,
+                        "sha1": "bcab850f8f487c3f4c4dbabde778bb82bd1a40ed",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"
+                    },
+                    "natives-windows": {
+                        "size": 613748,
+                        "sha1": "b84d5102b9dbfabfeb5e43c7e2828d98a7fc80e0",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 22,
+                    "sha1": "b04f3ee8f5e43fa3b162981b50bb72fe1acabb33",
+                    "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 1045632,
+                    "sha1": "7707204c9ffa5d91662de95f0a224e2f721b22af",
+                    "path": "org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 173887,
+                    "sha1": "f0e612c840a7639c1f77f68d72a28dae2f0c8490",
+                    "path": "org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
+            "natives": {
+                "linux": "natives-linux",
+                "osx": "natives-osx",
+                "windows": "natives-windows"
+            },
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 578539,
+                        "sha1": "d898a33b5d0a6ef3fed3a4ead506566dce6720a5",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar"
+                    },
+                    "natives-osx": {
+                        "size": 468116,
+                        "sha1": "79f5ce2fea02e77fe47a3c745219167a542121d7",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar"
+                    },
+                    "natives-windows": {
+                        "size": 613680,
+                        "sha1": "78b2a55ce4dc29c6b3ec4df8ca165eba05f9b341",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar"
+                    }
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "net.java.jinput:jinput-platform:2.0.5",
+            "natives": {
+                "linux": "natives-linux",
+                "osx": "natives-osx",
+                "windows": "natives-windows"
+            },
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 10362,
+                        "sha1": "7ff832a6eb9ab6a767f1ade2b548092d0fa64795",
+                        "path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar"
+                    },
+                    "natives-osx": {
+                        "size": 12186,
+                        "sha1": "53f9c919f34d2ca9de8c51fc4e1e8282029a9232",
+                        "path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar"
+                    },
+                    "natives-windows": {
+                        "size": 155179,
+                        "sha1": "385ee093e01f587f30ee1c8a2ee7d408fd732e16",
+                        "path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar"
+                    }
+                }
+            }
+        },
+        {
+            "name": "com.mojang:text2speech:1.10.3",
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 7833,
+                        "sha1": "ab7896aec3b3dd272b06194357f2d98f832c0cfc",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar"
+                    },
+                    "natives-windows": {
+                        "size": 81217,
+                        "sha1": "84a4b856389cc4f485275b1f63497a95a857a443",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 11055,
+                    "sha1": "48fd510879dff266c3815947de66e3d4809f8668",
+                    "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "com.mojang:text2speech:1.10.3",
+            "natives": {
+                "linux": "natives-linux",
+                "windows": "natives-windows"
+            },
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 7833,
+                        "sha1": "ab7896aec3b3dd272b06194357f2d98f832c0cfc",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar"
+                    },
+                    "natives-windows": {
+                        "size": 81217,
+                        "sha1": "84a4b856389cc4f485275b1f63497a95a857a443",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 11055,
+                    "sha1": "48fd510879dff266c3815947de66e3d4809f8668",
+                    "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "ca.weblite:java-objc-bridge:1.0.0",
+            "natives": {
+                "osx": "natives-osx"
+            },
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-osx": {
+                        "size": 5629,
+                        "sha1": "08befab4894d55875f33c3d300f4f71e6e828f64",
+                        "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 40502,
+                    "sha1": "6ef160c3133a78de015830860197602ca1c855d3",
+                    "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar",
+                    "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar"
+                }
+            }
+        },
+        {
+            "name": "ca.weblite:java-objc-bridge:1.0.0",
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-osx": {
+                        "size": 5629,
+                        "sha1": "08befab4894d55875f33c3d300f4f71e6e828f64",
+                        "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 40502,
+                    "sha1": "6ef160c3133a78de015830860197602ca1c855d3",
+                    "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar",
+                    "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar"
+                }
+            }
+        }
+    ],
+    "logging": {
+        "client": {
+            "file": {
+                "id": "client-1.12.xml",
+                "sha1": "ef4f57b922df243d0cef096efe808c72db042149",
+                "size": 877,
+                "url": "https://launchermeta.mojang.com/mc/log_configs/client-1.12.xml/ef4f57b922df243d0cef096efe808c72db042149/client-1.12.xml"
+            },
+            "argument": "-Dlog4j.configurationFile=${path}",
+            "type": "log4j2-xml"
+        }
+    },
+    "mainClass": "net.minecraft.client.main.Main",
+    "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}",
+    "minimumLauncherVersion": 18,
+    "releaseTime": "2017-09-18T08:39:46+00:00",
+    "time": "2018-08-16T19:32:40+00:00",
+    "type": "release"
+}

jsons/1.12.json

@@ -0,0 +1,724 @@
+{
+    "assetIndex": {
+        "id": "1.12",
+        "sha1": "c2ba0c4da30cce204c70db2ebc32a942cea8c7dd",
+        "size": 169015,
+        "url": "https://launchermeta.mojang.com/mc/assets/1.12/c2ba0c4da30cce204c70db2ebc32a942cea8c7dd/1.12.json",
+        "totalSize": 127300317
+    },
+    "assets": "1.12",
+    "downloads": {
+        "client": {
+            "sha1": "909823f9c467f9934687f136bc95a667a0d19d7f",
+            "size": 10177098,
+            "url": "https://launcher.mojang.com/mc/game/1.12/client/909823f9c467f9934687f136bc95a667a0d19d7f/client.jar"
+        },
+        "server": {
+            "sha1": "8494e844e911ea0d63878f64da9dcc21f53a3463",
+            "size": 30202458,
+            "url": "https://launcher.mojang.com/mc/game/1.12/server/8494e844e911ea0d63878f64da9dcc21f53a3463/server.jar"
+        }
+    },
+    "id": "1.12",
+    "libraries": [
+        {
+            "name": "com.mojang:patchy:1.1",
+            "downloads": {
+                "artifact": {
+                    "size": 15817,
+                    "sha1": "aef610b34a1be37fa851825f12372b78424d8903",
+                    "path": "com/mojang/patchy/1.1/patchy-1.1.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/patchy/1.1/patchy-1.1.jar"
+                }
+            }
+        },
+        {
+            "name": "oshi-project:oshi-core:1.1",
+            "downloads": {
+                "artifact": {
+                    "size": 30973,
+                    "sha1": "9ddf7b048a8d701be231c0f4f95fd986198fd2d8",
+                    "path": "oshi-project/oshi-core/1.1/oshi-core-1.1.jar",
+                    "url": "https://libraries.minecraft.net/oshi-project/oshi-core/1.1/oshi-core-1.1.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.dev.jna:jna:4.4.0",
+            "downloads": {
+                "artifact": {
+                    "size": 1091208,
+                    "sha1": "cb208278274bf12ebdb56c61bd7407e6f774d65a",
+                    "path": "net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar",
+                    "url": "https://libraries.minecraft.net/net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.dev.jna:platform:3.4.0",
+            "downloads": {
+                "artifact": {
+                    "size": 913436,
+                    "sha1": "e3f70017be8100d3d6923f50b3d2ee17714e9c13",
+                    "path": "net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar",
+                    "url": "https://libraries.minecraft.net/net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar"
+                }
+            }
+        },
+        {
+            "name": "com.ibm.icu:icu4j-core-mojang:51.2",
+            "downloads": {
+                "artifact": {
+                    "size": 1634692,
+                    "sha1": "63d216a9311cca6be337c1e458e587f99d382b84",
+                    "path": "com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar",
+                    "url": "https://libraries.minecraft.net/com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar"
+                }
+            }
+        },
+        {
+            "name": "net.sf.jopt-simple:jopt-simple:5.0.3",
+            "downloads": {
+                "artifact": {
+                    "size": 78175,
+                    "sha1": "cdd846cfc4e0f7eefafc02c0f5dce32b9303aa2a",
+                    "path": "net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.jar",
+                    "url": "https://libraries.minecraft.net/net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:codecjorbis:20101023",
+            "downloads": {
+                "artifact": {
+                    "size": 103871,
+                    "sha1": "c73b5636faf089d9f00e8732a829577de25237ee",
+                    "path": "com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:codecwav:20101023",
+            "downloads": {
+                "artifact": {
+                    "size": 5618,
+                    "sha1": "12f031cfe88fef5c1dd36c563c0a3a69bd7261da",
+                    "path": "com/paulscode/codecwav/20101023/codecwav-20101023.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/codecwav/20101023/codecwav-20101023.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:libraryjavasound:20101123",
+            "downloads": {
+                "artifact": {
+                    "size": 21679,
+                    "sha1": "5c5e304366f75f9eaa2e8cca546a1fb6109348b3",
+                    "path": "com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:librarylwjglopenal:20100824",
+            "downloads": {
+                "artifact": {
+                    "size": 18981,
+                    "sha1": "73e80d0794c39665aec3f62eee88ca91676674ef",
+                    "path": "com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"
+                }
+            }
+        },
+        {
+            "name": "com.paulscode:soundsystem:20120107",
+            "downloads": {
+                "artifact": {
+                    "size": 65020,
+                    "sha1": "419c05fe9be71f792b2d76cfc9b67f1ed0fec7f6",
+                    "path": "com/paulscode/soundsystem/20120107/soundsystem-20120107.jar",
+                    "url": "https://libraries.minecraft.net/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"
+                }
+            }
+        },
+        {
+            "name": "io.netty:netty-all:4.1.9.Final",
+            "downloads": {
+                "artifact": {
+                    "size": 3511093,
+                    "sha1": "0097860965d6a0a6b98e7f569f3f966727b8db75",
+                    "path": "io/netty/netty-all/4.1.9.Final/netty-all-4.1.9.Final.jar",
+                    "url": "https://libraries.minecraft.net/io/netty/netty-all/4.1.9.Final/netty-all-4.1.9.Final.jar"
+                }
+            }
+        },
+        {
+            "name": "com.google.guava:guava:21.0",
+            "downloads": {
+                "artifact": {
+                    "size": 2521113,
+                    "sha1": "3a3d111be1be1b745edfa7d91678a12d7ed38709",
+                    "path": "com/google/guava/guava/21.0/guava-21.0.jar",
+                    "url": "https://libraries.minecraft.net/com/google/guava/guava/21.0/guava-21.0.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.commons:commons-lang3:3.5",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 780282,
+                        "sha1": "8ca309192f104265c67a1570245ae827a8650af9",
+                        "path": "org/apache/commons/commons-lang3/3.5/commons-lang3-3.5-tests.jar",
+                        "url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 479881,
+                    "sha1": "6c6c702c89bfff3cd9e80b04d668c5e190d588c6",
+                    "path": "org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-io:commons-io:2.5",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 372821,
+                        "sha1": "32b15369c83e9435ced8cd3fbe652dfba9c497ef",
+                        "path": "commons-io/commons-io/2.5/commons-io-2.5-tests.jar",
+                        "url": "https://libraries.minecraft.net/commons-io/commons-io/2.5/commons-io-2.5-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 208700,
+                    "sha1": "2852e6e05fbb95076fc091f6d1780f1f8fe35e0f",
+                    "path": "commons-io/commons-io/2.5/commons-io-2.5.jar",
+                    "url": "https://libraries.minecraft.net/commons-io/commons-io/2.5/commons-io-2.5.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-codec:commons-codec:1.10",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 256617,
+                        "sha1": "df86446f0fe79f15ce8048c0ed04d1a92fa8d265",
+                        "path": "commons-codec/commons-codec/1.10/commons-codec-1.10-tests.jar",
+                        "url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.10/commons-codec-1.10-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 284184,
+                    "sha1": "4b95f4897fa13f2cd904aee711aeafc0c5295cd8",
+                    "path": "commons-codec/commons-codec/1.10/commons-codec-1.10.jar",
+                    "url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.10/commons-codec-1.10.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.jinput:jinput:2.0.5",
+            "downloads": {
+                "artifact": {
+                    "size": 208338,
+                    "sha1": "39c7796b469a600f72380316f6b1f11db6c2c7c4",
+                    "path": "net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar",
+                    "url": "https://libraries.minecraft.net/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"
+                }
+            }
+        },
+        {
+            "name": "net.java.jutils:jutils:1.0.0",
+            "downloads": {
+                "artifact": {
+                    "size": 7508,
+                    "sha1": "e12fe1fda814bd348c1579329c86943d2cd3c6a6",
+                    "path": "net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar",
+                    "url": "https://libraries.minecraft.net/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"
+                }
+            }
+        },
+        {
+            "name": "com.google.code.gson:gson:2.8.0",
+            "downloads": {
+                "artifact": {
+                    "size": 231952,
+                    "sha1": "c4ba5371a29ac9b2ad6129b1d39ea38750043eff",
+                    "path": "com/google/code/gson/gson/2.8.0/gson-2.8.0.jar",
+                    "url": "https://libraries.minecraft.net/com/google/code/gson/gson/2.8.0/gson-2.8.0.jar"
+                }
+            }
+        },
+        {
+            "name": "com.mojang:authlib:1.5.25",
+            "downloads": {
+                "artifact": {
+                    "size": 65621,
+                    "sha1": "9834cdf236c22e84b946bba989e2f94ef5897c3c",
+                    "path": "com/mojang/authlib/1.5.25/authlib-1.5.25.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/authlib/1.5.25/authlib-1.5.25.jar"
+                }
+            }
+        },
+        {
+            "name": "com.mojang:realms:1.10.17",
+            "downloads": {
+                "artifact": {
+                    "size": 3257404,
+                    "sha1": "e6a623bf93a230b503b0e3ae18c196fcd5aa3299",
+                    "path": "com/mojang/realms/1.10.17/realms-1.10.17.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/realms/1.10.17/realms-1.10.17.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.commons:commons-compress:1.8.1",
+            "downloads": {
+                "artifact": {
+                    "size": 365552,
+                    "sha1": "a698750c16740fd5b3871425f4cb3bbaa87f529d",
+                    "path": "org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.httpcomponents:httpclient:4.3.3",
+            "downloads": {
+                "artifact": {
+                    "size": 589512,
+                    "sha1": "18f4247ff4572a074444572cee34647c43e7c9c7",
+                    "path": "org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-logging:commons-logging:1.1.3",
+            "downloads": {
+                "artifact": {
+                    "size": 62050,
+                    "sha1": "f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f",
+                    "path": "commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar",
+                    "url": "https://libraries.minecraft.net/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.httpcomponents:httpcore:4.3.2",
+            "downloads": {
+                "artifact": {
+                    "size": 282269,
+                    "sha1": "31fbbff1ddbf98f3aa7377c94d33b0447c646b6e",
+                    "path": "org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar"
+                }
+            }
+        },
+        {
+            "name": "it.unimi.dsi:fastutil:7.1.0",
+            "downloads": {
+                "artifact": {
+                    "size": 17655579,
+                    "sha1": "9835253257524c1be7ab50c057aa2d418fb72082",
+                    "path": "it/unimi/dsi/fastutil/7.1.0/fastutil-7.1.0.jar",
+                    "url": "https://libraries.minecraft.net/it/unimi/dsi/fastutil/7.1.0/fastutil-7.1.0.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.logging.log4j:log4j-api:2.8.1",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 192791,
+                        "sha1": "9d0c48c6186ea7f7f443803801ee7c9469129b85",
+                        "path": "org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1-tests.jar",
+                        "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 228859,
+                    "sha1": "e801d13612e22cad62a3f4f3fe7fdbe6334a8e72",
+                    "path": "org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.8.1/log4j-api-2.8.1.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.logging.log4j:log4j-core:2.8.1",
+            "downloads": {
+                "classifiers": {
+                    "tests": {
+                        "size": 1412295,
+                        "sha1": "ef19122d4ad5de8da81fafabd007403007c8a832",
+                        "path": "org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1-tests.jar",
+                        "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1-tests.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 1402925,
+                    "sha1": "4ac28ff2f1ddf05dae3043a190451e8c46b73c31",
+                    "path": "org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.8.1/log4j-core-2.8.1.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209",
+            "rules": [
+                {
+                    "action": "allow"
+                },
+                {
+                    "action": "disallow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 1047168,
+                    "sha1": "697517568c68e78ae0b4544145af031c81082dfe",
+                    "path": "org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209",
+            "rules": [
+                {
+                    "action": "allow"
+                },
+                {
+                    "action": "disallow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 173887,
+                    "sha1": "d51a7c040a721d13efdfbd34f8b257b2df882ad0",
+                    "path": "org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209",
+            "natives": {
+                "linux": "natives-linux",
+                "osx": "natives-osx",
+                "windows": "natives-windows"
+            },
+            "rules": [
+                {
+                    "action": "allow"
+                },
+                {
+                    "action": "disallow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 578680,
+                        "sha1": "931074f46c795d2f7b30ed6395df5715cfd7675b",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar"
+                    },
+                    "natives-osx": {
+                        "size": 426822,
+                        "sha1": "bcab850f8f487c3f4c4dbabde778bb82bd1a40ed",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"
+                    },
+                    "natives-windows": {
+                        "size": 613748,
+                        "sha1": "b84d5102b9dbfabfeb5e43c7e2828d98a7fc80e0",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 22,
+                    "sha1": "b04f3ee8f5e43fa3b162981b50bb72fe1acabb33",
+                    "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 1045632,
+                    "sha1": "7707204c9ffa5d91662de95f0a224e2f721b22af",
+                    "path": "org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar"
+                }
+            }
+        },
+        {
+            "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "artifact": {
+                    "size": 173887,
+                    "sha1": "f0e612c840a7639c1f77f68d72a28dae2f0c8490",
+                    "path": "org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar",
+                    "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
+            "natives": {
+                "linux": "natives-linux",
+                "osx": "natives-osx",
+                "windows": "natives-windows"
+            },
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 578539,
+                        "sha1": "d898a33b5d0a6ef3fed3a4ead506566dce6720a5",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar"
+                    },
+                    "natives-osx": {
+                        "size": 468116,
+                        "sha1": "79f5ce2fea02e77fe47a3c745219167a542121d7",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar"
+                    },
+                    "natives-windows": {
+                        "size": 613680,
+                        "sha1": "78b2a55ce4dc29c6b3ec4df8ca165eba05f9b341",
+                        "path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar"
+                    }
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "net.java.jinput:jinput-platform:2.0.5",
+            "natives": {
+                "linux": "natives-linux",
+                "osx": "natives-osx",
+                "windows": "natives-windows"
+            },
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 10362,
+                        "sha1": "7ff832a6eb9ab6a767f1ade2b548092d0fa64795",
+                        "path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar"
+                    },
+                    "natives-osx": {
+                        "size": 12186,
+                        "sha1": "53f9c919f34d2ca9de8c51fc4e1e8282029a9232",
+                        "path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar"
+                    },
+                    "natives-windows": {
+                        "size": 155179,
+                        "sha1": "385ee093e01f587f30ee1c8a2ee7d408fd732e16",
+                        "path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar"
+                    }
+                }
+            }
+        },
+        {
+            "name": "com.mojang:text2speech:1.10.3",
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 7833,
+                        "sha1": "ab7896aec3b3dd272b06194357f2d98f832c0cfc",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar"
+                    },
+                    "natives-windows": {
+                        "size": 81217,
+                        "sha1": "84a4b856389cc4f485275b1f63497a95a857a443",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 11055,
+                    "sha1": "48fd510879dff266c3815947de66e3d4809f8668",
+                    "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "com.mojang:text2speech:1.10.3",
+            "natives": {
+                "linux": "natives-linux",
+                "windows": "natives-windows"
+            },
+            "downloads": {
+                "classifiers": {
+                    "natives-linux": {
+                        "size": 7833,
+                        "sha1": "ab7896aec3b3dd272b06194357f2d98f832c0cfc",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-linux.jar"
+                    },
+                    "natives-windows": {
+                        "size": 81217,
+                        "sha1": "84a4b856389cc4f485275b1f63497a95a857a443",
+                        "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar",
+                        "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 11055,
+                    "sha1": "48fd510879dff266c3815947de66e3d4809f8668",
+                    "path": "com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/text2speech/1.10.3/text2speech-1.10.3.jar"
+                }
+            }
+        },
+        {
+            "extract": {
+                "exclude": [
+                    "META-INF/"
+                ]
+            },
+            "name": "ca.weblite:java-objc-bridge:1.0.0",
+            "natives": {
+                "osx": "natives-osx"
+            },
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-osx": {
+                        "size": 5629,
+                        "sha1": "08befab4894d55875f33c3d300f4f71e6e828f64",
+                        "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 40502,
+                    "sha1": "6ef160c3133a78de015830860197602ca1c855d3",
+                    "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar",
+                    "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar"
+                }
+            }
+        },
+        {
+            "name": "ca.weblite:java-objc-bridge:1.0.0",
+            "rules": [
+                {
+                    "action": "allow",
+                    "os": {
+                        "name": "osx"
+                    }
+                }
+            ],
+            "downloads": {
+                "classifiers": {
+                    "natives-osx": {
+                        "size": 5629,
+                        "sha1": "08befab4894d55875f33c3d300f4f71e6e828f64",
+                        "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar",
+                        "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0-natives-osx.jar"
+                    }
+                },
+                "artifact": {
+                    "size": 40502,
+                    "sha1": "6ef160c3133a78de015830860197602ca1c855d3",
+                    "path": "ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar",
+                    "url": "https://libraries.minecraft.net/ca/weblite/java-objc-bridge/1.0.0/java-objc-bridge-1.0.0.jar"
+                }
+            }
+        }
+    ],
+    "logging": {
+        "client": {
+            "file": {
+                "id": "client-1.12.xml",
+                "sha1": "ef4f57b922df243d0cef096efe808c72db042149",
+                "size": 877,
+                "url": "https://launchermeta.mojang.com/mc/log_configs/client-1.12.xml/ef4f57b922df243d0cef096efe808c72db042149/client-1.12.xml"
+            },
+            "argument": "-Dlog4j.configurationFile=${path}",
+            "type": "log4j2-xml"
+        }
+    },
+    "mainClass": "net.minecraft.client.main.Main",
+    "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}",
+    "minimumLauncherVersion": 18,
+    "releaseTime": "2017-06-02T13:50:27+00:00",
+    "time": "2017-08-02T10:51:18+00:00",
+    "type": "release"
+}

mdk/README.txt

@@ -14,6 +14,9 @@ Source pack installation information:
 Standalone source installation
 ==============================
 
+See the Forge Documentation online for more detailed instructions:
+http://mcforge.readthedocs.io/en/latest/gettingstarted/
+
 Step 1: Open your command-line and browse to the folder where you extracted the zip file.
 
 Step 2: Once you have a command window up in the folder that the downloaded material was placed, type:
@@ -24,7 +27,7 @@ Linux/Mac OS: "./gradlew setupDecompWorkspace"
 Step 3: After all that finished, you're left with a choice.
 For eclipse, run "gradlew eclipse" (./gradlew eclipse if you are on Mac/Linux)
 
-If you preffer to use IntelliJ, steps are a little different.
+If you prefer to use IntelliJ, steps are a little different.
 1. Open IDEA, and import project.
 2. Select your build.gradle file and have it import.
 3. Once it's finished you must close IntelliJ and run the following command:
@@ -33,14 +36,14 @@ If you preffer to use IntelliJ, steps are a little different.
 
 Step 4: The final step is to open Eclipse and switch your workspace to /eclipse/ (if you use IDEA, it should automatically start on your project)
 
-If at any point you are missing libraries in your IDE, or you've run into problems you can run "gradlew --refresh-dependencies" to refresh the local cache. "gradlew clean" to reset everything {this does not effect your code} and then start the processs again.
+If at any point you are missing libraries in your IDE, or you've run into problems you can run "gradlew --refresh-dependencies" to refresh the local cache. "gradlew clean" to reset everything {this does not affect your code} and then start the processs again.
 
 Should it still not work, 
 Refer to #ForgeGradle on EsperNet for more information about the gradle environment.
 
 Tip:
 If you do not care about seeing Minecraft's source code you can replace "setupDecompWorkspace" with one of the following:
-"setupDevWorkspace": Will patch, deobfusicated, and gather required assets to run minecraft, but will not generated human readable source code.
+"setupDevWorkspace": Will patch, deobfuscate, and gather required assets to run minecraft, but will not generate human readable source code.
 "setupCIWorkspace": Same as Dev but will not download any assets. This is useful in build servers as it is the fastest because it does the least work.
 
 Tip:

mdk/build.gradle

@@ -1,44 +1,67 @@
 buildscript {
     repositories {
+        maven { url = 'https://files.minecraftforge.net/maven' }
         jcenter()
-        maven { url = "http://files.minecraftforge.net/maven" }
+        mavenCentral()
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
     }
 }
-apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'net.minecraftforge.gradle'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
+apply plugin: 'eclipse'
 
+version = '1.0'
+group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = 'modid'
 
-version = "1.0"
-group = "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "modid"
-
-sourceCompatibility = targetCompatibility = "1.6" // Need this here so eclipse task generates correctly.
-compileJava {
-    sourceCompatibility = targetCompatibility = "1.6"
-}
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
 minecraft {
-    version = "@VERSION@"
-    runDir = "run"
-    
     // the mappings can be changed at any time, and must be in the following format.
     // snapshot_YYYYMMDD   snapshot are built nightly.
     // stable_#            stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not always work.
     // simply re-run your setup task after changing the mappings to update your workspace.
-    mappings = "@MAPPINGS@"
+    mappings channel: '@MAPPING_CHANNEL@', version: '@MAPPING_VERSION@'
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+    
+    //accessTransformer = file('my_at.cfg')
+
+    // default run configurations.
+    // these can be tweaked, removed, or duplicated as needed.
+    runs {
+        client = {
+            // recommended logging data for a userdev environment
+            properties 'forge.logging.markers': 'SCAN,REGISTRIES,REGISTRYDUMP'
+            // recommended logging level for the console
+            properties 'forge.logging.console.level': 'debug'
+            workingDirectory project.file('run').canonicalPath
+            source sourceSets.main
+        }
+        server = {
+            // recommended logging data for a userdev environment
+            properties 'forge.logging.markers': 'SCAN,REGISTRIES,REGISTRYDUMP'
+            // recommended logging level for the console
+            properties 'forge.logging.console.level': 'debug'
+            workingDirectory project.file('run').canonicalPath
+            source sourceSets.main
+        }
+    }
 }
 
 dependencies {
+    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
+    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
+    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
+    minecraft '@FORGE_GROUP@:@FORGE_NAME@:@FORGE_VERSION@'
+
     // you may put jars on which you depend on in ./libs
     // or you may define them like so..
     //compile "some.group:artifact:version:classifier"
     //compile "some.group:artifact:version"
-      
+
     // real examples
     //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
     //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
@@ -46,10 +69,8 @@ dependencies {
     // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
     //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
 
-    // the deobf configurations:  'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided,
-    // except that these dependencies get remapped to your current MCP mappings
-    //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-    //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+    // These dependencies get remapped to your current MCP mappings
+    //deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
 
     // for more info...
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
@@ -57,21 +78,15 @@ dependencies {
 
 }
 
-processResources {
-    // this will ensure that this task is redone when the versions change.
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-                
-        // replace version and mcversion
-        expand 'version':project.version, 'mcversion':project.minecraft.version
+// Example for how to get properties into the manifest for reading by the runtime..
+jar {
+    manifest {
+        attributes(["Specification-Title": "examplemod",
+                    "Specification-Vendor": "examplemodsareus",
+                    "Specification-Version": "24.0", // We are version 1 of the modlauncher specification
+                    "Implementation-Title": project.name,
+                    "Implementation-Version": "${version}",
+                    "Implementation-Vendor" :"examplemodsareus",
+                    "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")],)
     }
-        
-    // copy everything else except the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
-}
+}

mdk/gitignore.txt

@@ -20,3 +20,6 @@ build
 # other
 eclipse
 run
+
+# Files from Forge MDK
+forge*changelog.txt

mdk/gradle.properties

@@ -1,3 +1,4 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
+org.gradle.daemon=false

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

@@ -1,20 +1,83 @@
 package com.example.examplemod;
 
+import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.InterModComms;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.Mod.EventHandler;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
+import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
+import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-@Mod(modid = ExampleMod.MODID, version = ExampleMod.VERSION)
+import java.util.stream.Collectors;
+
+// The value here should match an entry in the META-INF/mods.toml file
+@Mod("examplemod")
 public class ExampleMod
 {
-    public static final String MODID = "examplemod";
-    public static final String VERSION = "1.0";
-    
-    @EventHandler
-    public void init(FMLInitializationEvent event)
+    // Directly reference a log4j logger.
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    public ExampleMod() {
+        // Register the setup method for modloading
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
+        // Register the enqueueIMC method for modloading
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC);
+        // Register the processIMC method for modloading
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC);
+        // Register the doClientStuff method for modloading
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff);
+
+        // Register ourselves for server, registry and other game events we are interested in
+        MinecraftForge.EVENT_BUS.register(this);
+    }
+
+    private void setup(final FMLCommonSetupEvent event)
     {
-        // some example code
-        System.out.println("DIRT BLOCK >> "+Blocks.DIRT.getUnlocalizedName());
+        // some preinit code
+        LOGGER.info("HELLO FROM PREINIT");
+        LOGGER.info("DIRT BLOCK >> {}", Blocks.DIRT.getRegistryName());
+    }
+
+    private void doClientStuff(final FMLClientSetupEvent event) {
+        // do something that can only be done on the client
+        LOGGER.info("Got game settings {}", event.getMinecraftSupplier().get().gameSettings);
+    }
+
+    private void enqueueIMC(final InterModEnqueueEvent event)
+    {
+        // some example code to dispatch IMC to another mod
+        InterModComms.sendTo("forge", "helloworld", () -> { LOGGER.info("Hello world"); return "Hello world";});
+    }
+
+    private void processIMC(final InterModProcessEvent event)
+    {
+        // some example code to receive and process InterModComms from other mods
+        LOGGER.info("Got IMC", event.getIMCStream().
+                map(m->m.getMessageSupplier().get()).
+                collect(Collectors.toList()));
+    }
+    // You can use SubscribeEvent and let the Event Bus discover methods to call
+    @SubscribeEvent
+    public static void onServerStarting(FMLServerStartingEvent event) {
+        // do something when the server starts
+        LOGGER.info("HELLO from server starting");
+    }
+
+    // You can use EventBusSubscriber to automatically subscribe events on the contained class (this is subscribing to the MOD event bus
+    @Mod.EventBusSubscriber(bus=Mod.EventBusSubscriber.Bus.MOD)
+    public static class RegistryEvents {
+        @SubscribeEvent
+        public void onBlocksRegistry(final RegistryEvent.Register<Block> blockRegistryEvent) {
+            // register a new block here
+            LOGGER.info("HELLO from Register Block");
+        }
     }
 }

mdk/src/main/resources/META-INF/mods.toml

@@ -0,0 +1,56 @@
+# This is an example mods.toml file. It contains the data relating to the loading mods.
+# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
+# The overall format is standard TOML format, v0.5.0.
+# Note that there are a couple of TOML lists in this file.
+# Find more information on toml format here:  https://github.com/toml-lang/toml
+# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
+modLoader="javafml" #mandatory
+# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
+loaderVersion="[24,)" #mandatory (24 is current forge version)
+# A URL to refer people to when problems occur with this mod
+issueTrackerURL="http://my.issue.tracker/" #optional
+# A URL for the "homepage" for this mod, displayed in the mod UI
+displayURL="http://example.com/" #optional
+# A file name (in the root of the mod JAR) containing a logo for display
+logoFile="examplemod.png" #optional
+# A text field displayed in the mod UI
+credits="Thanks for this example mod goes to Java" #optional
+# A text field displayed in the mod UI
+authors="Love, Cheese and small house plants" #optional
+# A list of mods - how many allowed here is determined by the individual mod loader
+[[mods]] #mandatory
+# The modid of the mod
+modId="examplemod" #mandatory
+# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
+version="${file.jarVersion}" #mandatory
+ # A display name for the mod
+displayName="Example Mod" #mandatory
+# A URL to query for updates for this mod. See the JSON update specification <here>
+updateJSONURL="http://myurl.me/" #optional
+# The description text for the mod (multi line!) (#mandatory)
+description='''
+This is a long form description of the mod. You can write whatever you want here
+
+Have some lorem ipsum.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magna. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed sagittis luctus odio eu tempus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque volutpat ligula eget lacus auctor sagittis. In hac habitasse platea dictumst. Nunc gravida elit vitae sem vehicula efficitur. Donec mattis ipsum et arcu lobortis, eleifend sagittis sem rutrum. Cras pharetra quam eget posuere fermentum. Sed id tincidunt justo. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+'''
+# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
+[[dependencies.examplemod]] #optional
+    # the modid of the dependency
+    modId="forge" #mandatory
+    # Does this dependency have to exist - if not, ordering below must be specified
+    mandatory=true #mandatory
+    # The version range of the dependency
+    versionRange="[24,)" #mandatory
+    # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
+    ordering="NONE"
+    # Side this dependency is applied on - BOTH, CLIENT or SERVER
+    side="BOTH"
+# Here's another dependency
+[[dependencies.examplemod]]
+    modId="minecraft"
+    mandatory=true
+    versionRange="[1.13]"
+    ordering="NONE"
+    side="BOTH"

mdk/src/main/resources/mcmod.info

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

mdk/src/main/resources/pack.mcmeta

@@ -1,7 +1,7 @@
 {
     "pack": {
         "description": "examplemod resources",
-        "pack_format": 3,
-        "_comment": "A pack_format of 3 should be used starting with Minecraft 1.11. All resources, including language files, should be lowercase (eg: en_us.lang). A pack_format of 2 will load your mod resources with LegacyV2Adapter, which requires language files to have uppercase letters (eg: en_US.lang)."
+        "pack_format": 4,
+        "_comment": "A pack_format of 4 requires json lang files. Note: we require v4 pack meta for all mods."
     }
 }

mods.toml

@@ -0,0 +1,66 @@
+# The name of the mod loader type to load
+modLoader="javafml"
+# A version range to match for said mod loader
+loaderVersion="[2.0,)"
+# A URL to query for updates
+updateJSONURL="http://myurl.me/"
+# A URL to refer people to when problems occur with this mod
+issueTrackerURL="http://my.issue.tracker/"
+# Extra mod loader property
+randomScalaProperty="fishy"
+# Arbitrary key-value property pairs available to mods
+[properties]
+key="value"
+
+# A list of mods - how many allowed here is determined by the individual mod loader
+[[mods]]
+    # The modid of the mod
+    modId="inventorysorter"
+    # The version number of the mod
+    version="1.1"
+     # A display name for the mod
+    displayName="Inventory Sorter"
+    # The description text for the mod (multi line!)
+    description='''
+    This is my mod, there may be
+    others, but this one is mine
+    '''
+    # Override the default resourcelocation namespace with this instead
+    # Currently not implemented
+    namespace="invsorter"
+    # A random extra property for a mod loader
+    randomExtraProperty="somevalue"
+     # Arbitrary key-value pairs
+    [modproperties.inventorysorter]
+        key="value"
+    # A list of dependencies
+    [[dependencies.inventorysorter]]
+        # the modid of the dependency
+        modid="forge"
+        # Does this dependency have to exist - if not, ordering below must be specified
+        mandatory=true
+        # The version range of the dependency
+        versionRange="[14.23.2.0,)"
+        # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
+        ordering="NONE"
+        # Side this dependency is applied on - BOTH, CLIENT or SERVER
+        side="BOTH"
+    # Here's another dependency
+    [[dependencies.inventorysorter]]
+        modid="minecraft"
+        mandatory=true
+        versionRange="[1.12.2]"
+        ordering="NONE"
+        side="BOTH"
+
+# Here's another mod in this jar
+[[mods]]
+    # Note that other mod types may want to add additional key-value pairs in here
+    modId="inventorysortertoo"
+    # ${file.jarVersion} will read the Implementation-Version of the jar file
+    version="${file.jarVersion}"
+    displayName="Inventory Sorter as well"
+    description='''
+    This is also my mod, there may be
+    others, but this one is mine
+    '''

patches/minecraft/net/minecraft/advancements/AdvancementRewards.java.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/advancements/AdvancementRewards.java
++++ b/net/minecraft/advancements/AdvancementRewards.java
+@@ -41,7 +41,7 @@
+ 
+    public void func_192113_a(EntityPlayerMP p_192113_1_) {
+       p_192113_1_.func_195068_e(this.field_192115_b);
+-      LootContext lootcontext = (new LootContext.Builder(p_192113_1_.func_71121_q())).func_186472_a(p_192113_1_).func_204313_a(new BlockPos(p_192113_1_)).func_186471_a();
++      LootContext lootcontext = (new LootContext.Builder(p_192113_1_.func_71121_q())).func_186472_a(p_192113_1_).func_204313_a(new BlockPos(p_192113_1_)).func_186470_a(p_192113_1_).func_186469_a(p_192113_1_.func_184817_da()).func_186471_a(); // FORGE: add player & luck to LootContext
+       boolean flag = false;
+ 
+       for(ResourceLocation resourcelocation : this.field_192116_c) {

patches/minecraft/net/minecraft/advancements/PlayerAdvancements.java.patch

@@ -0,0 +1,19 @@
+--- a/net/minecraft/advancements/PlayerAdvancements.java
++++ b/net/minecraft/advancements/PlayerAdvancements.java
+@@ -174,6 +174,8 @@
+    }
+ 
+    public boolean func_192750_a(Advancement p_192750_1_, String p_192750_2_) {
++      // Forge: don't grant advancements for fake players
++      if (this.field_192762_j instanceof net.minecraftforge.common.util.FakePlayer) return false;
+       boolean flag = false;
+       AdvancementProgress advancementprogress = this.func_192747_a(p_192750_1_);
+       boolean flag1 = advancementprogress.func_192105_a();
+@@ -186,6 +188,7 @@
+             if (p_192750_1_.func_192068_c() != null && p_192750_1_.func_192068_c().func_193220_i() && this.field_192762_j.field_70170_p.func_82736_K().func_82766_b("announceAdvancements")) {
+                this.field_192756_d.func_184103_al().func_148539_a(new TextComponentTranslation("chat.type.advancement." + p_192750_1_.func_192068_c().func_192291_d().func_192307_a(), this.field_192762_j.func_145748_c_(), p_192750_1_.func_193123_j()));
+             }
++            net.minecraftforge.common.ForgeHooks.onAdvancement(this.field_192762_j, p_192750_1_);
+          }
+       }
+ 

patches/minecraft/net/minecraft/advancements/criterion/ItemPredicate.java.patch

@@ -0,0 +1,38 @@
+--- a/net/minecraft/advancements/criterion/ItemPredicate.java
++++ b/net/minecraft/advancements/criterion/ItemPredicate.java
+@@ -24,6 +24,8 @@
+ import net.minecraft.util.registry.IRegistry;
+ 
+ public class ItemPredicate {
++   private static final Map<ResourceLocation, java.util.function.Function<JsonObject, ItemPredicate>> custom_predicates = new java.util.HashMap<>();
++   private static final Map<ResourceLocation, java.util.function.Function<JsonObject, ItemPredicate>> unmod_predicates = java.util.Collections.unmodifiableMap(custom_predicates);
+    public static final ItemPredicate field_192495_a = new ItemPredicate();
+    @Nullable
+    private final Tag<Item> field_200018_b;
+@@ -90,6 +92,11 @@
+    public static ItemPredicate func_192492_a(@Nullable JsonElement p_192492_0_) {
+       if (p_192492_0_ != null && !p_192492_0_.isJsonNull()) {
+          JsonObject jsonobject = JsonUtils.func_151210_l(p_192492_0_, "item");
++         if (jsonobject.has("type")) {
++              final ResourceLocation rl = new ResourceLocation(JsonUtils.func_151200_h(jsonobject, "type"));
++              if (custom_predicates.containsKey(rl)) return custom_predicates.get(rl).apply(jsonobject);
++              else throw new JsonSyntaxException("There is no ItemPredicate of type "+rl);
++         }
+          MinMaxBounds.IntBound minmaxbounds$intbound = MinMaxBounds.IntBound.func_211344_a(jsonobject.get("count"));
+          MinMaxBounds.IntBound minmaxbounds$intbound1 = MinMaxBounds.IntBound.func_211344_a(jsonobject.get("durability"));
+          if (jsonobject.has("data")) {
+@@ -181,6 +188,14 @@
+       }
+    }
+ 
++   public static void register(ResourceLocation name, java.util.function.Function<JsonObject, ItemPredicate> deserializer) {
++      custom_predicates.put(name, deserializer);
++   }
++
++   public static Map<ResourceLocation, java.util.function.Function<JsonObject, ItemPredicate>> getPredicates() {
++       return unmod_predicates;
++   }
++
+    public static class Builder {
+       private final List<EnchantmentPredicate> field_200312_a = Lists.newArrayList();
+       @Nullable

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

@@ -0,0 +1,22 @@
+--- a/net/minecraft/block/BlockAbstractBanner.java
++++ b/net/minecraft/block/BlockAbstractBanner.java
+@@ -51,7 +51,7 @@
+    }
+ 
+    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
+-      func_180635_a(p_196255_2_, p_196255_3_, this.func_185473_a(p_196255_2_, p_196255_3_, p_196255_1_));
++      super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
+    }
+ 
+    public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, ItemStack p_180657_6_) {
+@@ -75,4 +75,10 @@
+    public EnumDyeColor func_196285_M_() {
+       return this.field_196286_a;
+    }
++
++   @Override
++   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune) {
++      TileEntity te = world.func_175625_s(pos);
++      drops.add((te instanceof TileEntityBanner) ? ((TileEntityBanner)te).func_190615_l(state) : func_185473_a(world, pos, state));
++   }
+ }

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

@@ -0,0 +1,52 @@
+--- a/net/minecraft/block/BlockAbstractSkull.java
++++ b/net/minecraft/block/BlockAbstractSkull.java
+@@ -38,6 +38,7 @@
+    }
+ 
+    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
++       super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
+    }
+ 
+    public void func_176208_a(World p_176208_1_, BlockPos p_176208_2_, IBlockState p_176208_3_, EntityPlayer p_176208_4_) {
+@@ -45,6 +46,7 @@
+          TileEntitySkull.func_195486_a(p_176208_1_, p_176208_2_);
+       }
+ 
++      this.func_196255_a(p_176208_3_, p_176208_1_, p_176208_2_, 1.0f, 0);
+       super.func_176208_a(p_176208_1_, p_176208_2_, p_176208_3_, p_176208_4_);
+    }
+ 
+@@ -55,7 +57,7 @@
+    public void func_196243_a(IBlockState p_196243_1_, World p_196243_2_, BlockPos p_196243_3_, IBlockState p_196243_4_, boolean p_196243_5_) {
+       if (p_196243_1_.func_177230_c() != p_196243_4_.func_177230_c() && !p_196243_2_.field_72995_K) {
+          TileEntity tileentity = p_196243_2_.func_175625_s(p_196243_3_);
+-         if (tileentity instanceof TileEntitySkull) {
++         if (false && tileentity instanceof TileEntitySkull) { //Forge: Moved to getDrops
+             TileEntitySkull tileentityskull = (TileEntitySkull)tileentity;
+             if (tileentityskull.func_195487_d()) {
+                ItemStack itemstack = this.func_185473_a(p_196243_2_, p_196243_3_, p_196243_1_);
+@@ -74,6 +76,24 @@
+       }
+    }
+ 
++   @Override
++   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune) {
++      TileEntity te = world.func_175625_s(pos);
++      if (te instanceof TileEntitySkull) {
++         TileEntitySkull skull = (TileEntitySkull)te;
++         if (skull.func_195487_d()) {
++            ItemStack ret = func_185473_a(world, pos, state);
++            Block block = skull.func_195044_w().func_177230_c();
++            if ((block == Blocks.field_196710_eS || block == Blocks.field_196709_eR) && skull.func_152108_a() != null) {
++               NBTTagCompound nbt = new NBTTagCompound();
++               NBTUtil.func_180708_a(nbt, skull.func_152108_a());
++               ret.func_196082_o().func_74782_a("SkullOwner", nbt);
++            }
++            drops.add(ret);
++         }
++      }
++   }
++
+    @OnlyIn(Dist.CLIENT)
+    public BlockSkull.ISkullType func_196292_N_() {
+       return this.field_196293_a;

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

@@ -1,45 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockBanner.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockBanner.java
-@@ -89,16 +89,9 @@
- 
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
-     {
--        ItemStack itemstack = this.func_185549_e(p_180653_1_, p_180653_2_);
--
--        if (itemstack.func_190926_b())
-         {
-             super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
-         }
--        else
--        {
--            func_180635_a(p_180653_1_, p_180653_2_, itemstack);
--        }
-     }
- 
-     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-@@ -120,6 +113,25 @@
-         }
-     }
- 
-+    @Override
-+    public java.util.List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
-+    {
-+        TileEntity te = world.func_175625_s(pos);
-+
-+        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
-+        if (te instanceof TileEntityBanner)
-+        {
-+            TileEntityBanner tileentitybanner = (TileEntityBanner)te;
-+            ItemStack itemstack = tileentitybanner.func_190615_l();
-+            ret.add(itemstack);
-+        }
-+        else
-+        {
-+            ret.add(new ItemStack(Items.field_179564_cE, 1, 0));
-+        }
-+        return ret;
-+    }
-+
-     public static class BlockBannerHanging extends BlockBanner
-         {
-             protected static final AxisAlignedBB field_185551_d = new AxisAlignedBB(0.0D, 0.0D, 0.875D, 1.0D, 0.78125D, 1.0D);

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

@@ -0,0 +1,13 @@
+--- a/net/minecraft/block/BlockBed.java
++++ b/net/minecraft/block/BlockBed.java
+@@ -67,7 +67,9 @@
+             }
+          }
+ 
+-         if (p_196250_2_.field_73011_w.func_76567_e() && p_196250_2_.func_180494_b(p_196250_3_) != Biomes.field_76778_j) {
++         net.minecraftforge.common.extensions.IForgeDimension.SleepResult sleepResult = p_196250_2_.field_73011_w.canSleepAt(p_196250_4_, p_196250_3_);
++         if (sleepResult != net.minecraftforge.common.extensions.IForgeDimension.SleepResult.BED_EXPLODES) {
++            if (sleepResult == net.minecraftforge.common.extensions.IForgeDimension.SleepResult.DENY) return true;
+             if (p_196250_1_.func_177229_b(field_176471_b)) {
+                EntityPlayer entityplayer = this.func_176470_e(p_196250_2_, p_196250_3_);
+                if (entityplayer != null) {

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

@@ -1,69 +1,32 @@
---- ../src-base/minecraft/net/minecraft/block/BlockBush.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockBush.java
-@@ -15,7 +15,7 @@
- import net.minecraftforge.fml.relauncher.Side;
- import net.minecraftforge.fml.relauncher.SideOnly;
+--- a/net/minecraft/block/BlockBush.java
++++ b/net/minecraft/block/BlockBush.java
+@@ -10,7 +10,7 @@
+ import net.minecraft.world.IWorld;
+ import net.minecraft.world.IWorldReaderBase;
  
--public class BlockBush extends Block
-+public class BlockBush extends Block implements net.minecraftforge.common.IPlantable
- {
-     protected static final AxisAlignedBB field_185515_b = new AxisAlignedBB(0.30000001192092896D, 0.0D, 0.30000001192092896D, 0.699999988079071D, 0.6000000238418579D, 0.699999988079071D);
+-public class BlockBush extends Block {
++public class BlockBush extends Block implements net.minecraftforge.common.IPlantable {
+    protected BlockBush(Block.Properties p_i48437_1_) {
+       super(p_i48437_1_);
+    }
+@@ -26,6 +26,8 @@
  
-@@ -38,7 +38,8 @@
+    public boolean func_196260_a(IBlockState p_196260_1_, IWorldReaderBase p_196260_2_, BlockPos p_196260_3_) {
+       BlockPos blockpos = p_196260_3_.func_177977_b();
++      if (p_196260_1_.func_177230_c() == this) //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check.
++         return p_196260_2_.func_180495_p(blockpos).canSustainPlant(p_196260_2_, blockpos, EnumFacing.UP, this);
+       return this.func_200014_a_(p_196260_2_.func_180495_p(blockpos), p_196260_2_, blockpos);
+    }
  
-     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-     {
--        return super.func_176196_c(p_176196_1_, p_176196_2_) && this.func_185514_i(p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()));
-+        IBlockState soil = p_176196_1_.func_180495_p(p_176196_2_.func_177977_b());
-+        return super.func_176196_c(p_176196_1_, p_176196_2_) && soil.func_177230_c().canSustainPlant(soil, p_176196_1_, p_176196_2_.func_177977_b(), net.minecraft.util.EnumFacing.UP, this);
-     }
- 
-     protected boolean func_185514_i(IBlockState p_185514_1_)
-@@ -68,6 +69,11 @@
- 
-     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
-     {
-+        if (p_180671_3_.func_177230_c() == this) //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check.
-+        {
-+            IBlockState soil = p_180671_1_.func_180495_p(p_180671_2_.func_177977_b());
-+            return soil.func_177230_c().canSustainPlant(soil, p_180671_1_, p_180671_2_.func_177977_b(), net.minecraft.util.EnumFacing.UP, this);
-+        }
-         return this.func_185514_i(p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()));
-     }
- 
-@@ -92,6 +98,35 @@
-         return false;
-     }
- 
-+    @Override
-+    public net.minecraftforge.common.EnumPlantType getPlantType(net.minecraft.world.IBlockAccess world, BlockPos pos)
-+    {
-+        if (this == Blocks.field_150464_aj)          return net.minecraftforge.common.EnumPlantType.Crop;
-+        if (this == Blocks.field_150459_bM)        return net.minecraftforge.common.EnumPlantType.Crop;
-+        if (this == Blocks.field_150469_bN)       return net.minecraftforge.common.EnumPlantType.Crop;
-+        if (this == Blocks.field_150394_bc)     return net.minecraftforge.common.EnumPlantType.Crop;
-+        if (this == Blocks.field_150393_bb)   return net.minecraftforge.common.EnumPlantType.Crop;
-+        if (this == Blocks.field_150330_I)       return net.minecraftforge.common.EnumPlantType.Desert;
-+        if (this == Blocks.field_150392_bi)      return net.minecraftforge.common.EnumPlantType.Water;
-+        if (this == Blocks.field_150337_Q)   return net.minecraftforge.common.EnumPlantType.Cave;
-+        if (this == Blocks.field_150338_P) return net.minecraftforge.common.EnumPlantType.Cave;
-+        if (this == Blocks.field_150388_bm)    return net.minecraftforge.common.EnumPlantType.Nether;
-+        if (this == Blocks.field_150345_g)        return net.minecraftforge.common.EnumPlantType.Plains;
-+        if (this == Blocks.field_150329_H)      return net.minecraftforge.common.EnumPlantType.Plains;
-+        if (this == Blocks.field_150398_cm)   return net.minecraftforge.common.EnumPlantType.Plains;
-+        if (this == Blocks.field_150328_O)     return net.minecraftforge.common.EnumPlantType.Plains;
-+        if (this == Blocks.field_150327_N)  return net.minecraftforge.common.EnumPlantType.Plains;
-+        return net.minecraftforge.common.EnumPlantType.Plains;
-+    }
+@@ -44,4 +46,11 @@
+    public int func_200011_d(IBlockState p_200011_1_, IBlockReader p_200011_2_, BlockPos p_200011_3_) {
+       return 0;
+    }
 +
-+    @Override
-+    public IBlockState getPlant(net.minecraft.world.IBlockAccess world, BlockPos pos)
-+    {
-+        IBlockState state = world.func_180495_p(pos);
-+        if (state.func_177230_c() != this) return func_176223_P();
-+        return state;
-+    }
-+
-     @SideOnly(Side.CLIENT)
-     public BlockRenderLayer func_180664_k()
-     {
++   @Override
++   public IBlockState getPlant(IBlockReader world, BlockPos pos) {
++       IBlockState state = world.func_180495_p(pos);
++       if (state.func_177230_c() != this) return func_176223_P();
++       return state;
++   }
+ }

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

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockButton.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockButton.java
-@@ -90,7 +90,7 @@
-     protected static boolean func_181088_a(World p_181088_0_, BlockPos p_181088_1_, EnumFacing p_181088_2_)
-     {
-         BlockPos blockpos = p_181088_1_.func_177972_a(p_181088_2_);
--        return p_181088_2_ == EnumFacing.DOWN ? p_181088_0_.func_180495_p(blockpos).func_185896_q() : p_181088_0_.func_180495_p(blockpos).func_185915_l();
-+        return p_181088_0_.func_180495_p(blockpos).isSideSolid(p_181088_0_, blockpos, p_181088_2_.func_176734_d());
-     }
- 
-     public IBlockState func_180642_a(World p_180642_1_, BlockPos p_180642_2_, EnumFacing p_180642_3_, float p_180642_4_, float p_180642_5_, float p_180642_6_, int p_180642_7_, EntityLivingBase p_180642_8_)

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

@@ -1,59 +1,63 @@
---- ../src-base/minecraft/net/minecraft/block/BlockCactus.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockCactus.java
-@@ -19,7 +19,7 @@
- import net.minecraftforge.fml.relauncher.Side;
- import net.minecraftforge.fml.relauncher.SideOnly;
+--- a/net/minecraft/block/BlockCactus.java
++++ b/net/minecraft/block/BlockCactus.java
+@@ -21,7 +21,7 @@
+ import net.minecraft.world.IWorldReaderBase;
+ import net.minecraft.world.World;
  
--public class BlockCactus extends Block
-+public class BlockCactus extends Block implements net.minecraftforge.common.IPlantable
- {
-     public static final PropertyInteger field_176587_a = PropertyInteger.func_177719_a("age", 0, 15);
-     protected static final AxisAlignedBB field_185593_b = new AxisAlignedBB(0.0625D, 0.0D, 0.0625D, 0.9375D, 0.9375D, 0.9375D);
-@@ -50,6 +50,8 @@
-             {
-                 int j = ((Integer)p_180650_3_.func_177229_b(field_176587_a)).intValue();
+-public class BlockCactus extends Block {
++public class BlockCactus extends Block implements net.minecraftforge.common.IPlantable {
+    public static final IntegerProperty field_176587_a = BlockStateProperties.field_208171_X;
+    protected static final VoxelShape field_196400_b = Block.func_208617_a(1.0D, 0.0D, 1.0D, 15.0D, 15.0D, 15.0D);
+    protected static final VoxelShape field_196401_c = Block.func_208617_a(1.0D, 0.0D, 1.0D, 15.0D, 16.0D, 15.0D);
+@@ -32,6 +32,7 @@
+    }
  
-+                if(net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, blockpos, p_180650_3_, true))
-+                {
-                 if (j == 15)
-                 {
-                     p_180650_1_.func_175656_a(blockpos, this.func_176223_P());
-@@ -61,6 +63,8 @@
-                 {
-                     p_180650_1_.func_180501_a(p_180650_2_, p_180650_3_.func_177226_a(field_176587_a, Integer.valueOf(j + 1)), 4);
-                 }
-+                net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
-+                }
+    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
++      if (!p_196267_2_.func_205050_e(p_196267_3_, 1)) return; // Forge: prevent growing cactus from loading unloaded chunks with block update
+       if (!p_196267_1_.func_196955_c(p_196267_2_, p_196267_3_)) {
+          p_196267_2_.func_175655_b(p_196267_3_, true);
+       } else {
+@@ -44,6 +45,7 @@
+ 
+             if (i < 3) {
+                int j = p_196267_1_.func_177229_b(field_176587_a);
++               if(net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_196267_2_, blockpos, p_196267_1_, true)) {
+                if (j == 15) {
+                   p_196267_2_.func_175656_a(blockpos, this.func_176223_P());
+                   IBlockState iblockstate = p_196267_1_.func_206870_a(field_176587_a, Integer.valueOf(0));
+@@ -52,7 +54,8 @@
+                } else {
+                   p_196267_2_.func_180501_a(p_196267_3_, p_196267_1_.func_206870_a(field_176587_a, Integer.valueOf(j + 1)), 4);
+                }
+-
++               net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_196267_2_, p_196267_3_, p_196267_1_);
++               }
              }
-         }
-     }
-@@ -111,8 +115,8 @@
-             }
-         }
+          }
+       }
+@@ -91,8 +94,8 @@
+          }
+       }
  
--        Block block = p_176586_1_.func_180495_p(p_176586_2_.func_177977_b()).func_177230_c();
--        return block == Blocks.field_150434_aF || block == Blocks.field_150354_m && !p_176586_1_.func_180495_p(p_176586_2_.func_177984_a()).func_185904_a().func_76224_d();
-+        IBlockState state = p_176586_1_.func_180495_p(p_176586_2_.func_177977_b());
-+        return state.func_177230_c().canSustainPlant(state, p_176586_1_, p_176586_2_.func_177977_b(), EnumFacing.UP, this) && !p_176586_1_.func_180495_p(p_176586_2_.func_177984_a()).func_185904_a().func_76224_d();
-     }
+-      Block block = p_196260_2_.func_180495_p(p_196260_3_.func_177977_b()).func_177230_c();
+-      return (block == Blocks.field_150434_aF || block == Blocks.field_150354_m || block == Blocks.field_196611_F) && !p_196260_2_.func_180495_p(p_196260_3_.func_177984_a()).func_185904_a().func_76224_d();
++      IBlockState soil = p_196260_2_.func_180495_p(p_196260_3_.func_177977_b());
++      return soil.canSustainPlant(p_196260_2_, p_196260_3_.func_177977_b(), EnumFacing.UP, this) && !p_196260_2_.func_180495_p(p_196260_3_.func_177984_a()).func_185904_a().func_76224_d();
+    }
  
-     public void func_180634_a(World p_180634_1_, BlockPos p_180634_2_, IBlockState p_180634_3_, Entity p_180634_4_)
-@@ -136,6 +140,18 @@
-         return ((Integer)p_176201_1_.func_177229_b(field_176587_a)).intValue();
-     }
- 
-+    @Override
-+    public net.minecraftforge.common.EnumPlantType getPlantType(net.minecraft.world.IBlockAccess world, BlockPos pos)
-+    {
-+        return net.minecraftforge.common.EnumPlantType.Desert;
-+    }
+    public void func_196262_a(IBlockState p_196262_1_, World p_196262_2_, BlockPos p_196262_3_, Entity p_196262_4_) {
+@@ -114,4 +117,14 @@
+    public boolean func_196266_a(IBlockState p_196266_1_, IBlockReader p_196266_2_, BlockPos p_196266_3_, PathType p_196266_4_) {
+       return false;
+    }
 +
-+    @Override
-+    public IBlockState getPlant(net.minecraft.world.IBlockAccess world, BlockPos pos)
-+    {
-+        return func_176223_P();
-+    }
++   @Override
++   public net.minecraftforge.common.EnumPlantType getPlantType(IBlockReader world, BlockPos pos) {
++       return net.minecraftforge.common.EnumPlantType.Desert;
++   }
 +
-     protected BlockStateContainer func_180661_e()
-     {
-         return new BlockStateContainer(this, new IProperty[] {field_176587_a});
++   @Override
++   public IBlockState getPlant(IBlockReader world, BlockPos pos) {
++       return func_176223_P();
++   }
+ }

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

@@ -1,22 +1,11 @@
---- ../src-base/minecraft/net/minecraft/block/BlockChest.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockChest.java
-@@ -522,7 +522,7 @@
+--- a/net/minecraft/block/BlockChest.java
++++ b/net/minecraft/block/BlockChest.java
+@@ -258,7 +258,7 @@
+    }
  
-     private boolean func_176456_n(World p_176456_1_, BlockPos p_176456_2_)
-     {
--        return p_176456_1_.func_180495_p(p_176456_2_.func_177984_a()).func_185915_l();
-+        return p_176456_1_.func_180495_p(p_176456_2_.func_177984_a()).isSideSolid(p_176456_1_, p_176456_2_.func_177984_a(), EnumFacing.DOWN);
-     }
+    private boolean func_176456_n(IBlockReader p_176456_1_, BlockPos p_176456_2_) {
+-      return p_176456_1_.func_180495_p(p_176456_2_.func_177984_a()).func_185915_l();
++       return p_176456_1_.func_180495_p(p_176456_2_.func_177984_a()).doesSideBlockChestOpening(p_176456_1_, p_176456_2_.func_177984_a(), EnumFacing.DOWN);
+    }
  
-     private boolean func_176453_o(World p_176453_1_, BlockPos p_176453_2_)
-@@ -587,4 +587,10 @@
-         BASIC,
-         TRAP;
-     }
-+
-+    /* ======================================== FORGE START =====================================*/
-+    public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
-+    {
-+        return !func_176454_e(world, pos) && super.rotateBlock(world, pos, axis);
-+    }
- }
+    private boolean func_176453_o(World p_176453_1_, BlockPos p_176453_2_) {

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

@@ -1,19 +1,20 @@
---- ../src-base/minecraft/net/minecraft/block/BlockChorusFlower.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockChorusFlower.java
-@@ -53,7 +53,7 @@
-             {
-                 int i = ((Integer)p_180650_3_.func_177229_b(field_185607_a)).intValue();
- 
--                if (i < 5 && p_180650_4_.nextInt(1) == 0)
-+                if (i < 5 &&  net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, blockpos, p_180650_3_, p_180650_4_.nextInt(1) == 0))
-                 {
-                     boolean flag = false;
-                     boolean flag1 = false;
-@@ -142,6 +142,7 @@
-                     {
-                         this.func_185605_c(p_180650_1_, p_180650_2_);
-                     }
-+                    net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
-                 }
+--- a/net/minecraft/block/BlockChorusFlower.java
++++ b/net/minecraft/block/BlockChorusFlower.java
+@@ -42,7 +42,7 @@
+          BlockPos blockpos = p_196267_3_.func_177984_a();
+          if (p_196267_2_.func_175623_d(blockpos) && blockpos.func_177956_o() < 256) {
+             int i = p_196267_1_.func_177229_b(field_185607_a);
+-            if (i < 5) {
++            if (i < 5 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_196267_2_, blockpos, p_196267_1_, true)) {
+                boolean flag = false;
+                boolean flag1 = false;
+                IBlockState iblockstate = p_196267_2_.func_180495_p(p_196267_3_.func_177977_b());
+@@ -99,7 +99,7 @@
+                } else {
+                   this.func_185605_c(p_196267_2_, p_196267_3_);
+                }
+-
++               net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_196267_2_, p_196267_3_, p_196267_1_);
              }
-         }
+          }
+       }

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

@@ -1,46 +1,39 @@
---- ../src-base/minecraft/net/minecraft/block/BlockCocoa.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockCocoa.java
-@@ -43,13 +43,14 @@
-         {
-             this.func_176500_f(p_180650_1_, p_180650_2_, p_180650_3_);
-         }
--        else if (p_180650_1_.field_73012_v.nextInt(5) == 0)
-+        else
-         {
-             int i = ((Integer)p_180650_3_.func_177229_b(field_176501_a)).intValue();
+--- a/net/minecraft/block/BlockCocoa.java
++++ b/net/minecraft/block/BlockCocoa.java
+@@ -34,10 +34,11 @@
+    }
  
--            if (i < 2)
-+            if (i < 2 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_.nextInt(5) == 0))
-             {
-                 p_180650_1_.func_180501_a(p_180650_2_, p_180650_3_.func_177226_a(field_176501_a, Integer.valueOf(i + 1)), 2);
-+                net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
-             }
-         }
-     }
-@@ -131,7 +132,14 @@
+    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
+-      if (p_196267_2_.field_73012_v.nextInt(5) == 0) {
++      if (true) {
+          int i = p_196267_1_.func_177229_b(field_176501_a);
+-         if (i < 2) {
++         if (i < 2 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_196267_2_, p_196267_3_, p_196267_1_, p_196267_2_.field_73012_v.nextInt(5) == 0)) {
+             p_196267_2_.func_180501_a(p_196267_3_, p_196267_1_.func_206870_a(field_176501_a, Integer.valueOf(i + 1)), 2);
++            net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_196267_2_, p_196267_3_, p_196267_1_);
+          }
+       }
  
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
-     {
--        int i = ((Integer)p_180653_3_.func_177229_b(field_176501_a)).intValue();
-+        super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
-+    }
+@@ -90,14 +91,20 @@
+    }
+ 
+    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
+-      int i = p_196255_1_.func_177229_b(field_176501_a);
++      super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
++   }
 +
-+    @Override
-+    public java.util.List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
-+    {
-+        java.util.List<ItemStack> dropped = super.getDrops(world, pos, state, fortune);
-+        int i = ((Integer)state.func_177229_b(field_176501_a)).intValue();
-         int j = 1;
++   @Override
++   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune) {
++      super.getDrops(state, drops, world, pos, fortune);
++      int i = state.func_177229_b(field_176501_a);
+       int j = 1;
+       if (i >= 2) {
+          j = 3;
+       }
  
-         if (i >= 2)
-@@ -141,8 +149,9 @@
+       for(int k = 0; k < j; ++k) {
+-         func_180635_a(p_196255_2_, p_196255_3_, new ItemStack(Items.field_196130_bo));
++         drops.add(new ItemStack(Items.field_196130_bo));
+       }
  
-         for (int k = 0; k < j; ++k)
-         {
--            func_180635_a(p_180653_1_, p_180653_2_, new ItemStack(Items.field_151100_aR, 1, EnumDyeColor.BROWN.func_176767_b()));
-+            dropped.add(new ItemStack(Items.field_151100_aR, 1, EnumDyeColor.BROWN.func_176767_b()));
-         }
-+        return dropped;
-     }
- 
-     public ItemStack func_185473_a(World p_185473_1_, BlockPos p_185473_2_, IBlockState p_185473_3_)
+    }

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

@@ -1,73 +1,56 @@
---- ../src-base/minecraft/net/minecraft/block/BlockCrops.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockCrops.java
-@@ -78,9 +78,10 @@
-             {
-                 float f = func_180672_a(this, p_180650_1_, p_180650_2_);
+--- a/net/minecraft/block/BlockCrops.java
++++ b/net/minecraft/block/BlockCrops.java
+@@ -55,12 +55,14 @@
  
--                if (p_180650_4_.nextInt((int)(25.0F / f) + 1) == 0)
-+                if(net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_.nextInt((int)(25.0F / f) + 1) == 0))
-                 {
-                     p_180650_1_.func_180501_a(p_180650_2_, this.func_185528_e(i + 1), 2);
-+                    net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
-                 }
+    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
+       super.func_196267_b(p_196267_1_, p_196267_2_, p_196267_3_, p_196267_4_);
++      if (!p_196267_2_.func_205050_e(p_196267_3_, 1)) return; // Forge: prevent loading unloaded chunks when checking neighbor's light
+       if (p_196267_2_.func_201669_a(p_196267_3_.func_177984_a(), 0) >= 9) {
+          int i = this.func_185527_x(p_196267_1_);
+          if (i < this.func_185526_g()) {
+             float f = func_180672_a(this, p_196267_2_, p_196267_3_);
+-            if (p_196267_4_.nextInt((int)(25.0F / f) + 1) == 0) {
++            if (net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_196267_2_, p_196267_3_, p_196267_1_, p_196267_4_.nextInt((int)(25.0F / f) + 1) == 0)) {
+                p_196267_2_.func_180501_a(p_196267_3_, this.func_185528_e(i + 1), 2);
++               net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_196267_2_, p_196267_3_, p_196267_1_);
              }
-         }
-@@ -116,11 +117,11 @@
-                 float f1 = 0.0F;
-                 IBlockState iblockstate = p_180672_1_.func_180495_p(blockpos.func_177982_a(i, 0, j));
+          }
+       }
+@@ -89,9 +91,9 @@
+          for(int j = -1; j <= 1; ++j) {
+             float f1 = 0.0F;
+             IBlockState iblockstate = p_180672_1_.func_180495_p(blockpos.func_177982_a(i, 0, j));
+-            if (iblockstate.func_177230_c() == Blocks.field_150458_ak) {
++            if (iblockstate.canSustainPlant(p_180672_1_, blockpos.func_177982_a(i, 0, j), net.minecraft.util.EnumFacing.UP, (net.minecraftforge.common.IPlantable)p_180672_0_)) {
+                f1 = 1.0F;
+-               if (iblockstate.func_177229_b(BlockFarmland.field_176531_a) > 0) {
++               if (iblockstate.isFertile(p_180672_1_, blockpos.func_177982_a(i, 0, j))) {
+                   f1 = 3.0F;
+                }
+             }
+@@ -135,15 +137,19 @@
+    }
  
--                if (iblockstate.func_177230_c() == Blocks.field_150458_ak)
-+                if (iblockstate.func_177230_c().canSustainPlant(iblockstate, p_180672_1_, blockpos.func_177982_a(i, 0, j), net.minecraft.util.EnumFacing.UP, (net.minecraftforge.common.IPlantable)p_180672_0_))
-                 {
-                     f1 = 1.0F;
- 
--                    if (((Integer)iblockstate.func_177229_b(BlockFarmland.field_176531_a)).intValue() > 0)
-+                    if (iblockstate.func_177230_c().isFertile(p_180672_1_, blockpos.func_177982_a(i, 0, j)))
-                     {
-                         f1 = 3.0F;
-                     }
-@@ -161,7 +162,8 @@
- 
-     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
-     {
--        return (p_180671_1_.func_175699_k(p_180671_2_) >= 8 || p_180671_1_.func_175678_i(p_180671_2_)) && this.func_185514_i(p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()));
-+        IBlockState soil = p_180671_1_.func_180495_p(p_180671_2_.func_177977_b());
-+        return (p_180671_1_.func_175699_k(p_180671_2_) >= 8 || p_180671_1_.func_175678_i(p_180671_2_)) && soil.func_177230_c().canSustainPlant(soil, p_180671_1_, p_180671_2_.func_177977_b(), net.minecraft.util.EnumFacing.UP, this);
-     }
- 
-     protected Item func_149866_i()
-@@ -174,11 +176,33 @@
-         return Items.field_151015_O;
-     }
- 
-+    @Override
-+    public java.util.List<ItemStack> getDrops(net.minecraft.world.IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
-+    {
-+        java.util.List<ItemStack> ret = super.getDrops(world, pos, state, fortune);
-+        int age = func_185527_x(state);
-+        Random rand = world instanceof World ? ((World)world).field_73012_v : new Random();
+    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
+-      super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, 0);
+-      if (!p_196255_2_.field_72995_K) {
+-         int i = this.func_185527_x(p_196255_1_);
++      super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
++   }
 +
-+        if (age >= func_185526_g())
-+        {
-+            int k = 3 + fortune;
-+
-+            for (int i = 0; i < 3 + fortune; ++i)
-+            {
-+                if (rand.nextInt(2 * func_185526_g()) <= age)
-+                {
-+                    ret.add(new ItemStack(this.func_149866_i(), 1, 0));
-+                }
-+            }
-+        }
-+        return ret;
-+    }
-+
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
-     {
-         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, 0);
- 
--        if (!p_180653_1_.field_72995_K)
-+        if (false && !p_180653_1_.field_72995_K) // Forge: NOP all this.
-         {
-             int i = this.func_185527_x(p_180653_3_);
++   @Override
++   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune) {
++      {
++         int i = this.func_185527_x(state);
+          if (i >= this.func_185526_g()) {
+-            int j = 3 + p_196255_5_;
++            int j = 3 + fortune;
  
+             for(int k = 0; k < j; ++k) {
+-               if (p_196255_2_.field_73012_v.nextInt(2 * this.func_185526_g()) <= i) {
+-                  func_180635_a(p_196255_2_, p_196255_3_, new ItemStack(this.func_199772_f()));
++               if (world.field_73012_v.nextInt(2 * this.func_185526_g()) <= i) {
++                  drops.add(new ItemStack(this.func_199772_f()));
+                }
+             }
+          }

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

@@ -1,23 +1,22 @@
---- ../src-base/minecraft/net/minecraft/block/BlockDeadBush.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockDeadBush.java
-@@ -17,7 +17,7 @@
- import net.minecraft.world.IBlockAccess;
+--- a/net/minecraft/block/BlockDeadBush.java
++++ b/net/minecraft/block/BlockDeadBush.java
+@@ -14,7 +14,7 @@
+ import net.minecraft.world.IBlockReader;
  import net.minecraft.world.World;
  
--public class BlockDeadBush extends BlockBush
-+public class BlockDeadBush extends BlockBush implements net.minecraftforge.common.IShearable
- {
-     protected static final AxisAlignedBB field_185516_a = new AxisAlignedBB(0.09999999403953552D, 0.0D, 0.09999999403953552D, 0.8999999761581421D, 0.800000011920929D, 0.8999999761581421D);
+-public class BlockDeadBush extends BlockBush {
++public class BlockDeadBush extends BlockBush implements net.minecraftforge.common.IShearable {
+    protected static final VoxelShape field_196397_a = Block.func_208617_a(2.0D, 0.0D, 2.0D, 14.0D, 13.0D, 14.0D);
  
-@@ -68,4 +68,11 @@
-             super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
-         }
-     }
+    protected BlockDeadBush(Block.Properties p_i48418_1_) {
+@@ -46,4 +46,10 @@
+ 
+       super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, flag ? Blocks.field_150350_a.func_176223_P() : p_180657_4_, p_180657_5_, p_180657_6_);
+    }
 +
-+    @Override public boolean isShearable(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos){ return true; }
-+    @Override
-+    public java.util.List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
-+    {
-+        return java.util.Arrays.asList(new ItemStack(Blocks.field_150330_I));
-+    }
++   @Override
++   public java.util.List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IWorld world, BlockPos pos, int fortune) {
++      world.func_180501_a(pos, Blocks.field_150350_a.func_176223_P(), 11);
++      return java.util.Arrays.asList(new ItemStack(Blocks.field_196555_aI));
++   }
  }

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

@@ -0,0 +1,10 @@
+--- a/net/minecraft/block/BlockDirtSnowySpreadable.java
++++ b/net/minecraft/block/BlockDirtSnowySpreadable.java
+@@ -25,6 +25,7 @@
+ 
+    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
+       if (!p_196267_2_.field_72995_K) {
++         if (!p_196267_2_.func_205050_e(p_196267_3_, 3)) return; // Forge: prevent loading unloaded chunks when checking neighbor's light and spreading
+          if (!func_196383_a(p_196267_2_, p_196267_3_)) {
+             p_196267_2_.func_175656_a(p_196267_3_, Blocks.field_150346_d.func_176223_P());
+          } else {

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

@@ -1,29 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockDoor.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockDoor.java
-@@ -107,7 +107,7 @@
-     {
-         if (this.field_149764_J == Material.field_151573_f)
-         {
--            return false;
-+            return false; //Allow items to interact with the door
-         }
-         else
-         {
-@@ -175,7 +175,7 @@
-                 flag1 = true;
-             }
- 
--            if (!p_189540_2_.func_180495_p(p_189540_3_.func_177977_b()).func_185896_q())
-+            if (!p_189540_2_.func_180495_p(p_189540_3_.func_177977_b()).isSideSolid(p_189540_2_,  p_189540_3_.func_177977_b(), EnumFacing.UP))
-             {
-                 p_189540_2_.func_175698_g(p_189540_3_);
-                 flag1 = true;
-@@ -219,7 +219,7 @@
- 
-     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-     {
--        return p_176196_2_.func_177956_o() >= 255 ? false : p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).func_185896_q() && super.func_176196_c(p_176196_1_, p_176196_2_) && super.func_176196_c(p_176196_1_, p_176196_2_.func_177984_a());
-+        return p_176196_2_.func_177956_o() >= p_176196_1_.func_72800_K() - 1 ? false : p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).isSideSolid(p_176196_1_,  p_176196_2_.func_177977_b(), EnumFacing.UP) && super.func_176196_c(p_176196_1_, p_176196_2_) && super.func_176196_c(p_176196_1_, p_176196_2_.func_177984_a());
-     }
- 
-     public EnumPushReaction func_149656_h(IBlockState p_149656_1_)

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

@@ -1,90 +1,19 @@
---- ../src-base/minecraft/net/minecraft/block/BlockDoublePlant.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockDoublePlant.java
-@@ -26,7 +26,7 @@
- import net.minecraftforge.fml.relauncher.Side;
- import net.minecraftforge.fml.relauncher.SideOnly;
+--- a/net/minecraft/block/BlockDoublePlant.java
++++ b/net/minecraft/block/BlockDoublePlant.java
+@@ -43,7 +43,7 @@
+    @Nullable
+    public IBlockState func_196258_a(BlockItemUseContext p_196258_1_) {
+       BlockPos blockpos = p_196258_1_.func_195995_a();
+-      return blockpos.func_177956_o() < 255 && p_196258_1_.func_195991_k().func_180495_p(blockpos.func_177984_a()).func_196953_a(p_196258_1_) ? super.func_196258_a(p_196258_1_) : null;
++      return blockpos.func_177956_o() < p_196258_1_.func_195991_k().func_72800_K() - 1 && p_196258_1_.func_195991_k().func_180495_p(blockpos.func_177984_a()).func_196953_a(p_196258_1_) ? super.func_196258_a(p_196258_1_) : null;
+    }
  
--public class BlockDoublePlant extends BlockBush implements IGrowable
-+public class BlockDoublePlant extends BlockBush implements IGrowable, net.minecraftforge.common.IShearable
- {
-     public static final PropertyEnum<BlockDoublePlant.EnumPlantType> field_176493_a = PropertyEnum.<BlockDoublePlant.EnumPlantType>func_177709_a("variant", BlockDoublePlant.EnumPlantType.class);
-     public static final PropertyEnum<BlockDoublePlant.EnumBlockHalf> field_176492_b = PropertyEnum.<BlockDoublePlant.EnumBlockHalf>func_177709_a("half", BlockDoublePlant.EnumBlockHalf.class);
-@@ -89,6 +89,8 @@
-             Block block = (Block)(flag ? this : p_176475_1_.func_180495_p(blockpos).func_177230_c());
-             Block block1 = (Block)(flag ? p_176475_1_.func_180495_p(blockpos1).func_177230_c() : this);
+    public void func_180633_a(World p_180633_1_, BlockPos p_180633_2_, IBlockState p_180633_3_, EntityLivingBase p_180633_4_, ItemStack p_180633_5_) {
+@@ -51,6 +51,7 @@
+    }
  
-+            if (!flag) this.func_176226_b(p_176475_1_, p_176475_2_, p_176475_3_, 0); //Forge move above the setting to air.
-+
-             if (block == this)
-             {
-                 p_176475_1_.func_180501_a(blockpos, Blocks.field_150350_a.func_176223_P(), 2);
-@@ -97,17 +99,13 @@
-             if (block1 == this)
-             {
-                 p_176475_1_.func_180501_a(blockpos1, Blocks.field_150350_a.func_176223_P(), 3);
--
--                if (!flag)
--                {
--                    this.func_176226_b(p_176475_1_, blockpos1, p_176475_3_, 0);
--                }
-             }
-         }
-     }
- 
-     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
-     {
-+        if (p_180671_3_.func_177230_c() != this) return super.func_180671_f(p_180671_1_, p_180671_2_, p_180671_3_); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check.
-         if (p_180671_3_.func_177229_b(field_176492_b) == BlockDoublePlant.EnumBlockHalf.UPPER)
-         {
-             return p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()).func_177230_c() == this;
-@@ -150,7 +148,6 @@
- 
-     public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, ItemStack p_180657_6_)
-     {
--        if (p_180657_1_.field_72995_K || p_180657_6_.func_77973_b() != Items.field_151097_aZ || p_180657_4_.func_177229_b(field_176492_b) != BlockDoublePlant.EnumBlockHalf.LOWER || !this.func_176489_b(p_180657_1_, p_180657_3_, p_180657_4_, p_180657_2_))
-         {
-             super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
-         }
-@@ -210,8 +207,6 @@
-         else
-         {
-             p_176489_4_.func_71029_a(StatList.func_188055_a(this));
--            int i = (blockdoubleplant$enumplanttype == BlockDoublePlant.EnumPlantType.GRASS ? BlockTallGrass.EnumType.GRASS : BlockTallGrass.EnumType.FERN).func_177044_a();
--            func_180635_a(p_176489_1_, p_176489_2_, new ItemStack(Blocks.field_150329_H, 2, i));
-             return true;
-         }
-     }
-@@ -281,6 +276,33 @@
-         return Block.EnumOffsetType.XZ;
-     }
- 
-+    @Override
-+    public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos)
-+    {
-+        IBlockState state = world.func_180495_p(pos);
-+        EnumPlantType type = (EnumPlantType)state.func_177229_b(field_176493_a);
-+        return state.func_177229_b(field_176492_b) == EnumBlockHalf.LOWER && (type == EnumPlantType.FERN || type == EnumPlantType.GRASS);
-+    }
-+
-+    @Override
-+    public java.util.List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
-+    {
-+        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
-+        EnumPlantType type = (EnumPlantType)world.func_180495_p(pos).func_177229_b(field_176493_a);
-+        if (type == EnumPlantType.FERN) ret.add(new ItemStack(Blocks.field_150329_H, 2, BlockTallGrass.EnumType.FERN.func_177044_a()));
-+        if (type == EnumPlantType.GRASS) ret.add(new ItemStack(Blocks.field_150329_H, 2, BlockTallGrass.EnumType.GRASS.func_177044_a()));
-+        return ret;
-+    }
-+
-+    @Override
-+    public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest)
-+    {
-+        //Forge: Break both parts on the client to prevent the top part flickering as default type for a few frames.
-+        if (state.func_177230_c() ==  this && state.func_177229_b(field_176492_b) == EnumBlockHalf.LOWER && world.func_180495_p(pos.func_177984_a()).func_177230_c() == this)
-+            world.func_175698_g(pos.func_177984_a());
-+        return world.func_175698_g(pos);
-+    }
-+
-     public static enum EnumBlockHalf implements IStringSerializable
-     {
-         UPPER,
+    public boolean func_196260_a(IBlockState p_196260_1_, IWorldReaderBase p_196260_2_, BlockPos p_196260_3_) {
++      if (p_196260_1_.func_177230_c() != this) return super.func_196260_a(p_196260_1_, p_196260_2_, p_196260_3_); //Forge: This function is called during world gen and placement, before this block is set, so if we are not 'here' then assume it's the pre-check.
+       if (p_196260_1_.func_177229_b(field_176492_b) != DoubleBlockHalf.UPPER) {
+          return super.func_196260_a(p_196260_1_, p_196260_2_, p_196260_3_);
+       } else {

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

@@ -1,20 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockDragonEgg.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockDragonEgg.java
-@@ -47,7 +47,7 @@
- 
-     private void func_180683_d(World p_180683_1_, BlockPos p_180683_2_)
-     {
--        if (BlockFalling.func_185759_i(p_180683_1_.func_180495_p(p_180683_2_.func_177977_b())) && p_180683_2_.func_177956_o() >= 0)
-+        if (p_180683_1_.func_175623_d(p_180683_2_.func_177977_b()) && BlockFalling.func_185759_i(p_180683_1_.func_180495_p(p_180683_2_.func_177977_b())) && p_180683_2_.func_177956_o() >= 0)
-         {
-             int i = 32;
- 
-@@ -60,7 +60,7 @@
-                 p_180683_1_.func_175698_g(p_180683_2_);
-                 BlockPos blockpos;
- 
--                for (blockpos = p_180683_2_; BlockFalling.func_185759_i(p_180683_1_.func_180495_p(blockpos)) && blockpos.func_177956_o() > 0; blockpos = blockpos.func_177977_b())
-+                for (blockpos = p_180683_2_; p_180683_1_.func_175623_d(blockpos) && BlockFalling.func_185759_i(p_180683_1_.func_180495_p(blockpos)) && blockpos.func_177956_o() > 0; blockpos = blockpos.func_177977_b())
-                 {
-                     ;
-                 }

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

@@ -1,11 +1,11 @@
---- ../src-base/minecraft/net/minecraft/block/BlockDropper.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockDropper.java
-@@ -43,7 +43,7 @@
-             {
-                 ItemStack itemstack = tileentitydispenser.func_70301_a(i);
- 
--                if (!itemstack.func_190926_b())
-+                if (!itemstack.func_190926_b() && net.minecraftforge.items.VanillaInventoryCodeHooks.dropperInsertHook(p_176439_1_, p_176439_2_, tileentitydispenser, i, itemstack))
-                 {
-                     EnumFacing enumfacing = (EnumFacing)p_176439_1_.func_180495_p(p_176439_2_).func_177229_b(field_176441_a);
-                     BlockPos blockpos = p_176439_2_.func_177972_a(enumfacing);
+--- a/net/minecraft/block/BlockDropper.java
++++ b/net/minecraft/block/BlockDropper.java
+@@ -37,7 +37,7 @@
+          p_176439_1_.func_175718_b(1001, p_176439_2_, 0);
+       } else {
+          ItemStack itemstack = tileentitydispenser.func_70301_a(i);
+-         if (!itemstack.func_190926_b()) {
++         if (!itemstack.func_190926_b() && net.minecraftforge.items.VanillaInventoryCodeHooks.dropperInsertHook(p_176439_1_, p_176439_2_, tileentitydispenser, i, itemstack)) {
+             EnumFacing enumfacing = p_176439_1_.func_180495_p(p_176439_2_).func_177229_b(field_176441_a);
+             IInventory iinventory = TileEntityHopper.func_195484_a(p_176439_1_, p_176439_2_.func_177972_a(enumfacing));
+             ItemStack itemstack1;

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

@@ -1,19 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockDynamicLiquid.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockDynamicLiquid.java
-@@ -67,7 +67,7 @@
-                 }
-             }
- 
--            if (this.field_149815_a >= 2 && this.field_149764_J == Material.field_151586_h)
-+            if (this.field_149815_a >= 2 && net.minecraftforge.event.ForgeEventFactory.canCreateFluidSource(p_180650_1_, p_180650_2_, p_180650_3_, this.field_149764_J == Material.field_151586_h))
-             {
-                 IBlockState iblockstate = p_180650_1_.func_180495_p(p_180650_2_.func_177977_b());
- 
-@@ -166,6 +166,7 @@
-                 }
-                 else
-                 {
-+                    if (p_176375_3_.func_177230_c() != Blocks.field_150431_aC) //Forge: Vanilla has a 'bug' where snowballs don't drop like every other block. So special case because ewww...
-                     p_176375_3_.func_177230_c().func_176226_b(p_176375_1_, p_176375_2_, p_176375_3_, 0);
-                 }
-             }

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

@@ -1,11 +1,11 @@
---- ../src-base/minecraft/net/minecraft/block/BlockEnchantmentTable.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockEnchantmentTable.java
-@@ -63,7 +63,7 @@
-                     {
-                         BlockPos blockpos = p_180655_3_.func_177982_a(i, k, j);
- 
--                        if (p_180655_2_.func_180495_p(blockpos).func_177230_c() == Blocks.field_150342_X)
-+                        if (net.minecraftforge.common.ForgeHooks.getEnchantPower(p_180655_2_, blockpos) > 0)
-                         {
-                             if (!p_180655_2_.func_175623_d(p_180655_3_.func_177982_a(i / 2, 0, j / 2)))
-                             {
+--- a/net/minecraft/block/BlockEnchantmentTable.java
++++ b/net/minecraft/block/BlockEnchantmentTable.java
+@@ -49,7 +49,7 @@
+             if (p_180655_4_.nextInt(16) == 0) {
+                for(int k = 0; k <= 1; ++k) {
+                   BlockPos blockpos = p_180655_3_.func_177982_a(i, k, j);
+-                  if (p_180655_2_.func_180495_p(blockpos).func_177230_c() == Blocks.field_150342_X) {
++                  if (p_180655_2_.func_180495_p(blockpos).getEnchantPowerBonus(p_180655_2_, p_180655_3_) > 0) {
+                      if (!p_180655_2_.func_175623_d(p_180655_3_.func_177982_a(i / 2, 0, j / 2))) {
+                         break;
+                      }

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

@@ -0,0 +1,11 @@
+--- a/net/minecraft/block/BlockEnderChest.java
++++ b/net/minecraft/block/BlockEnderChest.java
+@@ -81,7 +81,7 @@
+       InventoryEnderChest inventoryenderchest = p_196250_4_.func_71005_bN();
+       TileEntity tileentity = p_196250_2_.func_175625_s(p_196250_3_);
+       if (inventoryenderchest != null && tileentity instanceof TileEntityEnderChest) {
+-         if (p_196250_2_.func_180495_p(p_196250_3_.func_177984_a()).func_185915_l()) {
++         if (p_196250_2_.func_180495_p(p_196250_3_.func_177984_a()).doesSideBlockChestOpening(p_196250_2_, p_196250_3_.func_177984_a(), EnumFacing.DOWN)) {
+             return true;
+          } else if (p_196250_2_.field_72995_K) {
+             return true;

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

@@ -1,32 +1,21 @@
---- ../src-base/minecraft/net/minecraft/block/BlockFalling.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockFalling.java
-@@ -47,7 +47,7 @@
- 
-     private void func_176503_e(World p_176503_1_, BlockPos p_176503_2_)
-     {
--        if (func_185759_i(p_176503_1_.func_180495_p(p_176503_2_.func_177977_b())) && p_176503_2_.func_177956_o() >= 0)
-+        if ((p_176503_1_.func_175623_d(p_176503_2_.func_177977_b()) || func_185759_i(p_176503_1_.func_180495_p(p_176503_2_.func_177977_b()))) && p_176503_2_.func_177956_o() >= 0)
-         {
-             int i = 32;
- 
-@@ -62,17 +62,18 @@
+--- a/net/minecraft/block/BlockFalling.java
++++ b/net/minecraft/block/BlockFalling.java
+@@ -48,7 +48,9 @@
+                p_176503_1_.func_72838_d(entityfallingblock);
              }
-             else
-             {
-+                IBlockState state = p_176503_1_.func_180495_p(p_176503_2_);
-                 p_176503_1_.func_175698_g(p_176503_2_);
-                 BlockPos blockpos;
- 
--                for (blockpos = p_176503_2_.func_177977_b(); func_185759_i(p_176503_1_.func_180495_p(blockpos)) && blockpos.func_177956_o() > 0; blockpos = blockpos.func_177977_b())
-+                for (blockpos = p_176503_2_.func_177977_b(); (p_176503_1_.func_175623_d(blockpos) || func_185759_i(p_176503_1_.func_180495_p(blockpos))) && blockpos.func_177956_o() > 0; blockpos = blockpos.func_177977_b())
-                 {
-                     ;
-                 }
- 
-                 if (blockpos.func_177956_o() > 0)
-                 {
--                    p_176503_1_.func_175656_a(blockpos.func_177984_a(), this.func_176223_P());
-+                    p_176503_1_.func_175656_a(blockpos.func_177984_a(), state); //Forge: Fix loss of state information during world gen.
-                 }
+          } else {
++            IBlockState state = func_176223_P();
+             if (p_176503_1_.func_180495_p(p_176503_2_).func_177230_c() == this) {
++               state = p_176503_1_.func_180495_p(p_176503_2_);
+                p_176503_1_.func_175698_g(p_176503_2_);
              }
-         }
+ 
+@@ -58,7 +60,7 @@
+             }
+ 
+             if (blockpos.func_177956_o() > 0) {
+-               p_176503_1_.func_175656_a(blockpos.func_177984_a(), this.func_176223_P());
++               p_176503_1_.func_175656_a(blockpos.func_177984_a(), state); //Forge: Fix loss of state information during world gen.
+             }
+          }
+ 

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

@@ -1,20 +1,24 @@
---- ../src-base/minecraft/net/minecraft/block/BlockFarmland.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockFarmland.java
-@@ -70,7 +70,7 @@
+--- a/net/minecraft/block/BlockFarmland.java
++++ b/net/minecraft/block/BlockFarmland.java
+@@ -79,7 +79,7 @@
+    }
  
-     public void func_180658_a(World p_180658_1_, BlockPos p_180658_2_, Entity p_180658_3_, float p_180658_4_)
-     {
--        if (!p_180658_1_.field_72995_K && p_180658_1_.field_73012_v.nextFloat() < p_180658_4_ - 0.5F && p_180658_3_ instanceof EntityLivingBase && (p_180658_3_ instanceof EntityPlayer || p_180658_1_.func_82736_K().func_82766_b("mobGriefing")) && p_180658_3_.field_70130_N * p_180658_3_.field_70130_N * p_180658_3_.field_70131_O > 0.512F)
-+        if (!p_180658_1_.field_72995_K && p_180658_3_.canTrample(p_180658_1_, this, p_180658_2_, p_180658_4_)) // Forge: Move logic to Entity#canTrample
-         {
-             this.func_190970_b(p_180658_1_, p_180658_2_);
-         }
-@@ -93,7 +93,7 @@
-     private boolean func_176529_d(World p_176529_1_, BlockPos p_176529_2_)
-     {
-         Block block = p_176529_1_.func_180495_p(p_176529_2_.func_177984_a()).func_177230_c();
--        return block instanceof BlockCrops || block instanceof BlockStem;
-+        return block instanceof net.minecraftforge.common.IPlantable && canSustainPlant(p_176529_1_.func_180495_p(p_176529_2_), p_176529_1_, p_176529_2_, net.minecraft.util.EnumFacing.UP, (net.minecraftforge.common.IPlantable)block);
-     }
+    public void func_180658_a(World p_180658_1_, BlockPos p_180658_2_, Entity p_180658_3_, float p_180658_4_) {
+-      if (!p_180658_1_.field_72995_K && p_180658_1_.field_73012_v.nextFloat() < p_180658_4_ - 0.5F && p_180658_3_ instanceof EntityLivingBase && (p_180658_3_ instanceof EntityPlayer || p_180658_1_.func_82736_K().func_82766_b("mobGriefing")) && p_180658_3_.field_70130_N * p_180658_3_.field_70130_N * p_180658_3_.field_70131_O > 0.512F) {
++      if (!p_180658_1_.field_72995_K && net.minecraftforge.common.ForgeHooks.onFarmlandTrample(p_180658_1_, p_180658_2_, Blocks.field_150346_d.func_176223_P(), p_180658_4_, p_180658_3_)) { // Forge: Move logic to Entity#canTrample
+          func_199610_d(p_180658_1_.func_180495_p(p_180658_2_), p_180658_1_, p_180658_2_);
+       }
  
-     private boolean func_176530_e(World p_176530_1_, BlockPos p_176530_2_)
+@@ -90,9 +90,9 @@
+       p_199610_1_.func_175656_a(p_199610_2_, func_199601_a(p_199610_0_, Blocks.field_150346_d.func_176223_P(), p_199610_1_, p_199610_2_));
+    }
+ 
+-   private static boolean func_176529_d(IBlockReader p_176529_0_, BlockPos p_176529_1_) {
+-      Block block = p_176529_0_.func_180495_p(p_176529_1_.func_177984_a()).func_177230_c();
+-      return block instanceof BlockCrops || block instanceof BlockStem || block instanceof BlockAttachedStem;
++   private boolean func_176529_d(IBlockReader p_176529_0_, BlockPos p_176529_1_) {
++      IBlockState state = p_176529_0_.func_180495_p(p_176529_1_.func_177984_a());
++      return state.func_177230_c() instanceof net.minecraftforge.common.IPlantable && canSustainPlant(state, p_176529_0_, p_176529_1_, EnumFacing.UP, (net.minecraftforge.common.IPlantable)state.func_177230_c());
+    }
+ 
+    private static boolean func_176530_e(IWorldReaderBase p_176530_0_, BlockPos p_176530_1_) {

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

@@ -1,49 +1,50 @@
---- ../src-base/minecraft/net/minecraft/block/BlockFence.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockFence.java
-@@ -157,7 +157,10 @@
+--- a/net/minecraft/block/BlockFence.java
++++ b/net/minecraft/block/BlockFence.java
+@@ -64,15 +64,12 @@
+       IBlockReader iblockreader = p_196258_1_.func_195991_k();
+       BlockPos blockpos = p_196258_1_.func_195995_a();
+       IFluidState ifluidstate = p_196258_1_.func_195991_k().func_204610_c(p_196258_1_.func_195995_a());
+-      BlockPos blockpos1 = blockpos.func_177978_c();
+-      BlockPos blockpos2 = blockpos.func_177974_f();
+-      BlockPos blockpos3 = blockpos.func_177968_d();
+-      BlockPos blockpos4 = blockpos.func_177976_e();
+-      IBlockState iblockstate = iblockreader.func_180495_p(blockpos1);
+-      IBlockState iblockstate1 = iblockreader.func_180495_p(blockpos2);
+-      IBlockState iblockstate2 = iblockreader.func_180495_p(blockpos3);
+-      IBlockState iblockstate3 = iblockreader.func_180495_p(blockpos4);
+-      return super.func_196258_a(p_196258_1_).func_206870_a(field_196409_a, Boolean.valueOf(this.func_196416_a(iblockstate, iblockstate.func_193401_d(iblockreader, blockpos1, EnumFacing.SOUTH)))).func_206870_a(field_196411_b, Boolean.valueOf(this.func_196416_a(iblockstate1, iblockstate1.func_193401_d(iblockreader, blockpos2, EnumFacing.WEST)))).func_206870_a(field_196413_c, Boolean.valueOf(this.func_196416_a(iblockstate2, iblockstate2.func_193401_d(iblockreader, blockpos3, EnumFacing.NORTH)))).func_206870_a(field_196414_y, Boolean.valueOf(this.func_196416_a(iblockstate3, iblockstate3.func_193401_d(iblockreader, blockpos4, EnumFacing.EAST)))).func_206870_a(field_204514_u, Boolean.valueOf(ifluidstate.func_206886_c() == Fluids.field_204546_a));
++      return super.func_196258_a(p_196258_1_)
++              .func_206870_a(field_196409_a, canFenceConnectTo(iblockreader, blockpos, EnumFacing.NORTH))
++              .func_206870_a(field_196411_b, canFenceConnectTo(iblockreader, blockpos, EnumFacing.EAST))
++              .func_206870_a(field_196413_c, canFenceConnectTo(iblockreader, blockpos, EnumFacing.SOUTH))
++              .func_206870_a(field_196414_y, canFenceConnectTo(iblockreader, blockpos, EnumFacing.WEST))
++              .func_206870_a(field_204514_u, Boolean.valueOf(ifluidstate.func_206886_c() == Fluids.field_204546_a));
+    }
  
-     public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
-     {
--        return p_176221_1_.func_177226_a(field_176526_a, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177978_c()))).func_177226_a(field_176525_b, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177974_f()))).func_177226_a(field_176527_M, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177968_d()))).func_177226_a(field_176528_N, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177976_e())));
-+        return p_176221_1_.func_177226_a(field_176526_a, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.NORTH))
-+                .func_177226_a(field_176525_b, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.EAST))
-+                .func_177226_a(field_176527_M, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.SOUTH))
-+                .func_177226_a(field_176528_N, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.WEST));
-     }
+    public IBlockState func_196271_a(IBlockState p_196271_1_, EnumFacing p_196271_2_, IBlockState p_196271_3_, IWorld p_196271_4_, BlockPos p_196271_5_, BlockPos p_196271_6_) {
+@@ -80,7 +77,7 @@
+          p_196271_4_.func_205219_F_().func_205360_a(p_196271_5_, Fluids.field_204546_a, Fluids.field_204546_a.func_205569_a(p_196271_4_));
+       }
  
-     public IBlockState func_185499_a(IBlockState p_185499_1_, Rotation p_185499_2_)
-@@ -192,4 +195,34 @@
-     {
-         return new BlockStateContainer(this, new IProperty[] {field_176526_a, field_176525_b, field_176528_N, field_176527_M});
-     }
+-      return p_196271_2_.func_176740_k().func_176716_d() == EnumFacing.Plane.HORIZONTAL ? p_196271_1_.func_206870_a(field_196415_z.get(p_196271_2_), Boolean.valueOf(this.func_196416_a(p_196271_3_, p_196271_3_.func_193401_d(p_196271_4_, p_196271_6_, p_196271_2_.func_176734_d())))) : super.func_196271_a(p_196271_1_, p_196271_2_, p_196271_3_, p_196271_4_, p_196271_5_, p_196271_6_);
++      return p_196271_2_.func_176740_k().func_176716_d() == EnumFacing.Plane.HORIZONTAL ? p_196271_1_.func_206870_a(field_196415_z.get(p_196271_2_), Boolean.valueOf(this.canFenceConnectTo(p_196271_4_, p_196271_5_, p_196271_2_))) : super.func_196271_a(p_196271_1_, p_196271_2_, p_196271_3_, p_196271_4_, p_196271_5_, p_196271_6_);
+    }
+ 
+    protected void func_206840_a(StateContainer.Builder<Block, IBlockState> p_206840_1_) {
+@@ -90,4 +87,16 @@
+    public BlockFaceShape func_193383_a(IBlockReader p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_) {
+       return p_193383_4_ != EnumFacing.UP && p_193383_4_ != EnumFacing.DOWN ? BlockFaceShape.MIDDLE_POLE : BlockFaceShape.CENTER;
+    }
 +
-+    /* ======================================== FORGE START ======================================== */
++   @Override
++   public boolean canBeConnectedTo(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing facing) {
++      IBlockState other = world.func_180495_p(pos.func_177972_a(facing));
++      return func_196416_a(other, other.func_193401_d(world, pos.func_177972_a(facing), facing.func_176734_d()));
++   }
 +
-+    @Override
-+    public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
-+    {
-+        Block connector = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
-+
-+        if(connector instanceof BlockFence)
-+        {
-+            if(this != Blocks.field_150386_bk && connector == Blocks.field_150386_bk)
-+            {
-+                return false;
-+            }
-+            else if(this == Blocks.field_150386_bk && connector != Blocks.field_150386_bk)
-+            {
-+                return false;
-+            }
-+            return true;
-+        }
-+        return false;
-+    }
-+
-+    private boolean canFenceConnectTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
-+    {
-+        Block block = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
-+        return block.canBeConnectedTo(world, pos.func_177972_a(facing), facing.func_176734_d()) || func_176524_e(world, pos.func_177972_a(facing));
-+    }
-+
-+    /* ======================================== FORGE END ======================================== */
++   private boolean canFenceConnectTo(IBlockReader world, BlockPos pos, EnumFacing facing) {
++      BlockPos offset = pos.func_177972_a(facing);
++      IBlockState other = world.func_180495_p(offset);
++      return other.canBeConnectedTo(world, offset, facing.func_176734_d()) || func_176223_P().canBeConnectedTo(world, pos, facing);
++   }
  }

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

@@ -1,33 +1,26 @@
---- ../src-base/minecraft/net/minecraft/block/BlockFenceGate.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockFenceGate.java
-@@ -50,7 +50,7 @@
-     {
-         EnumFacing.Axis enumfacing$axis = ((EnumFacing)p_176221_1_.func_177229_b(field_185512_D)).func_176740_k();
+--- a/net/minecraft/block/BlockFenceGate.java
++++ b/net/minecraft/block/BlockFenceGate.java
+@@ -100,7 +100,7 @@
+    }
  
--        if (enumfacing$axis == EnumFacing.Axis.Z && (p_176221_2_.func_180495_p(p_176221_3_.func_177976_e()).func_177230_c() == Blocks.field_150463_bK || p_176221_2_.func_180495_p(p_176221_3_.func_177974_f()).func_177230_c() == Blocks.field_150463_bK) || enumfacing$axis == EnumFacing.Axis.X && (p_176221_2_.func_180495_p(p_176221_3_.func_177978_c()).func_177230_c() == Blocks.field_150463_bK || p_176221_2_.func_180495_p(p_176221_3_.func_177968_d()).func_177230_c() == Blocks.field_150463_bK))
-+        if (enumfacing$axis == EnumFacing.Axis.Z && (canFenceGateConnectTo(p_176221_2_, p_176221_3_, EnumFacing.WEST) || canFenceGateConnectTo(p_176221_2_, p_176221_3_, EnumFacing.EAST)) || enumfacing$axis == EnumFacing.Axis.X && (canFenceGateConnectTo(p_176221_2_, p_176221_3_, EnumFacing.NORTH) || canFenceGateConnectTo(p_176221_2_, p_176221_3_, EnumFacing.SOUTH)))
-         {
-             p_176221_1_ = p_176221_1_.func_177226_a(field_176467_M, Boolean.valueOf(true));
-         }
-@@ -175,4 +175,21 @@
-     {
-         return new BlockStateContainer(this, new IProperty[] {field_185512_D, field_176466_a, field_176465_b, field_176467_M});
-     }
+    private boolean func_196380_i(IBlockState p_196380_1_) {
+-      return p_196380_1_.func_177230_c() == Blocks.field_150463_bK || p_196380_1_.func_177230_c() == Blocks.field_196723_eg;
++      return p_196380_1_.func_177230_c() == Blocks.field_150463_bK || p_196380_1_.func_177230_c() == Blocks.field_196723_eg || p_196380_1_.func_177230_c() instanceof BlockWall;
+    }
+ 
+    public boolean func_196250_a(IBlockState p_196250_1_, World p_196250_2_, BlockPos p_196250_3_, EntityPlayer p_196250_4_, EnumHand p_196250_5_, EnumFacing p_196250_6_, float p_196250_7_, float p_196250_8_, float p_196250_9_) {
+@@ -145,4 +145,14 @@
+          return BlockFaceShape.UNDEFINED;
+       }
+    }
 +
-+    /* ======================================== FORGE START ======================================== */
++   @Override
++   public boolean canBeConnectedTo(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing facing) {
++      if (state.func_193401_d(world, pos, facing) == BlockFaceShape.MIDDLE_POLE) {
++         Block other = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
++         return other instanceof BlockFence || other instanceof BlockWall;
++      }
++      return false;
++   }
 +
-+    @Override
-+    public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
-+    {
-+        Block connector = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
-+        return connector instanceof BlockFence || connector instanceof BlockWall;
-+    }
-+
-+    private boolean canFenceGateConnectTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
-+    {
-+        Block block = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
-+        return block.canBeConnectedTo(world, pos.func_177972_a(facing), facing.func_176734_d());
-+    }
-+
-+    /* ======================================== FORGE END ======================================== */
  }

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

@@ -1,209 +1,188 @@
---- ../src-base/minecraft/net/minecraft/block/BlockFire.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockFire.java
-@@ -38,7 +38,15 @@
+--- a/net/minecraft/block/BlockFire.java
++++ b/net/minecraft/block/BlockFire.java
+@@ -64,13 +64,13 @@
  
-     public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
-     {
--        return !p_176221_2_.func_180495_p(p_176221_3_.func_177977_b()).func_185896_q() && !Blocks.field_150480_ab.func_176535_e(p_176221_2_, p_176221_3_.func_177977_b()) ? p_176221_1_.func_177226_a(field_176545_N, Boolean.valueOf(this.func_176535_e(p_176221_2_, p_176221_3_.func_177978_c()))).func_177226_a(field_176546_O, Boolean.valueOf(this.func_176535_e(p_176221_2_, p_176221_3_.func_177974_f()))).func_177226_a(field_176541_P, Boolean.valueOf(this.func_176535_e(p_176221_2_, p_176221_3_.func_177968_d()))).func_177226_a(field_176539_Q, Boolean.valueOf(this.func_176535_e(p_176221_2_, p_176221_3_.func_177976_e()))).func_177226_a(field_176542_R, Boolean.valueOf(this.func_176535_e(p_176221_2_, p_176221_3_.func_177984_a()))) : this.func_176223_P();
-+        if (!p_176221_2_.func_180495_p(p_176221_3_.func_177977_b()).isSideSolid(p_176221_2_, p_176221_3_.func_177977_b(), EnumFacing.UP) && !Blocks.field_150480_ab.canCatchFire(p_176221_2_, p_176221_3_.func_177977_b(), EnumFacing.UP))
-+        {
-+            return p_176221_1_.func_177226_a(field_176545_N, this.canCatchFire(p_176221_2_, p_176221_3_.func_177978_c(), EnumFacing.SOUTH))
-+                        .func_177226_a(field_176546_O,  this.canCatchFire(p_176221_2_, p_176221_3_.func_177974_f(), EnumFacing.WEST))
-+                        .func_177226_a(field_176541_P, this.canCatchFire(p_176221_2_, p_176221_3_.func_177968_d(), EnumFacing.NORTH))
-+                        .func_177226_a(field_176539_Q,  this.canCatchFire(p_176221_2_, p_176221_3_.func_177976_e(), EnumFacing.EAST))
-+                        .func_177226_a(field_176542_R, this.canCatchFire(p_176221_2_, p_176221_3_.func_177984_a(), EnumFacing.DOWN));
-+        }
-+        return this.func_176223_P();
-     }
+    public IBlockState func_196448_a(IBlockReader p_196448_1_, BlockPos p_196448_2_) {
+       IBlockState iblockstate = p_196448_1_.func_180495_p(p_196448_2_.func_177977_b());
+-      if (!iblockstate.func_185896_q() && !this.func_196446_i(iblockstate)) {
++      if (!iblockstate.func_185896_q() && !this.canCatchFire(p_196448_1_, p_196448_2_, EnumFacing.UP)) {
+          IBlockState iblockstate1 = this.func_176223_P();
  
-     protected BlockFire()
-@@ -91,6 +99,7 @@
- 
-     public void func_180686_a(Block p_180686_1_, int p_180686_2_, int p_180686_3_)
-     {
-+        if (p_180686_1_ == Blocks.field_150350_a) throw new IllegalArgumentException("Tried to set air on fire... This is bad.");
-         this.field_149849_a.put(p_180686_1_, Integer.valueOf(p_180686_2_));
-         this.field_149848_b.put(p_180686_1_, Integer.valueOf(p_180686_3_));
-     }
-@@ -131,13 +140,8 @@
+          for(EnumFacing enumfacing : EnumFacing.values()) {
+             BooleanProperty booleanproperty = field_196449_B.get(enumfacing);
+             if (booleanproperty != null) {
+-               iblockstate1 = iblockstate1.func_206870_a(booleanproperty, Boolean.valueOf(this.func_196446_i(p_196448_1_.func_180495_p(p_196448_2_.func_177972_a(enumfacing)))));
++               iblockstate1 = iblockstate1.func_206870_a(booleanproperty, Boolean.valueOf(this.canCatchFire(p_196448_1_, p_196448_2_.func_177972_a(enumfacing), enumfacing.func_176734_d())));
              }
+          }
  
-             Block block = p_180650_1_.func_180495_p(p_180650_2_.func_177977_b()).func_177230_c();
--            boolean flag = block == Blocks.field_150424_aL;
-+            boolean flag = block.isFireSource(p_180650_1_, p_180650_2_.func_177977_b(), EnumFacing.UP);
+@@ -98,12 +98,13 @@
  
--            if (p_180650_1_.field_73011_w instanceof WorldProviderEnd && block == Blocks.field_150357_h)
--            {
--                flag = true;
--            }
--
-             int i = ((Integer)p_180650_3_.func_177229_b(field_176543_a)).intValue();
+    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
+       if (p_196267_2_.func_82736_K().func_82766_b("doFireTick")) {
++         if (!p_196267_2_.func_205050_e(p_196267_3_, 2)) return; // Forge: prevent loading unloaded chunks when spreading fire
+          if (!p_196267_1_.func_196955_c(p_196267_2_, p_196267_3_)) {
+             p_196267_2_.func_175698_g(p_196267_3_);
+          }
  
-             if (!flag && p_180650_1_.func_72896_J() && this.func_176537_d(p_180650_1_, p_180650_2_) && p_180650_4_.nextFloat() < 0.2F + (float)i * 0.03F)
-@@ -158,7 +162,7 @@
-                 {
-                     if (!this.func_176533_e(p_180650_1_, p_180650_2_))
-                     {
--                        if (!p_180650_1_.func_180495_p(p_180650_2_.func_177977_b()).func_185896_q() || i > 3)
-+                        if (!p_180650_1_.func_180495_p(p_180650_2_.func_177977_b()).isSideSolid(p_180650_1_, p_180650_2_.func_177977_b(), EnumFacing.UP) || i > 3)
-                         {
-                             p_180650_1_.func_175698_g(p_180650_2_);
-                         }
-@@ -166,7 +170,7 @@
-                         return;
-                     }
+-         Block block = p_196267_2_.func_180495_p(p_196267_3_.func_177977_b()).func_177230_c();
+-         boolean flag = p_196267_2_.field_73011_w instanceof EndDimension && block == Blocks.field_150357_h || block == Blocks.field_150424_aL || block == Blocks.field_196814_hQ;
++         IBlockState other = p_196267_2_.func_180495_p(p_196267_3_.func_177977_b());
++         boolean flag = other.isFireSource(p_196267_2_, p_196267_3_.func_177977_b(), EnumFacing.UP);
+          int i = p_196267_1_.func_177229_b(field_176543_a);
+          if (!flag && p_196267_2_.func_72896_J() && this.func_176537_d(p_196267_2_, p_196267_3_) && p_196267_4_.nextFloat() < 0.2F + (float)i * 0.03F) {
+             p_196267_2_.func_175698_g(p_196267_3_);
+@@ -117,14 +118,14 @@
+             if (!flag) {
+                p_196267_2_.func_205220_G_().func_205360_a(p_196267_3_, this, this.func_149738_a(p_196267_2_) + p_196267_4_.nextInt(10));
+                if (!this.func_196447_a(p_196267_2_, p_196267_3_)) {
+-                  if (!p_196267_2_.func_180495_p(p_196267_3_.func_177977_b()).func_185896_q() || i > 3) {
++                  if (p_196267_2_.func_180495_p(p_196267_3_.func_177977_b()).func_193401_d(p_196267_2_, p_196267_3_.func_177977_b(), EnumFacing.UP) != BlockFaceShape.SOLID || i > 3) {
+                      p_196267_2_.func_175698_g(p_196267_3_);
+                   }
  
--                    if (!this.func_176535_e(p_180650_1_, p_180650_2_.func_177977_b()) && i == 15 && p_180650_4_.nextInt(4) == 0)
-+                    if (!this.canCatchFire(p_180650_1_, p_180650_2_.func_177977_b(), EnumFacing.UP) && i == 15 && p_180650_4_.nextInt(4) == 0)
-                     {
-                         p_180650_1_.func_175698_g(p_180650_2_);
-                         return;
-@@ -181,12 +185,12 @@
-                     j = -50;
-                 }
+                   return;
+                }
  
--                this.func_176536_a(p_180650_1_, p_180650_2_.func_177974_f(), 300 + j, p_180650_4_, i);
--                this.func_176536_a(p_180650_1_, p_180650_2_.func_177976_e(), 300 + j, p_180650_4_, i);
--                this.func_176536_a(p_180650_1_, p_180650_2_.func_177977_b(), 250 + j, p_180650_4_, i);
--                this.func_176536_a(p_180650_1_, p_180650_2_.func_177984_a(), 250 + j, p_180650_4_, i);
--                this.func_176536_a(p_180650_1_, p_180650_2_.func_177978_c(), 300 + j, p_180650_4_, i);
--                this.func_176536_a(p_180650_1_, p_180650_2_.func_177968_d(), 300 + j, p_180650_4_, i);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177974_f(), 300 + j, p_180650_4_, i, EnumFacing.WEST);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177976_e(), 300 + j, p_180650_4_, i, EnumFacing.EAST);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177977_b(), 250 + j, p_180650_4_, i, EnumFacing.UP);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177984_a(), 250 + j, p_180650_4_, i, EnumFacing.DOWN);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177978_c(), 300 + j, p_180650_4_, i, EnumFacing.SOUTH);
-+                this.tryCatchFire(p_180650_1_, p_180650_2_.func_177968_d(), 300 + j, p_180650_4_, i, EnumFacing.NORTH);
+-               if (i == 15 && p_196267_4_.nextInt(4) == 0 && !this.func_196446_i(p_196267_2_.func_180495_p(p_196267_3_.func_177977_b()))) {
++               if (i == 15 && p_196267_4_.nextInt(4) == 0 && !this.canCatchFire(p_196267_2_, p_196267_3_.func_177977_b(), EnumFacing.UP)) {
+                   p_196267_2_.func_175698_g(p_196267_3_);
+                   return;
+                }
+@@ -132,12 +133,12 @@
  
-                 for (int k = -1; k <= 1; ++k)
-                 {
-@@ -245,22 +249,30 @@
-         return false;
-     }
+             boolean flag1 = p_196267_2_.func_180502_D(p_196267_3_);
+             int k = flag1 ? -50 : 0;
+-            this.func_176536_a(p_196267_2_, p_196267_3_.func_177974_f(), 300 + k, p_196267_4_, i);
+-            this.func_176536_a(p_196267_2_, p_196267_3_.func_177976_e(), 300 + k, p_196267_4_, i);
+-            this.func_176536_a(p_196267_2_, p_196267_3_.func_177977_b(), 250 + k, p_196267_4_, i);
+-            this.func_176536_a(p_196267_2_, p_196267_3_.func_177984_a(), 250 + k, p_196267_4_, i);
+-            this.func_176536_a(p_196267_2_, p_196267_3_.func_177978_c(), 300 + k, p_196267_4_, i);
+-            this.func_176536_a(p_196267_2_, p_196267_3_.func_177968_d(), 300 + k, p_196267_4_, i);
++            this.tryCatchFire(p_196267_2_, p_196267_3_.func_177974_f(), 300 + k, p_196267_4_, i, EnumFacing.WEST);
++            this.tryCatchFire(p_196267_2_, p_196267_3_.func_177976_e(), 300 + k, p_196267_4_, i, EnumFacing.EAST);
++            this.tryCatchFire(p_196267_2_, p_196267_3_.func_177977_b(), 250 + k, p_196267_4_, i, EnumFacing.UP);
++            this.tryCatchFire(p_196267_2_, p_196267_3_.func_177984_a(), 250 + k, p_196267_4_, i, EnumFacing.DOWN);
++            this.tryCatchFire(p_196267_2_, p_196267_3_.func_177978_c(), 300 + k, p_196267_4_, i, EnumFacing.SOUTH);
++            this.tryCatchFire(p_196267_2_, p_196267_3_.func_177968_d(), 300 + k, p_196267_4_, i, EnumFacing.NORTH);
+             BlockPos.MutableBlockPos blockpos$mutableblockpos = new BlockPos.MutableBlockPos();
  
-+    @Deprecated // Use Block.getFlammability
-     public int func_176532_c(Block p_176532_1_)
-     {
-         Integer integer = (Integer)this.field_149848_b.get(p_176532_1_);
-         return integer == null ? 0 : integer.intValue();
-     }
+             for(int l = -1; l <= 1; ++l) {
+@@ -175,16 +176,18 @@
+       return p_176537_1_.func_175727_C(p_176537_2_) || p_176537_1_.func_175727_C(p_176537_2_.func_177976_e()) || p_176537_1_.func_175727_C(p_176537_2_.func_177974_f()) || p_176537_1_.func_175727_C(p_176537_2_.func_177978_c()) || p_176537_1_.func_175727_C(p_176537_2_.func_177968_d());
+    }
  
-+    @Deprecated // Use Block.getFlammability
-     public int func_176534_d(Block p_176534_1_)
-     {
-         Integer integer = (Integer)this.field_149849_a.get(p_176534_1_);
-         return integer == null ? 0 : integer.intValue();
-     }
++   @Deprecated //Forge: Use IForgeBlockState.getFlammability
+    public int func_176532_c(Block p_176532_1_) {
+       return this.field_149848_b.getInt(p_176532_1_);
+    }
  
-+    @Deprecated // Use tryCatchFire with face below
-     private void func_176536_a(World p_176536_1_, BlockPos p_176536_2_, int p_176536_3_, Random p_176536_4_, int p_176536_5_)
-     {
--        int i = this.func_176532_c(p_176536_1_.func_180495_p(p_176536_2_).func_177230_c());
-+        this.tryCatchFire(p_176536_1_, p_176536_2_, p_176536_3_, p_176536_4_, p_176536_5_, EnumFacing.UP);
-+    }
++   @Deprecated //Forge: Use IForgeBlockState.getFireSpreadSpeed
+    public int func_176534_d(Block p_176534_1_) {
+       return this.field_149849_a.getInt(p_176534_1_);
+    }
  
-+    private void tryCatchFire(World p_176536_1_, BlockPos p_176536_2_, int p_176536_3_, Random p_176536_4_, int p_176536_5_, EnumFacing face)
-+    {
-+        int i = p_176536_1_.func_180495_p(p_176536_2_).func_177230_c().getFlammability(p_176536_1_, p_176536_2_, face);
+-   private void func_176536_a(World p_176536_1_, BlockPos p_176536_2_, int p_176536_3_, Random p_176536_4_, int p_176536_5_) {
+-      int i = this.func_176532_c(p_176536_1_.func_180495_p(p_176536_2_).func_177230_c());
++   private void tryCatchFire(World p_176536_1_, BlockPos p_176536_2_, int p_176536_3_, Random p_176536_4_, int p_176536_5_, EnumFacing face) {
++      int i = p_176536_1_.func_180495_p(p_176536_2_).getFlammability(p_176536_1_, p_176536_2_, face);
+       if (p_176536_4_.nextInt(p_176536_3_) < i) {
+          IBlockState iblockstate = p_176536_1_.func_180495_p(p_176536_2_);
+          if (p_176536_4_.nextInt(p_176536_5_ + 10) < 5 && !p_176536_1_.func_175727_C(p_176536_2_)) {
+@@ -204,7 +207,7 @@
+ 
+    private boolean func_196447_a(IBlockReader p_196447_1_, BlockPos p_196447_2_) {
+       for(EnumFacing enumfacing : EnumFacing.values()) {
+-         if (this.func_196446_i(p_196447_1_.func_180495_p(p_196447_2_.func_177972_a(enumfacing)))) {
++         if (this.canCatchFire(p_196447_1_, p_196447_2_.func_177972_a(enumfacing), enumfacing.func_176734_d())) {
+             return true;
+          }
+       }
+@@ -219,7 +222,7 @@
+          int i = 0;
+ 
+          for(EnumFacing enumfacing : EnumFacing.values()) {
+-            i = Math.max(this.func_176534_d(p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(enumfacing)).func_177230_c()), i);
++            i = Math.max(p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(enumfacing)).getFlammability(p_176538_1_, p_176538_2_.func_177972_a(enumfacing), enumfacing.func_176734_d()), i);
+          }
+ 
+          return i;
+@@ -230,6 +233,7 @@
+       return false;
+    }
+ 
++   @Deprecated //Forge: Use canCatchFire with more context
+    public boolean func_196446_i(IBlockState p_196446_1_) {
+       return this.func_176534_d(p_196446_1_.func_177230_c()) > 0;
+    }
+@@ -252,8 +256,8 @@
+          p_180655_2_.func_184134_a((double)((float)p_180655_3_.func_177958_n() + 0.5F), (double)((float)p_180655_3_.func_177956_o() + 0.5F), (double)((float)p_180655_3_.func_177952_p() + 0.5F), SoundEvents.field_187643_bs, SoundCategory.BLOCKS, 1.0F + p_180655_4_.nextFloat(), p_180655_4_.nextFloat() * 0.7F + 0.3F, false);
+       }
+ 
+-      if (!p_180655_2_.func_180495_p(p_180655_3_.func_177977_b()).func_185896_q() && !this.func_196446_i(p_180655_2_.func_180495_p(p_180655_3_.func_177977_b()))) {
+-         if (this.func_196446_i(p_180655_2_.func_180495_p(p_180655_3_.func_177976_e()))) {
++      if (p_180655_2_.func_180495_p(p_180655_3_.func_177977_b()).func_193401_d(p_180655_2_, p_180655_3_.func_177977_b(), EnumFacing.UP) != BlockFaceShape.SOLID && !this.canCatchFire(p_180655_2_, p_180655_3_.func_177977_b(), EnumFacing.UP)) {
++         if (this.canCatchFire(p_180655_2_, p_180655_3_.func_177976_e(), EnumFacing.EAST)) {
+             for(int j = 0; j < 2; ++j) {
+                double d3 = (double)p_180655_3_.func_177958_n() + p_180655_4_.nextDouble() * (double)0.1F;
+                double d8 = (double)p_180655_3_.func_177956_o() + p_180655_4_.nextDouble();
+@@ -262,7 +266,7 @@
+             }
+          }
+ 
+-         if (this.func_196446_i(p_180655_2_.func_180495_p(p_180655_3_.func_177974_f()))) {
++         if (this.canCatchFire(p_180655_2_, p_180655_3_.func_177974_f(), EnumFacing.WEST)) {
+             for(int k = 0; k < 2; ++k) {
+                double d4 = (double)(p_180655_3_.func_177958_n() + 1) - p_180655_4_.nextDouble() * (double)0.1F;
+                double d9 = (double)p_180655_3_.func_177956_o() + p_180655_4_.nextDouble();
+@@ -271,7 +275,7 @@
+             }
+          }
+ 
+-         if (this.func_196446_i(p_180655_2_.func_180495_p(p_180655_3_.func_177978_c()))) {
++         if (this.canCatchFire(p_180655_2_, p_180655_3_.func_177978_c(), EnumFacing.SOUTH)) {
+             for(int l = 0; l < 2; ++l) {
+                double d5 = (double)p_180655_3_.func_177958_n() + p_180655_4_.nextDouble();
+                double d10 = (double)p_180655_3_.func_177956_o() + p_180655_4_.nextDouble();
+@@ -280,7 +284,7 @@
+             }
+          }
+ 
+-         if (this.func_196446_i(p_180655_2_.func_180495_p(p_180655_3_.func_177968_d()))) {
++         if (this.canCatchFire(p_180655_2_, p_180655_3_.func_177968_d(), EnumFacing.NORTH)) {
+             for(int i1 = 0; i1 < 2; ++i1) {
+                double d6 = (double)p_180655_3_.func_177958_n() + p_180655_4_.nextDouble();
+                double d11 = (double)p_180655_3_.func_177956_o() + p_180655_4_.nextDouble();
+@@ -289,7 +293,7 @@
+             }
+          }
+ 
+-         if (this.func_196446_i(p_180655_2_.func_180495_p(p_180655_3_.func_177984_a()))) {
++         if (this.canCatchFire(p_180655_2_, p_180655_3_.func_177984_a(), EnumFacing.DOWN)) {
+             for(int j1 = 0; j1 < 2; ++j1) {
+                double d7 = (double)p_180655_3_.func_177958_n() + p_180655_4_.nextDouble();
+                double d12 = (double)(p_180655_3_.func_177956_o() + 1) - p_180655_4_.nextDouble() * (double)0.1F;
+@@ -321,10 +325,23 @@
+    }
+ 
+    public void func_180686_a(Block p_180686_1_, int p_180686_2_, int p_180686_3_) {
++      if (p_180686_1_ == Blocks.field_150350_a) throw new IllegalArgumentException("Tried to set air on fire... This is bad.");
+       this.field_149849_a.put(p_180686_1_, p_180686_2_);
+       this.field_149848_b.put(p_180686_1_, p_180686_3_);
+    }
+ 
++   /**
++    * Side sensitive version that calls the block function.
++    *
++    * @param world The current world
++    * @param pos Block position
++    * @param face The side the fire is coming from
++    * @return True if the face can catch fire.
++    */
++   public boolean canCatchFire(IBlockReader world, BlockPos pos, EnumFacing face) {
++      return world.func_180495_p(pos).isFlammable(world, pos, face);
++   }
 +
-         if (p_176536_4_.nextInt(p_176536_3_) < i)
-         {
-             IBlockState iblockstate = p_176536_1_.func_180495_p(p_176536_2_);
-@@ -292,7 +304,7 @@
-     {
-         for (EnumFacing enumfacing : EnumFacing.values())
-         {
--            if (this.func_176535_e(p_176533_1_, p_176533_2_.func_177972_a(enumfacing)))
-+            if (this.canCatchFire(p_176533_1_, p_176533_2_.func_177972_a(enumfacing), enumfacing.func_176734_d()))
-             {
-                 return true;
-             }
-@@ -313,7 +325,7 @@
- 
-             for (EnumFacing enumfacing : EnumFacing.values())
-             {
--                i = Math.max(this.func_176534_d(p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(enumfacing)).func_177230_c()), i);
-+                i = Math.max(p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(enumfacing)).func_177230_c().getFireSpreadSpeed(p_176538_1_, p_176538_2_.func_177972_a(enumfacing), enumfacing.func_176734_d()), i);
-             }
- 
-             return i;
-@@ -325,9 +337,10 @@
-         return false;
-     }
- 
-+    @Deprecated // Use canCatchFire with face sensitive version below
-     public boolean func_176535_e(IBlockAccess p_176535_1_, BlockPos p_176535_2_)
-     {
--        return this.func_176534_d(p_176535_1_.func_180495_p(p_176535_2_).func_177230_c()) > 0;
-+        return canCatchFire(p_176535_1_, p_176535_2_, EnumFacing.UP);
-     }
- 
-     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-@@ -366,9 +379,9 @@
-             p_180655_2_.func_184134_a((double)((float)p_180655_3_.func_177958_n() + 0.5F), (double)((float)p_180655_3_.func_177956_o() + 0.5F), (double)((float)p_180655_3_.func_177952_p() + 0.5F), SoundEvents.field_187643_bs, SoundCategory.BLOCKS, 1.0F + p_180655_4_.nextFloat(), p_180655_4_.nextFloat() * 0.7F + 0.3F, false);
-         }
- 
--        if (!p_180655_2_.func_180495_p(p_180655_3_.func_177977_b()).func_185896_q() && !Blocks.field_150480_ab.func_176535_e(p_180655_2_, p_180655_3_.func_177977_b()))
-+        if (!p_180655_2_.func_180495_p(p_180655_3_.func_177977_b()).isSideSolid(p_180655_2_, p_180655_3_.func_177977_b(), EnumFacing.UP) && !Blocks.field_150480_ab.canCatchFire(p_180655_2_, p_180655_3_.func_177977_b(), EnumFacing.UP))
-         {
--            if (Blocks.field_150480_ab.func_176535_e(p_180655_2_, p_180655_3_.func_177976_e()))
-+            if (Blocks.field_150480_ab.canCatchFire(p_180655_2_, p_180655_3_.func_177976_e(), EnumFacing.EAST))
-             {
-                 for (int j = 0; j < 2; ++j)
-                 {
-@@ -379,7 +392,7 @@
-                 }
-             }
- 
--            if (Blocks.field_150480_ab.func_176535_e(p_180655_2_, p_180655_3_.func_177974_f()))
-+            if (Blocks.field_150480_ab.canCatchFire(p_180655_2_, p_180655_3_.func_177974_f(), EnumFacing.WEST))
-             {
-                 for (int k = 0; k < 2; ++k)
-                 {
-@@ -390,7 +403,7 @@
-                 }
-             }
- 
--            if (Blocks.field_150480_ab.func_176535_e(p_180655_2_, p_180655_3_.func_177978_c()))
-+            if (Blocks.field_150480_ab.canCatchFire(p_180655_2_, p_180655_3_.func_177978_c(), EnumFacing.SOUTH))
-             {
-                 for (int l = 0; l < 2; ++l)
-                 {
-@@ -401,7 +414,7 @@
-                 }
-             }
- 
--            if (Blocks.field_150480_ab.func_176535_e(p_180655_2_, p_180655_3_.func_177968_d()))
-+            if (Blocks.field_150480_ab.canCatchFire(p_180655_2_, p_180655_3_.func_177968_d(), EnumFacing.NORTH))
-             {
-                 for (int i1 = 0; i1 < 2; ++i1)
-                 {
-@@ -412,7 +425,7 @@
-                 }
-             }
- 
--            if (Blocks.field_150480_ab.func_176535_e(p_180655_2_, p_180655_3_.func_177984_a()))
-+            if (Blocks.field_150480_ab.canCatchFire(p_180655_2_, p_180655_3_.func_177984_a(), EnumFacing.DOWN))
-             {
-                 for (int j1 = 0; j1 < 2; ++j1)
-                 {
-@@ -460,4 +473,19 @@
-     {
-         return new BlockStateContainer(this, new IProperty[] {field_176543_a, field_176545_N, field_176546_O, field_176541_P, field_176539_Q, field_176542_R});
-     }
-+
-+    /*================================= Forge Start ======================================*/
-+    /**
-+     * Side sensitive version that calls the block function.
-+     *
-+     * @param world The current world
-+     * @param pos Block position
-+     * @param face The side the fire is coming from
-+     * @return True if the face can catch fire.
-+     */
-+    public boolean canCatchFire(IBlockAccess world, BlockPos pos, EnumFacing face)
-+    {
-+        return world.func_180495_p(pos).func_177230_c().isFlammable(world, pos, face);
-+    }
-+    /*================================= Forge Start ======================================*/
- }
+    public static void func_149843_e() {
+       BlockFire blockfire = (BlockFire)Blocks.field_150480_ab;
+       blockfire.func_180686_a(Blocks.field_196662_n, 5, 20);

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

@@ -1,48 +1,11 @@
---- ../src-base/minecraft/net/minecraft/block/BlockFlowerPot.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockFlowerPot.java
-@@ -165,13 +165,6 @@
+--- a/net/minecraft/block/BlockFlowerPot.java
++++ b/net/minecraft/block/BlockFlowerPot.java
+@@ -22,7 +22,7 @@
+ import net.minecraft.world.World;
  
-     public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
-     {
--        TileEntityFlowerPot tileentityflowerpot = this.func_176442_d(p_180663_1_, p_180663_2_);
--
--        if (tileentityflowerpot != null && tileentityflowerpot.func_145965_a() != null)
--        {
--            func_180635_a(p_180663_1_, p_180663_2_, new ItemStack(tileentityflowerpot.func_145965_a(), 1, tileentityflowerpot.func_145966_b()));
--        }
--
-         super.func_180663_b(p_180663_1_, p_180663_2_, p_180663_3_);
-     }
+ public class BlockFlowerPot extends Block {
+-   private static final Map<Block, Block> field_196451_b = Maps.newHashMap();
++   private static final Map<Block, Block> field_196451_b = Maps.newHashMap();  //TODO: Delegates
+    protected static final VoxelShape field_196450_a = Block.func_208617_a(5.0D, 0.0D, 5.0D, 11.0D, 6.0D, 11.0D);
+    private final Block field_196452_c;
  
-@@ -392,6 +385,31 @@
-         return BlockRenderLayer.CUTOUT;
-     }
- 
-+
-+    /*============================FORGE START=====================================*/
-+    @Override
-+    public java.util.List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
-+    {
-+        java.util.List<ItemStack> ret = super.getDrops(world, pos, state, fortune);
-+        TileEntityFlowerPot te = world.func_175625_s(pos) instanceof TileEntityFlowerPot ? (TileEntityFlowerPot)world.func_175625_s(pos) : null;
-+        if (te != null && te.func_145965_a() != null)
-+            ret.add(new ItemStack(te.func_145965_a(), 1, te.func_145966_b()));
-+        return ret;
-+    }
-+    @Override
-+    public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest)
-+    {
-+        if (willHarvest) return true; //If it will harvest, delay deletion of the block until after getDrops
-+        return super.removedByPlayer(state, world, pos, player, willHarvest);
-+    }
-+    @Override
-+    public void func_180657_a(World world, EntityPlayer player, BlockPos pos, IBlockState state, @Nullable TileEntity te, ItemStack tool)
-+    {
-+        super.func_180657_a(world, player, pos, state, te, tool);
-+        world.func_175698_g(pos);
-+    }
-+    /*===========================FORGE END==========================================*/
-+
-     public static enum EnumFlowerType implements IStringSerializable
-     {
-         EMPTY("empty"),

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

@@ -1,41 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockGrass.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockGrass.java
-@@ -38,7 +38,7 @@
-     {
-         if (!p_180650_1_.field_72995_K)
-         {
--            if (p_180650_1_.func_175671_l(p_180650_2_.func_177984_a()) < 4 && p_180650_1_.func_180495_p(p_180650_2_.func_177984_a()).func_185891_c() > 2)
-+            if (p_180650_1_.func_175671_l(p_180650_2_.func_177984_a()) < 4 && p_180650_1_.func_180495_p(p_180650_2_.func_177984_a()).getLightOpacity(p_180650_1_, p_180650_2_.func_177984_a()) > 2)
-             {
-                 p_180650_1_.func_175656_a(p_180650_2_, Blocks.field_150346_d.func_176223_P());
-             }
-@@ -58,7 +58,7 @@
-                         IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos.func_177984_a());
-                         IBlockState iblockstate1 = p_180650_1_.func_180495_p(blockpos);
- 
--                        if (iblockstate1.func_177230_c() == Blocks.field_150346_d && iblockstate1.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos.func_177984_a()) >= 4 && iblockstate.func_185891_c() <= 2)
-+                        if (iblockstate1.func_177230_c() == Blocks.field_150346_d && iblockstate1.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos.func_177984_a()) >= 4 && iblockstate.getLightOpacity(p_180650_1_, p_180650_2_.func_177984_a()) <= 2)
-                         {
-                             p_180650_1_.func_175656_a(blockpos, Blocks.field_150349_c.func_176223_P());
-                         }
-@@ -96,18 +96,11 @@
-             {
-                 if (j >= i / 16)
-                 {
--                    if (p_176474_1_.func_180495_p(blockpos1).func_177230_c().field_149764_J == Material.field_151579_a)
-+                    if (p_176474_1_.func_175623_d(blockpos1))
-                     {
-                         if (p_176474_2_.nextInt(8) == 0)
-                         {
--                            BlockFlower.EnumFlowerType blockflower$enumflowertype = p_176474_1_.func_180494_b(blockpos1).func_180623_a(p_176474_2_, blockpos1);
--                            BlockFlower blockflower = blockflower$enumflowertype.func_176964_a().func_180346_a();
--                            IBlockState iblockstate = blockflower.func_176223_P().func_177226_a(blockflower.func_176494_l(), blockflower$enumflowertype);
--
--                            if (blockflower.func_180671_f(p_176474_1_, blockpos1, iblockstate))
--                            {
--                                p_176474_1_.func_180501_a(blockpos1, iblockstate, 3);
--                            }
-+                            p_176474_1_.func_180494_b(blockpos1).plantFlower(p_176474_1_, p_176474_2_, blockpos1);
-                         }
-                         else
-                         {

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

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

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

@@ -1,29 +1,25 @@
---- ../src-base/minecraft/net/minecraft/block/BlockIce.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockIce.java
-@@ -41,9 +41,14 @@
-         p_180657_2_.func_71029_a(StatList.func_188055_a(this));
-         p_180657_2_.func_71020_j(0.005F);
+--- a/net/minecraft/block/BlockIce.java
++++ b/net/minecraft/block/BlockIce.java
+@@ -34,8 +34,10 @@
+    public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, ItemStack p_180657_6_) {
+       p_180657_2_.func_71029_a(StatList.field_188065_ae.func_199076_b(this));
+       p_180657_2_.func_71020_j(0.005F);
+-      if (this.func_149700_E() && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0) {
+-         func_180635_a(p_180657_1_, p_180657_3_, this.func_180643_i(p_180657_4_));
++      if (this.canSilkHarvest(p_180657_4_, p_180657_1_, p_180657_3_, p_180657_2_) && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0) {
++         net.minecraft.util.NonNullList<ItemStack> items = net.minecraft.util.NonNullList.func_193580_a(ItemStack.field_190927_a, func_180643_i(p_180657_4_));
++         net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, p_180657_1_, p_180657_3_, p_180657_4_, 0, 1.0f, true, p_180657_2_);
++         items.stream().filter(e -> !e.func_190926_b()).forEach(e -> func_180635_a(p_180657_1_, p_180657_3_, e));
+       } else {
+          if (p_180657_1_.field_73011_w.func_177500_n()) {
+             p_180657_1_.func_175698_g(p_180657_3_);
+@@ -43,7 +45,9 @@
+          }
  
--        if (this.func_149700_E() && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0)
-+        if (this.canSilkHarvest(p_180657_1_, p_180657_3_, p_180657_4_, p_180657_2_) && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0)
-         {
--            func_180635_a(p_180657_1_, p_180657_3_, this.func_180643_i(p_180657_4_));
-+            java.util.List<ItemStack> items = new java.util.ArrayList<ItemStack>();
-+            items.add(this.func_180643_i(p_180657_4_));
-+
-+            net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, p_180657_1_, p_180657_3_, p_180657_4_, 0, 1.0f, true, p_180657_2_);
-+            for (ItemStack is : items)
-+                func_180635_a(p_180657_1_, p_180657_3_, is);
-         }
-         else
-         {
-@@ -54,7 +59,9 @@
-             }
- 
-             int i = EnchantmentHelper.func_77506_a(Enchantments.field_185308_t, p_180657_6_);
-+            harvesters.set(p_180657_2_);
-             this.func_176226_b(p_180657_1_, p_180657_3_, p_180657_4_, i);
-+            harvesters.set(null);
-             Material material = p_180657_1_.func_180495_p(p_180657_3_.func_177977_b()).func_185904_a();
- 
-             if (material.func_76230_c() || material.func_76224_d())
+          int i = EnchantmentHelper.func_77506_a(Enchantments.field_185308_t, p_180657_6_);
++         harvesters.set(p_180657_2_);
+          p_180657_4_.func_196949_c(p_180657_1_, p_180657_3_, i);
++         harvesters.set(null);
+          Material material = p_180657_1_.func_180495_p(p_180657_3_.func_177977_b()).func_185904_a();
+          if (material.func_76230_c() || material.func_76224_d()) {
+             p_180657_1_.func_175656_a(p_180657_3_, Blocks.field_150355_j.func_176223_P());

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

@@ -1,30 +1,12 @@
---- ../src-base/minecraft/net/minecraft/block/BlockLadder.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockLadder.java
-@@ -61,7 +61,10 @@
- 
-     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-     {
--        return p_176196_1_.func_180495_p(p_176196_2_.func_177976_e()).func_185915_l() ? true : (p_176196_1_.func_180495_p(p_176196_2_.func_177974_f()).func_185915_l() ? true : (p_176196_1_.func_180495_p(p_176196_2_.func_177978_c()).func_185915_l() ? true : p_176196_1_.func_180495_p(p_176196_2_.func_177968_d()).func_185915_l()));
-+        return p_176196_1_.func_180495_p(p_176196_2_.func_177976_e()).isSideSolid(p_176196_1_, p_176196_2_.func_177976_e(), EnumFacing.EAST) ||
-+               p_176196_1_.func_180495_p(p_176196_2_.func_177974_f()).isSideSolid(p_176196_1_, p_176196_2_.func_177974_f(), EnumFacing.WEST) ||
-+               p_176196_1_.func_180495_p(p_176196_2_.func_177978_c()).isSideSolid(p_176196_1_, p_176196_2_.func_177978_c(), EnumFacing.SOUTH) ||
-+               p_176196_1_.func_180495_p(p_176196_2_.func_177968_d()).isSideSolid(p_176196_1_, p_176196_2_.func_177968_d(), EnumFacing.NORTH);
-     }
- 
-     public IBlockState func_180642_a(World p_180642_1_, BlockPos p_180642_2_, EnumFacing p_180642_3_, float p_180642_4_, float p_180642_5_, float p_180642_6_, int p_180642_7_, EntityLivingBase p_180642_8_)
-@@ -99,7 +102,7 @@
- 
-     protected boolean func_176381_b(World p_176381_1_, BlockPos p_176381_2_, EnumFacing p_176381_3_)
-     {
--        return p_176381_1_.func_180495_p(p_176381_2_.func_177972_a(p_176381_3_.func_176734_d())).func_185915_l();
-+        return p_176381_1_.func_180495_p(p_176381_2_.func_177972_a(p_176381_3_.func_176734_d())).isSideSolid(p_176381_1_, p_176381_2_.func_177972_a(p_176381_3_.func_176734_d()), p_176381_3_);
-     }
- 
-     public IBlockState func_176203_a(int p_176203_1_)
-@@ -139,4 +142,6 @@
-     {
-         return new BlockStateContainer(this, new IProperty[] {field_176382_a});
-     }
+--- a/net/minecraft/block/BlockLadder.java
++++ b/net/minecraft/block/BlockLadder.java
+@@ -151,4 +151,9 @@
+          return false;
+       }
+    }
 +
-+    @Override public boolean isLadder(IBlockState state, IBlockAccess world, BlockPos pos, EntityLivingBase entity) { return true; }
++   @Override
++   public boolean isLadder(IBlockState state, net.minecraft.world.IWorldReader world, BlockPos pos, net.minecraft.entity.EntityLivingBase entity) {
++      return true;
++   }
  }

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

@@ -1,131 +1,83 @@
---- ../src-base/minecraft/net/minecraft/block/BlockLeaves.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockLeaves.java
-@@ -17,7 +17,7 @@
- import net.minecraftforge.fml.relauncher.Side;
- import net.minecraftforge.fml.relauncher.SideOnly;
+--- a/net/minecraft/block/BlockLeaves.java
++++ b/net/minecraft/block/BlockLeaves.java
+@@ -26,7 +26,7 @@
+ import net.minecraftforge.api.distmarker.Dist;
+ import net.minecraftforge.api.distmarker.OnlyIn;
  
--public abstract class BlockLeaves extends Block
-+public abstract class BlockLeaves extends Block implements net.minecraftforge.common.IShearable
- {
-     public static final PropertyBool field_176237_a = PropertyBool.func_177716_a("decayable");
-     public static final PropertyBool field_176236_b = PropertyBool.func_177716_a("check_decay");
-@@ -53,9 +53,9 @@
-                         BlockPos blockpos = p_180663_2_.func_177982_a(j1, k1, l1);
-                         IBlockState iblockstate = p_180663_1_.func_180495_p(blockpos);
+-public class BlockLeaves extends Block {
++public class BlockLeaves extends Block implements net.minecraftforge.common.IShearable {
+    public static final IntegerProperty field_208494_a = BlockStateProperties.field_208514_aa;
+    public static final BooleanProperty field_208495_b = BlockStateProperties.field_208515_s;
+    protected static boolean field_196478_c;
+@@ -122,28 +122,37 @@
+    }
  
--                        if (iblockstate.func_185904_a() == Material.field_151584_j && !((Boolean)iblockstate.func_177229_b(field_176236_b)).booleanValue())
-+                        if (iblockstate.func_177230_c().isLeaves(iblockstate, p_180663_1_, blockpos))
-                         {
--                            p_180663_1_.func_180501_a(blockpos, iblockstate.func_177226_a(field_176236_b, Boolean.valueOf(true)), 4);
-+                            iblockstate.func_177230_c().beginLeavesDecay(iblockstate, p_180663_1_, blockpos);
-                         }
-                     }
-                 }
-@@ -96,9 +96,9 @@
-                                 IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos$mutableblockpos.func_181079_c(k + i2, l + j2, i1 + k2));
-                                 Block block = iblockstate.func_177230_c();
- 
--                                if (block != Blocks.field_150364_r && block != Blocks.field_150363_s)
-+                                if (!block.canSustainLeaves(iblockstate, p_180650_1_, blockpos$mutableblockpos.func_181079_c(k + i2, l + j2, i1 + k2)))
-                                 {
--                                    if (iblockstate.func_185904_a() == Material.field_151584_j)
-+                                    if (block.isLeaves(iblockstate, p_180650_1_, blockpos$mutableblockpos.func_181079_c(k + i2, l + j2, i1 + k2)))
-                                     {
-                                         this.field_150128_a[(i2 + 16) * 1024 + (j2 + 16) * 32 + k2 + 16] = -2;
-                                     }
-@@ -205,40 +205,7 @@
- 
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
-     {
--        if (!p_180653_1_.field_72995_K)
--        {
--            int i = this.func_176232_d(p_180653_3_);
--
--            if (p_180653_5_ > 0)
--            {
--                i -= 2 << p_180653_5_;
--
--                if (i < 10)
--                {
--                    i = 10;
--                }
--            }
--
--            if (p_180653_1_.field_73012_v.nextInt(i) == 0)
--            {
--                Item item = this.func_180660_a(p_180653_3_, p_180653_1_.field_73012_v, p_180653_5_);
--                func_180635_a(p_180653_1_, p_180653_2_, new ItemStack(item, 1, this.func_180651_a(p_180653_3_)));
--            }
--
--            i = 200;
--
--            if (p_180653_5_ > 0)
--            {
--                i -= 10 << p_180653_5_;
--
--                if (i < 40)
--                {
--                    i = 40;
--                }
--            }
--
--            this.func_176234_a(p_180653_1_, p_180653_2_, p_180653_3_, i);
--        }
-+        super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
-     }
- 
-     protected void func_176234_a(World p_176234_1_, BlockPos p_176234_2_, IBlockState p_176234_3_, int p_176234_4_)
-@@ -274,6 +241,53 @@
- 
-     public abstract BlockPlanks.EnumType func_176233_b(int p_176233_1_);
- 
-+    @Override public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos){ return true; }
-+    @Override public boolean isLeaves(IBlockState state, IBlockAccess world, BlockPos pos){ return true; }
+    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
+-      if (!p_196255_2_.field_72995_K) {
+-         int i = this.func_196472_i(p_196255_1_);
+-         if (p_196255_5_ > 0) {
+-            i -= 2 << p_196255_5_;
++       super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
++   }
 +
-+    @Override
-+    public void beginLeavesDecay(IBlockState state, World world, BlockPos pos)
-+    {
-+        if (!(Boolean)state.func_177229_b(field_176236_b))
-+        {
-+            world.func_180501_a(pos, state.func_177226_a(field_176236_b, true), 4);
-+        }
-+    }
-+
-+    @Override
-+    public java.util.List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
-+    {
-+        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
-+        Random rand = world instanceof World ? ((World)world).field_73012_v : new Random();
-+        int chance = this.func_176232_d(state);
-+
-+        if (fortune > 0)
-+        {
-+            chance -= 2 << fortune;
-+            if (chance < 10) chance = 10;
-+        }
-+
-+        if (rand.nextInt(chance) == 0)
-+        {
-+            ItemStack drop = new ItemStack(func_180660_a(state, rand, fortune), 1, func_180651_a(state));
++   @Override
++   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World worldIn, BlockPos pos, int fortune) {
++      {
++         int i = this.func_196472_i(state);
++         if (fortune > 0) {
++            i -= 2 << fortune;
+             if (i < 10) {
+                i = 10;
+             }
+          }
+ 
+-         if (p_196255_2_.field_73012_v.nextInt(i) == 0) {
+-            func_180635_a(p_196255_2_, p_196255_3_, new ItemStack(this.func_199769_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_5_)));
++         if (worldIn.field_73012_v.nextInt(i) == 0) {
++            ItemStack drop = new ItemStack(this.func_199769_a(state, worldIn, pos, fortune));
 +            if (!drop.func_190926_b())
-+                ret.add(drop);
-+        }
++                drops.add(drop);
+          }
+ 
+          i = 200;
+-         if (p_196255_5_ > 0) {
+-            i -= 10 << p_196255_5_;
++         if (fortune > 0) {
++            i -= 10 << fortune;
+             if (i < 40) {
+                i = 40;
+             }
+          }
+ 
+-         this.func_196474_a(p_196255_2_, p_196255_3_, p_196255_1_, i);
++         captureDrops(true);
++         this.func_196474_a(worldIn, pos, state, i);
++         drops.addAll(captureDrops(false));
+       }
+ 
+    }
+@@ -173,13 +182,7 @@
+    }
+ 
+    public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, ItemStack p_180657_6_) {
+-      if (!p_180657_1_.field_72995_K && p_180657_6_.func_77973_b() == Items.field_151097_aZ) {
+-         p_180657_2_.func_71029_a(StatList.field_188065_ae.func_199076_b(this));
+-         p_180657_2_.func_71020_j(0.005F);
+-         func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(this));
+-      } else {
+          super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
+-      }
+    }
+ 
+    protected void func_206840_a(StateContainer.Builder<Block, IBlockState> p_206840_1_) {
+@@ -189,4 +192,10 @@
+    public IBlockState func_196258_a(BlockItemUseContext p_196258_1_) {
+       return func_208493_b(this.func_176223_P().func_206870_a(field_208495_b, Boolean.valueOf(true)), p_196258_1_.func_195991_k(), p_196258_1_.func_195995_a());
+    }
 +
-+        chance = 200;
-+        if (fortune > 0)
-+        {
-+            chance -= 10 << fortune;
-+            if (chance < 40) chance = 40;
-+        }
-+
-+        this.captureDrops(true);
-+        if (world instanceof World)
-+            this.func_176234_a((World)world, pos, state, chance); // Dammet mojang
-+        ret.addAll(this.captureDrops(false));
-+        return ret;
-+    }
-+
-+
-     @SideOnly(Side.CLIENT)
-     public boolean func_176225_a(IBlockState p_176225_1_, IBlockAccess p_176225_2_, BlockPos p_176225_3_, EnumFacing p_176225_4_)
-     {
++   @Override
++   public java.util.List<ItemStack> onSheared(@javax.annotation.Nonnull ItemStack item, net.minecraft.world.IWorld world, BlockPos pos, int fortune) {
++      world.func_180501_a(pos, Blocks.field_150350_a.func_176223_P(), 11);
++      return java.util.Arrays.asList(new ItemStack(this));
++   }
+ }

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

@@ -1,15 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockLever.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockLever.java
-@@ -296,6 +296,12 @@
-         return new BlockStateContainer(this, new IProperty[] {field_176360_a, field_176359_b});
-     }
- 
-+
-+    private boolean canAttach(World world, BlockPos pos, EnumFacing side)
-+    {
-+        return world.isSideSolid(pos, side);
-+    }
-+
-     public static enum EnumOrientation implements IStringSerializable
-     {
-         DOWN_X(0, "down_x", EnumFacing.DOWN),

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

@@ -1,19 +1,27 @@
---- ../src-base/minecraft/net/minecraft/block/BlockMobSpawner.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockMobSpawner.java
-@@ -40,10 +40,14 @@
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
-     {
-         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
--        int i = 15 + p_180653_1_.field_73012_v.nextInt(15) + p_180653_1_.field_73012_v.nextInt(15);
--        this.func_180637_b(p_180653_1_, p_180653_2_, i);
-     }
+--- a/net/minecraft/block/BlockMobSpawner.java
++++ b/net/minecraft/block/BlockMobSpawner.java
+@@ -13,6 +13,8 @@
+ import net.minecraft.world.World;
  
-+    @Override
-+    public int getExpDrop(IBlockState state, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
-+    {
-+        return 15 + RANDOM.nextInt(15) + RANDOM.nextInt(15);
-+    }
+ public class BlockMobSpawner extends BlockContainer {
++   private static final java.util.Random RAND = new java.util.Random();
 +
-     public boolean func_149662_c(IBlockState p_149662_1_)
-     {
-         return false;
+    protected BlockMobSpawner(Block.Properties p_i48364_1_) {
+       super(p_i48364_1_);
+    }
+@@ -27,10 +29,13 @@
+ 
+    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
+       super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
+-      int i = 15 + p_196255_2_.field_73012_v.nextInt(15) + p_196255_2_.field_73012_v.nextInt(15);
+-      this.func_180637_b(p_196255_2_, p_196255_3_, i);
+    }
+ 
++   @Override
++   public int getExpDrop(IBlockState state, net.minecraft.world.IWorldReader world, BlockPos pos, int fortune) {
++      return 15 + RAND.nextInt(15) + RAND.nextInt(15);
++   }
++
+    public EnumBlockRenderType func_149645_b(IBlockState p_149645_1_) {
+       return EnumBlockRenderType.MODEL;
+    }

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

@@ -1,11 +1,11 @@
---- ../src-base/minecraft/net/minecraft/block/BlockMushroom.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockMushroom.java
-@@ -78,7 +78,7 @@
-         if (p_180671_2_.func_177956_o() >= 0 && p_180671_2_.func_177956_o() < 256)
-         {
-             IBlockState iblockstate = p_180671_1_.func_180495_p(p_180671_2_.func_177977_b());
--            return iblockstate.func_177230_c() == Blocks.field_150391_bh ? true : (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.PODZOL ? true : p_180671_1_.func_175699_k(p_180671_2_) < 13 && this.func_185514_i(iblockstate));
-+            return iblockstate.func_177230_c() == Blocks.field_150391_bh ? true : (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.PODZOL ? true : p_180671_1_.func_175699_k(p_180671_2_) < 13 && iblockstate.func_177230_c().canSustainPlant(iblockstate, p_180671_1_, p_180671_2_.func_177977_b(), net.minecraft.util.EnumFacing.UP, this));
-         }
-         else
-         {
+--- a/net/minecraft/block/BlockMushroom.java
++++ b/net/minecraft/block/BlockMushroom.java
+@@ -64,7 +64,7 @@
+       IBlockState iblockstate = p_196260_2_.func_180495_p(blockpos);
+       Block block = iblockstate.func_177230_c();
+       if (block != Blocks.field_150391_bh && block != Blocks.field_196661_l) {
+-         return p_196260_2_.func_201669_a(p_196260_3_, 0) < 13 && this.func_200014_a_(iblockstate, p_196260_2_, blockpos);
++         return p_196260_2_.func_201669_a(p_196260_3_, 0) < 13 && iblockstate.canSustainPlant(p_196260_2_, blockpos, net.minecraft.util.EnumFacing.UP, this);
+       } else {
+          return true;
+       }

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

@@ -1,20 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockMycelium.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockMycelium.java
-@@ -39,7 +39,7 @@
-     {
-         if (!p_180650_1_.field_72995_K)
-         {
--            if (p_180650_1_.func_175671_l(p_180650_2_.func_177984_a()) < 4 && p_180650_1_.func_180495_p(p_180650_2_.func_177984_a()).func_185891_c() > 2)
-+            if (p_180650_1_.func_175671_l(p_180650_2_.func_177984_a()) < 4 && p_180650_1_.func_180495_p(p_180650_2_.func_177984_a()).getLightOpacity(p_180650_1_, p_180650_2_.func_177984_a()) > 2)
-             {
-                 p_180650_1_.func_175656_a(p_180650_2_, Blocks.field_150346_d.func_176223_P().func_177226_a(BlockDirt.field_176386_a, BlockDirt.DirtType.DIRT));
-             }
-@@ -53,7 +53,7 @@
-                         IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos);
-                         IBlockState iblockstate1 = p_180650_1_.func_180495_p(blockpos.func_177984_a());
- 
--                        if (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos.func_177984_a()) >= 4 && iblockstate1.func_185891_c() <= 2)
-+                        if (iblockstate.func_177230_c() == Blocks.field_150346_d && iblockstate.func_177229_b(BlockDirt.field_176386_a) == BlockDirt.DirtType.DIRT && p_180650_1_.func_175671_l(blockpos.func_177984_a()) >= 4 && iblockstate1.getLightOpacity(p_180650_1_, blockpos.func_177984_a()) <= 2)
-                         {
-                             p_180650_1_.func_175656_a(blockpos, this.func_176223_P());
-                         }

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

@@ -1,61 +1,36 @@
---- ../src-base/minecraft/net/minecraft/block/BlockNetherWart.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockNetherWart.java
-@@ -42,25 +42,28 @@
+--- a/net/minecraft/block/BlockNetherWart.java
++++ b/net/minecraft/block/BlockNetherWart.java
+@@ -33,16 +33,22 @@
  
-     public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
-     {
--        return this.func_185514_i(p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()));
-+        return super.func_180671_f(p_180671_1_, p_180671_2_, p_180671_3_);
-     }
+    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
+       int i = p_196267_1_.func_177229_b(field_176486_a);
+-      if (i < 3 && p_196267_4_.nextInt(10) == 0) {
++      if (i < 3 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_196267_2_, p_196267_3_, p_196267_1_, p_196267_4_.nextInt(10) == 0)) {
+          p_196267_1_ = p_196267_1_.func_206870_a(field_176486_a, Integer.valueOf(i + 1));
+          p_196267_2_.func_180501_a(p_196267_3_, p_196267_1_, 2);
++         net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_196267_2_, p_196267_3_, p_196267_1_);
+       }
  
-     public void func_180650_b(World p_180650_1_, BlockPos p_180650_2_, IBlockState p_180650_3_, Random p_180650_4_)
-     {
-         int i = ((Integer)p_180650_3_.func_177229_b(field_176486_a)).intValue();
+       super.func_196267_b(p_196267_1_, p_196267_2_, p_196267_3_, p_196267_4_);
+    }
  
--        if (i < 3 && p_180650_4_.nextInt(10) == 0)
-+        if (i < 3 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_.nextInt(10) == 0))
-         {
-             p_180650_3_ = p_180650_3_.func_177226_a(field_176486_a, Integer.valueOf(i + 1));
-             p_180650_1_.func_180501_a(p_180650_2_, p_180650_3_, 2);
-+            net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
-         }
- 
-         super.func_180650_b(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_);
-     }
- 
-+    @SuppressWarnings("unused")
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
-     {
--        if (!p_180653_1_.field_72995_K)
-+        super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
-+        if (false && !p_180653_1_.field_72995_K)
-         {
-             int i = 1;
- 
-@@ -106,6 +109,26 @@
-         return ((Integer)p_176201_1_.func_177229_b(field_176486_a)).intValue();
-     }
- 
-+    @Override
-+    public java.util.List<ItemStack> getDrops(net.minecraft.world.IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
-+    {
-+        java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
-+        Random rand = world instanceof World ? ((World)world).field_73012_v : new Random();
-+        int count = 1;
-+
-+        if (((Integer)state.func_177229_b(field_176486_a)) >= 3)
-+        {
-+            count = 2 + rand.nextInt(3) + (fortune > 0 ? rand.nextInt(fortune + 1) : 0);
-+        }
-+
-+        for (int i = 0; i < count; i++)
-+        {
-+            ret.add(new ItemStack(Items.field_151075_bm));
-+        }
-+
-+        return ret;
+    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
+-      if (!p_196255_2_.field_72995_K) {
++       super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
 +    }
 +
-     protected BlockStateContainer func_180661_e()
-     {
-         return new BlockStateContainer(this, new IProperty[] {field_176486_a});
++   @Override
++   public void getDrops(IBlockState p_196255_1_, net.minecraft.util.NonNullList<ItemStack> drops, World p_196255_2_, BlockPos p_196255_3_, int p_196255_5_) {
++      {
+          int i = 1;
+          if (p_196255_1_.func_177229_b(field_176486_a) >= 3) {
+             i = 2 + p_196255_2_.field_73012_v.nextInt(3);
+@@ -52,7 +58,7 @@
+          }
+ 
+          for(int j = 0; j < i; ++j) {
+-            func_180635_a(p_196255_2_, p_196255_3_, new ItemStack(Items.field_151075_bm));
++            drops.add(new ItemStack(Items.field_151075_bm));
+          }
+ 
+       }

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

@@ -1,13 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockNewLeaf.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockNewLeaf.java
-@@ -109,4 +109,10 @@
-             super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
-         }
-     }
-+
-+    @Override
-+    public NonNullList<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
-+    {
-+        return NonNullList.func_191197_a(1, new ItemStack(this, 1, world.func_180495_p(pos).func_177229_b(field_176240_P).func_176839_a() - 4));
-+    }
- }

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

@@ -1,23 +1,32 @@
---- ../src-base/minecraft/net/minecraft/block/BlockNote.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockNote.java
-@@ -63,7 +63,9 @@
-             if (tileentity instanceof TileEntityNote)
-             {
-                 TileEntityNote tileentitynote = (TileEntityNote)tileentity;
-+                int old = tileentitynote.field_145879_a;
-                 tileentitynote.func_145877_a();
-+                if (old == tileentitynote.field_145879_a) return false;
-                 tileentitynote.func_175108_a(p_180639_1_, p_180639_2_);
-                 p_180639_4_.func_71029_a(StatList.field_188087_U);
-             }
-@@ -103,6 +105,10 @@
+--- a/net/minecraft/block/BlockNote.java
++++ b/net/minecraft/block/BlockNote.java
+@@ -49,7 +49,7 @@
+    }
  
-     public boolean func_189539_a(IBlockState p_189539_1_, World p_189539_2_, BlockPos p_189539_3_, int p_189539_4_, int p_189539_5_)
-     {
-+        net.minecraftforge.event.world.NoteBlockEvent.Play e = new net.minecraftforge.event.world.NoteBlockEvent.Play(p_189539_2_, p_189539_3_, p_189539_1_, p_189539_5_, p_189539_4_);
-+        if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(e)) return false;
-+        p_189539_4_ = e.getInstrument().ordinal();
-+        p_189539_5_ = e.getVanillaNoteId();
-         float f = (float)Math.pow(2.0D, (double)(p_189539_5_ - 12) / 12.0D);
-         p_189539_2_.func_184133_a((EntityPlayer)null, p_189539_3_, this.func_185576_e(p_189539_4_), SoundCategory.RECORDS, 3.0F, f);
-         p_189539_2_.func_175688_a(EnumParticleTypes.NOTE, (double)p_189539_3_.func_177958_n() + 0.5D, (double)p_189539_3_.func_177956_o() + 1.2D, (double)p_189539_3_.func_177952_p() + 0.5D, (double)p_189539_5_ / 24.0D, 0.0D, 0.0D, new int[0]);
+    private void func_196482_a(World p_196482_1_, BlockPos p_196482_2_) {
+-      if (p_196482_1_.func_180495_p(p_196482_2_.func_177984_a()).func_196958_f()) {
++      if (p_196482_1_.func_175623_d(p_196482_2_.func_177984_a())) {
+          p_196482_1_.func_175641_c(p_196482_2_, this, 0, 0);
+       }
+ 
+@@ -59,7 +59,9 @@
+       if (p_196250_2_.field_72995_K) {
+          return true;
+       } else {
+-         p_196250_1_ = p_196250_1_.func_177231_a(field_196485_c);
++         int _new = net.minecraftforge.common.ForgeHooks.onNoteChange(p_196250_2_, p_196250_3_, p_196250_1_, p_196250_1_.func_177229_b(field_196485_c), p_196250_1_.func_177231_a(field_196485_c).func_177229_b(field_196485_c));
++         if (_new == -1) return false;
++         p_196250_1_ = (IBlockState)p_196250_1_.func_206870_a(field_196485_c, _new);
+          p_196250_2_.func_180501_a(p_196250_3_, p_196250_1_, 3);
+          this.func_196482_a(p_196250_2_, p_196250_3_);
+          p_196250_4_.func_195066_a(StatList.field_188087_U);
+@@ -75,6 +77,9 @@
+    }
+ 
+    public boolean func_189539_a(IBlockState p_189539_1_, World p_189539_2_, BlockPos p_189539_3_, int p_189539_4_, int p_189539_5_) {
++      net.minecraftforge.event.world.NoteBlockEvent.Play e = new net.minecraftforge.event.world.NoteBlockEvent.Play(p_189539_2_, p_189539_3_, p_189539_1_, p_189539_1_.func_177229_b(field_196485_c), p_189539_1_.func_177229_b(field_196483_a));
++      if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(e)) return false;
++      p_189539_1_ = p_189539_1_.func_206870_a(field_196485_c, e.getVanillaNoteId()).func_206870_a(field_196483_a, e.getInstrument());
+       int i = p_189539_1_.func_177229_b(field_196485_c);
+       float f = (float)Math.pow(2.0D, (double)(i - 12) / 12.0D);
+       p_189539_2_.func_184133_a((EntityPlayer)null, p_189539_3_, p_189539_1_.func_177229_b(field_196483_a).func_208088_a(), SoundCategory.RECORDS, 3.0F, f);

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

@@ -1,20 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockOldLeaf.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockOldLeaf.java
-@@ -104,11 +104,16 @@
-         if (!p_180657_1_.field_72995_K && p_180657_6_.func_77973_b() == Items.field_151097_aZ)
-         {
-             p_180657_2_.func_71029_a(StatList.func_188055_a(this));
--            func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Item.func_150898_a(this), 1, ((BlockPlanks.EnumType)p_180657_4_.func_177229_b(field_176239_P)).func_176839_a()));
-         }
-         else
-         {
-             super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
-         }
-     }
-+
-+    @Override
-+    public NonNullList<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
-+    {
-+        return NonNullList.func_191197_a(1, new ItemStack(this, 1, world.func_180495_p(pos).func_177229_b(field_176239_P).func_176839_a()));
-+    }
- }

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

@@ -1,50 +1,39 @@
---- ../src-base/minecraft/net/minecraft/block/BlockOre.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockOre.java
-@@ -59,34 +59,39 @@
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
-     {
-         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
+--- a/net/minecraft/block/BlockOre.java
++++ b/net/minecraft/block/BlockOre.java
+@@ -49,23 +49,27 @@
+ 
+    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
+       super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
+-      if (this.func_199769_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_5_) != this) {
++   }
++
++   @Override
++   public int getExpDrop(IBlockState state, net.minecraft.world.IWorldReader reader, BlockPos pos, int fortune) {
++      World world = reader instanceof World ? (World)reader : null;
++      if (world == null || this.func_199769_a(state, world, pos, fortune) != this) {
+          int i = 0;
+          if (this == Blocks.field_150365_q) {
+-            i = MathHelper.func_76136_a(p_196255_2_.field_73012_v, 0, 2);
++            i = MathHelper.func_76136_a(RANDOM, 0, 2);
+          } else if (this == Blocks.field_150482_ag) {
+-            i = MathHelper.func_76136_a(p_196255_2_.field_73012_v, 3, 7);
++            i = MathHelper.func_76136_a(RANDOM, 3, 7);
+          } else if (this == Blocks.field_150412_bA) {
+-            i = MathHelper.func_76136_a(p_196255_2_.field_73012_v, 3, 7);
++            i = MathHelper.func_76136_a(RANDOM, 3, 7);
+          } else if (this == Blocks.field_150369_x) {
+-            i = MathHelper.func_76136_a(p_196255_2_.field_73012_v, 2, 5);
++            i = MathHelper.func_76136_a(RANDOM, 2, 5);
+          } else if (this == Blocks.field_196766_fg) {
+-            i = MathHelper.func_76136_a(p_196255_2_.field_73012_v, 2, 5);
++            i = MathHelper.func_76136_a(RANDOM, 2, 5);
+          }
 -
--        if (this.func_180660_a(p_180653_3_, p_180653_1_.field_73012_v, p_180653_5_) != Item.func_150898_a(this))
-+    }
-+    @Override
-+    public int getExpDrop(IBlockState state, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
-+    {
-+        Random rand = world instanceof World ? ((World)world).field_73012_v : new Random();
-+        if (this.func_180660_a(state, rand, fortune) != Item.func_150898_a(this))
-         {
-             int i = 0;
+-         this.func_180637_b(p_196255_2_, p_196255_3_, i);
++         return i;
+       }
+-
++      return 0;
+    }
  
-             if (this == Blocks.field_150365_q)
-             {
--                i = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 0, 2);
-+                i = MathHelper.func_76136_a(rand, 0, 2);
-             }
-             else if (this == Blocks.field_150482_ag)
-             {
--                i = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 3, 7);
-+                i = MathHelper.func_76136_a(rand, 3, 7);
-             }
-             else if (this == Blocks.field_150412_bA)
-             {
--                i = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 3, 7);
-+                i = MathHelper.func_76136_a(rand, 3, 7);
-             }
-             else if (this == Blocks.field_150369_x)
-             {
--                i = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 2, 5);
-+                i = MathHelper.func_76136_a(rand, 2, 5);
-             }
-             else if (this == Blocks.field_150449_bY)
-             {
--                i = MathHelper.func_76136_a(p_180653_1_.field_73012_v, 2, 5);
-+                i = MathHelper.func_76136_a(rand, 2, 5);
-             }
- 
--            this.func_180637_b(p_180653_1_, p_180653_2_, i);
-+            return i;
-         }
-+        return 0;
-     }
- 
-     public ItemStack func_185473_a(World p_185473_1_, BlockPos p_185473_2_, IBlockState p_185473_3_)
+    public ItemStack func_185473_a(IBlockReader p_185473_1_, BlockPos p_185473_2_, IBlockState p_185473_3_) {

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

@@ -1,36 +1,50 @@
---- ../src-base/minecraft/net/minecraft/block/BlockPane.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockPane.java
-@@ -111,7 +111,10 @@
+--- a/net/minecraft/block/BlockPane.java
++++ b/net/minecraft/block/BlockPane.java
+@@ -25,15 +25,12 @@
+       IBlockReader iblockreader = p_196258_1_.func_195991_k();
+       BlockPos blockpos = p_196258_1_.func_195995_a();
+       IFluidState ifluidstate = p_196258_1_.func_195991_k().func_204610_c(p_196258_1_.func_195995_a());
+-      BlockPos blockpos1 = blockpos.func_177978_c();
+-      BlockPos blockpos2 = blockpos.func_177968_d();
+-      BlockPos blockpos3 = blockpos.func_177976_e();
+-      BlockPos blockpos4 = blockpos.func_177974_f();
+-      IBlockState iblockstate = iblockreader.func_180495_p(blockpos1);
+-      IBlockState iblockstate1 = iblockreader.func_180495_p(blockpos2);
+-      IBlockState iblockstate2 = iblockreader.func_180495_p(blockpos3);
+-      IBlockState iblockstate3 = iblockreader.func_180495_p(blockpos4);
+-      return this.func_176223_P().func_206870_a(field_196409_a, Boolean.valueOf(this.func_196417_a(iblockstate, iblockstate.func_193401_d(iblockreader, blockpos1, EnumFacing.SOUTH)))).func_206870_a(field_196413_c, Boolean.valueOf(this.func_196417_a(iblockstate1, iblockstate1.func_193401_d(iblockreader, blockpos2, EnumFacing.NORTH)))).func_206870_a(field_196414_y, Boolean.valueOf(this.func_196417_a(iblockstate2, iblockstate2.func_193401_d(iblockreader, blockpos3, EnumFacing.EAST)))).func_206870_a(field_196411_b, Boolean.valueOf(this.func_196417_a(iblockstate3, iblockstate3.func_193401_d(iblockreader, blockpos4, EnumFacing.WEST)))).func_206870_a(field_204514_u, Boolean.valueOf(ifluidstate.func_206886_c() == Fluids.field_204546_a));
++      return this.func_176223_P()
++          .func_206870_a(field_196409_a, canPaneConnectTo(iblockreader, blockpos, EnumFacing.NORTH))
++          .func_206870_a(field_196413_c, canPaneConnectTo(iblockreader, blockpos, EnumFacing.SOUTH))
++          .func_206870_a(field_196414_y, canPaneConnectTo(iblockreader, blockpos, EnumFacing.WEST))
++          .func_206870_a(field_196411_b, canPaneConnectTo(iblockreader, blockpos, EnumFacing.EAST))
++          .func_206870_a(field_204514_u, Boolean.valueOf(ifluidstate.func_206886_c() == Fluids.field_204546_a));
+    }
  
-     public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
-     {
--        return p_176221_1_.func_177226_a(field_176241_b, Boolean.valueOf(this.func_150098_a(p_176221_2_.func_180495_p(p_176221_3_.func_177978_c()).func_177230_c()))).func_177226_a(field_176243_N, Boolean.valueOf(this.func_150098_a(p_176221_2_.func_180495_p(p_176221_3_.func_177968_d()).func_177230_c()))).func_177226_a(field_176244_O, Boolean.valueOf(this.func_150098_a(p_176221_2_.func_180495_p(p_176221_3_.func_177976_e()).func_177230_c()))).func_177226_a(field_176242_M, Boolean.valueOf(this.func_150098_a(p_176221_2_.func_180495_p(p_176221_3_.func_177974_f()).func_177230_c())));
-+        return p_176221_1_.func_177226_a(field_176241_b, canPaneConnectTo(p_176221_2_, p_176221_3_, EnumFacing.NORTH))
-+                .func_177226_a(field_176243_N, canPaneConnectTo(p_176221_2_, p_176221_3_, EnumFacing.SOUTH))
-+                .func_177226_a(field_176244_O, canPaneConnectTo(p_176221_2_, p_176221_3_, EnumFacing.WEST))
-+                .func_177226_a(field_176242_M, canPaneConnectTo(p_176221_2_, p_176221_3_, EnumFacing.EAST));
-     }
+    public IBlockState func_196271_a(IBlockState p_196271_1_, EnumFacing p_196271_2_, IBlockState p_196271_3_, IWorld p_196271_4_, BlockPos p_196271_5_, BlockPos p_196271_6_) {
+@@ -41,7 +38,7 @@
+          p_196271_4_.func_205219_F_().func_205360_a(p_196271_5_, Fluids.field_204546_a, Fluids.field_204546_a.func_205569_a(p_196271_4_));
+       }
  
-     public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
-@@ -188,4 +191,21 @@
-     {
-         return new BlockStateContainer(this, new IProperty[] {field_176241_b, field_176242_M, field_176244_O, field_176243_N});
-     }
+-      return p_196271_2_.func_176740_k().func_176722_c() ? p_196271_1_.func_206870_a(field_196415_z.get(p_196271_2_), Boolean.valueOf(this.func_196417_a(p_196271_3_, p_196271_3_.func_193401_d(p_196271_4_, p_196271_6_, p_196271_2_.func_176734_d())))) : super.func_196271_a(p_196271_1_, p_196271_2_, p_196271_3_, p_196271_4_, p_196271_5_, p_196271_6_);
++      return p_196271_2_.func_176740_k().func_176722_c() ? p_196271_1_.func_206870_a(field_196415_z.get(p_196271_2_), Boolean.valueOf(this.canPaneConnectTo(p_196271_4_, p_196271_5_, p_196271_2_))) : super.func_196271_a(p_196271_1_, p_196271_2_, p_196271_3_, p_196271_4_, p_196271_5_, p_196271_6_);
+    }
+ 
+    public boolean func_149686_d(IBlockState p_149686_1_) {
+@@ -87,4 +84,16 @@
+    public BlockFaceShape func_193383_a(IBlockReader p_193383_1_, IBlockState p_193383_2_, BlockPos p_193383_3_, EnumFacing p_193383_4_) {
+       return p_193383_4_ != EnumFacing.UP && p_193383_4_ != EnumFacing.DOWN ? BlockFaceShape.MIDDLE_POLE_THIN : BlockFaceShape.CENTER_SMALL;
+    }
 +
-+    /* ======================================== FORGE START ======================================== */
++   @Override
++   public boolean canBeConnectedTo(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing facing) {
++      IBlockState other = world.func_180495_p(pos.func_177972_a(facing));
++      return func_196417_a(other, other.func_193401_d(world, pos.func_177972_a(facing), facing.func_176734_d()));
++   }
 +
-+    @Override
-+    public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
-+    {
-+        Block connector = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
-+        return connector instanceof BlockPane;
-+    }
-+
-+    public boolean canPaneConnectTo(IBlockAccess world, BlockPos pos, EnumFacing dir)
-+    {
-+        IBlockState state = world.func_180495_p(pos.func_177972_a(dir));
-+        return state.func_177230_c().canBeConnectedTo(world, pos.func_177972_a(dir), dir.func_176734_d()) || func_150098_a(state.func_177230_c()) || state.isSideSolid(world, pos.func_177972_a(dir), dir.func_176734_d());
-+    }
-+
-+    /* ======================================== FORGE END ======================================== */
++   private boolean canPaneConnectTo(IBlockReader world, BlockPos pos, EnumFacing facing) {
++      BlockPos offset = pos.func_177972_a(facing);
++      IBlockState other = world.func_180495_p(offset);
++      return other.canBeConnectedTo(world, offset, facing.func_176734_d()) || func_176223_P().canBeConnectedTo(world, pos, facing);
++   }
  }

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

@@ -1,43 +1,33 @@
---- ../src-base/minecraft/net/minecraft/block/BlockPistonBase.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockPistonBase.java
-@@ -240,7 +240,7 @@
-                     }
-                 }
- 
--                if (!flag1 && iblockstate.func_185904_a() != Material.field_151579_a && func_185646_a(iblockstate, p_189539_2_, blockpos, enumfacing.func_176734_d(), false) && (iblockstate.func_185905_o() == EnumPushReaction.NORMAL || block == Blocks.field_150331_J || block == Blocks.field_150320_F))
-+                if (!flag1 && !iblockstate.func_177230_c().isAir(iblockstate, p_189539_2_, p_189539_3_) && func_185646_a(iblockstate, p_189539_2_, blockpos, enumfacing.func_176734_d(), false) && (iblockstate.func_185905_o() == EnumPushReaction.NORMAL || block == Blocks.field_150331_J || block == Blocks.field_150320_F))
-                 {
-                     this.func_176319_a(p_189539_2_, p_189539_3_, enumfacing, false);
-                 }
-@@ -306,7 +306,7 @@
-                     return false;
-                 }
- 
--                return !block.func_149716_u();
-+                return !block.hasTileEntity(p_185646_0_);
+--- a/net/minecraft/block/BlockPistonBase.java
++++ b/net/minecraft/block/BlockPistonBase.java
+@@ -244,7 +244,7 @@
+                return false;
              }
-             else
-             {
-@@ -352,7 +352,9 @@
-             {
-                 BlockPos blockpos1 = (BlockPos)list2.get(j);
-                 IBlockState iblockstate = p_176319_1_.func_180495_p(blockpos1);
--                iblockstate.func_177230_c().func_176226_b(p_176319_1_, blockpos1, iblockstate, 0);
-+                // Forge: With our change to how snowballs are dropped this needs to disallow to mimic vanilla behavior.
-+                float chance = iblockstate.func_177230_c() instanceof BlockSnow ? -1.0f : 1.0f;
-+                iblockstate.func_177230_c().func_180653_a(p_176319_1_, blockpos1, iblockstate, chance, 0);
-                 p_176319_1_.func_180501_a(blockpos1, Blocks.field_150350_a.func_176223_P(), 4);
-                 --k;
-                 aiblockstate[k] = iblockstate;
-@@ -432,4 +434,11 @@
-     {
-         return new BlockStateContainer(this, new IProperty[] {field_176387_N, field_176320_b});
-     }
+ 
+-            return !block.func_149716_u();
++            return !p_185646_0_.hasTileEntity();
+          } else {
+             return false;
+          }
+@@ -280,7 +280,9 @@
+          for(int j = list2.size() - 1; j >= 0; --j) {
+             BlockPos blockpos2 = list2.get(j);
+             IBlockState iblockstate = p_176319_1_.func_180495_p(blockpos2);
+-            iblockstate.func_196949_c(p_176319_1_, blockpos2, 0);
++            // Forge: With our change to how snowballs are dropped this needs to disallow to mimic vanilla behavior.
++            float chance = iblockstate.func_177230_c() instanceof BlockSnow ? -1.0f : 1.0f;
++            iblockstate.func_196941_a(p_176319_1_, blockpos2, chance, 0);
+             p_176319_1_.func_180501_a(blockpos2, Blocks.field_150350_a.func_176223_P(), 18);
+             --k;
+             aiblockstate[k] = iblockstate;
+@@ -333,6 +335,10 @@
+       return p_185499_1_.func_206870_a(field_176387_N, p_185499_2_.func_185831_a(p_185499_1_.func_177229_b(field_176387_N)));
+    }
+ 
++   public IBlockState rotate(IBlockState state, net.minecraft.world.IWorld world, BlockPos pos, Rotation direction) {
++       return state.func_177229_b(field_176320_b) ? state : super.rotate(state, world, pos, direction);
++   }
 +
-+    /* ======================================== FORGE START =====================================*/
-+    public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
-+    {
-+        IBlockState state = world.func_180495_p(pos);
-+        return !state.func_177229_b(field_176320_b) && super.rotateBlock(world, pos, axis);
-+    }
- }
+    public IBlockState func_185471_a(IBlockState p_185471_1_, Mirror p_185471_2_) {
+       return p_185471_1_.func_185907_a(p_185471_2_.func_185800_a(p_185471_1_.func_177229_b(field_176387_N)));
+    }

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

@@ -1,36 +1,26 @@
---- ../src-base/minecraft/net/minecraft/block/BlockPistonMoving.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockPistonMoving.java
-@@ -115,7 +115,7 @@
+--- a/net/minecraft/block/BlockPistonMoving.java
++++ b/net/minecraft/block/BlockPistonMoving.java
+@@ -86,14 +86,22 @@
+    }
  
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
-     {
--        if (!p_180653_1_.field_72995_K)
-+        if (false && !p_180653_1_.field_72995_K) // Forge: Noop this out
-         {
-             TileEntityPiston tileentitypiston = this.func_185589_c(p_180653_1_, p_180653_2_);
+    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
+-      if (!p_196255_2_.field_72995_K) {
++      if (false && !p_196255_2_.field_72995_K) { //Forge: Noop this out
+          TileEntityPiston tileentitypiston = this.func_196342_a(p_196255_2_, p_196255_3_);
+          if (tileentitypiston != null) {
+             tileentitypiston.func_200230_i().func_196949_c(p_196255_2_, p_196255_3_, 0);
+          }
+       }
++      super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, 1, p_196255_5_); // mimic vanilla behavior from above and ignore chance
+    }
  
-@@ -125,6 +125,7 @@
-                 iblockstate.func_177230_c().func_176226_b(p_180653_1_, p_180653_2_, iblockstate, 0);
-             }
-         }
-+        super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, 1, p_180653_5_); // mimic vanilla behavior from above and ignore chance
-     }
- 
-     @Nullable
-@@ -208,4 +209,16 @@
-     {
-         return new BlockStateContainer(this, new IProperty[] {field_176426_a, field_176425_b});
-     }
++   @Override
++   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune) {
++      TileEntityPiston te = this.func_196342_a(world, pos);
++      if (te != null)
++         te.func_200230_i().getDrops(drops, world, pos, fortune);
++   }
 +
-+    @Override
-+    public java.util.List<net.minecraft.item.ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
-+    {
-+        TileEntityPiston tileentitypiston = this.func_185589_c(world, pos);
-+        if (tileentitypiston != null)
-+        {
-+            IBlockState pushed = tileentitypiston.func_174927_b();
-+            return pushed.func_177230_c().getDrops(world, pos, pushed, fortune);
-+        }
-+        return new java.util.ArrayList();
-+    }
- }
+    public VoxelShape func_196244_b(IBlockState p_196244_1_, IBlockReader p_196244_2_, BlockPos p_196244_3_) {
+       return VoxelShapes.func_197880_a();
+    }

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

@@ -0,0 +1,11 @@
+--- a/net/minecraft/block/BlockPortal.java
++++ b/net/minecraft/block/BlockPortal.java
+@@ -76,7 +76,7 @@
+ 
+    public boolean func_176548_d(IWorld p_176548_1_, BlockPos p_176548_2_) {
+       BlockPortal.Size blockportal$size = this.func_201816_b(p_176548_1_, p_176548_2_);
+-      if (blockportal$size != null) {
++      if (blockportal$size != null && !net.minecraftforge.event.ForgeEventFactory.onTrySpawnPortal(p_176548_1_, p_176548_2_, blockportal$size)) {
+          blockportal$size.func_150859_c();
+          return true;
+       } else {

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

@@ -1,25 +1,25 @@
---- ../src-base/minecraft/net/minecraft/block/BlockPotato.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockPotato.java
-@@ -27,7 +27,7 @@
-     {
-         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
+--- a/net/minecraft/block/BlockPotato.java
++++ b/net/minecraft/block/BlockPotato.java
+@@ -26,7 +26,7 @@
  
--        if (!p_180653_1_.field_72995_K)
-+        if (false && !p_180653_1_.field_72995_K) //Forge: Moved to getDrops
-         {
-             if (this.func_185525_y(p_180653_3_) && p_180653_1_.field_73012_v.nextInt(50) == 0)
-             {
-@@ -40,4 +40,13 @@
-     {
-         return field_185534_a[((Integer)p_185496_1_.func_177229_b(this.func_185524_e())).intValue()];
-     }
+    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
+       super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
+-      if (!p_196255_2_.field_72995_K) {
++      if (false && !p_196255_2_.field_72995_K) { //Forge: Moved to getDrops
+          if (this.func_185525_y(p_196255_1_) && p_196255_2_.field_73012_v.nextInt(50) == 0) {
+             func_180635_a(p_196255_2_, p_196255_3_, new ItemStack(Items.field_151170_bI));
+          }
+@@ -34,6 +34,13 @@
+       }
+    }
+ 
++   @Override
++   public void getDrops(IBlockState state, net.minecraft.util.NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune) {
++      super.getDrops(state, drops, world, pos, fortune);
++      if (this.func_185525_y(state) && world.field_73012_v.nextInt(50) == 0)
++          drops.add(new ItemStack(Items.field_151170_bI));
++   }
 +
-+    @Override
-+    public java.util.List<ItemStack> getDrops(net.minecraft.world.IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
-+    {
-+        java.util.List<ItemStack> ret = super.getDrops(world, pos, state, fortune);
-+        if (this.func_185525_y(state) && RANDOM.nextInt(50) == 0)
-+            ret.add(new ItemStack(Items.field_151170_bI));
-+        return ret;
-+    }
- }
+    public VoxelShape func_196244_b(IBlockState p_196244_1_, IBlockReader p_196244_2_, BlockPos p_196244_3_) {
+       return field_196396_a[p_196244_1_.func_177229_b(this.func_185524_e())];
+    }

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

@@ -1,11 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockPumpkin.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockPumpkin.java
-@@ -124,7 +124,7 @@
- 
-     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-     {
--        return p_176196_1_.func_180495_p(p_176196_2_).func_177230_c().field_149764_J.func_76222_j() && p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).func_185896_q();
-+        return p_176196_1_.func_180495_p(p_176196_2_).func_177230_c().func_176200_f(p_176196_1_, p_176196_2_) && p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).isSideSolid(p_176196_1_, p_176196_2_, EnumFacing.UP);
-     }
- 
-     public IBlockState func_185499_a(IBlockState p_185499_1_, Rotation p_185499_2_)

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

@@ -1,29 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockQuartz.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockQuartz.java
-@@ -110,6 +110,26 @@
-         return new BlockStateContainer(this, new IProperty[] {field_176335_a});
-     }
- 
-+    public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
-+    {
-+        IBlockState state = world.func_180495_p(pos);
-+        for (IProperty prop : state.func_177228_b().keySet())
-+        {
-+            if (prop.func_177701_a().equals("variant") && prop.func_177699_b() == EnumType.class)
-+            {
-+                EnumType current = (EnumType)state.func_177229_b(prop);
-+                EnumType next = current == EnumType.LINES_X ? EnumType.LINES_Y :
-+                                current == EnumType.LINES_Y ? EnumType.LINES_Z :
-+                                current == EnumType.LINES_Z ? EnumType.LINES_X : current;
-+                if (next == current)
-+                    return false;
-+                world.func_175656_a(pos, state.func_177226_a(prop, next));
-+                return true;
-+            }
-+        }
-+        return false;
-+    }
-+
-     public static enum EnumType implements IStringSerializable
-     {
-         DEFAULT(0, "default", "default"),

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

@@ -1,230 +1,122 @@
---- ../src-base/minecraft/net/minecraft/block/BlockRailBase.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockRailBase.java
-@@ -33,7 +33,7 @@
-     public static boolean func_176563_d(IBlockState p_176563_0_)
-     {
-         Block block = p_176563_0_.func_177230_c();
--        return block == Blocks.field_150448_aq || block == Blocks.field_150318_D || block == Blocks.field_150319_E || block == Blocks.field_150408_cc;
-+        return block instanceof BlockRailBase;
-     }
+--- a/net/minecraft/block/BlockRailBase.java
++++ b/net/minecraft/block/BlockRailBase.java
+@@ -37,7 +37,7 @@
+    }
  
-     protected BlockRailBase(boolean p_i45389_1_)
-@@ -56,7 +56,7 @@
+    public VoxelShape func_196244_b(IBlockState p_196244_1_, IBlockReader p_196244_2_, BlockPos p_196244_3_) {
+-      RailShape railshape = p_196244_1_.func_177230_c() == this ? p_196244_1_.func_177229_b(this.func_176560_l()) : null;
++      RailShape railshape = p_196244_1_.func_177230_c() == this ? getRailDirection(p_196244_1_, p_196244_2_, p_196244_3_, null) : null;
+       return railshape != null && railshape.func_208092_c() ? field_190959_b : field_185590_a;
+    }
  
-     public AxisAlignedBB func_185496_a(IBlockState p_185496_1_, IBlockAccess p_185496_2_, BlockPos p_185496_3_)
-     {
--        BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = p_185496_1_.func_177230_c() == this ? (BlockRailBase.EnumRailDirection)p_185496_1_.func_177229_b(this.func_176560_l()) : null;
-+        BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = p_185496_1_.func_177230_c() == this ? getRailDirection(p_185496_2_, p_185496_3_, p_185496_1_, null) : null;
-         return blockrailbase$enumraildirection != null && blockrailbase$enumraildirection.func_177018_c() ? field_190959_b : field_185590_a;
-     }
+@@ -50,7 +50,7 @@
+    }
  
-@@ -67,7 +67,7 @@
+    public boolean func_196260_a(IBlockState p_196260_1_, IWorldReaderBase p_196260_2_, BlockPos p_196260_3_) {
+-      return p_196260_2_.func_180495_p(p_196260_3_.func_177977_b()).func_185896_q();
++      return p_196260_2_.func_180495_p(p_196260_3_.func_177977_b()).func_193401_d(p_196260_2_, p_196260_3_.func_177977_b(), EnumFacing.UP) == BlockFaceShape.SOLID;
+    }
  
-     public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
-     {
--        return p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).func_185896_q();
-+        return p_176196_1_.func_180495_p(p_176196_2_.func_177977_b()).isSideSolid(p_176196_1_, p_176196_2_.func_177977_b(), EnumFacing.UP);
-     }
+    public void func_196259_b(IBlockState p_196259_1_, World p_196259_2_, BlockPos p_196259_3_, IBlockState p_196259_4_) {
+@@ -67,19 +67,19 @@
  
-     public void func_176213_c(World p_176213_1_, BlockPos p_176213_2_, IBlockState p_176213_3_)
-@@ -87,27 +87,27 @@
-     {
-         if (!p_189540_2_.field_72995_K)
-         {
--            BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = (BlockRailBase.EnumRailDirection)p_189540_1_.func_177229_b(this.func_176560_l());
-+            BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = getRailDirection(p_189540_2_, p_189540_3_, p_189540_2_.func_180495_p(p_189540_3_), null);
-             boolean flag = false;
+    public void func_189540_a(IBlockState p_189540_1_, World p_189540_2_, BlockPos p_189540_3_, Block p_189540_4_, BlockPos p_189540_5_) {
+       if (!p_189540_2_.field_72995_K) {
+-         RailShape railshape = p_189540_1_.func_177229_b(this.func_176560_l());
++         RailShape railshape = getRailDirection(p_189540_1_, p_189540_2_, p_189540_3_, null);
+          boolean flag = false;
+-         if (!p_189540_2_.func_180495_p(p_189540_3_.func_177977_b()).func_185896_q()) {
++         if (p_189540_2_.func_180495_p(p_189540_3_.func_177977_b()).func_193401_d(p_189540_2_, p_189540_3_.func_177977_b(), EnumFacing.UP) != BlockFaceShape.SOLID) {
+             flag = true;
+          }
  
--            if (!p_189540_2_.func_180495_p(p_189540_3_.func_177977_b()).func_185896_q())
-+            if (!p_189540_2_.func_180495_p(p_189540_3_.func_177977_b()).isSideSolid(p_189540_2_, p_189540_3_.func_177977_b(), EnumFacing.UP))
-             {
-                 flag = true;
-             }
+-         if (railshape == RailShape.ASCENDING_EAST && !p_189540_2_.func_180495_p(p_189540_3_.func_177974_f()).func_185896_q()) {
++         if (railshape == RailShape.ASCENDING_EAST && p_189540_2_.func_180495_p(p_189540_3_.func_177974_f()).func_193401_d(p_189540_2_, p_189540_3_.func_177974_f(), EnumFacing.UP) != BlockFaceShape.SOLID) {
+             flag = true;
+-         } else if (railshape == RailShape.ASCENDING_WEST && !p_189540_2_.func_180495_p(p_189540_3_.func_177976_e()).func_185896_q()) {
++         } else if (railshape == RailShape.ASCENDING_WEST && p_189540_2_.func_180495_p(p_189540_3_.func_177976_e()).func_193401_d(p_189540_2_, p_189540_3_.func_177976_e(), EnumFacing.UP) != BlockFaceShape.SOLID) {
+             flag = true;
+-         } else if (railshape == RailShape.ASCENDING_NORTH && !p_189540_2_.func_180495_p(p_189540_3_.func_177978_c()).func_185896_q()) {
++         } else if (railshape == RailShape.ASCENDING_NORTH && p_189540_2_.func_180495_p(p_189540_3_.func_177978_c()).func_193401_d(p_189540_2_, p_189540_3_.func_177978_c(), EnumFacing.UP) != BlockFaceShape.SOLID) {
+             flag = true;
+-         } else if (railshape == RailShape.ASCENDING_SOUTH && !p_189540_2_.func_180495_p(p_189540_3_.func_177968_d()).func_185896_q()) {
++         } else if (railshape == RailShape.ASCENDING_SOUTH && p_189540_2_.func_180495_p(p_189540_3_.func_177968_d()).func_193401_d(p_189540_2_, p_189540_3_.func_177968_d(), EnumFacing.UP) != BlockFaceShape.SOLID) {
+             flag = true;
+          }
  
--            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_EAST && !p_189540_2_.func_180495_p(p_189540_3_.func_177974_f()).func_185896_q())
-+            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_EAST && !p_189540_2_.func_180495_p(p_189540_3_.func_177974_f()).isSideSolid(p_189540_2_, p_189540_3_.func_177974_f(), EnumFacing.UP))
-             {
-                 flag = true;
-             }
--            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_WEST && !p_189540_2_.func_180495_p(p_189540_3_.func_177976_e()).func_185896_q())
-+            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_WEST && !p_189540_2_.func_180495_p(p_189540_3_.func_177976_e()).isSideSolid(p_189540_2_, p_189540_3_.func_177976_e(), EnumFacing.UP))
-             {
-                 flag = true;
-             }
--            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_NORTH && !p_189540_2_.func_180495_p(p_189540_3_.func_177978_c()).func_185896_q())
-+            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_NORTH && !p_189540_2_.func_180495_p(p_189540_3_.func_177978_c()).isSideSolid(p_189540_2_, p_189540_3_.func_177978_c(), EnumFacing.UP))
-             {
-                 flag = true;
-             }
--            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_SOUTH && !p_189540_2_.func_180495_p(p_189540_3_.func_177968_d()).func_185896_q())
-+            else if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.ASCENDING_SOUTH && !p_189540_2_.func_180495_p(p_189540_3_.func_177968_d()).isSideSolid(p_189540_2_, p_189540_3_.func_177968_d(), EnumFacing.UP))
-             {
-                 flag = true;
-             }
-@@ -148,7 +148,7 @@
-     {
-         super.func_180663_b(p_180663_1_, p_180663_2_, p_180663_3_);
+@@ -111,7 +111,7 @@
+    public void func_196243_a(IBlockState p_196243_1_, World p_196243_2_, BlockPos p_196243_3_, IBlockState p_196243_4_, boolean p_196243_5_) {
+       if (!p_196243_5_) {
+          super.func_196243_a(p_196243_1_, p_196243_2_, p_196243_3_, p_196243_4_, p_196243_5_);
+-         if (p_196243_1_.func_177229_b(this.func_176560_l()).func_208092_c()) {
++         if (getRailDirection(p_196243_1_, p_196243_2_, p_196243_3_, null).func_208092_c()) {
+             p_196243_2_.func_195593_d(p_196243_3_.func_177984_a(), this);
+          }
  
--        if (((BlockRailBase.EnumRailDirection)p_180663_3_.func_177229_b(this.func_176560_l())).func_177018_c())
-+        if (getRailDirection(p_180663_1_, p_180663_2_, p_180663_3_, null).func_177018_c())
-         {
-             p_180663_1_.func_175685_c(p_180663_2_.func_177984_a(), this, false);
-         }
-@@ -160,8 +160,101 @@
-         }
-     }
+@@ -123,5 +123,66 @@
+       }
+    }
  
-+    //Forge: Use getRailDirection(IBlockAccess, BlockPos, IBlockState, EntityMinecart) for enhanced ability
-     public abstract IProperty<BlockRailBase.EnumRailDirection> func_176560_l();
- 
-+    /* ======================================== FORGE START =====================================*/
-+    /**
-+     * Return true if the rail can make corners.
-+     * Used by placement logic.
-+     * @param world The world.
-+     * @param pos Block's position in world
-+     * @return True if the rail can make corners.
-+     */
-+    public boolean isFlexibleRail(IBlockAccess world, BlockPos pos)
-+    {
-+        return !this.field_150053_a;
-+    }
++   //Forge: Use getRailDirection(IBlockAccess, BlockPos, IBlockState, EntityMinecart) for enhanced ability
+    public abstract IProperty<RailShape> func_176560_l();
 +
-+    /**
-+     * Returns true if the rail can make up and down slopes.
-+     * Used by placement logic.
-+     * @param world The world.
-+     * @param pos Block's position in world
-+     * @return True if the rail can make slopes.
-+     */
-+    public boolean canMakeSlopes(IBlockAccess world, BlockPos pos)
-+    {
-+        return true;
-+    }
++   /* ======================================== FORGE START =====================================*/
++   /**
++    * Return true if the rail can make corners.
++    * Used by placement logic.
++    * @param world The world.
++    * @param pos Block's position in world
++    * @return True if the rail can make corners.
++    */
++   public boolean isFlexibleRail(IBlockState state, IBlockReader world, BlockPos pos)
++   {
++       return !this.field_196277_c;
++   }
 +
-+    /**
-+     * Return the rail's direction.
-+     * Can be used to make the cart think the rail is a different shape,
-+     * for example when making diamond junctions or switches.
-+     * The cart parameter will often be null unless it it called from EntityMinecart.
-+     *
-+     * @param world The world.
-+     * @param pos Block's position in world
-+     * @param state The BlockState
-+     * @param cart The cart asking for the metadata, null if it is not called by EntityMinecart.
-+     * @return The direction.
-+     */
-+    public EnumRailDirection getRailDirection(IBlockAccess world, BlockPos pos, IBlockState state, @javax.annotation.Nullable net.minecraft.entity.item.EntityMinecart cart)
-+    {
-+        return state.func_177229_b(func_176560_l());
-+    }
++   /**
++    * Returns true if the rail can make up and down slopes.
++    * Used by placement logic.
++    * @param world The world.
++    * @param pos Block's position in world
++    * @return True if the rail can make slopes.
++    */
++   public boolean canMakeSlopes(IBlockState state, IBlockReader world, BlockPos pos) {
++       return true;
++   }
 +
-+    /**
-+     * Returns the max speed of the rail at the specified position.
-+     * @param world The world.
-+     * @param cart The cart on the rail, may be null.
-+     * @param pos Block's position in world
-+     * @return The max speed of the current rail.
-+     */
-+    public float getRailMaxSpeed(World world, net.minecraft.entity.item.EntityMinecart cart, BlockPos pos)
-+    {
-+        return 0.4f;
-+    }
++   /**
++    * Return the rail's direction.
++    * Can be used to make the cart think the rail is a different shape,
++    * for example when making diamond junctions or switches.
++    * The cart parameter will often be null unless it it called from EntityMinecart.
++    *
++    * @param world The world.
++    * @param pos Block's position in world
++    * @param state The BlockState
++    * @param cart The cart asking for the metadata, null if it is not called by EntityMinecart.
++    * @return The direction.
++    */
++   public RailShape getRailDirection(IBlockState state, IBlockReader world, BlockPos pos, @javax.annotation.Nullable net.minecraft.entity.item.EntityMinecart cart) {
++       return state.func_177229_b(func_176560_l());
++   }
 +
-+    /**
-+     * This function is called by any minecart that passes over this rail.
-+     * It is called once per update tick that the minecart is on the rail.
-+     * @param world The world.
-+     * @param cart The cart on the rail.
-+     * @param pos Block's position in world
-+     */
-+    public void onMinecartPass(World world, net.minecraft.entity.item.EntityMinecart cart, BlockPos pos)
-+    {
-+    }
++   /**
++    * Returns the max speed of the rail at the specified position.
++    * @param world The world.
++    * @param cart The cart on the rail, may be null.
++    * @param pos Block's position in world
++    * @return The max speed of the current rail.
++    */
++   public float getRailMaxSpeed(IBlockState state, World world, BlockPos pos, net.minecraft.entity.item.EntityMinecart cart) {
++       return 0.4f;
++   }
 +
-+    /**
-+     * Rotate the block. For vanilla blocks this rotates around the axis passed in (generally, it should be the "face" that was hit).
-+     * Note: for mod blocks, this is up to the block and modder to decide. It is not mandated that it be a rotation around the
-+     * face, but could be a rotation to orient *to* that face, or a visiting of possible rotations.
-+     * The method should return true if the rotation was successful though.
-+     *
-+     * @param world The world
-+     * @param pos Block position in world
-+     * @param axis The axis to rotate around
-+     * @return True if the rotation was successful, False if the rotation failed, or is not possible
-+     */
-+    public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
-+    {
-+        IBlockState state = world.func_180495_p(pos);
-+        for (IProperty prop : state.func_177228_b().keySet())
-+        {
-+            if (prop.func_177701_a().equals("shape"))
-+            {
-+                world.func_175656_a(pos, state.func_177231_a(prop));
-+                return true;
-+            }
-+        }
-+        return false;
-+    }
-+
-+    /* ======================================== FORGE END =====================================*/
-+
-     public static enum EnumRailDirection implements IStringSerializable
-     {
-         NORTH_SOUTH(0, "north_south"),
-@@ -232,6 +325,7 @@
-         private IBlockState field_180366_e;
-         private final boolean field_150656_f;
-         private final List<BlockPos> field_150657_g = Lists.<BlockPos>newArrayList();
-+        private final boolean canMakeSlopes;
- 
-         public Rail(World p_i45739_2_, BlockPos p_i45739_3_, IBlockState p_i45739_4_)
-         {
-@@ -239,8 +333,9 @@
-             this.field_180367_c = p_i45739_3_;
-             this.field_180366_e = p_i45739_4_;
-             this.field_180365_d = (BlockRailBase)p_i45739_4_.func_177230_c();
--            BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = (BlockRailBase.EnumRailDirection)p_i45739_4_.func_177229_b(this.field_180365_d.func_176560_l());
--            this.field_150656_f = this.field_180365_d.field_150053_a;
-+            BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = field_180365_d.getRailDirection(p_i45739_2_, p_i45739_3_, p_i45739_4_, null);
-+            this.field_150656_f = !this.field_180365_d.isFlexibleRail(p_i45739_2_, p_i45739_3_);
-+            this.canMakeSlopes = this.field_180365_d.canMakeSlopes(p_i45739_2_, p_i45739_3_);
-             this.func_180360_a(blockrailbase$enumraildirection);
-         }
- 
-@@ -432,7 +527,7 @@
-                 }
-             }
- 
--            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH)
-+            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH && canMakeSlopes)
-             {
-                 if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a()))
-                 {
-@@ -445,7 +540,7 @@
-                 }
-             }
- 
--            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST)
-+            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST && canMakeSlopes)
-             {
-                 if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos3.func_177984_a()))
-                 {
-@@ -588,7 +683,7 @@
-                 }
-             }
- 
--            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH)
-+            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.NORTH_SOUTH && canMakeSlopes)
-             {
-                 if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a()))
-                 {
-@@ -601,7 +696,7 @@
-                 }
-             }
- 
--            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST)
-+            if (blockrailbase$enumraildirection == BlockRailBase.EnumRailDirection.EAST_WEST && canMakeSlopes)
-             {
-                 if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos3.func_177984_a()))
-                 {
++   /**
++    * This function is called by any minecart that passes over this rail.
++    * It is called once per update tick that the minecart is on the rail.
++    * @param world The world.
++    * @param cart The cart on the rail.
++    * @param pos Block's position in world
++    */
++   public void onMinecartPass(IBlockState state, World world, BlockPos pos, net.minecraft.entity.item.EntityMinecart cart) { }
+ }

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

@@ -1,11 +1,11 @@
---- ../src-base/minecraft/net/minecraft/block/BlockRailDetector.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockRailDetector.java
-@@ -156,6 +156,8 @@
-     {
-         if (((Boolean)p_180641_1_.func_177229_b(field_176574_M)).booleanValue())
-         {
-+            List<EntityMinecart> carts = this.func_176571_a(p_180641_2_, p_180641_3_, EntityMinecart.class);
-+            if (!carts.isEmpty() && carts.get(0).getComparatorLevel() > -1) return carts.get(0).getComparatorLevel();
-             List<EntityMinecartCommandBlock> list = this.<EntityMinecartCommandBlock>func_176571_a(p_180641_2_, p_180641_3_, EntityMinecartCommandBlock.class, new Predicate[0]);
+--- a/net/minecraft/block/BlockRailDetector.java
++++ b/net/minecraft/block/BlockRailDetector.java
+@@ -127,6 +127,8 @@
  
-             if (!list.isEmpty())
+    public int func_180641_l(IBlockState p_180641_1_, World p_180641_2_, BlockPos p_180641_3_) {
+       if (p_180641_1_.func_177229_b(field_176574_M)) {
++         List<EntityMinecart> carts = this.func_200878_a(p_180641_2_, p_180641_3_, EntityMinecart.class, null);
++         if (!carts.isEmpty() && carts.get(0).getComparatorLevel() > -1) return carts.get(0).getComparatorLevel();
+          List<EntityMinecartCommandBlock> list = this.func_200878_a(p_180641_2_, p_180641_3_, EntityMinecartCommandBlock.class, (Predicate<Entity>)null);
+          if (!list.isEmpty()) {
+             return list.get(0).func_145822_e().func_145760_g();

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

@@ -0,0 +1,29 @@
+--- a/net/minecraft/block/BlockRailPowered.java
++++ b/net/minecraft/block/BlockRailPowered.java
+@@ -15,10 +15,16 @@
+ public class BlockRailPowered extends BlockRailBase {
+    public static final EnumProperty<RailShape> field_176568_b = BlockStateProperties.field_208166_S;
+    public static final BooleanProperty field_176569_M = BlockStateProperties.field_208194_u;
++   private final boolean isActivator;
+ 
+    protected BlockRailPowered(Block.Properties p_i48349_1_) {
+-      super(true, p_i48349_1_);
++      this(p_i48349_1_, false);
++   }
++
++   protected BlockRailPowered(Block.Properties builder, boolean isActivator) {
++      super(true, builder);
+       this.func_180632_j(this.field_176227_L.func_177621_b().func_206870_a(field_176568_b, RailShape.NORTH_SOUTH).func_206870_a(field_176569_M, Boolean.valueOf(false)));
++      this.isActivator = isActivator;
+    }
+ 
+    protected boolean func_176566_a(World p_176566_1_, BlockPos p_176566_2_, IBlockState p_176566_3_, boolean p_176566_4_, int p_176566_5_) {
+@@ -100,7 +106,7 @@
+ 
+    protected boolean func_208071_a(World p_208071_1_, BlockPos p_208071_2_, boolean p_208071_3_, int p_208071_4_, RailShape p_208071_5_) {
+       IBlockState iblockstate = p_208071_1_.func_180495_p(p_208071_2_);
+-      if (iblockstate.func_177230_c() != this) {
++      if (!(iblockstate.func_177230_c() instanceof BlockRailPowered) || isActivator != ((BlockRailPowered)iblockstate.func_177230_c()).isActivator) {
+          return false;
+       } else {
+          RailShape railshape = iblockstate.func_177229_b(field_176568_b);

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

@@ -0,0 +1,57 @@
+--- a/net/minecraft/block/BlockRailState.java
++++ b/net/minecraft/block/BlockRailState.java
+@@ -16,14 +16,16 @@
+    private IBlockState field_196923_d;
+    private final boolean field_208513_e;
+    private final List<BlockPos> field_196924_e = Lists.newArrayList();
++   private final boolean canMakeSlopes;
+ 
+    public BlockRailState(World p_i47755_1_, BlockPos p_i47755_2_, IBlockState p_i47755_3_) {
+       this.field_196920_a = p_i47755_1_;
+       this.field_196921_b = p_i47755_2_;
+       this.field_196923_d = p_i47755_3_;
+       this.field_196922_c = (BlockRailBase)p_i47755_3_.func_177230_c();
+-      RailShape railshape = p_i47755_3_.func_177229_b(this.field_196922_c.func_176560_l());
+-      this.field_208513_e = this.field_196922_c.func_208490_b();
++      RailShape railshape = this.field_196922_c.getRailDirection(field_196923_d, p_i47755_1_, p_i47755_2_, null);
++      this.field_208513_e = this.field_196922_c.isFlexibleRail(field_196923_d, p_i47755_1_, p_i47755_2_);
++      this.canMakeSlopes = this.field_196922_c.canMakeSlopes(field_196923_d, p_i47755_1_, p_i47755_2_);
+       this.func_208509_a(railshape);
+    }
+ 
+@@ -179,7 +181,7 @@
+          }
+       }
+ 
+-      if (railshape == RailShape.NORTH_SOUTH) {
++      if (railshape == RailShape.NORTH_SOUTH && canMakeSlopes) {
+          if (BlockRailBase.func_208488_a(this.field_196920_a, blockpos.func_177984_a())) {
+             railshape = RailShape.ASCENDING_NORTH;
+          }
+@@ -189,7 +191,7 @@
+          }
+       }
+ 
+-      if (railshape == RailShape.EAST_WEST) {
++      if (railshape == RailShape.EAST_WEST && canMakeSlopes) {
+          if (BlockRailBase.func_208488_a(this.field_196920_a, blockpos3.func_177984_a())) {
+             railshape = RailShape.ASCENDING_EAST;
+          }
+@@ -299,7 +301,7 @@
+          }
+       }
+ 
+-      if (railshape == RailShape.NORTH_SOUTH) {
++      if (railshape == RailShape.NORTH_SOUTH && canMakeSlopes) {
+          if (BlockRailBase.func_208488_a(this.field_196920_a, blockpos.func_177984_a())) {
+             railshape = RailShape.ASCENDING_NORTH;
+          }
+@@ -309,7 +311,7 @@
+          }
+       }
+ 
+-      if (railshape == RailShape.EAST_WEST) {
++      if (railshape == RailShape.EAST_WEST && canMakeSlopes) {
+          if (BlockRailBase.func_208488_a(this.field_196920_a, blockpos3.func_177984_a())) {
+             railshape = RailShape.ASCENDING_EAST;
+          }

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

@@ -1,24 +1,19 @@
---- ../src-base/minecraft/net/minecraft/block/BlockRedstoneComparator.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneComparator.java
-@@ -311,6 +311,21 @@
-         return this.func_176223_P().func_177226_a(field_185512_D, p_180642_8_.func_174811_aO().func_176734_d()).func_177226_a(field_176464_a, Boolean.valueOf(false)).func_177226_a(field_176463_b, BlockRedstoneComparator.Mode.COMPARE);
-     }
- 
-+    @Override
-+    public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor)
-+    {
-+        if (pos.func_177956_o() == neighbor.func_177956_o() && world instanceof World)
-+        {
-+            func_189540_a(world.func_180495_p(pos), (World)world, pos, world.func_180495_p(neighbor).func_177230_c(), neighbor);
-+        }
-+    }
+--- a/net/minecraft/block/BlockRedstoneComparator.java
++++ b/net/minecraft/block/BlockRedstoneComparator.java
+@@ -156,4 +156,16 @@
+    protected void func_206840_a(StateContainer.Builder<Block, IBlockState> p_206840_1_) {
+       p_206840_1_.func_206894_a(field_185512_D, field_176463_b, field_196348_c);
+    }
 +
-+    @Override
-+    public boolean getWeakChanges(IBlockAccess world, BlockPos pos)
-+    {
-+        return true;
-+    }
++   @Override
++   public boolean getWeakChanges(IBlockState state, net.minecraft.world.IWorldReader world, BlockPos pos) {
++      return true;
++   }
 +
-     public static enum Mode implements IStringSerializable
-     {
-         COMPARE("compare"),
++   @Override
++   public void onNeighborChange(IBlockState state, net.minecraft.world.IWorldReader world, BlockPos pos, BlockPos neighbor) {
++      if (pos.func_177956_o() == neighbor.func_177956_o() && world instanceof World && !((World)world).func_201670_d()) {
++         func_189540_a(state, (World)world, pos, world.func_180495_p(neighbor).func_177230_c(), neighbor);
++      }
++   }
+ }

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

@@ -1,35 +1,20 @@
---- ../src-base/minecraft/net/minecraft/block/BlockRedstoneDiode.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneDiode.java
-@@ -204,6 +204,8 @@
-     {
-         EnumFacing enumfacing = (EnumFacing)p_176400_3_.func_177229_b(field_185512_D);
-         BlockPos blockpos = p_176400_2_.func_177972_a(enumfacing.func_176734_d());
-+        if(net.minecraftforge.event.ForgeEventFactory.onNeighborNotify(p_176400_1_, p_176400_2_, p_176400_1_.func_180495_p(p_176400_2_), java.util.EnumSet.of(enumfacing.func_176734_d()), false).isCanceled())
-+            return;
-         p_176400_1_.func_190524_a(blockpos, this, p_176400_2_);
-         p_176400_1_.func_175695_a(blockpos, this, enumfacing);
-     }
-@@ -275,4 +277,23 @@
-     {
-         return BlockRenderLayer.CUTOUT;
-     }
-+
-+    /* ======================================== FORGE START =====================================*/
-+    @Override
-+    public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
-+    {
-+        if (super.rotateBlock(world, pos, axis))
-+        {
-+            IBlockState state = world.func_180495_p(pos);
-+            state = func_180675_k(state);
-+            world.func_175656_a(pos, state);
-+
-+            if (func_176404_e(world, pos, state))
-+            {
-+                world.func_175684_a(pos, this, 1);
-+            }
-+            return true;
-+        }
-+        return false;
-+    }
- }
+--- a/net/minecraft/block/BlockRedstoneDiode.java
++++ b/net/minecraft/block/BlockRedstoneDiode.java
+@@ -35,7 +35,7 @@
+    }
+ 
+    public boolean func_196260_a(IBlockState p_196260_1_, IWorldReaderBase p_196260_2_, BlockPos p_196260_3_) {
+-      return p_196260_2_.func_180495_p(p_196260_3_.func_177977_b()).func_185896_q();
++      return p_196260_2_.func_180495_p(p_196260_3_.func_177977_b()).func_185896_q() || p_196260_2_.func_180495_p(p_196260_3_.func_177977_b()).func_193401_d(p_196260_2_, p_196260_3_.func_177977_b(), EnumFacing.UP) == BlockFaceShape.SOLID;
+    }
+ 
+    public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
+@@ -172,6 +172,8 @@
+    protected void func_176400_h(World p_176400_1_, BlockPos p_176400_2_, IBlockState p_176400_3_) {
+       EnumFacing enumfacing = p_176400_3_.func_177229_b(field_185512_D);
+       BlockPos blockpos = p_176400_2_.func_177972_a(enumfacing.func_176734_d());
++      if (net.minecraftforge.event.ForgeEventFactory.onNeighborNotify(p_176400_1_, p_176400_2_, p_176400_1_.func_180495_p(p_176400_2_), java.util.EnumSet.of(enumfacing.func_176734_d()), false).isCanceled())
++         return;
+       p_176400_1_.func_190524_a(blockpos, this, p_176400_2_);
+       p_176400_1_.func_175695_a(blockpos, this, enumfacing);
+    }

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

@@ -1,22 +1,21 @@
---- ../src-base/minecraft/net/minecraft/block/BlockRedstoneOre.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneOre.java
-@@ -92,12 +92,16 @@
-     public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
-     {
-         super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
-+    }
+--- a/net/minecraft/block/BlockRedstoneOre.java
++++ b/net/minecraft/block/BlockRedstoneOre.java
+@@ -72,11 +72,17 @@
  
--        if (this.func_180660_a(p_180653_3_, p_180653_1_.field_73012_v, p_180653_5_) != Item.func_150898_a(this))
-+    @Override
-+    public int getExpDrop(IBlockState state, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
-+    {
-+        if (this.func_180660_a(state, RANDOM, fortune) != Item.func_150898_a(this))
-         {
--            int i = 1 + p_180653_1_.field_73012_v.nextInt(5);
--            this.func_180637_b(p_180653_1_, p_180653_2_, i);
-+            return 1 + RANDOM.nextInt(5);
-         }
-+        return 0;
-     }
+    public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) {
+       super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_);
+-      if (this.func_199769_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_5_) != this) {
++      if (false && this.func_199769_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_5_) != this) {
+          int i = 1 + p_196255_2_.field_73012_v.nextInt(5);
+          this.func_180637_b(p_196255_2_, p_196255_3_, i);
+       }
++   }
  
-     @SideOnly(Side.CLIENT)
++   @Override
++   public int getExpDrop(IBlockState state, net.minecraft.world.IWorldReader world, BlockPos pos, int fortune) {
++      if (!(world instanceof World) || func_199769_a(state, (World)world, pos, fortune) != this)
++         return 1 + RANDOM.nextInt(5);
++      return 0;
+    }
+ 
+    @OnlyIn(Dist.CLIENT)