From 3e346cb8b24edb9f1aa6d51590ec14ccd59f863a Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 23 Jun 2013 23:06:25 -0700 Subject: [PATCH] Add filter support for MCPMerger, and filter out libraries from the server's 'fat jar'. --- .../fml/common/asm/transformers/MCPMerger.java | 18 ++++++++++++++++-- fml/mcp_merge.cfg | 5 ++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/fml/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java b/fml/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java index bd3d6bde79..1a745134ac 100644 --- a/fml/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java +++ b/fml/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java @@ -58,6 +58,7 @@ public class MCPMerger private static HashSet copyToServer = new HashSet(); private static HashSet copyToClient = new HashSet(); private static HashSet dontAnnotate = new HashSet(); + private static HashSet dontProcess = new HashSet(); private static final boolean DEBUG = false; public static void main(String[] args) @@ -155,7 +156,8 @@ public class MCPMerger { case '!': dontAnnotate.add(line); break; case '<': copyToClient.add(line); break; - case '>': copyToServer.add(line); break; + case '>': copyToServer.add(line); break; + case '^': dontProcess.add(line); break; } } @@ -344,8 +346,20 @@ public class MCPMerger outFile.putNextEntry(entry); continue; } + String entryName = entry.getName(); - if (!entryName.endsWith(".class") || entryName.startsWith(".")) + + boolean filtered = false; + for (String filter : dontProcess) + { + if (entryName.startsWith(filter)) + { + filtered = true; + break; + } + } + + if (filtered || !entryName.endsWith(".class") || entryName.startsWith(".")) { ZipEntry newEntry = new ZipEntry(entry.getName()); outFile.putNextEntry(newEntry); diff --git a/fml/mcp_merge.cfg b/fml/mcp_merge.cfg index 28c5ec2bcf..5324af656a 100644 --- a/fml/mcp_merge.cfg +++ b/fml/mcp_merge.cfg @@ -1 +1,4 @@ -!bjy #net/minecraft/src/CodecMus +^org/bouncycastle +^org/apache +^com/google +^argo