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

Conf for 1.2.3

This commit is contained in:
LexManos 2012-03-04 03:06:56 -08:00
parent 8478ff83aa
commit 0599b29eb9
19 changed files with 57133 additions and 17643 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
forge/conf/astyle.cfg Normal file
View File

@ -0,0 +1,19 @@
# Artistic Style format configuration
# see http://astyle.sourceforge.net/astyle.html
style=allman
add-brackets
break-closing-brackets
indent-switches
max-instatement-indent=2
pad-oper
pad-header
unpad-paren
break-blocks
delete-empty-lines

1649
forge/conf/classes.csv
View File

File diff suppressed because it is too large Load Diff

7754
forge/conf/client.exc
View File

File diff suppressed because it is too large Load Diff

11560
forge/conf/client.srg Normal file
View File

File diff suppressed because it is too large Load Diff

11604
forge/conf/fields.csv
View File

File diff suppressed because it is too large Load Diff

60
forge/conf/mcp.cfg
View File

@ -8,8 +8,9 @@ DirReobf = reobf
DirConf = conf
DirRuntime = runtime
DirLib = lib
DirFFOut = temp/ffout
DirBinOut = temp/bin
DirTempSrc = temp/src
DirTempCls = temp/cls
DirTempBin = temp/bin
DirModSrc = modsrc
DirEclipse = eclipse
@ -17,17 +18,25 @@ DirEclipse = eclipse
Classes = %(DirConf)s/classes.csv
Methods = %(DirConf)s/methods.csv
Fields = %(DirConf)s/fields.csv
Params = %(DirConf)s/params.csv
[SRGS]
Client = %(DirTemp)s/client_rg.srg
Server = %(DirTemp)s/server_rg.srg
ConfClient = %(DirConf)s/client.srg
ConfServer = %(DirConf)s/server.srg
Client = %(DirTemp)s/client_rg.srg
Server = %(DirTemp)s/server_rg.srg
DeobfClient = %(DirTemp)s/client_deobf.srg
DeobfServer = %(DirTemp)s/server_deobf.srg
ReobfClient = %(DirTemp)s/client_ro.srg
ReobfServer = %(DirTemp)s/server_ro.srg
[JAR]
DirNatives = %(DirJars)s/bin/natives
Client = %(DirJars)s/bin/minecraft.jar
Server = %(DirJars)s/minecraft_server.jar
MD5Client = e92302d2acdba7c97e0d8df1e10d2006
MD5Server = b0f4fb91f9723104adf35944bbf3d3cf
LWJGL = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
MD5Client = 12f6c4b1bdcc63f029e3c088a364b8e4
MD5Server = 2604b805012028d522c3f8abe93d36c5
[RETROGUARD]
Location = %(DirRuntime)s/bin/retroguard.jar
@ -43,6 +52,7 @@ ClientLog = %(DirLogs)s/client_rg.log
ServerLog = %(DirLogs)s/server_rg.log
ClientDeobLog = %(DirLogs)s/client_deob.log
ServerDeobLog = %(DirLogs)s/server_deob.log
NullPkg = net/minecraft/src
[EXCEPTOR]
XClientCfg = %(DirConf)s/client.exc
@ -53,15 +63,15 @@ XClientLog = %(DirLogs)s/client_exc.log
XServerLog = %(DirLogs)s/server_exc.log
[DECOMPILE]
FFClientOut = %(DirFFOut)s/client
FFServerOut = %(DirFFOut)s/server
FFClientSrc = %(DirFFOut)s/minecraft_exc.jar
FFServerSrc = %(DirFFOut)s/minecraft_server_exc.jar
ClsClientTemp = %(DirTempCls)s/minecraft
ClsServerTemp = %(DirTempCls)s/minecraft_server
SrcClientTemp = %(DirTempSrc)s/minecraft
SrcServerTemp = %(DirTempSrc)s/minecraft_server
FFSource = net
[OUTPUT]
BinClient = %(DirBinOut)s/minecraft
BinServer = %(DirBinOut)s/minecraft_server
BinClientTemp = %(DirTempBin)s/minecraft
BinServerTemp = %(DirTempBin)s/minecraft_server
SrcClient = %(DirSrc)s/minecraft
SrcServer = %(DirSrc)s/minecraft_server
TestClient = net/minecraft/client/Minecraft
@ -79,17 +89,20 @@ PatchServer_osx = %(DirConf)s/patches/minecraft_server_osx.patch
[RECOMPILE]
BinClient = %(DirBin)s/minecraft
BinServer = %(DirBin)s/minecraft_server
LogClient = %(DirLogs)s/client_compile.log
LogServer = %(DirLogs)s/server_compile.log
ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
ClientFixes = %(DirConf)s/patches
FixSound = gh
FixStart = Start
IgnorePkg = paulscode,com/jcraft,isom,ibxm,de/matthiasmann/twl,org/xmlpull,javax/xml
[REOBF]
MD5Client = %(DirTemp)s/client.md5
MD5Server = %(DirTemp)s/server.md5
MD5PreReobfClient = %(DirTemp)s/client_reobf.md5
MD5PreReobfServer = %(DirTemp)s/server_reobf.md5
ObfSRGClient = %(DirTemp)s/client_ro.srg
ObfSRGServer = %(DirTemp)s/server_ro.srg
RecompJarClient = %(DirTemp)s/client_recomp.jar
RecompJarServer = %(DirTemp)s/server_recomp.jar
ObfJarClient = %(DirTemp)s/client_reobf.jar
@ -100,10 +113,6 @@ ClientRoLog = %(DirLogs)s/client_ro.log
ServerRoLog = %(DirLogs)s/server_ro.log
ReobfClientLog = %(DirLogs)s/client_reob.log
ReobfServerLog = %(DirLogs)s/server_reob.log
FixSound = ga
FixStart = Start
NullPkg = net/minecraft/src
IgnorePkg = paulscode,com/jcraft,isom,ibxm,de/matthiasmann/twl,org/xmlpull,javax/xml
[GETMODSOURCE]
OutSRCClient = %(DirModSrc)s/minecraft
@ -114,27 +123,32 @@ LogFile = %(DirLogs)s/mcp.log
LogFileErr = %(DirLogs)s/mcperr.log
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
RGIndex = 48000
ParamIndex = 1000
[ASTYLE]
AstyleConfig = %(DirConf)s/astyle.cfg
[COMMANDS]
Wine = wine
Patcher_win = %(DirRuntime)s/bin/applydiff.exe
Patcher_linux = patch
Patcher_osx = patch
Jad_win = %(DirRuntime)s/bin/jad.exe
Jad_linux = wine %(DirRuntime)s/bin/jad.exe
Jad_osx = %(DirRuntime)s/bin/jad-osx
AStyle_win = %(DirRuntime)s/bin/astyle.exe
AStyle_linux = wine %(DirRuntime)s/bin/astyle.exe
AStyle_linux = astyle
AStyle_osx = %(DirRuntime)s/bin/astyle-osx
JadRetro = %(DirRuntime)s/bin/jadretro.jar
Fernflower = %(DirRuntime)s/bin/fernflower.jar
Exceptor = %(DirRuntime)s/bin/exceptor.jar
Exceptor = %(DirRuntime)s/bin/mcinjector.jar
CmdPatch = %s -p1 -u -i {patchfile} -d {srcdir}
CmdJad = %s -b -d {outdir} -dead -o -r -s .java -stat -ff {classes}
CmdAStyle = %s -A1s4CSKYm1M1pHjcnqz2 {classes}
CmdAStyle = %s --suffix=none --quiet --options={conffile} {classes}
CmdRG = %s -cp "{classpath}" RetroGuard -searge {conffile}
CmdRGReobf = %s -cp "{classpath}" RetroGuard -notch {conffile}
CmdJadretro = %s -jar %s {targetdir}
CmdFernflower = %s -jar %s -rbr=0 -dgs=1 -asc=1 -log=WARN {jarin} {jarout}
CmdFernflower = %s -jar %s -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
CmdExceptor = %s -jar %s {input} {output} {conf} {log}
CmdRecomp = %s -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
CmdStartSrv = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer

