keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

MC 1.12.2 update.

This commit is contained in:
LexManos 2017-09-18 14:35:45 -07:00
parent 4203e7426f
commit 50265786b2
18 changed files with 1122 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -27,7 +27,7 @@ apply plugin: "maven"
apply plugin: "net.minecraftforge.gradle.patcher"
apply plugin: "net.minecraftforge.gradle.launch4j"
minecraft.version = "1.12.1"
minecraft.version = "1.12.2"
minecraft {
mappings = 'snapshot_nodoc_20170624'

92
jsons/1.12.2-dev.json Normal file
View File

@ -0,0 +1,92 @@
{
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"inheritsFrom": "1.12.2",
"minecraftArguments": "--version FML_DEV --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
"libraries": [
{
"name": "net.minecraft:launchwrapper:1.12"
},
{
"name": "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"
}
]
}

157
jsons/1.12.2-rel.json Normal file
View File

@ -0,0 +1,157 @@
{
"install": {
"profileName": "@project@",
"target":"@minecraft_version@-@project@@version@",
"path":"@artifact@",
"version":"@project@ @version@",
"filePath":"@universal_jar@",
"welcome":"Welcome to the simple @project@ installer.",
"minecraft":"@minecraft_version@",
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
"logo":"/big_logo.png",
"modList":"none"
},
"versionInfo": {
"id": "@minecraft_version@-@project@@version@",
"time": "@timestamp@",
"releaseTime": "1960-01-01T00:00:00-0700",
"type": "release",
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker --versionType Forge",
"mainClass": "net.minecraft.launchwrapper.Launch",
"inheritsFrom": "1.12.2",
"jar": "1.12.2",
"logging": {},
"libraries": [
{
"name": "@artifact@",
"url": "http://files.minecraftforge.net/maven/"
},
{
"name": "net.minecraft:launchwrapper:1.12",
"serverreq":true
},
{
"name": "org.ow2.asm:asm-all:5.2",
"url" : "http://files.minecraftforge.net/maven/",
"checksums" : [ "2ea49e08b876bbd33e0a7ce75c8f371d29e1f10a" ],
"serverreq":true,
"clientreq":true
},
{
"name": "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.2",
"maven": "http://files.minecraftforge.net/maven/"
}
]
}

724
jsons/1.12.2.json Normal file
View File

@ -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": "0f275bc1547d01fa5f56ba34bdc87d981ee12daf",
"size": 10180113,
"url": "https://launcher.mojang.com/mc/game/1.12.2/client/0f275bc1547d01fa5f56ba34bdc87d981ee12daf/client.jar"
},
"server": {
"sha1": "886945bfb2b978778c3a0288fd7fab09d315b25f",
"size": 30222121,
"url": "https://launcher.mojang.com/mc/game/1.12.2/server/886945bfb2b978778c3a0288fd7fab09d315b25f/server.jar"
}
},
"id": "1.12.2",
"libraries": [
{
"name": "com.mojang:patchy:1.1",
"downloads": {
"artifact": {
"size": 15817,
"sha1": "aef610b34a1be37fa851825f12372b78424d8903",
"path": "com/mojang/patchy/1.1/patchy-1.1.jar",
"url": "https://libraries.minecraft.net/com/mojang/patchy/1.1/patchy-1.1.jar"
}
}
},
{
"name": "oshi-project:oshi-core:1.1",
"downloads": {
"artifact": {
"size": 30973,
"sha1": "9ddf7b048a8d701be231c0f4f95fd986198fd2d8",
"path": "oshi-project/oshi-core/1.1/oshi-core-1.1.jar",
"url": "https://libraries.minecraft.net/oshi-project/oshi-core/1.1/oshi-core-1.1.jar"
}
}
},
{
"name": "net.java.dev.jna:jna:4.4.0",
"downloads": {
"artifact": {
"size": 1091208,
"sha1": "cb208278274bf12ebdb56c61bd7407e6f774d65a",
"path": "net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar",
"url": "https://libraries.minecraft.net/net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar"
}
}
},
{
"name": "net.java.dev.jna:platform:3.4.0",
"downloads": {
"artifact": {
"size": 913436,
"sha1": "e3f70017be8100d3d6923f50b3d2ee17714e9c13",
"path": "net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar",
"url": "https://libraries.minecraft.net/net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar"
}
}
},
{
"name": "com.ibm.icu:icu4j-core-mojang:51.2",
"downloads": {
"artifact": {
"size": 1634692,
"sha1": "63d216a9311cca6be337c1e458e587f99d382b84",
"path": "com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar",
"url": "https://libraries.minecraft.net/com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar"
}
}
},
{
"name": "net.sf.jopt-simple:jopt-simple:5.0.3",
"downloads": {
"artifact": {
"size": 78175,
"sha1": "cdd846cfc4e0f7eefafc02c0f5dce32b9303aa2a",
"path": "net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.jar",
"url": "https://libraries.minecraft.net/net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.jar"
}
}
},
{
"name": "com.paulscode:codecjorbis:20101023",
"downloads": {
"artifact": {
"size": 103871,
"sha1": "c73b5636faf089d9f00e8732a829577de25237ee",
"path": "com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar",
"url": "https://libraries.minecraft.net/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"
}
}
},
{
"name": "com.paulscode:codecwav:20101023",
"downloads": {
"artifact": {
"size": 5618,
"sha1": "12f031cfe88fef5c1dd36c563c0a3a69bd7261da",
"path": "com/paulscode/codecwav/20101023/codecwav-20101023.jar",
"url": "https://libraries.minecraft.net/com/paulscode/codecwav/20101023/codecwav-20101023.jar"
}
}
},
{
"name": "com.paulscode:libraryjavasound:20101123",
"downloads": {
"artifact": {
"size": 21679,
"sha1": "5c5e304366f75f9eaa2e8cca546a1fb6109348b3",
"path": "com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar",
"url": "https://libraries.minecraft.net/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"
}
}
},
{
"name": "com.paulscode:librarylwjglopenal:20100824",
"downloads": {
"artifact": {
"size": 18981,
"sha1": "73e80d0794c39665aec3f62eee88ca91676674ef",
"path": "com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar",
"url": "https://libraries.minecraft.net/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"
}
}
},
{
"name": "com.paulscode:soundsystem:20120107",
"downloads": {
"artifact": {
"size": 65020,
"sha1": "419c05fe9be71f792b2d76cfc9b67f1ed0fec7f6",
"path": "com/paulscode/soundsystem/20120107/soundsystem-20120107.jar",
"url": "https://libraries.minecraft.net/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"
}
}
},
{
"name": "io.netty:netty-all:4.1.9.Final",
"downloads": {
"artifact": {
"size": 3511093,
"sha1": "0097860965d6a0a6b98e7f569f3f966727b8db75",
"path": "io/netty/netty-all/4.1.9.Final/netty-all-4.1.9.Final.jar",
"url": "https://libraries.minecraft.net/io/netty/netty-all/4.1.9.Final/netty-all-4.1.9.Final.jar"
}
}
},
{
"name": "com.google.guava:guava:21.0",
"downloads": {
"artifact": {
"size": 2521113,
"sha1": "3a3d111be1be1b745edfa7d91678a12d7ed38709",
"path": "com/google/guava/guava/21.0/guava-21.0.jar",
"url": "https://libraries.minecraft.net/com/google/guava/guava/21.0/guava-21.0.jar"
}
}
},
{
"name": "org.apache.commons:commons-lang3:3.5",
"downloads": {
"classifiers": {
"tests": {
"size": 780282,
"sha1": "8ca309192f104265c67a1570245ae827a8650af9",
"path": "org/apache/commons/commons-lang3/3.5/commons-lang3-3.5-tests.jar",
"url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5-tests.jar"
}
},
"artifact": {
"size": 479881,
"sha1": "6c6c702c89bfff3cd9e80b04d668c5e190d588c6",
"path": "org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar",
"url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar"
}
}
},
{
"name": "commons-io:commons-io:2.5",
"downloads": {
"classifiers": {
"tests": {
"size": 372821,
"sha1": "32b15369c83e9435ced8cd3fbe652dfba9c497ef",
"path": "commons-io/commons-io/2.5/commons-io-2.5-tests.jar",
"url": "https://libraries.minecraft.net/commons-io/commons-io/2.5/commons-io-2.5-tests.jar"
}
},
"artifact": {
"size": 208700,
"sha1": "2852e6e05fbb95076fc091f6d1780f1f8fe35e0f",
"path": "commons-io/commons-io/2.5/commons-io-2.5.jar",
"url": "https://libraries.minecraft.net/commons-io/commons-io/2.5/commons-io-2.5.jar"
}
}
},
{
"name": "commons-codec:commons-codec:1.10",
"downloads": {
"classifiers": {
"tests": {
"size": 256617,
"sha1": "df86446f0fe79f15ce8048c0ed04d1a92fa8d265",
"path": "commons-codec/commons-codec/1.10/commons-codec-1.10-tests.jar",
"url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.10/commons-codec-1.10-tests.jar"
}
},
"artifact": {
"size": 284184,
"sha1": "4b95f4897fa13f2cd904aee711aeafc0c5295cd8",
"path": "commons-codec/commons-codec/1.10/commons-codec-1.10.jar",
"url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.10/commons-codec-1.10.jar"
}
}
},
{
"name": "net.java.jinput:jinput:2.0.5",
"downloads": {
"artifact": {
"size": 208338,
"sha1": "39c7796b469a600f72380316f6b1f11db6c2c7c4",
"path": "net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar",
"url": "https://libraries.minecraft.net/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"
}
}
},
{
"name": "net.java.jutils:jutils:1.0.0",
"downloads": {
"artifact": {
"size": 7508,
"sha1": "e12fe1fda814bd348c1579329c86943d2cd3c6a6",
"path": "net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar",
"url": "https://libraries.minecraft.net/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"
}
}
},
{
"name": "com.google.code.gson:gson:2.8.0",
"downloads": {
"artifact": {
"size": 231952,
"sha1": "c4ba5371a29ac9b2ad6129b1d39ea38750043eff",
"path": "com/google/code/gson/gson/2.8.0/gson-2.8.0.jar",
"url": "https://libraries.minecraft.net/com/google/code/gson/gson/2.8.0/gson-2.8.0.jar"
}
}
},
{
"name": "com.mojang:authlib:1.5.25",
"downloads": {
"artifact": {
"size": 65621,
"sha1": "9834cdf236c22e84b946bba989e2f94ef5897c3c",
"path": "com/mojang/authlib/1.5.25/authlib-1.5.25.jar",
"url": "https://libraries.minecraft.net/com/mojang/authlib/1.5.25/authlib-1.5.25.jar"
}
}
},
{
"name": "com.mojang:realms:1.10.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-09-18T08:39:46+00:00",
"time": "2017-09-18T08:41:11+00:00",
"type": "release"
}

6
patches/minecraft/net/minecraft/block/BlockFarmland.java.patch
View File

@ -1,15 +1,15 @@
--- ../src-base/minecraft/net/minecraft/block/BlockFarmland.java
+++ ../src-work/minecraft/net/minecraft/block/BlockFarmland.java
@@ -71,7 +71,7 @@
@@ -72,7 +72,7 @@
public void func_180658_a(World p_180658_1_, BlockPos p_180658_2_, Entity p_180658_3_, float p_180658_4_)
{
- if (!p_180658_1_.field_72995_K && p_180658_1_.field_73012_v.nextFloat() < p_180658_4_ - 0.5F && p_180658_3_ instanceof EntityLivingBase && (p_180658_3_ instanceof EntityPlayer || p_180658_1_.func_82736_K().func_82766_b("mobGriefing")) && p_180658_3_.field_70130_N * p_180658_3_.field_70130_N * p_180658_3_.field_70131_O > 0.512F)
+ if (!p_180658_1_.field_72995_K && p_180658_3_.canTrample(p_180658_1_, this, p_180658_2_, p_180658_4_)) // Forge: Move logic to Entity#canTrample
{
this.func_190970_b(p_180658_1_, p_180658_2_);
func_190970_b(p_180658_1_, p_180658_2_);
}
@@ -94,7 +94,7 @@
@@ -95,7 +95,7 @@
private boolean func_176529_d(World p_176529_1_, BlockPos p_176529_2_)
{
Block block = p_176529_1_.func_180495_p(p_176529_2_.func_177984_a()).func_177230_c();

12
patches/minecraft/net/minecraft/client/entity/EntityPlayerSP.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
+++ ../src-work/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
@@ -130,6 +130,7 @@
@@ -131,6 +131,7 @@
public boolean func_70097_a(DamageSource p_70097_1_, float p_70097_2_)
{
@ -8,7 +8,7 @@
return false;
}
@@ -447,6 +448,15 @@
@@ -448,6 +449,15 @@
}
}
@ -24,7 +24,7 @@
protected boolean func_145771_j(double p_145771_1_, double p_145771_3_, double p_145771_5_)
{
if (this.field_70145_X)
@@ -459,30 +469,34 @@
@@ -460,30 +470,34 @@
double d0 = p_145771_1_ - (double)blockpos.func_177958_n();
double d1 = p_145771_5_ - (double)blockpos.func_177952_p();
@ -64,7 +64,7 @@
{
d2 = 1.0D - d1;
i = 5;
@@ -517,7 +531,8 @@
@@ -518,7 +532,8 @@
private boolean func_175162_d(BlockPos p_175162_1_)
{
@ -74,7 +74,7 @@
}
public void func_70031_b(boolean p_70031_1_)
@@ -562,7 +577,13 @@
@@ -563,7 +578,13 @@
public void func_184185_a(SoundEvent p_184185_1_, float p_184185_2_, float p_184185_3_)
{
@ -89,7 +89,7 @@
}
public boolean func_70613_aW()
@@ -853,10 +874,13 @@
@@ -859,10 +880,13 @@
}
AxisAlignedBB axisalignedbb = this.func_174813_aQ();

17
patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java
@@ -69,6 +69,8 @@
@@ -70,6 +70,8 @@
private GuiScreen field_183503_M;
private int field_193978_M;
private int field_193979_N;
@ -9,7 +9,7 @@
public GuiMainMenu()
{
@@ -211,13 +213,15 @@
@@ -212,13 +214,15 @@
this.field_183503_M.func_183500_a(this.field_146294_l, this.field_146295_m);
this.field_183503_M.func_73866_w_();
}
@ -26,7 +26,7 @@
}
private void func_73972_b(int p_73972_1_, int p_73972_2_)
@@ -265,6 +269,11 @@
@@ -266,6 +270,11 @@
this.field_146297_k.func_71400_g();
}
@ -38,16 +38,17 @@
if (p_146284_1_.field_146127_k == 11)
{
this.field_146297_k.func_71371_a("Demo_World", "Demo_World", WorldServerDemo.field_73071_a);
@@ -497,6 +506,8 @@
this.func_73729_b(j + 155, 30, 0, 45, 155, 44);
}
@@ -500,6 +509,9 @@
this.field_146297_k.func_110434_K().func_110577_a(field_194400_H);
func_146110_a(j + 88, 67, 0.0F, 0.0F, 98, 14, 128.0F, 16.0F);
+
+ this.field_73975_c = net.minecraftforge.client.ForgeHooksClient.renderMainMenu(this, this.field_146289_q, this.field_146294_l, this.field_146295_m, this.field_73975_c);
+
GlStateManager.func_179094_E();
GlStateManager.func_179109_b((float)(this.field_146294_l / 2 + 90), 70.0F, 0.0F);
GlStateManager.func_179114_b(-20.0F, 0.0F, 0.0F, 1.0F);
@@ -516,7 +527,16 @@
@@ -519,7 +531,16 @@
s = s + ("release".equalsIgnoreCase(this.field_146297_k.func_184123_d()) ? "" : "/" + this.field_146297_k.func_184123_d());
}
@ -65,7 +66,7 @@
this.func_73731_b(this.field_146289_q, "Copyright Mojang AB. Do not distribute!", this.field_193979_N, this.field_146295_m - 10, -1);
if (p_73863_1_ > this.field_193979_N && p_73863_1_ < this.field_193979_N + this.field_193978_M && p_73863_2_ > this.field_146295_m - 10 && p_73863_2_ < this.field_146295_m && Mouse.isInsideWindow())
@@ -537,6 +557,7 @@
@@ -540,6 +561,7 @@
{
this.field_183503_M.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
}

