Released version 1.1.0

Author: theWituch

README.md

@@ -10,3 +10,4 @@ See to command line help for list of available parameters using:
 
     java <srgprocessor.jar> --clean --help
     java <srgprocessor.jar> --map --help
+    java <srgprocessor.jar> --deduce --help

pom.xml

@@ -4,9 +4,17 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.minecraftplus</groupId>
 	<artifactId>srgprocessor</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.0</version>
 	<name>SrgProcessor</name>
 
+	<distributionManagement>
+		<repository>
+			<id>minecraftplus</id>
+			<name>MineraftPlus Maven Public Repository</name>
+			<url>https://maven.minecraftplus.org/</url>
+		</repository>
+	</distributionManagement>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>8</java.version>
@@ -29,9 +37,26 @@
 			<version>3.0.2</version>
 			<scope>compile</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>5.8.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.jimfs</groupId>
+			<artifactId>jimfs</artifactId>
+			<version>1.2</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<repositories>
+		<repository>
+			<id>minecraftplus</id>
+			<url>https://maven.minecraftplus.org</url>
+		</repository>
 		<repository>
 			<id>forge</id>
 			<url>https://maven.minecraftforge.net</url>
@@ -86,6 +111,16 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.22.2</version>
+				<configuration>
+					<excludes>
+						<exclude>some test to exclude here</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>

src/main/java/net/minecraftforge/srg2source/util/io/ConfLogger.java

@@ -30,6 +30,14 @@ protected void log(String s) {
         logger.println(s);
     }
 
+    protected void logN(String s) {
+        logger.println(s + "\n");
+    }
+
+    protected void Nlog(String s) {
+        logger.println("\n" + s);
+    }
+
     public void error(String s) {
         errorLogger.println(s);
     }

src/main/java/org/minecraftplus/srgprocessor/ConsoleTool.java

@@ -73,7 +73,7 @@ public static void main(String[] args) throws Exception {
 
     private static enum Task
     {
-        MAP(SrgMapMain::main), CLEAN(SrgCleanMain::main);
+        MAP(SrgMapperMain::main), CLEAN(SrgCleanerMain::main), DEDUCE(SrgDeducerMain::main);
 
         private Consumer<String[]> task;
 

src/main/java/org/minecraftplus/srgprocessor/SrgCleanMain.java

@@ -0,0 +1,73 @@
+package org.minecraftplus.srgprocessor;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Arrays;
+
+import joptsimple.OptionException;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+import joptsimple.OptionSpec;
+import joptsimple.ValueConverter;
+import joptsimple.util.PathConverter;
+import net.minecraftforge.srgutils.IMappingFile.Format;
+import org.minecraftplus.srgprocessor.api.CleanerBuilder;
+
+public class SrgCleanerMain
+{
+    private static final ValueConverter<Path> PATH_CONVERTER = new PathConverter();
+
+    public static void main(String[] args) throws IOException {
+        OptionParser parser = new OptionParser();
+        OptionSpec<?> helpArg = parser.acceptsAll(Arrays.asList("h", "help")).forHelp();
+        OptionSpec<Path> inArg = parser.acceptsAll(Arrays.asList("in", "input", "srgFile")).withRequiredArg()
+                .withValuesConvertedBy(PATH_CONVERTER).required();
+        OptionSpec<Path> outArg = parser.acceptsAll(Arrays.asList("out", "output", "outFile")).withRequiredArg()
+                .withValuesConvertedBy(PATH_CONVERTER).required();
+        OptionSpec<Format> formatArg = parser.acceptsAll(Arrays.asList("f", "format", "outputFormat")).withRequiredArg()
+                .ofType(Format.class).defaultsTo(Format.TSRG2);
+        OptionSpec<Boolean> reverseArg = parser.acceptsAll(Arrays.asList("r", "reverse", "reverseOutput")).withOptionalArg()
+                .ofType(Boolean.class).defaultsTo(false);
+        OptionSpec<Boolean> filterArg = parser.acceptsAll(Arrays.asList("filter", "filterSameNames"),
+                        "Nodes with same original and mapped name will be removed from output").withOptionalArg()
+                .ofType(Boolean.class).defaultsTo(false);
+        OptionSpec<Boolean> inferArg = parser.acceptsAll(Arrays.asList("infer", "inferMethodParameters"),
+                        "Method parameters will be inferred from method descriptor").withOptionalArg()
+                .ofType(Boolean.class).defaultsTo(false);
+
+        try {
+            OptionSet options = parser.parse(args);
+
+            if (options.has(helpArg)) {
+                parser.printHelpOn(System.out);
+                return;
+            }
+
+            Path input = options.valueOf(inArg);
+            Path output = options.valueOf(outArg);
+            Format outputFormat = options.valueOf(formatArg);
+            boolean reverseOutput = options.has(reverseArg) || options.valueOf(reverseArg);
+            boolean filter = options.has(filterArg) || options.valueOf(filterArg);
+            boolean inferParameters = options.has(inferArg);
+
+            System.out.println("Input :    " + input);
+            System.out.println("Output:    " + output);
+            System.out.println("Format:    " + outputFormat);
+            System.out.println("Reverse:   " + reverseOutput);
+            System.out.println("Filter:    " + filter);
+            System.out.println("Infer:     " + inferParameters);
+
+            CleanerBuilder builder = new CleanerBuilder()
+                    .input(input).output(output).format(outputFormat)
+                    .infer(inferParameters).filter(filter);
+
+            if (reverseOutput)
+                builder.reverseOutput();
+
+            builder.build().run();
+        } catch (OptionException e) {
+            parser.printHelpOn(System.out);
+            e.printStackTrace();
+        }
+    }
+}