Fix performance regression in FastTESR rendering

too long on average (over first 200 frames) we'll use a sleep based
timer to allow mods doing splash screen work some time on the
LWJGL global lock.

CONTRIBUTING.md

@@ -8,3 +8,15 @@ Contributing to Forge
 3) Follow Forge coding guidelines (braces on newlines, spaces instead of tabs, etc)
 
 For more information, refer to [the wiki](https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge)
+
+
+Contributor License Agreement
+=============================
+- You grant Forge a license to use your code contributed to the primary codebase (everything **not** under patches) in Forge, under the LGPLv2.1 license.
+- You assign copyright ownership of your contributions to the patches codebase (everything under patches) to Forge, where it will be licensed under the LGPLv2.1 license.
+
+Additionally, while 1.9.4 is being maintained, you will be asked to acknowledge these two additional clauses.
+- You grant Forge a license to use your code contributed to the primary codebase (everything **not** under patches) in Forge, under the MinecraftForge license.
+- You grant assign copyright ownership of your contributions to the patches codebase (everything under patches) to Forge, where it will be licensed under the MinecraftForge license.
+
+"Forge" is Forge Development LLC, a legally incorporated entity in Oregon, USA.

EnergySystems.md

@@ -0,0 +1,9 @@
+# On the Contribution of an RF-lite Energy System: "Energy"
+Forge has acquired an Energy system, after many years of debate on the topic. The prevalence of the RF API has warranted the inclusion of a similar (but simpler) implementation to forge for 1.10.2 and onwards.
+Those who wish to use an RF like API, feel free to use it. If you don't want to think about Energy, but know you need it, you can use it *if you wish*. If you want to interoperate with other energy systems, feel free to use this to broker with them.
+
+# On Diversity in Energy Systems
+Forge has always supported diversity in energy-like systems. If you have a burning desire to simulate electricity flow in all it's glory, we fully support you and look forward to playing your mod. If you wish to have pneumatic power, we have no objections, and would love to see your wonderful creations. If you have a power system of your own devising that is simply beyond our imagination, please, blow us away.
+
+# On Modder Obligations
+As a modder, you are under *no* obligation to use or support the forge Energy system. If anyone, user, mod-pack maker or even us, tells you otherwise, refer them to this statement. The Forge energy system is not intended to supplant diversity in energy systems. It is not intended to be one-size-fits-all. The choice to support it, is the choice of the modder.

README.md

@@ -0,0 +1,63 @@
+# How to install Forge: For Players
+
+Go to [http://files.minecraftforge.net](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
+ 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!
+
+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.
+
+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. 
+ 
+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)
+
+## 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.
+
+### 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
+ associated with your github account to do this. If you have previously
+ signed it, you should be OK.

README.txt

@@ -1,36 +0,0 @@
-*** HOW TO INSTALL ***
-For Mod Users:
-
-Download the latest installer from http://files.minecraftforge.net and follow instructions given by the installer.
-
-
-For Mod Devs:
-
-Download the latest Forge source distribution from http://files.minecraftforge.net and unzip it to a folder.
-Open a command prompt, navigate to the directory where you unzipped the Forge sources, and run:
-If you have Gradle: gradle setupDevWorkspace
-If you DO NOT have Gradle installed:
-Windows: ./gradlew.bat setupDevWorkspace
-MacOS/Linux: ./gradlew setupDevWorkspace
-
-If you wish to use the Eclipse IDE, run gradle eclipse instead of gradle setupDevWorkspace, or install the Gradle plugin for Eclipse and import the Forge source folder as a Gradle project.
-
-To get the decompiled classes:
-If you have Gradle: gradle setupDecompWorkspace
-If you DO NOT have Gradle installed:
-Windows: ./gradlew.bat setupDecompWorkspace
-MacOS/Linux: ./gradlew setupDecompWorkspace
-
-For Contributors: (Note: This assumes you have Gradle installed. If you don't, use ./gradlew(.bat) instead of gradle.
-
-Clone this repository to a folder. 
-Open a command prompt and navigate to the folder where you cloned this repo.
-Run gradle setupForge to setup your development environment.
-
-To use Eclipse, point your Eclipse workspace at the eclipse folder inside the repo.
-
-
-Requirements (for both mod devs and contributors):
-  You must have a JDK installed and accessible.
-  If you do not wish to use the gradle wrapper, you can install Gradle from http://www.gradle.org/ .
- 

build.gradle

@@ -21,18 +21,20 @@ repositories {
             url = "file:///home/cpw/projects/repo"
         }
 }
+
 apply plugin: "maven"
 apply plugin: "net.minecraftforge.gradle.patcher"
 apply plugin: "net.minecraftforge.gradle.launch4j"
 