2
patches/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java.patch
View File

@ -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 < 338;
boolean flag1 = this.field_148301_e.field_82821_f < 340;
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);

4
patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/entity/item/EntityEnderPearl.java
+++ ../src-work/minecraft/net/minecraft/entity/item/EntityEnderPearl.java
@@ -96,6 +96,9 @@
@@ -98,6 +98,9 @@
if (entityplayermp.field_71135_a.func_147362_b().func_150724_d() && entityplayermp.field_70170_p == this.field_70170_p && !entityplayermp.func_70608_bn())
{
@ -10,7 +10,7 @@
if (this.field_70146_Z.nextFloat() < 0.05F && this.field_70170_p.func_82736_K().func_82766_b("doMobSpawning"))
{
EntityEndermite entityendermite = new EntityEndermite(this.field_70170_p);
@@ -109,9 +112,10 @@
@@ -111,9 +114,10 @@
entitylivingbase.func_184210_p();
}

12
patches/minecraft/net/minecraft/network/NetHandlerPlayServer.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/network/NetHandlerPlayServer.java
+++ ../src-work/minecraft/net/minecraft/network/NetHandlerPlayServer.java
@@ -663,7 +663,10 @@
@@ -671,7 +671,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;
}
@@ -721,7 +724,9 @@
@@ -729,7 +732,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());
}
@@ -925,7 +930,9 @@
@@ -933,7 +938,9 @@
}
else
{
@ -34,7 +34,7 @@
this.field_147367_d.func_184103_al().func_148544_a(itextcomponent, false);
}
@@ -1058,6 +1065,7 @@
@@ -1066,6 +1073,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)
@@ -1098,7 +1106,7 @@
@@ -1106,7 +1114,7 @@
return;
}
@ -51,7 +51,7 @@
if (this.field_147367_d.func_71199_h())
{
@@ -1141,7 +1149,7 @@
@@ -1149,7 +1157,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);

