From cd4efe616f238b8452b76e508c655e86fe644ba0 Mon Sep 17 00:00:00 2001 From: LexManos Date: Sat, 4 Aug 2012 02:35:34 -0700 Subject: [PATCH] Add the direct copied files from MCP conf --- conf/astyle.cfg | 19 +++ conf/patches/minecraft_ff.patch | 184 +++++++++++++++++++++++++ conf/patches/minecraft_server_ff.patch | 70 ++++++++++ conf/version.cfg | 4 + forge.py | 8 +- 5 files changed, 281 insertions(+), 4 deletions(-) create mode 100644 conf/astyle.cfg create mode 100644 conf/patches/minecraft_ff.patch create mode 100644 conf/patches/minecraft_server_ff.patch create mode 100644 conf/version.cfg diff --git a/conf/astyle.cfg b/conf/astyle.cfg new file mode 100644 index 000000000..657b4ecbd --- /dev/null +++ b/conf/astyle.cfg @@ -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 diff --git a/conf/patches/minecraft_ff.patch b/conf/patches/minecraft_ff.patch new file mode 100644 index 000000000..407a31478 --- /dev/null +++ b/conf/patches/minecraft_ff.patch @@ -0,0 +1,184 @@ +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_patched\net\minecraft\client\Minecraft.java Wed Aug 01 18:23:13 2012 +@@ -539,9 +539,8 @@ + return; + } + +- while(true) { + try { +- if(this.field_71425_J) { ++ while(this.field_71425_J) { + if(this.field_71434_R && this.field_71433_S != null) { + this.func_71377_b(this.field_71433_S); + return; +@@ -559,7 +558,6 @@ + this.func_71373_a(new GuiMemoryErrorScreen()); + System.gc(); + } +- continue; + } + } catch (MinecraftError var12) { + ; +@@ -577,8 +575,6 @@ + this.func_71405_e(); + } + +- return; +- } + } + + private void func_71411_J() { +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_patched\net\minecraft\src\CodecMus.java Wed Aug 01 18:24:06 2012 +@@ -1,5 +1,6 @@ + package net.minecraft.src; + ++import java.io.IOException; + import java.io.InputStream; + import net.minecraft.src.MusInputStream; + import paulscode.sound.codecs.CodecJOrbis; +@@ -7,6 +8,10 @@ + public class CodecMus extends CodecJOrbis { + + protected InputStream openInputStream() { ++ try { + return new MusInputStream(this, this.url, this.urlConnection.getInputStream()); ++ } catch(IOException ex) { ++ return null; ++ } + } + } +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_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Wed Aug 01 18:26:33 2012 +@@ -11,6 +11,10 @@ + + public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn { + ++ public ComponentStrongholdRightTurn(int p_i3843_1_, Random p_i3843_2_, StructureBoundingBox p_i3843_3_, int p_i3843_4_) { ++ super(p_i3843_1_, p_i3843_2_, p_i3843_3_, p_i3843_4_); ++ } ++ + public void func_74861_a(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_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); +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_patched\net\minecraft\src\DedicatedServer.java Wed Aug 01 18:31:22 2012 +@@ -183,7 +183,7 @@ + + } + +- protected CrashReport func_71230_b(CrashReport p_71230_1_) { ++ public CrashReport func_71230_b(CrashReport p_71230_1_) { + p_71230_1_.func_71500_a("Type", new CallableType(this)); + return super.func_71230_b(p_71230_1_); + } +@@ -192,7 +192,7 @@ + System.exit(0); + } + +- protected void func_71190_q() { ++ public void func_71190_q() { + super.func_71190_q(); + this.func_71333_ah(); + } +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_patched\net\minecraft\src\FontRenderer.java Thu Aug 02 02:37:34 2012 +@@ -711,8 +711,6 @@ + for(boolean var7 = false; var5 < var3; ++var5) { + char var8 = p_78259_1_.charAt(var5); + switch(var8) { +- case 32: +- var6 = var5; + case 167: + if(var5 < var3 - 1) { + ++var5; +@@ -726,6 +724,8 @@ + } + } + break; ++ case 32: ++ var6 = var5; + default: + var4 += this.func_78263_a(var8); + if(var7) { +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_patched\net\minecraft\src\IntegratedServer.java Wed Aug 01 18:32:27 2012 +@@ -97,7 +97,7 @@ + return true; + } + +- protected void func_71217_p() { ++ public void func_71217_p() { + boolean var1 = this.field_71348_o; + this.field_71348_o = this.field_71347_n.func_71752_f(); + if(!var1 && this.field_71348_o) { +@@ -144,7 +144,7 @@ + this.field_71349_l.func_71404_a(p_71228_1_); + } + +- protected CrashReport func_71230_b(CrashReport p_71230_1_) { ++ public CrashReport func_71230_b(CrashReport p_71230_1_) { + p_71230_1_.func_71500_a("Type", new CallableType3(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 +--- minecraft\net\minecraft\src\ItemMap.java Wed Aug 01 18:13:31 2012 ++++ minecraft_patched\net\minecraft\src\ItemMap.java Wed Aug 01 18:27:03 2012 +@@ -24,7 +24,6 @@ + } + + public static MapData func_77874_a(short p_77874_0_, World p_77874_1_) { +- "map_" + p_77874_0_; + MapData var3 = (MapData)p_77874_1_.func_72943_a(MapData.class, "map_" + p_77874_0_); + if(var3 == null) { + int var4 = p_77874_1_.func_72841_b("map"); +@@ -37,7 +36,6 @@ + } + + public MapData func_77873_a(ItemStack p_77873_1_, World p_77873_2_) { +- "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) { + p_77873_1_.func_77964_b(p_77873_2_.func_72841_b("map")); +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_patched\net\minecraft\src\RenderGlobal.java Wed Aug 01 18:33:03 2012 +@@ -1431,7 +1431,7 @@ + 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 var19 = this.field_72777_q.field_71451_h.field_70161_v - p_72726_6_; +- Object var21 = null; ++ EntityFX var21 = null; + if(p_72726_1_.equals("hugeexplosion")) { + 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")) { +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_patched\net\minecraft\src\TcpMasterThread.java Wed Aug 01 18:27:42 2012 +@@ -11,6 +11,7 @@ + this.field_74504_a = p_i3285_1_; + } + ++ @SuppressWarnings("deprecation") + public void run() { + try { + Thread.sleep(5000L); +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_patched\net\minecraft\src\ThreadedFileIOBase.java Wed Aug 01 18:28:10 2012 +@@ -20,7 +20,9 @@ + } + + public void run() { ++ while(true) { + this.func_75736_b(); ++ } + } + + private void func_75736_b() { diff --git a/conf/patches/minecraft_server_ff.patch b/conf/patches/minecraft_server_ff.patch new file mode 100644 index 000000000..a7e76d0ac --- /dev/null +++ b/conf/patches/minecraft_server_ff.patch @@ -0,0 +1,70 @@ +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_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Wed Aug 01 18:26:32 2012 +@@ -11,6 +11,10 @@ + + public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn { + ++ public ComponentStrongholdRightTurn(int p_i3843_1_, Random p_i3843_2_, StructureBoundingBox p_i3843_3_, int p_i3843_4_) { ++ super(p_i3843_1_, p_i3843_2_, p_i3843_3_, p_i3843_4_); ++ } ++ + public void func_74861_a(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_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); +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_patched\net\minecraft\src\DedicatedServer.java Wed Aug 01 18:31:22 2012 +@@ -184,7 +184,7 @@ + + } + +- protected CrashReport func_71230_b(CrashReport p_71230_1_) { ++ public CrashReport func_71230_b(CrashReport p_71230_1_) { + p_71230_1_.func_71500_a("Type", new CallableType(this)); + return super.func_71230_b(p_71230_1_); + } +@@ -193,7 +193,7 @@ + System.exit(0); + } + +- protected void func_71190_q() { ++ public void func_71190_q() { + super.func_71190_q(); + this.func_71333_ah(); + } +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_patched\net\minecraft\src\ItemMap.java Wed Aug 01 18:27:23 2012 +@@ -24,7 +24,6 @@ + } + + public MapData func_77873_a(ItemStack p_77873_1_, World p_77873_2_) { +- "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) { + 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 +--- minecraft_server\net\minecraft\src\TcpMasterThread.java Wed Aug 01 18:15:38 2012 ++++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java Wed Aug 01 18:28:41 2012 +@@ -11,6 +11,7 @@ + this.field_74504_a = p_i3285_1_; + } + ++ @SuppressWarnings("deprecation") + public void run() { + try { + Thread.sleep(5000L); +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_patched\net\minecraft\src\ThreadedFileIOBase.java Wed Aug 01 18:28:56 2012 +@@ -20,7 +20,9 @@ + } + + public void run() { ++ while(true) { + this.func_75736_b(); ++ } + } + + private void func_75736_b() { diff --git a/conf/version.cfg b/conf/version.cfg new file mode 100644 index 000000000..e6cad0ca3 --- /dev/null +++ b/conf/version.cfg @@ -0,0 +1,4 @@ +[VERSION] +MCPVersion = 7.0a +ClientVersion = 1.3.1 +ServerVersion = 1.3.1 diff --git a/forge.py b/forge.py index 282d2a850..51e0a5762 100644 --- a/forge.py +++ b/forge.py @@ -110,19 +110,19 @@ def apply_forge_patches(fml_dir, mcp_dir, forge_dir, src_dir, copy_files=True): def get_conf_copy(mcp_dir, forge_dir): #Lets grab the files we dont work on for file in ['astyle.cfg', 'version.cfg', 'patches/minecraft_ff.patch', 'patches/minecraft_server_ff.patch']: - dest_file = os.path.normpath(os.path.join(forge_dir, 'conf', file)) + dst_file = os.path.normpath(os.path.join(forge_dir, 'conf', file)) src_file = os.path.normpath(os.path.join(mcp_dir, 'conf', file)) if os.path.exists(dst_file): os.remove(dst_file) - shutil.copy(src_file, dst_dir) + shutil.copy(src_file, dst_file) print 'Grabbing: ' + src_file gen_merged_srg(mcp_dir, forge_dir) gen_merged_exc(mcp_dir, forge_dir) - gen_merged_fields(os.path.join(mcp_dir, 'conf', 'client.srg'), os.path.join(mcp_dir, 'conf', 'fields.csv')) + #gen_merged_fields(os.path.join(mcp_dir, 'conf', 'client.srg'), os.path.join(mcp_dir, 'conf', 'fields.csv')) -def gen_merged_rg(mcp_dir, forge_dir): +def gen_merged_srg(mcp_dir, forge_dir): print 'Generating merged Retroguard data' srg_client = os.path.join(mcp_dir, 'conf', 'client.srg') srg_server = os.path.join(mcp_dir, 'conf', 'server.srg')