+minecraft.version = "1.10.2"
+
 minecraft {
-    version = "1.9.4"
-    mappings = 'snapshot_nodoc_20160518'
+    mappings = 'snapshot_nodoc_20161111'
     workspaceDir = "projects"
-    versionJson = "jsons/1.9.4-dev.json"
+    versionJson = "jsons/${minecraft.version}-dev.json"
     buildUserdev = true
     buildInstaller = true
-    installerVersion = "1.4"
+    installerVersion = "1.5"
 
     def common = {
         patchPrefixOriginal "../src-base/minecraft"
@@ -66,7 +68,7 @@ extractForgeResources { exclude "**/log4j2.xml" }
 genGradleProjects { addTestCompileDep "junit:junit:4.12" }
 
 processJson {
-    releaseJson = "jsons/1.9.4-rel.json"
+    releaseJson = "jsons/${minecraft.version}-rel.json"
     addReplacements([
         "@minecraft_version@": project.minecraft.version,
         "@version@": project.version,
@@ -82,8 +84,6 @@ task changelog(type: JenkinsChangelog) {
     // skip if there is no forge jenkins pass
     onlyIf {
         project.hasProperty('forgeJenkinsPass')
-        // Not sure what abrar was trying to do here...
-        //project.file("build/distributions/${project.name}-${project.version}-changelog.txt").text = ""
     }
 
     outputs.upToDateWhen { false } // never up to date
@@ -106,14 +106,14 @@ task crowdin(type: CrowdinDownload) {
 }
 
 def extraTxts = [
-    changelog, // yeah we can do thi, because gradle and groovy are awesome
-    "LICENSE-fml.txt",
     "CREDITS-fml.txt",
+    "LICENSE-new.txt",
     "MinecraftForge-Credits.txt",
-    "MinecraftForge-License.txt",
     "Paulscode SoundSystem CodecIBXM License.txt",
     "Paulscode IBXM Library License.txt"
 ]
+if (project.hasProperty('forgeJenkinsPass'))
+    extraTxts += changelog
 
 outputJar {
     classifier = 'universal'
@@ -134,6 +134,7 @@ installer {
     classifier = 'installer'
     from extraTxts
     from "src/main/resources/forge_logo.png"
+    from "src/main/resources/url.png"
     rename "forge_logo\\.png", "big_logo.png"
 }
 
@@ -176,7 +177,8 @@ task makeMdk(type: Zip) {
     into ('eclipse') {
         from 'mdk/eclipse'
     }
-    from changelog.output
+    if (project.hasProperty('forgeJenkinsPass'))
+        from changelog.output
     from ('mdk') {
         filter(ReplaceTokens, tokens: [
         VERSION: project.version,
@@ -185,11 +187,10 @@ task makeMdk(type: Zip) {
         exclude 'eclipse'
         rename 'gitignore\\.txt', '.gitignore'
         from 'MinecraftForge-Credits.txt'
-        from 'MinecraftForge-License.txt'
+        from 'LICENSE-new.txt'
         from 'Paulscode IBXM Library License.txt'
         from 'Paulscode SoundSystem CodecIBXM License.txt'
         from 'CREDITS-fml.txt'
-        from 'LICENSE-fml.txt'
     }
 }
 tasks.build.dependsOn makeMdk
@@ -211,7 +212,8 @@ tasks.build.dependsOn 'launch4j'
 // MAVEN
 
 artifacts {
-    archives changelog.output
+    if (project.hasProperty('forgeJenkinsPass'))
+        archives changelog.output
     archives file("build/distributions/${project.name}-${project.version}-installer-win.exe")
     archives makeMdk
 }
@@ -220,11 +222,13 @@ task ciWriteBuildNumber << {
     def file = file("src/main/java/net/minecraftforge/common/ForgeVersion.java");
     def bn = System.getenv("BUILD_NUMBER")?:project.ext.properties.buildNumber?:0;
     def outfile = "";
-    def ln = System.getProperty('line.separator')
+    def ln = "\n"; //Linux line endings because we're on git!
 
     file.eachLine{ String s ->
         if (s.matches("^    public static final int buildVersion    = [\\d]+;\$"))
             s = "    public static final int buildVersion    = ${bn};";
+        if (s.matches('^    public static final String mcVersion = "[^\\"]+";'))
+            s = "    public static final String mcVersion = \"${minecraft.version}\";";
         outfile += (s+ln);
     }
     file.write(outfile);
@@ -350,7 +354,7 @@ String getVersionFromJava(File file)
     String branch = null;
     if (!System.getenv().containsKey("GIT_BRANCH"))
     {
-        // TODO: use grgit
+        // TODO: use grgit - Tried to switch 07/07/16 - jgit broken on windows?
         branch = "git rev-parse --abbrev-ref HEAD".execute().text.trim()
     }
     else
@@ -361,8 +365,11 @@ String getVersionFromJava(File file)
 
     def out = "${minecraft.version.replace('-', '_')}-$major.$minor.$revision.$build"
 
-    if (branch && branch != 'master' && branch != 'HEAD')
-        out += "-$branch"
+    if (branch && branch != 'master' && branch != 'HEAD' && branch != minecraft.version && branch != minecraft.version + '.0')
+    {
+        if (!(branch.endsWith('.x') && minecraft.version.startsWith(branch.substring(0, branch.length() -1))))
+            out += "-$branch"
+    }
 
     return out;
 }
@@ -373,7 +380,7 @@ task resetBuildNumber << {
 }
 // re-add old tasks for jenkins compat
 // should be remvoed, and the jenkisn fixed when no longer building with FG 1.2
-task setupForge { dependsOn 'setup' }
+task setupForge { dependsOn 'setup', 'ciWriteBuildNumber' }
 task buildPackages { dependsOn 'build' }
 
 //Temporary hack to fix compile errors caused by mappings shading in Bootstrap

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip

jsons/1.10-dev.json

@@ -0,0 +1,92 @@
+{
+  "id": "@minecraft_version@-@project@@version@",
+  "time": "@timestamp@",
+  "releaseTime": "1960-01-01T00:00:00-0700",
+  "type": "release",
+  "inheritsFrom": "1.10",
+  "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.0.3",
+      "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.10-rel.json

@@ -0,0 +1,139 @@
+{
+"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"
+},
+"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.10",
+  "jar": "1.10",
+  "libraries": [
+    {
+      "name": "@artifact@",
+      "url": "http://files.minecraftforge.net/maven/"
+    },
+    {
+      "name": "net.minecraft:launchwrapper:1.12",
+      "serverreq":true
+    },
+    {
+      "name": "org.ow2.asm:asm-all:5.0.3",
+      "serverreq":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:4.6",
+      "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.10.2-dev.json

@@ -0,0 +1,92 @@
+{
+  "id": "@minecraft_version@-@project@@version@",
+  "time": "@timestamp@",
+  "releaseTime": "1960-01-01T00:00:00-0700",
+  "type": "release",
+  "inheritsFrom": "1.10.2",
+  "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.0.3",
+      "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.10.2-rel.json

@@ -0,0 +1,153 @@
+{
+"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.10.2",
+  "jar": "1.10.2",
+  "libraries": [
+    {
+      "name": "@artifact@",
+      "url": "http://files.minecraftforge.net/maven/"
+    },
+    {
+      "name": "net.minecraft:launchwrapper:1.12",
+      "serverreq":true
+    },
+    {
+      "name": "org.ow2.asm:asm-all:5.0.3",
+      "serverreq":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:4.6",
+      "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.10.2",
+        "maven": "http://files.minecraftforge.net/maven/"
+    }
+]
+}

jsons/1.10.2.json

@@ -0,0 +1,563 @@
+{
+    "assetIndex": {
+        "id": "1.10",
+        "sha1": "72241db3c0bdc39e39b202182ff0000da5271a1d",
+        "size": 145874,
+        "url": "https://launchermeta.mojang.com/mc/assets/1.10/72241db3c0bdc39e39b202182ff0000da5271a1d/1.10.json",
+        "totalSize": 122198775
+    },
+    "assets": "1.10",
+    "downloads": {
+        "client": {
+            "sha1": "dc8e75ac7274ff6af462b0dcec43c307de668e40",
+            "size": 8857653,
+            "url": "https://launcher.mojang.com/mc/game/1.10.2/client/dc8e75ac7274ff6af462b0dcec43c307de668e40/client.jar"
+        },
+        "server": {
+            "sha1": "3d501b23df53c548254f5e3f66492d178a48db63",
+            "size": 9459897,
+            "url": "https://launcher.mojang.com/mc/game/1.10.2/server/3d501b23df53c548254f5e3f66492d178a48db63/server.jar"
+        }
+    },
+    "id": "1.10.2",
+    "libraries": [
+        {
+            "name": "com.mojang:netty:1.6",
+            "downloads": {
+                "artifact": {
+                    "size": 7877,
+                    "sha1": "4b75825a06139752bd800d9e29c5fd55b8b1b1e4",
+                    "path": "com/mojang/netty/1.6/netty-1.6.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/netty/1.6/netty-1.6.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:3.4.0",
+            "downloads": {
+                "artifact": {
+                    "size": 1008730,
+                    "sha1": "803ff252fedbd395baffd43b37341dc4a150a554",
+                    "path": "net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar",
+                    "url": "https://libraries.minecraft.net/net/java/dev/jna/jna/3.4.0/jna-3.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:4.6",
+            "downloads": {
+                "artifact": {
+                    "size": 62477,
+                    "sha1": "306816fb57cf94f108a43c95731b08934dcae15c",
+                    "path": "net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar",
+                    "url": "https://libraries.minecraft.net/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.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.0.23.Final",
+            "downloads": {
+                "artifact": {
+                    "size": 1779991,
+                    "sha1": "0294104aaf1781d6a56a07d561e792c5d0c95f45",
+                    "path": "io/netty/netty-all/4.0.23.Final/netty-all-4.0.23.Final.jar",
+                    "url": "https://libraries.minecraft.net/io/netty/netty-all/4.0.23.Final/netty-all-4.0.23.Final.jar"
+                }
+            }
+        },
+        {
+            "name": "com.google.guava:guava:17.0",
+            "downloads": {
+                "artifact": {
+                    "size": 2243036,
+                    "sha1": "9c6ef172e8de35fd8d4d8783e4821e57cdef7445",
+                    "path": "com/google/guava/guava/17.0/guava-17.0.jar",
+                    "url": "https://libraries.minecraft.net/com/google/guava/guava/17.0/guava-17.0.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.commons:commons-lang3:3.3.2",
+            "downloads": {
+                "artifact": {
+                    "size": 412739,
+                    "sha1": "90a3822c38ec8c996e84c16a3477ef632cbc87a3",
+                    "path": "org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-io:commons-io:2.4",
+            "downloads": {
+                "artifact": {
+                    "size": 185140,
+                    "sha1": "b1b6ea3b7e4aa4f492509a4952029cd8e48019ad",
+                    "path": "commons-io/commons-io/2.4/commons-io-2.4.jar",
+                    "url": "https://libraries.minecraft.net/commons-io/commons-io/2.4/commons-io-2.4.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-codec:commons-codec:1.9",
+            "downloads": {
+                "artifact": {
+                    "size": 263965,
+                    "sha1": "9ce04e34240f674bc72680f8b843b1457383161a",
+                    "path": "commons-codec/commons-codec/1.9/commons-codec-1.9.jar",
+                    "url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.9/commons-codec-1.9.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.2.4",
+            "downloads": {
+                "artifact": {
+                    "size": 190432,
+                    "sha1": "a60a5e993c98c864010053cb901b7eab25306568",
+                    "path": "com/google/code/gson/gson/2.2.4/gson-2.2.4.jar",
+                    "url": "https://libraries.minecraft.net/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar"
+                }
+            }
+        },
+        {
+            "name": "com.mojang:authlib:1.5.22",
+            "downloads": {
+                "artifact": {
+                    "size": 64539,
+                    "sha1": "afaa8f6df976fcb5520e76ef1d5798c9e6b5c0b2",
+                    "path": "com/mojang/authlib/1.5.22/authlib-1.5.22.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/authlib/1.5.22/authlib-1.5.22.jar"
+                }
+            }
+        },
+        {
+            "name": "com.mojang:realms:1.9.8",
+            "downloads": {
+                "artifact": {
+                    "size": 1577897,
+                    "sha1": "c9609760e050cd7c369292252552c0cc81c54331",
+                    "path": "com/mojang/realms/1.9.8/realms-1.9.8.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/realms/1.9.8/realms-1.9.8.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.0.12_mojang",
+            "downloads": {
+                "artifact": {
+                    "size": 522306,
+                    "sha1": "ba787e741efdc425fc5d2ea654b57c15fba27efa",
+                    "path": "it/unimi/dsi/fastutil/7.0.12_mojang/fastutil-7.0.12_mojang.jar",
+                    "url": "https://libraries.minecraft.net/it/unimi/dsi/fastutil/7.0.12_mojang/fastutil-7.0.12_mojang.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.logging.log4j:log4j-api:2.0-beta9",
+            "downloads": {
+                "artifact": {
+                    "size": 108161,
+                    "sha1": "1dd66e68cccd907880229f9e2de1314bd13ff785",
+                    "path": "org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.logging.log4j:log4j-core:2.0-beta9",
+            "downloads": {
+                "artifact": {
+                    "size": 681134,
+                    "sha1": "678861ba1b2e1fccb594bb0ca03114bb05da9695",
+                    "path": "org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.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"
+                    }
+                }
+            }
+        }
+    ],
+    "logging": {
+        "client": {
+            "file": {
+                "id": "client-1.7.xml",
+                "sha1": "49e2e41bc339698bd8199e0da9398c926e68c95d",
+                "size": 467,
+                "url": "https://launchermeta.mojang.com/mc/log_configs/client-1.7.xml/49e2e41bc339698bd8199e0da9398c926e68c95d/client-1.7.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": "2016-06-23T09:17:32+00:00",
+    "time": "2016-10-22T20:28:03+00:00",
+    "type": "release"
+}

jsons/1.10.json

@@ -0,0 +1,563 @@
+{
+    "assetIndex": {
+        "id": "1.10",
+        "sha1": "d3bfc4ffba1ea334c725dd91eaf4ecd402d641f7",
+        "size": 145627,
+        "url": "https://launchermeta.mojang.com/mc/assets/1.10/d3bfc4ffba1ea334c725dd91eaf4ecd402d641f7/1.10.json",
+        "totalSize": 121931230
+    },
+    "assets": "1.10",
+    "downloads": {
+        "client": {
+            "sha1": "ba038efbc6d9e4a046927a7658413d0276895739",
+            "size": 8856992,
+            "url": "https://launcher.mojang.com/mc/game/1.10/client/ba038efbc6d9e4a046927a7658413d0276895739/client.jar"
+        },
+        "server": {
+            "sha1": "a96617ffdf5dabbb718ab11a9a68e50545fc5bee",
+            "size": 9459395,
+            "url": "https://launcher.mojang.com/mc/game/1.10/server/a96617ffdf5dabbb718ab11a9a68e50545fc5bee/server.jar"
+        }
+    },
+    "id": "1.10",
+    "libraries": [
+        {
+            "name": "com.mojang:netty:1.6",
+            "downloads": {
+                "artifact": {
+                    "size": 7877,
+                    "sha1": "4b75825a06139752bd800d9e29c5fd55b8b1b1e4",
+                    "path": "com/mojang/netty/1.6/netty-1.6.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/netty/1.6/netty-1.6.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:3.4.0",
+            "downloads": {
+                "artifact": {
+                    "size": 1008730,
+                    "sha1": "803ff252fedbd395baffd43b37341dc4a150a554",
+                    "path": "net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar",
+                    "url": "https://libraries.minecraft.net/net/java/dev/jna/jna/3.4.0/jna-3.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:4.6",
+            "downloads": {
+                "artifact": {
+                    "size": 62477,
+                    "sha1": "306816fb57cf94f108a43c95731b08934dcae15c",
+                    "path": "net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar",
+                    "url": "https://libraries.minecraft.net/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.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.0.23.Final",
+            "downloads": {
+                "artifact": {
+                    "size": 1779991,
+                    "sha1": "0294104aaf1781d6a56a07d561e792c5d0c95f45",
+                    "path": "io/netty/netty-all/4.0.23.Final/netty-all-4.0.23.Final.jar",
+                    "url": "https://libraries.minecraft.net/io/netty/netty-all/4.0.23.Final/netty-all-4.0.23.Final.jar"
+                }
+            }
+        },
+        {
+            "name": "com.google.guava:guava:17.0",
+            "downloads": {
+                "artifact": {
+                    "size": 2243036,
+                    "sha1": "9c6ef172e8de35fd8d4d8783e4821e57cdef7445",
+                    "path": "com/google/guava/guava/17.0/guava-17.0.jar",
+                    "url": "https://libraries.minecraft.net/com/google/guava/guava/17.0/guava-17.0.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.commons:commons-lang3:3.3.2",
+            "downloads": {
+                "artifact": {
+                    "size": 412739,
+                    "sha1": "90a3822c38ec8c996e84c16a3477ef632cbc87a3",
+                    "path": "org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-io:commons-io:2.4",
+            "downloads": {
+                "artifact": {
+                    "size": 185140,
+                    "sha1": "b1b6ea3b7e4aa4f492509a4952029cd8e48019ad",
+                    "path": "commons-io/commons-io/2.4/commons-io-2.4.jar",
+                    "url": "https://libraries.minecraft.net/commons-io/commons-io/2.4/commons-io-2.4.jar"
+                }
+            }
+        },
+        {
+            "name": "commons-codec:commons-codec:1.9",
+            "downloads": {
+                "artifact": {
+                    "size": 263965,
+                    "sha1": "9ce04e34240f674bc72680f8b843b1457383161a",
+                    "path": "commons-codec/commons-codec/1.9/commons-codec-1.9.jar",
+                    "url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.9/commons-codec-1.9.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.2.4",
+            "downloads": {
+                "artifact": {
+                    "size": 190432,
+                    "sha1": "a60a5e993c98c864010053cb901b7eab25306568",
+                    "path": "com/google/code/gson/gson/2.2.4/gson-2.2.4.jar",
+                    "url": "https://libraries.minecraft.net/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar"
+                }
+            }
+        },
+        {
+            "name": "com.mojang:authlib:1.5.22",
+            "downloads": {
+                "artifact": {
+                    "size": 64539,
+                    "sha1": "afaa8f6df976fcb5520e76ef1d5798c9e6b5c0b2",
+                    "path": "com/mojang/authlib/1.5.22/authlib-1.5.22.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/authlib/1.5.22/authlib-1.5.22.jar"
+                }
+            }
+        },
+        {
+            "name": "com.mojang:realms:1.9.1",
+            "downloads": {
+                "artifact": {
+                    "size": 1575796,
+                    "sha1": "cd3929316dfd85be640e1c1f15df5577cdcd860b",
+                    "path": "com/mojang/realms/1.9.1/realms-1.9.1.jar",
+                    "url": "https://libraries.minecraft.net/com/mojang/realms/1.9.1/realms-1.9.1.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.0.12_mojang",
+            "downloads": {
+                "artifact": {
+                    "size": 522306,
+                    "sha1": "ba787e741efdc425fc5d2ea654b57c15fba27efa",
+                    "path": "it/unimi/dsi/fastutil/7.0.12_mojang/fastutil-7.0.12_mojang.jar",
+                    "url": "https://libraries.minecraft.net/it/unimi/dsi/fastutil/7.0.12_mojang/fastutil-7.0.12_mojang.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.logging.log4j:log4j-api:2.0-beta9",
+            "downloads": {
+                "artifact": {
+                    "size": 108161,
+                    "sha1": "1dd66e68cccd907880229f9e2de1314bd13ff785",
+                    "path": "org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar"
+                }
+            }
+        },
+        {
+            "name": "org.apache.logging.log4j:log4j-core:2.0-beta9",
+            "downloads": {
+                "artifact": {
+                    "size": 681134,
+                    "sha1": "678861ba1b2e1fccb594bb0ca03114bb05da9695",
+                    "path": "org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar",
+                    "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.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"
+                    }
+                }
+            }
+        }
+    ],
+    "logging": {
+        "client": {
+            "file": {
+                "id": "client-1.7.xml",
+                "sha1": "49e2e41bc339698bd8199e0da9398c926e68c95d",
+                "size": 467,
+                "url": "https://launchermeta.mojang.com/mc/log_configs/client-1.7.xml/49e2e41bc339698bd8199e0da9398c926e68c95d/client-1.7.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": "2016-06-08T13:06:18+00:00",
+    "time": "2016-06-20T15:31:06+00:00",
+    "type": "release"
+}

mdk/build.gradle

@@ -1,29 +1,25 @@
-
-// For those who want the bleeding edge
 buildscript {
     repositories {
         jcenter()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
+        maven { url = "http://files.minecraftforge.net/maven" }
     }
     dependencies {
         classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
     }
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
+//Only edit below this line, the above code adds and enables the nessasary things for Forge to be setup.
+
 
-/*
-// for people who want stable - not yet functional for MC 1.8.8 - we require the forgegradle 2.1 snapshot
-plugins {
-    id "net.minecraftforge.gradle.forge" version "2.0.2"
-}
-*/
 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"
+}
+
 minecraft {
     version = "@VERSION@"
     runDir = "run"

mdk/gradle.properties

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

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

@@ -26,7 +26,7 @@
      }
  
      public static IBlockState func_176220_d(int p_176220_0_)
-@@ -286,7 +288,7 @@
+@@ -292,7 +294,7 @@
  
      public boolean func_176200_f(IBlockAccess p_176200_1_, BlockPos p_176200_2_)
      {
@@ -35,7 +35,7 @@
      }
  
      public Block func_149711_c(float p_149711_1_)
-@@ -324,9 +326,10 @@
+@@ -330,9 +332,10 @@
          return this.field_149789_z;
      }
  
@@ -47,7 +47,7 @@
      }
  
      @Deprecated
-@@ -370,13 +373,13 @@
+@@ -376,13 +379,13 @@
      @SideOnly(Side.CLIENT)
      public int func_185484_c(IBlockState p_185484_1_, IBlockAccess p_185484_2_, BlockPos p_185484_3_)
      {
@@ -63,7 +63,7 @@
          }
          else
          {
-@@ -440,7 +443,7 @@
+@@ -446,7 +449,7 @@
                  }
          }
  
@@ -72,7 +72,7 @@
      }
  
      @Deprecated
-@@ -500,6 +503,10 @@
+@@ -506,6 +509,10 @@
  
      public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
      {
@@ -83,7 +83,7 @@
      }
  
      public int func_149745_a(Random p_149745_1_)
-@@ -516,8 +523,7 @@
+@@ -522,8 +529,7 @@
      @Deprecated
      public float func_180647_a(IBlockState p_180647_1_, EntityPlayer p_180647_2_, World p_180647_3_, BlockPos p_180647_4_)
      {
@@ -93,7 +93,7 @@
      }
  
      public final void func_176226_b(World p_176226_1_, BlockPos p_176226_2_, IBlockState p_176226_3_, int p_176226_4_)
-@@ -527,20 +533,16 @@
+@@ -533,20 +539,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_)
      {
@@ -119,7 +119,7 @@
                  }
              }
          }
-@@ -548,8 +550,13 @@
+@@ -554,8 +556,13 @@
  
      public static void func_180635_a(World p_180635_0_, BlockPos p_180635_1_, ItemStack p_180635_2_)
      {
@@ -132,9 +132,9 @@
 +                return;
 +            }
              float f = 0.5F;
-             double d0 = (double)(p_180635_0_.field_73012_v.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
-             double d1 = (double)(p_180635_0_.field_73012_v.nextFloat() * f) + (double)(1.0F - f) * 0.5D;
-@@ -621,7 +628,7 @@
+             double d0 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D;
+             double d1 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D;
+@@ -627,7 +634,7 @@
  
      public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
      {
@@ -143,7 +143,16 @@
      }
  
      public boolean func_180639_a(World p_180639_1_, BlockPos p_180639_2_, IBlockState p_180639_3_, EntityPlayer p_180639_4_, EnumHand p_180639_5_, @Nullable ItemStack p_180639_6_, EnumFacing p_180639_7_, float p_180639_8_, float p_180639_9_, float p_180639_10_)
-@@ -674,25 +681,35 @@
+@@ -639,6 +646,8 @@
+     {
+     }
+ 
++    // Forge: use getStateForPlacement
++    @Deprecated
+     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_)
+     {
+         return this.func_176203_a(p_180642_7_);
+@@ -680,25 +689,35 @@
          p_180657_2_.func_71029_a(StatList.func_188055_a(this));
          p_180657_2_.func_71020_j(0.025F);
  
@@ -182,7 +191,7 @@
      }
  
      @Nullable
-@@ -788,9 +805,11 @@
+@@ -794,9 +813,11 @@
      }
  
      @Nullable
@@ -195,7 +204,15 @@
      }
  
      @SideOnly(Side.CLIENT)
-@@ -887,6 +906,1141 @@
+@@ -883,6 +904,7 @@
+         return Block.EnumOffsetType.NONE;
+     }
+ 
++    @Deprecated // Forge - World/state/pos/entity sensitive version below
+     public SoundType func_185467_w()
+     {
+         return this.field_149762_H;
+@@ -893,6 +915,1187 @@
          return "Block{" + field_149771_c.func_177774_c(this) + "}";
      }
  
@@ -612,7 +629,7 @@
 +        {
 +            IBlockState state = world.func_180495_p(pos);
 +            state = state.func_177230_c().func_176221_a(state, world, pos);
-+            state = state.func_177226_a(BlockBed.field_176471_b, true);
++            state = state.func_177226_a(BlockBed.field_176471_b, occupied);
 +            ((World)world).func_180501_a(pos, state, 4);
 +        }
 +    }
@@ -687,7 +704,7 @@
 +     */
 +    public boolean canBeReplacedByLeaves(IBlockState state, IBlockAccess world, BlockPos pos)
 +    {
-+        return !state.func_185913_b();
++        return isAir(state, world, pos) || isLeaves(state, world, pos); //!state.isFullBlock();
 +    }
 +
 +    /**
@@ -891,9 +908,9 @@
 +        IBlockState plant = plantable.getPlant(world, pos.func_177972_a(direction));
 +        net.minecraftforge.common.EnumPlantType plantType = plantable.getPlantType(world, pos.func_177972_a(direction));
 +
-+        if (plant.func_177230_c() == net.minecraft.init.Blocks.field_150434_aF && this == net.minecraft.init.Blocks.field_150434_aF)
++        if (plant.func_177230_c() == net.minecraft.init.Blocks.field_150434_aF)
 +        {
-+            return true;
++            return this == net.minecraft.init.Blocks.field_150434_aF || this == net.minecraft.init.Blocks.field_150354_m;
 +        }
 +
 +        if (plant.func_177230_c() == net.minecraft.init.Blocks.field_150436_aH && this == net.minecraft.init.Blocks.field_150436_aH)
@@ -908,7 +925,7 @@
 +
 +        switch (plantType)
 +        {
-+            case Desert: return this == net.minecraft.init.Blocks.field_150354_m || this == net.minecraft.init.Blocks.field_150405_ch || this == net.minecraft.init.Blocks.field_150406_ce || this == net.minecraft.init.Blocks.field_150346_d;
++            case Desert: return this == net.minecraft.init.Blocks.field_150354_m || this == net.minecraft.init.Blocks.field_150405_ch || this == net.minecraft.init.Blocks.field_150406_ce;
 +            case Nether: return this == net.minecraft.init.Blocks.field_150425_aM;
 +            case Crop:   return this == net.minecraft.init.Blocks.field_150458_ak;
 +            case Cave:   return state.isSideSolid(world, pos, EnumFacing.UP);
@@ -1009,7 +1026,8 @@
 +                   this != net.minecraft.init.Blocks.field_150411_aY &&
 +                   this != net.minecraft.init.Blocks.field_185775_db;
 +        }
-+        else if (entity instanceof net.minecraft.entity.boss.EntityWither)
++        else if ((entity instanceof net.minecraft.entity.boss.EntityWither) ||
++                 (entity instanceof net.minecraft.entity.projectile.EntityWitherSkull))
 +        {
 +            return net.minecraft.entity.boss.EntityWither.func_181033_a(this);
 +        }
@@ -1332,8 +1350,66 @@
 +    public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
 +    {
 +    }
++
++    /**
++     * Sensitive version of getSoundType
++     * @param state The state
++     * @param world The world
++     * @param pos The position. Note that the world may not necessarily have {@code state} here!
++     * @param entity The entity that is breaking/stepping on/placing/hitting/falling on this block, or null if no entity is in this context
++     * @return A SoundType to use
++     */
++    public SoundType getSoundType(IBlockState state, World world, BlockPos pos, @Nullable Entity entity)
++    {
++        return func_185467_w();
++    }
++
++    /**
++     * @param state The state
++     * @param world The world
++     * @param pos The position of this state
++     * @param beaconPos The position of the beacon
++     * @return A float RGB [0.0, 1.0] array to be averaged with a beacon's existing beam color, or null to do nothing to the beam
++     */
++    @Nullable
++    public float[] getBeaconColorMultiplier(IBlockState state, World world, BlockPos pos, BlockPos beaconPos)
++    {
++        return null;
++    }
++
++    /**
++     * Gets the {@link IBlockState} to place
++     * @param world The world the block is being placed in
++     * @param pos The position the block is being placed at
++     * @param facing The side the block is being placed on
++     * @param hitX The X coordinate of the hit vector
++     * @param hitY The Y coordinate of the hit vector
++     * @param hitZ The Z coordinate of the hit vector
++     * @param meta The metadata of {@link ItemStack} as processed by {@link Item#getMetadata(int)}
++     * @param placer The entity placing the block
++     * @param stack The stack being used to place this block
++     * @return The state to be placed in the world
++     */
++    public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, ItemStack stack)
++    {
++        return func_180642_a(world, pos, facing, hitX, hitY, hitZ, meta, placer);
++    }
++
 +    /* ========================================= FORGE END ======================================*/
 +
      public static void func_149671_p()
      {
          func_176215_a(0, field_176230_a, (new BlockAir()).func_149663_c("air"));
+@@ -1169,11 +2372,7 @@
+             }
+             else
+             {
+-                for (IBlockState iblockstate : block16.func_176194_O().func_177619_a())
+-                {
+-                    int k = field_149771_c.func_148757_b(block16) << 4 | block16.func_176201_c(iblockstate);
+-                    field_176229_d.func_148746_a(iblockstate, k);
+-                }
++//                Handled in GameData.BlockCallbacks - leaving tripwire as it seems to be special cased
+             }
+         }
+     }

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

@@ -9,18 +9,36 @@
  {
      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);
-@@ -110,8 +110,8 @@
+@@ -49,6 +49,8 @@
+             {
+                 int j = ((Integer)p_180650_3_.func_177229_b(field_176587_a)).intValue();
+ 
++                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());
+@@ -60,6 +62,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_));
++                }
+             }
+         }
+     }
+@@ -110,8 +114,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_, EnumFacing.UP, this) && !p_176586_1_.func_180495_p(p_176586_2_.func_177984_a()).func_185904_a().func_76224_d();
++        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();
      }
  
      public void func_180634_a(World p_180634_1_, BlockPos p_180634_2_, IBlockState p_180634_3_, Entity p_180634_4_)
-@@ -135,6 +135,18 @@
+@@ -135,6 +139,18 @@
          return ((Integer)p_176201_1_.func_177229_b(field_176587_a)).intValue();
      }
  

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

@@ -0,0 +1,19 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockChorusFlower.java
++++ ../src-work/minecraft/net/minecraft/block/BlockChorusFlower.java
+@@ -52,7 +52,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;
+@@ -141,6 +141,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_));
+                 }
+             }
+         }

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

@@ -1,6 +1,23 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockCocoa.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockCocoa.java
-@@ -131,7 +131,14 @@
+@@ -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();
+ 
+-            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_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
      {
@@ -16,7 +33,7 @@
          int j = 1;
  
          if (i >= 2)
-@@ -141,8 +148,9 @@
+@@ -141,8 +149,9 @@
  
          for (int k = 0; k < j; ++k)
          {

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

@@ -1,6 +1,18 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockCrops.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockCrops.java
-@@ -117,11 +117,11 @@
+@@ -79,9 +79,10 @@
+             {
+                 float f = func_180672_a(this, p_180650_1_, p_180650_2_);
+ 
+-                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_));
+                 }
+             }
+         }
+@@ -117,11 +118,11 @@
                  float f1 = 0.0F;
                  IBlockState iblockstate = p_180672_1_.func_180495_p(blockpos.func_177982_a(i, 0, j));
  
@@ -14,7 +26,7 @@
                      {
                          f1 = 3.0F;
                      }
-@@ -162,7 +162,8 @@
+@@ -162,7 +163,8 @@
  
      public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
      {
@@ -24,7 +36,7 @@
      }
  
      protected Item func_149866_i()
-@@ -175,11 +176,33 @@
+@@ -175,11 +177,33 @@
          return Items.field_151015_O;
      }
  

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

@@ -9,6 +9,15 @@
          }
          else
          {
+@@ -176,7 +176,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;
 @@ -221,7 +221,7 @@
  
      public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)

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

@@ -45,7 +45,7 @@
          {
              super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
          }
-@@ -214,8 +211,6 @@
+@@ -211,8 +208,6 @@
          else
          {
              p_176489_4_.func_71029_a(StatList.func_188055_a(this));
@@ -54,7 +54,7 @@
              return true;
          }
      }
-@@ -286,6 +281,33 @@
+@@ -283,6 +278,33 @@
          return Block.EnumOffsetType.XZ;
      }
  

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

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

@@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockEnchantmentTable.java
++++ ../src-work/minecraft/net/minecraft/block/BlockEnchantmentTable.java
+@@ -64,7 +64,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)))
+                             {

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockFalling.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockFalling.java
-@@ -44,7 +44,7 @@
+@@ -47,7 +47,7 @@
  
      private void func_176503_e(World p_176503_1_, BlockPos p_176503_2_)
      {
@@ -9,7 +9,11 @@
          {
              int i = 32;
  
-@@ -62,7 +62,7 @@
+@@ -62,17 +62,18 @@
+             }
+             else
+             {
++                IBlockState state = p_176503_1_.func_180495_p(p_176503_2_);
                  p_176503_1_.func_175698_g(p_176503_2_);
                  BlockPos blockpos;
  
@@ -18,3 +22,11 @@
                  {
                      ;
                  }
+ 
+                 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,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockFarmland.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockFarmland.java
-@@ -89,7 +89,7 @@
+@@ -83,7 +83,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();

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

@@ -123,7 +123,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().getFlammability(p_176538_1_, p_176538_2_.func_177972_a(enumfacing), enumfacing.func_176734_d()), 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;

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockFlowerPot.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockFlowerPot.java
-@@ -149,13 +149,6 @@
+@@ -151,13 +151,6 @@
  
      public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
      {
@@ -14,7 +14,7 @@
          super.func_180663_b(p_180663_1_, p_180663_2_, p_180663_3_);
      }
  
-@@ -377,6 +370,31 @@
+@@ -379,6 +372,31 @@
          return BlockRenderLayer.CUTOUT;
      }
  

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

@@ -18,7 +18,7 @@
                          {
                              p_180650_1_.func_175656_a(blockpos, Blocks.field_150349_c.func_176223_P());
                          }
-@@ -98,7 +98,7 @@
+@@ -98,18 +98,11 @@
              {
                  if (j >= i / 16)
                  {
@@ -27,3 +27,15 @@
                      {
                          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/BlockLeaves.java.patch

@@ -31,7 +31,7 @@
 -                                    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 + l1) * k1 + (j2 + l1) * j1 + k2 + l1] = -2;
+                                         this.field_150128_a[(i2 + 16) * 1024 + (j2 + 16) * 32 + k2 + 16] = -2;
                                      }
 @@ -207,40 +207,7 @@
  

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockNetherWart.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockNetherWart.java
-@@ -43,7 +43,7 @@
+@@ -43,25 +43,28 @@
  
      public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
      {
@@ -9,7 +9,17 @@
      }
  
      public void func_180650_b(World p_180650_1_, BlockPos p_180650_2_, IBlockState p_180650_3_, Random p_180650_4_)
-@@ -59,9 +59,11 @@
+     {
+         int i = ((Integer)p_180650_3_.func_177229_b(field_176486_a)).intValue();
+ 
+-        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_);
      }
  
@@ -22,7 +32,7 @@
          {
              int i = 1;
  
-@@ -108,6 +110,26 @@
+@@ -108,6 +111,26 @@
          return ((Integer)p_176201_1_.func_177229_b(field_176486_a)).intValue();
      }
  

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

@@ -19,5 +19,5 @@
 +        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.BLOCKS, 3.0F, f);
+         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]);

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

@@ -13,7 +13,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_, p_180653_4_, p_180653_5_);
++        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
      }
  
      public RayTraceResult func_180636_a(IBlockState p_180636_1_, World p_180636_2_, BlockPos p_180636_3_, Vec3d p_180636_4_, Vec3d p_180636_5_)

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockPumpkin.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockPumpkin.java
-@@ -118,7 +118,7 @@
+@@ -124,7 +124,7 @@
  
      public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
      {

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockQuartz.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockQuartz.java
-@@ -113,6 +113,26 @@
+@@ -110,6 +110,26 @@
          return new BlockStateContainer(this, new IProperty[] {field_176335_a});
      }
  

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockRailBase.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockRailBase.java
-@@ -33,7 +33,7 @@
+@@ -32,7 +32,7 @@
      public static boolean func_176563_d(IBlockState p_176563_0_)
      {
          Block block = p_176563_0_.func_177230_c();
@@ -9,16 +9,16 @@
      }
  
      protected BlockRailBase(boolean p_i45389_1_)
-@@ -67,7 +67,7 @@
+@@ -66,7 +66,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_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_, EnumFacing.UP);
++        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_176213_c(World p_176213_1_, BlockPos p_176213_2_, IBlockState p_176213_3_)
-@@ -90,24 +90,24 @@
+@@ -89,24 +89,24 @@
              BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = (BlockRailBase.EnumRailDirection)p_189540_1_.func_177229_b(this.func_176560_l());
              boolean flag = false;
  
@@ -48,7 +48,7 @@
              {
                  flag = true;
              }
-@@ -162,6 +162,98 @@
+@@ -161,6 +161,98 @@
  
      public abstract IProperty<BlockRailBase.EnumRailDirection> func_176560_l();
  
@@ -147,7 +147,7 @@
      public static enum EnumRailDirection implements IStringSerializable
      {
          NORTH_SOUTH(0, "north_south"),
-@@ -232,6 +324,7 @@
+@@ -231,6 +323,7 @@
          private IBlockState field_180366_e;
          private final boolean field_150656_f;
          private final List<BlockPos> field_150657_g = Lists.<BlockPos>newArrayList();
@@ -155,7 +155,7 @@
  
          public Rail(World p_i45739_2_, BlockPos p_i45739_3_, IBlockState p_i45739_4_)
          {
-@@ -239,8 +332,9 @@
+@@ -238,8 +331,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();
@@ -167,7 +167,7 @@
              this.func_180360_a(blockrailbase$enumraildirection);
          }
  
-@@ -432,7 +526,7 @@
+@@ -431,7 +525,7 @@
                  }
              }
  
@@ -176,7 +176,7 @@
              {
                  if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a()))
                  {
-@@ -445,7 +539,7 @@
+@@ -444,7 +538,7 @@
                  }
              }
  
@@ -185,7 +185,7 @@
              {
                  if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos3.func_177984_a()))
                  {
-@@ -588,7 +682,7 @@
+@@ -587,7 +681,7 @@
                  }
              }
  
@@ -194,7 +194,7 @@
              {
                  if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a()))
                  {
-@@ -601,7 +695,7 @@
+@@ -600,7 +694,7 @@
                  }
              }
  

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

@@ -0,0 +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]);
+ 
+             if (!list.isEmpty())

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockRedstoneComparator.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneComparator.java
-@@ -313,6 +313,21 @@
+@@ -312,6 +312,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);
      }
  

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

@@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/block/BlockRedstoneTorch.java
++++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneTorch.java
+@@ -24,7 +24,7 @@
+ 
+ public class BlockRedstoneTorch extends BlockTorch
+ {
+-    private static final Map<World, List<BlockRedstoneTorch.Toggle>> field_150112_b = Maps.<World, List<BlockRedstoneTorch.Toggle>>newHashMap();
++    private static final Map<World, List<BlockRedstoneTorch.Toggle>> field_150112_b = new java.util.WeakHashMap<World, List<BlockRedstoneTorch.Toggle>>(); // FORGE - fix vanilla MC-101233
+     private final boolean field_150113_a;
+ 
+     private boolean func_176598_a(World p_176598_1_, BlockPos p_176598_2_, boolean p_176598_3_)

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

@@ -9,7 +9,25 @@
  {
      public static final PropertyInteger field_176355_a = PropertyInteger.func_177719_a("age", 0, 15);
      protected static final AxisAlignedBB field_185701_b = new AxisAlignedBB(0.125D, 0.0D, 0.125D, 0.875D, 1.0D, 0.875D);
-@@ -70,7 +70,9 @@
+@@ -54,6 +54,8 @@
+                 {
+                     int j = ((Integer)p_180650_3_.func_177229_b(field_176355_a)).intValue();
+ 
++                    if(net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, p_180650_2_, p_180650_3_, true))
++                    {
+                     if (j == 15)
+                     {
+                         p_180650_1_.func_175656_a(p_180650_2_.func_177984_a(), this.func_176223_P());
+@@ -63,6 +65,8 @@
+                     {
+                         p_180650_1_.func_180501_a(p_180650_2_, p_180650_3_.func_177226_a(field_176355_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_));
++                    }
+                 }
+             }
+         }
+@@ -70,7 +74,9 @@
  
      public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
      {
@@ -20,7 +38,7 @@
  
          if (block == this)
          {
-@@ -165,6 +167,17 @@
+@@ -165,6 +171,17 @@
          return ((Integer)p_176201_1_.func_177229_b(field_176355_a)).intValue();
      }
  

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockSkull.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockSkull.java
-@@ -117,10 +117,6 @@
+@@ -118,10 +118,6 @@
          return new ItemStack(Items.field_151144_bL, 1, i);
      }
  
@@ -11,7 +11,7 @@
      public void func_176208_a(World p_176208_1_, BlockPos p_176208_2_, IBlockState p_176208_3_, EntityPlayer p_176208_4_)
      {
          if (p_176208_4_.field_71075_bZ.field_75098_d)
-@@ -128,13 +124,18 @@
+@@ -129,13 +125,18 @@
              p_176208_3_ = p_176208_3_.func_177226_a(field_176417_b, Boolean.valueOf(true));
              p_176208_1_.func_180501_a(p_176208_2_, p_176208_3_, 4);
          }
@@ -31,7 +31,7 @@
          {
              if (!((Boolean)p_180663_3_.func_177229_b(field_176417_b)).booleanValue())
              {
-@@ -143,7 +144,7 @@
+@@ -144,7 +145,7 @@
                  if (tileentity instanceof TileEntitySkull)
                  {
                      TileEntitySkull tileentityskull = (TileEntitySkull)tileentity;
@@ -40,7 +40,7 @@
  
                      if (tileentityskull.func_145904_a() == 3 && tileentityskull.func_152108_a() != null)
                      {
-@@ -153,12 +154,11 @@
+@@ -154,12 +155,11 @@
                          itemstack.func_77978_p().func_74782_a("SkullOwner", nbttagcompound);
                      }
  

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

@@ -1,12 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockSlab.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockSlab.java
-@@ -50,6 +50,16 @@
+@@ -50,6 +50,19 @@
          return this.func_176552_j();
      }
  
 +    @Override
 +    public boolean doesSideBlockRendering(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing face)
 +    {
++        if (net.minecraftforge.common.ForgeModContainer.disableStairSlabCulling)
++            return super.doesSideBlockRendering(state, world, pos, face);
++
 +        if ( state.func_185914_p() )
 +            return true;
 +
@@ -17,7 +20,7 @@
      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_)
      {
          IBlockState iblockstate = super.func_180642_a(p_180642_1_, p_180642_2_, p_180642_3_, p_180642_4_, p_180642_5_, p_180642_6_, p_180642_7_, p_180642_8_).func_177226_a(field_176554_a, BlockSlab.EnumBlockHalf.BOTTOM);
-@@ -77,13 +87,14 @@
+@@ -77,13 +90,14 @@
          {
              return false;
          }

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

@@ -1,18 +1,30 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockStairs.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockStairs.java
-@@ -445,6 +445,17 @@
+@@ -445,6 +445,29 @@
          return new BlockStateContainer(this, new IProperty[] {field_176309_a, field_176308_b, field_176310_M});
      }
  
 +    @Override
 +    public boolean doesSideBlockRendering(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing face)
 +    {
++        if (net.minecraftforge.common.ForgeModContainer.disableStairSlabCulling)
++            return super.doesSideBlockRendering(state, world, pos, face);
++
 +        if ( state.func_185914_p() )
 +            return true;
 +
++        state = this.func_176221_a(state, world, pos);
++
 +        EnumHalf half = state.func_177229_b(field_176308_b);
 +        EnumFacing side = state.func_177229_b(field_176309_a);
-+        return side == face || (half == EnumHalf.TOP && face == EnumFacing.UP) || (half == EnumHalf.BOTTOM && face == EnumFacing.DOWN);
++        EnumShape shape = state.func_177229_b(field_176310_M);
++        if (face == EnumFacing.UP) return half == EnumHalf.TOP;
++        if (face == EnumFacing.DOWN) return half == EnumHalf.BOTTOM;
++        if (shape == EnumShape.OUTER_LEFT || shape == EnumShape.OUTER_RIGHT) return false;
++        if (face == side) return true;
++        if (shape == EnumShape.INNER_LEFT && face.func_176746_e() == side) return true;
++        if (shape == EnumShape.INNER_RIGHT && face.func_176735_f() == side) return true;
++        return false;
 +    }
 +
      public static enum EnumHalf implements IStringSerializable

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

@@ -1,6 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockStem.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockStem.java
-@@ -90,9 +90,10 @@
+@@ -70,7 +70,7 @@
+         {
+             float f = BlockCrops.func_180672_a(this, p_180650_1_, p_180650_2_);
+ 
+-            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))
+             {
+                 int i = ((Integer)p_180650_3_.func_177229_b(field_176484_a)).intValue();
+ 
+@@ -90,13 +90,15 @@
                      }
  
                      p_180650_2_ = p_180650_2_.func_177972_a(EnumFacing.Plane.HORIZONTAL.func_179518_a(p_180650_4_));
@@ -13,7 +22,12 @@
                      {
                          p_180650_1_.func_175656_a(p_180650_2_, this.field_149877_a.func_176223_P());
                      }
-@@ -110,24 +111,29 @@
+                 }
++                net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
+             }
+         }
+     }
+@@ -110,24 +112,29 @@
      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_);

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockTrapDoor.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockTrapDoor.java
-@@ -242,6 +242,18 @@
+@@ -240,6 +240,18 @@
          return new BlockStateContainer(this, new IProperty[] {field_176284_a, field_176283_b, field_176285_M});
      }
  

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

