1.12.1 Update, Not much modder facing changes, 1.12 mods should load and run fine on this version.

build.gradle

@@ -1,5 +1,6 @@
 buildscript {
     repositories {
+        mavenLocal()
         mavenCentral()
         maven {
             name = "forge"
@@ -26,7 +27,7 @@ apply plugin: "maven"
 apply plugin: "net.minecraftforge.gradle.patcher"
 apply plugin: "net.minecraftforge.gradle.launch4j"
 
-minecraft.version = "1.12"
+minecraft.version = "1.12.1"
 
 minecraft {
     mappings = 'snapshot_nodoc_20170624'

jsons/1.12.1-dev.json

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

jsons/1.12.1-rel.json

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

jsons/1.12.1.json

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

jsons/1.12.json

@@ -1,10 +1,10 @@
 {
     "assetIndex": {
         "id": "1.12",
-        "sha1": "67e29e024e664064c1f04c728604f83c24cbc218",
-        "size": 169014,
-        "url": "https://launchermeta.mojang.com/mc/assets/1.12/67e29e024e664064c1f04c728604f83c24cbc218/1.12.json",
-        "totalSize": 127037169
+        "sha1": "c2ba0c4da30cce204c70db2ebc32a942cea8c7dd",
+        "size": 169015,
+        "url": "https://launchermeta.mojang.com/mc/assets/1.12/c2ba0c4da30cce204c70db2ebc32a942cea8c7dd/1.12.json",
+        "totalSize": 127300317
     },
     "assets": "1.12",
     "downloads": {
@@ -719,6 +719,6 @@
     "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}",
     "minimumLauncherVersion": 18,
     "releaseTime": "2017-06-02T13:50:27+00:00",
-    "time": "2017-06-13T06:57:00+00:00",
+    "time": "2017-08-02T10:51:18+00:00",
     "type": "release"
 }

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

@@ -205,7 +205,7 @@
      }
  
      protected ItemStack func_180643_i(IBlockState p_180643_1_)
-@@ -810,12 +826,12 @@
+@@ -810,6 +826,7 @@
          p_176216_2_.field_70181_x = 0.0D;
      }
  
@@ -213,21 +213,7 @@
      public ItemStack func_185473_a(World p_185473_1_, BlockPos p_185473_2_, IBlockState p_185473_3_)
      {
          return new ItemStack(Item.func_150898_a(this), 1, this.func_180651_a(p_185473_3_));
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         p_149666_2_.add(new ItemStack(this));
-@@ -831,7 +847,6 @@
-     {
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public CreativeTabs func_149708_J()
-     {
-         return this.field_149772_a;
-@@ -921,6 +936,7 @@
+@@ -919,6 +936,7 @@
          }
      }
  
@@ -235,7 +221,7 @@
      public SoundType func_185467_w()
      {
          return this.field_149762_H;
-@@ -936,6 +952,1287 @@
+@@ -934,6 +952,1287 @@
      {
      }
  
@@ -1523,7 +1509,7 @@
      public static void func_149671_p()
      {
          func_176215_a(0, field_176230_a, (new BlockAir()).func_149663_c("air"));
-@@ -1232,31 +2529,6 @@
+@@ -1230,31 +2529,6 @@
                  block15.field_149783_u = flag;
              }
          }

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockAnvil.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockAnvil.java
-@@ -108,7 +108,6 @@
-         return enumfacing.func_176740_k() == EnumFacing.Axis.X ? field_185760_c : field_185761_d;
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         p_149666_2_.add(new ItemStack(this));

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockCarpet.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockCarpet.java
-@@ -99,7 +99,6 @@
-         return ((EnumDyeColor)p_180651_1_.func_177229_b(field_176330_a)).func_176765_a();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (int i = 0; i < 16; ++i)

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockColored.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockColored.java
-@@ -31,7 +31,6 @@
-         return ((EnumDyeColor)p_180651_1_.func_177229_b(field_176581_a)).func_176765_a();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (EnumDyeColor enumdyecolor : EnumDyeColor.values())

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockConcretePowder.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockConcretePowder.java
-@@ -84,7 +84,6 @@
-         return ((EnumDyeColor)p_180651_1_.func_177229_b(field_192426_a)).func_176765_a();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (EnumDyeColor enumdyecolor : EnumDyeColor.values())

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockDaylightDetector.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockDaylightDetector.java
-@@ -163,7 +163,6 @@
-         return new BlockStateContainer(this, new IProperty[] {field_176436_a});
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         if (!this.field_176435_b)

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockDirt.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockDirt.java
-@@ -46,7 +46,6 @@
-         return p_176221_1_;
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         p_149666_2_.add(new ItemStack(this, 1, BlockDirt.DirtType.DIRT.func_176925_a()));

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

@@ -1,15 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockDoublePlant.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockDoublePlant.java
-@@ -26,7 +26,7 @@
- import net.minecraftforge.fml.relauncher.Side;
- import net.minecraftforge.fml.relauncher.SideOnly;
+@@ -24,7 +24,7 @@
+ import net.minecraft.world.IBlockAccess;
+ import net.minecraft.world.World;
  
 -public class BlockDoublePlant extends BlockBush implements IGrowable
 +public class BlockDoublePlant extends BlockBush implements IGrowable, net.minecraftforge.common.IShearable
  {
      public static final PropertyEnum<BlockDoublePlant.EnumPlantType> field_176493_a = PropertyEnum.<BlockDoublePlant.EnumPlantType>func_177709_a("variant", BlockDoublePlant.EnumPlantType.class);
      public static final PropertyEnum<BlockDoublePlant.EnumBlockHalf> field_176492_b = PropertyEnum.<BlockDoublePlant.EnumBlockHalf>func_177709_a("half", BlockDoublePlant.EnumBlockHalf.class);
-@@ -89,6 +89,8 @@
+@@ -87,6 +87,8 @@
              Block block = (Block)(flag ? this : p_176475_1_.func_180495_p(blockpos).func_177230_c());
              Block block1 = (Block)(flag ? p_176475_1_.func_180495_p(blockpos1).func_177230_c() : this);
  
@@ -18,7 +18,7 @@
              if (block == this)
              {
                  p_176475_1_.func_180501_a(blockpos, Blocks.field_150350_a.func_176223_P(), 2);
-@@ -97,17 +99,13 @@
+@@ -95,17 +97,13 @@
              if (block1 == this)
              {
                  p_176475_1_.func_180501_a(blockpos1, Blocks.field_150350_a.func_176223_P(), 3);
@@ -37,7 +37,7 @@
          if (p_180671_3_.func_177229_b(field_176492_b) == BlockDoublePlant.EnumBlockHalf.UPPER)
          {
              return p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()).func_177230_c() == this;
-@@ -162,7 +160,6 @@
+@@ -160,7 +158,6 @@
  
      public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, ItemStack p_180657_6_)
      {
@@ -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_);
          }
-@@ -222,13 +219,10 @@
+@@ -220,8 +217,6 @@
          else
          {
              p_176489_4_.func_71029_a(StatList.func_188055_a(this));
@@ -54,12 +54,7 @@
              return true;
          }
      }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (BlockDoublePlant.EnumPlantType blockdoubleplant$enumplanttype : BlockDoublePlant.EnumPlantType.values())
-@@ -293,6 +287,24 @@
+@@ -290,6 +285,24 @@
          return Block.EnumOffsetType.XZ;
      }
  

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

@@ -1,18 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockFlower.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockFlower.java
-@@ -39,7 +39,6 @@
-         return ((BlockFlower.EnumFlowerType)p_180651_1_.func_177229_b(this.func_176494_l())).func_176968_b();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (BlockFlower.EnumFlowerType blockflower$enumflowertype : BlockFlower.EnumFlowerType.func_176966_a(this.func_176495_j()))
-@@ -151,7 +150,6 @@
-             return ablockflower$enumflowertype[p_176967_1_];
-         }
- 
--        @SideOnly(Side.CLIENT)
-         public static BlockFlower.EnumFlowerType[] func_176966_a(BlockFlower.EnumFlowerColor p_176966_0_)
-         {
-             return field_176981_k[p_176966_0_.ordinal()];

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

@@ -1,14 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockNewLeaf.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockNewLeaf.java
-@@ -52,7 +52,6 @@
-         return new ItemStack(this, 1, p_185473_3_.func_177230_c().func_176201_c(p_185473_3_) & 3);
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         p_149666_2_.add(new ItemStack(this, 1, 0));
-@@ -109,4 +108,10 @@
+@@ -106,4 +106,10 @@
              super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
          }
      }

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockNewLog.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockNewLog.java
-@@ -56,7 +56,6 @@
-         }
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         p_149666_2_.add(new ItemStack(this, 1, BlockPlanks.EnumType.ACACIA.func_176839_a() - 4));

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

@@ -1,14 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockOldLeaf.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockOldLeaf.java
-@@ -47,7 +47,6 @@
-         return p_176232_1_.func_177229_b(field_176239_P) == BlockPlanks.EnumType.JUNGLE ? 40 : super.func_176232_d(p_176232_1_);
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         p_149666_2_.add(new ItemStack(this, 1, BlockPlanks.EnumType.OAK.func_176839_a()));
-@@ -104,11 +103,16 @@
+@@ -101,11 +101,16 @@
          if (!p_180657_1_.field_72995_K && p_180657_6_.func_77973_b() == Items.field_151097_aZ)
          {
              p_180657_2_.func_71029_a(StatList.func_188055_a(this));

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockOldLog.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockOldLog.java
-@@ -60,7 +60,6 @@
-         }
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         p_149666_2_.add(new ItemStack(this, 1, BlockPlanks.EnumType.OAK.func_176839_a()));

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockPlanks.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockPlanks.java
-@@ -31,7 +31,6 @@
-         return ((BlockPlanks.EnumType)p_180651_1_.func_177229_b(field_176383_a)).func_176839_a();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (BlockPlanks.EnumType blockplanks$enumtype : BlockPlanks.EnumType.values())

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockPrismarine.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockPrismarine.java
-@@ -60,7 +60,6 @@
-         return this.func_176223_P().func_177226_a(field_176332_a, BlockPrismarine.EnumType.func_176810_a(p_176203_1_));
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         p_149666_2_.add(new ItemStack(this, 1, field_176331_b));

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