9616
forge/conf/methods.csv
View File

File diff suppressed because it is too large Load Diff

13079
forge/conf/params.csv Normal file
View File

File diff suppressed because it is too large Load Diff

36
forge/conf/patches/Start.java
View File

@ -5,23 +5,23 @@ import net.minecraft.client.Minecraft;
public class Start
{
public static void main(String[] args)
{
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("minecraftDir");
Field.setAccessible(new Field[] { f }, true);
f.set(null, new File("."));
}
catch (Exception e)
{
e.printStackTrace();
return;
}
public static void main(String[] args)
{
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_6275_Z");
Field.setAccessible(new Field[] { f }, true);
f.set(null, new File("."));
}
catch (Exception e)
{
e.printStackTrace();
return;
}
// start minecraft game application
Minecraft.main(args);
}
// start minecraft game application
Minecraft.main(args);
}
}

2
forge/conf/patches/ga.java → forge/conf/patches/gh.java
View File

@ -1,6 +1,6 @@
// this is needed for the sound engine to work with deobfuscated sourcecode without crashing
public class ga
public class gh
{
public static int c(double d)
{

3092
forge/conf/patches/minecraft.patch
View File

File diff suppressed because it is too large Load Diff

87
forge/conf/patches/minecraft_ff.patch
View File

@ -1,7 +1,7 @@
diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
--- minecraft\net\minecraft\client\Minecraft.java Fri Jan 13 17:44:46 2012
+++ minecraft_patched\net\minecraft\client\Minecraft.java Fri Jan 13 17:35:06 2012
@@ -1609,11 +1609,13 @@
--- minecraft\net\minecraft\client\Minecraft.java Sat Mar 03 17:30:19 2012
+++ minecraft_patched\net\minecraft\client\Minecraft.java Sat Mar 03 17:35:46 2012
@@ -1626,11 +1626,13 @@
this.field_6324_e.func_600_a(var6.field_22395_a + var10, 64, var6.field_22396_c + var8);
if(!this.field_6327_b.func_35643_e()) {
@ -15,9 +15,21 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
}
}
}
@@ -1746,7 +1748,11 @@
}
public static void func_6269_a(String p_6269_0_, String p_6269_1_) {
+ try {
func_6253_a(p_6269_0_, p_6269_1_, (String)null);
+ }
+ catch (LWJGLException e) {
+ }
}
public static void func_6253_a(String p_6253_0_, String p_6253_1_, String p_6253_2_) throws LWJGLException {
diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
--- minecraft\net\minecraft\src\CodecMus.java Fri Jan 13 17:44:20 2012
+++ minecraft_patched\net\minecraft\src\CodecMus.java Fri Jan 13 17:35:06 2012
--- minecraft\net\minecraft\src\CodecMus.java Sat Mar 03 17:30:19 2012
+++ minecraft_patched\net\minecraft\src\CodecMus.java Sat Mar 03 17:32:07 2012
@@ -1,5 +1,6 @@
package net.minecraft.src;
@ -29,9 +41,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\min
public class CodecMus extends CodecJOrbis {
protected InputStream openInputStream() {
- return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
+ try {
+ return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
+ }
+ catch (IOException e) {
+ return null;
@ -39,27 +50,27 @@ diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\min
}
}
diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\minecraft\src\ItemMap.java
--- minecraft\net\minecraft\src\ItemMap.java Fri Jan 13 17:43:42 2012
+++ minecraft_patched\net\minecraft\src\ItemMap.java Fri Jan 13 17:35:06 2012
--- minecraft\net\minecraft\src\ItemMap.java Sat Mar 03 17:30:20 2012
+++ minecraft_patched\net\minecraft\src\ItemMap.java Sat Mar 03 17:32:07 2012
@@ -19,7 +19,6 @@
}
public static MapData func_28013_a(short var0, World var1) {
- "map_" + var0;
MapData var3 = (MapData)var1.func_28103_a(MapData.class, "map_" + var0);
public static MapData func_28013_a(short p_28013_0_, World p_28013_1_) {
- "map_" + p_28013_0_;
MapData var3 = (MapData)p_28013_1_.func_28103_a(MapData.class, "map_" + p_28013_0_);
if(var3 == null) {
int var4 = var1.func_28101_b("map");
int var4 = p_28013_1_.func_28101_b("map");
@@ -32,7 +31,6 @@
}
public MapData func_28012_a(ItemStack var1, World var2) {
- "map_" + var1.func_21181_i();
MapData var4 = (MapData)var2.func_28103_a(MapData.class, "map_" + var1.func_21181_i());
public MapData func_28012_a(ItemStack p_28012_1_, World p_28012_2_) {
- "map_" + p_28012_1_.func_21181_i();
MapData var4 = (MapData)p_28012_2_.func_28103_a(MapData.class, "map_" + p_28012_1_.func_21181_i());
if(var4 == null) {
var1.func_28156_b(var2.func_28101_b("map"));
p_28012_1_.func_28156_b(p_28012_2_.func_28101_b("map"));
diff -r -U 3 minecraft\net\minecraft\src\MusInputStream.java minecraft_patched\net\minecraft\src\MusInputStream.java
--- minecraft\net\minecraft\src\MusInputStream.java Fri Jan 13 17:42:36 2012
+++ minecraft_patched\net\minecraft\src\MusInputStream.java Fri Jan 13 17:35:06 2012
--- minecraft\net\minecraft\src\MusInputStream.java Sat Mar 03 17:30:20 2012
+++ minecraft_patched\net\minecraft\src\MusInputStream.java Sat Mar 03 17:32:07 2012
@@ -1,5 +1,6 @@
package net.minecraft.src;
@ -67,42 +78,40 @@ diff -r -U 3 minecraft\net\minecraft\src\MusInputStream.java minecraft_patched\n
import java.io.InputStream;
import java.net.URL;
import net.minecraft.src.CodecMus;
@@ -28,7 +29,12 @@
@@ -27,7 +28,12 @@
}
public int read(byte[] var1, int var2, int var3) {
- var3 = this.field_1515_d.read(var1, var2, var3);
public int read(byte[] p_read_1_, int p_read_2_, int p_read_3_) {
+ try {
+ var3 = this.field_1515_d.read(var1, var2, var3);
p_read_3_ = this.field_1515_d.read(p_read_1_, p_read_2_, p_read_3_);
+ }
+ catch (IOException e) {
+ return 0;
+ }
for(int var4 = 0; var4 < var3; ++var4) {
byte var5 = var1[var2 + var4] = (byte)(var1[var2 + var4] ^ this.field_1516_c >> 8);
for(int var4 = 0; var4 < p_read_3_; ++var4) {
byte var5 = p_read_1_[p_read_2_ + var4] = (byte)(p_read_1_[p_read_2_ + var4] ^ this.field_1516_c >> 8);
diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
--- minecraft\net\minecraft\src\RenderGlobal.java Fri Jan 13 17:43:24 2012
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java Fri Jan 13 17:35:06 2012
@@ -1466,7 +1466,7 @@
double var15 = this.field_1439_t.field_22009_h.field_611_ak - var2;
double var17 = this.field_1439_t.field_22009_h.field_610_al - var4;
double var19 = this.field_1439_t.field_22009_h.field_609_am - var6;
--- minecraft\net\minecraft\src\RenderGlobal.java Sat Mar 03 17:30:20 2012
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java Sat Mar 03 17:32:07 2012
@@ -1458,7 +1458,7 @@
double var15 = this.field_1439_t.field_22009_h.field_611_ak - p_40193_2_;
double var17 = this.field_1439_t.field_22009_h.field_610_al - p_40193_4_;
double var19 = this.field_1439_t.field_22009_h.field_609_am - p_40193_6_;
- Object var21 = null;
+ EntityFX var21 = null;
if(var1.equals("hugeexplosion")) {
this.field_1439_t.field_6321_h.func_1192_a(var21 = new EntityHugeExplodeFX(this.field_1448_k, var2, var4, var6, var8, var10, var12));
} else if(var1.equals("largeexplode")) {
if(p_40193_1_.equals("hugeexplosion")) {
this.field_1439_t.field_6321_h.func_1192_a(var21 = new EntityHugeExplodeFX(this.field_1448_k, p_40193_2_, p_40193_4_, p_40193_6_, p_40193_8_, p_40193_10_, p_40193_12_));
} else if(p_40193_1_.equals("largeexplode")) {
diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
--- minecraft\net\minecraft\src\ThreadedFileIOBase.java Fri Jan 13 17:43:00 2012
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Fri Jan 13 17:35:06 2012
@@ -21,7 +21,9 @@
--- minecraft\net\minecraft\src\ThreadedFileIOBase.java Sat Mar 03 17:30:20 2012
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Sat Mar 03 17:32:07 2012
@@ -20,7 +20,9 @@
}
public void run() {
- this.func_40568_b();
+ while (true) {
+ this.func_40568_b();
this.func_40568_b();
+ }
}

66
forge/conf/patches/minecraft_osx.patch
View File

@ -1,54 +1,12 @@
diff -r -U 3 minecraft\net\minecraft\src\EntityMinecart.java minecraft_patched\net\minecraft\src\EntityMinecart.java
--- minecraft\net\minecraft\src\EntityMinecart.java Sat Jan 14 16:05:10 2012
+++ minecraft_patched\net\minecraft\src\EntityMinecart.java Sat Jan 14 16:07:41 2012
@@ -811,7 +811,7 @@
double d = entity.field_611_ak - field_611_ak;
double d1 = entity.field_609_am - field_609_am;
double d2 = d * d + d1 * d1;
- if(d2 >= 9.9999997473787516E-05D)
+ if(d2 >= 9.9999997473787516E-005D)
{
d2 = MathHelper.func_1109_a(d2);
d /= d2;
diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
--- minecraft\net\minecraft\src\RenderGlobal.java Sat Jan 14 16:05:10 2012
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java Sat Jan 14 16:07:41 2012
@@ -968,7 +968,7 @@
f3 = f7;
f4 = f8;
}
- float f6 = 0.0004882812F;
+ float f6 = 0.0004882813F;
double d = (float)field_1435_x + f;
double d1 = field_1439_t.field_22009_h.field_9285_at + (field_1439_t.field_22009_h.field_611_ak - field_1439_t.field_22009_h.field_9285_at) * (double)f + d * 0.029999999329447746D;
double d2 = field_1439_t.field_22009_h.field_9283_av + (field_1439_t.field_22009_h.field_609_am - field_1439_t.field_22009_h.field_9283_av) * (double)f;
diff -r -U 3 minecraft\net\minecraft\src\Vec3D.java minecraft_patched\net\minecraft\src\Vec3D.java
--- minecraft\net\minecraft\src\Vec3D.java Sat Jan 14 16:05:10 2012
+++ minecraft_patched\net\minecraft\src\Vec3D.java Sat Jan 14 16:07:41 2012
@@ -137,7 +137,7 @@
double d1 = vec3d.field_1776_a - field_1776_a;
double d2 = vec3d.field_1775_b - field_1775_b;
double d3 = vec3d.field_1779_c - field_1779_c;
- if(d1 * d1 < 1.0000000116860974E-07D)
+ if(d1 * d1 < 1.0000000116860974E-007D)
{
return null;
}
@@ -156,7 +156,7 @@
double d1 = vec3d.field_1776_a - field_1776_a;
double d2 = vec3d.field_1775_b - field_1775_b;
double d3 = vec3d.field_1779_c - field_1779_c;
- if(d2 * d2 < 1.0000000116860974E-07D)
+ if(d2 * d2 < 1.0000000116860974E-007D)
{
return null;
}
@@ -175,7 +175,7 @@
double d1 = vec3d.field_1776_a - field_1776_a;
double d2 = vec3d.field_1775_b - field_1775_b;
double d3 = vec3d.field_1779_c - field_1779_c;
- if(d3 * d3 < 1.0000000116860974E-07D)
+ if(d3 * d3 < 1.0000000116860974E-007D)
{
return null;
}
diff -r -U 3 minecraft/net/minecraft/src/RenderGlobal.java minecraft_patched/net/minecraft/src/RenderGlobal.java
--- minecraft/net/minecraft/src/RenderGlobal.java 2012-02-25 12:51:18.000000000 +1300
+++ minecraft_patched/net/minecraft/src/RenderGlobal.java 2012-02-25 13:13:03.850786399 +1300
@@ -954,7 +954,7 @@
f2 = f6;
f3 = f7;
}
- float f5 = 0.0004882812F;
+ float f5 = 0.0004882813F;
double d = (float)field_1435_x + p_4141_1_;
double d1 = field_1439_t.field_22009_h.field_9285_at + (field_1439_t.field_22009_h.field_611_ak - field_1439_t.field_22009_h.field_9285_at) * (double)p_4141_1_ + d * 0.029999999329447746D;
double d2 = field_1439_t.field_22009_h.field_9283_av + (field_1439_t.field_22009_h.field_609_am - field_1439_t.field_22009_h.field_9283_av) * (double)p_4141_1_;

2056
forge/conf/patches/minecraft_server.patch
View File

File diff suppressed because it is too large Load Diff

22
forge/conf/patches/minecraft_server_ff.patch
View File

@ -1,25 +1,23 @@
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 Fri Jan 13 17:46:22 2012
+++ minecraft_server_patched\net\minecraft\src\ItemMap.java Fri Jan 13 17:37:00 2012
--- minecraft_server\net\minecraft\src\ItemMap.java Sat Mar 03 17:30:52 2012
+++ minecraft_server_patched\net\minecraft\src\ItemMap.java Sat Mar 03 17:32:42 2012
@@ -22,7 +22,6 @@
}
public MapData func_28023_a(ItemStack var1, World var2) {
- "map_" + var1.func_21125_h();
MapData var4 = (MapData)var2.func_28103_a(MapData.class, "map_" + var1.func_21125_h());
public MapData func_28023_a(ItemStack p_28023_1_, World p_28023_2_) {
- "map_" + p_28023_1_.func_21125_h();
MapData var4 = (MapData)p_28023_2_.func_28103_a(MapData.class, "map_" + p_28023_1_.func_21125_h());
if(var4 == null) {
var1.func_28145_b(var2.func_28104_b("map"));
diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_server_patched\net\minecraft\src\RConThreadClient.java
p_28023_1_.func_28145_b(p_28023_2_.func_28104_b("map"));
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 Fri Jan 13 17:45:20 2012
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java Fri Jan 13 17:37:00 2012
@@ -21,7 +21,9 @@
--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java Sat Mar 03 17:30:52 2012
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java Sat Mar 03 17:32:42 2012
@@ -20,7 +20,9 @@
}
public void run() {
- this.func_40509_b();
+ while (true) {
+ this.func_40509_b();
this.func_40509_b();
+ }
}

60
forge/conf/patches/minecraft_server_osx.patch
View File

@ -1,60 +0,0 @@
diff -r -U 3 minecraft_server\net\minecraft\src\EntityMinecart.java minecraft_server_patched\net\minecraft\src\EntityMinecart.java
--- minecraft_server\net\minecraft\src\EntityMinecart.java Sat Jan 14 16:05:25 2012
+++ minecraft_server_patched\net\minecraft\src\EntityMinecart.java Sat Jan 14 16:07:50 2012
@@ -751,7 +751,7 @@
double d = entity.field_322_l - field_322_l;
double d1 = entity.field_320_n - field_320_n;
double d2 = d * d + d1 * d1;
- if(d2 >= 9.9999997473787516E-05D)
+ if(d2 >= 9.9999997473787516E-005D)
{
d2 = MathHelper.func_583_a(d2);
d /= d2;
diff -r -U 3 minecraft_server\net\minecraft\src\GuiStatsComponent.java minecraft_server_patched\net\minecraft\src\GuiStatsComponent.java
--- minecraft_server\net\minecraft\src\GuiStatsComponent.java Sat Jan 14 16:05:25 2012
+++ minecraft_server_patched\net\minecraft\src\GuiStatsComponent.java Sat Jan 14 16:07:50 2012
@@ -43,12 +43,12 @@
System.gc();
field_768_c[0] = (new StringBuilder()).append("Memory use: ").append(l / 1024L / 1024L).append(" mb (").append((Runtime.getRuntime().freeMemory() * 100L) / Runtime.getRuntime().maxMemory()).append("% free)").toString();
field_768_c[1] = (new StringBuilder()).append("Threads: ").append(NetworkManager.field_1052_b).append(" + ").append(NetworkManager.field_1051_c).toString();
- field_768_c[2] = (new StringBuilder()).append("Avg tick: ").append(field_40573_a.format(func_40571_a(field_40572_e.field_40027_f) * 9.9999999999999995E-07D)).append(" ms").toString();
+ field_768_c[2] = (new StringBuilder()).append("Avg tick: ").append(field_40573_a.format(func_40571_a(field_40572_e.field_40027_f) * 9.9999999999999995E-007D)).append(" ms").toString();
i = 0;
_L3:
if(i >= field_40572_e.field_6034_e.length) goto _L2; else goto _L1
_L1:
- field_768_c[3 + i] = (new StringBuilder()).append("Lvl ").append(i).append(" tick: ").append(field_40573_a.format(func_40571_a(field_40572_e.field_40028_g[i]) * 9.9999999999999995E-07D)).append(" ms").toString();
+ field_768_c[3 + i] = (new StringBuilder()).append("Lvl ").append(i).append(" tick: ").append(field_40573_a.format(func_40571_a(field_40572_e.field_40028_g[i]) * 9.9999999999999995E-007D)).append(" ms").toString();
if(field_40572_e.field_6034_e[i] == null || field_40572_e.field_6034_e[i].field_20911_y == null)
{
continue; /* Loop/switch isn't completed */
diff -r -U 3 minecraft_server\net\minecraft\src\Vec3D.java minecraft_server_patched\net\minecraft\src\Vec3D.java
--- minecraft_server\net\minecraft\src\Vec3D.java Sat Jan 14 16:05:25 2012
+++ minecraft_server_patched\net\minecraft\src\Vec3D.java Sat Jan 14 16:07:50 2012
@@ -121,7 +121,7 @@
double d1 = vec3d.field_1055_a - field_1055_a;
double d2 = vec3d.field_1054_b - field_1054_b;
double d3 = vec3d.field_1058_c - field_1058_c;
- if(d1 * d1 < 1.0000000116860974E-07D)
+ if(d1 * d1 < 1.0000000116860974E-007D)
{
return null;
}
@@ -140,7 +140,7 @@
double d1 = vec3d.field_1055_a - field_1055_a;
double d2 = vec3d.field_1054_b - field_1054_b;
double d3 = vec3d.field_1058_c - field_1058_c;
- if(d2 * d2 < 1.0000000116860974E-07D)
+ if(d2 * d2 < 1.0000000116860974E-007D)
{
return null;
}
@@ -159,7 +159,7 @@
double d1 = vec3d.field_1055_a - field_1055_a;
double d2 = vec3d.field_1054_b - field_1054_b;
double d3 = vec3d.field_1058_c - field_1058_c;
- if(d3 * d3 < 1.0000000116860974E-07D)
+ if(d3 * d3 < 1.0000000116860974E-007D)
{
return null;
}

5723
forge/conf/server.exc
View File

File diff suppressed because it is too large Load Diff

8285
forge/conf/server.srg Normal file
View File

File diff suppressed because it is too large Load Diff

6
forge/conf/version.cfg
View File

@ -1,4 +1,4 @@
[VERSION]
MCPVersion = 5.6
ClientVersion = 1.1
ServerVersion = 1.1
MCPVersion = 6.0
ClientVersion = 1.2.3
ServerVersion = 1.2.3