Make Interface sorting opt-in

Author: LexManos

src/main/java/net/minecraftforge/mergetool/ConsoleMerger.java

@@ -76,6 +76,7 @@ private static void merge(String[] args) {
         OptionSpec<Boolean> inject = parser.accepts("inject").withOptionalArg().ofType(Boolean.class).defaultsTo(true);
         OptionSpec<Void> data = parser.accepts("keep-data");
         OptionSpec<Void> meta = parser.accepts("keep-meta");
+        OptionSpec<Void> sortInterfaces = parser.accepts("sort-interfaces");
         OptionSpec<AnnotationVersion> anno = parser.accepts("ann").withOptionalArg().ofType(AnnotationVersion.class).withValuesConvertedBy(AnnotationReader).defaultsTo(AnnotationVersion.API);
         OptionSpec<String> whitelist    = parser.accepts("whitelist").withRequiredArg().ofType(String.class);
         OptionSpec<String> whitelistPkg = parser.accepts("whitelist-pkg").withRequiredArg().ofType(String.class);
@@ -109,6 +110,9 @@ private static void merge(String[] args) {
             if (options.has(bundled))
                 merge.bundledServerJar();
 
+            if (options.has(sortInterfaces))
+                merge.sortInterfaces();
+
             Predicate<String> filter = null;
             if (options.has(whitelist) || options.has(whitelistMap)) {
                 Set<String> classes = loadList(options.valuesOf(whitelist), options.valuesOf(whitelistMap));

src/main/java/net/minecraftforge/mergetool/Merger.java

@@ -59,6 +59,7 @@ public class Merger {
     private boolean copyData = false;
     private boolean keepMeta = false;
     private boolean bundledServerJar = false;
+    private boolean sortInterfaces = false;
 
     public Merger(File client, File server, File merged) {
         this.client = client;
@@ -111,6 +112,11 @@ public Merger bundledServerJar() {
         return this;
     }
 
+    public Merger sortInterfaces() {
+        this.sortInterfaces = true;
+        return this;
+    }
+
     public void process() throws IOException {
         try (ZipOutputStream outJar = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(this.merged)))) {
             Set<String> added = new HashSet<>();
@@ -349,8 +355,10 @@ private void processInterfaces(ClassNode cClass, ClassNode sClass) {
             }
         }
 
-        Collections.sort(cIntfs); //Sort things, we're in obf territory but should stabilize things.
-        Collections.sort(sIntfs);
+        if (sortInterfaces) {
+            Collections.sort(cIntfs); //Sort things, we're in obf territory but should stabilize things.
+            Collections.sort(sIntfs);
+        }
 
         if (this.annotation != null && !cOnly.isEmpty() || !sOnly.isEmpty()) {
             this.annotation.add(cClass, cOnly, sOnly);