First draft 1.7.9 support.
This is not modding minecraft. It's performing an update. Go away!
This commit is contained in:
parent
ca674c2ae5
commit
3885f9bf84
|
@ -29,8 +29,8 @@ repositories {
|
||||||
}
|
}
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
version = '1.7.2'
|
version = '1.7.9'
|
||||||
mcpVersion = '9.03'
|
mcpVersion = '9.04'
|
||||||
fmlDir = projectDir.getAbsolutePath();
|
fmlDir = projectDir.getAbsolutePath();
|
||||||
mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
|
mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
|
||||||
tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker'
|
tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker'
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
25058
fml/conf/joined.exc
25058
fml/conf/joined.exc
File diff suppressed because it is too large
Load Diff
43260
fml/conf/joined.srg
43260
fml/conf/joined.srg
File diff suppressed because it is too large
Load Diff
11741
fml/conf/params.csv
11741
fml/conf/params.csv
File diff suppressed because it is too large
Load Diff
|
@ -1,4 +1,4 @@
|
||||||
[VERSION]
|
[VERSION]
|
||||||
MCPVersion = 9.01-alpha
|
MCPVersion = 9.04
|
||||||
ClientVersion = 1.7.2
|
ClientVersion = 1.7.9
|
||||||
ServerVersion = 1.7.2
|
ServerVersion = 1.7.9
|
||||||
|
|
|
@ -0,0 +1,179 @@
|
||||||
|
{
|
||||||
|
"id": "@minecraft_version@-@project@@version@",
|
||||||
|
"time": "@timestamp@",
|
||||||
|
"releaseTime": "1960-01-01T00:00:00-0700",
|
||||||
|
"type": "release",
|
||||||
|
"minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
|
||||||
|
"libraries": [
|
||||||
|
{
|
||||||
|
"name": "net.minecraft:launchwrapper:1.9",
|
||||||
|
"comment" : "Important for FML, we add this"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.ow2.asm:asm-debug-all:4.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2",
|
||||||
|
"comment" : "Important for FML, we add this"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-library:2.10.2",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2",
|
||||||
|
"comment" : "Important for FML, we add this"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-compiler:2.10.2",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2",
|
||||||
|
"comment" : "Important for FML, we add this"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.jopt-simple:jopt-simple:4.5",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "java3d:vecmath:1.3.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.trove4j:trove4j:3.0.3"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.jopt-simple:jopt-simple:4.5"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "lzma:lzma:0.0.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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.10.Final"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.guava:guava:15.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.commons:commons-lang3:3.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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.13"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
|
||||||
|
"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:5.16"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "tv.twitch:twitch-platform:5.16",
|
||||||
|
"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": 9
|
||||||
|
}
|
|
@ -0,0 +1,219 @@
|
||||||
|
{
|
||||||
|
"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 ${game_assets} --uuid ${auth_uuid} --accessToken ${auth_access_token} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
|
||||||
|
"libraries": [
|
||||||
|
{
|
||||||
|
"name": "@artifact@",
|
||||||
|
"url": "http://files.minecraftforge.net/maven/"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.minecraft:launchwrapper:1.9",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.ow2.asm:asm-all:4.1",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-library:2.10.2",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "65de4339eaed1c3675485fb03a3532fecfd8e8cd" ],
|
||||||
|
"comment" : "Important for FML, we add this",
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-compiler:2.10.2",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "99fd0ffb66f3088b0cd1071315fd5eb2b2b070ff" ],
|
||||||
|
"comment" : "Important for FML, we add this",
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "java3d:vecmath:1.3.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.trove4j:trove4j:3.0.3"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.jopt-simple:jopt-simple:4.5",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "lzma:lzma:0.0.1",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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.10.Final"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.guava:guava:15.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.commons:commons-lang3:3.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-io:commons-io:2.4"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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.3"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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.0",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"windows": "natives-windows"
|
||||||
|
},
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20131017",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20131017",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20131017",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"natives": {
|
||||||
|
"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/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"mainClass": "net.minecraft.launchwrapper.Launch",
|
||||||
|
"minimumLauncherVersion": 9
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,150 @@
|
||||||
|
{
|
||||||
|
"id": "1.7.9",
|
||||||
|
"time": "2014-04-14T15:29:23+02:00",
|
||||||
|
"releaseTime": "2014-04-14T15:29:23+02: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}",
|
||||||
|
"minimumLauncherVersion": 13,
|
||||||
|
"assets": "1.7.4",
|
||||||
|
"libraries": [
|
||||||
|
{
|
||||||
|
"name": "java3d:vecmath:1.3.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.trove4j:trove4j:3.0.3"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.jopt-simple:jopt-simple:4.5"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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.10.Final"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.guava:guava:15.0"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.commons:commons-lang3:3.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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.13"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
|
||||||
|
"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:5.16"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "tv.twitch:twitch-platform:5.16",
|
||||||
|
"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"
|
||||||
|
}
|
|
@ -7,7 +7,7 @@
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import net.minecraft.client.gui.Gui;
|
import net.minecraft.client.gui.Gui;
|
||||||
@@ -147,6 +148,8 @@
|
@@ -138,6 +139,8 @@
|
||||||
GL11.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT);
|
GL11.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
||||||
Tessellator tessellator = Tessellator.field_78398_a;
|
Tessellator tessellator = Tessellator.field_78398_a;
|
||||||
this.field_73725_b.func_110434_K().func_110577_a(Gui.field_110325_k);
|
this.field_73725_b.func_110434_K().func_110577_a(Gui.field_110325_k);
|
||||||
float f = 32.0F;
|
float f = 32.0F;
|
||||||
@@ -184,6 +187,7 @@
|
@@ -175,6 +178,7 @@
|
||||||
OpenGlHelper.func_148821_a(770, 771, 1, 0);
|
OpenGlHelper.func_148821_a(770, 771, 1, 0);
|
||||||
this.field_73725_b.field_71466_p.func_78261_a(this.field_73726_c, (l - this.field_73725_b.field_71466_p.func_78256_a(this.field_73726_c)) / 2, i1 / 2 - 4 - 16, 16777215);
|
this.field_73725_b.field_71466_p.func_78261_a(this.field_73726_c, (l - this.field_73725_b.field_71466_p.func_78256_a(this.field_73726_c)) / 2, i1 / 2 - 4 - 16, 16777215);
|
||||||
this.field_73725_b.field_71466_p.func_78261_a(this.field_73727_a, (l - this.field_73725_b.field_71466_p.func_78256_a(this.field_73727_a)) / 2, i1 / 2 - 4 + 8, 16777215);
|
this.field_73725_b.field_71466_p.func_78261_a(this.field_73727_a, (l - this.field_73725_b.field_71466_p.func_78256_a(this.field_73727_a)) / 2, i1 / 2 - 4 + 8, 16777215);
|
||||||
|
|
|
@ -1,17 +1,16 @@
|
||||||
--- ../src-base/minecraft/net/minecraft/client/Minecraft.java
|
--- ../src-base/minecraft/net/minecraft/client/Minecraft.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
|
+++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
|
||||||
@@ -1,6 +1,10 @@
|
@@ -9,6 +9,9 @@
|
||||||
package net.minecraft.client;
|
import com.google.common.util.concurrent.ListenableFutureTask;
|
||||||
|
import com.mojang.authlib.minecraft.MinecraftSessionService;
|
||||||
import com.google.common.collect.Lists;
|
import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
|
||||||
+
|
|
||||||
+import cpw.mods.fml.client.FMLClientHandler;
|
+import cpw.mods.fml.client.FMLClientHandler;
|
||||||
+import cpw.mods.fml.common.FMLCommonHandler;
|
+import cpw.mods.fml.common.FMLCommonHandler;
|
||||||
+import cpw.mods.fml.common.StartupQuery;
|
+import cpw.mods.fml.common.StartupQuery;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import io.netty.util.concurrent.GenericFutureListener;
|
import io.netty.util.concurrent.GenericFutureListener;
|
||||||
@@ -146,6 +150,8 @@
|
@@ -169,6 +172,8 @@
|
||||||
import org.lwjgl.opengl.PixelFormat;
|
import org.lwjgl.opengl.PixelFormat;
|
||||||
import org.lwjgl.util.glu.GLU;
|
import org.lwjgl.util.glu.GLU;
|
||||||
|
|
||||||
|
@ -20,7 +19,7 @@
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public class Minecraft implements IPlayerUsage
|
public class Minecraft implements IPlayerUsage
|
||||||
{
|
{
|
||||||
@@ -333,21 +339,23 @@
|
@@ -344,21 +349,23 @@
|
||||||
File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt");
|
File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt");
|
||||||
System.out.println(p_71377_1_.func_71502_e());
|
System.out.println(p_71377_1_.func_71502_e());
|
||||||
|
|
||||||
|
@ -47,7 +46,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_71367_a(String p_71367_1_, int p_71367_2_)
|
public void func_71367_a(String p_71367_1_, int p_71367_2_)
|
||||||
@@ -448,7 +456,7 @@
|
@@ -471,7 +478,7 @@
|
||||||
this.field_110451_am = new SimpleReloadableResourceManager(this.field_110452_an);
|
this.field_110451_am = new SimpleReloadableResourceManager(this.field_110452_an);
|
||||||
this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab);
|
this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab);
|
||||||
this.field_110451_am.func_110542_a(this.field_135017_as);
|
this.field_110451_am.func_110542_a(this.field_135017_as);
|
||||||
|
@ -55,8 +54,8 @@
|
||||||
+ FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am);
|
+ FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am);
|
||||||
this.field_71446_o = new TextureManager(this.field_110451_am);
|
this.field_71446_o = new TextureManager(this.field_110451_am);
|
||||||
this.field_110451_am.func_110542_a(this.field_71446_o);
|
this.field_110451_am.func_110542_a(this.field_71446_o);
|
||||||
this.field_147127_av = new SoundHandler(this.field_110451_am, this.field_71474_y);
|
this.field_152350_aA = new SkinManager(this.field_71446_o, new File(this.field_110446_Y, "skins"), this.field_152355_az);
|
||||||
@@ -508,12 +516,13 @@
|
@@ -532,12 +539,13 @@
|
||||||
this.field_71446_o.func_130088_a(TextureMap.field_110576_c, new TextureMap(1, "textures/items"));
|
this.field_71446_o.func_130088_a(TextureMap.field_110576_c, new TextureMap(1, "textures/items"));
|
||||||
GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d);
|
GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d);
|
||||||
this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
|
this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
|
||||||
|
@ -71,15 +70,15 @@
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -527,6 +536,7 @@
|
@@ -553,6 +561,7 @@
|
||||||
this.func_71352_k();
|
this.func_71352_k();
|
||||||
}
|
}
|
||||||
|
|
||||||
+ FMLClientHandler.instance().onInitializationComplete();
|
+ FMLClientHandler.instance().onInitializationComplete();
|
||||||
Display.setVSyncEnabled(this.field_71474_y.field_74352_v);
|
try
|
||||||
}
|
{
|
||||||
|
Display.setVSyncEnabled(this.field_71474_y.field_74352_v);
|
||||||
@@ -916,9 +926,11 @@
|
@@ -970,9 +979,11 @@
|
||||||
|
|
||||||
if (!this.field_71454_w)
|
if (!this.field_71454_w)
|
||||||
{
|
{
|
||||||
|
@ -91,7 +90,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
GL11.glFlush();
|
GL11.glFlush();
|
||||||
@@ -1496,6 +1508,8 @@
|
@@ -1554,6 +1565,8 @@
|
||||||
--this.field_71467_ac;
|
--this.field_71467_ac;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -100,7 +99,7 @@
|
||||||
this.field_71424_I.func_76320_a("gui");
|
this.field_71424_I.func_76320_a("gui");
|
||||||
|
|
||||||
if (!this.field_71445_n)
|
if (!this.field_71445_n)
|
||||||
@@ -1646,6 +1660,7 @@
|
@@ -1698,6 +1711,7 @@
|
||||||
this.field_71462_r.func_146274_d();
|
this.field_71462_r.func_146274_d();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -108,7 +107,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.field_71429_W > 0)
|
if (this.field_71429_W > 0)
|
||||||
@@ -1787,6 +1802,7 @@
|
@@ -1834,6 +1848,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -116,7 +115,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1978,12 +1994,15 @@
|
@@ -2025,12 +2040,15 @@
|
||||||
this.field_71453_ak.func_74428_b();
|
this.field_71453_ak.func_74428_b();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -132,7 +131,7 @@
|
||||||
this.func_71403_a((WorldClient)null);
|
this.func_71403_a((WorldClient)null);
|
||||||
System.gc();
|
System.gc();
|
||||||
ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
|
ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
|
||||||
@@ -2019,6 +2038,12 @@
|
@@ -2066,6 +2084,12 @@
|
||||||
|
|
||||||
while (!this.field_71437_Z.func_71200_ad())
|
while (!this.field_71437_Z.func_71200_ad())
|
||||||
{
|
{
|
||||||
|
@ -145,7 +144,7 @@
|
||||||
String s2 = this.field_71437_Z.func_71195_b_();
|
String s2 = this.field_71437_Z.func_71195_b_();
|
||||||
|
|
||||||
if (s2 != null)
|
if (s2 != null)
|
||||||
@@ -2094,6 +2119,7 @@
|
@@ -2141,6 +2165,7 @@
|
||||||
this.field_110448_aq.func_148529_f();
|
this.field_110448_aq.func_148529_f();
|
||||||
this.func_71351_a((ServerData)null);
|
this.func_71351_a((ServerData)null);
|
||||||
this.field_71455_al = false;
|
this.field_71455_al = false;
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import java.awt.Color;
|
import java.awt.Color;
|
||||||
@@ -312,6 +313,11 @@
|
@@ -314,6 +315,11 @@
|
||||||
this.func_73731_b(fontrenderer, s, k - fontrenderer.func_78256_a(s) - 2, 2, 14737632);
|
this.func_73731_b(fontrenderer, s, k - fontrenderer.func_78256_a(s) - 2, 2, 14737632);
|
||||||
s = "Allocated memory: " + j5 * 100L / i5 + "% (" + j5 / 1024L / 1024L + "MB)";
|
s = "Allocated memory: " + j5 * 100L / i5 + "% (" + j5 / 1024L / 1024L + "MB)";
|
||||||
this.func_73731_b(fontrenderer, s, k - fontrenderer.func_78256_a(s) - 2, 12, 14737632);
|
this.func_73731_b(fontrenderer, s, k - fontrenderer.func_78256_a(s) - 2, 12, 14737632);
|
||||||
|
|
|
@ -16,17 +16,17 @@
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
@@ -33,6 +36,9 @@
|
@@ -35,6 +38,9 @@
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GLContext;
|
||||||
import org.lwjgl.util.glu.Project;
|
import org.lwjgl.util.glu.Project;
|
||||||
|
|
||||||
+import com.google.common.base.Strings;
|
+import com.google.common.base.Strings;
|
||||||
+import com.google.common.collect.Lists;
|
+import com.google.common.collect.Lists;
|
||||||
+
|
+
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public class GuiMainMenu extends GuiScreen
|
public class GuiMainMenu extends GuiScreen implements GuiYesNoCallback
|
||||||
{
|
{
|
||||||
@@ -65,6 +71,8 @@
|
@@ -67,6 +73,8 @@
|
||||||
private GuiButton field_130023_H;
|
private GuiButton field_130023_H;
|
||||||
private static final String __OBFID = "CL_00001154";
|
private static final String __OBFID = "CL_00001154";
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@
|
||||||
public GuiMainMenu()
|
public GuiMainMenu()
|
||||||
{
|
{
|
||||||
this.field_146972_A = field_96138_a;
|
this.field_146972_A = field_96138_a;
|
||||||
@@ -265,13 +273,22 @@
|
@@ -267,13 +275,22 @@
|
||||||
private void func_130022_h()
|
private void func_130022_h()
|
||||||
{
|
{
|
||||||
this.field_130023_H.field_146125_m = true;
|
this.field_130023_H.field_146125_m = true;
|
||||||
|
@ -59,7 +59,7 @@
|
||||||
this.field_130023_H.field_146125_m = false;
|
this.field_130023_H.field_146125_m = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -320,6 +337,11 @@
|
@@ -322,6 +339,11 @@
|
||||||
this.field_146297_k.func_71400_g();
|
this.field_146297_k.func_71400_g();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,7 +71,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);
|
||||||
@@ -583,7 +605,15 @@
|
@@ -585,7 +607,15 @@
|
||||||
s = s + " Demo";
|
s = s + " Demo";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
@@ -83,7 +84,7 @@
|
@@ -83,7 +84,7 @@
|
||||||
boolean flag2 = this.field_148301_e.field_82821_f < 4;
|
boolean flag2 = this.field_148301_e.field_82821_f < 5;
|
||||||
boolean flag3 = flag1 || flag2;
|
boolean flag3 = flag1 || flag2;
|
||||||
this.field_148300_d.field_71466_p.func_78276_b(this.field_148301_e.field_78847_a, p_148279_2_ + 32 + 3, p_148279_3_ + 1, 16777215);
|
this.field_148300_d.field_71466_p.func_78276_b(this.field_148301_e.field_78847_a, p_148279_2_ + 32 + 3, p_148279_3_ + 1, 16777215);
|
||||||
- List list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_148279_4_ - 32 - 2);
|
- List list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_148279_4_ - 32 - 2);
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
import net.minecraft.util.ChatComponentTranslation;
|
import net.minecraft.util.ChatComponentTranslation;
|
||||||
import net.minecraft.util.CryptManager;
|
import net.minecraft.util.CryptManager;
|
||||||
import net.minecraft.util.IChatComponent;
|
import net.minecraft.util.IChatComponent;
|
||||||
@@ -90,7 +94,7 @@
|
@@ -100,7 +104,7 @@
|
||||||
|
|
||||||
public void func_147390_a(S02PacketLoginSuccess p_147390_1_)
|
public void func_147390_a(S02PacketLoginSuccess p_147390_1_)
|
||||||
{
|
{
|
||||||
|
@ -27,7 +27,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_147231_a(IChatComponent p_147231_1_)
|
public void func_147231_a(IChatComponent p_147231_1_)
|
||||||
@@ -104,7 +108,10 @@
|
@@ -114,7 +118,10 @@
|
||||||
|
|
||||||
if (p_147232_2_ == EnumConnectionState.PLAY)
|
if (p_147232_2_ == EnumConnectionState.PLAY)
|
||||||
{
|
{
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.tileentity.TileEntityFlowerPot;
|
import net.minecraft.tileentity.TileEntityFlowerPot;
|
||||||
import net.minecraft.util.Direction;
|
import net.minecraft.util.Direction;
|
||||||
@@ -242,7 +243,53 @@
|
@@ -245,7 +246,53 @@
|
||||||
{
|
{
|
||||||
p_147805_1_.func_149719_a(this.field_147845_a, p_147805_2_, p_147805_3_, p_147805_4_);
|
p_147805_1_.func_149719_a(this.field_147845_a, p_147805_2_, p_147805_3_, p_147805_4_);
|
||||||
this.func_147775_a(p_147805_1_);
|
this.func_147775_a(p_147805_1_);
|
||||||
|
@ -63,7 +63,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -8060,6 +8107,10 @@
|
@@ -8089,6 +8136,10 @@
|
||||||
this.func_147799_a((BlockHopper)p_147800_1_, 0, 0, 0, 0, true);
|
this.func_147799_a((BlockHopper)p_147800_1_, 0, 0, 0, 0, true);
|
||||||
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
|
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
|
||||||
}
|
}
|
||||||
|
@ -74,7 +74,7 @@
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -8118,7 +8169,24 @@
|
@@ -8147,7 +8198,24 @@
|
||||||
|
|
||||||
public static boolean func_147739_a(int p_147739_0_)
|
public static boolean func_147739_a(int p_147739_0_)
|
||||||
{
|
{
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
return field_110906_m;
|
return field_110906_m;
|
||||||
default:
|
default:
|
||||||
- return field_110903_f;
|
- return field_110903_f;
|
||||||
+ return VillagerRegistry.getVillagerSkin(p_110902_1_.func_70946_n(), field_110903_f);
|
+ return VillagerRegistry.getVillagerSkin(p_110775_1_.func_70946_n(), field_110903_f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
@@ -879,6 +881,7 @@
|
@@ -1049,6 +1051,7 @@
|
||||||
|
|
||||||
public void func_74303_b()
|
public void func_74303_b()
|
||||||
{
|
{
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@@ -141,6 +142,7 @@
|
@@ -140,6 +141,7 @@
|
||||||
return IntCache.func_85144_b();
|
return IntCache.func_85144_b();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- ../src-base/minecraft/net/minecraft/entity/monster/EntitySlime.java
|
--- ../src-base/minecraft/net/minecraft/entity/monster/EntitySlime.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/entity/monster/EntitySlime.java
|
+++ ../src-work/minecraft/net/minecraft/entity/monster/EntitySlime.java
|
||||||
@@ -240,7 +240,7 @@
|
@@ -247,7 +247,7 @@
|
||||||
{
|
{
|
||||||
Chunk chunk = this.field_70170_p.func_72938_d(MathHelper.func_76128_c(this.field_70165_t), MathHelper.func_76128_c(this.field_70161_v));
|
Chunk chunk = this.field_70170_p.func_72938_d(MathHelper.func_76128_c(this.field_70165_t), MathHelper.func_76128_c(this.field_70161_v));
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@@ -194,6 +197,7 @@
|
@@ -193,6 +196,7 @@
|
||||||
|
|
||||||
public void func_70071_h_()
|
public void func_70071_h_()
|
||||||
{
|
{
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
if (this.field_71074_e != null)
|
if (this.field_71074_e != null)
|
||||||
{
|
{
|
||||||
ItemStack itemstack = this.field_71071_by.func_70448_g();
|
ItemStack itemstack = this.field_71071_by.func_70448_g();
|
||||||
@@ -317,6 +321,7 @@
|
@@ -316,6 +320,7 @@
|
||||||
this.field_71100_bB.func_75118_a(this);
|
this.field_71100_bB.func_75118_a(this);
|
||||||
this.func_71064_a(StatList.field_75948_k, 1);
|
this.func_71064_a(StatList.field_75948_k, 1);
|
||||||
}
|
}
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public int func_82145_z()
|
public int func_82145_z()
|
||||||
@@ -2032,6 +2037,11 @@
|
@@ -2031,6 +2036,11 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import io.netty.bootstrap.Bootstrap;
|
import io.netty.bootstrap.Bootstrap;
|
||||||
@@ -127,7 +129,7 @@
|
@@ -142,7 +144,7 @@
|
||||||
final EnumConnectionState enumconnectionstate = EnumConnectionState.func_150752_a(p_150732_1_);
|
final EnumConnectionState enumconnectionstate = EnumConnectionState.func_150752_a(p_150732_1_);
|
||||||
final EnumConnectionState enumconnectionstate1 = (EnumConnectionState)this.field_150746_k.attr(field_150739_c).get();
|
final EnumConnectionState enumconnectionstate1 = (EnumConnectionState)this.field_150746_k.attr(field_150739_c).get();
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
{
|
{
|
||||||
field_150735_g.debug("Disabled auto read");
|
field_150735_g.debug("Disabled auto read");
|
||||||
this.field_150746_k.config().setAutoRead(false);
|
this.field_150746_k.config().setAutoRead(false);
|
||||||
@@ -135,7 +137,7 @@
|
@@ -150,7 +152,7 @@
|
||||||
|
|
||||||
if (this.field_150746_k.eventLoop().inEventLoop())
|
if (this.field_150746_k.eventLoop().inEventLoop())
|
||||||
{
|
{
|
||||||
|
@ -27,7 +27,7 @@
|
||||||
{
|
{
|
||||||
this.func_150723_a(enumconnectionstate);
|
this.func_150723_a(enumconnectionstate);
|
||||||
}
|
}
|
||||||
@@ -149,7 +151,7 @@
|
@@ -164,7 +166,7 @@
|
||||||
private static final String __OBFID = "CL_00001241";
|
private static final String __OBFID = "CL_00001241";
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
|
@ -36,7 +36,7 @@
|
||||||
{
|
{
|
||||||
NetworkManager.this.func_150723_a(enumconnectionstate);
|
NetworkManager.this.func_150723_a(enumconnectionstate);
|
||||||
}
|
}
|
||||||
@@ -299,6 +301,11 @@
|
@@ -315,6 +317,11 @@
|
||||||
this.channelRead0(p_channelRead0_1_, (Packet)p_channelRead0_2_);
|
this.channelRead0(p_channelRead0_1_, (Packet)p_channelRead0_2_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
- p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(30)).addLast("legacy_query", new PingResponseHandler(NetworkSystem.this)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer()).addLast("prepender", new MessageSerializer2()).addLast("encoder", new MessageSerializer());
|
- p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(30)).addLast("legacy_query", new PingResponseHandler(NetworkSystem.this)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer(NetworkManager.field_152462_h)).addLast("prepender", new MessageSerializer2()).addLast("encoder", new MessageSerializer(NetworkManager.field_152462_h));
|
||||||
+ p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(FMLNetworkHandler.READ_TIMEOUT)).addLast("legacy_query", new PingResponseHandler(NetworkSystem.this)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer()).addLast("prepender", new MessageSerializer2()).addLast("encoder", new MessageSerializer());
|
+ p_initChannel_1_.pipeline().addLast("timeout", new ReadTimeoutHandler(FMLNetworkHandler.READ_TIMEOUT)).addLast("legacy_query", new PingResponseHandler(NetworkSystem.this)).addLast("splitter", new MessageDeserializer2()).addLast("decoder", new MessageDeserializer(NetworkManager.field_152462_h)).addLast("prepender", new MessageSerializer2()).addLast("encoder", new MessageSerializer(NetworkManager.field_152462_h));
|
||||||
NetworkManager networkmanager = new NetworkManager(false);
|
NetworkManager networkmanager = new NetworkManager(false);
|
||||||
NetworkSystem.this.field_151272_f.add(networkmanager);
|
NetworkSystem.this.field_151272_f.add(networkmanager);
|
||||||
p_initChannel_1_.pipeline().addLast("packet_handler", networkmanager);
|
p_initChannel_1_.pipeline().addLast("packet_handler", networkmanager);
|
||||||
|
|
|
@ -7,9 +7,9 @@
|
||||||
+import cpw.mods.fml.client.FMLClientHandler;
|
+import cpw.mods.fml.client.FMLClientHandler;
|
||||||
+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
|
+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
|
||||||
import java.lang.reflect.Type;
|
import java.lang.reflect.Type;
|
||||||
|
import java.util.UUID;
|
||||||
import net.minecraft.util.IChatComponent;
|
import net.minecraft.util.IChatComponent;
|
||||||
import net.minecraft.util.JsonUtils;
|
@@ -233,6 +235,7 @@
|
||||||
@@ -230,6 +232,7 @@
|
|
||||||
serverstatusresponse.func_151320_a(JsonUtils.func_151200_h(jsonobject, "favicon"));
|
serverstatusresponse.func_151320_a(JsonUtils.func_151200_h(jsonobject, "favicon"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,8 +17,8 @@
|
||||||
return serverstatusresponse;
|
return serverstatusresponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -257,6 +260,7 @@
|
@@ -260,6 +263,7 @@
|
||||||
jsonobject.addProperty("favicon", p_151313_1_.func_151316_d());
|
jsonobject.addProperty("favicon", p_serialize_1_.func_151316_d());
|
||||||
}
|
}
|
||||||
|
|
||||||
+ FMLNetworkHandler.enhanceStatusQuery(jsonobject);
|
+ FMLNetworkHandler.enhanceStatusQuery(jsonobject);
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
--- ../src-base/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java
|
|
||||||
@@ -1,5 +1,6 @@
|
|
||||||
package net.minecraft.network.play.server;
|
|
||||||
|
|
||||||
+import cpw.mods.fml.common.network.ByteBufUtils;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import io.netty.buffer.ByteBuf;
|
|
||||||
@@ -27,23 +28,23 @@
|
|
||||||
this.field_149172_a = p_i45190_1_;
|
|
||||||
this.field_149171_b = p_i45190_2_;
|
|
||||||
|
|
||||||
- if (p_i45190_2_.length >= 32767)
|
|
||||||
+ if (p_i45190_2_.length > 0x1ffff0)
|
|
||||||
{
|
|
||||||
- throw new IllegalArgumentException("Payload may not be larger than 32767 bytes");
|
|
||||||
+ throw new IllegalArgumentException("Payload may not be larger than 2097136 (0x1ffff0) bytes");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void func_148837_a(PacketBuffer p_148837_1_) throws IOException
|
|
||||||
{
|
|
||||||
this.field_149172_a = p_148837_1_.func_150789_c(20);
|
|
||||||
- this.field_149171_b = new byte[p_148837_1_.readUnsignedShort()];
|
|
||||||
+ this.field_149171_b = new byte[ByteBufUtils.readVarShort(p_148837_1_)];
|
|
||||||
p_148837_1_.readBytes(this.field_149171_b);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void func_148840_b(PacketBuffer p_148840_1_) throws IOException
|
|
||||||
{
|
|
||||||
p_148840_1_.func_150785_a(this.field_149172_a);
|
|
||||||
- p_148840_1_.writeShort(this.field_149171_b.length);
|
|
||||||
+ ByteBufUtils.writeVarShort(p_148840_1_, this.field_149171_b.length);
|
|
||||||
p_148840_1_.writeBytes(this.field_149171_b);
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
--- ../src-base/minecraft/net/minecraft/server/MinecraftServer.java
|
--- ../src-base/minecraft/net/minecraft/server/MinecraftServer.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/server/MinecraftServer.java
|
+++ ../src-work/minecraft/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -4,6 +4,11 @@
|
@@ -5,6 +5,11 @@
|
||||||
import com.mojang.authlib.GameProfile;
|
import com.mojang.authlib.GameProfileRepository;
|
||||||
import com.mojang.authlib.minecraft.MinecraftSessionService;
|
import com.mojang.authlib.minecraft.MinecraftSessionService;
|
||||||
import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
|
import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
|
||||||
+
|
+
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
@@ -333,7 +338,7 @@
|
@@ -343,7 +348,7 @@
|
||||||
|
|
||||||
public void func_71260_j()
|
public void func_71260_j()
|
||||||
{
|
{
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
{
|
{
|
||||||
field_147145_h.info("Stopping server");
|
field_147145_h.info("Stopping server");
|
||||||
|
|
||||||
@@ -381,6 +386,7 @@
|
@@ -394,6 +399,7 @@
|
||||||
{
|
{
|
||||||
if (this.func_71197_b())
|
if (this.func_71197_b())
|
||||||
{
|
{
|
||||||
|
@ -29,8 +29,8 @@
|
||||||
long i = func_130071_aq();
|
long i = func_130071_aq();
|
||||||
long l = 0L;
|
long l = 0L;
|
||||||
this.field_147147_p.func_151315_a(new ChatComponentText(this.field_71286_C));
|
this.field_147147_p.func_151315_a(new ChatComponentText(this.field_71286_C));
|
||||||
@@ -425,12 +431,20 @@
|
@@ -438,12 +444,20 @@
|
||||||
Thread.sleep(1L);
|
Thread.sleep(Math.max(1L, 50L - l));
|
||||||
this.field_71296_Q = true;
|
this.field_71296_Q = true;
|
||||||
}
|
}
|
||||||
+ FMLCommonHandler.instance().handleServerStopping();
|
+ FMLCommonHandler.instance().handleServerStopping();
|
||||||
|
@ -50,7 +50,7 @@
|
||||||
catch (Throwable throwable1)
|
catch (Throwable throwable1)
|
||||||
{
|
{
|
||||||
field_147145_h.error("Encountered an unexpected exception", throwable1);
|
field_147145_h.error("Encountered an unexpected exception", throwable1);
|
||||||
@@ -456,6 +470,7 @@
|
@@ -469,6 +483,7 @@
|
||||||
field_147145_h.error("We were unable to save this crash report to disk.");
|
field_147145_h.error("We were unable to save this crash report to disk.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@
|
||||||
this.func_71228_a(crashreport);
|
this.func_71228_a(crashreport);
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
@@ -471,6 +486,8 @@
|
@@ -484,6 +499,8 @@
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
@ -67,15 +67,15 @@
|
||||||
this.func_71240_o();
|
this.func_71240_o();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -513,6 +530,7 @@
|
@@ -529,6 +546,7 @@
|
||||||
|
public void func_71217_p()
|
||||||
{
|
{
|
||||||
long i = System.nanoTime();
|
long i = System.nanoTime();
|
||||||
AxisAlignedBB.func_72332_a().func_72298_a();
|
|
||||||
+ FMLCommonHandler.instance().onPreServerTick();
|
+ FMLCommonHandler.instance().onPreServerTick();
|
||||||
++this.field_71315_w;
|
++this.field_71315_w;
|
||||||
|
|
||||||
if (this.field_71295_T)
|
if (this.field_71295_T)
|
||||||
@@ -566,6 +584,7 @@
|
@@ -582,6 +600,7 @@
|
||||||
|
|
||||||
this.field_71304_b.func_76319_b();
|
this.field_71304_b.func_76319_b();
|
||||||
this.field_71304_b.func_76319_b();
|
this.field_71304_b.func_76319_b();
|
||||||
|
@ -83,7 +83,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_71190_q()
|
public void func_71190_q()
|
||||||
@@ -593,6 +612,7 @@
|
@@ -608,6 +627,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
this.field_71304_b.func_76320_a("tick");
|
this.field_71304_b.func_76320_a("tick");
|
||||||
|
@ -91,7 +91,7 @@
|
||||||
CrashReport crashreport;
|
CrashReport crashreport;
|
||||||
|
|
||||||
try
|
try
|
||||||
@@ -617,6 +637,7 @@
|
@@ -632,6 +652,7 @@
|
||||||
throw new ReportedException(crashreport);
|
throw new ReportedException(crashreport);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@
|
||||||
this.field_71304_b.func_76319_b();
|
this.field_71304_b.func_76319_b();
|
||||||
this.field_71304_b.func_76320_a("tracker");
|
this.field_71304_b.func_76320_a("tracker");
|
||||||
worldserver.func_73039_n().func_72788_a();
|
worldserver.func_73039_n().func_72788_a();
|
||||||
@@ -648,6 +669,7 @@
|
@@ -663,6 +684,7 @@
|
||||||
|
|
||||||
public void func_71256_s()
|
public void func_71256_s()
|
||||||
{
|
{
|
||||||
|
@ -107,7 +107,7 @@
|
||||||
(new Thread("Server thread")
|
(new Thread("Server thread")
|
||||||
{
|
{
|
||||||
private static final String __OBFID = "CL_00001418";
|
private static final String __OBFID = "CL_00001418";
|
||||||
@@ -695,7 +717,7 @@
|
@@ -715,7 +737,7 @@
|
||||||
|
|
||||||
public String getServerModName()
|
public String getServerModName()
|
||||||
{
|
{
|
||||||
|
@ -116,3 +116,12 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public CrashReport func_71230_b(CrashReport p_71230_1_)
|
public CrashReport func_71230_b(CrashReport p_71230_1_)
|
||||||
|
@@ -1117,7 +1139,7 @@
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
- public abstract String func_71206_a(WorldSettings.GameType var1, boolean var2);
|
||||||
|
+ public abstract String func_71206_a(WorldSettings.GameType p_71206_1_, boolean p_71206_2_);
|
||||||
|
|
||||||
|
public int func_71259_af()
|
||||||
|
{
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
@@ -45,6 +46,7 @@
|
@@ -46,6 +47,7 @@
|
||||||
private boolean field_71338_p;
|
private boolean field_71338_p;
|
||||||
private WorldSettings.GameType field_71337_q;
|
private WorldSettings.GameType field_71337_q;
|
||||||
private boolean field_71335_s;
|
private boolean field_71335_s;
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
private static final String __OBFID = "CL_00001784";
|
private static final String __OBFID = "CL_00001784";
|
||||||
|
|
||||||
public DedicatedServer(File p_i1508_1_)
|
public DedicatedServer(File p_i1508_1_)
|
||||||
@@ -109,6 +111,8 @@
|
@@ -110,6 +112,8 @@
|
||||||
field_155771_h.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
|
field_155771_h.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,30 +24,29 @@
|
||||||
field_155771_h.info("Loading properties");
|
field_155771_h.info("Loading properties");
|
||||||
this.field_71340_o = new PropertyManager(new File("server.properties"));
|
this.field_71340_o = new PropertyManager(new File("server.properties"));
|
||||||
|
|
||||||
@@ -180,6 +184,8 @@
|
@@ -192,6 +196,7 @@
|
||||||
field_155771_h.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
+ FMLCommonHandler.instance().onServerStarted();
|
||||||
|
this.func_152361_a(new DedicatedPlayerList(this));
|
||||||
|
long j = System.nanoTime();
|
||||||
|
|
||||||
+ FMLCommonHandler.instance().onServerStarted();
|
@@ -237,6 +242,7 @@
|
||||||
+
|
this.func_71191_d((this.func_71207_Z() + 8) / 16 * 16);
|
||||||
this.func_71210_a(new DedicatedPlayerList(this));
|
this.func_71191_d(MathHelper.func_76125_a(this.func_71207_Z(), 64, 256));
|
||||||
long j = System.nanoTime();
|
this.field_71340_o.func_73667_a("max-build-height", Integer.valueOf(this.func_71207_Z()));
|
||||||
|
+ if (!FMLCommonHandler.instance().handleServerAboutToStart(this)) { return false; }
|
||||||
|
field_155771_h.info("Preparing level \"" + this.func_71270_I() + "\"");
|
||||||
|
this.func_71247_a(this.func_71270_I(), this.func_71270_I(), k, worldtype, s2);
|
||||||
|
long i1 = System.nanoTime() - j;
|
||||||
|
@@ -257,7 +263,8 @@
|
||||||
|
this.field_71339_n.func_72602_a();
|
||||||
|
}
|
||||||
|
|
||||||
@@ -225,6 +231,7 @@
|
- return true;
|
||||||
this.func_71191_d((this.func_71207_Z() + 8) / 16 * 16);
|
+ allowPlayerLogins = true;
|
||||||
this.func_71191_d(MathHelper.func_76125_a(this.func_71207_Z(), 64, 256));
|
+ return FMLCommonHandler.instance().handleServerStarting(this);
|
||||||
this.field_71340_o.func_73667_a("max-build-height", Integer.valueOf(this.func_71207_Z()));
|
|
||||||
+ if (!FMLCommonHandler.instance().handleServerAboutToStart(this)) { return false; }
|
|
||||||
field_155771_h.info("Preparing level \"" + this.func_71270_I() + "\"");
|
|
||||||
this.func_71247_a(this.func_71270_I(), this.func_71270_I(), k, worldtype, s2);
|
|
||||||
long i1 = System.nanoTime() - j;
|
|
||||||
@@ -245,7 +252,8 @@
|
|
||||||
this.field_71339_n.func_72602_a();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- return true;
|
|
||||||
+ allowPlayerLogins = true;
|
|
||||||
+ return FMLCommonHandler.instance().handleServerStarting(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean func_71225_e()
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
--- ../src-base/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
|
--- ../src-base/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
|
+++ ../src-work/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
|
||||||
@@ -3,6 +3,8 @@
|
@@ -4,6 +4,8 @@
|
||||||
import com.google.common.base.Charsets;
|
import com.google.common.collect.Lists;
|
||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
import com.mojang.authlib.GameProfile;
|
import com.mojang.authlib.GameProfile;
|
||||||
+
|
+
|
||||||
|
@ -9,16 +9,16 @@
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
@@ -88,7 +90,7 @@
|
@@ -98,7 +100,7 @@
|
||||||
this.field_72405_c = 8;
|
this.field_72405_c = 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
- public void func_72355_a(NetworkManager p_72355_1_, EntityPlayerMP p_72355_2_)
|
- public void func_72355_a(NetworkManager p_72355_1_, EntityPlayerMP p_72355_2_)
|
||||||
+ public void func_72355_a(NetworkManager p_72355_1_, EntityPlayerMP p_72355_2_, NetHandlerPlayServer nethandlerplayserver)
|
+ public void func_72355_a(NetworkManager p_72355_1_, EntityPlayerMP p_72355_2_, NetHandlerPlayServer nethandlerplayserver)
|
||||||
{
|
{
|
||||||
NBTTagCompound nbttagcompound = this.func_72380_a(p_72355_2_);
|
GameProfile gameprofile = p_72355_2_.func_146103_bH();
|
||||||
p_72355_2_.func_70029_a(this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK));
|
PlayerProfileCache playerprofilecache = this.field_72400_f.func_152358_ax();
|
||||||
@@ -104,7 +106,7 @@
|
@@ -119,7 +121,7 @@
|
||||||
WorldServer worldserver = this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK);
|
WorldServer worldserver = this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK);
|
||||||
ChunkCoordinates chunkcoordinates = worldserver.func_72861_E();
|
ChunkCoordinates chunkcoordinates = worldserver.func_72861_E();
|
||||||
this.func_72381_a(p_72355_2_, (EntityPlayerMP)null, worldserver);
|
this.func_72381_a(p_72355_2_, (EntityPlayerMP)null, worldserver);
|
||||||
|
@ -27,7 +27,7 @@
|
||||||
nethandlerplayserver.func_147359_a(new S01PacketJoinGame(p_72355_2_.func_145782_y(), p_72355_2_.field_71134_c.func_73081_b(), worldserver.func_72912_H().func_76093_s(), worldserver.field_73011_w.field_76574_g, worldserver.field_73013_u, this.func_72352_l(), worldserver.func_72912_H().func_76067_t()));
|
nethandlerplayserver.func_147359_a(new S01PacketJoinGame(p_72355_2_.func_145782_y(), p_72355_2_.field_71134_c.func_73081_b(), worldserver.func_72912_H().func_76093_s(), worldserver.field_73011_w.field_76574_g, worldserver.field_73013_u, this.func_72352_l(), worldserver.func_72912_H().func_76067_t()));
|
||||||
nethandlerplayserver.func_147359_a(new S3FPacketCustomPayload("MC|Brand", this.func_72365_p().getServerModName().getBytes(Charsets.UTF_8)));
|
nethandlerplayserver.func_147359_a(new S3FPacketCustomPayload("MC|Brand", this.func_72365_p().getServerModName().getBytes(Charsets.UTF_8)));
|
||||||
nethandlerplayserver.func_147359_a(new S05PacketSpawnPosition(chunkcoordinates.field_71574_a, chunkcoordinates.field_71572_b, chunkcoordinates.field_71573_c));
|
nethandlerplayserver.func_147359_a(new S05PacketSpawnPosition(chunkcoordinates.field_71574_a, chunkcoordinates.field_71572_b, chunkcoordinates.field_71573_c));
|
||||||
@@ -136,6 +138,7 @@
|
@@ -161,6 +163,7 @@
|
||||||
|
|
||||||
p_72355_2_.func_71116_b();
|
p_72355_2_.func_71116_b();
|
||||||
|
|
||||||
|
@ -35,16 +35,16 @@
|
||||||
if (nbttagcompound != null && nbttagcompound.func_150297_b("Riding", 10))
|
if (nbttagcompound != null && nbttagcompound.func_150297_b("Riding", 10))
|
||||||
{
|
{
|
||||||
Entity entity = EntityList.func_75615_a(nbttagcompound.func_74775_l("Riding"), worldserver);
|
Entity entity = EntityList.func_75615_a(nbttagcompound.func_74775_l("Riding"), worldserver);
|
||||||
@@ -225,6 +228,8 @@
|
@@ -250,6 +253,8 @@
|
||||||
|
|
||||||
protected void func_72391_b(EntityPlayerMP p_72391_1_)
|
protected void func_72391_b(EntityPlayerMP p_72391_1_)
|
||||||
{
|
{
|
||||||
+ if (p_72391_1_.field_71135_a == null) return;
|
+ if (p_72391_1_.field_71135_a == null) return;
|
||||||
+
|
+
|
||||||
this.field_72412_k.func_75753_a(p_72391_1_);
|
this.field_72412_k.func_75753_a(p_72391_1_);
|
||||||
StatisticsFile statisticsfile = (StatisticsFile)this.field_148547_k.get(p_72391_1_.func_70005_c_());
|
StatisticsFile statisticsfile = (StatisticsFile)this.field_148547_k.get(p_72391_1_.func_110124_au());
|
||||||
|
|
||||||
@@ -256,6 +261,7 @@
|
@@ -281,6 +286,7 @@
|
||||||
|
|
||||||
public void func_72367_e(EntityPlayerMP p_72367_1_)
|
public void func_72367_e(EntityPlayerMP p_72367_1_)
|
||||||
{
|
{
|
||||||
|
@ -52,7 +52,7 @@
|
||||||
p_72367_1_.func_71029_a(StatList.field_75947_j);
|
p_72367_1_.func_71029_a(StatList.field_75947_j);
|
||||||
this.func_72391_b(p_72367_1_);
|
this.func_72391_b(p_72367_1_);
|
||||||
WorldServer worldserver = p_72367_1_.func_71121_q();
|
WorldServer worldserver = p_72367_1_.func_71121_q();
|
||||||
@@ -415,6 +421,7 @@
|
@@ -436,6 +442,7 @@
|
||||||
this.field_72404_b.add(entityplayermp1);
|
this.field_72404_b.add(entityplayermp1);
|
||||||
entityplayermp1.func_71116_b();
|
entityplayermp1.func_71116_b();
|
||||||
entityplayermp1.func_70606_j(entityplayermp1.func_110143_aJ());
|
entityplayermp1.func_70606_j(entityplayermp1.func_110143_aJ());
|
||||||
|
@ -60,7 +60,7 @@
|
||||||
return entityplayermp1;
|
return entityplayermp1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -440,6 +447,7 @@
|
@@ -461,6 +468,7 @@
|
||||||
PotionEffect potioneffect = (PotionEffect)iterator.next();
|
PotionEffect potioneffect = (PotionEffect)iterator.next();
|
||||||
p_72356_1_.field_71135_a.func_147359_a(new S1DPacketEntityEffect(p_72356_1_.func_145782_y(), potioneffect));
|
p_72356_1_.field_71135_a.func_147359_a(new S1DPacketEntityEffect(p_72356_1_.func_145782_y(), potioneffect));
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
{
|
{
|
||||||
this.func_147322_a("Took too long to log in");
|
this.func_147322_a("Took too long to log in");
|
||||||
}
|
}
|
||||||
@@ -97,7 +99,7 @@
|
@@ -96,7 +98,7 @@
|
||||||
{
|
{
|
||||||
this.field_147328_g = NetHandlerLoginServer.LoginState.ACCEPTED;
|
this.field_147328_g = NetHandlerLoginServer.LoginState.ACCEPTED;
|
||||||
this.field_147333_a.func_150725_a(new S02PacketLoginSuccess(this.field_147337_i), new GenericFutureListener[0]);
|
this.field_147333_a.func_150725_a(new S02PacketLoginSuccess(this.field_147337_i), new GenericFutureListener[0]);
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
@@ -319,7 +320,15 @@
|
@@ -322,7 +323,15 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- ../src-base/minecraft/net/minecraft/world/World.java
|
--- ../src-base/minecraft/net/minecraft/world/World.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/world/World.java
|
+++ ../src-work/minecraft/net/minecraft/world/World.java
|
||||||
@@ -1800,14 +1800,14 @@
|
@@ -1799,14 +1799,14 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
||||||
this.field_72984_F.func_76318_c("pendingBlockEntities");
|
this.field_72984_F.func_76318_c("pendingBlockEntities");
|
||||||
|
|
||||||
if (!this.field_147484_a.isEmpty())
|
if (!this.field_147484_a.isEmpty())
|
||||||
@@ -3570,7 +3570,7 @@
|
@@ -3597,7 +3597,7 @@
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public double func_72919_O()
|
public double func_72919_O()
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,15 +1,14 @@
|
||||||
--- ../src-base/minecraft/net/minecraft/world/gen/ChunkProviderServer.java
|
--- ../src-base/minecraft/net/minecraft/world/gen/ChunkProviderServer.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/world/gen/ChunkProviderServer.java
|
+++ ../src-work/minecraft/net/minecraft/world/gen/ChunkProviderServer.java
|
||||||
@@ -6,6 +6,8 @@
|
@@ -1,6 +1,7 @@
|
||||||
import java.util.Iterator;
|
package net.minecraft.world.gen;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
import com.google.common.collect.Lists;
|
||||||
+
|
|
||||||
+import cpw.mods.fml.common.registry.GameRegistry;
|
+import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
import net.minecraft.crash.CrashReport;
|
import java.io.IOException;
|
||||||
import net.minecraft.crash.CrashReportCategory;
|
import java.util.ArrayList;
|
||||||
import net.minecraft.entity.EnumCreatureType;
|
import java.util.Collections;
|
||||||
@@ -209,6 +211,7 @@
|
@@ -216,6 +217,7 @@
|
||||||
if (this.field_73246_d != null)
|
if (this.field_73246_d != null)
|
||||||
{
|
{
|
||||||
this.field_73246_d.func_73153_a(p_73153_1_, p_73153_2_, p_73153_3_);
|
this.field_73246_d.func_73153_a(p_73153_1_, p_73153_2_, p_73153_3_);
|
||||||
|
|
|
@ -8,6 +8,7 @@ import net.minecraft.client.gui.GuiLabel;
|
||||||
import net.minecraft.client.gui.GuiScreen;
|
import net.minecraft.client.gui.GuiScreen;
|
||||||
import net.minecraft.client.gui.GuiSelectWorld;
|
import net.minecraft.client.gui.GuiSelectWorld;
|
||||||
import net.minecraft.client.gui.GuiYesNo;
|
import net.minecraft.client.gui.GuiYesNo;
|
||||||
|
import net.minecraft.client.gui.GuiYesNoCallback;
|
||||||
import net.minecraft.world.WorldSettings;
|
import net.minecraft.world.WorldSettings;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Level;
|
import org.apache.logging.log4j.Level;
|
||||||
|
@ -17,18 +18,21 @@ import cpw.mods.fml.common.ObfuscationReflectionHelper;
|
||||||
import cpw.mods.fml.common.StartupQuery;
|
import cpw.mods.fml.common.StartupQuery;
|
||||||
import cpw.mods.fml.common.ZipperUtil;
|
import cpw.mods.fml.common.ZipperUtil;
|
||||||
|
|
||||||
public class GuiOldSaveLoadConfirm extends GuiYesNo {
|
public class GuiOldSaveLoadConfirm extends GuiYesNo implements GuiYesNoCallback {
|
||||||
|
|
||||||
private String dirName;
|
private String dirName;
|
||||||
private String saveName;
|
private String saveName;
|
||||||
private File zip;
|
private File zip;
|
||||||
|
private GuiScreen parent;
|
||||||
public GuiOldSaveLoadConfirm(String dirName, String saveName, GuiScreen parent)
|
public GuiOldSaveLoadConfirm(String dirName, String saveName, GuiScreen parent)
|
||||||
{
|
{
|
||||||
super(parent, "", "", 0);
|
super(null, "", "", 0);
|
||||||
|
this.parent = parent;
|
||||||
this.dirName = dirName;
|
this.dirName = dirName;
|
||||||
this.saveName = saveName;
|
this.saveName = saveName;
|
||||||
this.zip = new File(FMLClientHandler.instance().getClient().mcDataDir,String.format("%s-%2$td%2$tm%2$ty%2$tH%2$tM%2$tS.zip", dirName, System.currentTimeMillis()));
|
this.zip = new File(FMLClientHandler.instance().getClient().mcDataDir,String.format("%s-%2$td%2$tm%2$ty%2$tH%2$tM%2$tS.zip", dirName, System.currentTimeMillis()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)
|
public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)
|
||||||
{
|
{
|
||||||
|
@ -55,7 +59,7 @@ public class GuiOldSaveLoadConfirm extends GuiYesNo {
|
||||||
if (p_146284_1_.id == 1)
|
if (p_146284_1_.id == 1)
|
||||||
{
|
{
|
||||||
ObfuscationReflectionHelper.setPrivateValue(GuiSelectWorld.class, (GuiSelectWorld)parentScreen, false, "field_"+"146634_i");
|
ObfuscationReflectionHelper.setPrivateValue(GuiSelectWorld.class, (GuiSelectWorld)parentScreen, false, "field_"+"146634_i");
|
||||||
FMLClientHandler.instance().showGuiScreen(parentScreen);
|
FMLClientHandler.instance().showGuiScreen(parent);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -66,7 +70,7 @@ public class GuiOldSaveLoadConfirm extends GuiYesNo {
|
||||||
} catch (IOException e)
|
} catch (IOException e)
|
||||||
{
|
{
|
||||||
FMLLog.log(Level.WARN, e, "There was a problem saving the backup %s. Please fix and try again", zip.getName());
|
FMLLog.log(Level.WARN, e, "There was a problem saving the backup %s. Please fix and try again", zip.getName());
|
||||||
FMLClientHandler.instance().showGuiScreen(new GuiBackupFailed(parentScreen, zip));
|
FMLClientHandler.instance().showGuiScreen(new GuiBackupFailed(parent, zip));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
FMLClientHandler.instance().showGuiScreen(null);
|
FMLClientHandler.instance().showGuiScreen(null);
|
||||||
|
|
|
@ -176,7 +176,7 @@ public class Loader
|
||||||
private Loader()
|
private Loader()
|
||||||
{
|
{
|
||||||
modClassLoader = new ModClassLoader(getClass().getClassLoader());
|
modClassLoader = new ModClassLoader(getClass().getClassLoader());
|
||||||
String actualMCVersion = "1.7.2";
|
String actualMCVersion = "1.7.9";
|
||||||
if (!mccversion.equals(actualMCVersion))
|
if (!mccversion.equals(actualMCVersion))
|
||||||
{
|
{
|
||||||
FMLLog.severe("This version of FML is built for Minecraft %s, we have detected Minecraft %s in your minecraft jar file", mccversion, actualMCVersion);
|
FMLLog.severe("This version of FML is built for Minecraft %s, we have detected Minecraft %s in your minecraft jar file", mccversion, actualMCVersion);
|
||||||
|
|
Loading…
Reference in New Issue