@@ -0,0 +1,18 @@
+--- ../src-base/minecraft/net/minecraft/block/SoundType.java
++++ ../src-work/minecraft/net/minecraft/block/SoundType.java
+@@ -48,7 +48,6 @@
+         return this.field_185861_n;
+     }
+ 
+-    @SideOnly(Side.CLIENT)
+     public SoundEvent func_185845_c()
+     {
+         return this.field_185862_o;
+@@ -64,7 +63,6 @@
+         return this.field_185864_q;
+     }
+ 
+-    @SideOnly(Side.CLIENT)
+     public SoundEvent func_185846_f()
+     {
+         return this.field_185865_r;

patches/minecraft/net/minecraft/block/state/BlockStateContainer.java.patch

@@ -35,7 +35,7 @@
              map2.put(map1, blockstatecontainer$stateimplementation);
              list1.add(blockstatecontainer$stateimplementation);
          }
-@@ -166,6 +176,13 @@
+@@ -165,6 +175,13 @@
                  this.field_177237_b = p_i45660_2_;
              }
  
@@ -49,7 +49,7 @@
              public Collection < IProperty<? >> func_177227_a()
              {
                  return Collections. < IProperty<? >> unmodifiableCollection(this.field_177237_b.keySet());
-@@ -441,5 +458,86 @@
+@@ -445,5 +462,86 @@
              {
                  this.field_177239_a.func_189540_a(this, p_189546_1_, p_189546_2_, p_189546_3_);
              }

patches/minecraft/net/minecraft/block/state/IBlockProperties.java.patch

@@ -1,8 +1,8 @@
 --- ../src-base/minecraft/net/minecraft/block/state/IBlockProperties.java
 +++ ../src-work/minecraft/net/minecraft/block/state/IBlockProperties.java
-@@ -26,9 +26,13 @@
+@@ -28,9 +28,13 @@
  
-     boolean func_185913_b();
+     boolean func_189884_a(Entity p_189884_1_);
  
 +    @Deprecated //Forge location aware version below
      int func_185891_c();
@@ -14,7 +14,7 @@
  
      @SideOnly(Side.CLIENT)
      boolean func_185895_e();
-@@ -90,5 +94,10 @@
+@@ -92,5 +96,10 @@
  
      RayTraceResult func_185910_a(World p_185910_1_, BlockPos p_185910_2_, Vec3d p_185910_3_, Vec3d p_185910_4_);
  

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

@@ -1,14 +1,14 @@
 --- ../src-base/minecraft/net/minecraft/client/Minecraft.java
 +++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
-@@ -321,7 +321,6 @@
+@@ -322,7 +322,6 @@
          this.field_152355_az = (new YggdrasilAuthenticationService(this.field_110453_aa, UUID.randomUUID().toString())).createMinecraftSessionService();
          this.field_71449_j = p_i45547_1_.field_178745_a.field_178752_a;
-         field_147123_G.info("Setting user: " + this.field_71449_j.func_111285_a());
--        field_147123_G.debug("(Session ID is " + this.field_71449_j.func_111286_b() + ")");
+         field_147123_G.info("Setting user: {}", new Object[] {this.field_71449_j.func_111285_a()});
+-        field_147123_G.debug("(Session ID is {})", new Object[] {this.field_71449_j.func_111286_b()});
          this.field_71459_aj = p_i45547_1_.field_178741_d.field_178756_a;
          this.field_71443_c = p_i45547_1_.field_178743_b.field_178764_a > 0 ? p_i45547_1_.field_178743_b.field_178764_a : 1;
          this.field_71440_d = p_i45547_1_.field_178743_b.field_178762_b > 0 ? p_i45547_1_.field_178743_b.field_178762_b : 1;
-@@ -435,10 +434,10 @@
+@@ -437,10 +436,10 @@
          this.field_110451_am = new SimpleReloadableResourceManager(this.field_110452_an);
          this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab);
          this.field_110451_am.func_110542_a(this.field_135017_as);
@@ -21,7 +21,7 @@
          this.field_152350_aA = new SkinManager(this.field_71446_o, new File(this.field_110446_Y, "skins"), this.field_152355_az);
          this.field_71469_aa = new AnvilSaveConverter(new File(this.field_71412_D, "saves"), this.field_184131_U);
          this.field_147127_av = new SoundHandler(this.field_110451_am, this.field_71474_y);
-@@ -463,7 +462,7 @@
+@@ -465,7 +464,7 @@
              {
                  try
                  {
@@ -30,7 +30,7 @@
                  }
                  catch (Exception exception)
                  {
-@@ -472,6 +471,8 @@
+@@ -474,6 +473,8 @@
              }
          });
          this.field_71417_B = new MouseHelper();
@@ -39,7 +39,7 @@
          this.func_71361_d("Pre startup");
          GlStateManager.func_179098_w();
          GlStateManager.func_179103_j(7425);
-@@ -485,19 +486,23 @@
+@@ -487,19 +488,24 @@
          GlStateManager.func_179096_D();
          GlStateManager.func_179128_n(5888);
          this.func_71361_d("Startup");
@@ -61,13 +61,15 @@
          this.field_175620_Y = new ItemRenderer(this);
          this.field_110451_am.func_110542_a(this.field_175621_X);
 +        bar.step("Loading Entity Renderer");
++        net.minecraftforge.fml.client.SplashProgress.pause();
          this.field_71460_t = new EntityRenderer(this, this.field_110451_am);
          this.field_110451_am.func_110542_a(this.field_71460_t);
          this.field_175618_aM = new BlockRendererDispatcher(this.field_175617_aL.func_174954_c(), this.field_184127_aH);
-@@ -507,23 +512,26 @@
+@@ -509,23 +515,27 @@
          this.field_71458_u = new GuiAchievement(this);
          GlStateManager.func_179083_b(0, 0, this.field_71443_c, this.field_71440_d);
          this.field_71452_i = new ParticleManager(this.field_71441_e, this.field_71446_o);
++        net.minecraftforge.fml.client.SplashProgress.resume();
 +        net.minecraftforge.fml.common.ProgressManager.pop(bar);
 +        net.minecraftforge.fml.client.FMLClientHandler.instance().finishMinecraftLoading();
          this.func_71361_d("Post startup");
@@ -94,7 +96,7 @@
          if (this.field_71474_y.field_74353_u && !this.field_71431_Q)
          {
              this.func_71352_k();
-@@ -695,21 +703,23 @@
+@@ -697,21 +707,23 @@
          File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt");
          Bootstrap.func_179870_a(p_71377_1_.func_71502_e());
  
@@ -121,7 +123,7 @@
      }
  
      public boolean func_152349_b()
-@@ -902,11 +912,6 @@
+@@ -904,11 +916,6 @@
  
      public void func_147108_a(@Nullable GuiScreen p_147108_1_)
      {
@@ -133,7 +135,7 @@
          if (p_147108_1_ == null && this.field_71441_e == null)
          {
              p_147108_1_ = new GuiMainMenu();
-@@ -916,6 +921,17 @@
+@@ -918,6 +925,17 @@
              p_147108_1_ = new GuiGameOver((ITextComponent)null);
          }
  
@@ -151,7 +153,7 @@
          if (p_147108_1_ instanceof GuiMainMenu || p_147108_1_ instanceof GuiMultiplayer)
          {
              this.field_71474_y.field_74330_P = false;
-@@ -1054,9 +1070,11 @@
+@@ -1053,9 +1071,11 @@
  
          if (!this.field_71454_w)
          {
@@ -163,7 +165,7 @@
          }
  
          this.field_71424_I.func_76319_b();
-@@ -1396,9 +1414,9 @@
+@@ -1398,9 +1418,9 @@
              {
                  BlockPos blockpos = this.field_71476_x.func_178782_a();
  
@@ -175,7 +177,7 @@
                      this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND);
                  }
              }
-@@ -1432,7 +1450,7 @@
+@@ -1434,7 +1454,7 @@
                      case BLOCK:
                          BlockPos blockpos = this.field_71476_x.func_178782_a();
  