2
patches/minecraft/net/minecraft/util/datafix/DataFixesManager.java.patch
View File

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

156
patches/minecraft/net/minecraft/world/World.java.patch
View File

@ -405,44 +405,12 @@
throw new ReportedException(crashreport1);
}
}
@@ -1684,7 +1800,7 @@
{
BlockPos blockpos = tileentity.func_174877_v();
@@ -1674,14 +1790,23 @@
- if (this.func_175667_e(blockpos) && this.field_175728_M.func_177746_a(blockpos))
+ if (this.func_175668_a(blockpos, false) && this.field_175728_M.func_177746_a(blockpos)) //Forge: Fix TE's getting an extra tick on the client side....
{
try
{
@@ -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);
+ if (net.minecraftforge.common.ForgeModContainer.removeErroringTileEntities)
+ {
+ net.minecraftforge.fml.common.FMLLog.log.fatal("{}", crashreport2.func_71502_e());
+ tileentity.func_145843_s();
+ this.func_175713_t(tileentity.func_174877_v());
+ }
+ else
throw new ReportedException(crashreport2);
}
}
@@ -1712,20 +1835,31 @@
this.field_72984_F.func_76318_c("blockEntities");
if (this.func_175667_e(tileentity.func_174877_v()))
{
- this.func_175726_f(tileentity.func_174877_v()).func_177425_e(tileentity.func_174877_v());
+ //Forge: Bugfix: If we set the tile entity it immediately sets it in the chunk, so we could be desyned
+ Chunk chunk = this.func_175726_f(tileentity.func_174877_v());
+ if (chunk.func_177424_a(tileentity.func_174877_v(), net.minecraft.world.chunk.Chunk.EnumCreateEntityType.CHECK) == tileentity)
+ chunk.func_177425_e(tileentity.func_174877_v());
}
}
}
- this.field_147481_N = false;
-
+ this.field_147481_N = true; //FML Move above remove to prevent CMEs
+
if (!this.field_147483_b.isEmpty())
{
- this.field_175730_i.removeAll(this.field_147483_b);
@ -460,12 +428,46 @@
this.field_147483_b.clear();
}
+ this.field_147481_N = false; //FML Move below remove to prevent CMEs
+
this.field_72984_F.func_76318_c("pendingBlockEntities");
- this.field_147481_N = true;
Iterator<TileEntity> iterator = this.field_175730_i.iterator();
if (!this.field_147484_a.isEmpty())
@@ -1764,12 +1898,18 @@
while (iterator.hasNext())
@@ -1692,7 +1817,7 @@
{
BlockPos blockpos = tileentity.func_174877_v();
- if (this.func_175667_e(blockpos) && this.field_175728_M.func_177746_a(blockpos))
+ if (this.func_175668_a(blockpos, false) && this.field_175728_M.func_177746_a(blockpos)) //Forge: Fix TE's getting an extra tick on the client side....
{
try
{
@@ -1708,6 +1833,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);
+ if (net.minecraftforge.common.ForgeModContainer.removeErroringTileEntities)
+ {
+ net.minecraftforge.fml.common.FMLLog.log.fatal("{}", crashreport2.func_71502_e());
+ tileentity.func_145843_s();
+ this.func_175713_t(tileentity.func_174877_v());
+ }
+ else
throw new ReportedException(crashreport2);
}
}
@@ -1720,7 +1852,10 @@
if (this.func_175667_e(tileentity.func_174877_v()))
{
- this.func_175726_f(tileentity.func_174877_v()).func_177425_e(tileentity.func_174877_v());
+ //Forge: Bugfix: If we set the tile entity it immediately sets it in the chunk, so we could be desyned
+ Chunk chunk = this.func_175726_f(tileentity.func_174877_v());
+ if (chunk.func_177424_a(tileentity.func_174877_v(), net.minecraft.world.chunk.Chunk.EnumCreateEntityType.CHECK) == tileentity)
+ chunk.func_177425_e(tileentity.func_174877_v());
}
}
}
@@ -1764,12 +1899,18 @@
public boolean func_175700_a(TileEntity p_175700_1_)
{
@ -484,7 +486,7 @@
if (this.field_72995_K)
{
@@ -1785,6 +1925,11 @@
@@ -1785,6 +1926,11 @@
{
if (this.field_147481_N)
{
@ -496,7 +498,7 @@
this.field_147484_a.addAll(p_147448_1_);
}
else
@@ -1807,9 +1952,13 @@
@@ -1807,9 +1953,13 @@
{
int j2 = MathHelper.func_76128_c(p_72866_1_.field_70165_t);
int k2 = MathHelper.func_76128_c(p_72866_1_.field_70161_v);
@ -512,7 +514,7 @@
{
return;
}
@@ -1831,6 +1980,7 @@
@@ -1831,6 +1981,7 @@
}
else
{
@ -520,7 +522,7 @@
p_72866_1_.func_70071_h_();
}
}
@@ -2011,6 +2161,11 @@
@@ -2011,6 +2162,11 @@
blockpos$pooledmutableblockpos.func_185344_t();
return true;
}
@ -532,7 +534,7 @@
}
}
}
@@ -2050,6 +2205,16 @@
@@ -2050,6 +2206,16 @@
IBlockState iblockstate1 = this.func_180495_p(blockpos$pooledmutableblockpos);
Block block = iblockstate1.func_177230_c();
@ -549,7 +551,7 @@
if (iblockstate1.func_185904_a() == p_72918_2_)
{
double d0 = (double)((float)(i4 + 1) - BlockLiquid.func_149801_b(((Integer)iblockstate1.func_177229_b(BlockLiquid.field_176367_b)).intValue()));
@@ -2116,6 +2281,7 @@
@@ -2116,6 +2282,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_);
@ -557,7 +559,7 @@
explosion.func_77278_a();
explosion.func_77279_a(true);
return explosion;
@@ -2238,6 +2404,7 @@
@@ -2238,6 +2405,7 @@
public void func_175690_a(BlockPos p_175690_1_, @Nullable TileEntity p_175690_2_)
{
@ -565,7 +567,7 @@
if (!this.func_189509_E(p_175690_1_))
{
if (p_175690_2_ != null && !p_175690_2_.func_145837_r())
@@ -2245,6 +2412,8 @@
@@ -2245,6 +2413,8 @@
if (this.field_147481_N)
{
p_175690_2_.func_174878_a(p_175690_1_);
@ -574,7 +576,7 @@
Iterator<TileEntity> iterator1 = this.field_147484_a.iterator();
while (iterator1.hasNext())
@@ -2262,7 +2431,8 @@
@@ -2262,7 +2432,8 @@
}
else
{
@ -584,7 +586,7 @@
this.func_175700_a(p_175690_2_);
}
}
@@ -2277,6 +2447,8 @@
@@ -2277,6 +2448,8 @@
{
tileentity2.func_145843_s();
this.field_147484_a.remove(tileentity2);
@ -593,7 +595,7 @@
}
else
{
@@ -2289,6 +2461,7 @@
@@ -2289,6 +2462,7 @@
this.func_175726_f(p_175713_1_).func_177425_e(p_175713_1_);
}
@ -601,7 +603,7 @@
}
public void func_147457_a(TileEntity p_147457_1_)
@@ -2315,7 +2488,7 @@
@@ -2315,7 +2489,7 @@
if (chunk1 != null && !chunk1.func_76621_g())
{
IBlockState iblockstate1 = this.func_180495_p(p_175677_1_);
@ -610,7 +612,7 @@
}
else
{
@@ -2338,6 +2511,7 @@
@@ -2338,6 +2512,7 @@
{
this.field_72985_G = p_72891_1_;
this.field_72992_H = p_72891_2_;
@ -618,7 +620,7 @@
}
public void func_72835_b()
@@ -2347,6 +2521,11 @@
@@ -2347,6 +2522,11 @@
protected void func_72947_a()
{
@ -630,7 +632,7 @@
if (this.field_72986_A.func_76059_o())
{
this.field_73004_o = 1.0F;
@@ -2360,6 +2539,11 @@
@@ -2360,6 +2540,11 @@
protected void func_72979_l()
{
@ -642,7 +644,7 @@
if (this.field_73011_w.func_191066_m())
{
if (!this.field_72995_K)
@@ -2484,6 +2668,11 @@
@@ -2484,6 +2669,11 @@
public boolean func_175670_e(BlockPos p_175670_1_, boolean p_175670_2_)
{
@ -654,7 +656,7 @@
Biome biome = this.func_180494_b(p_175670_1_);
float f = biome.func_180626_a(p_175670_1_);
@@ -2525,6 +2714,11 @@
@@ -2525,6 +2715,11 @@
public boolean func_175708_f(BlockPos p_175708_1_, boolean p_175708_2_)
{
@ -666,7 +668,7 @@
Biome biome = this.func_180494_b(p_175708_1_);
float f = biome.func_180626_a(p_175708_1_);
@@ -2542,7 +2736,7 @@
@@ -2542,7 +2737,7 @@
{
IBlockState iblockstate1 = this.func_180495_p(p_175708_1_);
@ -675,7 +677,7 @@
{
return true;
}
@@ -2574,10 +2768,11 @@
@@ -2574,10 +2769,11 @@
else
{
IBlockState iblockstate1 = this.func_180495_p(p_175638_1_);
@ -690,7 +692,7 @@
{
k2 = 1;
}
@@ -2683,7 +2878,8 @@
@@ -2683,7 +2879,8 @@
int k6 = k4 + enumfacing.func_96559_d();
int l6 = l4 + enumfacing.func_82599_e();
blockpos$pooledmutableblockpos.func_181079_c(j6, k6, l6);
@ -700,7 +702,7 @@
j5 = this.func_175642_b(p_180500_1_, blockpos$pooledmutableblockpos);
if (j5 == i5 - i7 && k2 < this.field_72994_J.length)
@@ -2791,10 +2987,10 @@
@@ -2791,10 +2988,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();
@ -715,7 +717,7 @@
for (int j3 = j2; j3 <= k2; ++j3)
{
@@ -2847,10 +3043,10 @@
@@ -2847,10 +3044,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_)
{
@ -730,7 +732,7 @@
List<T> list = Lists.<T>newArrayList();
for (int j3 = j2; j3 < k2; ++j3)
@@ -2930,11 +3126,13 @@
@@ -2930,11 +3127,13 @@
public void func_175650_b(Collection<Entity> p_175650_1_)
{
@ -747,7 +749,7 @@
}
}
@@ -2958,7 +3156,7 @@
@@ -2958,7 +3157,7 @@
}
else
{
@ -756,7 +758,7 @@
}
}
@@ -3042,7 +3240,7 @@
@@ -3042,7 +3241,7 @@
public int func_175651_c(BlockPos p_175651_1_, EnumFacing p_175651_2_)
{
IBlockState iblockstate1 = this.func_180495_p(p_175651_1_);
@ -765,7 +767,7 @@
}
public boolean func_175640_z(BlockPos p_175640_1_)
@@ -3208,6 +3406,8 @@
@@ -3208,6 +3407,8 @@
d2 *= ((Double)MoreObjects.firstNonNull(p_184150_11_.apply(entityplayer1), Double.valueOf(1.0D))).doubleValue();
}
@ -774,7 +776,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;
@@ -3269,7 +3469,7 @@
@@ -3269,7 +3470,7 @@
public long func_72905_C()
{
@ -783,7 +785,7 @@
}
public long func_82737_E()
@@ -3279,17 +3479,17 @@
@@ -3279,17 +3480,17 @@
public long func_72820_D()
{
@ -804,7 +806,7 @@
if (!this.func_175723_af().func_177746_a(blockpos1))
{
@@ -3301,7 +3501,7 @@
@@ -3301,7 +3502,7 @@
public void func_175652_B(BlockPos p_175652_1_)
{
@ -813,7 +815,7 @@
}
@SideOnly(Side.CLIENT)
@@ -3321,12 +3521,18 @@
@@ -3321,12 +3522,18 @@
if (!this.field_72996_f.contains(p_72897_1_))
{
@ -832,7 +834,7 @@
return true;
}
@@ -3428,8 +3634,7 @@
@@ -3428,8 +3635,7 @@
public boolean func_180502_D(BlockPos p_180502_1_)
{
@ -842,7 +844,7 @@
}
@Nullable
@@ -3490,12 +3695,12 @@
@@ -3490,12 +3696,12 @@
public int func_72800_K()
{
@ -857,7 +859,7 @@
}
public Random func_72843_D(int p_72843_1_, int p_72843_2_, int p_72843_3_)
@@ -3539,7 +3744,7 @@
@@ -3539,7 +3745,7 @@
@SideOnly(Side.CLIENT)
public double func_72919_O()
{
@ -866,7 +868,7 @@
}
public void func_175715_c(int p_175715_1_, BlockPos p_175715_2_, int p_175715_3_)
@@ -3573,7 +3778,7 @@
@@ -3573,7 +3779,7 @@
public void func_175666_e(BlockPos p_175666_1_, Block p_175666_2_)
{
@ -875,7 +877,7 @@
{
BlockPos blockpos1 = p_175666_1_.func_177972_a(enumfacing);
@@ -3581,18 +3786,15 @@
@@ -3581,18 +3787,15 @@
{
IBlockState iblockstate1 = this.func_180495_p(blockpos1);
@ -898,7 +900,7 @@
}
}
}
@@ -3658,6 +3860,124 @@
@@ -3658,6 +3861,124 @@
return j2 >= -128 && j2 <= 128 && k2 >= -128 && k2 <= 128;
}

48
patches/minecraft/net/minecraft/world/WorldServer.java.patch
View File

@ -1,6 +1,6 @@
--- ../src-base/minecraft/net/minecraft/world/WorldServer.java
+++ ../src-work/minecraft/net/minecraft/world/WorldServer.java
@@ -100,30 +100,39 @@
@@ -101,30 +101,39 @@
private int field_147489_T;
private final List<NextTickListEntry> field_94579_S = Lists.<NextTickListEntry>newArrayList();
@ -43,7 +43,7 @@
}
else
{
@@ -160,6 +169,7 @@
@@ -161,6 +170,7 @@
this.func_175723_af().func_177750_a(this.field_72986_A.func_176137_E());
}
@ -51,7 +51,7 @@
return this;
}
@@ -178,8 +188,8 @@
@@ -179,8 +189,8 @@
{
if (this.func_82736_K().func_82766_b("doDaylightCycle"))
{
@ -62,7 +62,7 @@
}
this.func_73053_d();
@@ -205,7 +215,7 @@
@@ -206,7 +216,7 @@
if (this.func_82736_K().func_82766_b("doDaylightCycle"))
{
@ -71,7 +71,7 @@
}
this.field_72984_F.func_76318_c("tickPending");
@@ -219,6 +229,10 @@
@@ -220,6 +230,10 @@
this.field_175740_d.func_75528_a();
this.field_72984_F.func_76318_c("portalForcer");
this.field_85177_Q.func_85189_a(this.func_82737_E());
@ -82,7 +82,7 @@
this.field_72984_F.func_76319_b();
this.func_147488_Z();
}
@@ -227,12 +241,14 @@
@@ -228,12 +242,14 @@
public Biome.SpawnListEntry func_175734_a(EnumCreatureType p_175734_1_, BlockPos p_175734_2_)
{
List<Biome.SpawnListEntry> list = this.func_72863_F().func_177458_a(p_175734_1_, p_175734_2_);
@ -97,7 +97,7 @@
return list != null && !list.isEmpty() ? list.contains(p_175732_2_) : false;
}
@@ -281,10 +297,7 @@
@@ -279,10 +295,7 @@
private void func_73051_P()
{
@ -109,7 +109,7 @@
}
public boolean func_73056_e()
@@ -377,7 +390,7 @@
@@ -375,7 +388,7 @@
boolean flag1 = this.func_72911_I();
this.field_72984_F.func_76320_a("pollingChunks");
@ -118,7 +118,7 @@
{
this.field_72984_F.func_76320_a("getChunk");
Chunk chunk = iterator.next();
@@ -389,7 +402,7 @@
@@ -387,7 +400,7 @@
chunk.func_150804_b(false);
this.field_72984_F.func_76318_c("thunder");
@ -127,7 +127,7 @@
{
this.field_73005_l = this.field_73005_l * 3 + 1013904223;
int l = this.field_73005_l >> 2;
@@ -417,7 +430,7 @@
@@ -415,7 +428,7 @@
this.field_72984_F.func_76318_c("iceandsnow");
@ -136,7 +136,7 @@
{
this.field_73005_l = this.field_73005_l * 3 + 1013904223;
int j2 = this.field_73005_l >> 2;
@@ -527,7 +540,10 @@
@@ -525,7 +538,10 @@
{
if (p_175654_2_.func_149698_L())
{
@ -148,7 +148,7 @@
{
IBlockState iblockstate = this.func_180495_p(p_175654_1_);
@@ -563,6 +579,7 @@
@@ -561,6 +577,7 @@
public void func_180497_b(BlockPos p_180497_1_, Block p_180497_2_, int p_180497_3_, int p_180497_4_)
{
@ -156,7 +156,7 @@
NextTickListEntry nextticklistentry = new NextTickListEntry(p_180497_1_, p_180497_2_);
nextticklistentry.func_82753_a(p_180497_4_);
Material material = p_180497_2_.func_176223_P().func_185904_a();
@@ -581,7 +598,7 @@
@@ -579,7 +596,7 @@
public void func_72939_s()
{
@ -165,7 +165,7 @@
{
if (this.field_80004_Q++ >= 300)
{
@@ -705,6 +722,9 @@
@@ -703,6 +720,9 @@
{
NextTickListEntry nextticklistentry1 = iterator.next();
iterator.remove();
@ -175,7 +175,7 @@
int k = 0;
if (this.func_175707_a(nextticklistentry1.field_180282_a.func_177982_a(0, 0, 0), nextticklistentry1.field_180282_a.func_177982_a(0, 0, 0)))
@@ -831,6 +851,10 @@
@@ -829,6 +849,10 @@
public boolean func_175660_a(EntityPlayer p_175660_1_, BlockPos p_175660_2_)
{
@ -186,7 +186,7 @@
return !this.field_73061_a.func_175579_a(this, p_175660_2_, p_175660_1_) && this.func_175723_af().func_177746_a(p_175660_2_);
}
@@ -896,6 +920,7 @@
@@ -894,6 +918,7 @@
}
else
{
@ -194,7 +194,7 @@
this.field_72987_B = true;
BiomeProvider biomeprovider = this.field_73011_w.func_177499_m();
List<Biome> list = biomeprovider.func_76932_a();
@@ -981,6 +1006,7 @@
@@ -979,6 +1004,7 @@
}
chunkproviderserver.func_186027_a(p_73044_1_);
@ -202,7 +202,7 @@
for (Chunk chunk : Lists.newArrayList(chunkproviderserver.func_189548_a()))
{
@@ -1025,6 +1051,7 @@
@@ -1023,6 +1049,7 @@
this.field_72986_A.func_176135_e(this.func_175723_af().func_177732_i());
this.field_73019_z.func_75755_a(this.field_72986_A, this.field_73061_a.func_184103_al().func_72378_q());
this.field_72988_C.func_75744_a();
@ -210,7 +210,7 @@
}
public boolean func_72838_d(Entity p_72838_1_)
@@ -1036,7 +1063,7 @@
@@ -1034,7 +1061,7 @@
{
for (Entity entity : Lists.newArrayList(p_175650_1_))
{
@ -219,7 +219,7 @@
{
this.field_72996_f.add(entity);
this.func_72923_a(entity);
@@ -1117,7 +1144,7 @@
@@ -1115,7 +1142,7 @@
{
if (super.func_72942_c(p_72942_1_))
{
@ -228,7 +228,7 @@
return true;
}
else
@@ -1139,6 +1166,7 @@
@@ -1137,6 +1164,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_);
@ -236,7 +236,7 @@
explosion.func_77278_a();
explosion.func_77279_a(false);
@@ -1184,7 +1212,7 @@
@@ -1182,7 +1210,7 @@
{
if (this.func_147485_a(blockeventdata))
{
@ -245,7 +245,7 @@
}
}
@@ -1210,27 +1238,31 @@
@@ -1208,27 +1236,31 @@
if (this.field_73003_n != this.field_73004_o)
{
@ -283,7 +283,7 @@
}
}
@@ -1325,6 +1357,11 @@
@@ -1323,6 +1355,11 @@
return this.field_193036_D;
}

2
patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch
View File

@ -87,7 +87,7 @@
@@ -121,7 +167,9 @@
NBTTagCompound nbttagcompound1 = new NBTTagCompound();
nbttagcompound.func_74782_a("Level", nbttagcompound1);
nbttagcompound.func_74768_a("DataVersion", 1241);
nbttagcompound.func_74768_a("DataVersion", 1343);
+ 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));

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

@ -1,10 +1,10 @@
--- ../src-base/minecraft/net/minecraft/world/gen/structure/template/Template.java
+++ ../src-work/minecraft/net/minecraft/world/gen/structure/template/Template.java
@@ -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", 1241);
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().getDataFixer().writeVersionData(p_189552_1_);
return p_189552_1_;
}
@@ -514,6 +514,7 @@
nbttaglist2.func_74742_a(NBTUtil.func_190009_a(new NBTTagCompound(), iblockstate));
}
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().getDataFixer().writeVersionData(p_189552_1_); //Moved up for MC updating reasons.
p_189552_1_.func_74782_a("palette", nbttaglist2);
p_189552_1_.func_74782_a("blocks", nbttaglist);
p_189552_1_.func_74782_a("entities", nbttaglist1);

8
src/main/java/net/minecraftforge/common/ForgeVersion.java
View File

@ -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 = 22;
public static final int minorVersion = 23;
//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.1";
public static final String mcVersion = "1.12.2";
// This is the MCP data version we're using
public static final String mcpVersion = "9.41";
public static final String mcpVersion = "9.42";
@SuppressWarnings("unused")
private static Status status = PENDING;
@SuppressWarnings("unused")

4
src/main/java/net/minecraftforge/fml/common/FMLModContainer.java
View File

@ -257,7 +257,9 @@ public class FMLModContainer implements ModContainer
String mcVersionString = (String)descriptor.get("acceptedMinecraftVersions");
if ("[1.12]".equals(mcVersionString))
mcVersionString = "[1.12,1.12.1]";
mcVersionString = "[1.12,1.12.2]";
if ("[1.12.1]".equals(mcVersionString) || "[1.12,1.12.1]".equals(mcVersionString))
mcVersionString = "[1.12,1.12.2]";
if (!Strings.isNullOrEmpty(mcVersionString))
{

4
src/main/resources/mcpmod.info
View File

@ -3,8 +3,8 @@
"modid": "mcp",
"name": "Minecraft Coder Pack",
"description": "Modding toolkit to decompile and deobfuscate the Minecraft client and server files.",
"version": "9.19",
"mcversion": "1.8.9",
"version": "9.42",
"mcversion": "1.12.2",
"logoFile": "/mcplogo.png",
"url": "http://www.modcoderpack.com/website/",
"updateUrl": "",