add CommandReorderTiny

FabricMC · Jun 28, 2019 · ea16f28 · ea16f28
1 parent 92715f4
commit ea16f28
Show file tree

Hide file tree

Showing 35 changed files with 143 additions and 34 deletions.
diff --git a/HEADER b/HEADER
@@ -1,4 +1,4 @@
-Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/Command.java b/src/main/java/net/fabricmc/stitch/Command.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/Main.java b/src/main/java/net/fabricmc/stitch/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ public static void addCommand(Command command) {
         addCommand(new CommandMergeJar());
         addCommand(new CommandMergeTiny());
         addCommand(new CommandProposeFieldNames());
+        addCommand(new CommandReorderTiny());
         addCommand(new CommandRewriteIntermediary());
         addCommand(new CommandUpdateIntermediary());
     }

diff --git a/src/main/java/net/fabricmc/stitch/commands/CommandAsmTrace.java b/src/main/java/net/fabricmc/stitch/commands/CommandAsmTrace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/commands/CommandGenerateIntermediary.java b/src/main/java/net/fabricmc/stitch/commands/CommandGenerateIntermediary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/commands/CommandGeneratePrefixRemapper.java b/src/main/java/net/fabricmc/stitch/commands/CommandGeneratePrefixRemapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/commands/CommandMatcherToTiny.java b/src/main/java/net/fabricmc/stitch/commands/CommandMatcherToTiny.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/commands/CommandMergeJar.java b/src/main/java/net/fabricmc/stitch/commands/CommandMergeJar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/commands/CommandMergeTiny.java b/src/main/java/net/fabricmc/stitch/commands/CommandMergeTiny.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/commands/CommandProposeFieldNames.java b/src/main/java/net/fabricmc/stitch/commands/CommandProposeFieldNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/commands/CommandReorderTiny.java b/src/main/java/net/fabricmc/stitch/commands/CommandReorderTiny.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.stitch.commands;
+
+import com.google.common.base.Joiner;
+import net.fabricmc.mappings.ClassEntry;
+import net.fabricmc.mappings.EntryTriple;
+import net.fabricmc.mappings.FieldEntry;
+import net.fabricmc.mappings.Mappings;
+import net.fabricmc.mappings.MappingsProvider;
+import net.fabricmc.mappings.MethodEntry;
+import net.fabricmc.stitch.Command;
+import net.fabricmc.stitch.representation.JarReader;
+import net.fabricmc.stitch.representation.JarRootEntry;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.util.Locale;
+
+public class CommandReorderTiny extends Command {
+    public CommandReorderTiny() {
+        super("reorderTiny");
+    }
+
+    @Override
+    public String getHelpString() {
+        return "<old-mapping-file> <new-mapping-file> [name order...]";
+    }
+
+    @Override
+    public boolean isArgumentCountValid(int count) {
+        return count >= 4;
+    }
+
+    @Override
+    public void run(String[] args) throws Exception {
+        File fileOld = new File(args[0]);
+        File fileNew = new File(args[1]);
+        String[] names = new String[args.length - 2];
+        System.arraycopy(args, 2, names, 0, names.length);
+
+        System.err.println("Loading mapping file...");
+
+        Mappings input;
+        try (FileInputStream stream = new FileInputStream(fileOld)) {
+            input = MappingsProvider.readTinyMappings(stream, false);
+        }
+
+        System.err.println("Rewriting mappings...");
+
+        try (FileOutputStream stream = new FileOutputStream(fileNew);
+             OutputStreamWriter osw = new OutputStreamWriter(stream);
+             BufferedWriter writer = new BufferedWriter(osw)) {
+
+            StringBuilder firstLineBuilder = new StringBuilder("v1");
+            for (String name : names) {
+                firstLineBuilder.append('\t').append(name);
+            }
+            writer.write(firstLineBuilder.append('\n').toString());
+            for (ClassEntry entry : input.getClassEntries()) {
+                StringBuilder s = new StringBuilder("CLASS");
+                for (String name : names) {
+                    s.append('\t').append(entry.get(name));
+                }
+                writer.write(s.append('\n').toString());
+            }
+            for (FieldEntry entry : input.getFieldEntries()) {
+                StringBuilder s = new StringBuilder("FIELD");
+                EntryTriple first = entry.get(names[0]);
+                s.append('\t').append(first.getOwner()).append('\t').append(first.getDesc());
+                for (String name : names) {
+                    s.append('\t').append(entry.get(name).getName());
+                }
+                writer.write(s.append('\n').toString());
+            }
+            for (MethodEntry entry : input.getMethodEntries()) {
+                StringBuilder s = new StringBuilder("METHOD");
+                EntryTriple first = entry.get(names[0]);
+                s.append('\t').append(first.getOwner()).append('\t').append(first.getDesc());
+                for (String name : names) {
+                    s.append('\t').append(entry.get(name).getName());
+                }
+                writer.write(s.append('\n').toString());
+            }
+        }
+
+        System.err.println("Done!");
+    }
+
+}
diff --git a/src/main/java/net/fabricmc/stitch/commands/CommandRewriteIntermediary.java b/src/main/java/net/fabricmc/stitch/commands/CommandRewriteIntermediary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/commands/CommandUpdateIntermediary.java b/src/main/java/net/fabricmc/stitch/commands/CommandUpdateIntermediary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/commands/GenMap.java b/src/main/java/net/fabricmc/stitch/commands/GenMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/commands/GenState.java b/src/main/java/net/fabricmc/stitch/commands/GenState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/enigma/StitchEnigmaPlugin.java b/src/main/java/net/fabricmc/stitch/enigma/StitchEnigmaPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/enigma/StitchIntermediaryObfuscationTestService.java b/src/main/java/net/fabricmc/stitch/enigma/StitchIntermediaryObfuscationTestService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/enigma/StitchNameProposalService.java b/src/main/java/net/fabricmc/stitch/enigma/StitchNameProposalService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/merge/ClassMerger.java b/src/main/java/net/fabricmc/stitch/merge/ClassMerger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/merge/JarMerger.java b/src/main/java/net/fabricmc/stitch/merge/JarMerger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/representation/AbstractJarEntry.java b/src/main/java/net/fabricmc/stitch/representation/AbstractJarEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/representation/Access.java b/src/main/java/net/fabricmc/stitch/representation/Access.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/representation/ClassPropagationTree.java b/src/main/java/net/fabricmc/stitch/representation/ClassPropagationTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/representation/ClassStorage.java b/src/main/java/net/fabricmc/stitch/representation/ClassStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/representation/JarClassEntry.java b/src/main/java/net/fabricmc/stitch/representation/JarClassEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/representation/JarFieldEntry.java b/src/main/java/net/fabricmc/stitch/representation/JarFieldEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/representation/JarMethodEntry.java b/src/main/java/net/fabricmc/stitch/representation/JarMethodEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/representation/JarReader.java b/src/main/java/net/fabricmc/stitch/representation/JarReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/representation/JarRootEntry.java b/src/main/java/net/fabricmc/stitch/representation/JarRootEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/util/FieldNameFinder.java b/src/main/java/net/fabricmc/stitch/util/FieldNameFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/util/MatcherUtil.java b/src/main/java/net/fabricmc/stitch/util/MatcherUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/util/Pair.java b/src/main/java/net/fabricmc/stitch/util/Pair.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/util/SnowmanClassVisitor.java b/src/main/java/net/fabricmc/stitch/util/SnowmanClassVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/util/StitchUtil.java b/src/main/java/net/fabricmc/stitch/util/StitchUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/net/fabricmc/stitch/util/SyntheticParameterClassVisitor.java b/src/main/java/net/fabricmc/stitch/util/SyntheticParameterClassVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, 2018 Adrian Siekierka
+ * Copyright (c) 2016, 2017, 2018, 2019 Adrian Siekierka
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.