@@ -184,25 +186,32 @@
                          {
                              this.field_71442_b.func_180511_b(blockpos, this.field_71476_x.field_178784_b);
                              break;
-@@ -1476,7 +1494,7 @@
+@@ -1448,6 +1468,7 @@
+                         }
+ 
+                         this.field_71439_g.func_184821_cY();
++                        net.minecraftforge.common.ForgeHooks.onEmptyLeftClick(this.field_71439_g, this.field_71439_g.func_184614_ca());
+                 }
+ 
+                 this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND);
+@@ -1477,7 +1498,6 @@
                          switch (this.field_71476_x.field_72313_a)
                          {
                              case ENTITY:
 -
-+                                if(!net.minecraftforge.common.ForgeHooks.onInteractEntityAt(field_71439_g, field_71476_x.field_72308_g, field_71476_x, field_71439_g.func_184586_b(enumhand), enumhand))
                                  if (this.field_71442_b.func_187102_a(this.field_71439_g, this.field_71476_x.field_72308_g, this.field_71476_x, this.field_71439_g.func_184586_b(enumhand), enumhand) == EnumActionResult.SUCCESS)
                                  {
                                      return;
-@@ -1519,7 +1537,7 @@
+@@ -1520,7 +1540,7 @@
                      }
  
                      ItemStack itemstack1 = this.field_71439_g.func_184586_b(enumhand);
 -
-+                    if (itemstack1 == null) net.minecraftforge.common.ForgeHooks.onEmptyClick(this.field_71439_g, enumhand);
++                    if (itemstack1 == null && (this.field_71476_x == null || this.field_71476_x.field_72313_a == RayTraceResult.Type.MISS)) net.minecraftforge.common.ForgeHooks.onEmptyClick(this.field_71439_g, enumhand);
                      if (itemstack1 != null && this.field_71442_b.func_187101_a(this.field_71439_g, this.field_71441_e, itemstack1, enumhand) == EnumActionResult.SUCCESS)
                      {
                          this.field_71460_t.field_78516_c.func_187460_a(enumhand);
-@@ -1626,6 +1644,8 @@
+@@ -1627,6 +1647,8 @@
              --this.field_71467_ac;
          }
  
@@ -211,7 +220,7 @@
          this.field_71424_I.func_76320_a("gui");
  
          if (!this.field_71445_n)
-@@ -1737,6 +1757,7 @@
+@@ -1738,6 +1760,7 @@
                      this.field_71457_ai = 0;
                      this.field_71441_e.func_72897_h(this.field_71439_g);
                  }
@@ -219,7 +228,7 @@
              }
  
              this.field_71424_I.func_76318_c("gameRenderer");
-@@ -1824,6 +1845,7 @@
+@@ -1825,6 +1848,7 @@
              this.field_71453_ak.func_74428_b();
          }
  
@@ -227,7 +236,7 @@
          this.field_71424_I.func_76319_b();
          this.field_71423_H = func_71386_F();
      }
-@@ -1930,6 +1952,7 @@
+@@ -1931,6 +1955,7 @@
                      }
                  }
              }
@@ -235,7 +244,7 @@
          }
  
          this.func_184117_aA();
-@@ -2169,6 +2192,8 @@
+@@ -2177,6 +2202,8 @@
      {
          while (Mouse.next())
          {
@@ -244,7 +253,7 @@
              int i = Mouse.getEventButton();
              KeyBinding.func_74510_a(i - 100, Mouse.getEventButtonState());
  
-@@ -2234,6 +2259,7 @@
+@@ -2242,6 +2269,7 @@
  
      public void func_71371_a(String p_71371_1_, String p_71371_2_, @Nullable WorldSettings p_71371_3_)
      {
@@ -252,7 +261,7 @@
          this.func_71403_a((WorldClient)null);
          System.gc();
          ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
-@@ -2276,6 +2302,12 @@
+@@ -2284,6 +2312,12 @@
  
          while (!this.field_71437_Z.func_71200_ad())
          {
@@ -265,13 +274,13 @@
              String s = this.field_71437_Z.func_71195_b_();
  
              if (s != null)
-@@ -2301,8 +2333,14 @@
+@@ -2309,8 +2343,14 @@
          SocketAddress socketaddress = this.field_71437_Z.func_147137_ag().func_151270_a();
          NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress);
          networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null));
--        networkmanager.func_179290_a(new C00Handshake(110, socketaddress.toString(), 0, EnumConnectionState.LOGIN));
+-        networkmanager.func_179290_a(new C00Handshake(210, socketaddress.toString(), 0, EnumConnectionState.LOGIN));
 -        networkmanager.func_179290_a(new CPacketLoginStart(this.func_110432_I().func_148256_e()));
-+        networkmanager.func_179290_a(new C00Handshake(110, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true));
++        networkmanager.func_179290_a(new C00Handshake(210, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true));
 +        com.mojang.authlib.GameProfile gameProfile = this.func_110432_I().func_148256_e();
 +        if (!this.func_110432_I().hasCachedProperties())
 +        {
@@ -282,7 +291,7 @@
          this.field_71453_ak = networkmanager;
      }
  
-@@ -2313,6 +2351,8 @@
+@@ -2321,6 +2361,8 @@
  
      public void func_71353_a(@Nullable WorldClient p_71353_1_, String p_71353_2_)
      {
@@ -291,7 +300,7 @@
          if (p_71353_1_ == null)
          {
              NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
-@@ -2325,6 +2365,18 @@
+@@ -2333,6 +2375,18 @@
              if (this.field_71437_Z != null && this.field_71437_Z.func_175578_N())
              {
                  this.field_71437_Z.func_71263_m();
@@ -310,7 +319,7 @@
              }
  
              this.field_71437_Z = null;
-@@ -2348,6 +2400,7 @@
+@@ -2356,6 +2410,7 @@
              this.field_71456_v.func_181029_i();
              this.func_71351_a((ServerData)null);
              this.field_71455_al = false;
@@ -318,7 +327,7 @@
          }
  
          this.field_147127_av.func_147690_c();
-@@ -2464,159 +2517,8 @@
+@@ -2473,159 +2528,8 @@
      {
          if (this.field_71476_x != null && this.field_71476_x.field_72313_a != RayTraceResult.Type.MISS)
          {
@@ -480,7 +489,7 @@
          }
      }
  
-@@ -2912,18 +2814,8 @@
+@@ -2927,18 +2831,8 @@
  
      public static int func_71369_N()
      {
@@ -501,7 +510,7 @@
      }
  
      public boolean func_70002_Q()
-@@ -3060,15 +2952,16 @@
+@@ -3077,15 +2971,16 @@
              {
                  if (Keyboard.getEventKeyState())
                  {
@@ -520,14 +529,16 @@
              }
          }
      }
-@@ -3195,4 +3088,10 @@
-     {
+@@ -3205,6 +3100,12 @@
          return this.field_184127_aH;
      }
-+
+ 
 +    // FORGE
 +    public ItemColors getItemColors()
 +    {
 +        return this.field_184128_aI;
 +    }
- }
++
+     public boolean func_189648_am()
+     {
+         return this.field_71439_g != null && this.field_71439_g.func_175140_cp() || this.field_71474_y.field_178879_v;

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

@@ -16,7 +16,15 @@
      }
  
      private synchronized void func_148608_i()
-@@ -338,6 +340,9 @@
+@@ -205,6 +207,7 @@
+                 this.field_148620_e.stop(s);
+             }
+ 
++            this.field_189000_p.clear(); //Forge: MC-35856 Fixed paused sounds repeating when switching worlds
+             this.field_148629_h.clear();
+             this.field_148626_m.clear();
+             this.field_148625_l.clear();
+@@ -338,6 +341,9 @@
      {
          if (this.field_148617_f)
          {
@@ -26,7 +34,7 @@
              SoundEventAccessor soundeventaccessor = p_148611_1_.func_184366_a(this.field_148622_c);
              ResourceLocation resourcelocation = p_148611_1_.func_147650_b();
  
-@@ -400,10 +405,12 @@
+@@ -400,10 +406,12 @@
                              if (sound.func_188723_h())
                              {
                                  this.field_148620_e.newStreamingSource(false, s, func_148612_a(resourcelocation1), resourcelocation1.toString(), flag, p_148611_1_.func_147649_g(), p_148611_1_.func_147654_h(), p_148611_1_.func_147651_i(), p_148611_1_.func_147656_j().func_148586_a(), f);

patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
 +++ ../src-work/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
-@@ -404,6 +404,15 @@
+@@ -415,6 +415,15 @@
          this.field_71159_c.field_71456_v.func_146158_b().func_146227_a(p_146105_1_);
      }
  
@@ -16,7 +16,7 @@
      protected boolean func_145771_j(double p_145771_1_, double p_145771_3_, double p_145771_5_)
      {
          if (this.field_70145_X)
-@@ -416,30 +425,34 @@
+@@ -427,30 +436,34 @@
              double d0 = p_145771_1_ - (double)blockpos.func_177958_n();
              double d1 = p_145771_5_ - (double)blockpos.func_177952_p();
  
@@ -56,7 +56,7 @@
                  {
                      d2 = 1.0D - d1;
                      i = 5;
-@@ -474,7 +487,7 @@
+@@ -485,7 +498,7 @@
  
      private boolean func_175162_d(BlockPos p_175162_1_)
      {
@@ -65,7 +65,7 @@
      }
  
      public void func_70031_b(boolean p_70031_1_)
-@@ -519,7 +532,13 @@
+@@ -530,7 +543,13 @@
  
      public void func_184185_a(SoundEvent p_184185_1_, float p_184185_2_, float p_184185_3_)
      {

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

@@ -46,5 +46,5 @@
 -            if (keybinding.func_151463_i() != keybinding.func_151469_h())
 +            if (!keybinding.isSetToDefaultValue())
              {
-                 flag = false;
+                 flag = true;
                  break;

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

@@ -1,15 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
-@@ -205,6 +205,8 @@
+@@ -206,6 +206,8 @@
                      }
                  }
  
 +                WorldType.field_77139_a[this.field_146331_K].onGUICreateWorldPress();
 +
-                 WorldSettings worldsettings = new WorldSettings(i, WorldSettings.GameType.func_77142_a(this.field_146342_r), this.field_146341_s, this.field_146337_w, WorldType.field_77139_a[this.field_146331_K]);
+                 WorldSettings worldsettings = new WorldSettings(i, GameType.func_77142_a(this.field_146342_r), this.field_146341_s, this.field_146337_w, WorldType.field_77139_a[this.field_146331_K]);
                  worldsettings.func_82750_a(this.field_146334_a);
  
-@@ -311,14 +313,7 @@
+@@ -312,14 +314,7 @@
              }
              else if (p_146284_1_.field_146127_k == 8)
              {
@@ -25,7 +25,7 @@
              }
          }
      }
-@@ -370,7 +365,7 @@
+@@ -371,7 +366,7 @@
              this.field_146326_C.field_146125_m = this.field_146344_y;
              this.field_146320_D.field_146125_m = this.field_146344_y;
              this.field_146321_E.field_146125_m = this.field_146344_y;

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiIngame.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngame.java
-@@ -361,7 +361,8 @@
+@@ -360,7 +360,8 @@
  
                  BlockPos blockpos = raytraceresult.func_178782_a();
  
@@ -10,7 +10,7 @@
                  {
                      return;
                  }
-@@ -419,7 +420,10 @@
+@@ -418,7 +419,10 @@
              {
                  Potion potion = potioneffect.func_188419_a();
  
@@ -22,7 +22,7 @@
                  {
                      int k = p_184048_1_.func_78326_a();
                      int l = 1;
-@@ -456,7 +460,10 @@
+@@ -455,7 +459,10 @@
                      }
  
                      GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, f);

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

@@ -1,17 +1,16 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
-@@ -30,8 +30,9 @@
+@@ -30,7 +30,8 @@
  
-         this.field_146292_n.add(new GuiButton(4, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 24 + i, I18n.func_135052_a("menu.returnToGame", new Object[0])));
-         this.field_146292_n.add(new GuiButton(0, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 96 + i, 98, 20, I18n.func_135052_a("menu.options", new Object[0])));
+         this.field_146292_n.add(new GuiButton(4, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 24 + -16, I18n.func_135052_a("menu.returnToGame", new Object[0])));
+         this.field_146292_n.add(new GuiButton(0, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 96 + -16, 98, 20, I18n.func_135052_a("menu.options", new Object[0])));
+-        GuiButton guibutton = this.func_189646_b(new GuiButton(7, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + -16, 98, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
 +        this.field_146292_n.add(new GuiButton(12, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + i, 98, 20, I18n.func_135052_a("fml.menu.modoptions")));
-         GuiButton guibutton;
--        this.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + i, 98, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
-+        this.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 72 + i, 200, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
-         this.field_146292_n.add(new GuiButton(5, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 48 + i, 98, 20, I18n.func_135052_a("gui.achievements", new Object[0])));
-         this.field_146292_n.add(new GuiButton(6, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 48 + i, 98, 20, I18n.func_135052_a("gui.stats", new Object[0])));
++        GuiButton guibutton = this.func_189646_b(new GuiButton(7, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 72 + -16, 200, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
          guibutton.field_146124_l = this.field_146297_k.func_71356_B() && !this.field_146297_k.func_71401_C().func_71344_c();
-@@ -74,13 +75,19 @@
+         this.field_146292_n.add(new GuiButton(5, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 48 + -16, 98, 20, I18n.func_135052_a("gui.achievements", new Object[0])));
+         this.field_146292_n.add(new GuiButton(6, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 48 + -16, 98, 20, I18n.func_135052_a("gui.stats", new Object[0])));
+@@ -73,13 +74,19 @@
                  this.field_146297_k.func_71381_h();
                  break;
              case 5:

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

@@ -9,7 +9,7 @@
  
      public GuiMainMenu()
      {
-@@ -210,13 +212,15 @@
+@@ -209,13 +211,15 @@
              this.field_183503_M.func_183500_a(this.field_146294_l, this.field_146295_m);
              this.field_183503_M.func_73866_w_();
          }
@@ -20,13 +20,13 @@
      {
          this.field_146292_n.add(new GuiButton(1, this.field_146294_l / 2 - 100, p_73969_1_, I18n.func_135052_a("menu.singleplayer", new Object[0])));
          this.field_146292_n.add(new GuiButton(2, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 1, I18n.func_135052_a("menu.multiplayer", new Object[0])));
--        this.field_146292_n.add(this.field_175372_K = new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0])));
-+        this.field_146292_n.add(this.field_175372_K = new GuiButton(14, this.field_146294_l / 2 + 2, p_73969_1_ + p_73969_2_ * 2, 98, 20, I18n.func_135052_a("menu.online", new Object[0]).replace("Minecraft", "").trim()));
+-        this.field_175372_K = this.func_189646_b(new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0])));
++        this.field_175372_K = this.func_189646_b(new GuiButton(14, this.field_146294_l / 2 + 2, p_73969_1_ + p_73969_2_ * 2, 98, 20, I18n.func_135052_a("menu.online", new Object[0]).replace("Minecraft", "").trim()));
 +        this.field_146292_n.add(modButton = new GuiButton(6, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, 98, 20, I18n.func_135052_a("fml.menu.mods")));
      }
  
      private void func_73972_b(int p_73972_1_, int p_73972_2_)
-@@ -264,6 +268,11 @@
+@@ -263,6 +267,11 @@
              this.field_146297_k.func_71400_g();
          }
  
@@ -38,8 +38,8 @@
          if (p_146284_1_.field_146127_k == 11)
          {
              this.field_146297_k.func_71371_a("Demo_World", "Demo_World", DemoWorldServer.field_73071_a);
-@@ -493,6 +502,8 @@
-             this.func_73729_b(j + 155, k + 0, 0, 45, 155, 44);
+@@ -490,6 +499,8 @@
+             this.func_73729_b(j + 155, 30, 0, 45, 155, 44);
          }
  
 +        this.field_73975_c = net.minecraftforge.client.ForgeHooksClient.renderMainMenu(this, this.field_146289_q, this.field_146294_l, this.field_146295_m, this.field_73975_c);
@@ -47,7 +47,7 @@
          GlStateManager.func_179094_E();
          GlStateManager.func_179109_b((float)(this.field_146294_l / 2 + 90), 70.0F, 0.0F);
          GlStateManager.func_179114_b(-20.0F, 0.0F, 0.0F, 1.0F);
-@@ -512,7 +523,15 @@
+@@ -509,7 +520,15 @@
              s = s + ("release".equalsIgnoreCase(this.field_146297_k.func_184123_d()) ? "" : "/" + this.field_146297_k.func_184123_d());
          }
  
@@ -62,9 +62,9 @@
 +            }
 +        }
          String s1 = "Copyright Mojang AB. Do not distribute!";
-         this.func_73731_b(this.field_146289_q, s1, this.field_146294_l - this.field_146289_q.func_78256_a(s1) - 2, this.field_146295_m - 10, -1);
+         this.func_73731_b(this.field_146289_q, "Copyright Mojang AB. Do not distribute!", this.field_146294_l - this.field_146289_q.func_78256_a("Copyright Mojang AB. Do not distribute!") - 2, this.field_146295_m - 10, -1);
  
-@@ -529,6 +548,7 @@
+@@ -526,6 +545,7 @@
          {
              this.field_183503_M.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
          }
@@ -72,7 +72,7 @@
      }
  
      protected void func_73864_a(int p_73864_1_, int p_73864_2_, int p_73864_3_) throws IOException
-@@ -549,6 +569,8 @@
+@@ -546,6 +566,8 @@
          {
              this.field_183503_M.func_73864_a(p_73864_1_, p_73864_2_, p_73864_3_);
          }

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiMultiplayer.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiMultiplayer.java
-@@ -40,6 +40,7 @@
+@@ -41,6 +41,7 @@
      public GuiMultiplayer(GuiScreen p_i1040_1_)
      {
          this.field_146798_g = p_i1040_1_;
@@ -8,7 +8,7 @@
      }
  
      public void func_73866_w_()
-@@ -372,7 +373,7 @@
+@@ -375,7 +376,7 @@
  
      private void func_146791_a(ServerData p_146791_1_)
      {

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

@@ -1,12 +1,12 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
-@@ -193,6 +193,9 @@
+@@ -188,6 +188,9 @@
          long l = j - k;
          List<String> list = Lists.newArrayList(new String[] {String.format("Java: %s %dbit", new Object[]{System.getProperty("java.version"), Integer.valueOf(this.field_175242_a.func_147111_S() ? 64 : 32)}), String.format("Mem: % 2d%% %03d/%03dMB", new Object[]{Long.valueOf(l * 100L / i), Long.valueOf(func_175240_a(l)), Long.valueOf(func_175240_a(i))}), String.format("Allocated: % 2d%% %03dMB", new Object[]{Long.valueOf(j * 100L / i), Long.valueOf(func_175240_a(j))}), "", String.format("CPU: %s", new Object[]{OpenGlHelper.func_183029_j()}), "", String.format("Display: %dx%d (%s)", new Object[]{Integer.valueOf(Display.getWidth()), Integer.valueOf(Display.getHeight()), GlStateManager.func_187416_u(7936)}), GlStateManager.func_187416_u(7937), GlStateManager.func_187416_u(7938)});
  
 +        list.add("");
 +        list.addAll(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(false));
 +
-         if (this.func_175236_d())
+         if (this.field_175242_a.func_189648_am())
          {
              return list;

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

@@ -1,21 +1,23 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiScreen.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiScreen.java
-@@ -141,7 +141,8 @@
+@@ -147,7 +147,10 @@
              }
          }
  
 -        this.func_146283_a(list, p_146285_2_, p_146285_3_);
 +        FontRenderer font = p_146285_1_.func_77973_b().getFontRenderer(p_146285_1_);
++        net.minecraftforge.fml.client.config.GuiUtils.preItemToolTip(p_146285_1_);
 +        this.drawHoveringText(list, p_146285_2_, p_146285_3_, (font == null ? field_146289_q : font));
++        net.minecraftforge.fml.client.config.GuiUtils.postItemToolTip();
      }
  
      protected void func_146279_a(String p_146279_1_, int p_146279_2_, int p_146279_3_)
-@@ -151,7 +152,13 @@
+@@ -157,7 +160,13 @@
  
      protected void func_146283_a(List<String> p_146283_1_, int p_146283_2_, int p_146283_3_)
      {
 -        if (!p_146283_1_.isEmpty())
-+        drawHoveringText(p_146283_1_, p_146283_2_, p_146283_3_, field_146289_q);   
++        drawHoveringText(p_146283_1_, p_146283_2_, p_146283_3_, field_146289_q);
 +    }
 +
 +    protected void drawHoveringText(List<String> p_146283_1_, int p_146283_2_, int p_146283_3_, FontRenderer font)
@@ -25,7 +27,7 @@
          {
              GlStateManager.func_179101_C();
              RenderHelper.func_74518_a();
-@@ -421,6 +428,7 @@
+@@ -427,6 +436,7 @@
          {
              this.field_146297_k.field_71456_v.func_146158_b().func_146239_a(p_175281_1_);
          }
@@ -33,7 +35,7 @@
  
          this.field_146297_k.field_71439_g.func_71165_d(p_175281_1_);
      }