@@ -1,14 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockQuartz.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockQuartz.java
-@@ -61,7 +61,6 @@
-         return blockquartz$enumtype != BlockQuartz.EnumType.LINES_X && blockquartz$enumtype != BlockQuartz.EnumType.LINES_Z ? super.func_180643_i(p_180643_1_) : new ItemStack(Item.func_150898_a(this), 1, BlockQuartz.EnumType.LINES_Y.func_176796_a());
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         p_149666_2_.add(new ItemStack(this, 1, BlockQuartz.EnumType.DEFAULT.func_176796_a()));
-@@ -111,6 +110,26 @@
+@@ -108,6 +108,26 @@
          return new BlockStateContainer(this, new IProperty[] {field_176335_a});
      }
  

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockRedSandstone.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockRedSandstone.java
-@@ -28,7 +28,6 @@
-         return ((BlockRedSandstone.EnumType)p_180651_1_.func_177229_b(field_176336_a)).func_176827_a();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (BlockRedSandstone.EnumType blockredsandstone$enumtype : BlockRedSandstone.EnumType.values())

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockSand.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockSand.java
-@@ -28,7 +28,6 @@
-         return ((BlockSand.EnumType)p_180651_1_.func_177229_b(field_176504_a)).func_176688_a();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (BlockSand.EnumType blocksand$enumtype : BlockSand.EnumType.values())

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockSandStone.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockSandStone.java
-@@ -31,7 +31,6 @@
-         return ((BlockSandStone.EnumType)p_180651_1_.func_177229_b(field_176297_a)).func_176675_a();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (BlockSandStone.EnumType blocksandstone$enumtype : BlockSandStone.EnumType.values())

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

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockSapling.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockSapling.java
-@@ -76,6 +76,7 @@
+@@ -74,6 +74,7 @@
  
      public void func_176476_e(World p_176476_1_, BlockPos p_176476_2_, IBlockState p_176476_3_, Random p_176476_4_)
      {
@@ -8,11 +8,3 @@
          WorldGenerator worldgenerator = (WorldGenerator)(p_176476_4_.nextInt(10) == 0 ? new WorldGenBigTree(true) : new WorldGenTrees(true));
          int i = 0;
          int j = 0;
-@@ -209,7 +210,6 @@
-         return ((BlockPlanks.EnumType)p_180651_1_.func_177229_b(field_176480_a)).func_176839_a();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (BlockPlanks.EnumType blockplanks$enumtype : BlockPlanks.EnumType.values())

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockSilverfish.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockSilverfish.java
-@@ -75,7 +75,6 @@
-         return new ItemStack(this, 1, p_185473_3_.func_177230_c().func_176201_c(p_185473_3_));
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (BlockSilverfish.EnumType blocksilverfish$enumtype : BlockSilverfish.EnumType.values())

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockSponge.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockSponge.java
-@@ -107,7 +107,6 @@
-         return i > 0;
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         p_149666_2_.add(new ItemStack(this, 1, 0));

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockStainedGlass.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockStainedGlass.java
-@@ -34,7 +34,6 @@
-         return ((EnumDyeColor)p_180651_1_.func_177229_b(field_176547_a)).func_176765_a();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (EnumDyeColor enumdyecolor : EnumDyeColor.values())

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockStainedGlassPane.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockStainedGlassPane.java
-@@ -35,7 +35,6 @@
-         return ((EnumDyeColor)p_180651_1_.func_177229_b(field_176245_a)).func_176765_a();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (int i = 0; i < EnumDyeColor.values().length; ++i)

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockStone.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockStone.java
-@@ -50,7 +50,6 @@
-         return ((BlockStone.EnumType)p_180651_1_.func_177229_b(field_176247_a)).func_176642_a();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (BlockStone.EnumType blockstone$enumtype : BlockStone.EnumType.values())

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockStoneBrick.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockStoneBrick.java
-@@ -32,7 +32,6 @@
-         return ((BlockStoneBrick.EnumType)p_180651_1_.func_177229_b(field_176249_a)).func_176612_a();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (BlockStoneBrick.EnumType blockstonebrick$enumtype : BlockStoneBrick.EnumType.values())

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockStoneSlab.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockStoneSlab.java
-@@ -68,7 +68,6 @@
-         return BlockStoneSlab.EnumType.func_176625_a(p_185674_1_.func_77960_j() & 7);
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (BlockStoneSlab.EnumType blockstoneslab$enumtype : BlockStoneSlab.EnumType.values())

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockStoneSlabNew.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockStoneSlabNew.java
-@@ -74,7 +74,6 @@
-         return BlockStoneSlabNew.EnumType.func_176916_a(p_185674_1_.func_77960_j() & 7);
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (BlockStoneSlabNew.EnumType blockstoneslabnew$enumtype : BlockStoneSlabNew.EnumType.values())

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

@@ -1,15 +1,15 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockTallGrass.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockTallGrass.java
-@@ -24,7 +24,7 @@
- import net.minecraftforge.fml.relauncher.Side;
- import net.minecraftforge.fml.relauncher.SideOnly;
+@@ -22,7 +22,7 @@
+ import net.minecraft.world.IBlockAccess;
+ import net.minecraft.world.World;
  
 -public class BlockTallGrass extends BlockBush implements IGrowable
 +public class BlockTallGrass extends BlockBush implements IGrowable, net.minecraftforge.common.IShearable
  {
      public static final PropertyEnum<BlockTallGrass.EnumType> field_176497_a = PropertyEnum.<BlockTallGrass.EnumType>func_177709_a("type", BlockTallGrass.EnumType.class);
      protected static final AxisAlignedBB field_185522_c = new AxisAlignedBB(0.09999999403953552D, 0.0D, 0.09999999403953552D, 0.8999999761581421D, 0.800000011920929D, 0.8999999761581421D);
-@@ -42,7 +42,7 @@
+@@ -40,7 +40,7 @@
  
      public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
      {
@@ -18,7 +18,7 @@
      }
  
      public boolean func_176200_f(IBlockAccess p_176200_1_, BlockPos p_176200_2_)
-@@ -52,7 +52,7 @@
+@@ -50,7 +50,7 @@
  
      public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
      {
@@ -27,15 +27,7 @@
      }
  
      public int func_149679_a(int p_149679_1_, Random p_149679_2_)
-@@ -78,7 +78,6 @@
-         return new ItemStack(this, 1, p_185473_3_.func_177230_c().func_176201_c(p_185473_3_));
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (int i = 1; i < 3; ++i)
-@@ -181,4 +180,19 @@
+@@ -178,4 +178,19 @@
              }
          }
      }

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

@@ -1,14 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/block/BlockWall.java
 +++ ../src-work/minecraft/net/minecraft/block/BlockWall.java
-@@ -128,7 +128,6 @@
-         return Block.func_193382_c(p_194143_0_) || p_194143_0_ == Blocks.field_180401_cv || p_194143_0_ == Blocks.field_150440_ba || p_194143_0_ == Blocks.field_150423_aK || p_194143_0_ == Blocks.field_150428_aP;
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (BlockWall.EnumType blockwall$enumtype : BlockWall.EnumType.values())
-@@ -160,10 +159,10 @@
+@@ -159,10 +159,10 @@
  
      public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
      {
@@ -23,7 +15,7 @@
          boolean flag4 = flag && !flag1 && flag2 && !flag3 || !flag && flag1 && !flag2 && flag3;
          return p_176221_1_.func_177226_a(field_176256_a, Boolean.valueOf(!flag4 || !p_176221_2_.func_175623_d(p_176221_3_.func_177984_a()))).func_177226_a(field_176254_b, Boolean.valueOf(flag)).func_177226_a(field_176257_M, Boolean.valueOf(flag1)).func_177226_a(field_176258_N, Boolean.valueOf(flag2)).func_177226_a(field_176259_O, Boolean.valueOf(flag3));
      }
-@@ -178,6 +177,24 @@
+@@ -177,6 +177,24 @@
          return p_193383_4_ != EnumFacing.UP && p_193383_4_ != EnumFacing.DOWN ? BlockFaceShape.MIDDLE_POLE_THICK : BlockFaceShape.CENTER_BIG;
      }
  

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

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/block/BlockWoodSlab.java
-+++ ../src-work/minecraft/net/minecraft/block/BlockWoodSlab.java
-@@ -66,7 +66,6 @@
-         return BlockPlanks.EnumType.func_176837_a(p_185674_1_.func_77960_j() & 7);
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_149666_a(CreativeTabs p_149666_1_, NonNullList<ItemStack> p_149666_2_)
-     {
-         for (BlockPlanks.EnumType blockplanks$enumtype : BlockPlanks.EnumType.values())

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

@@ -273,9 +273,9 @@
          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(335, socketaddress.toString(), 0, EnumConnectionState.LOGIN));
+-        networkmanager.func_179290_a(new C00Handshake(socketaddress.toString(), 0, EnumConnectionState.LOGIN));
 -        networkmanager.func_179290_a(new CPacketLoginStart(this.func_110432_I().func_148256_e()));
-+        networkmanager.func_179290_a(new C00Handshake(335, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true));
++        networkmanager.func_179290_a(new C00Handshake(socketaddress.toString(), 0, EnumConnectionState.LOGIN, true));
 +        com.mojang.authlib.GameProfile gameProfile = this.func_110432_I().func_148256_e();
 +        if (!this.func_110432_I().hasCachedProperties())
 +        {

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
 @@ -83,7 +83,7 @@
-         boolean flag1 = this.field_148301_e.field_82821_f < 335;
+         boolean flag1 = this.field_148301_e.field_82821_f < 338;
          boolean flag2 = flag || flag1;
          this.field_148300_d.field_71466_p.func_78276_b(this.field_148301_e.field_78847_a, p_192634_2_ + 32 + 3, p_192634_3_ + 1, 16777215);
 -        List<String> list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_192634_4_ - 32 - 2);

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(335, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN));
-+                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(335, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN, true));
+-                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN));
++                    GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(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/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
-@@ -293,7 +293,7 @@
+@@ -295,7 +295,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();
-@@ -755,7 +755,7 @@
+@@ -757,7 +757,7 @@
  
              if (tileentity != null)
              {
@@ -18,7 +18,7 @@
              }
          }
      }
-@@ -838,7 +838,9 @@
+@@ -840,7 +840,9 @@
      public void func_147251_a(SPacketChat p_147251_1_)
      {
          PacketThreadUtil.func_180031_a(p_147251_1_, this, this.field_147299_f);
@@ -29,7 +29,7 @@
      }
  
      public void func_147279_a(SPacketAnimation p_147279_1_)
-@@ -969,7 +971,7 @@
+@@ -971,7 +973,7 @@
  
                      if (entity1 == this.field_147299_f.field_71439_g && !flag)
                      {
@@ -38,7 +38,7 @@
                      }
                  }
              }
-@@ -1217,6 +1219,15 @@
+@@ -1219,6 +1221,15 @@
              {
                  tileentity.func_145839_a(p_147273_1_.func_148857_g());
              }
@@ -54,7 +54,7 @@
  
              if (flag && this.field_147299_f.field_71462_r instanceof GuiCommandBlock)
              {
-@@ -1317,15 +1328,15 @@
+@@ -1319,15 +1330,15 @@
              }
              else if (f == 101.0F)
              {
@@ -73,7 +73,7 @@
              }
          }
          else if (i == 6)
