diff --git a/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java b/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java index d5f70448ab..aa6cba744c 100644 --- a/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java +++ b/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java @@ -49,6 +49,7 @@ import cpw.mods.fml.relauncher.IClassTransformer; public class AccessTransformer implements IClassTransformer { + private static final boolean DEBUG = false; private class Modifier { public String name = ""; @@ -162,8 +163,10 @@ public class AccessTransformer implements IClassTransformer if (n.name.equals(m.name)) { n.access = getFixedAccess(n.access, m); - System.out.println(String.format("Field: %s.%s %s -> %s", name, m.name, Integer.toBinaryString(m.oldAccess), - Integer.toBinaryString(m.newAccess))); + if (DEBUG) + { + System.out.println(String.format("Field: %s.%s %s -> %s", name, m.name, toBinary(m.oldAccess), toBinary(m.newAccess))); + } break; } } @@ -175,7 +178,10 @@ public class AccessTransformer implements IClassTransformer if (n.name.equals(m.name) && n.desc.equals(m.desc)) { n.access = getFixedAccess(n.access, m); - System.out.println(String.format("Method: %s.%s%s %s -> %s", name, m.name, m.desc, toBinary(m.oldAccess), toBinary(m.newAccess))); + if (DEBUG) + { + System.out.println(String.format("Method: %s.%s%s %s -> %s", name, m.name, m.desc, toBinary(m.oldAccess), toBinary(m.newAccess))); + } break; } } @@ -237,7 +243,7 @@ public class AccessTransformer implements IClassTransformer if (args.length < 2) { System.out.println("Usage: AccessTransformer [MapFile2]... "); - return; + System.exit(1); } boolean hasTransformer = false; @@ -259,7 +265,7 @@ public class AccessTransformer implements IClassTransformer if (!hasTransformer) { System.out.println("Culd not find a valid transformer to perform"); - return; + System.exit(1); } File orig = new File(args[0]); @@ -267,13 +273,13 @@ public class AccessTransformer implements IClassTransformer if (!orig.exists() && !temp.exists()) { System.out.println("Could not find target jar: " + orig); - return; + System.exit(1); } if (!orig.renameTo(temp)) { System.out.println("Could not rename file: " + orig + " -> " + temp); - return; + System.exit(1); } try @@ -283,6 +289,7 @@ public class AccessTransformer implements IClassTransformer catch (IOException e) { e.printStackTrace(); + System.exit(1); } if (!temp.delete()) diff --git a/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java b/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java index 3f36d20059..4362fa8989 100644 --- a/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java +++ b/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java @@ -25,13 +25,14 @@ public class MCPMerger private static Hashtable servers = new Hashtable(); private static HashSet copyToServer = new HashSet(); private static HashSet copyToClient = new HashSet(); + private static final boolean DEBUG = false; public static void main(String[] args) { if (args.length != 3) { System.out.println("Usage: AccessTransformer "); - return; + System.exit(1); } File map_file = new File(args[0]); @@ -54,31 +55,31 @@ public class MCPMerger if (!client_jar.exists()) { System.out.println("Could not find minecraft.jar: " + client_jar); - return; + System.exit(1); } if (!server_jar.exists()) { System.out.println("Could not find minecraft_server.jar: " + server_jar); - return; + System.exit(1); } if (!client_jar.renameTo(client_jar_tmp)) { System.out.println("Could not rename file: " + client_jar + " -> " + client_jar_tmp); - return; + System.exit(1); } if (!server_jar.renameTo(server_jar_tmp)) { System.out.println("Could not rename file: " + server_jar + " -> " + server_jar_tmp); - return; + System.exit(1); } if (!readMapFile(map_file)) { System.out.println("Could not read map file: " + map_file); - return; + System.exit(1); } try @@ -88,6 +89,7 @@ public class MCPMerger catch (IOException e) { e.printStackTrace(); + System.exit(1); } if (!client_jar_tmp.delete()) @@ -172,7 +174,10 @@ public class MCPMerger } else { - System.out.println("Copy class c->s : " + name); + if (DEBUG) + { + System.out.println("Copy class c->s : " + name); + } copyClass(cInJar, cEntry, cOutJar, sOutJar, true); } continue; @@ -200,7 +205,10 @@ public class MCPMerger } else { - System.out.println("Copy class s->c : " + entry.getKey()); + if (DEBUG) + { + System.out.println("Copy class s->c : " + entry.getKey()); + } copyClass(sInJar, entry.getValue(), cOutJar, sOutJar, false); } } @@ -444,7 +452,10 @@ public class MCPMerger mw.server = this.server | mw.server; this.client = this.client | mw.client; this.server = this.server | mw.server; - System.out.printf(" eq: %s %s\n", this, mw); + if (DEBUG) + { + System.out.printf(" eq: %s %s\n", this, mw); + } } return eq; } @@ -486,13 +497,19 @@ public class MCPMerger serverName = sM.name; if (!serverName.equals(lastName) && cPos != cLen) { - System.out.printf("Server -skip : %s %s %d (%s %d) %d [%s]\n", sClass.name, clientName, cLen - cPos, serverName, sLen - sPos, allMethods.size(), lastName); + if (DEBUG) + { + System.out.printf("Server -skip : %s %s %d (%s %d) %d [%s]\n", sClass.name, clientName, cLen - cPos, serverName, sLen - sPos, allMethods.size(), lastName); + } break; } MethodWrapper mw = new MethodWrapper(sM); mw.server = true; allMethods.add(mw); - System.out.printf("Server *add* : %s %s %d (%s %d) %d [%s]\n", sClass.name, clientName, cLen - cPos, serverName, sLen - sPos, allMethods.size(), lastName); + if (DEBUG) + { + System.out.printf("Server *add* : %s %s %d (%s %d) %d [%s]\n", sClass.name, clientName, cLen - cPos, serverName, sLen - sPos, allMethods.size(), lastName); + } sPos++; } while (sPos < sLen); @@ -507,13 +524,19 @@ public class MCPMerger clientName = cM.name; if (!clientName.equals(lastName) && sPos != sLen) { - System.out.printf("Client -skip : %s %s %d (%s %d) %d [%s]\n", cClass.name, clientName, cLen - cPos, serverName, sLen - sPos, allMethods.size(), lastName); + if (DEBUG) + { + System.out.printf("Client -skip : %s %s %d (%s %d) %d [%s]\n", cClass.name, clientName, cLen - cPos, serverName, sLen - sPos, allMethods.size(), lastName); + } break; } MethodWrapper mw = new MethodWrapper(cM); mw.client = true; allMethods.add(mw); - System.out.printf("Client *add* : %s %s %d (%s %d) %d [%s]\n", cClass.name, clientName, cLen - cPos, serverName, sLen - sPos, allMethods.size(), lastName); + if (DEBUG) + { + System.out.printf("Client *add* : %s %s %d (%s %d) %d [%s]\n", cClass.name, clientName, cLen - cPos, serverName, sLen - sPos, allMethods.size(), lastName); + } cPos++; } while (cPos < cLen); diff --git a/common/cpw/mods/fml/common/asm/transformers/SideTransformer.java b/common/cpw/mods/fml/common/asm/transformers/SideTransformer.java index 0be4e04990..0a8a2d8a61 100644 --- a/common/cpw/mods/fml/common/asm/transformers/SideTransformer.java +++ b/common/cpw/mods/fml/common/asm/transformers/SideTransformer.java @@ -19,6 +19,7 @@ import cpw.mods.fml.relauncher.IClassTransformer; public class SideTransformer implements IClassTransformer { private static String SIDE = FMLRelauncher.side(); + private static final boolean DEBUG = false; @SuppressWarnings("unchecked") @Override public byte[] transform(String name, byte[] bytes) @@ -33,7 +34,10 @@ public class SideTransformer implements IClassTransformer FieldNode field = fields.next(); if (remove((List)field.visibleAnnotations, SIDE)) { - System.out.println("Removing Field: " + field.name); + if (DEBUG) + { + System.out.println(String.format("Removing Field: %s.%s", classNode.name, field.name)); + } fields.remove(); } } @@ -43,7 +47,10 @@ public class SideTransformer implements IClassTransformer MethodNode method = methods.next(); if (remove((List)method.visibleAnnotations, SIDE)) { - System.out.println("Removing Method: " + method.name + " " + method.desc); + if (DEBUG) + { + System.out.println(String.format("Removing Method: %s.%s%s", classNode.name, method.name, method.desc)); + } methods.remove(); } }