-@@ -435,9 +443,15 @@
+@@ -441,9 +451,15 @@
  
                  if (guibutton.func_146116_c(this.field_146297_k, p_73864_1_, p_73864_2_))
                  {
@@ -49,7 +51,7 @@
                  }
              }
          }
-@@ -467,8 +481,12 @@
+@@ -473,8 +489,12 @@
          this.field_146289_q = p_146280_1_.field_71466_p;
          this.field_146294_l = p_146280_2_;
          this.field_146295_m = p_146280_3_;
@@ -62,7 +64,7 @@
      }
  
      public void func_183500_a(int p_183500_1_, int p_183500_2_)
-@@ -487,7 +505,9 @@
+@@ -493,7 +513,9 @@
          {
              while (Mouse.next())
              {
@@ -72,7 +74,7 @@
              }
          }
  
-@@ -495,7 +515,9 @@
+@@ -501,7 +523,9 @@
          {
              while (Keyboard.next())
              {
@@ -82,7 +84,7 @@
              }
          }
      }
-@@ -557,6 +579,7 @@
+@@ -563,6 +587,7 @@
      public void func_146276_q_()
      {
          this.func_146270_b(0);

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

@@ -8,10 +8,10 @@
 -            GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
 -            float f = 32.0F;
 -            vertexbuffer.func_181668_a(7, DefaultVertexFormats.field_181709_i);
--            vertexbuffer.func_181662_b((double)this.field_148152_e, (double)this.field_148154_c, 0.0D).func_187315_a((double)((float)this.field_148152_e / f), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d();
--            vertexbuffer.func_181662_b((double)this.field_148151_d, (double)this.field_148154_c, 0.0D).func_187315_a((double)((float)this.field_148151_d / f), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d();
--            vertexbuffer.func_181662_b((double)this.field_148151_d, (double)this.field_148153_b, 0.0D).func_187315_a((double)((float)this.field_148151_d / f), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d();
--            vertexbuffer.func_181662_b((double)this.field_148152_e, (double)this.field_148153_b, 0.0D).func_187315_a((double)((float)this.field_148152_e / f), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / f)).func_181669_b(32, 32, 32, 255).func_181675_d();
+-            vertexbuffer.func_181662_b((double)this.field_148152_e, (double)this.field_148154_c, 0.0D).func_187315_a((double)((float)this.field_148152_e / 32.0F), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d();
+-            vertexbuffer.func_181662_b((double)this.field_148151_d, (double)this.field_148154_c, 0.0D).func_187315_a((double)((float)this.field_148151_d / 32.0F), (double)((float)(this.field_148154_c + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d();
+-            vertexbuffer.func_181662_b((double)this.field_148151_d, (double)this.field_148153_b, 0.0D).func_187315_a((double)((float)this.field_148151_d / 32.0F), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d();
+-            vertexbuffer.func_181662_b((double)this.field_148152_e, (double)this.field_148153_b, 0.0D).func_187315_a((double)((float)this.field_148152_e / 32.0F), (double)((float)(this.field_148153_b + (int)this.field_148169_q) / 32.0F)).func_181669_b(32, 32, 32, 255).func_181675_d();
 -            tessellator.func_78381_a();
 +            // Forge: background rendering moved into separate method.
 +            this.drawContainerBackground(tessellator);

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

@@ -1,10 +1,11 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/GuiUtilRenderComponents.java
-@@ -73,6 +73,7 @@
+@@ -73,6 +73,8 @@
                          s3 = s4;
                      }
  
 +                    s3 = FontRenderer.func_78282_e(s2) + s3; //Forge: Fix chat formatting not surviving line wrapping.
-                     TextComponentString textcomponentstring2 = new TextComponentString(s3);
-                     textcomponentstring2.func_150255_a(itextcomponent1.func_150256_b().func_150232_l());
-                     list1.add(j + 1, textcomponentstring2);
++
+                     TextComponentString textcomponentstring1 = new TextComponentString(s3);
+                     textcomponentstring1.func_150255_a(itextcomponent1.func_150256_b().func_150232_l());
+                     list1.add(j + 1, textcomponentstring1);

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

@@ -0,0 +1,15 @@
+--- ../src-base/minecraft/net/minecraft/client/gui/GuiVideoSettings.java
++++ ../src-work/minecraft/net/minecraft/client/gui/GuiVideoSettings.java
+@@ -107,4 +107,12 @@
+         this.func_73732_a(this.field_146289_q, this.field_146500_a, this.field_146294_l / 2, 5, 16777215);
+         super.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
+     }
++
++    // FORGE: fix for MC-64581 very laggy mipmap slider
++    @Override
++    public void func_146281_b()
++    {
++        super.func_146281_b();
++        this.field_146297_k.field_71474_y.onGuiClosed();
++    }
+ }

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

@@ -1,7 +1,7 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
 @@ -82,7 +82,7 @@
-         boolean flag1 = this.field_148301_e.field_82821_f < 110;
+         boolean flag1 = this.field_148301_e.field_82821_f < 210;
          boolean flag2 = flag || flag1;
          this.field_148300_d.field_71466_p.func_78276_b(this.field_148301_e.field_78847_a, p_180790_2_ + 32 + 3, p_180790_3_ + 1, 16777215);
 -        List<String> list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_180790_4_ - 32 - 2);

patches/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java.patch

@@ -1,7 +1,7 @@
 --- ../src-base/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java
 +++ ../src-work/minecraft/net/minecraft/client/gui/achievement/GuiAchievements.java
 @@ -49,6 +49,10 @@
-     private StatisticsManager field_146556_E;
+     private final StatisticsManager field_146556_E;
      private boolean field_146558_F = true;
  
 +    private int currentPage = -1;
@@ -11,10 +11,10 @@
      public GuiAchievements(GuiScreen p_i45026_1_, StatisticsManager p_i45026_2_)
      {
          this.field_146562_a = p_i45026_1_;
-@@ -57,6 +61,14 @@
-         int j = 141;
-         this.field_146569_s = this.field_146567_u = this.field_146565_w = (double)(AchievementList.field_187982_f.field_75993_a * 24 - i / 2 - 12);
-         this.field_146568_t = this.field_146566_v = this.field_146573_x = (double)(AchievementList.field_187982_f.field_75991_b * 24 - j / 2);
+@@ -61,6 +65,14 @@
+         this.field_146573_x = (double)(AchievementList.field_187982_f.field_75991_b * 24 - 70);
+         this.field_146568_t = this.field_146573_x;
+         this.field_146566_v = this.field_146573_x;
 +        minecraftAchievements.clear();
 +        for (Achievement achievement : AchievementList.field_187981_e)
 +        {
@@ -26,7 +26,7 @@
      }
  
      public void func_73866_w_()
-@@ -64,6 +76,7 @@
+@@ -68,6 +80,7 @@
          this.field_146297_k.func_147114_u().func_147297_a(new CPacketClientStatus(CPacketClientStatus.State.REQUEST_STATS));
          this.field_146292_n.clear();
          this.field_146292_n.add(new GuiOptionButton(1, this.field_146294_l / 2 + 24, this.field_146295_m / 2 + 74, 80, 20, I18n.func_135052_a("gui.done", new Object[0])));
@@ -34,7 +34,7 @@
      }
  
      protected void func_146284_a(GuiButton p_146284_1_) throws IOException
-@@ -74,12 +87,22 @@
+@@ -78,12 +91,22 @@
              {
                  this.field_146297_k.func_147108_a(this.field_146562_a);
              }
@@ -58,7 +58,7 @@
          {
              this.field_146297_k.func_147108_a((GuiScreen)null);
              this.field_146297_k.func_71381_h();
-@@ -257,7 +280,9 @@
+@@ -264,7 +287,9 @@
          GlStateManager.func_179143_c(518);
          GlStateManager.func_179094_E();
          GlStateManager.func_179109_b((float)i1, (float)j1, -200.0F);
@@ -69,7 +69,7 @@
          GlStateManager.func_179098_w();
          GlStateManager.func_179140_f();
          GlStateManager.func_179091_B();
-@@ -331,11 +356,12 @@
+@@ -338,11 +363,12 @@
          GlStateManager.func_179143_c(515);
          this.field_146297_k.func_110434_K().func_110577_a(field_146561_C);
  
@@ -77,14 +77,15 @@
 +        java.util.List<Achievement> achievementList = (currentPage == -1 ? minecraftAchievements : net.minecraftforge.common.AchievementPage.getAchievementPage(currentPage).getAchievements());
 +        for (int j5 = 0; j5 < achievementList.size(); ++j5)
          {
-             Achievement achievement1 = (Achievement)AchievementList.field_187981_e.get(j5);
+-            Achievement achievement1 = (Achievement)AchievementList.field_187981_e.get(j5);
++            Achievement achievement1 = achievementList.get(j5);
  
 -            if (achievement1.field_75992_c != null)
 +            if (achievement1.field_75992_c != null && achievementList.contains(achievement1.field_75992_c))
              {
                  int k5 = achievement1.field_75993_a * 24 - i + 11;
                  int l5 = achievement1.field_75991_b * 24 - j + 11;
-@@ -389,9 +415,9 @@
+@@ -396,9 +422,9 @@
          GlStateManager.func_179091_B();
          GlStateManager.func_179142_g();
  
@@ -96,7 +97,7 @@
              int l6 = achievement2.field_75993_a * 24 - i;
              int j7 = achievement2.field_75991_b * 24 - j;
  
-@@ -432,6 +458,7 @@
+@@ -439,6 +465,7 @@
  
                  this.field_146297_k.func_110434_K().func_110577_a(field_146561_C);
  
@@ -104,7 +105,7 @@
                  if (achievement2.func_75984_f())
                  {
                      this.func_73729_b(l6 - 2, j7 - 2, 26, 202, 26, 26);
-@@ -440,6 +467,7 @@
+@@ -447,6 +474,7 @@
                  {
                      this.func_73729_b(l6 - 2, j7 - 2, 0, 202, 26, 26);
                  }
@@ -112,7 +113,7 @@
  
                  if (!this.field_146556_E.func_77442_b(achievement2))
                  {
-@@ -448,7 +476,7 @@
+@@ -455,7 +483,7 @@
                      this.field_146296_j.func_175039_a(false);
                  }
  

patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch

@@ -78,6 +78,15 @@
          int k = -1;
  
          if (slot != null)
+@@ -488,7 +493,7 @@
+                 {
+                     for (Slot slot2 : this.field_147002_h.field_75151_b)
+                     {
+-                        if (slot2 != null && slot2.func_82869_a(this.field_146297_k.field_71439_g) && slot2.func_75216_d() && slot2.field_75224_c == slot.field_75224_c && Container.func_94527_a(slot2, this.field_146994_N, true))
++                        if (slot2 != null && slot2.func_82869_a(this.field_146297_k.field_71439_g) && slot2.func_75216_d() && slot2.isSameInventory(slot) && Container.func_94527_a(slot2, this.field_146994_N, true))
+                         {
+                             this.func_184098_a(slot2, slot2.field_75222_d, p_146286_3_, ClickType.QUICK_MOVE);
+                         }
 @@ -575,7 +580,7 @@
              }
              else if (this.field_146297_k.field_71439_g.field_71071_by.func_70445_o() != null)

patches/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java.patch

@@ -162,7 +162,17 @@
          GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
          GlStateManager.func_179140_f();
      }
-@@ -638,16 +687,35 @@
+@@ -624,7 +673,9 @@
+                 }
+             }
+ 
++            net.minecraftforge.fml.client.config.GuiUtils.preItemToolTip(p_146285_1_);
+             this.func_146283_a(list, p_146285_2_, p_146285_3_);
++            net.minecraftforge.fml.client.config.GuiUtils.postItemToolTip();
+         }
+         else
+         {
+@@ -638,16 +689,35 @@
          RenderHelper.func_74520_c();
          CreativeTabs creativetabs = CreativeTabs.field_78032_a[field_147058_w];
  
@@ -199,7 +209,7 @@
          this.field_146297_k.func_110434_K().func_110577_a(new ResourceLocation("textures/gui/container/creative_inventory/tab_" + creativetabs.func_78015_f()));
          this.func_73729_b(this.field_147003_i, this.field_147009_r, 0, 0, this.field_146999_f, this.field_147000_g);
          this.field_147062_A.func_146194_f();
-@@ -662,6 +730,14 @@
+@@ -662,6 +732,14 @@
              this.func_73729_b(i, j + (int)((float)(k - j - 17) * this.field_147067_x), 232 + (this.func_147055_p() ? 0 : 12), 0, 12, 15);
          }
  
@@ -214,7 +224,7 @@
          this.func_147051_a(creativetabs);
  
          if (creativetabs == CreativeTabs.field_78036_m)
-@@ -672,6 +748,14 @@
+@@ -672,6 +750,14 @@
  
      protected boolean func_147049_a(CreativeTabs p_147049_1_, int p_147049_2_, int p_147049_3_)
      {
@@ -229,16 +239,16 @@
          int i = p_147049_1_.func_78020_k();
          int j = 28 * i;
          int k = 0;
-@@ -768,6 +852,8 @@
+@@ -768,6 +854,8 @@
          }
  
          GlStateManager.func_179140_f();
 +        GlStateManager.func_179124_c(1F, 1F, 1F); //Forge: Reset color in case Items change it.
 +        GlStateManager.func_179147_l(); //Forge: Make sure blend is enabled else tabs show a white border.
-         this.func_73729_b(l, i1, j, k, 28, j1);
+         this.func_73729_b(l, i1, j, k, 28, 32);
          this.field_73735_i = 100.0F;
          this.field_146296_j.field_77023_b = 100.0F;
-@@ -794,6 +880,15 @@
+@@ -794,6 +882,15 @@
          {
              this.field_146297_k.func_147108_a(new GuiStats(this, this.field_146297_k.field_71439_g.func_146107_m()));
          }

patches/minecraft/net/minecraft/client/model/ModelBox.java.patch

@@ -7,7 +7,7 @@
 -@SideOnly(Side.CLIENT)
  public class ModelBox
  {
-     private PositionTextureVertex[] field_78253_h;
+     private final PositionTextureVertex[] field_78253_h;
 @@ -81,6 +80,7 @@
          }
      }
@@ -15,4 +15,4 @@
 +    @SideOnly(Side.CLIENT)
      public void func_178780_a(VertexBuffer p_178780_1_, float p_178780_2_)
      {
-         for (int i = 0; i < this.field_78254_i.length; ++i)
+         for (TexturedQuad texturedquad : this.field_78254_i)

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

@@ -4,8 +4,8 @@
                      inetaddress = InetAddress.getByName(p_146367_1_);
                      GuiConnecting.this.field_146371_g = NetworkManager.func_181124_a(inetaddress, p_146367_2_, GuiConnecting.this.field_146297_k.field_71474_y.func_181148_f());
                      GuiConnecting.this.field_146371_g.func_150719_a(new NetHandlerLoginClient(GuiConnecting.this.field_146371_g, GuiConnecting.this.field_146297_k, GuiConnecting.this.field_146374_i));
--                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(110, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN));
-+                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(110, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN, true));
+-                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(210, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN));
++                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(210, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN, true));
                      GuiConnecting.this.field_146371_g.func_179290_a(new CPacketLoginStart(GuiConnecting.this.field_146297_k.func_110432_I().func_148256_e()));
                  }
                  catch (UnknownHostException unknownhostexception)

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
 +++ ../src-work/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
-@@ -122,6 +122,12 @@
+@@ -123,6 +123,12 @@
              }
          }
  
@@ -13,7 +13,7 @@
          if (this.field_78779_k.func_77145_d() && this.field_78776_a.field_71439_g.func_184614_ca() != null && this.field_78776_a.field_71439_g.func_184614_ca().func_77973_b() instanceof ItemSword)
          {
              return false;
-@@ -143,14 +149,7 @@
+@@ -144,14 +150,7 @@
              else
              {
                  world.func_175718_b(2001, p_187103_1_, Block.func_176210_f(iblockstate));
@@ -28,7 +28,7 @@
                  this.field_178895_c = new BlockPos(this.field_178895_c.func_177958_n(), -1, this.field_178895_c.func_177952_p());
  
                  if (!this.field_78779_k.func_77145_d())
-@@ -161,13 +160,20 @@
+@@ -162,13 +161,20 @@
                      {
                          itemstack1.func_179548_a(world, iblockstate, p_187103_1_, this.field_78776_a.field_71439_g);
  
@@ -50,7 +50,15 @@
                  return flag;
              }
          }
-@@ -218,14 +224,17 @@
+@@ -208,6 +214,7 @@
+             if (this.field_78779_k.func_77145_d())
+             {
+                 this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_));
++                if (!net.minecraftforge.common.ForgeHooks.onLeftClickBlock(this.field_78776_a.field_71439_g, p_180511_1_, p_180511_2_, net.minecraftforge.common.ForgeHooks.rayTraceEyeHitVec(this.field_78776_a.field_71439_g, func_78757_d() + 1)).isCanceled())
+                 func_178891_a(this.field_78776_a, this, p_180511_1_, p_180511_2_);
+                 this.field_78781_i = 5;
+             }
+@@ -219,14 +226,17 @@
                  }
  
                  this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_));
@@ -69,7 +77,25 @@
                  if (flag && iblockstate.func_185903_a(this.field_78776_a.field_71439_g, this.field_78776_a.field_71439_g.field_70170_p, p_180511_1_) >= 1.0F)
                  {
                      this.func_187103_a(p_180511_1_);
-@@ -372,13 +381,32 @@
+@@ -290,7 +300,7 @@
+ 
+                 if (this.field_78780_h % 4.0F == 0.0F)
+                 {
+-                    SoundType soundtype = block.func_185467_w();
++                    SoundType soundtype = block.getSoundType(iblockstate, field_78776_a.field_71441_e, p_180512_1_, field_78776_a.field_71439_g);
+                     this.field_78776_a.func_147118_V().func_147682_a(new PositionedSoundRecord(soundtype.func_185846_f(), SoundCategory.NEUTRAL, (soundtype.func_185843_a() + 1.0F) / 8.0F, soundtype.func_185847_b() * 0.5F, p_180512_1_));
+                 }
+ 
+@@ -342,7 +352,7 @@
+ 
+         if (this.field_85183_f != null && itemstack != null)
+         {
+-            flag = itemstack.func_77973_b() == this.field_85183_f.func_77973_b() && ItemStack.func_77970_a(itemstack, this.field_85183_f) && (itemstack.func_77984_f() || itemstack.func_77960_j() == this.field_85183_f.func_77960_j());
++            flag = !net.minecraftforge.client.ForgeHooksClient.shouldCauseBlockBreakReset(this.field_85183_f, itemstack);
+         }
+ 
+         return p_178893_1_.equals(this.field_178895_c) && flag;
+@@ -373,13 +383,32 @@
          }
          else
          {
@@ -83,7 +109,7 @@
 +            }
 +            EnumActionResult result = EnumActionResult.PASS;
 +
-             if (this.field_78779_k != WorldSettings.GameType.SPECTATOR)
+             if (this.field_78779_k != GameType.SPECTATOR)
              {
 +                net.minecraft.item.Item item = p_187099_3_ == null ? null : p_187099_3_.func_77973_b();
 +                EnumActionResult ret = item == null ? EnumActionResult.PASS : item.onItemUseFirst(p_187099_3_, p_187099_1_, p_187099_2_, p_187099_4_, p_187099_5_, f, f1, f2, p_187099_7_);
@@ -104,37 +130,37 @@
                  }
  
                  if (!flag && p_187099_3_ != null && p_187099_3_.func_77973_b() instanceof ItemBlock)
-@@ -394,7 +422,7 @@
+@@ -395,7 +424,7 @@
  
              this.field_78774_b.func_147297_a(new CPacketPlayerTryUseItemOnBlock(p_187099_4_, p_187099_5_, p_187099_7_, f, f1, f2));
  
