Update README, version, and error messages; refactor mapping output logic

Author: builtbyjonas

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}

README.md

@@ -32,21 +32,21 @@ You can either **download the latest jar from the [Releases tab](https://github.
 After building (or downloading), you can run the tool from the command line:
 
 ```sh
-java -jar build/libs/mojang2tiny-1.0.0.jar \
+java -jar build/libs/mojang2tiny-1.1.0.jar \
   -i <intermediary.tiny> \
-  -m <mappings1.txt> [<mappings2.txt> ...] \
+  -m <mappings.txt> \
   -o <output-directory>
 ```
 
 #### Arguments
 - `-i`, `--intermediary` — Path to the intermediary mapping file (Tiny format)
-- `-m`, `--mappings` — One or more Mojang mapping files to convert
-- `-o`, `--output-dir` — Output directory for the generated Tiny files
+- `-m`, `--mappings` — Mojang mapping file to convert
+- `-o`, `--output-dir` — Output directory for the generated Tiny file
 
 ### Example (CLI)
 
 ```sh
-java -jar build/libs/mojang2tiny-1.0.0.jar \
+java -jar build/libs/mojang2tiny-1.1.0.jar \
   -i intermediary.tiny \
   -m mojang-mappings.txt \
   -o output/
@@ -64,9 +64,9 @@ import java.util.Arrays;
 public class Example {
     public static void main(String[] args) throws Exception {
         File intermediary = new File("intermediary.tiny");
-        File mapping1 = new File("mojang-mappings.txt");
+        File mappings = new File("mojang-mappings.txt");
         File outputDir = new File("output");
-        Main.convert(intermediary, Arrays.asList(mapping1), outputDir);
+        Main.convert(intermediary, mappings, outputDir);
     }
 }
 ```

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'com.threadmc'
-version = '1.0.0'
+version = '1.1.0'
 
 repositories {
     mavenCentral()

src/main/java/com/threadmc/mojang2tiny/Intermediary.java

@@ -34,7 +34,7 @@ public static Intermediary load(InputStream in) throws IOException {
                     entries.add(new IntermediaryEntry.MethodEntry(className, sig, split[3], split[4]));
                     break;
                 default:
-                    throw new IOException("Syntax error at: " + line);
+                    throw new IOException("[Mojang2Tiny] Syntax error at: " + line);
             }
         }
         return new Intermediary(entries);

src/main/java/com/threadmc/mojang2tiny/JvmSignature.java

@@ -20,15 +20,15 @@ public static JvmSignature from(List<JvmType> params, JvmType result) {
 
     public static JvmSignature fromJvmSig(String s) {
         StringBuilder sb = new StringBuilder(s);
-        if (sb.charAt(0) != '(') throw new IllegalArgumentException("Expected '('");
+        if (sb.charAt(0) != '(') throw new IllegalArgumentException("[Mojang2Tiny] Expected '('");
         sb.deleteCharAt(0);
         List<JvmType> params = new ArrayList<>();
         while (sb.charAt(0) != ')') {
             params.add(JvmType.read(sb));
         }
         sb.deleteCharAt(0);
         JvmType result = JvmType.read(sb);
-        if (sb.length() != 0) throw new IllegalArgumentException("Expected end of signature");
+        if (sb.length() != 0) throw new IllegalArgumentException("[Mojang2Tiny] Expected end of signature");
         return new JvmSignature(params, result);
     }
 

src/main/java/com/threadmc/mojang2tiny/JvmType.java

@@ -41,7 +41,7 @@ public static JvmType read(StringBuilder s) {
                 return new ClassType(className);
             }
             case '[': return new ArrayType(read(s));
-            default: throw new IllegalArgumentException("Malformed JVM type: " + first);
+            default: throw new IllegalArgumentException("[Mojang2Tiny] Malformed JVM type: " + first);
         }
     }
 

src/main/java/com/threadmc/mojang2tiny/Main.java

@@ -6,7 +6,6 @@
 
 import java.io.*;
 import java.util.concurrent.Callable;
-import java.util.List;
 
 /**
  * Main entry point for mojang2tiny. Can be used as a CLI (via main method)
@@ -21,30 +20,34 @@
 public class Main implements Callable<Integer> {
     @Option(names = {"-i", "--intermediary"}, required = true, description = {"Intermediary mapping file"})
     private File intermediaryFile;
-    @Option(names = {"-m", "--mappings"}, required = true, description = {"Mojang mapping files"}, arity = "1..*")
-    private List<File> mappingFiles;
+    @Option(names = {"-m", "--mappings"}, required = true, description = {"Mojang mapping file"})
+    private File mappingFile;
     @Option(names = {"-o", "--output-dir"}, required = true, description = {"Output directory"})
     private File outputDir;
+    @Option(names = {"-t", "--tiny-version"}, description = {"Tiny format version (v1 or v2), default: v2"})
+    private String tinyVersion = "v2";
 
     public Main() {}
 
     @Override
     public Integer call() throws Exception {
-        System.out.println("Loading intermediary");
+        System.out.println("[Mojang2Tiny] Loading intermediary");
         Intermediary intermediary;
         try (InputStream in = new FileInputStream(intermediaryFile)) {
             intermediary = Intermediary.load(in);
         }
         MojangMap mojang = MojangMap.empty();
-        for (File mappingFile : mappingFiles) {
-            System.out.println("Loading mojang: " + mappingFile.getName());
-            try (InputStream in = new FileInputStream(mappingFile)) {
-                MojangMap m = MojangMap.load(in);
-                mojang.combine(m);
-            }
+        System.out.println("[Mojang2Tiny] Loading mojang: " + mappingFile.getName());
+        try (InputStream in = new FileInputStream(mappingFile)) {
+            MojangMap m = MojangMap.load(in);
+            mojang.combine(m);
         }
-        System.out.println("Writing mapping files");
-        MappingOutput.write(outputDir, intermediary, mojang);
+        System.out.println("[Mojang2Tiny] Writing mapping file");
+        if (!outputDir.exists()) {
+            outputDir.mkdirs();
+        }
+        File outFile = new File(outputDir, "mappings.tiny");
+        MappingOutput.write(outFile, intermediary, mojang, tinyVersion);
         return 0;
     }
 
@@ -64,18 +67,17 @@ public static void main(String[] args) {
      * @param outputDir Output directory for Tiny mappings
      * @throws Exception if an error occurs during conversion
      */
-    public static void convert(File intermediaryFile, List<File> mappingFiles, File outputDir) throws Exception {
+    public static void convert(File intermediaryFile, File mappingFile, File outputDir, String tinyVersion) throws Exception {
         Intermediary intermediary;
         try (InputStream in = new FileInputStream(intermediaryFile)) {
             intermediary = Intermediary.load(in);
         }
         MojangMap mojang = MojangMap.empty();
-        for (File mappingFile : mappingFiles) {
-            try (InputStream in = new FileInputStream(mappingFile)) {
-                MojangMap m = MojangMap.load(in);
-                mojang.combine(m);
-            }
+        try (InputStream in = new FileInputStream(mappingFile)) {
+            MojangMap m = MojangMap.load(in);
+            mojang.combine(m);
         }
-        MappingOutput.write(outputDir, intermediary, mojang);
+        File outFile = new File(outputDir, "mappings.tiny");
+        MappingOutput.write(outFile, intermediary, mojang, tinyVersion);
     }
 }