-@@ -1487,7 +1498,7 @@
+@@ -1489,7 +1500,7 @@
  
          if (entity instanceof EntityLivingBase)
          {

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

@@ -12,8 +12,8 @@
  
          try
          {
--            networkmanager.func_179290_a(new C00Handshake(335, serveraddress.func_78861_a(), serveraddress.func_78864_b(), EnumConnectionState.STATUS));
-+            networkmanager.func_179290_a(new C00Handshake(335, serveraddress.func_78861_a(), serveraddress.func_78864_b(), EnumConnectionState.STATUS, true));
+-            networkmanager.func_179290_a(new C00Handshake(serveraddress.func_78861_a(), serveraddress.func_78864_b(), EnumConnectionState.STATUS));
++            networkmanager.func_179290_a(new C00Handshake(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/renderer/RenderGlobal.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/RenderGlobal.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/RenderGlobal.java
-@@ -552,8 +552,10 @@
+@@ -553,8 +553,10 @@
  
      public void func_180446_a(Entity p_180446_1_, ICamera p_180446_2_, float p_180446_3_)
      {
@@ -11,7 +11,7 @@
              --this.field_72740_G;
          }
          else
-@@ -564,9 +566,12 @@
+@@ -565,9 +567,12 @@
              this.field_72769_h.field_72984_F.func_76320_a("prepare");
              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_);
@@ -24,7 +24,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_;
-@@ -578,11 +583,15 @@
+@@ -579,11 +584,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 +40,7 @@
                  ++this.field_72749_I;
  
                  if (entity1.func_145770_h(d0, d1, d2))
-@@ -605,6 +614,7 @@
+@@ -606,6 +615,7 @@
                  {
                      for (Entity entity2 : classinheritancemultimap)
                      {
@@ -48,7 +48,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)
-@@ -641,6 +651,7 @@
+@@ -642,6 +652,7 @@
                  }
              }
  
@@ -56,7 +56,7 @@
              if (this.func_174985_d() && (!list1.isEmpty() || this.field_184386_ad))
              {
                  this.field_72769_h.field_72984_F.func_76318_c("entityOutlines");
-@@ -680,6 +691,7 @@
+@@ -681,6 +692,7 @@
              this.field_72769_h.field_72984_F.func_76318_c("blockentities");
              RenderHelper.func_74519_b();
  
@@ -64,7 +64,7 @@
              for (RenderGlobal.ContainerLocalRenderInformation renderglobal$containerlocalrenderinformation1 : this.field_72755_R)
              {
                  List<TileEntity> list3 = renderglobal$containerlocalrenderinformation1.field_178036_a.func_178571_g().func_178485_b();
-@@ -688,6 +700,7 @@
+@@ -689,6 +701,7 @@
                  {
                      for (TileEntity tileentity2 : list3)
                      {
@@ -72,7 +72,7 @@
                          TileEntityRendererDispatcher.field_147556_a.func_180546_a(tileentity2, p_180446_3_, -1);
                      }
                  }
-@@ -697,9 +710,11 @@
+@@ -698,9 +711,11 @@
              {
                  for (TileEntity tileentity : this.field_181024_n)
                  {
@@ -84,7 +84,7 @@
  
              this.func_180443_s();
  
-@@ -950,7 +965,7 @@
+@@ -951,7 +966,7 @@
                  BlockPos blockpos2 = renderchunk4.func_178568_j().func_177982_a(8, 8, 8);
                  boolean flag3 = blockpos2.func_177951_i(blockpos1) < 768.0D;
  
@@ -93,7 +93,7 @@
                  {
                      this.field_175009_l.add(renderchunk4);
                  }
-@@ -1249,6 +1264,13 @@
+@@ -1253,6 +1268,13 @@
  
      public void func_174976_a(float p_174976_1_, int p_174976_2_)
      {
@@ -107,7 +107,7 @@
          if (this.field_72777_q.field_71441_e.field_73011_w.func_186058_p().func_186068_a() == 1)
          {
              this.func_180448_r();
-@@ -1466,6 +1488,12 @@
+@@ -1470,6 +1492,12 @@
  
      public void func_180447_b(float p_180447_1_, int p_180447_2_, double p_180447_3_, double p_180447_5_, double p_180447_7_)
      {
@@ -120,9 +120,9 @@
          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)
-@@ -1888,8 +1916,11 @@
-                 double d4 = (double)blockpos.func_177956_o() - d1;
-                 double d5 = (double)blockpos.func_177952_p() - d2;
+@@ -1892,8 +1920,11 @@
+                 double d7 = (double)blockpos.func_177956_o() - d4;
+                 double d8 = (double)blockpos.func_177952_p() - d5;
                  Block block = this.field_72769_h.func_180495_p(blockpos).func_177230_c();
 +                TileEntity te = this.field_72769_h.func_175625_s(blockpos);
 +                boolean hasBreak = block instanceof BlockChest || block instanceof BlockEnderChest || block instanceof BlockSign || block instanceof BlockSkull;
@@ -131,9 +131,9 @@
 -                if (!(block instanceof BlockChest) && !(block instanceof BlockEnderChest) && !(block instanceof BlockSign) && !(block instanceof BlockSkull))
 +                if (!hasBreak)
                  {
-                     if (d3 * d3 + d4 * d4 + d5 * d5 > 1024.0D)
+                     if (d6 * d6 + d7 * d7 + d8 * d8 > 1024.0D)
                      {
-@@ -2384,7 +2415,7 @@
+@@ -2388,7 +2419,7 @@
  
                  if (block.func_176223_P().func_185904_a() != Material.field_151579_a)
                  {

patches/minecraft/net/minecraft/creativetab/CreativeTabs.java.patch

@@ -44,7 +44,7 @@
          return this.field_78033_n < 6;
      }
  
-@@ -262,4 +284,39 @@
+@@ -260,4 +282,39 @@
              item.func_150895_a(this, p_78018_1_);
          }
      }

patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch

@@ -153,14 +153,14 @@
          this.field_71100_bB.func_75112_a(p_70037_1_);
          this.field_71075_bZ.func_75095_b(p_70037_1_);
  
-@@ -887,6 +932,7 @@
-     {
-         super.func_70014_b(p_70014_1_);
-         p_70014_1_.func_74768_a("DataVersion", 1139);
-+        net.minecraftforge.fml.common.FMLCommonHandler.instance().getDataFixer().writeVersionData(p_70014_1_);
-         p_70014_1_.func_74782_a("Inventory", this.field_71071_by.func_70442_a(new NBTTagList()));
-         p_70014_1_.func_74768_a("SelectedItemSlot", this.field_71071_by.field_70461_c);
-         p_70014_1_.func_74757_a("Sleeping", this.field_71083_bS);
+@@ -896,6 +941,7 @@
+         p_70014_1_.func_74768_a("XpTotal", this.field_71067_cb);
+         p_70014_1_.func_74768_a("XpSeed", this.field_175152_f);
+         p_70014_1_.func_74768_a("Score", this.func_71037_bA());
++        net.minecraftforge.fml.common.FMLCommonHandler.instance().getDataFixer().writeVersionData(p_70014_1_); //Moved down so it doesn't keep missing every MC update.
+ 
+         if (this.field_71077_c != null)
+         {
 @@ -905,6 +951,27 @@
              p_70014_1_.func_74757_a("SpawnForced", this.field_82248_d);
          }

patches/minecraft/net/minecraft/entity/player/InventoryPlayer.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/entity/player/InventoryPlayer.java
 +++ ../src-work/minecraft/net/minecraft/entity/player/InventoryPlayer.java
-@@ -293,7 +293,8 @@
+@@ -292,7 +292,8 @@
  
          if (itemstack.func_190926_b())
          {
@@ -10,7 +10,7 @@
  
              if (p_191973_2_.func_77942_o())
              {
-@@ -364,6 +365,13 @@
+@@ -363,6 +364,13 @@
                  }
              }
          }

patches/minecraft/net/minecraft/inventory/Container.java.patch

@@ -12,7 +12,7 @@
                  for (int j = 0; j < this.field_75149_d.size(); ++j)
                  {
                      ((IContainerListener)this.field_75149_d.get(j)).func_71111_a(this, i, itemstack1);
-@@ -603,18 +605,19 @@
+@@ -589,18 +591,19 @@
                  if (!itemstack.func_190926_b() && itemstack.func_77973_b() == p_75135_1_.func_77973_b() && (!p_75135_1_.func_77981_g() || p_75135_1_.func_77960_j() == itemstack.func_77960_j()) && ItemStack.func_77970_a(p_75135_1_, itemstack))
                  {
                      int j = itemstack.func_190916_E() + p_75135_1_.func_190916_E();
@@ -36,7 +36,7 @@
                          slot.func_75218_e();
                          flag = true;
                      }
-@@ -752,7 +755,7 @@
+@@ -738,7 +741,7 @@
                  p_94525_2_.func_190920_e(1);
                  break;
              case 2:

patches/minecraft/net/minecraft/item/Item.java.patch

@@ -60,19 +60,8 @@
          return p_77621_1_.func_147447_a(vec3d, vec3d1, p_77621_3_, !p_77621_3_, false);
      }
  
-@@ -399,7 +406,6 @@
-         return 0;
-     }
+@@ -409,6 +416,9 @@
  
--    @SideOnly(Side.CLIENT)
-     public void func_150895_a(CreativeTabs p_150895_1_, NonNullList<ItemStack> p_150895_2_)
-     {
-         if (this.func_194125_a(p_150895_1_))
-@@ -408,15 +414,16 @@
-         }
-     }
- 
--    @SideOnly(Side.CLIENT)
      protected boolean func_194125_a(CreativeTabs p_194125_1_)
      {
 +        for (CreativeTabs tab : this.getCreativeTabs())
@@ -81,13 +70,7 @@
          CreativeTabs creativetabs = this.func_77640_w();
          return creativetabs != null && (p_194125_1_ == CreativeTabs.field_78027_g || p_194125_1_ == creativetabs);
      }
- 
-     @Nullable
--    @SideOnly(Side.CLIENT)
-     public CreativeTabs func_77640_w()
-     {
-         return this.field_77701_a;
-@@ -438,11 +445,666 @@
+@@ -435,11 +445,666 @@
          return false;
      }
  
@@ -714,7 +697,7 @@
 +        }
 +        return builder.build();
 +    }
-+    
++
 +    /**
 +     * Can this Item disable a shield
 +     * @param stack The ItemStack
@@ -727,7 +710,7 @@
 +    {
 +        return this instanceof ItemAxe;
 +    }
-+    
++
 +    /**
 +     * Is this Item a shield
 +     * @param stack The ItemStack
@@ -754,7 +737,7 @@
      public static void func_150900_l()
      {
          func_179214_a(Blocks.field_150350_a, new ItemAir(Blocks.field_150350_a));
-@@ -1002,6 +1664,8 @@
+@@ -999,6 +1664,8 @@
          private final float field_78010_h;
          private final float field_78011_i;
          private final int field_78008_j;
@@ -763,7 +746,7 @@
  
          private ToolMaterial(int p_i1874_3_, int p_i1874_4_, float p_i1874_5_, float p_i1874_6_, int p_i1874_7_)
          {
-@@ -1037,6 +1701,7 @@
+@@ -1034,6 +1701,7 @@
              return this.field_78008_j;
          }
  
@@ -771,7 +754,7 @@
          public Item func_150995_f()
          {
              if (this == WOOD)
-@@ -1060,5 +1725,21 @@
+@@ -1057,5 +1725,21 @@
                  return this == DIAMOND ? Items.field_151045_i : null;
              }
          }

patches/minecraft/net/minecraft/item/ItemAppleGold.java.patch

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/item/ItemAppleGold.java
-+++ ../src-work/minecraft/net/minecraft/item/ItemAppleGold.java
-@@ -47,7 +47,6 @@
-         }
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_150895_a(CreativeTabs p_150895_1_, NonNullList<ItemStack> p_150895_2_)
-     {
-         if (this.func_194125_a(p_150895_1_))

patches/minecraft/net/minecraft/item/ItemBanner.java.patch

@@ -1,18 +0,0 @@
---- ../src-base/minecraft/net/minecraft/item/ItemBanner.java
-+++ ../src-work/minecraft/net/minecraft/item/ItemBanner.java
-@@ -133,7 +133,6 @@
-         func_185054_a(p_77624_1_, p_77624_3_);
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_150895_a(CreativeTabs p_150895_1_, NonNullList<ItemStack> p_150895_2_)
-     {
-         if (this.func_194125_a(p_150895_1_))
-@@ -157,7 +156,6 @@
-         return itemstack;
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public CreativeTabs func_77640_w()
-     {
-         return CreativeTabs.field_78031_c;

patches/minecraft/net/minecraft/item/ItemBed.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/item/ItemBed.java
 +++ ../src-work/minecraft/net/minecraft/item/ItemBed.java
-@@ -69,7 +69,7 @@
+@@ -67,7 +67,7 @@
                      IBlockState iblockstate2 = Blocks.field_150324_C.func_176223_P().func_177226_a(BlockBed.field_176471_b, Boolean.valueOf(false)).func_177226_a(BlockBed.field_185512_D, enumfacing).func_177226_a(BlockBed.field_176472_a, BlockBed.EnumPartType.FOOT);
                      p_180614_2_.func_180501_a(p_180614_3_, iblockstate2, 10);
                      p_180614_2_.func_180501_a(blockpos, iblockstate2.func_177226_a(BlockBed.field_176472_a, BlockBed.EnumPartType.HEAD), 10);
@@ -9,11 +9,3 @@
                      p_180614_2_.func_184133_a((EntityPlayer)null, p_180614_3_, soundtype.func_185841_e(), SoundCategory.BLOCKS, (soundtype.func_185843_a() + 1.0F) / 2.0F, soundtype.func_185847_b() * 0.8F);
                      TileEntity tileentity = p_180614_2_.func_175625_s(blockpos);
  
-@@ -113,7 +113,6 @@
-         return super.func_77658_a() + "." + EnumDyeColor.func_176764_b(p_77667_1_.func_77960_j()).func_176762_d();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_150895_a(CreativeTabs p_150895_1_, NonNullList<ItemStack> p_150895_2_)
-     {
-         if (this.func_194125_a(p_150895_1_))

patches/minecraft/net/minecraft/item/ItemBlock.java.patch

@@ -37,21 +37,7 @@
          {
              p_179222_3_ = EnumFacing.UP;
          }
-@@ -149,13 +137,11 @@
-         return this.field_150939_a.func_149739_a();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public CreativeTabs func_77640_w()
-     {
-         return this.field_150939_a.func_149708_J();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_150895_a(CreativeTabs p_150895_1_, NonNullList<ItemStack> p_150895_2_)
-     {
-         if (this.func_194125_a(p_150895_1_))
-@@ -173,6 +159,36 @@
+@@ -171,6 +159,36 @@
  
      public Block func_179223_d()
      {

patches/minecraft/net/minecraft/item/ItemCoal.java.patch

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/item/ItemCoal.java
-+++ ../src-work/minecraft/net/minecraft/item/ItemCoal.java
-@@ -19,7 +19,6 @@
-         return p_77667_1_.func_77960_j() == 1 ? "item.charcoal" : "item.coal";
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_150895_a(CreativeTabs p_150895_1_, NonNullList<ItemStack> p_150895_2_)
-     {
-         if (this.func_194125_a(p_150895_1_))

patches/minecraft/net/minecraft/item/ItemEnchantedBook.java.patch

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/item/ItemEnchantedBook.java
-+++ ../src-work/minecraft/net/minecraft/item/ItemEnchantedBook.java
-@@ -101,7 +101,6 @@
-         return itemstack;
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_150895_a(CreativeTabs p_150895_1_, NonNullList<ItemStack> p_150895_2_)
-     {
-         if (p_150895_1_ == CreativeTabs.field_78027_g)

patches/minecraft/net/minecraft/item/ItemFishFood.java.patch

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/item/ItemFishFood.java
-+++ ../src-work/minecraft/net/minecraft/item/ItemFishFood.java
-@@ -47,7 +47,6 @@
-         super.func_77849_c(p_77849_1_, p_77849_2_, p_77849_3_);
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_150895_a(CreativeTabs p_150895_1_, NonNullList<ItemStack> p_150895_2_)
-     {
-         if (this.func_194125_a(p_150895_1_))

patches/minecraft/net/minecraft/item/ItemMonsterPlacer.java.patch

@@ -1,18 +0,0 @@
---- ../src-base/minecraft/net/minecraft/item/ItemMonsterPlacer.java
-+++ ../src-work/minecraft/net/minecraft/item/ItemMonsterPlacer.java
-@@ -250,7 +250,6 @@
-         }
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_150895_a(CreativeTabs p_150895_1_, NonNullList<ItemStack> p_150895_2_)
-     {
-         if (this.func_194125_a(p_150895_1_))
-@@ -264,7 +263,6 @@
-         }
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public static void func_185078_a(ItemStack p_185078_0_, ResourceLocation p_185078_1_)
-     {
-         NBTTagCompound nbttagcompound = p_185078_0_.func_77942_o() ? p_185078_0_.func_77978_p() : new NBTTagCompound();

patches/minecraft/net/minecraft/item/ItemPotion.java.patch

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/item/ItemPotion.java
-+++ ../src-work/minecraft/net/minecraft/item/ItemPotion.java
-@@ -120,7 +120,6 @@
-         return super.func_77636_d(p_77636_1_) || !PotionUtils.func_185189_a(p_77636_1_).isEmpty();
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_150895_a(CreativeTabs p_150895_1_, NonNullList<ItemStack> p_150895_2_)
-     {
-         if (this.func_194125_a(p_150895_1_))

patches/minecraft/net/minecraft/item/ItemSkull.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/item/ItemSkull.java
 +++ ../src-work/minecraft/net/minecraft/item/ItemSkull.java
-@@ -45,13 +45,18 @@
+@@ -43,13 +43,18 @@
          }
          else
          {
@@ -20,11 +20,3 @@
                  {
                      return EnumActionResult.FAIL;
                  }
-@@ -128,7 +133,6 @@
-         }
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_150895_a(CreativeTabs p_150895_1_, NonNullList<ItemStack> p_150895_2_)
-     {
-         if (this.func_194125_a(p_150895_1_))

patches/minecraft/net/minecraft/item/ItemTippedArrow.java.patch

@@ -1,10 +0,0 @@
---- ../src-base/minecraft/net/minecraft/item/ItemTippedArrow.java
-+++ ../src-work/minecraft/net/minecraft/item/ItemTippedArrow.java
-@@ -31,7 +31,6 @@
-         return entitytippedarrow;
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public void func_150895_a(CreativeTabs p_150895_1_, NonNullList<ItemStack> p_150895_2_)
-     {
-         if (this.func_194125_a(p_150895_1_))

patches/minecraft/net/minecraft/item/crafting/IRecipe.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/item/crafting/IRecipe.java
 +++ ../src-work/minecraft/net/minecraft/item/crafting/IRecipe.java
-@@ -4,35 +4,33 @@
+@@ -4,21 +4,21 @@
  import net.minecraft.item.ItemStack;
  import net.minecraft.util.NonNullList;
  import net.minecraft.world.World;
@@ -25,22 +25,13 @@
 +        return net.minecraftforge.common.ForgeHooks.defaultRecipeGetRemainingItems(p_179532_1_);
 +    }
  
--    @SideOnly(Side.CLIENT)
--default NonNullList<Ingredient> func_192400_c()
-+    default NonNullList<Ingredient> func_192400_c()
-     {
-         return NonNullList.<Ingredient>func_191196_a();
-     }
- 
--default boolean func_192399_d()
-+    default boolean func_192399_d()
+ default NonNullList<Ingredient> func_192400_c()
      {
+@@ -30,7 +30,6 @@
          return false;
      }
  
 -    @SideOnly(Side.CLIENT)
--default String func_193358_e()
-+    default String func_193358_e()
+ default String func_193358_e()
      {
          return "";
-     }

patches/minecraft/net/minecraft/item/crafting/Ingredient.java.patch

@@ -9,11 +9,8 @@
      public static final Ingredient field_193370_a = new Ingredient(new ItemStack[0])
      {
          public boolean apply(@Nullable ItemStack p_apply_1_)
-@@ -21,15 +23,19 @@
-         }
-     };
+@@ -23,12 +25,17 @@
      private final ItemStack[] field_193371_b;
--    @SideOnly(Side.CLIENT)
      private IntList field_194140_c;
  
 +    protected Ingredient(int size)
@@ -31,11 +28,10 @@
      public ItemStack[] func_193365_a()
      {
          return this.field_193371_b;
-@@ -110,4 +116,16 @@
- 
+@@ -76,6 +83,18 @@
          return this.field_194140_c;
      }
-+
+ 
 +    public static void invalidateAll()
 +    {
 +        for (Ingredient ing : INSTANCES)
@@ -47,4 +43,7 @@
 +    {
 +        this.field_194140_c = null;
 +    }
- }
++
+     public static Ingredient func_193367_a(Item p_193367_0_)
+     {
+         return func_193369_a(new ItemStack(p_193367_0_, 1, 32767));

patches/minecraft/net/minecraft/item/crafting/ShapedRecipes.java.patch

@@ -20,11 +20,10 @@
      public String func_193358_e()
      {
          return this.field_194137_e;
-@@ -57,23 +54,17 @@
-         for (int i = 0; i < nonnulllist.size(); ++i)
+@@ -58,10 +55,7 @@
          {
              ItemStack itemstack = p_179532_1_.func_70301_a(i);
--
+ 
 -            if (itemstack.func_77973_b().func_77634_r())
 -            {
 -                nonnulllist.set(i, new ItemStack(itemstack.func_77973_b().func_77668_q()));
@@ -33,11 +32,7 @@
          }
  
          return nonnulllist;
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public NonNullList<Ingredient> func_192400_c()
-     {
+@@ -72,7 +66,6 @@
          return this.field_77574_d;
      }
  
@@ -45,17 +40,3 @@
      public boolean func_194133_a(int p_194133_1_, int p_194133_2_)
      {
          return p_194133_1_ >= this.field_77576_b && p_194133_2_ >= this.field_77577_c;
-@@ -241,13 +232,11 @@
-         return i;
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public int func_192403_f()
-     {
-         return this.field_77576_b;
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public int func_192404_g()
-     {
-         return this.field_77577_c;

patches/minecraft/net/minecraft/item/crafting/ShapelessRecipes.java.patch

@@ -20,11 +20,10 @@
      public String func_193358_e()
      {
          return this.field_194138_c;
-@@ -44,17 +41,12 @@
-         for (int i = 0; i < nonnulllist.size(); ++i)
+@@ -50,10 +47,7 @@
          {
              ItemStack itemstack = p_179532_1_.func_70301_a(i);
--
+ 
 -            if (itemstack.func_77973_b().func_77634_r())
 -            {
 -                nonnulllist.set(i, new ItemStack(itemstack.func_77973_b().func_77668_q()));
@@ -33,13 +32,7 @@
          }
  
          return nonnulllist;
-     }
- 
--    @SideOnly(Side.CLIENT)
-     public NonNullList<Ingredient> func_192400_c()
-     {
-         return this.field_77579_b;
-@@ -137,7 +129,6 @@
+@@ -136,7 +130,6 @@
          return nonnulllist;
      }
  

patches/minecraft/net/minecraft/network/NetHandlerPlayServer.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/network/NetHandlerPlayServer.java
 +++ ../src-work/minecraft/net/minecraft/network/NetHandlerPlayServer.java
-@@ -661,7 +661,10 @@
+@@ -663,7 +663,10 @@
                  double d2 = this.field_147369_b.field_70161_v - ((double)blockpos.func_177952_p() + 0.5D);
                  double d3 = d0 * d0 + d1 * d1 + d2 * d2;
  
@@ -12,7 +12,7 @@
                  {
                      return;
                  }
-@@ -719,7 +722,9 @@
+@@ -721,7 +724,9 @@
  
          if (blockpos.func_177956_o() < this.field_147367_d.func_71207_Z() - 1 || enumfacing != EnumFacing.UP && blockpos.func_177956_o() < this.field_147367_d.func_71207_Z())
          {
@@ -23,7 +23,7 @@
              {
                  this.field_147369_b.field_71134_c.func_187251_a(this.field_147369_b, worldserver, itemstack, enumhand, blockpos, enumfacing, p_184337_1_.func_187026_d(), p_184337_1_.func_187025_e(), p_184337_1_.func_187020_f());
              }
-@@ -923,7 +928,9 @@
+@@ -925,7 +930,9 @@
              }
              else
              {
@@ -34,7 +34,7 @@
                  this.field_147367_d.func_184103_al().func_148544_a(itextcomponent, false);
              }
  
-@@ -1056,6 +1063,7 @@
+@@ -1058,6 +1065,7 @@
                  else if (p_147340_1_.func_149565_c() == CPacketUseEntity.Action.INTERACT_AT)
                  {
                      EnumHand enumhand1 = p_147340_1_.func_186994_b();
@@ -42,7 +42,7 @@
                      entity.func_184199_a(this.field_147369_b, p_147340_1_.func_179712_b(), enumhand1);
                  }
                  else if (p_147340_1_.func_149565_c() == CPacketUseEntity.Action.ATTACK)
-@@ -1096,7 +1104,7 @@
+@@ -1098,7 +1106,7 @@
                          return;
                      }
  
@@ -51,7 +51,7 @@
  
                      if (this.field_147367_d.func_71199_h())
                      {
-@@ -1139,7 +1147,7 @@
+@@ -1141,7 +1149,7 @@
              {
                  ItemStack itemstack2 = this.field_147369_b.field_71070_bA.func_184996_a(p_147351_1_.func_149544_d(), p_147351_1_.func_149543_e(), p_147351_1_.func_186993_f(), this.field_147369_b);
  

patches/minecraft/net/minecraft/network/handshake/client/C00Handshake.java.patch

@@ -9,12 +9,12 @@
      public C00Handshake()
      {
 @@ -28,18 +29,26 @@
-         this.field_149597_d = p_i45266_4_;
+         this.field_149597_d = p_i47613_3_;
      }
  
-+    public C00Handshake(int protocol, String address, int port, EnumConnectionState state, boolean addFMLMarker)
++    public C00Handshake(String address, int port, EnumConnectionState state, boolean addFMLMarker)
 +    {
-+        this(protocol, address, port, state);
++        this(address, port, state);
 +        this.hasFMLMarker = addFMLMarker;
 +    }
 +

patches/minecraft/net/minecraft/profiler/Profiler.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/profiler/Profiler.java
 +++ ../src-work/minecraft/net/minecraft/profiler/Profiler.java
-@@ -177,4 +177,16 @@
+@@ -193,4 +193,16 @@
                  return (this.field_76331_c.hashCode() & 11184810) + 4473924;
              }
          }

patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch

@@ -12,8 +12,8 @@
                          return;
                      }
  
--                    RealmsConnect.this.connection.func_179290_a(new C00Handshake(335, p_connect_1_, p_connect_2_, EnumConnectionState.LOGIN));
-+                    RealmsConnect.this.connection.func_179290_a(new C00Handshake(335, p_connect_1_, p_connect_2_, EnumConnectionState.LOGIN, true));
+-                    RealmsConnect.this.connection.func_179290_a(new C00Handshake(p_connect_1_, p_connect_2_, EnumConnectionState.LOGIN));
++                    RealmsConnect.this.connection.func_179290_a(new C00Handshake(p_connect_1_, p_connect_2_, EnumConnectionState.LOGIN, true));
  
                      if (RealmsConnect.this.aborted)
                      {

patches/minecraft/net/minecraft/server/MinecraftServer.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/server/MinecraftServer.java
 +++ ../src-work/minecraft/net/minecraft/server/MinecraftServer.java
-@@ -104,7 +104,7 @@
+@@ -105,7 +105,7 @@
      @SideOnly(Side.SERVER)
      private String field_71320_r;
      private int field_71319_s = -1;
@@ -9,7 +9,7 @@
      private PlayerList field_71318_t;
      private boolean field_71317_u = true;
      private boolean field_71316_v;
-@@ -122,7 +122,8 @@
+@@ -123,7 +123,8 @@
      private int field_71280_D;
      private int field_143008_E;
      public final long[] field_71311_j = new long[100];
@@ -19,7 +19,7 @@
      private KeyPair field_71292_I;
      private String field_71293_J;
      private String field_71294_K;
-@@ -221,8 +222,6 @@
+@@ -222,8 +223,6 @@
      {
          this.func_71237_c(p_71247_1_);
          this.func_71192_d("menu.loadingLevel");
@@ -28,7 +28,7 @@
          ISaveHandler isavehandler = this.field_71310_m.func_75804_a(p_71247_1_, true);
          this.func_175584_a(this.func_71270_I(), isavehandler);
          WorldInfo worldinfo = isavehandler.func_75757_d();
-@@ -253,6 +252,7 @@
+@@ -254,6 +253,7 @@
              worldsettings = new WorldSettings(worldinfo);
          }
  
@@ -36,7 +36,7 @@
          for (int i = 0; i < this.field_71305_c.length; ++i)
          {
              int j = 0;
-@@ -292,8 +292,23 @@
+@@ -293,8 +293,23 @@
                  this.field_71305_c[i].func_72912_H().func_76060_a(this.func_71265_f());
              }
          }
@@ -61,7 +61,7 @@
          this.func_147139_a(this.func_147135_j());
          this.func_71222_d();
      }
-@@ -308,7 +323,7 @@
+@@ -309,7 +324,7 @@
          this.func_71192_d("menu.generatingTerrain");
          int j1 = 0;
          field_147145_h.info("Preparing start region for level 0");
@@ -70,7 +70,7 @@
          BlockPos blockpos = worldserver.func_175694_M();
          long k1 = func_130071_aq();
  
-@@ -433,9 +448,16 @@
+@@ -434,9 +449,16 @@
              {
                  if (worldserver1 != null)
                  {
@@ -87,7 +87,7 @@
          }
  
          if (this.field_71307_n.func_76468_d())
-@@ -460,6 +482,7 @@
+@@ -461,6 +483,7 @@
          {
              if (this.func_71197_b())
              {
@@ -95,7 +95,7 @@
                  this.field_175591_ab = func_130071_aq();
                  long i = 0L;
                  this.field_147147_p.func_151315_a(new TextComponentString(this.field_71286_C));
-@@ -504,12 +527,20 @@
+@@ -505,12 +528,20 @@
                      Thread.sleep(Math.max(1L, 50L - i));
                      this.field_71296_Q = true;
                  }
@@ -116,7 +116,7 @@
          catch (Throwable throwable1)
          {
              field_147145_h.error("Encountered an unexpected exception", throwable1);
-@@ -535,14 +566,15 @@
+@@ -536,14 +567,15 @@
                  field_147145_h.error("We were unable to save this crash report to disk.");
              }
  
@@ -133,7 +133,7 @@
              }
              catch (Throwable throwable)
              {
-@@ -550,6 +582,8 @@
+@@ -551,6 +583,8 @@
              }
              finally
              {
@@ -142,7 +142,7 @@
                  this.func_71240_o();
              }
          }
-@@ -617,6 +651,7 @@
+@@ -618,6 +652,7 @@
      public void func_71217_p()
      {
          long i = System.nanoTime();
@@ -150,7 +150,7 @@
          ++this.field_71315_w;
  
          if (this.field_71295_T)
-@@ -643,6 +678,7 @@
+@@ -644,6 +679,7 @@
  
              Collections.shuffle(Arrays.asList(agameprofile));
              this.field_147147_p.func_151318_b().func_151330_a(agameprofile);
@@ -158,7 +158,7 @@
          }
  
          if (this.field_71315_w % 900 == 0)
-@@ -670,6 +706,7 @@
+@@ -671,6 +707,7 @@
  
          this.field_71304_b.func_76319_b();
          this.field_71304_b.func_76319_b();
@@ -166,7 +166,7 @@
      }
  
      public void func_71190_q()
-@@ -685,24 +722,28 @@
+@@ -686,14 +723,17 @@
          }
  
          this.field_71304_b.func_76318_c("levels");
@@ -184,8 +184,10 @@
              {
 -                WorldServer worldserver = this.field_71305_c[j];
 +                WorldServer worldserver = net.minecraftforge.common.DimensionManager.getWorld(id);
-                 this.field_71304_b.func_76320_a(worldserver.func_72912_H().func_76065_j());
- 
+                 this.field_71304_b.func_194340_a(() ->
+                 {
+                     return worldserver.func_72912_H().func_76065_j();
+@@ -702,11 +742,12 @@
                  if (this.field_71315_w % 20 == 0)
                  {
                      this.field_71304_b.func_76320_a("timeSync");
@@ -199,7 +201,7 @@
  
                  try
                  {
-@@ -726,6 +767,7 @@
+@@ -730,6 +771,7 @@
                      throw new ReportedException(crashreport1);
                  }
  
@@ -207,7 +209,7 @@
                  this.field_71304_b.func_76319_b();
                  this.field_71304_b.func_76320_a("tracker");
                  worldserver.func_73039_n().func_72788_a();
-@@ -733,9 +775,11 @@
+@@ -737,9 +779,11 @@
                  this.field_71304_b.func_76319_b();
              }
  
@@ -220,7 +222,7 @@
          this.field_71304_b.func_76318_c("connection");
          this.func_147137_ag().func_151269_c();
          this.field_71304_b.func_76318_c("players");
-@@ -759,7 +803,8 @@
+@@ -763,7 +807,8 @@
  
      public void func_71256_s()
      {
@@ -230,7 +232,7 @@
          this.field_175590_aa.start();
      }
  
-@@ -775,14 +820,13 @@
+@@ -779,14 +824,13 @@
  
      public WorldServer func_71218_a(int p_71218_1_)
      {
@@ -250,7 +252,7 @@
      }
  
      public String func_71249_w()
-@@ -812,7 +856,7 @@
+@@ -816,7 +860,7 @@
  
      public String getServerModName()
      {
@@ -259,7 +261,7 @@
      }
  
      public CrashReport func_71230_b(CrashReport p_71230_1_)
-@@ -1594,4 +1638,9 @@
+@@ -1598,4 +1642,9 @@
      {
          return this.field_175590_aa;
      }

patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/server/dedicated/DedicatedServer.java
 +++ ../src-work/minecraft/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -59,6 +59,7 @@
+@@ -62,6 +62,7 @@
      private boolean field_71338_p;
      private GameType field_71337_q;
      private boolean field_71335_s;
@@ -8,7 +8,7 @@
  
      public DedicatedServer(File p_i47086_1_, DataFixer p_i47086_2_, YggdrasilAuthenticationService p_i47086_3_, MinecraftSessionService p_i47086_4_, GameProfileRepository p_i47086_5_, PlayerProfileCache p_i47086_6_)
      {
-@@ -92,6 +93,7 @@
+@@ -95,6 +96,7 @@
          {
              public void run()
              {
@@ -16,7 +16,7 @@
                  BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
                  String s4;
  
-@@ -117,6 +119,8 @@
+@@ -120,6 +122,8 @@
              field_155771_h.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
          }
  
@@ -25,7 +25,7 @@
          field_155771_h.info("Loading properties");
          this.field_71340_o = new PropertyManager(new File("server.properties"));
          this.field_154332_n = new ServerEula(new File("eula.txt"));
-@@ -209,6 +213,7 @@
+@@ -212,6 +216,7 @@
              }
              else
              {
@@ -33,7 +33,7 @@
                  this.func_184105_a(new DedicatedPlayerList(this));
                  long j = System.nanoTime();
  
-@@ -257,6 +262,7 @@
+@@ -260,6 +265,7 @@
                  TileEntitySkull.func_184293_a(this.func_152358_ax());
                  TileEntitySkull.func_184294_a(this.func_147130_as());
                  PlayerProfileCache.func_187320_a(this.func_71266_T());
@@ -41,16 +41,17 @@
                  field_155771_h.info("Preparing level \"{}\"", (Object)this.func_71270_I());
                  this.func_71247_a(this.func_71270_I(), this.func_71270_I(), k, worldtype, s2);
                  long i1 = System.nanoTime() - j;
-@@ -292,7 +298,7 @@
-                     thread1.start();
+@@ -296,7 +302,8 @@
                  }
  
+                 Items.field_190931_a.func_150895_a(CreativeTabs.field_78027_g, NonNullList.func_191196_a());
 -                return true;
++                // <3 you Grum for this, saves us ~30 patch files! --^
 +                return net.minecraftforge.fml.common.FMLCommonHandler.instance().handleServerStarting(this);
              }
          }
      }
-@@ -511,7 +517,7 @@
+@@ -515,7 +522,7 @@
  
      public boolean func_175579_a(World p_175579_1_, BlockPos p_175579_2_, EntityPlayer p_175579_3_)
      {
@@ -59,7 +60,7 @@
          {
              return false;
          }
-@@ -580,6 +586,9 @@
+@@ -584,6 +591,9 @@
          return this.field_71340_o.func_73669_a("network-compression-threshold", super.func_175577_aI());
      }
  

patches/minecraft/net/minecraft/stats/RecipeBook.java.patch

@@ -1,11 +1,11 @@
 --- ../src-base/minecraft/net/minecraft/stats/RecipeBook.java
 +++ ../src-work/minecraft/net/minecraft/stats/RecipeBook.java
-@@ -41,9 +41,17 @@
+@@ -42,9 +42,17 @@
          this.field_194078_b.clear(i);
      }
  
 +    @Deprecated //DO NOT USE
-     protected static int func_194075_d(IRecipe p_194075_0_)
+     protected static int func_194075_d(@Nullable IRecipe p_194075_0_)
      {
 -        return CraftingManager.field_193380_a.func_148757_b(p_194075_0_);
 +        int ret = CraftingManager.field_193380_a.func_148757_b(p_194075_0_);

patches/minecraft/net/minecraft/util/datafix/DataFixesManager.java.patch

@@ -3,7 +3,7 @@
 @@ -165,6 +165,7 @@
      public static DataFixer func_188279_a()
      {
-         DataFixer datafixer = new DataFixer(1139);
+         DataFixer datafixer = new DataFixer(1241);
 +        datafixer = new net.minecraftforge.common.util.CompoundDataFixer(datafixer);
          WorldInfo.func_189967_a(datafixer);
          EntityPlayerMP.func_191522_a(datafixer);

patches/minecraft/net/minecraft/world/World.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/world/World.java
 +++ ../src-work/minecraft/net/minecraft/world/World.java
-@@ -62,8 +62,15 @@
+@@ -63,8 +63,15 @@
  import net.minecraftforge.fml.relauncher.Side;
  import net.minecraftforge.fml.relauncher.SideOnly;
  
@@ -17,7 +17,7 @@
      private int field_181546_a = 63;
      protected boolean field_72999_e;
      public final List<Entity> field_72996_f = Lists.<Entity>newArrayList();
-@@ -107,6 +114,12 @@
+@@ -108,6 +115,12 @@
      private final WorldBorder field_175728_M;
      int[] field_72994_J;
  
@@ -30,7 +30,7 @@
      protected World(ISaveHandler p_i45749_1_, WorldInfo p_i45749_2_, WorldProvider p_i45749_3_, Profiler p_i45749_4_, boolean p_i45749_5_)
      {
          this.field_73021_x = Lists.newArrayList(this.field_184152_t);
-@@ -121,6 +134,7 @@
+@@ -122,6 +135,7 @@
          this.field_73011_w = p_i45749_3_;
          this.field_72995_K = p_i45749_5_;
          this.field_175728_M = p_i45749_3_.func_177501_r();
@@ -38,7 +38,7 @@
      }
  
      public World func_175643_b()
-@@ -130,6 +144,11 @@
+@@ -131,6 +145,11 @@
  
      public Biome func_180494_b(final BlockPos p_180494_1_)
      {
@@ -50,7 +50,7 @@
          if (this.func_175667_e(p_180494_1_))
          {
              Chunk chunk = this.func_175726_f(p_180494_1_);
-@@ -206,7 +225,7 @@
+@@ -207,7 +226,7 @@
  
      public boolean func_175623_d(BlockPos p_175623_1_)
      {
@@ -59,7 +59,7 @@
      }
  
      public boolean func_175667_e(BlockPos p_175667_1_)
-@@ -307,24 +326,50 @@
+@@ -308,24 +327,50 @@
          else
          {
              Chunk chunk = this.func_175726_f(p_180501_1_);
@@ -113,7 +113,7 @@
                      this.func_184138_a(p_180501_1_, iblockstate, p_180501_2_, p_180501_3_);
                  }
  
-@@ -341,8 +386,6 @@
+@@ -342,8 +387,6 @@
                  {
                      this.func_190522_c(p_180501_1_, block);
                  }
@@ -122,7 +122,7 @@
              }
          }
      }
-@@ -357,7 +400,7 @@
+@@ -358,7 +401,7 @@
          IBlockState iblockstate = this.func_180495_p(p_175655_1_);
          Block block = iblockstate.func_177230_c();
  
@@ -131,7 +131,7 @@
          {
              return false;
          }
-@@ -440,6 +483,9 @@
+@@ -441,6 +484,9 @@
  
      public void func_175685_c(BlockPos p_175685_1_, Block p_175685_2_, boolean p_175685_3_)
      {
@@ -141,7 +141,7 @@
          this.func_190524_a(p_175685_1_.func_177976_e(), p_175685_2_, p_175685_1_);
          this.func_190524_a(p_175685_1_.func_177974_f(), p_175685_2_, p_175685_1_);
          this.func_190524_a(p_175685_1_.func_177977_b(), p_175685_2_, p_175685_1_);
-@@ -455,6 +501,11 @@
+@@ -456,6 +502,11 @@
  
      public void func_175695_a(BlockPos p_175695_1_, Block p_175695_2_, EnumFacing p_175695_3_)
      {
@@ -153,7 +153,7 @@
          if (p_175695_3_ != EnumFacing.WEST)
          {
              this.func_190524_a(p_175695_1_.func_177976_e(), p_175695_2_, p_175695_1_);
-@@ -526,11 +577,11 @@
+@@ -527,11 +578,11 @@
          {
              IBlockState iblockstate = this.func_180495_p(p_190529_1_);
  
@@ -167,7 +167,7 @@
                  }
                  catch (Throwable throwable)
                  {
-@@ -587,7 +638,7 @@
+@@ -588,7 +639,7 @@
                  {
                      IBlockState iblockstate = this.func_180495_p(blockpos1);
  
@@ -176,7 +176,7 @@
                      {
                          return false;
                      }
-@@ -861,7 +912,7 @@
+@@ -862,7 +913,7 @@
  
      public boolean func_72935_r()
      {
@@ -185,7 +185,7 @@
      }
  
      @Nullable
-@@ -1064,6 +1115,13 @@
+@@ -1065,6 +1116,13 @@
  
      public void func_184148_a(@Nullable EntityPlayer p_184148_1_, double p_184148_2_, double p_184148_4_, double p_184148_6_, SoundEvent p_184148_8_, SoundCategory p_184148_9_, float p_184148_10_, float p_184148_11_)
      {
@@ -199,7 +199,7 @@
          for (int i = 0; i < this.field_73021_x.size(); ++i)
          {
              ((IWorldEventListener)this.field_73021_x.get(i)).func_184375_a(p_184148_1_, p_184148_8_, p_184148_9_, p_184148_2_, p_184148_4_, p_184148_6_, p_184148_10_, p_184148_11_);
-@@ -1117,6 +1175,9 @@
+@@ -1118,6 +1176,9 @@
  
      public boolean func_72838_d(Entity p_72838_1_)
      {
@@ -209,7 +209,7 @@
          int i = MathHelper.func_76128_c(p_72838_1_.field_70165_t / 16.0D);
          int j = MathHelper.func_76128_c(p_72838_1_.field_70161_v / 16.0D);
          boolean flag = p_72838_1_.field_98038_p;
-@@ -1139,6 +1200,8 @@
+@@ -1140,6 +1201,8 @@
                  this.func_72854_c();
              }
  
@@ -218,7 +218,7 @@
              this.func_72964_e(i, j).func_76612_a(p_72838_1_);
              this.field_72996_f.add(p_72838_1_);
              this.func_72923_a(p_72838_1_);
-@@ -1267,6 +1330,7 @@
+@@ -1268,6 +1331,7 @@
                                  }
  
                                  iblockstate1.func_185908_a(this, blockpos$pooledmutableblockpos, p_191504_2_, p_191504_4_, p_191504_1_, false);
@@ -226,7 +226,7 @@
  
                                  if (p_191504_3_ && !p_191504_4_.isEmpty())
                                  {
-@@ -1318,11 +1382,10 @@
+@@ -1319,11 +1383,10 @@
                  }
              }
          }
@@ -239,7 +239,7 @@
      public void func_72848_b(IWorldEventListener p_72848_1_)
      {
          this.field_73021_x.remove(p_72848_1_);
-@@ -1360,19 +1423,38 @@
+@@ -1361,19 +1424,38 @@
  
      public int func_72967_a(float p_72967_1_)
      {
@@ -280,7 +280,7 @@
          float f = this.func_72826_c(p_72971_1_);
          float f1 = 1.0F - (MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.2F);
          f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F);
-@@ -1385,6 +1467,12 @@
+@@ -1386,6 +1468,12 @@
      @SideOnly(Side.CLIENT)
      public Vec3d func_72833_a(Entity p_72833_1_, float p_72833_2_)
      {
@@ -293,7 +293,7 @@
          float f = this.func_72826_c(p_72833_2_);
          float f1 = MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.5F;
          f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F);
-@@ -1392,9 +1480,7 @@
+@@ -1393,9 +1481,7 @@
          int j = MathHelper.func_76128_c(p_72833_1_.field_70163_u);
          int k = MathHelper.func_76128_c(p_72833_1_.field_70161_v);
          BlockPos blockpos = new BlockPos(i, j, k);
@@ -304,7 +304,7 @@
          float f3 = (float)(l >> 16 & 255) / 255.0F;
          float f4 = (float)(l >> 8 & 255) / 255.0F;
          float f5 = (float)(l & 255) / 255.0F;
-@@ -1443,20 +1529,25 @@
+@@ -1444,20 +1530,25 @@
  
      public float func_72826_c(float p_72826_1_)
      {
@@ -333,7 +333,7 @@
      public float func_72929_e(float p_72929_1_)
      {
          float f = this.func_72826_c(p_72929_1_);
-@@ -1466,6 +1557,12 @@
+@@ -1467,6 +1558,12 @@
      @SideOnly(Side.CLIENT)
      public Vec3d func_72824_f(float p_72824_1_)
      {
@@ -346,7 +346,7 @@
          float f = this.func_72826_c(p_72824_1_);
          float f1 = MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.5F;
          f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F);
-@@ -1521,9 +1618,9 @@
+@@ -1522,9 +1619,9 @@
          for (blockpos = new BlockPos(p_175672_1_.func_177958_n(), chunk.func_76625_h() + 16, p_175672_1_.func_177952_p()); blockpos.func_177956_o() >= 0; blockpos = blockpos1)
          {
              blockpos1 = blockpos.func_177977_b();
@@ -358,7 +358,7 @@
              {
                  break;
              }
-@@ -1535,6 +1632,12 @@
+@@ -1536,6 +1633,12 @@
      @SideOnly(Side.CLIENT)
      public float func_72880_h(float p_72880_1_)
      {
@@ -371,7 +371,7 @@
          float f = this.func_72826_c(p_72880_1_);
          float f1 = 1.0F - (MathHelper.func_76134_b(f * ((float)Math.PI * 2F)) * 2.0F + 0.25F);
          f1 = MathHelper.func_76131_a(f1, 0.0F, 1.0F);
-@@ -1569,6 +1672,7 @@
+@@ -1570,6 +1673,7 @@
  
              try
              {
@@ -379,7 +379,7 @@
                  ++entity.field_70173_aa;
                  entity.func_70071_h_();
              }
-@@ -1586,6 +1690,12 @@
+@@ -1587,6 +1691,12 @@
                      entity.func_85029_a(crashreportcategory);
                  }
  
@@ -392,7 +392,7 @@
                  throw new ReportedException(crashreport);
              }
  
-@@ -1647,6 +1757,12 @@
+@@ -1648,6 +1758,12 @@
                      CrashReport crashreport1 = CrashReport.func_85055_a(throwable1, "Ticking entity");
                      CrashReportCategory crashreportcategory1 = crashreport1.func_85058_a("Entity being ticked");
                      entity2.func_85029_a(crashreportcategory1);
@@ -405,7 +405,7 @@
                      throw new ReportedException(crashreport1);
                  }
              }
-@@ -1683,11 +1799,11 @@
+@@ -1684,7 +1800,7 @@
              {
                  BlockPos blockpos = tileentity.func_174877_v();
  
@@ -414,12 +414,7 @@
                  {
                      try
                      {
--                        this.field_72984_F.func_76320_a(tileentity.getClass().getSimpleName());
-+                        this.field_72984_F.func_76320_a(this.field_72984_F.field_76327_a ? net.minecraftforge.common.ForgeHooks.getRegistryName(tileentity.getClass()) : ""); // Fix for MC-117087
-                         ((ITickable)tileentity).func_73660_a();
-                         this.field_72984_F.func_76319_b();
-                     }
-@@ -1696,6 +1812,13 @@
+@@ -1700,6 +1816,13 @@
                          CrashReport crashreport2 = CrashReport.func_85055_a(throwable, "Ticking block entity");
                          CrashReportCategory crashreportcategory2 = crashreport2.func_85058_a("Block entity being ticked");
                          tileentity.func_145828_a(crashreportcategory2);
@@ -433,7 +428,7 @@
                          throw new ReportedException(crashreport2);
                      }
                  }
-@@ -1708,20 +1831,28 @@
+@@ -1712,20 +1835,28 @@
  
                  if (this.func_175667_e(tileentity.func_174877_v()))
                  {
@@ -465,7 +460,7 @@
          this.field_72984_F.func_76318_c("pendingBlockEntities");
  
          if (!this.field_147484_a.isEmpty())
-@@ -1760,12 +1891,18 @@
+@@ -1764,12 +1895,18 @@
  
      public boolean func_175700_a(TileEntity p_175700_1_)
      {
@@ -484,7 +479,7 @@
  
          if (this.field_72995_K)
          {
-@@ -1781,6 +1918,11 @@
+@@ -1785,6 +1922,11 @@
      {
          if (this.field_147481_N)
          {
@@ -496,22 +491,23 @@
              this.field_147484_a.addAll(p_147448_1_);
          }
          else
-@@ -1803,9 +1945,12 @@
+@@ -1807,9 +1949,13 @@
          {
-             int i = MathHelper.func_76128_c(p_72866_1_.field_70165_t);
-             int j = MathHelper.func_76128_c(p_72866_1_.field_70161_v);
--            int k = 32;
-+            boolean isForced = getPersistentChunks().containsKey(new net.minecraft.util.math.ChunkPos(i >> 4, j >> 4));
-+            int k = isForced ? 0 : 32;
-+            boolean canUpdate = !p_72866_2_ || this.func_175663_a(i - k, 0, j - k, i + k, 0, j + k, true);
-+            if (!canUpdate) canUpdate = net.minecraftforge.event.ForgeEventFactory.canEntityUpdate(p_72866_1_);
+             int j2 = MathHelper.func_76128_c(p_72866_1_.field_70165_t);
+             int k2 = MathHelper.func_76128_c(p_72866_1_.field_70161_v);
+-            int l2 = 32;
  
--            if (p_72866_2_ && !this.func_175663_a(i - 32, 0, j - 32, i + 32, 0, j + 32, true))
+-            if (p_72866_2_ && !this.func_175663_a(j2 - 32, 0, k2 - 32, j2 + 32, 0, k2 + 32, true))
++            boolean isForced = getPersistentChunks().containsKey(new net.minecraft.util.math.ChunkPos(j2 >> 4, k2 >> 4));
++            int range = isForced ? 0 : 32;
++            boolean canUpdate = !p_72866_2_ || this.func_175663_a(j2 - range, 0, k2 - range, j2 + range, 0, k2 + range, true);
++            if (!canUpdate) canUpdate = net.minecraftforge.event.ForgeEventFactory.canEntityUpdate(p_72866_1_);
++
 +            if (!canUpdate)
              {
                  return;
              }
-@@ -1827,6 +1972,7 @@
+@@ -1831,6 +1977,7 @@
              }
              else
              {
@@ -519,11 +515,11 @@
                  p_72866_1_.func_70071_h_();
              }
          }
-@@ -2007,6 +2153,11 @@
+@@ -2011,6 +2158,11 @@
                              blockpos$pooledmutableblockpos.func_185344_t();
                              return true;
                          }
-+                        else if (block.isBurning(this, new BlockPos(k1, l1, i2)))
++                        else if (block.isBurning(this, new BlockPos(l3, i4, j4)))
 +                        {
 +                            blockpos$pooledmutableblockpos.func_185344_t();
 +                            return true;
@@ -531,11 +527,11 @@
                      }
                  }
              }
-@@ -2046,6 +2197,16 @@
-                         IBlockState iblockstate = this.func_180495_p(blockpos$pooledmutableblockpos);
-                         Block block = iblockstate.func_177230_c();
+@@ -2050,6 +2202,16 @@
+                         IBlockState iblockstate1 = this.func_180495_p(blockpos$pooledmutableblockpos);
+                         Block block = iblockstate1.func_177230_c();
  
-+                        Boolean result = block.isEntityInsideMaterial(this, blockpos$pooledmutableblockpos, iblockstate, p_72918_3_, (double)l, p_72918_2_, false);
++                        Boolean result = block.isEntityInsideMaterial(this, blockpos$pooledmutableblockpos, iblockstate1, p_72918_3_, (double)i3, p_72918_2_, false);
 +                        if (result != null && result == true)
 +                        {
 +                            // Forge: When requested call blocks modifyAcceleration method, and more importantly cause this method to return true, which results in an entity being "inWater"
@@ -545,10 +541,10 @@
 +                        }
 +                        else if (result != null && result == false) continue;
 +
-                         if (iblockstate.func_185904_a() == p_72918_2_)
+                         if (iblockstate1.func_185904_a() == p_72918_2_)
                          {
-                             double d0 = (double)((float)(l1 + 1) - BlockLiquid.func_149801_b(((Integer)iblockstate.func_177229_b(BlockLiquid.field_176367_b)).intValue()));
-@@ -2112,6 +2273,7 @@
+                             double d0 = (double)((float)(i4 + 1) - BlockLiquid.func_149801_b(((Integer)iblockstate1.func_177229_b(BlockLiquid.field_176367_b)).intValue()));
+@@ -2116,6 +2278,7 @@
      public Explosion func_72885_a(@Nullable Entity p_72885_1_, double p_72885_2_, double p_72885_4_, double p_72885_6_, float p_72885_8_, boolean p_72885_9_, boolean p_72885_10_)
      {
          Explosion explosion = new Explosion(this, p_72885_1_, p_72885_2_, p_72885_4_, p_72885_6_, p_72885_8_, p_72885_9_, p_72885_10_);
@@ -556,7 +552,7 @@
          explosion.func_77278_a();
          explosion.func_77279_a(true);
          return explosion;
-@@ -2234,6 +2396,7 @@
+@@ -2238,6 +2401,7 @@
  
      public void func_175690_a(BlockPos p_175690_1_, @Nullable TileEntity p_175690_2_)
      {
@@ -564,16 +560,16 @@
          if (!this.func_189509_E(p_175690_1_))
          {
              if (p_175690_2_ != null && !p_175690_2_.func_145837_r())
-@@ -2241,6 +2404,8 @@
+@@ -2245,6 +2409,8 @@
                  if (this.field_147481_N)
                  {
                      p_175690_2_.func_174878_a(p_175690_1_);
 +                    if (p_175690_2_.func_145831_w() != this)
 +                        p_175690_2_.func_145834_a(this); // Forge - set the world early as vanilla doesn't set it until next tick
-                     Iterator<TileEntity> iterator = this.field_147484_a.iterator();
+                     Iterator<TileEntity> iterator1 = this.field_147484_a.iterator();
  
-                     while (iterator.hasNext())
-@@ -2258,7 +2423,8 @@
+                     while (iterator1.hasNext())
+@@ -2262,7 +2428,8 @@
                  }
                  else
                  {
@@ -583,16 +579,16 @@
                      this.func_175700_a(p_175690_2_);
                  }
              }
-@@ -2273,6 +2439,8 @@
+@@ -2277,6 +2444,8 @@
          {
-             tileentity.func_145843_s();
-             this.field_147484_a.remove(tileentity);
-+            if (!(tileentity instanceof ITickable)) //Forge: If they are not tickable they wont be removed in the update loop.
-+                this.field_147482_g.remove(tileentity);
+             tileentity2.func_145843_s();
+             this.field_147484_a.remove(tileentity2);
++            if (!(tileentity2 instanceof ITickable)) //Forge: If they are not tickable they wont be removed in the update loop.
++                this.field_147482_g.remove(tileentity2);
          }
          else
          {
-@@ -2285,6 +2453,7 @@
+@@ -2289,6 +2458,7 @@
  
              this.func_175726_f(p_175713_1_).func_177425_e(p_175713_1_);
          }
@@ -600,16 +596,16 @@
      }
  
      public void func_147457_a(TileEntity p_147457_1_)
-@@ -2311,7 +2480,7 @@
-             if (chunk != null && !chunk.func_76621_g())
+@@ -2315,7 +2485,7 @@
+             if (chunk1 != null && !chunk1.func_76621_g())
              {
-                 IBlockState iblockstate = this.func_180495_p(p_175677_1_);
--                return iblockstate.func_185904_a().func_76218_k() && iblockstate.func_185917_h();
-+                return iblockstate.func_177230_c().isNormalCube(iblockstate, this, p_175677_1_);
+                 IBlockState iblockstate1 = this.func_180495_p(p_175677_1_);
+-                return iblockstate1.func_185904_a().func_76218_k() && iblockstate1.func_185917_h();
++                return iblockstate1.func_177230_c().isNormalCube(iblockstate1, this, p_175677_1_);
              }
              else
              {
-@@ -2334,6 +2503,7 @@
+@@ -2338,6 +2508,7 @@
      {
          this.field_72985_G = p_72891_1_;
          this.field_72992_H = p_72891_2_;
@@ -617,7 +613,7 @@
      }
  
      public void func_72835_b()
-@@ -2343,6 +2513,11 @@
+@@ -2347,6 +2518,11 @@
  
      protected void func_72947_a()
      {
@@ -629,7 +625,7 @@
          if (this.field_72986_A.func_76059_o())
          {
              this.field_73004_o = 1.0F;
-@@ -2356,6 +2531,11 @@
+@@ -2360,6 +2536,11 @@
  
      protected void func_72979_l()
      {
@@ -641,7 +637,7 @@
          if (this.field_73011_w.func_191066_m())
          {
              if (!this.field_72995_K)
-@@ -2480,6 +2660,11 @@
+@@ -2484,6 +2665,11 @@
  
      public boolean func_175670_e(BlockPos p_175670_1_, boolean p_175670_2_)
      {
@@ -653,7 +649,7 @@
          Biome biome = this.func_180494_b(p_175670_1_);
          float f = biome.func_180626_a(p_175670_1_);
  
-@@ -2521,6 +2706,11 @@
+@@ -2525,6 +2711,11 @@
  
      public boolean func_175708_f(BlockPos p_175708_1_, boolean p_175708_2_)
      {
@@ -665,105 +661,106 @@
          Biome biome = this.func_180494_b(p_175708_1_);
          float f = biome.func_180626_a(p_175708_1_);
  
-@@ -2538,7 +2728,7 @@
+@@ -2542,7 +2733,7 @@
              {
-                 IBlockState iblockstate = this.func_180495_p(p_175708_1_);
+                 IBlockState iblockstate1 = this.func_180495_p(p_175708_1_);
  
--                if (iblockstate.func_185904_a() == Material.field_151579_a && Blocks.field_150431_aC.func_176196_c(this, p_175708_1_))
-+                if (iblockstate.func_177230_c().isAir(iblockstate, this, p_175708_1_) && Blocks.field_150431_aC.func_176196_c(this, p_175708_1_))
+-                if (iblockstate1.func_185904_a() == Material.field_151579_a && Blocks.field_150431_aC.func_176196_c(this, p_175708_1_))
++                if (iblockstate1.func_177230_c().isAir(iblockstate1, this, p_175708_1_) && Blocks.field_150431_aC.func_176196_c(this, p_175708_1_))
                  {
                      return true;
                  }
-@@ -2570,10 +2760,11 @@
+@@ -2574,10 +2765,11 @@
          else
          {
-             IBlockState iblockstate = this.func_180495_p(p_175638_1_);
--            int i = p_175638_2_ == EnumSkyBlock.SKY ? 0 : iblockstate.func_185906_d();
--            int j = iblockstate.func_185891_c();
-+            int blockLight = iblockstate.func_177230_c().getLightValue(iblockstate, this, p_175638_1_);
-+            int i = p_175638_2_ == EnumSkyBlock.SKY ? 0 : blockLight;
-+            int j = iblockstate.func_177230_c().getLightOpacity(iblockstate, this, p_175638_1_);
+             IBlockState iblockstate1 = this.func_180495_p(p_175638_1_);
+-            int j2 = p_175638_2_ == EnumSkyBlock.SKY ? 0 : iblockstate1.func_185906_d();
+-            int k2 = iblockstate1.func_185891_c();
++            int blockLight = iblockstate1.func_177230_c().getLightValue(iblockstate1, this, p_175638_1_);
++            int j2 = p_175638_2_ == EnumSkyBlock.SKY ? 0 : blockLight;
++            int k2 = iblockstate1.func_177230_c().getLightOpacity(iblockstate1, this, p_175638_1_);
  
--            if (j >= 15 && iblockstate.func_185906_d() > 0)
-+            if (j >= 15 && blockLight > 0)
+-            if (k2 >= 15 && iblockstate1.func_185906_d() > 0)
++            if (k2 >= 15 && blockLight > 0)
              {
-                 j = 1;
+                 k2 = 1;
              }
-@@ -2679,7 +2870,7 @@
-                                     int j4 = j2 + enumfacing.func_96559_d();
-                                     int k4 = k2 + enumfacing.func_82599_e();
-                                     blockpos$pooledmutableblockpos.func_181079_c(i4, j4, k4);
--                                    int l4 = Math.max(1, this.func_180495_p(blockpos$pooledmutableblockpos).func_185891_c());
-+                                    int l4 = Math.max(1, this.func_180495_p(blockpos$pooledmutableblockpos).func_177230_c().getLightOpacity(this.func_180495_p(blockpos$pooledmutableblockpos), this, blockpos$pooledmutableblockpos));
-                                     i3 = this.func_175642_b(p_180500_1_, blockpos$pooledmutableblockpos);
+@@ -2683,7 +2875,8 @@
+                                     int k6 = k4 + enumfacing.func_96559_d();
+                                     int l6 = l4 + enumfacing.func_82599_e();
+                                     blockpos$pooledmutableblockpos.func_181079_c(j6, k6, l6);
+-                                    int i7 = Math.max(1, this.func_180495_p(blockpos$pooledmutableblockpos).func_185891_c());
++                                    IBlockState bs = this.func_180495_p(blockpos$pooledmutableblockpos);
++                                    int i7 = Math.max(1, bs.func_177230_c().getLightOpacity(bs, this, blockpos$pooledmutableblockpos));
+                                     j5 = this.func_175642_b(p_180500_1_, blockpos$pooledmutableblockpos);
  
-                                     if (i3 == l2 - l4 && j < this.field_72994_J.length)
-@@ -2787,10 +2978,10 @@
+                                     if (j5 == i5 - i7 && k2 < this.field_72994_J.length)
+@@ -2791,10 +2984,10 @@
      public List<Entity> func_175674_a(@Nullable Entity p_175674_1_, AxisAlignedBB p_175674_2_, @Nullable Predicate <? super Entity > p_175674_3_)
      {
          List<Entity> list = Lists.<Entity>newArrayList();
--        int i = MathHelper.func_76128_c((p_175674_2_.field_72340_a - 2.0D) / 16.0D);
--        int j = MathHelper.func_76128_c((p_175674_2_.field_72336_d + 2.0D) / 16.0D);
--        int k = MathHelper.func_76128_c((p_175674_2_.field_72339_c - 2.0D) / 16.0D);
--        int l = MathHelper.func_76128_c((p_175674_2_.field_72334_f + 2.0D) / 16.0D);
-+        int i = MathHelper.func_76128_c((p_175674_2_.field_72340_a - MAX_ENTITY_RADIUS) / 16.0D);
-+        int j = MathHelper.func_76128_c((p_175674_2_.field_72336_d + MAX_ENTITY_RADIUS) / 16.0D);
-+        int k = MathHelper.func_76128_c((p_175674_2_.field_72339_c - MAX_ENTITY_RADIUS) / 16.0D);
-+        int l = MathHelper.func_76128_c((p_175674_2_.field_72334_f + MAX_ENTITY_RADIUS) / 16.0D);
+-        int j2 = MathHelper.func_76128_c((p_175674_2_.field_72340_a - 2.0D) / 16.0D);
+-        int k2 = MathHelper.func_76128_c((p_175674_2_.field_72336_d + 2.0D) / 16.0D);
+-        int l2 = MathHelper.func_76128_c((p_175674_2_.field_72339_c - 2.0D) / 16.0D);
+-        int i3 = MathHelper.func_76128_c((p_175674_2_.field_72334_f + 2.0D) / 16.0D);
++        int j2 = MathHelper.func_76128_c((p_175674_2_.field_72340_a - MAX_ENTITY_RADIUS) / 16.0D);
++        int k2 = MathHelper.func_76128_c((p_175674_2_.field_72336_d + MAX_ENTITY_RADIUS) / 16.0D);
++        int l2 = MathHelper.func_76128_c((p_175674_2_.field_72339_c - MAX_ENTITY_RADIUS) / 16.0D);
++        int i3 = MathHelper.func_76128_c((p_175674_2_.field_72334_f + MAX_ENTITY_RADIUS) / 16.0D);
  
-         for (int i1 = i; i1 <= j; ++i1)
+         for (int j3 = j2; j3 <= k2; ++j3)
          {
-@@ -2843,10 +3034,10 @@
+@@ -2847,10 +3040,10 @@
  
      public <T extends Entity> List<T> func_175647_a(Class <? extends T > p_175647_1_, AxisAlignedBB p_175647_2_, @Nullable Predicate <? super T > p_175647_3_)
      {
--        int i = MathHelper.func_76128_c((p_175647_2_.field_72340_a - 2.0D) / 16.0D);
--        int j = MathHelper.func_76143_f((p_175647_2_.field_72336_d + 2.0D) / 16.0D);
--        int k = MathHelper.func_76128_c((p_175647_2_.field_72339_c - 2.0D) / 16.0D);
--        int l = MathHelper.func_76143_f((p_175647_2_.field_72334_f + 2.0D) / 16.0D);
-+        int i = MathHelper.func_76128_c((p_175647_2_.field_72340_a - MAX_ENTITY_RADIUS) / 16.0D);
-+        int j = MathHelper.func_76143_f((p_175647_2_.field_72336_d + MAX_ENTITY_RADIUS) / 16.0D);
-+        int k = MathHelper.func_76128_c((p_175647_2_.field_72339_c - MAX_ENTITY_RADIUS) / 16.0D);
-+        int l = MathHelper.func_76143_f((p_175647_2_.field_72334_f + MAX_ENTITY_RADIUS) / 16.0D);
+-        int j2 = MathHelper.func_76128_c((p_175647_2_.field_72340_a - 2.0D) / 16.0D);
+-        int k2 = MathHelper.func_76143_f((p_175647_2_.field_72336_d + 2.0D) / 16.0D);
+-        int l2 = MathHelper.func_76128_c((p_175647_2_.field_72339_c - 2.0D) / 16.0D);
+-        int i3 = MathHelper.func_76143_f((p_175647_2_.field_72334_f + 2.0D) / 16.0D);
++        int j2 = MathHelper.func_76128_c((p_175647_2_.field_72340_a - MAX_ENTITY_RADIUS) / 16.0D);
++        int k2 = MathHelper.func_76143_f((p_175647_2_.field_72336_d + MAX_ENTITY_RADIUS) / 16.0D);
++        int l2 = MathHelper.func_76128_c((p_175647_2_.field_72339_c - MAX_ENTITY_RADIUS) / 16.0D);
++        int i3 = MathHelper.func_76143_f((p_175647_2_.field_72334_f + MAX_ENTITY_RADIUS) / 16.0D);
          List<T> list = Lists.<T>newArrayList();
  
-         for (int i1 = i; i1 < j; ++i1)
-@@ -2926,11 +3117,13 @@
+         for (int j3 = j2; j3 < k2; ++j3)
+@@ -2930,11 +3123,13 @@
  
      public void func_175650_b(Collection<Entity> p_175650_1_)
      {
 -        this.field_72996_f.addAll(p_175650_1_);
 -
-         for (Entity entity : p_175650_1_)
+         for (Entity entity4 : p_175650_1_)
          {
--            this.func_72923_a(entity);
-+            if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.EntityJoinWorldEvent(entity, this)))
+-            this.func_72923_a(entity4);
++            if (!net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.EntityJoinWorldEvent(entity4, this)))
 +            {
-+                field_72996_f.add(entity);
-+                this.func_72923_a(entity);
++                field_72996_f.add(entity4);
++                this.func_72923_a(entity4);
 +            }
          }
      }
  
-@@ -2954,7 +3147,7 @@
+@@ -2958,7 +3153,7 @@
          }
          else
          {
--            return iblockstate.func_185904_a().func_76222_j() && p_190527_1_.func_176198_a(this, p_190527_2_, p_190527_4_);
-+            return iblockstate.func_177230_c().func_176200_f(this, p_190527_2_) && p_190527_1_.func_176198_a(this, p_190527_2_, p_190527_4_);
+-            return iblockstate1.func_185904_a().func_76222_j() && p_190527_1_.func_176198_a(this, p_190527_2_, p_190527_4_);
++            return iblockstate1.func_177230_c().func_176200_f(this, p_190527_2_) && p_190527_1_.func_176198_a(this, p_190527_2_, p_190527_4_);
          }
      }
  
-@@ -3038,7 +3231,7 @@
+@@ -3042,7 +3237,7 @@
      public int func_175651_c(BlockPos p_175651_1_, EnumFacing p_175651_2_)
      {
-         IBlockState iblockstate = this.func_180495_p(p_175651_1_);
--        return iblockstate.func_185915_l() ? this.func_175676_y(p_175651_1_) : iblockstate.func_185911_a(this, p_175651_1_, p_175651_2_);
-+        return iblockstate.func_177230_c().shouldCheckWeakPower(iblockstate, this, p_175651_1_, p_175651_2_) ? this.func_175676_y(p_175651_1_) : iblockstate.func_185911_a(this, p_175651_1_, p_175651_2_);
+         IBlockState iblockstate1 = this.func_180495_p(p_175651_1_);
+-        return iblockstate1.func_185915_l() ? this.func_175676_y(p_175651_1_) : iblockstate1.func_185911_a(this, p_175651_1_, p_175651_2_);
++        return iblockstate1.func_177230_c().shouldCheckWeakPower(iblockstate1, this, p_175651_1_, p_175651_2_) ? this.func_175676_y(p_175651_1_) : iblockstate1.func_185911_a(this, p_175651_1_, p_175651_2_);
      }
  
      public boolean func_175640_z(BlockPos p_175640_1_)
-@@ -3204,6 +3397,8 @@
+@@ -3208,6 +3403,8 @@
                      d2 *= ((Double)MoreObjects.firstNonNull(p_184150_11_.apply(entityplayer1), Double.valueOf(1.0D))).doubleValue();
                  }
  
@@ -772,7 +769,7 @@
                  if ((p_184150_9_ < 0.0D || Math.abs(entityplayer1.field_70163_u - p_184150_3_) < p_184150_9_ * p_184150_9_) && (p_184150_7_ < 0.0D || d1 < d2 * d2) && (d0 == -1.0D || d1 < d0))
                  {
                      d0 = d1;
-@@ -3265,7 +3460,7 @@
+@@ -3269,7 +3466,7 @@
  
      public long func_72905_C()
      {
@@ -781,7 +778,7 @@
      }
  
      public long func_82737_E()
-@@ -3275,17 +3470,17 @@
+@@ -3279,17 +3476,17 @@
  
      public long func_72820_D()
      {
@@ -797,12 +794,12 @@
  
      public BlockPos func_175694_M()
      {
--        BlockPos blockpos = new BlockPos(this.field_72986_A.func_76079_c(), this.field_72986_A.func_76075_d(), this.field_72986_A.func_76074_e());
-+        BlockPos blockpos = this.field_73011_w.getSpawnPoint();
+-        BlockPos blockpos1 = new BlockPos(this.field_72986_A.func_76079_c(), this.field_72986_A.func_76075_d(), this.field_72986_A.func_76074_e());
++        BlockPos blockpos1 = this.field_73011_w.getSpawnPoint();
  
-         if (!this.func_175723_af().func_177746_a(blockpos))
+         if (!this.func_175723_af().func_177746_a(blockpos1))
          {
-@@ -3297,7 +3492,7 @@
+@@ -3301,7 +3498,7 @@
  
      public void func_175652_B(BlockPos p_175652_1_)
      {
@@ -811,7 +808,7 @@
      }
  
      @SideOnly(Side.CLIENT)
-@@ -3317,12 +3512,18 @@
+@@ -3321,12 +3518,18 @@
  
          if (!this.field_72996_f.contains(p_72897_1_))
          {
@@ -830,7 +827,7 @@
          return true;
      }
  
-@@ -3424,8 +3625,7 @@
+@@ -3428,8 +3631,7 @@
  
      public boolean func_180502_D(BlockPos p_180502_1_)
      {
@@ -840,7 +837,7 @@
      }
  
      @Nullable
-@@ -3486,12 +3686,12 @@
+@@ -3490,12 +3692,12 @@
  
      public int func_72800_K()
      {
@@ -855,7 +852,7 @@
      }
  
      public Random func_72843_D(int p_72843_1_, int p_72843_2_, int p_72843_3_)
-@@ -3535,7 +3735,7 @@
+@@ -3539,7 +3741,7 @@
      @SideOnly(Side.CLIENT)
      public double func_72919_O()
      {
@@ -864,40 +861,40 @@
      }
  
      public void func_175715_c(int p_175715_1_, BlockPos p_175715_2_, int p_175715_3_)
-@@ -3569,7 +3769,7 @@
+@@ -3573,7 +3775,7 @@
  
      public void func_175666_e(BlockPos p_175666_1_, Block p_175666_2_)
      {
 -        for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL)
 +        for (EnumFacing enumfacing : EnumFacing.field_82609_l)
          {
-             BlockPos blockpos = p_175666_1_.func_177972_a(enumfacing);
+             BlockPos blockpos1 = p_175666_1_.func_177972_a(enumfacing);
  
-@@ -3577,18 +3777,14 @@
+@@ -3581,18 +3783,15 @@
              {
-                 IBlockState iblockstate = this.func_180495_p(blockpos);
+                 IBlockState iblockstate1 = this.func_180495_p(blockpos1);
  
--                if (Blocks.field_150441_bU.func_185547_C(iblockstate))
-+                iblockstate.func_177230_c().onNeighborChange(this, blockpos, p_175666_1_);
-+                if (iblockstate.func_177230_c().isNormalCube(iblockstate, this, blockpos))
+-                if (Blocks.field_150441_bU.func_185547_C(iblockstate1))
++                iblockstate1.func_177230_c().onNeighborChange(this, blockpos1, p_175666_1_);
++                if (iblockstate1.func_177230_c().isNormalCube(iblockstate1, this, blockpos1))
                  {
--                    iblockstate.func_189546_a(this, blockpos, p_175666_2_, p_175666_1_);
+-                    iblockstate1.func_189546_a(this, blockpos1, p_175666_2_, p_175666_1_);
 -                }
--                else if (iblockstate.func_185915_l())
+-                else if (iblockstate1.func_185915_l())
 -                {
-                     blockpos = blockpos.func_177972_a(enumfacing);
-                     iblockstate = this.func_180495_p(blockpos);
--
--                    if (Blocks.field_150441_bU.func_185547_C(iblockstate))
-+                    if (iblockstate.func_177230_c().getWeakChanges(this, blockpos))
+                     blockpos1 = blockpos1.func_177972_a(enumfacing);
+                     iblockstate1 = this.func_180495_p(blockpos1);
+ 
+-                    if (Blocks.field_150441_bU.func_185547_C(iblockstate1))
++                    if (iblockstate1.func_177230_c().getWeakChanges(this, blockpos1))
                      {
--                        iblockstate.func_189546_a(this, blockpos, p_175666_2_, p_175666_1_);
-+                        iblockstate.func_177230_c().onNeighborChange(this, blockpos, p_175666_1_);
+-                        iblockstate1.func_189546_a(this, blockpos1, p_175666_2_, p_175666_1_);
++                        iblockstate1.func_177230_c().onNeighborChange(this, blockpos1, p_175666_1_);
                      }
                  }
              }
-@@ -3654,6 +3850,115 @@
-         return i >= -128 && i <= 128 && j >= -128 && j <= 128;
+@@ -3658,6 +3857,115 @@
+         return j2 >= -128 && j2 <= 128 && k2 >= -128 && k2 <= 128;
      }
  
 +    /* ======================================== FORGE START =====================================*/

patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch

@@ -100,7 +100,7 @@
 @@ -121,7 +180,9 @@
              NBTTagCompound nbttagcompound1 = new NBTTagCompound();
              nbttagcompound.func_74782_a("Level", nbttagcompound1);
-             nbttagcompound.func_74768_a("DataVersion", 1139);
+             nbttagcompound.func_74768_a("DataVersion", 1241);
 +            net.minecraftforge.fml.common.FMLCommonHandler.instance().getDataFixer().writeVersionData(nbttagcompound);
              this.func_75820_a(p_75816_2_, p_75816_1_, nbttagcompound1);
 +            net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.ChunkDataEvent.Save(p_75816_2_, nbttagcompound));

patches/minecraft/net/minecraft/world/gen/structure/template/Template.java.patch

@@ -3,7 +3,7 @@
 @@ -520,6 +520,7 @@
          p_189552_1_.func_74782_a("size", this.func_186267_a(this.field_186272_c.func_177958_n(), this.field_186272_c.func_177956_o(), this.field_186272_c.func_177952_p()));
          p_189552_1_.func_74778_a("author", this.field_186273_d);
-         p_189552_1_.func_74768_a("DataVersion", 1139);
+         p_189552_1_.func_74768_a("DataVersion", 1241);
 +        net.minecraftforge.fml.common.FMLCommonHandler.instance().getDataFixer().writeVersionData(p_189552_1_);
          return p_189552_1_;
      }

patches/minecraft/net/minecraft/world/storage/WorldInfo.java.patch

@@ -20,14 +20,14 @@
              }
          }
      }