--            if (!flag && this.field_78779_k != WorldSettings.GameType.SPECTATOR)
-+            if (!flag && this.field_78779_k != WorldSettings.GameType.SPECTATOR || event.getUseItem() == net.minecraftforge.fml.common.eventhandler.Event.Result.ALLOW)
+-            if (!flag && this.field_78779_k != GameType.SPECTATOR)
++            if (!flag && this.field_78779_k != GameType.SPECTATOR || event.getUseItem() == net.minecraftforge.fml.common.eventhandler.Event.Result.ALLOW)
              {
                  if (p_187099_3_ == null)
                  {
-@@ -412,14 +440,19 @@
-                 {
-                     int i = p_187099_3_.func_77960_j();
-                     int j = p_187099_3_.field_77994_a;
-+                    if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY) {
-                     EnumActionResult enumactionresult = p_187099_3_.func_179546_a(p_187099_1_, p_187099_2_, p_187099_4_, p_187099_7_, p_187099_5_, f, f1, f2);
-                     p_187099_3_.func_77964_b(i);
-                     p_187099_3_.field_77994_a = j;
-                     return enumactionresult;
-+                    } else return result;
-                 }
-                 else
-                 {
--                    return p_187099_3_.func_179546_a(p_187099_1_, p_187099_2_, p_187099_4_, p_187099_7_, p_187099_5_, f, f1, f2);
-+                    if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY)
-+                    result = p_187099_3_.func_179546_a(p_187099_1_, p_187099_2_, p_187099_4_, p_187099_7_, p_187099_5_, f, f1, f2);
-+                    if (p_187099_3_.field_77994_a <= 0) net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(p_187099_1_, p_187099_3_, p_187099_7_);
-+                    return result;
+@@ -421,14 +450,19 @@
+                     {
+                         int i = p_187099_3_.func_77960_j();
+                         int j = p_187099_3_.field_77994_a;
++                        if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY) {
+                         EnumActionResult enumactionresult = p_187099_3_.func_179546_a(p_187099_1_, p_187099_2_, p_187099_4_, p_187099_7_, p_187099_5_, f, f1, f2);
+                         p_187099_3_.func_77964_b(i);
+                         p_187099_3_.field_77994_a = j;
+                         return enumactionresult;
++                        } else return result;
+                     }
+                     else
+                     {
+-                        return p_187099_3_.func_179546_a(p_187099_1_, p_187099_2_, p_187099_4_, p_187099_7_, p_187099_5_, f, f1, f2);
++                        if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY)
++                        result = p_187099_3_.func_179546_a(p_187099_1_, p_187099_2_, p_187099_4_, p_187099_7_, p_187099_5_, f, f1, f2);
++                        if (p_187099_3_.field_77994_a <= 0) net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(p_187099_1_, p_187099_3_, p_187099_7_);
++                        return result;
+                     }
                  }
              }
-             else
-@@ -446,6 +479,7 @@
+@@ -456,6 +490,7 @@
              }
              else
              {
@@ -142,7 +168,7 @@
                  int i = p_187101_3_.field_77994_a;
                  ActionResult<ItemStack> actionresult = p_187101_3_.func_77957_a(p_187101_2_, p_187101_1_, p_187101_4_);
                  ItemStack itemstack = (ItemStack)actionresult.func_188398_b();
-@@ -454,9 +488,10 @@
+@@ -464,9 +499,10 @@
                  {
                      p_187101_1_.func_184611_a(p_187101_4_, itemstack);
  
@@ -154,3 +180,11 @@
                      }
                  }
  
+@@ -504,6 +540,7 @@
+         this.func_78750_j();
+         Vec3d vec3d = new Vec3d(p_187102_3_.field_72307_f.field_72450_a - p_187102_2_.field_70165_t, p_187102_3_.field_72307_f.field_72448_b - p_187102_2_.field_70163_u, p_187102_3_.field_72307_f.field_72449_c - p_187102_2_.field_70161_v);
+         this.field_78774_b.func_147297_a(new CPacketUseEntity(p_187102_2_, p_187102_5_, vec3d));
++        if(net.minecraftforge.common.ForgeHooks.onInteractEntityAt(p_187102_1_, p_187102_2_, p_187102_3_, p_187102_1_.func_184586_b(p_187102_5_), p_187102_5_)) return EnumActionResult.PASS;
+         return this.field_78779_k == GameType.SPECTATOR ? EnumActionResult.PASS : p_187102_2_.func_184199_a(p_187102_1_, vec3d, p_187102_4_, p_187102_5_);
+     }
+ 

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/multiplayer/WorldClient.java
 +++ ../src-work/minecraft/net/minecraft/client/multiplayer/WorldClient.java
-@@ -59,17 +59,18 @@
+@@ -60,17 +60,19 @@
  
      public WorldClient(NetHandlerPlayClient p_i45063_1_, WorldSettings p_i45063_2_, int p_i45063_3_, EnumDifficulty p_i45063_4_, Profiler p_i45063_5_)
      {
@@ -17,6 +17,7 @@
          this.field_72988_C = new SaveDataMemoryStorage();
          this.func_72966_v();
          this.func_72947_a();
++        this.initCapabilities();
 +        net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Load(this));
      }
  

patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
 +++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
-@@ -268,7 +268,7 @@
+@@ -271,7 +271,7 @@
      {
          PacketThreadUtil.func_180031_a(p_147282_1_, this, this.field_147299_f);
          this.field_147299_f.field_71442_b = new PlayerControllerMP(this.field_147299_f, this);
@@ -9,7 +9,7 @@
          this.field_147299_f.field_71474_y.field_74318_M = p_147282_1_.func_149192_g();
          this.field_147299_f.func_71403_a(this.field_147300_g);
          this.field_147299_f.field_71439_g.field_71093_bK = p_147282_1_.func_149194_f();
-@@ -719,7 +719,7 @@
+@@ -725,7 +725,7 @@
  
              if (tileentity != null)
              {
@@ -18,7 +18,7 @@
              }
          }
      }
-@@ -797,14 +797,16 @@
+@@ -803,14 +803,16 @@
      public void func_147251_a(SPacketChat p_147251_1_)
      {
          PacketThreadUtil.func_180031_a(p_147251_1_, this, this.field_147299_f);
@@ -37,7 +37,7 @@
          }
      }
  
-@@ -860,6 +862,11 @@
+@@ -866,6 +868,11 @@
          float f = (float)(p_147281_1_.func_149028_l() * 360) / 256.0F;
          float f1 = (float)(p_147281_1_.func_149030_m() * 360) / 256.0F;
          EntityLivingBase entitylivingbase = (EntityLivingBase)EntityList.func_75616_a(p_147281_1_.func_149025_e(), this.field_147299_f.field_71441_e);
@@ -47,9 +47,9 @@
 +            return;
 +        }
          EntityTracker.func_187254_a(entitylivingbase, d0, d1, d2);
-         entitylivingbase.field_70761_aq = entitylivingbase.field_70759_as = (float)(p_147281_1_.func_149032_n() * 360) / 256.0F;
-         Entity[] aentity = entitylivingbase.func_70021_al();
-@@ -931,7 +938,7 @@
+         entitylivingbase.field_70761_aq = (float)(p_147281_1_.func_149032_n() * 360) / 256.0F;
+         entitylivingbase.field_70759_as = (float)(p_147281_1_.func_149032_n() * 360) / 256.0F;
+@@ -938,7 +945,7 @@
  
                      if (entity1 == this.field_147299_f.field_71439_g && !flag)
                      {
@@ -58,18 +58,23 @@
                      }
                  }
              }
-@@ -1162,6 +1169,10 @@
+@@ -1169,6 +1176,15 @@
              {
                  tileentity.func_145839_a(p_147273_1_.func_148857_g());
              }
 +            else
 +            {
++                if(tileentity == null)
++                {
++                    field_147301_d.error("Received invalid update packet for null tile entity at {} with data: {}", p_147273_1_.func_179823_a(), p_147273_1_.func_148857_g());
++                    return;
++                }
 +                tileentity.onDataPacket(field_147302_e, p_147273_1_);
 +            }
  
              if (flag && this.field_147299_f.field_71462_r instanceof GuiCommandBlock)
              {
-@@ -1259,15 +1270,15 @@
+@@ -1266,15 +1282,15 @@
              }
              else if (f == 101.0F)
              {
@@ -88,7 +93,7 @@
              }
          }
          else if (i == 6)
-@@ -1361,7 +1372,7 @@
+@@ -1368,7 +1384,7 @@
  
          if (entity instanceof EntityLivingBase)
          {

patches/minecraft/net/minecraft/client/network/ServerPinger.java.patch

@@ -8,3 +8,12 @@
                      this.field_175092_e = Minecraft.func_71386_F();
                      networkmanager.func_179290_a(new CPacketPing(this.field_175092_e));
                      this.field_147403_d = true;
+@@ -176,7 +177,7 @@
+ 
+         try
+         {
+-            networkmanager.func_179290_a(new C00Handshake(210, serveraddress.func_78861_a(), serveraddress.func_78864_b(), EnumConnectionState.STATUS));
++            networkmanager.func_179290_a(new C00Handshake(210, serveraddress.func_78861_a(), serveraddress.func_78864_b(), EnumConnectionState.STATUS, true));
+             networkmanager.func_179290_a(new CPacketServerQuery());
+         }
+         catch (Throwable throwable)

patches/minecraft/net/minecraft/client/particle/ParticleManager.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/particle/ParticleManager.java
 +++ ../src-work/minecraft/net/minecraft/client/particle/ParticleManager.java
-@@ -145,6 +145,7 @@
+@@ -146,6 +146,7 @@
  
      public void func_78873_a(Particle p_78873_1_)
      {
@@ -8,7 +8,7 @@
          this.field_187241_h.add(p_78873_1_);
      }
  
-@@ -378,7 +379,7 @@
+@@ -380,7 +381,7 @@
  
      public void func_180533_a(BlockPos p_180533_1_, IBlockState p_180533_2_)
      {
@@ -17,7 +17,7 @@
          {
              p_180533_2_ = p_180533_2_.func_185899_b(this.field_78878_a, p_180533_1_);
              int i = 4;
-@@ -462,4 +463,13 @@
+@@ -464,4 +465,13 @@
  
          return "" + i;
      }

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

@@ -16,10 +16,10 @@
              if (bakedquad.func_178212_b())
              {
                  int k = this.field_187499_a.func_186724_a(p_187492_2_, p_187492_1_, p_187492_3_, bakedquad.func_178211_c());
-@@ -290,11 +297,26 @@
-                 float f = (float)(l >> 16 & 255) / 255.0F;
-                 float f1 = (float)(l >> 8 & 255) / 255.0F;
-                 float f2 = (float)(l & 255) / 255.0F;
+@@ -291,11 +298,26 @@
+                 float f = (float)(j1 >> 16 & 255) / 255.0F;
+                 float f1 = (float)(j1 >> 8 & 255) / 255.0F;
+                 float f2 = (float)(j1 & 255) / 255.0F;
 +                if(bakedquad.shouldApplyDiffuseLighting())
 +                {
 +                    float diffuse = net.minecraftforge.client.model.pipeline.LightUtil.diffuseLight(bakedquad.func_178210_d());

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/EntityRenderer.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/EntityRenderer.java
-@@ -208,6 +208,7 @@
+@@ -207,6 +207,7 @@
              {
                  this.func_175069_a(new ResourceLocation("shaders/post/invert.json"));
              }
@@ -8,7 +8,7 @@
          }
      }
  
-@@ -399,7 +400,7 @@
+@@ -398,7 +399,7 @@
  
                          if (d3 < d2 || d2 == 0.0D)
                          {
@@ -17,7 +17,7 @@
                              {
                                  if (d2 == 0.0D)
                                  {
-@@ -492,7 +493,7 @@
+@@ -491,7 +492,7 @@
                  f = f * 60.0F / 70.0F;
              }
  
@@ -26,7 +26,7 @@
          }
      }
  
-@@ -556,14 +557,8 @@
+@@ -555,14 +556,8 @@
              {
                  BlockPos blockpos = new BlockPos(entity);
                  IBlockState iblockstate = this.field_78531_r.field_71441_e.func_180495_p(blockpos);
@@ -42,7 +42,7 @@
                  GlStateManager.func_179114_b(entity.field_70126_B + (entity.field_70177_z - entity.field_70126_B) * p_78467_1_ + 180.0F, 0.0F, -1.0F, 0.0F);
                  GlStateManager.func_179114_b(entity.field_70127_C + (entity.field_70125_A - entity.field_70127_C) * p_78467_1_, -1.0F, 0.0F, 0.0F);
              }
-@@ -630,17 +625,20 @@
+@@ -629,17 +624,20 @@
  
          if (!this.field_78531_r.field_71474_y.field_74325_U)
          {
@@ -70,7 +70,7 @@
          }
  
          GlStateManager.func_179109_b(0.0F, -f, 0.0F);
-@@ -758,6 +756,7 @@
+@@ -757,6 +755,7 @@
  
              boolean flag = this.field_78531_r.func_175606_aa() instanceof EntityLivingBase && ((EntityLivingBase)this.field_78531_r.func_175606_aa()).func_70608_bn();
  
@@ -78,7 +78,7 @@
              if (this.field_78531_r.field_71474_y.field_74320_O == 0 && !flag && !this.field_78531_r.field_71474_y.field_74319_N && !this.field_78531_r.field_71442_b.func_78747_a())
              {
                  this.func_180436_i();
-@@ -1093,7 +1092,7 @@
+@@ -1092,7 +1091,7 @@
  
                  try
                  {
@@ -87,16 +87,16 @@
                  }
                  catch (Throwable throwable)
                  {
-@@ -1188,7 +1187,7 @@
+@@ -1187,7 +1186,7 @@
  
-                     if (this.field_78531_r.field_71442_b.func_178889_l() == WorldSettings.GameType.SPECTATOR)
+                     if (this.field_78531_r.field_71442_b.func_178889_l() == GameType.SPECTATOR)
                      {
 -                        flag = block.func_149716_u() && this.field_78531_r.field_71441_e.func_175625_s(blockpos) instanceof IInventory;
 +                        flag = block.hasTileEntity(this.field_78531_r.field_71441_e.func_180495_p(blockpos)) && this.field_78531_r.field_71441_e.func_175625_s(blockpos) instanceof IInventory;
                      }
                      else
                      {
-@@ -1313,7 +1312,9 @@
+@@ -1312,7 +1311,9 @@
              GlStateManager.func_179094_E();
              RenderHelper.func_74519_b();
              this.field_78531_r.field_71424_I.func_76318_c("entities");
@@ -106,7 +106,7 @@
              RenderHelper.func_74518_a();
              this.func_175072_h();
          }
-@@ -1326,6 +1327,7 @@
+@@ -1325,6 +1326,7 @@
              EntityPlayer entityplayer = (EntityPlayer)entity;
              GlStateManager.func_179118_c();
              this.field_78531_r.field_71424_I.func_76318_c("outline");
@@ -114,7 +114,7 @@
              renderglobal.func_72731_b(entityplayer, this.field_78531_r.field_71476_x, 0, p_175068_2_);
              GlStateManager.func_179141_d();
          }
-@@ -1367,6 +1369,17 @@
+@@ -1371,6 +1373,17 @@
          GlStateManager.func_179103_j(7425);
          this.field_78531_r.field_71424_I.func_76318_c("translucent");
          renderglobal.func_174977_a(BlockRenderLayer.TRANSLUCENT, (double)p_175068_2_, p_175068_1_, entity);
@@ -132,7 +132,7 @@
          GlStateManager.func_179103_j(7424);
          GlStateManager.func_179132_a(true);
          GlStateManager.func_179089_o();
-@@ -1379,6 +1392,9 @@
+@@ -1383,6 +1396,9 @@
              this.func_180437_a(renderglobal, p_175068_2_, p_175068_1_);
          }
  
@@ -142,7 +142,7 @@
          this.field_78531_r.field_71424_I.func_76318_c("hand");
  
          if (this.field_175074_C)
-@@ -1491,6 +1507,13 @@
+@@ -1498,6 +1514,13 @@
  
      protected void func_78474_d(float p_78474_1_)
      {
@@ -156,7 +156,7 @@
          float f = this.field_78531_r.field_71441_e.func_72867_j(p_78474_1_);
  
          if (f > 0.0F)
-@@ -1821,6 +1844,13 @@
+@@ -1828,6 +1851,13 @@
              this.field_175081_S = f7;
          }
  
@@ -170,7 +170,7 @@
          GlStateManager.func_179082_a(this.field_175080_Q, this.field_175082_R, this.field_175081_S, 0.0F);
      }
  
-@@ -1831,7 +1861,9 @@
+@@ -1838,7 +1868,9 @@
          GlStateManager.func_187432_a(0.0F, -1.0F, 0.0F);
          GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
          IBlockState iblockstate = ActiveRenderInfo.func_186703_a(this.field_78531_r.field_71441_e, entity, p_78468_2_);
@@ -181,7 +181,7 @@
          if (entity instanceof EntityLivingBase && ((EntityLivingBase)entity).func_70644_a(MobEffects.field_76440_q))
          {
              float f1 = 5.0F;
-@@ -1916,6 +1948,7 @@
+@@ -1923,6 +1955,7 @@
                  GlStateManager.func_179102_b(f * 0.05F);
                  GlStateManager.func_179153_c(Math.min(f, 192.0F) * 0.5F);
              }

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

@@ -1,16 +1,21 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/InventoryEffectRenderer.java
-@@ -28,8 +28,14 @@
+@@ -28,13 +28,19 @@
  
      protected void func_175378_g()
      {
--        if (!this.field_146297_k.field_71439_g.func_70651_bq().isEmpty())
+-        if (this.field_146297_k.field_71439_g.func_70651_bq().isEmpty())
 +        boolean hasVisibleEffect = false;
 +        for(PotionEffect potioneffect : this.field_146297_k.field_71439_g.func_70651_bq()) {
 +            Potion potion = potioneffect.func_188419_a();
 +            if(potion.shouldRender(potioneffect)) { hasVisibleEffect = true; break; }
 +        }
-+        if (!this.field_146297_k.field_71439_g.func_70651_bq().isEmpty() && hasVisibleEffect)
++        if (this.field_146297_k.field_71439_g.func_70651_bq().isEmpty() || !hasVisibleEffect)
+         {
+             this.field_147003_i = (this.field_146294_l - this.field_146999_f) / 2;
+             this.field_147045_u = false;
+         }
+         else
          {
 +            if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.PotionShiftEvent(this))) this.field_147003_i = (this.field_146294_l - this.field_146999_f) / 2; else
              this.field_147003_i = 160 + (this.field_146294_l - this.field_146999_f - 200) / 2;

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

@@ -9,7 +9,23 @@
              {
                  EnumHand enumhand1 = abstractclientplayer.func_184600_cs();
                  flag = enumhand1 == EnumHand.MAIN_HAND;
-@@ -361,7 +361,7 @@
+@@ -334,6 +334,7 @@
+         {
+             float f3 = enumhand == EnumHand.MAIN_HAND ? f : 0.0F;
+             float f5 = 1.0F - (this.field_187470_g + (this.field_187469_f - this.field_187470_g) * p_78440_1_);
++            if(!net.minecraftforge.client.ForgeHooksClient.renderSpecificFirstPersonHand(EnumHand.MAIN_HAND, p_78440_1_, f1, f3, f5, this.field_187467_d))
+             this.func_187457_a(abstractclientplayer, p_78440_1_, f1, EnumHand.MAIN_HAND, f3, this.field_187467_d, f5);
+         }
+ 
+@@ -341,6 +342,7 @@
+         {
+             float f4 = enumhand == EnumHand.OFF_HAND ? f : 0.0F;
+             float f6 = 1.0F - (this.field_187472_i + (this.field_187471_h - this.field_187472_i) * p_78440_1_);
++            if(!net.minecraftforge.client.ForgeHooksClient.renderSpecificFirstPersonHand(EnumHand.OFF_HAND, p_78440_1_, f1, f4, f6, this.field_187468_e))
+             this.func_187457_a(abstractclientplayer, p_78440_1_, f1, EnumHand.OFF_HAND, f4, this.field_187468_e, f6);
+         }
+ 
+@@ -361,7 +363,7 @@
                  this.func_187456_a(p_187457_7_, p_187457_5_, enumhandside);
              }
          }
