diff --git a/forge/conf/patches/me.java b/forge/conf/patches/ga.java similarity index 89% rename from forge/conf/patches/me.java rename to forge/conf/patches/ga.java index df7f73b931..1c96ef7d87 100644 --- a/forge/conf/patches/me.java +++ b/forge/conf/patches/ga.java @@ -1,6 +1,6 @@ // this is needed for the sound engine to work with deobfuscated sourcecode without crashing -public class me +public class ga { public static int c(double d) { diff --git a/forge/conf/patches/minecraft_osx.patch b/forge/conf/patches/minecraft_osx.patch new file mode 100644 index 0000000000..063d60efae --- /dev/null +++ b/forge/conf/patches/minecraft_osx.patch @@ -0,0 +1,54 @@ +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 --git a/forge/conf/patches/minecraft_server_osx.patch b/forge/conf/patches/minecraft_server_osx.patch new file mode 100644 index 0000000000..19f7a51816 --- /dev/null +++ b/forge/conf/patches/minecraft_server_osx.patch @@ -0,0 +1,60 @@ +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; + } diff --git a/forge/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch b/forge/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch deleted file mode 100644 index ca03dd7a4a..0000000000 --- a/forge/patches/minecraft/net/minecraft/src/Packet100OpenWindow.java.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 -@@ -30,9 +30,9 @@ - throws IOException - { - windowId = datainputstream.readByte(); -- inventoryType = datainputstream.readByte(); -+ inventoryType = datainputstream.readByte()&0xFF; - windowTitle = readString(datainputstream, 16); -- slotsCount = datainputstream.readByte(); -+ slotsCount = datainputstream.readByte()&0xFF; - } - - public void writePacketData(DataOutputStream dataoutputstream) diff --git a/forge/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch b/forge/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch deleted file mode 100644 index 4a9e792aae..0000000000 --- a/forge/patches/minecraft/net/minecraft/src/Packet24MobSpawn.java.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 -@@ -15,7 +15,7 @@ - { - - public int entityId; -- public byte type; -+ public int type; - public int xPosition; - public int yPosition; - public int zPosition; -@@ -44,7 +44,7 @@ - throws IOException - { - entityId = datainputstream.readInt(); -- type = datainputstream.readByte(); -+ type = datainputstream.readByte() & 0xFF; - xPosition = datainputstream.readInt(); - yPosition = datainputstream.readInt(); - zPosition = datainputstream.readInt(); diff --git a/forge/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch deleted file mode 100644 index 9eda3eae1f..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/Packet100OpenWindow.java.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Packet100OpenWindow.java 0000-00-00 00:00:00.000000000 -0000 -@@ -38,9 +38,9 @@ - throws IOException - { - windowId = datainputstream.readByte(); -- inventoryType = datainputstream.readByte(); -+ inventoryType = datainputstream.readByte()&0xFF; - windowTitle = readString(datainputstream, 16); -- slotsCount = datainputstream.readByte(); -+ slotsCount = datainputstream.readByte()&0xFF; - } - - public void writePacketData(DataOutputStream dataoutputstream) diff --git a/forge/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch deleted file mode 100644 index 886ae732c3..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/Packet24MobSpawn.java.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Packet24MobSpawn.java 0000-00-00 00:00:00.000000000 -0000 -@@ -15,7 +15,7 @@ - { - - public int entityId; -- public byte type; -+ public int type; - public int xPosition; - public int yPosition; - public int zPosition; -@@ -44,7 +44,7 @@ - throws IOException - { - entityId = datainputstream.readInt(); -- type = datainputstream.readByte(); -+ type = datainputstream.readByte() & 0xFF; - xPosition = datainputstream.readInt(); - yPosition = datainputstream.readInt(); - zPosition = datainputstream.readInt(); diff --git a/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch b/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch deleted file mode 100644 index 1547e7a4bf..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 -@@ -183,12 +183,11 @@ - sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); - for(int k = 0; k < numBlocksToUpdate; k++) - { -- int j1 = chunkX * 16 + (numBlocksToUpdate >> 12 & 0xf); -- int i2 = numBlocksToUpdate & 0xff; -- int k2 = chunkZ * 16 + (numBlocksToUpdate >> 8 & 0xf); -+ int j1 = chunkX * 16 + (blocksToUpdate[k] >> 12 & 0xf); -+ int i2 = blocksToUpdate[k] & 0xff; -+ int k2 = chunkZ * 16 + (blocksToUpdate[k] >> 8 & 0xf); - if(Block.isBlockContainer[worldserver.getBlockId(j1, i2, k2)]) - { -- System.out.println("Sending!"); - updateTileEntity(worldserver.getBlockTileEntity(j1, i2, k2)); - } - }