-@@ -334,6 +335,7 @@
-         nbttagcompound.func_74757_a("Snapshot", false);
-         p_76064_1_.func_74782_a("Version", nbttagcompound);
-         p_76064_1_.func_74768_a("DataVersion", 1139);
+@@ -366,6 +367,7 @@
+         p_76064_1_.func_74780_a("BorderSizeLerpTarget", this.field_176148_F);
+         p_76064_1_.func_74780_a("BorderWarningBlocks", (double)this.field_176154_I);
+         p_76064_1_.func_74780_a("BorderWarningTime", (double)this.field_176155_J);
 +        net.minecraftforge.fml.common.FMLCommonHandler.instance().getDataFixer().writeVersionData(p_76064_1_);
-         p_76064_1_.func_74772_a("RandomSeed", this.field_76100_a);
-         p_76064_1_.func_74778_a("generatorName", this.field_76098_b.func_77127_a());
-         p_76064_1_.func_74768_a("generatorVersion", this.field_76098_b.func_77131_c());
+ 
+         if (this.field_176158_z != null)
+         {
 @@ -376,9 +378,10 @@
          p_76064_1_.func_74782_a("GameRules", this.field_82577_x.func_82770_a());
          NBTTagCompound nbttagcompound1 = new NBTTagCompound();

src/main/java/net/minecraftforge/common/ForgeVersion.java

@@ -54,15 +54,15 @@ public class ForgeVersion
     //This number is incremented every time we remove deprecated code/major API changes, never reset
     public static final int majorVersion    = 14;
     //This number is incremented every minecraft release, never reset
-    public static final int minorVersion    = 21;
+    public static final int minorVersion    = 22;
     //This number is incremented every time a interface changes or new major feature is added, and reset every Minecraft version
-    public static final int revisionVersion = 1;
+    public static final int revisionVersion = 0;
     //This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code.
     public static final int buildVersion    = 0;
     // This is the minecraft version we're building for - used in various places in Forge/FML code
-    public static final String mcVersion = "1.12";
+    public static final String mcVersion = "1.12.1";
     // This is the MCP data version we're using
-    public static final String mcpVersion = "9.40";
+    public static final String mcpVersion = "9.41";
     @SuppressWarnings("unused")
     private static Status status = PENDING;
     @SuppressWarnings("unused")

src/main/java/net/minecraftforge/fml/common/AutomaticEventSubscriber.java

@@ -78,7 +78,7 @@ public class AutomaticEventSubscriber
                         continue; //We're not injecting this guy
                     }
                     FMLLog.log.debug("Registering @EventBusSubscriber for {} for mod {}", targ.getClassName(), mod.getModId());
-                    Class<?> subscriptionTarget = Class.forName(targ.getClassName(), true, mcl);
+                    Class<?> subscriptionTarget = Class.forName(targ.getClassName(), false, mcl);
                     MinecraftForge.EVENT_BUS.register(subscriptionTarget);
                     FMLLog.log.debug("Injected @EventBusSubscriber class {}", targ.getClassName());
                 }

src/main/java/net/minecraftforge/fml/common/FMLModContainer.java

@@ -264,6 +264,8 @@ public class FMLModContainer implements ModContainer
                 mcVersionString = "[1.9.4,1.10.2]";
         if ("[1.11]".equals(mcVersionString))
             mcVersionString = "[1.11,1.11.2]";
+        if ("[1.12]".equals(mcVersionString))
+            mcVersionString = "[1.12,1.12.1]";
         if (!Strings.isNullOrEmpty(mcVersionString))
         {
             minecraftAccepted = VersionParser.parseRange(mcVersionString);