@@ -18,7 +34,7 @@
          {
              if (flag && this.field_187468_e == null)
              {
-@@ -445,6 +445,7 @@
+@@ -445,6 +447,7 @@
          if (this.field_78455_a.field_71439_g.func_70094_T())
          {
              IBlockState iblockstate = this.field_78455_a.field_71441_e.func_180495_p(new BlockPos(this.field_78455_a.field_71439_g));
@@ -26,7 +42,7 @@
              EntityPlayer entityplayer = this.field_78455_a.field_71439_g;
  
              for (int i = 0; i < 8; ++i)
-@@ -458,11 +459,13 @@
+@@ -458,11 +461,13 @@
                  if (iblockstate1.func_177230_c().func_176214_u())
                  {
                      iblockstate = iblockstate1;
@@ -40,7 +56,7 @@
                  this.func_178108_a(p_78447_1_, this.field_78455_a.func_175602_ab().func_175023_a().func_178122_a(iblockstate));
              }
          }
-@@ -471,11 +474,13 @@
+@@ -471,11 +476,13 @@
          {
              if (this.field_78455_a.field_71439_g.func_70055_a(Material.field_151586_h))
              {
@@ -54,7 +70,7 @@
                  this.func_78442_d(p_78447_1_);
              }
          }
-@@ -597,8 +602,8 @@
+@@ -597,8 +604,8 @@
          else
          {
              float f = entityplayersp.func_184825_o(1.0F);

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

@@ -1,6 +1,14 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/RenderGlobal.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/RenderGlobal.java
-@@ -548,8 +548,10 @@
+@@ -456,6 +456,7 @@
+         {
+             this.field_175009_l.clear();
+             this.field_72755_R.clear();
++            if (field_175008_n != null) field_175008_n.func_178160_a(); // Forge: Fix MC-105406
+             this.field_175008_n = null;
+ 
+             if (this.field_174995_M != null)
+@@ -548,8 +549,10 @@
  
      public void func_180446_a(Entity p_180446_1_, ICamera p_180446_2_, float p_180446_3_)
      {
@@ -11,9 +19,9 @@
              --this.field_72740_G;
          }
          else
-@@ -560,9 +562,12 @@
+@@ -560,9 +563,12 @@
              this.field_72769_h.field_72984_F.func_76320_a("prepare");
-             TileEntityRendererDispatcher.field_147556_a.func_178470_a(this.field_72769_h, this.field_72777_q.func_110434_K(), this.field_72777_q.field_71466_p, this.field_72777_q.func_175606_aa(), p_180446_3_);
+             TileEntityRendererDispatcher.field_147556_a.func_190056_a(this.field_72769_h, this.field_72777_q.func_110434_K(), this.field_72777_q.field_71466_p, this.field_72777_q.func_175606_aa(), this.field_72777_q.field_71476_x, p_180446_3_);
              this.field_175010_j.func_180597_a(this.field_72769_h, this.field_72777_q.field_71466_p, this.field_72777_q.func_175606_aa(), this.field_72777_q.field_147125_j, this.field_72777_q.field_71474_y, p_180446_3_);
 +            if(pass == 0)
 +            {
@@ -24,7 +32,7 @@
              Entity entity = this.field_72777_q.func_175606_aa();
              double d3 = entity.field_70142_S + (entity.field_70165_t - entity.field_70142_S) * (double)p_180446_3_;
              double d4 = entity.field_70137_T + (entity.field_70163_u - entity.field_70137_T) * (double)p_180446_3_;
-@@ -574,11 +579,15 @@
+@@ -574,11 +580,15 @@
              this.field_72777_q.field_71460_t.func_180436_i();
              this.field_72769_h.field_72984_F.func_76318_c("global");
              List<Entity> list = this.field_72769_h.func_72910_y();
@@ -40,7 +48,7 @@
                  ++this.field_72749_I;
  
                  if (entity1.func_145770_h(d0, d1, d2))
-@@ -601,6 +610,7 @@
+@@ -601,6 +611,7 @@
                  {
                      for (Entity entity2 : classinheritancemultimap)
                      {
@@ -48,7 +56,7 @@
                          boolean flag = this.field_175010_j.func_178635_a(entity2, p_180446_2_, d0, d1, d2) || entity2.func_184215_y(this.field_72777_q.field_71439_g);
  
                          if (flag)
-@@ -637,6 +647,7 @@
+@@ -637,6 +648,7 @@
                  }
              }
  
@@ -56,7 +64,7 @@
              if (this.func_174985_d() && (!list1.isEmpty() || this.field_184386_ad))
              {
                  this.field_72769_h.field_72984_F.func_76318_c("entityOutlines");
-@@ -676,6 +687,7 @@
+@@ -676,6 +688,7 @@
              this.field_72769_h.field_72984_F.func_76318_c("blockentities");
              RenderHelper.func_74519_b();
  
@@ -64,7 +72,7 @@
              for (RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation1 : this.field_72755_R)
              {
                  List<TileEntity> list3 = renderglobal$containerlocalrenderinformation1.field_178036_a.func_178571_g().func_178485_b();
-@@ -684,6 +696,7 @@
+@@ -684,6 +697,7 @@
                  {
                      for (TileEntity tileentity2 : list3)
                      {
@@ -72,7 +80,7 @@
                          TileEntityRendererDispatcher.field_147556_a.func_180546_a(tileentity2, p_180446_3_, -1);
                      }
                  }
-@@ -693,9 +706,11 @@
+@@ -693,9 +707,11 @@
              {
                  for (TileEntity tileentity : this.field_181024_n)
                  {
@@ -84,7 +92,7 @@
  
              this.func_180443_s();
  
-@@ -722,7 +737,7 @@
+@@ -722,7 +738,7 @@
  
                  Block block = this.field_72769_h.func_180495_p(blockpos).func_177230_c();
  
@@ -93,7 +101,16 @@
                  {
                      TileEntityRendererDispatcher.field_147556_a.func_180546_a(tileentity1, p_180446_3_, destroyblockprogress.func_73106_e());
                  }
-@@ -1214,6 +1229,13 @@
+@@ -926,7 +942,7 @@
+                 BlockPos blockpos2 = renderchunk4.func_178568_j().func_177982_a(8, 8, 8);
+                 boolean flag3 = blockpos2.func_177951_i(blockpos1) < 768.0D;
+ 
+-                if (!renderchunk4.func_188281_o() && !flag3)
++                if (net.minecraftforge.common.ForgeModContainer.alwaysSetupTerrainOffThread || (!renderchunk4.func_188281_o() && !flag3))
+                 {
+                     this.field_175009_l.add(renderchunk4);
+                 }
+@@ -1213,6 +1229,13 @@
  
      public void func_174976_a(float p_174976_1_, int p_174976_2_)
      {
@@ -107,7 +124,7 @@
          if (this.field_72777_q.field_71441_e.field_73011_w.func_186058_p().func_186068_a() == 1)
          {
              this.func_180448_r();
-@@ -1431,6 +1453,12 @@
+@@ -1430,6 +1453,12 @@
  
      public void func_180447_b(float p_180447_1_, int p_180447_2_)
      {
@@ -120,7 +137,7 @@
          if (this.field_72777_q.field_71441_e.field_73011_w.func_76569_d())
          {
              if (this.field_72777_q.field_71474_y.func_181147_e() == 2)
-@@ -1858,8 +1886,11 @@
+@@ -1857,8 +1886,11 @@
                  double d4 = (double)blockpos.func_177956_o() - d1;
                  double d5 = (double)blockpos.func_177952_p() - d2;
                  Block block = this.field_72769_h.func_180495_p(blockpos).func_177230_c();
@@ -133,3 +150,12 @@
                  {
                      if (d3 * d3 + d4 * d4 + d5 * d5 > 1024.0D)
                      {
+@@ -2304,7 +2336,7 @@
+ 
+                 if (block.func_176223_P().func_185904_a() != Material.field_151579_a)
+                 {
+-                    SoundType soundtype = block.func_185467_w();
++                    SoundType soundtype = block.getSoundType(Block.func_176220_d(p_180439_4_), field_72769_h, p_180439_3_, null);
+                     this.field_72769_h.func_184156_a(p_180439_3_, soundtype.func_185845_c(), SoundCategory.BLOCKS, (soundtype.func_185843_a() + 1.0F) / 2.0F, soundtype.func_185847_b() * 0.8F, false);
+                 }
+ 

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

@@ -83,7 +83,7 @@
                  GlStateManager.func_179140_f();
                  GlStateManager.func_179097_i();
                  GlStateManager.func_179090_x();
-@@ -1054,6 +1043,7 @@
+@@ -1059,6 +1048,7 @@
          this.func_175029_a(Blocks.field_185779_df, TileEntityStructure.Mode.LOAD.func_185110_a(), "structure_block");
          this.func_175029_a(Blocks.field_185779_df, TileEntityStructure.Mode.CORNER.func_185110_a(), "structure_block");
          this.func_175029_a(Blocks.field_185779_df, TileEntityStructure.Mode.DATA.func_185110_a(), "structure_block");

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

@@ -1,15 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/VertexBuffer.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/VertexBuffer.java
-@@ -126,6 +126,8 @@
+@@ -123,6 +123,8 @@
  
-             bitset.set(l1);
+             bitset.set(i1);
          }
 +        this.field_178999_b.limit(this.field_178999_b.capacity());
 +        this.field_178999_b.position(this.func_181664_j());
      }
  
      public VertexBuffer.State func_181672_a()
-@@ -510,15 +512,15 @@
+@@ -507,15 +509,15 @@
                  break;
              case USHORT:
              case SHORT:
@@ -31,7 +31,7 @@
          }
  
          this.func_181667_k();
-@@ -609,4 +611,9 @@
+@@ -606,4 +608,9 @@
              return this.field_179018_e;
          }
      }

patches/minecraft/net/minecraft/client/renderer/block/model/ModelBakery.java.patch

@@ -42,7 +42,7 @@
                              {
                                  if (!modelblockdefinition.func_188002_b())
                                  {
--                                    field_177603_c.warn("Unable to load variant: " + modelresourcelocation.func_177518_c() + " from " + modelresourcelocation);
+-                                    field_177603_c.warn("Unable to load variant: {} from {}", new Object[] {modelresourcelocation.func_177518_c(), modelresourcelocation});
 +                                    field_177603_c.warn("Unable to load variant: " + modelresourcelocation.func_177518_c() + " from " + modelresourcelocation, var12);
                                  }
                              }
@@ -51,7 +51,7 @@
                  }
 -                catch (Exception exception)
 -                {
--                    field_177603_c.warn((String)("Unable to load definition " + resourcelocation), (Throwable)exception);
+-                    field_177603_c.warn("Unable to load definition {}", new Object[] {resourcelocation, exception});
 -                }
              }
          }

patches/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java.patch

@@ -1,15 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/chunk/RenderChunk.java
-@@ -162,7 +162,7 @@
+@@ -161,7 +161,7 @@
                      lvt_9_1_.func_178606_a(blockpos$mutableblockpos);
                  }
  
 -                if (block.func_149716_u())
 +                if (block.hasTileEntity(iblockstate))
                  {
-                     TileEntity tileentity = this.field_189564_r.func_175625_s(new BlockPos(blockpos$mutableblockpos));
+                     TileEntity tileentity = this.field_189564_r.func_190300_a(blockpos$mutableblockpos, Chunk.EnumCreateEntityType.CHECK);
  
-@@ -182,7 +182,9 @@
+@@ -181,7 +181,9 @@
                      }
                  }
  
@@ -20,7 +20,7 @@
                  int j = blockrenderlayer1.ordinal();
  
                  if (block.func_176223_P().func_185901_i() != EnumBlockRenderType.INVISIBLE)
-@@ -197,6 +199,8 @@
+@@ -196,6 +198,8 @@
  
                      aboolean[j] |= blockrendererdispatcher.func_175018_a(iblockstate, blockpos$mutableblockpos, this.field_189564_r, vertexbuffer);
                  }
@@ -29,7 +29,7 @@
              }
  
              for (BlockRenderLayer blockrenderlayer : BlockRenderLayer.values())
-@@ -278,7 +282,9 @@
+@@ -277,7 +281,9 @@
      private void func_189563_q()
      {
          int i = 1;
@@ -40,7 +40,7 @@
      }
  
      @Nullable
-@@ -427,6 +433,26 @@
+@@ -426,6 +432,26 @@
          return this.field_178593_n && this.field_188284_q;
      }
  

patches/minecraft/net/minecraft/client/renderer/color/BlockColors.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/color/BlockColors.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/color/BlockColors.java
-@@ -26,7 +26,8 @@
+@@ -27,7 +27,8 @@
  @SideOnly(Side.CLIENT)
  public class BlockColors
  {
@@ -10,7 +10,16 @@
  
      public static BlockColors func_186723_a()
      {
-@@ -146,7 +147,7 @@
+@@ -147,7 +148,7 @@
+ 
+     public int func_189991_a(IBlockState p_189991_1_)
+     {
+-        IBlockColor iblockcolor = (IBlockColor)this.field_186725_a.func_148745_a(Block.func_149682_b(p_189991_1_.func_177230_c()));
++        IBlockColor iblockcolor = (IBlockColor)this.blockColorMap.get(p_189991_1_.func_177230_c().delegate);
+ 
+         if (iblockcolor != null)
+         {
+@@ -162,7 +163,7 @@
  
      public int func_186724_a(IBlockState p_186724_1_, @Nullable IBlockAccess p_186724_2_, @Nullable BlockPos p_186724_3_, int p_186724_4_)
      {
@@ -19,14 +28,14 @@
          return iblockcolor == null ? -1 : iblockcolor.func_186720_a(p_186724_1_, p_186724_2_, p_186724_3_, p_186724_4_);
      }
  
-@@ -156,7 +157,9 @@
- 
-         for (int j = p_186722_2_.length; i < j; ++i)
+@@ -170,7 +171,9 @@
+     {
+         for (Block block : p_186722_2_)
          {
--            this.field_186725_a.func_148746_a(p_186722_1_, Block.func_149682_b(p_186722_2_[i]));
-+            if (p_186722_2_[i] == null) throw new IllegalArgumentException("Block registered to block color handler cannot be null!");
-+            if (p_186722_2_[i].getRegistryName() == null) throw new IllegalArgumentException("Block must be registered before assigning color handler.");
-+            this.blockColorMap.put(p_186722_2_[i].delegate, p_186722_1_);
+-            this.field_186725_a.func_148746_a(p_186722_1_, Block.func_149682_b(block));
++            if (block == null) throw new IllegalArgumentException("Block registered to block color handler cannot be null!");
++            if (block.getRegistryName() == null) throw new IllegalArgumentException("Block must be registered before assigning color handler.");
++            this.blockColorMap.put(block.delegate, p_186722_1_);
          }
      }
  }

patches/minecraft/net/minecraft/client/renderer/color/ItemColors.java.patch

@@ -10,7 +10,7 @@
  
      public static ItemColors func_186729_a(final BlockColors p_186729_0_)
      {
-@@ -136,7 +137,7 @@
+@@ -134,7 +135,7 @@
  
      public int func_186728_a(ItemStack p_186728_1_, int p_186728_2_)
      {
@@ -19,25 +19,25 @@
          return iitemcolor == null ? -1 : iitemcolor.func_186726_a(p_186728_1_, p_186728_2_);
      }
  
-@@ -146,7 +147,9 @@
- 
-         for (int j = p_186731_2_.length; i < j; ++i)
+@@ -142,7 +143,9 @@
+     {
+         for (Block block : p_186731_2_)
          {
--            this.field_186732_a.func_148746_a(p_186731_1_, Item.func_150891_b(Item.func_150898_a(p_186731_2_[i])));
-+            if (p_186731_2_[i] == null) throw new IllegalArgumentException("Block registered to item color handler cannot be null!");
-+            if (p_186731_2_[i].getRegistryName() == null) throw new IllegalArgumentException("Block must be registered before assigning color handler.");
-+            this.itemColorMap.put(Item.func_150898_a(p_186731_2_[i]).delegate, p_186731_1_);
+-            this.field_186732_a.func_148746_a(p_186731_1_, Item.func_150891_b(Item.func_150898_a(block)));
++            if (block == null) throw new IllegalArgumentException("Block registered to item color handler cannot be null!");
++            if (block.getRegistryName() == null) throw new IllegalArgumentException("Block must be registered before assigning color handler.");
++            this.itemColorMap.put(Item.func_150898_a(block).delegate, p_186731_1_);
          }
      }
  
-@@ -156,7 +159,9 @@
- 
-         for (int j = p_186730_2_.length; i < j; ++i)
+@@ -150,7 +153,9 @@
+     {
+         for (Item item : p_186730_2_)
          {
--            this.field_186732_a.func_148746_a(p_186730_1_, Item.func_150891_b(p_186730_2_[i]));
-+            if (p_186730_2_[i] == null) throw new IllegalArgumentException("Item registered to item color handler cannot be null!");
-+            if (p_186730_2_[i].getRegistryName() == null) throw new IllegalArgumentException("Item must be registered before assigning color handler.");
-+            this.itemColorMap.put(p_186730_2_[i].delegate, p_186730_1_);
+-            this.field_186732_a.func_148746_a(p_186730_1_, Item.func_150891_b(item));
++            if (item == null) throw new IllegalArgumentException("Item registered to item color handler cannot be null!");
++            if (item.getRegistryName() == null) throw new IllegalArgumentException("Item must be registered before assigning color handler.");
++            this.itemColorMap.put(item.delegate, p_186730_1_);
          }
      }
  }

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

@@ -2,7 +2,7 @@
 +++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderLivingBase.java
 @@ -32,6 +32,9 @@
      protected List<LayerRenderer<T>> field_177097_h = Lists.<LayerRenderer<T>>newArrayList();
-     protected boolean field_188323_j = false;
+     protected boolean field_188323_j;
  
 +    public static float NAME_TAG_RANGE = 64.0f;
 +    public static float NAME_TAG_RANGE_SNEAK = 32.0f;

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/entity/RenderManager.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderManager.java
-@@ -205,8 +205,13 @@
+@@ -209,8 +209,13 @@
          this.field_178637_m = new RenderPlayer(this);
          this.field_178636_l.put("default", this.field_178637_m);
          this.field_178636_l.put("slim", new RenderPlayer(this, true));
@@ -14,7 +14,7 @@
      public void func_178628_a(double p_178628_1_, double p_178628_3_, double p_178628_5_)
      {
          this.field_78725_b = p_178628_1_;
-@@ -255,9 +260,9 @@
+@@ -259,9 +264,9 @@
              IBlockState iblockstate = p_180597_1_.func_180495_p(new BlockPos(p_180597_3_));
              Block block = iblockstate.func_177230_c();
  

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

@@ -16,3 +16,15 @@
      }
  
      private void func_177137_d(AbstractClientPlayer p_177137_1_)
+@@ -127,6 +129,11 @@
+                     {
+                         modelbiped$armpose1 = ModelBiped.ArmPose.BLOCK;
+                     }
++                    // FORGE: fix MC-88356 allow offhand to use bow and arrow animation
++                    else if (enumaction1 == EnumAction.BOW)
++                    {
++                        modelbiped$armpose1 = ModelBiped.ArmPose.BOW_AND_ARROW;
++                    }
+                 }
+             }
+ 

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

@@ -0,0 +1,25 @@
+--- ../src-base/minecraft/net/minecraft/client/renderer/entity/RenderZombie.java
++++ ../src-work/minecraft/net/minecraft/client/renderer/entity/RenderZombie.java
+@@ -83,21 +83,7 @@
+     {
+         if (p_110775_1_.func_82231_m())
+         {
+-            switch (p_110775_1_.func_184736_de())
+-            {
+-                case 0:
+-                    return field_188330_l;
+-                case 1:
+-                    return field_188331_m;
+-                case 2:
+-                    return field_188332_n;
+-                case 3:
+-                    return field_188333_o;
+-                case 4:
+-                    return field_188329_p;
+-                default:
+-                    return field_110864_q;
+-            }
++            return p_110775_1_.getVillagerTypeForge().getZombieSkin();
+         }
+         else
+         {

patches/minecraft/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java.patch

@@ -13,12 +13,11 @@
 +                this.field_177190_a.func_110776_a(this.getArmorResource(p_188361_1_, itemstack, p_188361_9_, null));
  
 -                switch (itemarmor.func_82812_d())
--                {
+                 {
 -                    case LEATHER:
-                         int i = itemarmor.func_82814_b(itemstack);
-+                {
-+                    if (i != 0xFFFFFF) // Allow this for anything, not only cloth
++                    if (itemarmor.hasOverlay(itemstack)) // Allow this for anything, not only cloth
 +                    {
+                         int i = itemarmor.func_82814_b(itemstack);
                          float f = (float)(i >> 16 & 255) / 255.0F;
                          float f1 = (float)(i >> 8 & 255) / 255.0F;
                          float f2 = (float)(i & 255) / 255.0F;

patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch

@@ -25,7 +25,16 @@
      }
  
      public List<TextureAtlasSprite> func_94309_g()
-@@ -238,7 +244,7 @@
+@@ -148,7 +154,7 @@
+ 
+             if (flag3 ^ flag4)
+             {
+-                flag = flag3;
++                flag = !flag3 && flag1; //Forge: Fix stitcher not expanding entire height before growing width, and {potentially} growing larger then the max size.
+             }
+             else
+             {
+@@ -240,7 +246,7 @@
  
              public String toString()
              {

patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch

@@ -71,20 +71,29 @@
              }
              catch (RuntimeException runtimeexception)
              {
--                field_147635_d.error((String)("Unable to parse metadata from " + resourcelocation), (Throwable)runtimeexception);
-+                //logger.error((String)("Unable to parse metadata from " + resourcelocation), (Throwable)runtimeexception);
+-                field_147635_d.error("Unable to parse metadata from {}", new Object[] {resourcelocation, runtimeexception});
++                //LOGGER.error("Unable to parse metadata from {}", new Object[] {resourcelocation, runtimeexception});
 +                net.minecraftforge.fml.client.FMLClientHandler.instance().trackBrokenTexture(resourcelocation, runtimeexception.getMessage());
                  continue;
              }
              catch (IOException ioexception)
              {
--                field_147635_d.error((String)("Using missing texture, unable to load " + resourcelocation), (Throwable)ioexception);
-+                //logger.error((String)("Using missing texture, unable to load " + resourcelocation), (Throwable)ioexception);
+-                field_147635_d.error("Using missing texture, unable to load {}", new Object[] {resourcelocation, ioexception});
++                //LOGGER.error("Using missing texture, unable to load {}", new Object[] {resourcelocation, ioexception});
 +                net.minecraftforge.fml.client.FMLClientHandler.instance().trackMissingTexture(resourcelocation);
                  continue;
              }
              finally
-@@ -129,6 +158,7 @@
+@@ -122,17 +151,18 @@
+ 
+             if (lvt_11_2_ < k)
+             {
+-                field_147635_d.warn("Texture {} with size {}x{} limits mip level from {} to {}", new Object[] {resourcelocation, Integer.valueOf(textureatlassprite.func_94211_a()), Integer.valueOf(textureatlassprite.func_94216_b()), Integer.valueOf(MathHelper.func_151239_c(k)), Integer.valueOf(MathHelper.func_151239_c(lvt_11_2_))});
+-                k = lvt_11_2_;
++                // FORGE: do not lower the mipmap level, just log the problematic textures
++                field_147635_d.warn("Texture {} with size {}x{} will have visual artifacts at mip level {}, it can only support level {}. Please report to the mod author that the texture should be some multiple of 16x16.", resourcelocation, textureatlassprite.func_94211_a(), textureatlassprite.func_94216_b(), MathHelper.func_151239_c(k), MathHelper.func_151239_c(lvt_11_2_));
+             }
+ 
              stitcher.func_110934_a(textureatlassprite);
          }
  
@@ -92,6 +101,11 @@
          int l = Math.min(j, k);
          int i1 = MathHelper.func_151239_c(l);
  
+-        if (i1 < this.field_147636_j)
++        if (false && i1 < this.field_147636_j) // FORGE: do not lower the mipmap level
+         {
+             field_147635_d.warn("{}: dropping miplevel from {} to {}, because of minimum power of two: {}", new Object[] {this.field_94254_c, Integer.valueOf(this.field_147636_j), Integer.valueOf(i1), Integer.valueOf(l)});
+             this.field_147636_j = i1;
 @@ -140,9 +170,12 @@
  
          this.field_94249_f.func_147963_d(this.field_147636_j);
@@ -154,7 +168,7 @@
  
              if (textureatlassprite == null)
              {
-@@ -318,4 +363,37 @@
+@@ -318,4 +363,52 @@
      {
          return this.field_94249_f;
      }
@@ -182,6 +196,7 @@
 +     * @param entry Entry instance
 +     * @return True if the entry was added to the map, false otherwise.
 +     */
++    @Deprecated //Use non-String version
 +    public boolean setTextureEntry(String name, TextureAtlasSprite entry)
 +    {
 +        if (!field_110574_e.containsKey(name))
@@ -190,5 +205,19 @@
 +            return true;
 +        }
 +        return false;
++    }
++    public boolean setTextureEntry(TextureAtlasSprite entry)
++    {
++        return setTextureEntry(entry.func_94215_i(), entry);
++    }
++
++    public String getBasePath()
++    {
++        return field_94254_c;
++    }
++
++    public int getMipmapLevels()
++    {
++        return field_147636_j;
 +    }
  }

patches/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java.patch

@@ -1,6 +1,30 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java
-@@ -202,9 +202,11 @@
+@@ -83,6 +83,7 @@
+                     int[] aint1 = aint[l1 - 1];
+                     int[] aint2 = new int[aint1.length >> 2];
+                     int j = p_147949_1_ >> l1;
++                    if (j > 0) { // FORGE: forcing higher mipmap levels on odd textures needs this check
+                     int k = aint2.length / j;
+                     int l = j << 1;
+ 
+@@ -94,6 +95,7 @@
+                             aint2[i1 + j1 * j] = func_147943_a(aint1[k1 + 0], aint1[k1 + 1], aint1[k1 + 0 + l], aint1[k1 + 1 + l], flag);
+                         }
+                     }
++                    } // end if (j > 0)
+ 
+                     aint[l1] = aint2;
+                 }
+@@ -168,6 +170,7 @@
+         for (int i = 0; i < p_147955_0_.length; ++i)
+         {
+             int[] aint = p_147955_0_[i];
++            if ((p_147955_1_ >> i <= 0) || (p_147955_2_ >> i <= 0)) break;
+             func_147947_a(i, aint, p_147955_1_ >> i, p_147955_2_ >> i, p_147955_3_ >> i, p_147955_4_ >> i, p_147955_5_, p_147955_6_, p_147955_0_.length > 1);
+         }
+     }
+@@ -202,9 +205,11 @@
  
      public static void func_180600_a(int p_180600_0_, int p_180600_1_, int p_180600_2_, int p_180600_3_)
      {

patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java.patch

@@ -1,11 +1,12 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java
-@@ -108,11 +108,14 @@
+@@ -112,12 +112,15 @@
      {
          if (p_180546_1_.func_145835_a(this.field_147560_j, this.field_147561_k, this.field_147558_l) < p_180546_1_.func_145833_n())
          {
 +            if(!drawingBatch || !p_180546_1_.hasFastRenderer())
 +            {
+             RenderHelper.func_74519_b();
              int i = this.field_147550_f.func_175626_b(p_180546_1_.func_174877_v(), 0);
              int j = i % 65536;
              int k = i / 65536;
@@ -15,7 +16,7 @@
              BlockPos blockpos = p_180546_1_.func_174877_v();
              this.func_178469_a(p_180546_1_, (double)blockpos.func_177958_n() - field_147554_b, (double)blockpos.func_177956_o() - field_147555_c, (double)blockpos.func_177952_p() - field_147552_d, p_180546_2_, p_180546_3_);
          }
-@@ -131,6 +134,11 @@
+@@ -136,6 +139,11 @@
          {
              try
              {
@@ -27,7 +28,7 @@
                  tileentityspecialrenderer.func_180535_a(p_178469_1_, p_178469_2_, p_178469_4_, p_178469_6_, p_178469_8_, p_178469_9_);
              }
              catch (Throwable throwable)
-@@ -157,4 +165,52 @@
+@@ -162,4 +170,52 @@
      {
          return this.field_147557_n;
      }

patches/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java.patch

@@ -1,9 +1,11 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java
-@@ -45,4 +45,6 @@
-     {
+@@ -77,6 +77,8 @@
          return false;
      }
-+
+ 
 +    public void renderTileEntityFast(T te, double x, double y, double z, float partialTicks, int destroyStage, net.minecraft.client.renderer.VertexBuffer buffer) {}
- }
++
+     protected void func_190052_a(T p_190052_1_, String p_190052_2_, double p_190052_3_, double p_190052_5_, double p_190052_7_, int p_190052_9_)
+     {
+         Entity entity = this.field_147501_a.field_147551_g;

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

@@ -1,14 +1,14 @@
 --- ../src-base/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java
 +++ ../src-work/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java
-@@ -93,6 +93,7 @@
+@@ -92,6 +92,7 @@
+ 
      public void func_110541_a(List<IResourcePack> p_110541_1_)
      {
-         this.func_110543_a();
 +        net.minecraftforge.fml.common.ProgressManager.ProgressBar resReload = net.minecraftforge.fml.common.ProgressManager.push("Loading Resources", p_110541_1_.size()+1, true);
-         field_147967_a.info("Reloading ResourceManager: " + field_130074_a.join(Iterables.transform(p_110541_1_, new Function<IResourcePack, String>()
+         this.func_110543_a();
+         field_147967_a.info("Reloading ResourceManager: {}", new Object[] {field_130074_a.join(Iterables.transform(p_110541_1_, new Function<IResourcePack, String>()
          {
-             public String apply(@Nullable IResourcePack p_apply_1_)
-@@ -103,23 +104,32 @@
+@@ -104,23 +105,32 @@
  
          for (IResourcePack iresourcepack : p_110541_1_)
          {

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/settings/GameSettings.java
 +++ ../src-work/minecraft/net/minecraft/client/settings/GameSettings.java
-@@ -148,6 +148,7 @@
+@@ -156,6 +156,7 @@
  
      public GameSettings(Minecraft p_i46326_1_, File p_i46326_2_)
      {
@@ -8,7 +8,7 @@
          this.field_74324_K = (KeyBinding[])ArrayUtils.addAll(new KeyBinding[] {this.field_74312_F, this.field_74313_G, this.field_74351_w, this.field_74370_x, this.field_74368_y, this.field_74366_z, this.field_74314_A, this.field_74311_E, this.field_151444_V, this.field_74316_C, this.field_151445_Q, this.field_74310_D, this.field_74321_H, this.field_74322_I, this.field_74323_J, this.field_151447_Z, this.field_151457_aa, this.field_151458_ab, this.field_152395_am, this.field_178883_an, this.field_186718_X}, this.field_151456_ac);
          this.field_74318_M = EnumDifficulty.NORMAL;
          this.field_74332_R = "";
-@@ -172,6 +173,7 @@
+@@ -179,6 +180,7 @@
  
      public GameSettings()
      {
@@ -16,23 +16,38 @@
          this.field_74324_K = (KeyBinding[])ArrayUtils.addAll(new KeyBinding[] {this.field_74312_F, this.field_74313_G, this.field_74351_w, this.field_74370_x, this.field_74368_y, this.field_74366_z, this.field_74314_A, this.field_74311_E, this.field_151444_V, this.field_74316_C, this.field_151445_Q, this.field_74310_D, this.field_74321_H, this.field_74322_I, this.field_74323_J, this.field_151447_Z, this.field_151457_aa, this.field_151458_ab, this.field_152395_am, this.field_178883_an, this.field_186718_X}, this.field_151456_ac);
          this.field_74318_M = EnumDifficulty.NORMAL;
          this.field_74332_R = "";
-@@ -854,6 +856,7 @@
-                         if (astring[0].equals("key_" + keybinding.func_151464_g()))
+@@ -265,7 +267,7 @@
+                 this.field_74317_L.func_147117_R().func_147633_a(this.field_151442_I);
+                 this.field_74317_L.func_110434_K().func_110577_a(TextureMap.field_110575_b);
+                 this.field_74317_L.func_147117_R().func_174937_a(false, this.field_151442_I > 0);
+-                this.field_74317_L.func_175603_A();
++                this.needsResourceRefresh = true; // FORGE: fix for MC-64581 very laggy mipmap slider
+             }
+         }
+ 
+@@ -887,7 +889,12 @@
+                     {
+                         if (s1.equals("key_" + keybinding.func_151464_g()))
                          {
-                             keybinding.func_151462_b(Integer.parseInt(astring[1]));
-+                            if (astring.length == 3) keybinding.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.valueFromString(astring[2]), Integer.parseInt(astring[1]));
+-                            keybinding.func_151462_b(Integer.parseInt(s2));
++                            if (s2.indexOf(':') != -1)
++                            {
++                                String[] t = s2.split(":");
++                                keybinding.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.valueFromString(t[1]), Integer.parseInt(t[0]));
++                            } else
++                            keybinding.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.NONE, Integer.parseInt(s2));
                          }
                      }
  
-@@ -895,6 +898,7 @@
+@@ -944,6 +951,7 @@
  
      public void func_74303_b()
      {
 +        if (net.minecraftforge.fml.client.FMLClientHandler.instance().isLoading()) return;
+         PrintWriter printwriter = null;
+ 
          try
-         {
-             PrintWriter printwriter = new PrintWriter(new FileWriter(this.field_74354_ai));
-@@ -964,7 +968,8 @@
+@@ -1017,7 +1025,8 @@
  
              for (KeyBinding keybinding : this.field_74324_K)
              {
@@ -42,7 +57,7 @@
              }
  
              for (SoundCategory soundcategory : SoundCategory.values())
-@@ -1194,4 +1199,24 @@
+@@ -1250,4 +1259,35 @@
              return p_148264_1_;
          }
      }
@@ -65,5 +80,16 @@
 +        field_151458_ab.setKeyConflictContext(inGame);
 +        field_186718_X.setKeyConflictContext(inGame);
 +    }
++
++    // FORGE: fix for MC-64581 very laggy mipmap slider
++    private boolean needsResourceRefresh = false;
++    public void onGuiClosed()
++    {
++        if (needsResourceRefresh)
++        {
++            this.field_74317_L.func_175603_A();
++            this.needsResourceRefresh = false;
++        }
++    }
 +    /******* Forge End ***********/
  }

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

@@ -53,11 +53,11 @@
      public boolean func_151470_d()
      {
 -        return this.field_74513_e;
-+        return this.field_74513_e && getKeyConflictContext().isActive() && getKeyModifier().isActive();
++        return this.field_74513_e && getKeyConflictContext().isActive() && getKeyModifier().isActive(getKeyConflictContext());
      }
  
      public String func_151466_e()
-@@ -158,4 +158,130 @@
+@@ -158,4 +158,135 @@
  
          return i;
      }
@@ -101,7 +101,7 @@
 +     */
 +    public boolean isActiveAndMatches(int keyCode)
 +    {
-+        return keyCode == this.func_151463_i() && getKeyConflictContext().isActive() && getKeyModifier().isActive();
++        return keyCode != 0 && keyCode == this.func_151463_i() && getKeyConflictContext().isActive() && getKeyModifier().isActive(getKeyConflictContext());
 +    }
 +
 +    public void setKeyConflictContext(net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext)
@@ -159,9 +159,14 @@
 +            {
 +                return true;
 +            }
-+            else if (keyModifier == otherKeyModifier || keyModifier == net.minecraftforge.client.settings.KeyModifier.NONE || otherKeyModifier == net.minecraftforge.client.settings.KeyModifier.NONE)
++            else if (func_151463_i() == other.func_151463_i())
 +            {
-+                return func_151463_i() == other.func_151463_i();
++                return keyModifier == otherKeyModifier ||
++                        // IN_GAME key contexts have a conflict when at least one modifier is NONE.
++                        // For example: If you hold shift to crouch, you can still press E to open your inventory. This means that a Shift+E hotkey is in conflict with E.
++                        // GUI and other key contexts do not have this limitation.
++                        (getKeyConflictContext().conflicts(net.minecraftforge.client.settings.KeyConflictContext.IN_GAME) &&
++                                (keyModifier == net.minecraftforge.client.settings.KeyModifier.NONE || otherKeyModifier == net.minecraftforge.client.settings.KeyModifier.NONE));
 +            }
 +        }
 +        return false;

patches/minecraft/net/minecraft/command/CommandDebug.java.patch

@@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/command/CommandDebug.java
++++ ../src-work/minecraft/net/minecraft/command/CommandDebug.java
+@@ -99,7 +99,7 @@
+         {
+             IOUtils.closeQuietly((Writer)filewriter);
+             field_147208_a.error("Could not save profiler results to {}", new Object[] {file1, throwable});
+-        }
++        } finally { IOUtils.closeQuietly(filewriter); } // FORGE: Fix MC-103399
+     }
+ 
+     private String func_184893_b(long p_184893_1_, int p_184893_3_, MinecraftServer p_184893_4_)

patches/minecraft/net/minecraft/command/CommandFill.java.patch

@@ -21,8 +21,8 @@
                                              continue;
                                          }
                                      }
--                                    else if (p_184881_3_[8].equals("replace") && !block.func_149716_u())
-+                                    else if (p_184881_3_[8].equals("replace") && !block.hasTileEntity(state))
+-                                    else if ("replace".equals(p_184881_3_[8]) && !block.func_149716_u())
++                                    else if ("replace".equals(p_184881_3_[8]) && !block.hasTileEntity(state))
                                      {
                                          if (p_184881_3_.length > 9)
                                          {

patches/minecraft/net/minecraft/command/CommandHandler.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/command/CommandHandler.java
 +++ ../src-work/minecraft/net/minecraft/command/CommandHandler.java
-@@ -47,6 +47,16 @@
+@@ -47,6 +47,17 @@
          }
          else if (icommand.func_184882_a(this.func_184879_a(), p_71556_1_))
          {
@@ -13,15 +13,16 @@
 +                }
 +                return 1;
 +            }
++            if (event.getParameters() != null) astring = event.getParameters();
 +
              if (i > -1)
              {
                  List<Entity> list = EntitySelector.<Entity>func_179656_b(p_71556_1_, astring[i], Entity.class);
-@@ -110,7 +120,7 @@
+@@ -110,7 +121,7 @@
              TextComponentTranslation textcomponenttranslation = new TextComponentTranslation("commands.generic.exception", new Object[0]);
              textcomponenttranslation.func_150256_b().func_150238_a(TextFormatting.RED);
              p_175786_1_.func_145747_a(textcomponenttranslation);
--            field_147175_a.warn("Couldn\'t process command: \'" + p_175786_4_ + "\'");
+-            field_147175_a.warn("Couldn\'t process command: \'{}\'", new Object[] {p_175786_4_});
 +            field_147175_a.warn("Couldn\'t process command: \'" + p_175786_4_ + "\'", var9);
          }
  

patches/minecraft/net/minecraft/command/EntitySelector.java.patch

@@ -5,10 +5,18 @@
  public class EntitySelector
  {
 -    private static final Pattern field_82389_a = Pattern.compile("^@([pare])(?:\\[([\\w=,!-]*)\\])?$");
-+    private static final Pattern field_82389_a = Pattern.compile("^@([pare])(?:\\[([\\w\\.=,!-]*)\\])?$"); // FORGE: allow . in entity selectors
++    private static final Pattern field_82389_a = Pattern.compile("^@([pare])(?:\\[([\\w\\.:=,!-]*)\\])?$"); // FORGE: allow '.' and ':' in entity selectors
      private static final Pattern field_82387_b = Pattern.compile("\\G([-!]?[\\w-]*)(?:$|,)");
 -    private static final Pattern field_82388_c = Pattern.compile("\\G(\\w+)=([-!]?[\\w-]*)(?:$|,)");
-+    private static final Pattern field_82388_c = Pattern.compile("\\G(\\w+)=([-!]?[\\w\\.-]*)(?:$|,)"); // FORGE: allow . in entity selectors
++    private static final Pattern field_82388_c = Pattern.compile("\\G([\\w:]+)=([-!]?[\\w\\.-]*)(?:$|,)"); // FORGE: allow ':' in arguments and '.' in value of entity selectors
      private static final Set<String> field_179666_d = Sets.newHashSet(new String[] {"x", "y", "z", "dx", "dy", "dz", "rm", "r"});
  
      @Nullable
+@@ -111,6 +111,7 @@
+                         list2.addAll(func_184951_f(map));
+                         list2.addAll(func_180698_a(map, vec3d));
+                         list2.addAll(func_179662_g(map));
++                        list2.addAll(net.minecraftforge.event.ForgeEventFactory.gatherEntitySelectors(map, s, p_179656_0_, vec3d));
+                         list1.addAll(func_179660_a(map, p_179656_2_, list2, s, world, blockpos));
+                     }
+                 }