counter : counters.entrySet()) {
+ counterLines.add("# INTERMEDIARY-COUNTER " + counter.getKey() + " " + counter.getValue());
+ }
+
+ writer.write(counterLines.toString());
+ Path counterPath = getExternalCounterFile();
+
+ if (counterPath != null) {
+ Files.write(counterPath, counterLines.toString().getBytes(StandardCharsets.UTF_8), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+ }
+ }
+
+ private Path getExternalCounterFile() {
+ if (System.getProperty("stitch.counter") != null) {
+ return Paths.get(System.getProperty("stitch.counter"));
+ }
+
+ return null;
+ }
}
diff --git a/src/main/java/net/fabricmc/stitch/commands/tinyv2/CommandMergeTinyV2.java b/src/main/java/net/fabricmc/stitch/commands/tinyv2/CommandMergeTinyV2.java
index 4257ec0..b6eba4f 100644
--- a/src/main/java/net/fabricmc/stitch/commands/tinyv2/CommandMergeTinyV2.java
+++ b/src/main/java/net/fabricmc/stitch/commands/tinyv2/CommandMergeTinyV2.java
@@ -43,34 +43,36 @@
* the same namespace as the first column and a different namespace as the second column.
* The first column of the output will contain the shared namespace,
* the second column of the output would be the second namespace of input a,
- * and the third column of the output would be the second namespace of input b
- *
- * Descriptors will remain as-is (using the namespace of the first column)
- *
- *
- * For example:
- *
- * Input A:
- * intermediary named
- * c net/minecraft/class_123 net/minecraft/somePackage/someClass
- * m (Lnet/minecraft/class_124;)V method_1234 someMethod
- *
- * Input B:
- * intermediary official
- * c net/minecraft/class_123 a
- * m (Lnet/minecraft/class_124;)V method_1234 a
- *
- * The output will be:
- *
- * intermediary named official
- * c net/minecraft/class_123 net/minecraft/somePackage/someClass a
- * m (Lnet/minecraft/class_124;)V method_1234 someMethod a
- *
+ * and the third column of the output would be the second namespace of input b.
+ *
+ *
Descriptors will remain as-is (using the namespace of the first column).
+ *
+ * For example, for input A:
+ *
+ * intermediary named
+ * c net/minecraft/class_123 net/minecraft/somePackage/someClass
+ * m (Lnet/minecraft/class_124;)V method_1234 someMethod
+ *
+ * and input B:
+ *
+ * intermediary official
+ * c net/minecraft/class_123 a
+ * m (Lnet/minecraft/class_124;)V method_1234 a
+ *
+ * the output will be:
+ *
+ * intermediary named official
+ * c net/minecraft/class_123 net/minecraft/somePackage/someClass a
+ * m (Lnet/minecraft/class_124;)V method_1234 someMethod a
+ *
+ *
+ *
*
* After intermediary-named mappings are obtained,
* and official-intermediary mappings are obtained and swapped using CommandReorderTinyV2, Loom merges them using this command,
* and then reorders it to official-intermediary-named using CommandReorderTinyV2 again.
* This is a convenient way of storing all the mappings in Loom.
+ *
*/
public class CommandMergeTinyV2 extends Command {
public CommandMergeTinyV2() {
@@ -78,7 +80,7 @@ public CommandMergeTinyV2() {
}
/**
- * and are the tiny files to be merged. The result will be written to