Support TinyV2 in Stitch (#15)

.gitignore

@@ -0,0 +1,5 @@
+local/
+.gradle/
+out/
+build/
+.idea/

build.gradle

@@ -16,7 +16,7 @@ sourceCompatibility = 1.8
 
 def ENV = System.getenv()
 if (ENV.BUILD_NUMBER) {
-    version = version + "." + "${System.getenv().BUILD_NUMBER}"
+	version = version + "." + "${System.getenv().BUILD_NUMBER}"
 }
 
 group = 'net.fabricmc'
@@ -39,34 +39,37 @@ dependencies {
 	compile 'org.ow2.asm:asm-commons:7.1'
 	compile 'org.ow2.asm:asm-tree:7.1'
 	compile 'org.ow2.asm:asm-util:7.1'
-	compile 'net.fabricmc:tiny-mappings-parser:0.1.1.8'
+	compile 'net.fabricmc:tiny-mappings-parser:0.2.0.11'
 	implementation group: 'org.checkerframework', name: 'checker-qual', version: '2.5.7'
-	implementation('cuchaz:enigma:0.14.0.120') {
+	implementation('cuchaz:enigma:0.14.2.138') {
 		exclude group: 'org.ow2.asm'
 	}
+
+	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
+	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
 }
 
 apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/maven.gradle'
 apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/license.gradle'
 
 jar {
 	manifest {
-		attributes	'Implementation-Title': 'Stitch',
+		attributes 'Implementation-Title': 'Stitch',
 				'Implementation-Version': version,
 				'Main-Class': "net.fabricmc.stitch.Main"
 	}
 }
 
 task allJar(type: Jar) {
-    from {
+	from {
 		configurations.compile.collect {
 			it.isDirectory() ? it : zipTree(it)
 		}
 	}
 	manifest {
-		attributes	'Implementation-Title': 'Stitch',
-					'Implementation-Version': version,
-					'Main-Class': "net.fabricmc.stitch.Main"
+		attributes 'Implementation-Title': 'Stitch',
+				'Implementation-Version': version,
+				'Main-Class': "net.fabricmc.stitch.Main"
 	}
 	classifier = 'all'
 	with jar
@@ -98,3 +101,7 @@ publishing {
 		}
 	}
 }
+
+test {
+	useJUnitPlatform()
+}

gradle.properties

@@ -1,4 +1,4 @@
 name = stitch
 description = Fabric auxillary Tiny tools
 url = https://github.com/FabricMC/stitch
-version = 0.2.1
+version = 0.3.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Aug 16 01:28:54 BST 2016
+#Mon Sep 16 17:37:29 IDT 2019
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME

src/main/java/net/fabricmc/stitch/Main.java

@@ -17,6 +17,9 @@
 package net.fabricmc.stitch;
 
 import net.fabricmc.stitch.commands.*;
+import net.fabricmc.stitch.commands.tinyv2.CommandMergeTinyV2;
+import net.fabricmc.stitch.commands.tinyv2.CommandProposeV2FieldNames;
+import net.fabricmc.stitch.commands.tinyv2.CommandReorderTinyV2;
 
 import java.util.Locale;
 import java.util.Map;
@@ -40,6 +43,9 @@ public static void addCommand(Command command) {
         addCommand(new CommandReorderTiny());
         addCommand(new CommandRewriteIntermediary());
         addCommand(new CommandUpdateIntermediary());
+        addCommand(new CommandReorderTinyV2());
+        addCommand(new CommandMergeTinyV2());
+        addCommand(new CommandProposeV2FieldNames());
     }
 
     public static void main(String[] args) {

src/main/java/net/fabricmc/stitch/commands/CommandReorderTiny.java

@@ -16,16 +16,10 @@
 
 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;