Start working on MC 1.3.2
This commit is contained in:
parent
b69364e168
commit
3d0bd2bc7a
|
@ -1469,6 +1469,9 @@ net/minecraft/src/CommandServerKick.func_71515_b(Lnet/minecraft/src/ICommandSend
|
||||||
net/minecraft/src/CommandServerKick.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
|
net/minecraft/src/CommandServerKick.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
|
||||||
net/minecraft/src/CommandServerKick.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
|
net/minecraft/src/CommandServerKick.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
|
||||||
net/minecraft/src/CommandServerList.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
|
net/minecraft/src/CommandServerList.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
|
||||||
|
net/minecraft/src/CommandServerMessage.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
|
||||||
|
net/minecraft/src/CommandServerMessage.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
|
||||||
|
net/minecraft/src/CommandServerMessage.func_71519_b(Lnet/minecraft/src/ICommandSender;)Z=|p_71519_1_
|
||||||
net/minecraft/src/CommandServerOp.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
|
net/minecraft/src/CommandServerOp.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
|
||||||
net/minecraft/src/CommandServerOp.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
|
net/minecraft/src/CommandServerOp.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
|
||||||
net/minecraft/src/CommandServerOp.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
|
net/minecraft/src/CommandServerOp.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
|
||||||
|
@ -1495,6 +1498,7 @@ net/minecraft/src/CommandServerWhitelist.func_71515_b(Lnet/minecraft/src/IComman
|
||||||
net/minecraft/src/CommandServerWhitelist.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
|
net/minecraft/src/CommandServerWhitelist.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
|
||||||
net/minecraft/src/CommandServerWhitelist.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
|
net/minecraft/src/CommandServerWhitelist.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
|
||||||
net/minecraft/src/CommandShowSeed.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
|
net/minecraft/src/CommandShowSeed.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
|
||||||
|
net/minecraft/src/CommandShowSeed.func_71519_b(Lnet/minecraft/src/ICommandSender;)Z=|p_71519_1_
|
||||||
net/minecraft/src/CommandTime.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
|
net/minecraft/src/CommandTime.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
|
||||||
net/minecraft/src/CommandTime.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
|
net/minecraft/src/CommandTime.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
|
||||||
net/minecraft/src/CommandTime.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
|
net/minecraft/src/CommandTime.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
|
||||||
|
@ -3415,6 +3419,7 @@ net/minecraft/src/IntHashMapEntry.equals(Ljava/lang/Object;)Z=|p_equals_1_
|
||||||
net/minecraft/src/IntegratedPlayerList.<init>(Lnet/minecraft/src/IntegratedServer;)V=|p_i3125_1_
|
net/minecraft/src/IntegratedPlayerList.<init>(Lnet/minecraft/src/IntegratedServer;)V=|p_i3125_1_
|
||||||
net/minecraft/src/IntegratedPlayerList.func_72391_b(Lnet/minecraft/src/EntityPlayerMP;)V=|p_72391_1_
|
net/minecraft/src/IntegratedPlayerList.func_72391_b(Lnet/minecraft/src/EntityPlayerMP;)V=|p_72391_1_
|
||||||
net/minecraft/src/IntegratedServer.<init>(Lnet/minecraft/client/Minecraft;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/src/WorldSettings;)V=|p_i3118_1_,p_i3118_2_,p_i3118_3_,p_i3118_4_
|
net/minecraft/src/IntegratedServer.<init>(Lnet/minecraft/client/Minecraft;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/src/WorldSettings;)V=|p_i3118_1_,p_i3118_2_,p_i3118_3_,p_i3118_4_
|
||||||
|
net/minecraft/src/IntegratedServer.func_70000_a(Lnet/minecraft/src/PlayerUsageSnooper;)V=|p_70000_1_
|
||||||
net/minecraft/src/IntegratedServer.func_71197_b()Z=java/io/IOException|
|
net/minecraft/src/IntegratedServer.func_71197_b()Z=java/io/IOException|
|
||||||
net/minecraft/src/IntegratedServer.func_71206_a(Lnet/minecraft/src/EnumGameType;Z)Ljava/lang/String;=|p_71206_1_,p_71206_2_
|
net/minecraft/src/IntegratedServer.func_71206_a(Lnet/minecraft/src/EnumGameType;Z)Ljava/lang/String;=|p_71206_1_,p_71206_2_
|
||||||
net/minecraft/src/IntegratedServer.func_71228_a(Lnet/minecraft/src/CrashReport;)V=|p_71228_1_
|
net/minecraft/src/IntegratedServer.func_71228_a(Lnet/minecraft/src/CrashReport;)V=|p_71228_1_
|
||||||
|
@ -6056,15 +6061,19 @@ net/minecraft/src/WorldProvider.func_76563_a(JF)F=|p_76563_1_,p_76563_3_
|
||||||
net/minecraft/src/WorldProvider.func_76566_a(II)Z=|p_76566_1_,p_76566_2_
|
net/minecraft/src/WorldProvider.func_76566_a(II)Z=|p_76566_1_,p_76566_2_
|
||||||
net/minecraft/src/WorldProvider.func_76568_b(II)Z=|p_76568_1_,p_76568_2_
|
net/minecraft/src/WorldProvider.func_76568_b(II)Z=|p_76568_1_,p_76568_2_
|
||||||
net/minecraft/src/WorldProvider.func_76570_a(I)Lnet/minecraft/src/WorldProvider;=|p_76570_0_
|
net/minecraft/src/WorldProvider.func_76570_a(I)Lnet/minecraft/src/WorldProvider;=|p_76570_0_
|
||||||
|
net/minecraft/src/WorldProvider.func_80004_l()Ljava/lang/String;=|
|
||||||
net/minecraft/src/WorldProviderEnd.func_76560_a(FF)[F=|p_76560_1_,p_76560_2_
|
net/minecraft/src/WorldProviderEnd.func_76560_a(FF)[F=|p_76560_1_,p_76560_2_
|
||||||
net/minecraft/src/WorldProviderEnd.func_76562_b(FF)Lnet/minecraft/src/Vec3;=|p_76562_1_,p_76562_2_
|
net/minecraft/src/WorldProviderEnd.func_76562_b(FF)Lnet/minecraft/src/Vec3;=|p_76562_1_,p_76562_2_
|
||||||
net/minecraft/src/WorldProviderEnd.func_76563_a(JF)F=|p_76563_1_,p_76563_3_
|
net/minecraft/src/WorldProviderEnd.func_76563_a(JF)F=|p_76563_1_,p_76563_3_
|
||||||
net/minecraft/src/WorldProviderEnd.func_76566_a(II)Z=|p_76566_1_,p_76566_2_
|
net/minecraft/src/WorldProviderEnd.func_76566_a(II)Z=|p_76566_1_,p_76566_2_
|
||||||
net/minecraft/src/WorldProviderEnd.func_76568_b(II)Z=|p_76568_1_,p_76568_2_
|
net/minecraft/src/WorldProviderEnd.func_76568_b(II)Z=|p_76568_1_,p_76568_2_
|
||||||
|
net/minecraft/src/WorldProviderEnd.func_80004_l()Ljava/lang/String;=|
|
||||||
net/minecraft/src/WorldProviderHell.func_76562_b(FF)Lnet/minecraft/src/Vec3;=|p_76562_1_,p_76562_2_
|
net/minecraft/src/WorldProviderHell.func_76562_b(FF)Lnet/minecraft/src/Vec3;=|p_76562_1_,p_76562_2_
|
||||||
net/minecraft/src/WorldProviderHell.func_76563_a(JF)F=|p_76563_1_,p_76563_3_
|
net/minecraft/src/WorldProviderHell.func_76563_a(JF)F=|p_76563_1_,p_76563_3_
|
||||||
net/minecraft/src/WorldProviderHell.func_76566_a(II)Z=|p_76566_1_,p_76566_2_
|
net/minecraft/src/WorldProviderHell.func_76566_a(II)Z=|p_76566_1_,p_76566_2_
|
||||||
net/minecraft/src/WorldProviderHell.func_76568_b(II)Z=|p_76568_1_,p_76568_2_
|
net/minecraft/src/WorldProviderHell.func_76568_b(II)Z=|p_76568_1_,p_76568_2_
|
||||||
|
net/minecraft/src/WorldProviderHell.func_80004_l()Ljava/lang/String;=|
|
||||||
|
net/minecraft/src/WorldProviderSurface.func_80004_l()Ljava/lang/String;=|
|
||||||
net/minecraft/src/WorldRenderer.<init>(Lnet/minecraft/src/World;Ljava/util/List;IIII)V=|p_i3196_1_,p_i3196_2_,p_i3196_3_,p_i3196_4_,p_i3196_5_,p_i3196_6_
|
net/minecraft/src/WorldRenderer.<init>(Lnet/minecraft/src/World;Ljava/util/List;IIII)V=|p_i3196_1_,p_i3196_2_,p_i3196_3_,p_i3196_4_,p_i3196_5_,p_i3196_6_
|
||||||
net/minecraft/src/WorldRenderer.func_78908_a(Lnet/minecraft/src/ICamera;)V=|p_78908_1_
|
net/minecraft/src/WorldRenderer.func_78908_a(Lnet/minecraft/src/ICamera;)V=|p_78908_1_
|
||||||
net/minecraft/src/WorldRenderer.func_78909_a(I)I=|p_78909_1_
|
net/minecraft/src/WorldRenderer.func_78909_a(I)I=|p_78909_1_
|
||||||
|
|
25126
fml/conf/joined.srg
25126
fml/conf/joined.srg
File diff suppressed because it is too large
Load Diff
|
@ -22,8 +22,8 @@ Params = %(DirConf)s/params.csv
|
||||||
NewIds = %(DirConf)s/newids.csv
|
NewIds = %(DirConf)s/newids.csv
|
||||||
|
|
||||||
[SRGS]
|
[SRGS]
|
||||||
ConfClient = %(DirConf)s/joined.srg
|
ConfClient = %(DirConf)s/client.srg
|
||||||
ConfServer = %(DirConf)s/joined.srg
|
ConfServer = %(DirConf)s/server.srg
|
||||||
Client = %(DirTemp)s/client_rg.srg
|
Client = %(DirTemp)s/client_rg.srg
|
||||||
Server = %(DirTemp)s/server_rg.srg
|
Server = %(DirTemp)s/server_rg.srg
|
||||||
DeobfClient = %(DirTemp)s/client_deobf.srg
|
DeobfClient = %(DirTemp)s/client_deobf.srg
|
||||||
|
@ -36,8 +36,8 @@ DirNatives = %(DirJars)s/bin/natives
|
||||||
Client = %(DirJars)s/bin/minecraft.jar
|
Client = %(DirJars)s/bin/minecraft.jar
|
||||||
Server = %(DirJars)s/minecraft_server.jar
|
Server = %(DirJars)s/minecraft_server.jar
|
||||||
LWJGL = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
|
LWJGL = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
|
||||||
MD5Client = 266ccbc9798afd2eadf3d6c01b4c562a
|
MD5Client = 969699f13e5bbe7f12e40ac4f32b7d9a
|
||||||
MD5Server = f44a3cfe6ec35b1ac3f2b635e73d96fe
|
MD5Server = c047f82522e53f2ec3c6b64304dfad0f
|
||||||
|
|
||||||
[RETROGUARD]
|
[RETROGUARD]
|
||||||
Location = %(DirRuntime)s/bin/retroguard.jar
|
Location = %(DirRuntime)s/bin/retroguard.jar
|
||||||
|
@ -56,8 +56,8 @@ ServerDeobLog = %(DirLogs)s/server_deob.log
|
||||||
NullPkg = net/minecraft/src
|
NullPkg = net/minecraft/src
|
||||||
|
|
||||||
[EXCEPTOR]
|
[EXCEPTOR]
|
||||||
XClientCfg = %(DirConf)s/joined.exc
|
XClientCfg = %(DirConf)s/client.exc
|
||||||
XServerCfg = %(DirConf)s/joined.exc
|
XServerCfg = %(DirConf)s/server.exc
|
||||||
XClientOut = %(DirTemp)s/minecraft_exc.jar
|
XClientOut = %(DirTemp)s/minecraft_exc.jar
|
||||||
XServerOut = %(DirTemp)s/minecraft_server_exc.jar
|
XServerOut = %(DirTemp)s/minecraft_server_exc.jar
|
||||||
XClientLog = %(DirLogs)s/client_exc.log
|
XClientLog = %(DirLogs)s/client_exc.log
|
||||||
|
@ -121,10 +121,10 @@ OutSRCServer = %(DirModSrc)s/minecraft_server
|
||||||
[MCP]
|
[MCP]
|
||||||
LogFile = %(DirLogs)s/mcp.log
|
LogFile = %(DirLogs)s/mcp.log
|
||||||
LogFileErr = %(DirLogs)s/mcperr.log
|
LogFileErr = %(DirLogs)s/mcperr.log
|
||||||
UpdateUrl =
|
UpdateUrl = http://mcp.ocean-labs.de/files/mcprolling_{version}/
|
||||||
IgnoreUpdate = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
|
IgnoreUpdate = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
|
||||||
RGIndex = 70000
|
RGIndex = 80000
|
||||||
ParamIndex = 3000
|
ParamIndex = 4000
|
||||||
|
|
||||||
[ASTYLE]
|
[ASTYLE]
|
||||||
AstyleConfig = %(DirConf)s/astyle.cfg
|
AstyleConfig = %(DirConf)s/astyle.cfg
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.UnsupportedEncodingException;
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.net.URL;
|
|
||||||
import java.net.URLConnection;
|
|
||||||
import java.net.URLEncoder;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
|
|
||||||
|
@ -14,6 +9,8 @@ public class Start
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
// set new minecraft data folder to prevent it from using the .minecraft folder
|
||||||
|
// this makes it a portable version
|
||||||
Field f = Minecraft.class.getDeclaredField("field_71463_am");
|
Field f = Minecraft.class.getDeclaredField("field_71463_am");
|
||||||
Field.setAccessible(new Field[] { f }, true);
|
Field.setAccessible(new Field[] { f }, true);
|
||||||
f.set(null, new File("."));
|
f.set(null, new File("."));
|
||||||
|
@ -23,57 +20,8 @@ public class Start
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (args.length != 2)
|
|
||||||
{
|
|
||||||
Minecraft.main(args);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
try {
|
|
||||||
String parameters = "http://login.minecraft.net/?user=" + URLEncoder.encode(args[0], "UTF-8") +
|
|
||||||
"&password=" + URLEncoder.encode(args[1], "UTF-8") +
|
|
||||||
"&version=" + 13;
|
|
||||||
String result = openUrl(parameters);
|
|
||||||
|
|
||||||
if (result == null)
|
// start minecraft game application
|
||||||
{
|
Minecraft.main(args);
|
||||||
System.out.println("Can't connect to minecraft.net");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!result.contains(":"))
|
|
||||||
{
|
|
||||||
System.out.println("Login Failed: " + result);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
//latestVersion, downloadTicket, userName, sessionId
|
|
||||||
String[] values = result.split(":");
|
|
||||||
Minecraft.main(new String[]{values[2].trim(), values[3].trim()});
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String openUrl(String addr)
|
|
||||||
{
|
|
||||||
try {
|
|
||||||
URL url = new URL(addr);
|
|
||||||
java.io.InputStream is;
|
|
||||||
is = url.openConnection().getInputStream();
|
|
||||||
|
|
||||||
java.io.BufferedReader reader = new java.io.BufferedReader(new java.io.InputStreamReader(is));
|
|
||||||
String buf = "";
|
|
||||||
String line = null;
|
|
||||||
while((line = reader.readLine() ) != null)
|
|
||||||
{
|
|
||||||
buf += "\n" + line;
|
|
||||||
}
|
|
||||||
reader.close();
|
|
||||||
return buf;
|
|
||||||
} catch (IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
|
diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
|
||||||
--- minecraft\net\minecraft\client\Minecraft.java Wed Aug 01 18:13:27 2012
|
--- minecraft\net\minecraft\client\Minecraft.java Tue Aug 14 20:15:26 2012
|
||||||
+++ minecraft_patched\net\minecraft\client\Minecraft.java Wed Aug 01 18:23:13 2012
|
+++ minecraft_patched\net\minecraft\client\Minecraft.java Tue Aug 14 20:18:48 2012
|
||||||
@@ -539,9 +539,8 @@
|
@@ -539,9 +539,8 @@
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -30,8 +30,8 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
|
||||||
|
|
||||||
private void func_71411_J() {
|
private void func_71411_J() {
|
||||||
diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
|
diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
|
||||||
--- minecraft\net\minecraft\src\CodecMus.java Wed Aug 01 18:13:28 2012
|
--- minecraft\net\minecraft\src\CodecMus.java Tue Aug 14 20:15:26 2012
|
||||||
+++ minecraft_patched\net\minecraft\src\CodecMus.java Wed Aug 01 18:24:06 2012
|
+++ minecraft_patched\net\minecraft\src\CodecMus.java Tue Aug 14 20:18:48 2012
|
||||||
@@ -1,5 +1,6 @@
|
@@ -1,5 +1,6 @@
|
||||||
package net.minecraft.src;
|
package net.minecraft.src;
|
||||||
|
|
||||||
|
@ -51,8 +51,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\min
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
|
diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
|
||||||
--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java Wed Aug 01 18:13:28 2012
|
--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java Tue Aug 14 20:15:26 2012
|
||||||
+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Wed Aug 01 18:26:33 2012
|
+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Tue Aug 14 20:18:48 2012
|
||||||
@@ -11,6 +11,10 @@
|
@@ -11,6 +11,10 @@
|
||||||
|
|
||||||
public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
|
public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
|
||||||
|
@ -65,18 +65,18 @@ diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minec
|
||||||
if(this.field_74885_f != 2 && this.field_74885_f != 3) {
|
if(this.field_74885_f != 2 && this.field_74885_f != 3) {
|
||||||
this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
|
this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
|
||||||
diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java
|
diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java
|
||||||
--- minecraft\net\minecraft\src\DedicatedServer.java Wed Aug 01 18:13:29 2012
|
--- minecraft\net\minecraft\src\DedicatedServer.java Tue Aug 14 20:15:26 2012
|
||||||
+++ minecraft_patched\net\minecraft\src\DedicatedServer.java Wed Aug 01 18:31:22 2012
|
+++ minecraft_patched\net\minecraft\src\DedicatedServer.java Tue Aug 14 20:25:02 2012
|
||||||
@@ -183,7 +183,7 @@
|
@@ -183,7 +183,7 @@
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- protected CrashReport func_71230_b(CrashReport p_71230_1_) {
|
- protected CrashReport func_71230_b(CrashReport p_71230_1_) {
|
||||||
+ public CrashReport func_71230_b(CrashReport p_71230_1_) {
|
+ public CrashReport func_71230_b(CrashReport p_71230_1_) {
|
||||||
|
p_71230_1_ = super.func_71230_b(p_71230_1_);
|
||||||
p_71230_1_.func_71500_a("Type", new CallableType(this));
|
p_71230_1_.func_71500_a("Type", new CallableType(this));
|
||||||
return super.func_71230_b(p_71230_1_);
|
return p_71230_1_;
|
||||||
}
|
@@ -193,7 +193,7 @@
|
||||||
@@ -192,7 +192,7 @@
|
|
||||||
System.exit(0);
|
System.exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -86,8 +86,8 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\
|
||||||
this.func_71333_ah();
|
this.func_71333_ah();
|
||||||
}
|
}
|
||||||
diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
|
diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
|
||||||
--- minecraft\net\minecraft\src\FontRenderer.java Thu Aug 02 02:35:41 2012
|
--- minecraft\net\minecraft\src\FontRenderer.java Tue Aug 14 20:15:26 2012
|
||||||
+++ minecraft_patched\net\minecraft\src\FontRenderer.java Thu Aug 02 02:37:34 2012
|
+++ minecraft_patched\net\minecraft\src\FontRenderer.java Tue Aug 14 20:18:48 2012
|
||||||
@@ -711,8 +711,6 @@
|
@@ -711,8 +711,6 @@
|
||||||
for(boolean var7 = false; var5 < var3; ++var5) {
|
for(boolean var7 = false; var5 < var3; ++var5) {
|
||||||
char var8 = p_78259_1_.charAt(var5);
|
char var8 = p_78259_1_.charAt(var5);
|
||||||
|
@ -107,9 +107,9 @@ diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net
|
||||||
var4 += this.func_78263_a(var8);
|
var4 += this.func_78263_a(var8);
|
||||||
if(var7) {
|
if(var7) {
|
||||||
diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java
|
diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java
|
||||||
--- minecraft\net\minecraft\src\IntegratedServer.java Wed Aug 01 18:13:30 2012
|
--- minecraft\net\minecraft\src\IntegratedServer.java Tue Aug 14 20:15:26 2012
|
||||||
+++ minecraft_patched\net\minecraft\src\IntegratedServer.java Wed Aug 01 18:32:27 2012
|
+++ minecraft_patched\net\minecraft\src\IntegratedServer.java Tue Aug 14 20:24:49 2012
|
||||||
@@ -97,7 +97,7 @@
|
@@ -98,7 +98,7 @@
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -118,18 +118,18 @@ diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched
|
||||||
boolean var1 = this.field_71348_o;
|
boolean var1 = this.field_71348_o;
|
||||||
this.field_71348_o = this.field_71347_n.func_71752_f();
|
this.field_71348_o = this.field_71347_n.func_71752_f();
|
||||||
if(!var1 && this.field_71348_o) {
|
if(!var1 && this.field_71348_o) {
|
||||||
@@ -144,7 +144,7 @@
|
@@ -145,7 +145,7 @@
|
||||||
this.field_71349_l.func_71404_a(p_71228_1_);
|
this.field_71349_l.func_71404_a(p_71228_1_);
|
||||||
}
|
}
|
||||||
|
|
||||||
- protected CrashReport func_71230_b(CrashReport p_71230_1_) {
|
- protected CrashReport func_71230_b(CrashReport p_71230_1_) {
|
||||||
+ public CrashReport func_71230_b(CrashReport p_71230_1_) {
|
+ public CrashReport func_71230_b(CrashReport p_71230_1_) {
|
||||||
|
p_71230_1_ = super.func_71230_b(p_71230_1_);
|
||||||
p_71230_1_.func_71500_a("Type", new CallableType3(this));
|
p_71230_1_.func_71500_a("Type", new CallableType3(this));
|
||||||
p_71230_1_.func_71500_a("Is Modded", new CallableIsModded(this));
|
p_71230_1_.func_71500_a("Is Modded", new CallableIsModded(this));
|
||||||
return super.func_71230_b(p_71230_1_);
|
|
||||||
diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\minecraft\src\ItemMap.java
|
diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\minecraft\src\ItemMap.java
|
||||||
--- minecraft\net\minecraft\src\ItemMap.java Wed Aug 01 18:13:31 2012
|
--- minecraft\net\minecraft\src\ItemMap.java Tue Aug 14 20:15:26 2012
|
||||||
+++ minecraft_patched\net\minecraft\src\ItemMap.java Wed Aug 01 18:27:03 2012
|
+++ minecraft_patched\net\minecraft\src\ItemMap.java Tue Aug 14 20:18:48 2012
|
||||||
@@ -24,7 +24,6 @@
|
@@ -24,7 +24,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -146,9 +146,32 @@ diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\mine
|
||||||
MapData var4 = (MapData)p_77873_2_.func_72943_a(MapData.class, "map_" + p_77873_1_.func_77960_j());
|
MapData var4 = (MapData)p_77873_2_.func_72943_a(MapData.class, "map_" + p_77873_1_.func_77960_j());
|
||||||
if(var4 == null) {
|
if(var4 == null) {
|
||||||
p_77873_1_.func_77964_b(p_77873_2_.func_72841_b("map"));
|
p_77873_1_.func_77964_b(p_77873_2_.func_72841_b("map"));
|
||||||
|
diff -r -U 3 minecraft\net\minecraft\src\RConThreadClient.java minecraft_patched\net\minecraft\src\RConThreadClient.java
|
||||||
|
--- minecraft\net\minecraft\src\RConThreadClient.java Tue Aug 14 20:15:27 2012
|
||||||
|
+++ minecraft_patched\net\minecraft\src\RConThreadClient.java Tue Aug 14 20:18:48 2012
|
||||||
|
@@ -40,13 +40,13 @@
|
||||||
|
|
||||||
|
BufferedInputStream var1 = new BufferedInputStream(this.field_72659_h.getInputStream());
|
||||||
|
int var2 = var1.read(this.field_72660_i, 0, 1460);
|
||||||
|
- if(10 <= var2) {
|
||||||
|
- byte var3 = 0;
|
||||||
|
- int var4 = RConUtils.func_72665_b(this.field_72660_i, 0, var2);
|
||||||
|
- if(var4 != var2 - 4) {
|
||||||
|
- return;
|
||||||
|
- }
|
||||||
|
+ if(10 > var2) {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
+ byte var3 = 0;
|
||||||
|
+ int var4 = RConUtils.func_72665_b(this.field_72660_i, 0, var2);
|
||||||
|
+ if(var4 == var2 - 4) {
|
||||||
|
int var21 = var3 + 4;
|
||||||
|
int var5 = RConUtils.func_72665_b(this.field_72660_i, var21, var2);
|
||||||
|
var21 += 4;
|
||||||
diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
|
diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
|
||||||
--- minecraft\net\minecraft\src\RenderGlobal.java Wed Aug 01 18:13:32 2012
|
--- minecraft\net\minecraft\src\RenderGlobal.java Tue Aug 14 20:15:27 2012
|
||||||
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java Wed Aug 01 18:33:03 2012
|
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java Tue Aug 14 20:18:48 2012
|
||||||
@@ -1431,7 +1431,7 @@
|
@@ -1431,7 +1431,7 @@
|
||||||
double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
|
double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
|
||||||
double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
|
double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
|
||||||
|
@ -159,8 +182,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net
|
||||||
this.field_72777_q.field_71452_i.func_78873_a(var21 = new EntityHugeExplodeFX(this.field_72769_h, p_72726_2_, p_72726_4_, p_72726_6_, p_72726_8_, p_72726_10_, p_72726_12_));
|
this.field_72777_q.field_71452_i.func_78873_a(var21 = new EntityHugeExplodeFX(this.field_72769_h, p_72726_2_, p_72726_4_, p_72726_6_, p_72726_8_, p_72726_10_, p_72726_12_));
|
||||||
} else if(p_72726_1_.equals("largeexplode")) {
|
} else if(p_72726_1_.equals("largeexplode")) {
|
||||||
diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
|
diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
|
||||||
--- minecraft\net\minecraft\src\TcpMasterThread.java Wed Aug 01 18:13:32 2012
|
--- minecraft\net\minecraft\src\TcpMasterThread.java Tue Aug 14 20:15:27 2012
|
||||||
+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java Wed Aug 01 18:27:42 2012
|
+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java Tue Aug 14 20:18:48 2012
|
||||||
@@ -11,6 +11,7 @@
|
@@ -11,6 +11,7 @@
|
||||||
this.field_74504_a = p_i3285_1_;
|
this.field_74504_a = p_i3285_1_;
|
||||||
}
|
}
|
||||||
|
@ -170,8 +193,8 @@ diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\
|
||||||
try {
|
try {
|
||||||
Thread.sleep(5000L);
|
Thread.sleep(5000L);
|
||||||
diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
|
diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
|
||||||
--- minecraft\net\minecraft\src\ThreadedFileIOBase.java Wed Aug 01 18:13:32 2012
|
--- minecraft\net\minecraft\src\ThreadedFileIOBase.java Tue Aug 14 20:15:27 2012
|
||||||
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Wed Aug 01 18:28:10 2012
|
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Tue Aug 14 20:18:48 2012
|
||||||
@@ -20,7 +20,9 @@
|
@@ -20,7 +20,9 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
|
diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
|
||||||
--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java Wed Aug 01 18:15:36 2012
|
--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java Tue Aug 14 20:16:02 2012
|
||||||
+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Wed Aug 01 18:26:32 2012
|
+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Tue Aug 14 20:19:30 2012
|
||||||
@@ -11,6 +11,10 @@
|
@@ -11,6 +11,10 @@
|
||||||
|
|
||||||
public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
|
public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
|
||||||
|
@ -13,18 +13,18 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.jav
|
||||||
if(this.field_74885_f != 2 && this.field_74885_f != 3) {
|
if(this.field_74885_f != 2 && this.field_74885_f != 3) {
|
||||||
this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
|
this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
|
||||||
diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java
|
diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java
|
||||||
--- minecraft_server\net\minecraft\src\DedicatedServer.java Wed Aug 01 18:15:36 2012
|
--- minecraft_server\net\minecraft\src\DedicatedServer.java Tue Aug 14 20:16:03 2012
|
||||||
+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java Wed Aug 01 18:31:22 2012
|
+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java Tue Aug 14 20:24:26 2012
|
||||||
@@ -184,7 +184,7 @@
|
@@ -184,7 +184,7 @@
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- protected CrashReport func_71230_b(CrashReport p_71230_1_) {
|
- protected CrashReport func_71230_b(CrashReport p_71230_1_) {
|
||||||
+ public CrashReport func_71230_b(CrashReport p_71230_1_) {
|
+ public CrashReport func_71230_b(CrashReport p_71230_1_) {
|
||||||
|
p_71230_1_ = super.func_71230_b(p_71230_1_);
|
||||||
p_71230_1_.func_71500_a("Type", new CallableType(this));
|
p_71230_1_.func_71500_a("Type", new CallableType(this));
|
||||||
return super.func_71230_b(p_71230_1_);
|
return p_71230_1_;
|
||||||
}
|
@@ -194,7 +194,7 @@
|
||||||
@@ -193,7 +193,7 @@
|
|
||||||
System.exit(0);
|
System.exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,8 +34,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_s
|
||||||
this.func_71333_ah();
|
this.func_71333_ah();
|
||||||
}
|
}
|
||||||
diff -r -U 3 minecraft_server\net\minecraft\src\ItemMap.java minecraft_server_patched\net\minecraft\src\ItemMap.java
|
diff -r -U 3 minecraft_server\net\minecraft\src\ItemMap.java minecraft_server_patched\net\minecraft\src\ItemMap.java
|
||||||
--- minecraft_server\net\minecraft\src\ItemMap.java Wed Aug 01 18:15:37 2012
|
--- minecraft_server\net\minecraft\src\ItemMap.java Tue Aug 14 20:16:03 2012
|
||||||
+++ minecraft_server_patched\net\minecraft\src\ItemMap.java Wed Aug 01 18:27:23 2012
|
+++ minecraft_server_patched\net\minecraft\src\ItemMap.java Tue Aug 14 20:19:30 2012
|
||||||
@@ -24,7 +24,6 @@
|
@@ -24,7 +24,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -45,8 +45,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ItemMap.java minecraft_server_pa
|
||||||
if(var4 == null) {
|
if(var4 == null) {
|
||||||
p_77873_1_.func_77964_b(p_77873_2_.func_72841_b("map"));
|
p_77873_1_.func_77964_b(p_77873_2_.func_72841_b("map"));
|
||||||
diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_server_patched\net\minecraft\src\TcpMasterThread.java
|
diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_server_patched\net\minecraft\src\TcpMasterThread.java
|
||||||
--- minecraft_server\net\minecraft\src\TcpMasterThread.java Wed Aug 01 18:15:38 2012
|
--- minecraft_server\net\minecraft\src\TcpMasterThread.java Tue Aug 14 20:16:03 2012
|
||||||
+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java Wed Aug 01 18:28:41 2012
|
+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java Tue Aug 14 20:19:30 2012
|
||||||
@@ -11,6 +11,7 @@
|
@@ -11,6 +11,7 @@
|
||||||
this.field_74504_a = p_i3285_1_;
|
this.field_74504_a = p_i3285_1_;
|
||||||
}
|
}
|
||||||
|
@ -56,8 +56,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_s
|
||||||
try {
|
try {
|
||||||
Thread.sleep(5000L);
|
Thread.sleep(5000L);
|
||||||
diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
|
diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
|
||||||
--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java Wed Aug 01 18:15:38 2012
|
--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java Tue Aug 14 20:16:03 2012
|
||||||
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java Wed Aug 01 18:28:56 2012
|
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java Tue Aug 14 20:19:30 2012
|
||||||
@@ -20,7 +20,9 @@
|
@@ -20,7 +20,9 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
[VERSION]
|
[VERSION]
|
||||||
MCPVersion = 7.0a
|
MCPVersion = 7.2
|
||||||
ClientVersion = 1.3.1
|
ClientVersion = 1.3.2
|
||||||
ServerVersion = 1.3.1
|
ServerVersion = 1.3.2
|
||||||
|
|
|
@ -61,8 +61,8 @@ def pre_decompile(mcp_dir, fml_dir):
|
||||||
with open(server_jar, 'rb') as fh:
|
with open(server_jar, 'rb') as fh:
|
||||||
md5_s = md5(fh.read()).hexdigest()
|
md5_s = md5(fh.read()).hexdigest()
|
||||||
|
|
||||||
clean_c = "266ccbc9798afd2eadf3d6c01b4c562a"
|
clean_c = "969699f13e5bbe7f12e40ac4f32b7d9a"
|
||||||
clean_s = "f44a3cfe6ec35b1ac3f2b635e73d96fe"
|
clean_s = "c047f82522e53f2ec3c6b64304dfad0f"
|
||||||
|
|
||||||
if not md5_c == clean_c:
|
if not md5_c == clean_c:
|
||||||
print 'Warning, Modified Client jar detected'
|
print 'Warning, Modified Client jar detected'
|
||||||
|
|
Loading…
Reference in New Issue