1.8.9 update
This commit is contained in:
parent
6644e8c9ed
commit
56eba05237
10
build.gradle
10
build.gradle
|
@ -26,11 +26,11 @@ apply plugin: "net.minecraftforge.gradle.patcher"
|
||||||
apply plugin: "net.minecraftforge.gradle.launch4j"
|
apply plugin: "net.minecraftforge.gradle.launch4j"
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
version = "1.8.8"
|
version = "1.8.9"
|
||||||
//mappings = 'stable_16'
|
mappings = 'stable_20'
|
||||||
mappings = "snapshot_nodoc_20151122"
|
//mappings = "snapshot_nodoc_20151122"
|
||||||
workspaceDir = "projects"
|
workspaceDir = "projects"
|
||||||
versionJson = "jsons/1.8.8-dev.json"
|
versionJson = "jsons/1.8.9-dev.json"
|
||||||
buildUserdev = true
|
buildUserdev = true
|
||||||
buildInstaller = true
|
buildInstaller = true
|
||||||
installerVersion = "1.4"
|
installerVersion = "1.4"
|
||||||
|
@ -65,7 +65,7 @@ extractForgeSources { exclude "**/SideOnly.java", "**/Side.java" }
|
||||||
genGradleProjects { addTestCompileDep "junit:junit:4.12" }
|
genGradleProjects { addTestCompileDep "junit:junit:4.12" }
|
||||||
|
|
||||||
processJson {
|
processJson {
|
||||||
releaseJson = "jsons/1.8.8-rel.json"
|
releaseJson = "jsons/1.8.9-rel.json"
|
||||||
addReplacements([
|
addReplacements([
|
||||||
"@minecraft_version@": project.minecraft.version,
|
"@minecraft_version@": project.minecraft.version,
|
||||||
"@version@": project.version,
|
"@version@": project.version,
|
||||||
|
|
|
@ -0,0 +1,328 @@
|
||||||
|
{
|
||||||
|
"id": "@minecraft_version@-@project@@version@",
|
||||||
|
"time": "@timestamp@",
|
||||||
|
"releaseTime": "1960-01-01T00:00:00-0700",
|
||||||
|
"type": "release",
|
||||||
|
"minecraftArguments": "--version FML_DEV --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
|
||||||
|
"libraries": [
|
||||||
|
{
|
||||||
|
"name": "net.minecraft:launchwrapper:1.12"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "jline:jline:2.13",
|
||||||
|
"children": ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.code.findbugs:jsr305:1.3.9",
|
||||||
|
"children": ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.ow2.asm:asm-debug-all:5.0.3",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe:config:1.2.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-compiler:2.11.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-library:2.11.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-reflect:2.11.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.modules:scala-swing_2.11:1.0.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.modules:scala-xml_2.11:1.0.2",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "lzma:lzma:0.0.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "java3d:vecmath:1.5.2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.trove4j:trove4j:3.0.3"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "oshi-project:oshi-core:1.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.dev.jna:jna:3.4.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.dev.jna:platform:3.4.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.jopt-simple:jopt-simple:4.6",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:codecjorbis:20101023"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:codecwav:20101023"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:libraryjavasound:20101123"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:librarylwjglopenal:20100824"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:soundsystem:20120107"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "io.netty:netty-all:4.0.23.Final"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.guava:guava:17.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.commons:commons-lang3:3.3.2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-io:commons-io:2.4"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-codec:commons-codec:1.9"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.jinput:jinput:2.0.5"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.jutils:jutils:1.0.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.code.gson:gson:2.2.4"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.mojang:authlib:1.5.21"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.mojang:realms:1.7.48"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.commons:commons-compress:1.8.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.httpcomponents:httpclient:4.3.3"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-logging:commons-logging:1.1.3"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.httpcomponents:httpcore:4.3.2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"windows": "natives-windows",
|
||||||
|
"osx": "natives-osx"
|
||||||
|
},
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"windows": "natives-windows",
|
||||||
|
"osx": "natives-osx"
|
||||||
|
},
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.jinput:jinput-platform:2.0.5",
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"windows": "natives-windows",
|
||||||
|
"osx": "natives-osx"
|
||||||
|
},
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "tv.twitch:twitch:6.5"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "tv.twitch:twitch-platform:6.5",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "linux"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"windows": "natives-windows-${arch}",
|
||||||
|
"osx": "natives-osx"
|
||||||
|
},
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "tv.twitch:twitch-external-platform:4.5",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "windows"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"natives": {
|
||||||
|
"windows": "natives-windows-${arch}"
|
||||||
|
},
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"mainClass": "net.minecraft.launchwrapper.Launch",
|
||||||
|
"minimumLauncherVersion": 14,
|
||||||
|
"assets": "1.8"
|
||||||
|
}
|
|
@ -0,0 +1,146 @@
|
||||||
|
{
|
||||||
|
"install": {
|
||||||
|
"profileName": "@project@",
|
||||||
|
"target":"@minecraft_version@-@project@@version@",
|
||||||
|
"path":"@artifact@",
|
||||||
|
"version":"@project@ @version@",
|
||||||
|
"filePath":"@universal_jar@",
|
||||||
|
"welcome":"Welcome to the simple @project@ installer.",
|
||||||
|
"minecraft":"@minecraft_version@",
|
||||||
|
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
|
||||||
|
"logo":"/big_logo.png"
|
||||||
|
},
|
||||||
|
"versionInfo": {
|
||||||
|
"id": "@minecraft_version@-@project@@version@",
|
||||||
|
"time": "@timestamp@",
|
||||||
|
"releaseTime": "1960-01-01T00:00:00-0700",
|
||||||
|
"type": "release",
|
||||||
|
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
|
||||||
|
"mainClass": "net.minecraft.launchwrapper.Launch",
|
||||||
|
"minimumLauncherVersion": 14,
|
||||||
|
"assets": "1.8",
|
||||||
|
"inheritsFrom": "1.8.9",
|
||||||
|
"jar": "1.8.9",
|
||||||
|
"libraries": [
|
||||||
|
{
|
||||||
|
"name": "@artifact@",
|
||||||
|
"url": "http://files.minecraftforge.net/maven/"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"comment": "Force the downgrade on dedicated server to match client. Netty bug: https://github.com/MinecraftForge/MinecraftForge/issues/1848",
|
||||||
|
"name": "io.netty:netty-all:4.0.23.Final",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.minecraft:launchwrapper:1.12",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.ow2.asm:asm-all:5.0.3",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "jline:jline:2.13",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "2d9530d0a25daffaffda7c35037b046b627bb171" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe:config:1.2.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-compiler:2.11.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-library:2.11.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-reflect:2.11.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-swing_2.11:1.0.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-xml_2.11:1.0.2",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "lzma:lzma:0.0.1",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.jopt-simple:jopt-simple:4.6",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "java3d:vecmath:1.5.2",
|
||||||
|
"clientreq":true,
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.trove4j:trove4j:3.0.3",
|
||||||
|
"clientreq":true,
|
||||||
|
"serverreq":true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,244 @@
|
||||||
|
{
|
||||||
|
"id": "1.8.9",
|
||||||
|
"time": "2015-12-03T12:24:39+03:00",
|
||||||
|
"releaseTime": "2015-12-03T12:24:39+03:00",
|
||||||
|
"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} --userProperties ${user_properties} --userType ${user_type}",
|
||||||
|
"libraries": [
|
||||||
|
{
|
||||||
|
"name": "oshi-project:oshi-core:1.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.dev.jna:jna:3.4.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.dev.jna:platform:3.4.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.jopt-simple:jopt-simple:4.6"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:codecjorbis:20101023"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:codecwav:20101023"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:libraryjavasound:20101123"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:librarylwjglopenal:20100824"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:soundsystem:20120107"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "io.netty:netty-all:4.0.23.Final"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.guava:guava:17.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.commons:commons-lang3:3.3.2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-io:commons-io:2.4"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-codec:commons-codec:1.9"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.jinput:jinput:2.0.5"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.jutils:jutils:1.0.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.code.gson:gson:2.2.4"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.mojang:authlib:1.5.21"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.mojang:realms:1.7.48"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.commons:commons-compress:1.8.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.httpcomponents:httpclient:4.3.3"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-logging:commons-logging:1.1.3"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.httpcomponents:httpcore:4.3.2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"windows": "natives-windows",
|
||||||
|
"osx": "natives-osx"
|
||||||
|
},
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"windows": "natives-windows",
|
||||||
|
"osx": "natives-osx"
|
||||||
|
},
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.jinput:jinput-platform:2.0.5",
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"windows": "natives-windows",
|
||||||
|
"osx": "natives-osx"
|
||||||
|
},
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "tv.twitch:twitch:6.5"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "tv.twitch:twitch-platform:6.5",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "linux"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"windows": "natives-windows-${arch}",
|
||||||
|
"osx": "natives-osx"
|
||||||
|
},
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "tv.twitch:twitch-external-platform:4.5",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "windows"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"natives": {
|
||||||
|
"windows": "natives-windows-${arch}"
|
||||||
|
},
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"mainClass": "net.minecraft.client.main.Main",
|
||||||
|
"minimumLauncherVersion": 14,
|
||||||
|
"assets": "1.8"
|
||||||
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
--- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java
|
--- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java
|
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java
|
||||||
@@ -197,6 +197,11 @@
|
@@ -224,6 +224,11 @@
|
||||||
this.field_146292_n.add(new GuiButton(1, this.field_146294_l / 2 - 100, p_73969_1_, I18n.func_135052_a("menu.singleplayer", new Object[0])));
|
this.field_146292_n.add(new GuiButton(1, this.field_146294_l / 2 - 100, p_73969_1_, I18n.func_135052_a("menu.singleplayer", new Object[0])));
|
||||||
this.field_146292_n.add(new GuiButton(2, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 1, I18n.func_135052_a("menu.multiplayer", new Object[0])));
|
this.field_146292_n.add(new GuiButton(2, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 1, I18n.func_135052_a("menu.multiplayer", new Object[0])));
|
||||||
this.field_146292_n.add(this.field_175372_K = new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0])));
|
this.field_146292_n.add(this.field_175372_K = new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0])));
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private void func_73972_b(int p_73972_1_, int p_73972_2_)
|
private void func_73972_b(int p_73972_1_, int p_73972_2_)
|
||||||
@@ -244,6 +249,11 @@
|
@@ -271,6 +276,11 @@
|
||||||
this.field_146297_k.func_71400_g();
|
this.field_146297_k.func_71400_g();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
if (p_146284_1_.field_146127_k == 11)
|
if (p_146284_1_.field_146127_k == 11)
|
||||||
{
|
{
|
||||||
this.field_146297_k.func_71371_a("Demo_World", "Demo_World", DemoWorldServer.field_73071_a);
|
this.field_146297_k.func_71371_a("Demo_World", "Demo_World", DemoWorldServer.field_73071_a);
|
||||||
@@ -489,7 +499,16 @@
|
@@ -516,7 +526,16 @@
|
||||||
s = s + " Demo";
|
s = s + " Demo";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -76,8 +76,8 @@
|
||||||
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent.Post(this, this.field_146292_n));
|
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent.Post(this, this.field_146292_n));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_73866_w_()
|
public void func_183500_a(int p_183500_1_, int p_183500_2_)
|
||||||
@@ -496,7 +513,9 @@
|
@@ -502,7 +519,9 @@
|
||||||
{
|
{
|
||||||
while (Mouse.next())
|
while (Mouse.next())
|
||||||
{
|
{
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -504,7 +523,9 @@
|
@@ -510,7 +529,9 @@
|
||||||
{
|
{
|
||||||
while (Keyboard.next())
|
while (Keyboard.next())
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- ../src-base/minecraft/net/minecraft/client/settings/GameSettings.java
|
--- ../src-base/minecraft/net/minecraft/client/settings/GameSettings.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/settings/GameSettings.java
|
+++ ../src-work/minecraft/net/minecraft/client/settings/GameSettings.java
|
||||||
@@ -981,6 +981,7 @@
|
@@ -994,6 +994,7 @@
|
||||||
|
|
||||||
public void func_74303_b()
|
public void func_74303_b()
|
||||||
{
|
{
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
|
|
||||||
if (i >= 0 && i < Potion.field_76425_a.length && Potion.field_76425_a[i] != null)
|
if (i >= 0 && i < Potion.field_76425_a.length && Potion.field_76425_a[i] != null)
|
||||||
{
|
{
|
||||||
@@ -223,4 +228,62 @@
|
@@ -223,4 +228,53 @@
|
||||||
{
|
{
|
||||||
return this.field_100013_f;
|
return this.field_100013_f;
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,24 +57,24 @@
|
||||||
- func_151180_a(p_75924_0_, Blocks.field_180388_cO, Blocks.field_180389_cP);
|
- func_151180_a(p_75924_0_, Blocks.field_180388_cO, Blocks.field_180389_cP);
|
||||||
- func_151180_a(p_75924_0_, Blocks.field_150349_c, Blocks.field_150346_d);
|
- func_151180_a(p_75924_0_, Blocks.field_150349_c, Blocks.field_150346_d);
|
||||||
- func_151180_a(p_75924_0_, Blocks.field_150458_ak, Blocks.field_150346_d);
|
- func_151180_a(p_75924_0_, Blocks.field_150458_ak, Blocks.field_150346_d);
|
||||||
+ func_151180_a(p_75924_0_, Blocks.field_150355_j, Blocks.field_150358_i, useItemIds);
|
+ mergeStatBases(p_75924_0_, Blocks.field_150355_j, Blocks.field_150358_i, useItemIds);
|
||||||
+ func_151180_a(p_75924_0_, Blocks.field_150353_l, Blocks.field_150356_k, useItemIds);
|
+ mergeStatBases(p_75924_0_, Blocks.field_150353_l, Blocks.field_150356_k, useItemIds);
|
||||||
+ func_151180_a(p_75924_0_, Blocks.field_150428_aP, Blocks.field_150423_aK, useItemIds);
|
+ mergeStatBases(p_75924_0_, Blocks.field_150428_aP, Blocks.field_150423_aK, useItemIds);
|
||||||
+ func_151180_a(p_75924_0_, Blocks.field_150470_am, Blocks.field_150460_al, useItemIds);
|
+ mergeStatBases(p_75924_0_, Blocks.field_150470_am, Blocks.field_150460_al, useItemIds);
|
||||||
+ func_151180_a(p_75924_0_, Blocks.field_150439_ay, Blocks.field_150450_ax, useItemIds);
|
+ mergeStatBases(p_75924_0_, Blocks.field_150439_ay, Blocks.field_150450_ax, useItemIds);
|
||||||
+ func_151180_a(p_75924_0_, Blocks.field_150416_aS, Blocks.field_150413_aR, useItemIds);
|
+ mergeStatBases(p_75924_0_, Blocks.field_150416_aS, Blocks.field_150413_aR, useItemIds);
|
||||||
+ func_151180_a(p_75924_0_, Blocks.field_150455_bV, Blocks.field_150441_bU, useItemIds);
|
+ mergeStatBases(p_75924_0_, Blocks.field_150455_bV, Blocks.field_150441_bU, useItemIds);
|
||||||
+ func_151180_a(p_75924_0_, Blocks.field_150429_aA, Blocks.field_150437_az, useItemIds);
|
+ mergeStatBases(p_75924_0_, Blocks.field_150429_aA, Blocks.field_150437_az, useItemIds);
|
||||||
+ func_151180_a(p_75924_0_, Blocks.field_150374_bv, Blocks.field_150379_bu, useItemIds);
|
+ mergeStatBases(p_75924_0_, Blocks.field_150374_bv, Blocks.field_150379_bu, useItemIds);
|
||||||
+ func_151180_a(p_75924_0_, Blocks.field_150334_T, Blocks.field_150333_U, useItemIds);
|
+ mergeStatBases(p_75924_0_, Blocks.field_150334_T, Blocks.field_150333_U, useItemIds);
|
||||||
+ func_151180_a(p_75924_0_, Blocks.field_150373_bw, Blocks.field_150376_bx, useItemIds);
|
+ mergeStatBases(p_75924_0_, Blocks.field_150373_bw, Blocks.field_150376_bx, useItemIds);
|
||||||
+ func_151180_a(p_75924_0_, Blocks.field_180388_cO, Blocks.field_180389_cP, useItemIds);
|
+ mergeStatBases(p_75924_0_, Blocks.field_180388_cO, Blocks.field_180389_cP, useItemIds);
|
||||||
+ func_151180_a(p_75924_0_, Blocks.field_150349_c, Blocks.field_150346_d, useItemIds);
|
+ mergeStatBases(p_75924_0_, Blocks.field_150349_c, Blocks.field_150346_d, useItemIds);
|
||||||
+ func_151180_a(p_75924_0_, Blocks.field_150458_ak, Blocks.field_150346_d, useItemIds);
|
+ mergeStatBases(p_75924_0_, Blocks.field_150458_ak, Blocks.field_150346_d, useItemIds);
|
||||||
}
|
}
|
||||||
|
|
||||||
- private static void func_151180_a(StatBase[] p_151180_0_, Block p_151180_1_, Block p_151180_2_)
|
- private static void func_151180_a(StatBase[] p_151180_0_, Block p_151180_1_, Block p_151180_2_)
|
||||||
+ private static void func_151180_a(StatBase[] p_151180_0_, Block p_151180_1_, Block p_151180_2_, boolean useItemIds)
|
+ private static void mergeStatBases(StatBase[] p_151180_0_, Block p_151180_1_, Block p_151180_2_, boolean useItemIds)
|
||||||
{
|
{
|
||||||
- int i = Block.func_149682_b(p_151180_1_);
|
- int i = Block.func_149682_b(p_151180_1_);
|
||||||
- int j = Block.func_149682_b(p_151180_2_);
|
- int j = Block.func_149682_b(p_151180_2_);
|
||||||
|
|
|
@ -387,7 +387,7 @@ public class ForgeHooksClient
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
model.getItemCameraTransforms().func_181689_a(cameraTransformType);
|
model.getItemCameraTransforms().applyTransform(cameraTransformType);
|
||||||
}
|
}
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
|
|
|
@ -153,7 +153,7 @@ public class GuiIngameForge extends GuiIngame
|
||||||
|
|
||||||
Scoreboard scoreboard = this.mc.theWorld.getScoreboard();
|
Scoreboard scoreboard = this.mc.theWorld.getScoreboard();
|
||||||
ScoreObjective objective = null;
|
ScoreObjective objective = null;
|
||||||
ScorePlayerTeam scoreplayerteam = scoreboard.getPlayersTeam(mc.thePlayer.getCommandSenderName());
|
ScorePlayerTeam scoreplayerteam = scoreboard.getPlayersTeam(mc.thePlayer.getName());
|
||||||
if (scoreplayerteam != null)
|
if (scoreplayerteam != null)
|
||||||
{
|
{
|
||||||
int slot = scoreplayerteam.getChatFormat().getColorIndex();
|
int slot = scoreplayerteam.getChatFormat().getColorIndex();
|
||||||
|
@ -276,7 +276,7 @@ public class GuiIngameForge extends GuiIngame
|
||||||
|
|
||||||
if (f1 > 0.0F)
|
if (f1 > 0.0F)
|
||||||
{
|
{
|
||||||
func_180474_b(f1, res);
|
renderPortal(f1, res);
|
||||||
}
|
}
|
||||||
|
|
||||||
post(PORTAL);
|
post(PORTAL);
|
||||||
|
|
|
@ -17,10 +17,10 @@ public class Attributes
|
||||||
static
|
static
|
||||||
{
|
{
|
||||||
DEFAULT_BAKED_FORMAT = new VertexFormat();
|
DEFAULT_BAKED_FORMAT = new VertexFormat();
|
||||||
DEFAULT_BAKED_FORMAT.func_181721_a(new VertexFormatElement(0, EnumType.FLOAT, EnumUsage.POSITION, 3));
|
DEFAULT_BAKED_FORMAT.addElement(new VertexFormatElement(0, EnumType.FLOAT, EnumUsage.POSITION, 3));
|
||||||
DEFAULT_BAKED_FORMAT.func_181721_a(new VertexFormatElement(0, EnumType.UBYTE, EnumUsage.COLOR, 4));
|
DEFAULT_BAKED_FORMAT.addElement(new VertexFormatElement(0, EnumType.UBYTE, EnumUsage.COLOR, 4));
|
||||||
DEFAULT_BAKED_FORMAT.func_181721_a(new VertexFormatElement(0, EnumType.FLOAT, EnumUsage.UV, 2));
|
DEFAULT_BAKED_FORMAT.addElement(new VertexFormatElement(0, EnumType.FLOAT, EnumUsage.UV, 2));
|
||||||
DEFAULT_BAKED_FORMAT.func_181721_a(new VertexFormatElement(0, EnumType.BYTE, EnumUsage.PADDING, 4));
|
DEFAULT_BAKED_FORMAT.addElement(new VertexFormatElement(0, EnumType.BYTE, EnumUsage.PADDING, 4));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -59,9 +59,9 @@ public interface IFlexibleBakedModel extends IBakedModel
|
||||||
return parent.isBuiltInRenderer();
|
return parent.isBuiltInRenderer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public TextureAtlasSprite getTexture()
|
public TextureAtlasSprite getParticleTexture()
|
||||||
{
|
{
|
||||||
return parent.getTexture();
|
return parent.getParticleTexture();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
|
|
|
@ -63,7 +63,7 @@ public interface IPerspectiveAwareModel extends IFlexibleBakedModel
|
||||||
ImmutableMap.Builder<TransformType, TRSRTransformation> builder = ImmutableMap.builder();
|
ImmutableMap.Builder<TransformType, TRSRTransformation> builder = ImmutableMap.builder();
|
||||||
for(TransformType type : TransformType.values())
|
for(TransformType type : TransformType.values())
|
||||||
{
|
{
|
||||||
builder.put(type, new TRSRTransformation(transforms.func_181688_b(type)));
|
builder.put(type, new TRSRTransformation(transforms.getTransform(type)));
|
||||||
}
|
}
|
||||||
return builder.build();
|
return builder.build();
|
||||||
}
|
}
|
||||||
|
@ -89,7 +89,7 @@ public interface IPerspectiveAwareModel extends IFlexibleBakedModel
|
||||||
public boolean isAmbientOcclusion() { return parent.isAmbientOcclusion(); }
|
public boolean isAmbientOcclusion() { return parent.isAmbientOcclusion(); }
|
||||||
public boolean isGui3d() { return parent.isGui3d(); }
|
public boolean isGui3d() { return parent.isGui3d(); }
|
||||||
public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); }
|
public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); }
|
||||||
public TextureAtlasSprite getTexture() { return parent.getTexture(); }
|
public TextureAtlasSprite getParticleTexture() { return parent.getParticleTexture(); }
|
||||||
public ItemCameraTransforms getItemCameraTransforms() { return parent.getItemCameraTransforms(); }
|
public ItemCameraTransforms getItemCameraTransforms() { return parent.getItemCameraTransforms(); }
|
||||||
public List<BakedQuad> getFaceQuads(EnumFacing side) { return parent.getFaceQuads(side); }
|
public List<BakedQuad> getFaceQuads(EnumFacing side) { return parent.getFaceQuads(side); }
|
||||||
public List<BakedQuad> getGeneralQuads() { return parent.getGeneralQuads(); }
|
public List<BakedQuad> getGeneralQuads() { return parent.getGeneralQuads(); }
|
||||||
|
|
|
@ -53,9 +53,9 @@ public interface ISmartBlockModel extends IBakedModel
|
||||||
return parent.isBuiltInRenderer();
|
return parent.isBuiltInRenderer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public TextureAtlasSprite getTexture()
|
public TextureAtlasSprite getParticleTexture()
|
||||||
{
|
{
|
||||||
return parent.getTexture();
|
return parent.getParticleTexture();
|
||||||
}
|
}
|
||||||
|
|
||||||
public ItemCameraTransforms getItemCameraTransforms()
|
public ItemCameraTransforms getItemCameraTransforms()
|
||||||
|
|
|
@ -113,7 +113,7 @@ public class ItemLayerModel implements IRetexturableModel
|
||||||
public boolean isAmbientOcclusion() { return true; }
|
public boolean isAmbientOcclusion() { return true; }
|
||||||
public boolean isGui3d() { return false; }
|
public boolean isGui3d() { return false; }
|
||||||
public boolean isBuiltInRenderer() { return false; }
|
public boolean isBuiltInRenderer() { return false; }
|
||||||
public TextureAtlasSprite getTexture() { return particle; }
|
public TextureAtlasSprite getParticleTexture() { return particle; }
|
||||||
public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; }
|
public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; }
|
||||||
public List<BakedQuad> getFaceQuads(EnumFacing side) { return ImmutableList.of(); }
|
public List<BakedQuad> getFaceQuads(EnumFacing side) { return ImmutableList.of(); }
|
||||||
public List<BakedQuad> getGeneralQuads() { return quads; }
|
public List<BakedQuad> getGeneralQuads() { return quads; }
|
||||||
|
|
|
@ -293,7 +293,7 @@ public class ModelFluid implements IModelCustomData
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public TextureAtlasSprite getTexture()
|
public TextureAtlasSprite getParticleTexture()
|
||||||
{
|
{
|
||||||
return still;
|
return still;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,8 +5,6 @@ import java.util.List;
|
||||||
|
|
||||||
import javax.vecmath.Matrix4f;
|
import javax.vecmath.Matrix4f;
|
||||||
|
|
||||||
import org.apache.commons.lang3.tuple.Pair;
|
|
||||||
|
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||||
|
@ -22,9 +20,10 @@ import net.minecraft.util.EnumFacing;
|
||||||
import net.minecraft.util.EnumWorldBlockLayer;
|
import net.minecraft.util.EnumWorldBlockLayer;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraftforge.client.MinecraftForgeClient;
|
import net.minecraftforge.client.MinecraftForgeClient;
|
||||||
import net.minecraftforge.client.model.ItemLayerModel.BakedModel;
|
|
||||||
import net.minecraftforge.fml.common.FMLLog;
|
import net.minecraftforge.fml.common.FMLLog;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.tuple.Pair;
|
||||||
|
|
||||||
import com.google.common.base.Function;
|
import com.google.common.base.Function;
|
||||||
import com.google.common.base.Optional;
|
import com.google.common.base.Optional;
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
|
@ -209,10 +208,10 @@ public class MultiLayerModel implements IModelCustomData
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TextureAtlasSprite getTexture()
|
public TextureAtlasSprite getParticleTexture()
|
||||||
{
|
{
|
||||||
compute();
|
compute();
|
||||||
return base.getTexture();
|
return base.getParticleTexture();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -100,9 +100,9 @@ public class MultiModel implements IModel
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TextureAtlasSprite getTexture()
|
public TextureAtlasSprite getParticleTexture()
|
||||||
{
|
{
|
||||||
return internalBase.getTexture();
|
return internalBase.getParticleTexture();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -936,7 +936,7 @@ public class B3DLoader implements ICustomModelLoader
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public TextureAtlasSprite getTexture()
|
public TextureAtlasSprite getParticleTexture()
|
||||||
{
|
{
|
||||||
// FIXME somehow specify particle texture in the model
|
// FIXME somehow specify particle texture in the model
|
||||||
return textures.values().asList().get(0);
|
return textures.values().asList().get(0);
|
||||||
|
|
|
@ -1469,7 +1469,7 @@ public class OBJModel implements IRetexturableModel, IModelCustomData
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TextureAtlasSprite getTexture()
|
public TextureAtlasSprite getParticleTexture()
|
||||||
{
|
{
|
||||||
return this.sprite;
|
return this.sprite;
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,7 +69,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer
|
||||||
VertexFormat format = parent.getVertexFormat();
|
VertexFormat format = parent.getVertexFormat();
|
||||||
if(format.hasNormal()) return format;
|
if(format.hasNormal()) return format;
|
||||||
format = new VertexFormat(format);
|
format = new VertexFormat(format);
|
||||||
format.func_181721_a(new VertexFormatElement(0, VertexFormatElement.EnumType.FLOAT, VertexFormatElement.EnumUsage.NORMAL, 4));
|
format.addElement(new VertexFormatElement(0, VertexFormatElement.EnumType.FLOAT, VertexFormatElement.EnumUsage.NORMAL, 4));
|
||||||
return format;
|
return format;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -39,9 +39,9 @@ public class ForgeVersion
|
||||||
//This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code.
|
//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;
|
public static final int buildVersion = 0;
|
||||||
// This is the minecraft version we're building for - used in various places in Forge/FML code
|
// This is the minecraft version we're building for - used in various places in Forge/FML code
|
||||||
public static final String mcVersion = "1.8.8";
|
public static final String mcVersion = "1.8.9";
|
||||||
// This is the MCP data version we're using
|
// This is the MCP data version we're using
|
||||||
public static final String mcpVersion = "9.18";
|
public static final String mcpVersion = "9.19";
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
private static Status status = PENDING;
|
private static Status status = PENDING;
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
|
|
|
@ -526,11 +526,11 @@ public class GuiModList extends GuiScreen
|
||||||
GuiModList.this.mc.renderEngine.bindTexture(logoPath);
|
GuiModList.this.mc.renderEngine.bindTexture(logoPath);
|
||||||
WorldRenderer wr = tess.getWorldRenderer();
|
WorldRenderer wr = tess.getWorldRenderer();
|
||||||
int offset = (this.left + this.listWidth/2) - (logoDims.width / 2);
|
int offset = (this.left + this.listWidth/2) - (logoDims.width / 2);
|
||||||
wr.func_181668_a(7, DefaultVertexFormats.field_181707_g);
|
wr.begin(7, DefaultVertexFormats.POSITION_TEX);
|
||||||
wr.func_181662_b(offset, top + logoDims.height, zLevel).func_181673_a(0, 1).func_181675_d();
|
wr.pos(offset, top + logoDims.height, zLevel).tex(0, 1).endVertex();
|
||||||
wr.func_181662_b(offset + logoDims.width, top + logoDims.height, zLevel).func_181673_a(1, 1).func_181675_d();
|
wr.pos(offset + logoDims.width, top + logoDims.height, zLevel).tex(1, 1).endVertex();
|
||||||
wr.func_181662_b(offset + logoDims.width, top, zLevel).func_181673_a(1, 0).func_181675_d();
|
wr.pos(offset + logoDims.width, top, zLevel).tex(1, 0).endVertex();
|
||||||
wr.func_181662_b(offset, top, zLevel).func_181673_a(0, 0).func_181675_d();
|
wr.pos(offset, top, zLevel).tex(0, 0).endVertex();
|
||||||
tess.draw();
|
tess.draw();
|
||||||
GlStateManager.disableBlend();
|
GlStateManager.disableBlend();
|
||||||
top += logoDims.height + 10;
|
top += logoDims.height + 10;
|
||||||
|
|
|
@ -283,11 +283,11 @@ public abstract class GuiScrollingList
|
||||||
this.client.renderEngine.bindTexture(Gui.optionsBackground);
|
this.client.renderEngine.bindTexture(Gui.optionsBackground);
|
||||||
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
float scale = 32.0F;
|
float scale = 32.0F;
|
||||||
worldr.func_181668_a(7, DefaultVertexFormats.field_181709_i);
|
worldr.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
|
||||||
worldr.func_181662_b(this.left, this.bottom, 0.0D).func_181673_a(this.left / scale, (this.bottom + (int)this.scrollDistance) / scale).func_181669_b(0x20, 0x20, 0x20, 0xFF).func_181675_d();
|
worldr.pos(this.left, this.bottom, 0.0D).tex(this.left / scale, (this.bottom + (int)this.scrollDistance) / scale).color(0x20, 0x20, 0x20, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(this.right, this.bottom, 0.0D).func_181673_a(this.right / scale, (this.bottom + (int)this.scrollDistance) / scale).func_181669_b(0x20, 0x20, 0x20, 0xFF).func_181675_d();
|
worldr.pos(this.right, this.bottom, 0.0D).tex(this.right / scale, (this.bottom + (int)this.scrollDistance) / scale).color(0x20, 0x20, 0x20, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(this.right, this.top, 0.0D).func_181673_a(this.right / scale, (this.top + (int)this.scrollDistance) / scale).func_181669_b(0x20, 0x20, 0x20, 0xFF).func_181675_d();
|
worldr.pos(this.right, this.top, 0.0D).tex(this.right / scale, (this.top + (int)this.scrollDistance) / scale).color(0x20, 0x20, 0x20, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(this.left, this.top, 0.0D).func_181673_a(this.left / scale, (this.top + (int)this.scrollDistance) / scale).func_181669_b(0x20, 0x20, 0x20, 0xFF).func_181675_d();
|
worldr.pos(this.left, this.top, 0.0D).tex(this.left / scale, (this.top + (int)this.scrollDistance) / scale).color(0x20, 0x20, 0x20, 0xFF).endVertex();
|
||||||
tess.draw();
|
tess.draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -310,15 +310,15 @@ public abstract class GuiScrollingList
|
||||||
int max = entryRight;
|
int max = entryRight;
|
||||||
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
GlStateManager.disableTexture2D();
|
GlStateManager.disableTexture2D();
|
||||||
worldr.func_181668_a(7, DefaultVertexFormats.field_181709_i);
|
worldr.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
|
||||||
worldr.func_181662_b(min, slotTop + slotBuffer + 2, 0).func_181673_a(0, 1).func_181669_b(0x80, 0x80, 0x80, 0xFF).func_181675_d();
|
worldr.pos(min, slotTop + slotBuffer + 2, 0).tex(0, 1).color(0x80, 0x80, 0x80, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(max, slotTop + slotBuffer + 2, 0).func_181673_a(1, 1).func_181669_b(0x80, 0x80, 0x80, 0xFF).func_181675_d();
|
worldr.pos(max, slotTop + slotBuffer + 2, 0).tex(1, 1).color(0x80, 0x80, 0x80, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(max, slotTop - 2, 0).func_181673_a(1, 0).func_181669_b(0x80, 0x80, 0x80, 0xFF).func_181675_d();
|
worldr.pos(max, slotTop - 2, 0).tex(1, 0).color(0x80, 0x80, 0x80, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(min, slotTop - 2, 0).func_181673_a(0, 0).func_181669_b(0x80, 0x80, 0x80, 0xFF).func_181675_d();
|
worldr.pos(min, slotTop - 2, 0).tex(0, 0).color(0x80, 0x80, 0x80, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(min + 1, slotTop + slotBuffer + 1, 0).func_181673_a(0, 1).func_181669_b(0x00, 0x00, 0x00, 0xFF).func_181675_d();
|
worldr.pos(min + 1, slotTop + slotBuffer + 1, 0).tex(0, 1).color(0x00, 0x00, 0x00, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(max - 1, slotTop + slotBuffer + 1, 0).func_181673_a(1, 1).func_181669_b(0x00, 0x00, 0x00, 0xFF).func_181675_d();
|
worldr.pos(max - 1, slotTop + slotBuffer + 1, 0).tex(1, 1).color(0x00, 0x00, 0x00, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(max - 1, slotTop - 1, 0).func_181673_a(1, 0).func_181669_b(0x00, 0x00, 0x00, 0xFF).func_181675_d();
|
worldr.pos(max - 1, slotTop - 1, 0).tex(1, 0).color(0x00, 0x00, 0x00, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(min + 1, slotTop - 1, 0).func_181673_a(0, 0).func_181669_b(0x00, 0x00, 0x00, 0xFF).func_181675_d();
|
worldr.pos(min + 1, slotTop - 1, 0).tex(0, 0).color(0x00, 0x00, 0x00, 0xFF).endVertex();
|
||||||
tess.draw();
|
tess.draw();
|
||||||
GlStateManager.enableTexture2D();
|
GlStateManager.enableTexture2D();
|
||||||
}
|
}
|
||||||
|
@ -346,23 +346,23 @@ public abstract class GuiScrollingList
|
||||||
}
|
}
|
||||||
|
|
||||||
GlStateManager.disableTexture2D();
|
GlStateManager.disableTexture2D();
|
||||||
worldr.func_181668_a(7, DefaultVertexFormats.field_181709_i);
|
worldr.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
|
||||||
worldr.func_181662_b(scrollBarLeft, this.bottom, 0.0D).func_181673_a(0.0D, 1.0D).func_181669_b(0x00, 0x00, 0x00, 0xFF).func_181675_d();
|
worldr.pos(scrollBarLeft, this.bottom, 0.0D).tex(0.0D, 1.0D).color(0x00, 0x00, 0x00, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(scrollBarRight, this.bottom, 0.0D).func_181673_a(1.0D, 1.0D).func_181669_b(0x00, 0x00, 0x00, 0xFF).func_181675_d();
|
worldr.pos(scrollBarRight, this.bottom, 0.0D).tex(1.0D, 1.0D).color(0x00, 0x00, 0x00, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(scrollBarRight, this.top, 0.0D).func_181673_a(1.0D, 0.0D).func_181669_b(0x00, 0x00, 0x00, 0xFF).func_181675_d();
|
worldr.pos(scrollBarRight, this.top, 0.0D).tex(1.0D, 0.0D).color(0x00, 0x00, 0x00, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(scrollBarLeft, this.top, 0.0D).func_181673_a(0.0D, 0.0D).func_181669_b(0x00, 0x00, 0x00, 0xFF).func_181675_d();
|
worldr.pos(scrollBarLeft, this.top, 0.0D).tex(0.0D, 0.0D).color(0x00, 0x00, 0x00, 0xFF).endVertex();
|
||||||
tess.draw();
|
tess.draw();
|
||||||
worldr.func_181668_a(7, DefaultVertexFormats.field_181709_i);
|
worldr.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
|
||||||
worldr.func_181662_b(scrollBarLeft, barTop + height, 0.0D).func_181673_a(0.0D, 1.0D).func_181669_b(0x80, 0x80, 0x80, 0xFF).func_181675_d();
|
worldr.pos(scrollBarLeft, barTop + height, 0.0D).tex(0.0D, 1.0D).color(0x80, 0x80, 0x80, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(scrollBarRight, barTop + height, 0.0D).func_181673_a(1.0D, 1.0D).func_181669_b(0x80, 0x80, 0x80, 0xFF).func_181675_d();
|
worldr.pos(scrollBarRight, barTop + height, 0.0D).tex(1.0D, 1.0D).color(0x80, 0x80, 0x80, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(scrollBarRight, barTop, 0.0D).func_181673_a(1.0D, 0.0D).func_181669_b(0x80, 0x80, 0x80, 0xFF).func_181675_d();
|
worldr.pos(scrollBarRight, barTop, 0.0D).tex(1.0D, 0.0D).color(0x80, 0x80, 0x80, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(scrollBarLeft, barTop, 0.0D).func_181673_a(0.0D, 0.0D).func_181669_b(0x80, 0x80, 0x80, 0xFF).func_181675_d();
|
worldr.pos(scrollBarLeft, barTop, 0.0D).tex(0.0D, 0.0D).color(0x80, 0x80, 0x80, 0xFF).endVertex();
|
||||||
tess.draw();
|
tess.draw();
|
||||||
worldr.func_181668_a(7, DefaultVertexFormats.field_181709_i);
|
worldr.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
|
||||||
worldr.func_181662_b(scrollBarLeft, barTop + height - 1, 0.0D).func_181673_a(0.0D, 1.0D).func_181669_b(0xC0, 0xC0, 0xC0, 0xFF).func_181675_d();
|
worldr.pos(scrollBarLeft, barTop + height - 1, 0.0D).tex(0.0D, 1.0D).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(scrollBarRight - 1, barTop + height - 1, 0.0D).func_181673_a(1.0D, 1.0D).func_181669_b(0xC0, 0xC0, 0xC0, 0xFF).func_181675_d();
|
worldr.pos(scrollBarRight - 1, barTop + height - 1, 0.0D).tex(1.0D, 1.0D).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(scrollBarRight - 1, barTop, 0.0D).func_181673_a(1.0D, 0.0D).func_181669_b(0xC0, 0xC0, 0xC0, 0xFF).func_181675_d();
|
worldr.pos(scrollBarRight - 1, barTop, 0.0D).tex(1.0D, 0.0D).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex();
|
||||||
worldr.func_181662_b(scrollBarLeft, barTop, 0.0D).func_181673_a(0.0D, 0.0D).func_181669_b(0xC0, 0xC0, 0xC0, 0xFF).func_181675_d();
|
worldr.pos(scrollBarLeft, barTop, 0.0D).tex(0.0D, 0.0D).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex();
|
||||||
tess.draw();
|
tess.draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -391,11 +391,11 @@ public abstract class GuiScrollingList
|
||||||
GlStateManager.shadeModel(GL11.GL_SMOOTH);
|
GlStateManager.shadeModel(GL11.GL_SMOOTH);
|
||||||
Tessellator tessellator = Tessellator.getInstance();
|
Tessellator tessellator = Tessellator.getInstance();
|
||||||
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
|
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
|
||||||
worldrenderer.func_181668_a(7, DefaultVertexFormats.field_181706_f);
|
worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR);
|
||||||
worldrenderer.func_181662_b(right, top, 0.0D).func_181666_a(r1, g1, b1, a1).func_181675_d();
|
worldrenderer.pos(right, top, 0.0D).color(r1, g1, b1, a1).endVertex();
|
||||||
worldrenderer.func_181662_b(left, top, 0.0D).func_181666_a(r1, g1, b1, a1).func_181675_d();
|
worldrenderer.pos(left, top, 0.0D).color(r1, g1, b1, a1).endVertex();
|
||||||
worldrenderer.func_181662_b(left, bottom, 0.0D).func_181666_a(r2, g2, b2, a2).func_181675_d();
|
worldrenderer.pos(left, bottom, 0.0D).color(r2, g2, b2, a2).endVertex();
|
||||||
worldrenderer.func_181662_b(right, bottom, 0.0D).func_181666_a(r2, g2, b2, a2).func_181675_d();
|
worldrenderer.pos(right, bottom, 0.0D).color(r2, g2, b2, a2).endVertex();
|
||||||
tessellator.draw();
|
tessellator.draw();
|
||||||
GlStateManager.shadeModel(GL11.GL_FLAT);
|
GlStateManager.shadeModel(GL11.GL_FLAT);
|
||||||
GlStateManager.disableBlend();
|
GlStateManager.disableBlend();
|
||||||
|
|
|
@ -185,11 +185,11 @@ public class GuiUtils
|
||||||
float vScale = 1f / 0x100;
|
float vScale = 1f / 0x100;
|
||||||
Tessellator tessellator = Tessellator.getInstance();
|
Tessellator tessellator = Tessellator.getInstance();
|
||||||
WorldRenderer wr = tessellator.getWorldRenderer();
|
WorldRenderer wr = tessellator.getWorldRenderer();
|
||||||
wr.func_181668_a(7, DefaultVertexFormats.field_181707_g);
|
wr.begin(7, DefaultVertexFormats.POSITION_TEX);
|
||||||
wr.func_181662_b(x , y + height, zLevel).func_181673_a( u * uScale, ((v + height) * vScale)).func_181675_d();
|
wr.pos(x , y + height, zLevel).tex( u * uScale, ((v + height) * vScale)).endVertex();
|
||||||
wr.func_181662_b(x + width, y + height, zLevel).func_181673_a((u + width) * uScale, ((v + height) * vScale)).func_181675_d();
|
wr.pos(x + width, y + height, zLevel).tex((u + width) * uScale, ((v + height) * vScale)).endVertex();
|
||||||
wr.func_181662_b(x + width, y , zLevel).func_181673_a((u + width) * uScale, ( v * vScale)).func_181675_d();
|
wr.pos(x + width, y , zLevel).tex((u + width) * uScale, ( v * vScale)).endVertex();
|
||||||
wr.func_181662_b(x , y , zLevel).func_181673_a( u * uScale, ( v * vScale)).func_181675_d();
|
wr.pos(x , y , zLevel).tex( u * uScale, ( v * vScale)).endVertex();
|
||||||
tessellator.draw();
|
tessellator.draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -112,7 +112,7 @@ import com.google.gson.JsonParser;
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
public class Loader
|
public class Loader
|
||||||
{
|
{
|
||||||
public static final String MC_VERSION = "1.8.8";
|
public static final String MC_VERSION = "1.8.9";
|
||||||
private static final Splitter DEPENDENCYPARTSPLITTER = Splitter.on(":").omitEmptyStrings().trimResults();
|
private static final Splitter DEPENDENCYPARTSPLITTER = Splitter.on(":").omitEmptyStrings().trimResults();
|
||||||
private static final Splitter DEPENDENCYSPLITTER = Splitter.on(";").omitEmptyStrings().trimResults();
|
private static final Splitter DEPENDENCYSPLITTER = Splitter.on(";").omitEmptyStrings().trimResults();
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -49,7 +49,7 @@ public class ModClassLoader extends URLClassLoader
|
||||||
public ModClassLoader(ClassLoader parent) {
|
public ModClassLoader(ClassLoader parent) {
|
||||||
super(new URL[0], null);
|
super(new URL[0], null);
|
||||||
this.mainClassLoader = (LaunchClassLoader)parent;
|
this.mainClassLoader = (LaunchClassLoader)parent;
|
||||||
this.sources = new ArrayList();
|
this.sources = Lists.newArrayList();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addFile(File modFile) throws MalformedURLException
|
public void addFile(File modFile) throws MalformedURLException
|
||||||
|
|
|
@ -1,19 +1,18 @@
|
||||||
package net.minecraftforge.fml.common.network.handshake;
|
package net.minecraftforge.fml.common.network.handshake;
|
||||||
|
|
||||||
|
import io.netty.channel.ChannelFutureListener;
|
||||||
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.util.ResourceLocation;
|
|
||||||
import net.minecraftforge.fml.common.FMLLog;
|
import net.minecraftforge.fml.common.FMLLog;
|
||||||
import net.minecraftforge.fml.common.Loader;
|
import net.minecraftforge.fml.common.Loader;
|
||||||
import net.minecraftforge.fml.common.network.NetworkRegistry;
|
import net.minecraftforge.fml.common.network.NetworkRegistry;
|
||||||
import net.minecraftforge.fml.common.network.handshake.FMLHandshakeMessage.ServerHello;
|
import net.minecraftforge.fml.common.network.handshake.FMLHandshakeMessage.ServerHello;
|
||||||
import net.minecraftforge.fml.common.network.internal.FMLMessage;
|
import net.minecraftforge.fml.common.network.internal.FMLMessage;
|
||||||
import net.minecraftforge.fml.common.network.internal.FMLNetworkHandler;
|
import net.minecraftforge.fml.common.network.internal.FMLNetworkHandler;
|
||||||
import net.minecraftforge.fml.common.registry.GameData;
|
|
||||||
import net.minecraftforge.fml.common.registry.PersistentRegistryManager;
|
import net.minecraftforge.fml.common.registry.PersistentRegistryManager;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import io.netty.channel.ChannelFutureListener;
|
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Packet handshake sequence manager- client side (responding to remote server)
|
* Packet handshake sequence manager- client side (responding to remote server)
|
||||||
|
|
|
@ -16,14 +16,13 @@ import net.minecraftforge.fml.common.ModContainer;
|
||||||
import net.minecraftforge.fml.common.network.ByteBufUtils;
|
import net.minecraftforge.fml.common.network.ByteBufUtils;
|
||||||
import net.minecraftforge.fml.common.network.NetworkRegistry;
|
import net.minecraftforge.fml.common.network.NetworkRegistry;
|
||||||
import net.minecraftforge.fml.common.network.internal.FMLProxyPacket;
|
import net.minecraftforge.fml.common.network.internal.FMLProxyPacket;
|
||||||
import net.minecraftforge.fml.common.registry.GameData;
|
import net.minecraftforge.fml.common.registry.PersistentRegistryManager;
|
||||||
|
|
||||||
import com.google.common.base.Charsets;
|
import com.google.common.base.Charsets;
|
||||||
import com.google.common.base.Joiner;
|
import com.google.common.base.Joiner;
|
||||||
import com.google.common.collect.Iterables;
|
import com.google.common.collect.Iterables;
|
||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
import com.google.common.collect.Sets;
|
import com.google.common.collect.Sets;
|
||||||
import net.minecraftforge.fml.common.registry.PersistentRegistryManager;
|
|
||||||
|
|
||||||
public abstract class FMLHandshakeMessage {
|
public abstract class FMLHandshakeMessage {
|
||||||
public static FMLProxyPacket makeCustomChannelRegistration(Set<String> channels)
|
public static FMLProxyPacket makeCustomChannelRegistration(Set<String> channels)
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
package net.minecraftforge.fml.common.network.handshake;
|
package net.minecraftforge.fml.common.network.handshake;
|
||||||
|
|
||||||
|
import io.netty.channel.ChannelFutureListener;
|
||||||
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
|
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
|
@ -10,11 +13,8 @@ import net.minecraftforge.fml.common.Loader;
|
||||||
import net.minecraftforge.fml.common.network.NetworkRegistry;
|
import net.minecraftforge.fml.common.network.NetworkRegistry;
|
||||||
import net.minecraftforge.fml.common.network.internal.FMLMessage;
|
import net.minecraftforge.fml.common.network.internal.FMLMessage;
|
||||||
import net.minecraftforge.fml.common.network.internal.FMLNetworkHandler;
|
import net.minecraftforge.fml.common.network.internal.FMLNetworkHandler;
|
||||||
import net.minecraftforge.fml.common.registry.GameData;
|
|
||||||
import net.minecraftforge.fml.common.registry.PersistentRegistryManager;
|
import net.minecraftforge.fml.common.registry.PersistentRegistryManager;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import io.netty.channel.ChannelFutureListener;
|
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
|
||||||
|
|
||||||
enum FMLHandshakeServerState implements IHandshakeState<FMLHandshakeServerState>
|
enum FMLHandshakeServerState implements IHandshakeState<FMLHandshakeServerState>
|
||||||
{
|
{
|
||||||
|
|
|
@ -18,9 +18,6 @@ import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import net.minecraftforge.fml.common.registry.PersistentRegistryManager;
|
|
||||||
import org.apache.logging.log4j.Level;
|
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayerMP;
|
import net.minecraft.entity.player.EntityPlayerMP;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.network.EnumConnectionState;
|
import net.minecraft.network.EnumConnectionState;
|
||||||
|
@ -48,9 +45,11 @@ import net.minecraftforge.fml.common.network.PacketLoggingHandler;
|
||||||
import net.minecraftforge.fml.common.network.internal.FMLMessage;
|
import net.minecraftforge.fml.common.network.internal.FMLMessage;
|
||||||
import net.minecraftforge.fml.common.network.internal.FMLNetworkHandler;
|
import net.minecraftforge.fml.common.network.internal.FMLNetworkHandler;
|
||||||
import net.minecraftforge.fml.common.network.internal.FMLProxyPacket;
|
import net.minecraftforge.fml.common.network.internal.FMLProxyPacket;
|
||||||
import net.minecraftforge.fml.common.registry.GameData;
|
import net.minecraftforge.fml.common.registry.PersistentRegistryManager;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
|
|
||||||
|
import org.apache.logging.log4j.Level;
|
||||||
|
|
||||||
@SuppressWarnings("rawtypes")
|
@SuppressWarnings("rawtypes")
|
||||||
public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> implements ChannelOutboundHandler {
|
public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> implements ChannelOutboundHandler {
|
||||||
private static boolean DEBUG_HANDSHAKE = Boolean.parseBoolean(System.getProperty("fml.debugNetworkHandshake", "false"));
|
private static boolean DEBUG_HANDSHAKE = Boolean.parseBoolean(System.getProperty("fml.debugNetworkHandshake", "false"));
|
||||||
|
|
|
@ -149,7 +149,6 @@ public class FMLControlledNamespacedRegistry<I> extends RegistryNamespacedDefaul
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
void set(FMLControlledNamespacedRegistry<I> otherRegistry)
|
void set(FMLControlledNamespacedRegistry<I> otherRegistry)
|
||||||
{
|
{
|
||||||
if (this.superType != otherRegistry.superType)
|
if (this.superType != otherRegistry.superType)
|
||||||
|
@ -623,7 +622,6 @@ public class FMLControlledNamespacedRegistry<I> extends RegistryNamespacedDefaul
|
||||||
* This iterator is used by some regular MC methods to visit all blocks, we need to include substitutions
|
* This iterator is used by some regular MC methods to visit all blocks, we need to include substitutions
|
||||||
* Compare #typeSafeIterable()
|
* Compare #typeSafeIterable()
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
@Override
|
@Override
|
||||||
public Iterator<I> iterator()
|
public Iterator<I> iterator()
|
||||||
{
|
{
|
||||||
|
|
|
@ -14,10 +14,6 @@ package net.minecraftforge.fml.common.registry;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import com.google.common.collect.BiMap;
|
|
||||||
import com.google.common.collect.HashBiMap;
|
|
||||||
import com.google.common.collect.Maps;
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
|
@ -29,6 +25,9 @@ import net.minecraftforge.fml.common.FMLLog;
|
||||||
import net.minecraftforge.fml.common.Loader;
|
import net.minecraftforge.fml.common.Loader;
|
||||||
import net.minecraftforge.fml.common.ModContainer;
|
import net.minecraftforge.fml.common.ModContainer;
|
||||||
|
|
||||||
|
import com.google.common.collect.BiMap;
|
||||||
|
import com.google.common.collect.HashBiMap;
|
||||||
|
|
||||||
public class GameData
|
public class GameData
|
||||||
{
|
{
|
||||||
static final int MIN_BLOCK_ID = 0;
|
static final int MIN_BLOCK_ID = 0;
|
||||||
|
@ -214,7 +213,7 @@ public class GameData
|
||||||
private static BiMap<Block, Item> BLOCK_TO_ITEM = HashBiMap.create();
|
private static BiMap<Block, Item> BLOCK_TO_ITEM = HashBiMap.create();
|
||||||
|
|
||||||
//Internal: DO NOT USE, will change without warning.
|
//Internal: DO NOT USE, will change without warning.
|
||||||
public static Map getBlockItemMap()
|
public static Map<Block, Item> getBlockItemMap()
|
||||||
{
|
{
|
||||||
return BLOCK_TO_ITEM;
|
return BLOCK_TO_ITEM;
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,17 +25,6 @@ import java.util.Map;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import com.google.common.base.Objects;
|
|
||||||
import com.google.common.base.Strings;
|
|
||||||
import com.google.common.base.Throwables;
|
|
||||||
import com.google.common.collect.ImmutableList;
|
|
||||||
import com.google.common.collect.Lists;
|
|
||||||
import com.google.common.collect.Maps;
|
|
||||||
import com.google.common.collect.ObjectArrays;
|
|
||||||
import com.google.common.collect.Sets;
|
|
||||||
import com.google.common.primitives.Ints;
|
|
||||||
import org.apache.logging.log4j.Level;
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemBlock;
|
import net.minecraft.item.ItemBlock;
|
||||||
|
@ -47,7 +36,6 @@ import net.minecraft.nbt.JsonToNBT;
|
||||||
import net.minecraft.nbt.NBTBase;
|
import net.minecraft.nbt.NBTBase;
|
||||||
import net.minecraft.nbt.NBTException;
|
import net.minecraft.nbt.NBTException;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.potion.Potion;
|
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
@ -60,6 +48,18 @@ import net.minecraftforge.fml.common.LoaderException;
|
||||||
import net.minecraftforge.fml.common.LoaderState;
|
import net.minecraftforge.fml.common.LoaderState;
|
||||||
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
|
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
|
||||||
|
|
||||||
|
import org.apache.logging.log4j.Level;
|
||||||
|
|
||||||
|
import com.google.common.base.Objects;
|
||||||
|
import com.google.common.base.Strings;
|
||||||
|
import com.google.common.base.Throwables;
|
||||||
|
import com.google.common.collect.ImmutableList;
|
||||||
|
import com.google.common.collect.Lists;
|
||||||
|
import com.google.common.collect.Maps;
|
||||||
|
import com.google.common.collect.ObjectArrays;
|
||||||
|
import com.google.common.collect.Sets;
|
||||||
|
import com.google.common.primitives.Ints;
|
||||||
|
|
||||||
public class GameRegistry
|
public class GameRegistry
|
||||||
{
|
{
|
||||||
private static Set<IWorldGenerator> worldGenerators = Sets.newHashSet();
|
private static Set<IWorldGenerator> worldGenerators = Sets.newHashSet();
|
||||||
|
@ -199,7 +199,6 @@ public class GameRegistry
|
||||||
* @param name The mod-unique name to register it as, will get prefixed by your modid.
|
* @param name The mod-unique name to register it as, will get prefixed by your modid.
|
||||||
* @param itemCtorArgs Arguments to pass (after the required {@code Block} parameter) to the ItemBlock constructor (optional).
|
* @param itemCtorArgs Arguments to pass (after the required {@code Block} parameter) to the ItemBlock constructor (optional).
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
public static Block registerBlock(Block block, Class<? extends ItemBlock> itemclass, String name, Object... itemCtorArgs)
|
public static Block registerBlock(Block block, Class<? extends ItemBlock> itemclass, String name, Object... itemCtorArgs)
|
||||||
{
|
{
|
||||||
if (Loader.instance().isInState(LoaderState.CONSTRUCTING))
|
if (Loader.instance().isInState(LoaderState.CONSTRUCTING))
|
||||||
|
|
|
@ -42,7 +42,6 @@ public final class ConsoleCommandCompleter implements Completer
|
||||||
}
|
}
|
||||||
|
|
||||||
final String input = buffer;
|
final String input = buffer;
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
Future<List<String>> tabComplete = this.server.callFromMainThread(new Callable<List<String>>() {
|
Future<List<String>> tabComplete = this.server.callFromMainThread(new Callable<List<String>>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -41,4 +41,4 @@ net/minecraft/item/ItemBlock.setTileEntityNBT(Lnet/minecraft/world/World;Lnet/mi
|
||||||
net/minecraft/server/management/ServerConfigurationManager.initializeConnectionToPlayer(Lnet/minecraft/network/NetworkManager;Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/network/NetHandlerPlayServer;)V=|p_72355_1_,p_72355_2_,nethandlerplayserver
|
net/minecraft/server/management/ServerConfigurationManager.initializeConnectionToPlayer(Lnet/minecraft/network/NetworkManager;Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/network/NetHandlerPlayServer;)V=|p_72355_1_,p_72355_2_,nethandlerplayserver
|
||||||
net/minecraft/item/ItemMonsterPlacer.spawnCreature(Lnet/minecraft/world/World;Ljava/lang/String;DDD)Lnet/minecraft/entity/Entity;=|p_77840_0_,name,p_77840_2_,p_77840_4_,p_77840_6_
|
net/minecraft/item/ItemMonsterPlacer.spawnCreature(Lnet/minecraft/world/World;Ljava/lang/String;DDD)Lnet/minecraft/entity/Entity;=|p_77840_0_,name,p_77840_2_,p_77840_4_,p_77840_6_
|
||||||
|
|
||||||
net/minecraft/stats/StatList.func_151180_a([Lnet/minecraft/stats/StatBase;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Z)V=|p_151180_0_,p_151180_1_,p_151180_2_,useItemIds
|
net/minecraft/stats/StatList.mergeStatBases([Lnet/minecraft/stats/StatBase;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Z)V=|p_151180_0_,p_151180_1_,p_151180_2_,useItemIds
|
||||||
|
|
|
@ -3,9 +3,6 @@ package net.minecraftforge.debug;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
|
|
||||||
import com.google.common.base.Function;
|
|
||||||
import com.google.common.collect.Maps;
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.BlockWall;
|
import net.minecraft.block.BlockWall;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
|
@ -14,7 +11,6 @@ import net.minecraft.block.state.BlockState;
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import net.minecraft.client.renderer.block.statemap.IStateMapper;
|
import net.minecraft.client.renderer.block.statemap.IStateMapper;
|
||||||
import net.minecraft.client.renderer.block.statemap.StateMap;
|
import net.minecraft.client.renderer.block.statemap.StateMap;
|
||||||
import net.minecraft.client.resources.model.ModelBakery;
|
|
||||||
import net.minecraft.client.resources.model.ModelResourceLocation;
|
import net.minecraft.client.resources.model.ModelResourceLocation;
|
||||||
import net.minecraft.init.Blocks;
|
import net.minecraft.init.Blocks;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
|
@ -30,6 +26,9 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
|
import com.google.common.base.Function;
|
||||||
|
import com.google.common.collect.Maps;
|
||||||
|
|
||||||
@Mod(modid = ForgeBlockStatesLoaderDebug.MODID)
|
@Mod(modid = ForgeBlockStatesLoaderDebug.MODID)
|
||||||
public class ForgeBlockStatesLoaderDebug {
|
public class ForgeBlockStatesLoaderDebug {
|
||||||
public static final String MODID = "ForgeBlockStatesLoader";
|
public static final String MODID = "ForgeBlockStatesLoader";
|
||||||
|
@ -47,7 +46,6 @@ public class ForgeBlockStatesLoaderDebug {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void preInit(FMLPreInitializationEvent event)
|
public void preInit(FMLPreInitializationEvent event)
|
||||||
{
|
{
|
||||||
|
|
|
@ -5,8 +5,6 @@ import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.google.common.primitives.Ints;
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
|
@ -24,10 +22,7 @@ import net.minecraft.util.EnumFacing;
|
||||||
import net.minecraft.util.EnumWorldBlockLayer;
|
import net.minecraft.util.EnumWorldBlockLayer;
|
||||||
import net.minecraftforge.client.event.ModelBakeEvent;
|
import net.minecraftforge.client.event.ModelBakeEvent;
|
||||||
import net.minecraftforge.client.model.IFlexibleBakedModel;
|
import net.minecraftforge.client.model.IFlexibleBakedModel;
|
||||||
import net.minecraftforge.client.model.IModelPart;
|
|
||||||
import net.minecraftforge.client.model.IModelState;
|
|
||||||
import net.minecraftforge.client.model.ISmartBlockModel;
|
import net.minecraftforge.client.model.ISmartBlockModel;
|
||||||
import net.minecraftforge.client.model.TRSRTransformation;
|
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
import net.minecraftforge.fml.common.Mod;
|
import net.minecraftforge.fml.common.Mod;
|
||||||
import net.minecraftforge.fml.common.Mod.EventHandler;
|
import net.minecraftforge.fml.common.Mod.EventHandler;
|
||||||
|
@ -36,6 +31,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
|
|
||||||
|
import com.google.common.primitives.Ints;
|
||||||
|
|
||||||
@SuppressWarnings( "deprecation" )
|
@SuppressWarnings( "deprecation" )
|
||||||
@Mod( modid = "LayerBreakingTest", name = "LayerBreakingTest", version = "0.0.0" )
|
@Mod( modid = "LayerBreakingTest", name = "LayerBreakingTest", version = "0.0.0" )
|
||||||
public class LayerBreakingTest
|
public class LayerBreakingTest
|
||||||
|
@ -85,7 +82,7 @@ public class LayerBreakingTest
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TextureAtlasSprite getTexture()
|
public TextureAtlasSprite getParticleTexture()
|
||||||
{
|
{
|
||||||
return texture;
|
return texture;
|
||||||
}
|
}
|
||||||
|
@ -178,7 +175,7 @@ public class LayerBreakingTest
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TextureAtlasSprite getTexture()
|
public TextureAtlasSprite getParticleTexture()
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -195,8 +192,8 @@ public class LayerBreakingTest
|
||||||
if (solid == null)
|
if (solid == null)
|
||||||
{
|
{
|
||||||
BlockModelShapes models = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes();
|
BlockModelShapes models = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes();
|
||||||
translucent = new TestBakedModel(models.getModelForState(Blocks.stained_glass.getStateFromMeta(3)).getTexture(), true);
|
translucent = new TestBakedModel(models.getModelForState(Blocks.stained_glass.getStateFromMeta(3)).getParticleTexture(), true);
|
||||||
solid = new TestBakedModel(models.getModelForState(Blocks.cobblestone.getDefaultState()).getTexture(), false);
|
solid = new TestBakedModel(models.getModelForState(Blocks.cobblestone.getDefaultState()).getParticleTexture(), false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (net.minecraftforge.client.MinecraftForgeClient.getRenderLayer() == EnumWorldBlockLayer.SOLID)
|
if (net.minecraftforge.client.MinecraftForgeClient.getRenderLayer() == EnumWorldBlockLayer.SOLID)
|
||||||
|
|
|
@ -276,7 +276,7 @@ public class ModelAnimationDebug
|
||||||
GlStateManager.shadeModel(GL11.GL_FLAT);
|
GlStateManager.shadeModel(GL11.GL_FLAT);
|
||||||
}
|
}
|
||||||
|
|
||||||
worldrenderer.func_181668_a(7, DefaultVertexFormats.BLOCK);
|
worldrenderer.begin(7, DefaultVertexFormats.BLOCK);
|
||||||
worldrenderer.setTranslation(x - te.getPos().getX(), y - te.getPos().getY(), z - te.getPos().getZ());
|
worldrenderer.setTranslation(x - te.getPos().getX(), y - te.getPos().getY(), z - te.getPos().getZ());
|
||||||
|
|
||||||
this.blockRenderer.getBlockModelRenderer().renderModel(te.getWorld(), model, state, te.getPos(), worldrenderer, false);
|
this.blockRenderer.getBlockModelRenderer().renderModel(te.getWorld(), model, state, te.getPos(), worldrenderer, false);
|
||||||
|
|
|
@ -293,7 +293,7 @@ public class ModelBakeEventDebug
|
||||||
public boolean isBuiltInRenderer() { return false; }
|
public boolean isBuiltInRenderer() { return false; }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TextureAtlasSprite getTexture() { return this.base; }
|
public TextureAtlasSprite getParticleTexture() { return this.base; }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemCameraTransforms getItemCameraTransforms()
|
public ItemCameraTransforms getItemCameraTransforms()
|
||||||
|
|
|
@ -3,23 +3,17 @@ package net.minecraftforge.debug;
|
||||||
import gnu.trove.set.TIntSet;
|
import gnu.trove.set.TIntSet;
|
||||||
import gnu.trove.set.hash.TIntHashSet;
|
import gnu.trove.set.hash.TIntHashSet;
|
||||||
|
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.Gui;
|
|
||||||
import net.minecraft.client.renderer.RenderHelper;
|
|
||||||
import net.minecraft.client.renderer.Tessellator;
|
|
||||||
import net.minecraft.client.renderer.WorldRenderer;
|
|
||||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||||
import net.minecraft.client.renderer.texture.TextureMap;
|
import net.minecraft.client.renderer.texture.TextureMap;
|
||||||
import net.minecraft.init.Blocks;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.potion.Potion;
|
import net.minecraft.potion.Potion;
|
||||||
import net.minecraft.potion.PotionEffect;
|
import net.minecraft.potion.PotionEffect;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraftforge.fml.common.Mod;
|
import net.minecraftforge.fml.common.Mod;
|
||||||
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||||
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
@Mod(modid=PotionRegistryDebug.MODID)
|
@Mod(modid=PotionRegistryDebug.MODID)
|
||||||
public class PotionRegistryDebug {
|
public class PotionRegistryDebug {
|
||||||
public static final String MODID = "ForgePotionRegistry";
|
public static final String MODID = "ForgePotionRegistry";
|
||||||
|
|
Loading…
Reference in New Issue