Fixed CLI and GUI. Obfuscation in reobf task

Author: Lassebq

build.gradle

@@ -28,7 +28,7 @@ dependencies {
     implementation 'org.ow2.asm:asm-tree:' + ASMVersion
     implementation 'org.ow2.asm:asm-util:' + ASMVersion
 
-    implementation 'com.github.MCPHackers:RetroFernflower:43254d0b4787e515c1fb387ccb82952421ce846b'
+    implementation 'com.github.MCPHackers:RetroFernflower:3992b4b81fe2b106f2e53dca2d7425fce72dd9f5'
     implementation 'org.fusesource.jansi:jansi:2.4.0'
     implementation 'net.fabricmc:tiny-remapper:0.6.0'
     // TODO: Don't gut MCInjector bundled ASM

logs/mcp.log

@@ -1,10 +1,9 @@
 package org.mcphackers.mcp;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -15,20 +14,9 @@
 
 public interface MCP {
 
-	String VERSION = "v0.4";
-
-	default void attemptToDeleteUpdateJar() {
-		long startTime = System.currentTimeMillis();
-		boolean keepTrying = true;
-		while(keepTrying) {
-			try {
-				Files.deleteIfExists(Paths.get(MCPPaths.UPDATE_JAR));
-				keepTrying = false;
-			} catch (IOException e) {
-				keepTrying = System.currentTimeMillis() - startTime < 10000;
-			}
-		}
-	}
+	String VERSION = "v1.0-pre1";
+	
+	Map<String, TaskParameter> nameToParamMap = new HashMap<>();
 
 	default void performTask(TaskMode mode, Side side) {
 		performTask(mode, side, true, true);
@@ -58,7 +46,7 @@ default void performTask(TaskMode mode, Side side, boolean enableProgressBars, b
 				performedTasks.add(task);
 			}
 		}
-		setProgressBars(performedTasks);
+		if(enableProgressBars) setProgressBars(performedTasks, mode);
 		ExecutorService pool = Executors.newFixedThreadPool(2);
 		setActive(false);
 
@@ -71,14 +59,6 @@ default void performTask(TaskMode mode, Side side, boolean enableProgressBars, b
 				task.setProgressBarIndex(barIndex);
 			}
 			pool.execute(() -> {
-				String name = mode.name;
-				if(task.side == Side.CLIENT || task.side == Side.SERVER) {
-					name = task.side.name;
-				}
-				if(enableProgressBars) {
-					setProgressBarName(barIndex, name);
-					setProgressBarActive(barIndex, true);
-				}
 				try {
 					task.doTask();
 				} catch (Exception e) {
@@ -111,17 +91,11 @@ default void performTask(TaskMode mode, Side side, boolean enableProgressBars, b
 			String[] msgs2 = {"Finished successfully!", "Finished with warnings!", "Finished with errors!"};
 			showMessage(mode.name, msgs2[result], result);
 		}
-
-		for(int i = 0; i < performedTasks.size(); i++) {
-			setProgressBarActive(i, false);
-			
-			setProgress(i, "Idle", 0);
-		}
 		setActive(true);
-		clearProgressBars();
+		if(enableProgressBars) clearProgressBars();
 	}
 
-	void setProgressBars(List<Task> tasks);
+	void setProgressBars(List<Task> tasks, TaskMode mode);
 
 	void clearProgressBars();
 
@@ -133,10 +107,6 @@ default void performTask(TaskMode mode, Side side, boolean enableProgressBars, b
 
 	void setCurrentVersion(String version);
 
-	void setProgressBarActive(int barIndex, boolean active);
-	
-	void setProgressBarName(int side, String name);
-	
 	void setProgress(int barIndex, String progressMessage);
 
 	void setProgress(int barIndex, int progress);

src/main/java/org/mcphackers/mcp/MCP.java

@@ -24,19 +24,22 @@ public void setDefault(TaskParameter param) {
 			value = true;
 			break;
 		case IGNORED_PACKAGES:
-			value = new String[] {"paulscode", "com/jcraft", "isom"};
+			value = new String[] {"paulscode", "com/jcraft", "de/jarnbjo", "isom"};
 			break;
 		case INDENTION_STRING:
 			value = "\t";
 			break;
+		case OBFUSCATION:
+			value = true;
+			break;
 		case FULL_BUILD:
 			value = false;
 			break;
 		case RUN_BUILD:
 			value = false;
 			break;
 		case RUN_ARGS:
-			value = new String[0];
+			value = new String[] {"-Xms1024M", "-Xmx1024M", "-Djava.util.Arrays.useLegacyMergeSort=true"};
 			break;
 		case SETUP_VERSION:
 			value = null;
@@ -65,6 +68,15 @@ public void setParameter(TaskParameter param, Object value) throws IllegalArgume
 		}
 	}
 
+	public Object getParameter(TaskParameter param) {
+		Object value = options.get(param);
+		if(value instanceof String[]) {
+			String valueStr = String.join(", ", (String[])value);
+			return valueStr;
+		}
+		return value;
+	}
+
 	public boolean getBooleanParameter(TaskParameter param) throws IllegalArgumentException {
 		Object value = options.get(param);
 		if(value instanceof Boolean) {

src/main/java/org/mcphackers/mcp/MCPLogger.java

@@ -8,6 +8,7 @@ public enum TaskParameter {
 	PATCHES("patch", "Apply patches", Boolean.class),
 	IGNORED_PACKAGES("ignore", "Set ignored packages", String[].class),
 	INDENTION_STRING("ind", "Set indention string", String.class),
+	OBFUSCATION("obf", "Obfuscation", Boolean.class),
 	FULL_BUILD("fullbuild", "Full build", Boolean.class),
 	RUN_BUILD("runbuild", "Run build", Boolean.class),
 	RUN_ARGS("runargs", "Run arguments", String[].class),
@@ -25,6 +26,7 @@ public enum TaskParameter {
 	}
 
 	TaskParameter(String name, String desc, Class c) {
+		MCP.nameToParamMap.put(name, this);
 		this.name = name;
 		this.desc = desc;
 		this.type = c;

src/main/java/org/mcphackers/mcp/Options.java

@@ -28,4 +28,17 @@ public static void main(String[] args) {
 			}
 		}
 	}
+
+	public static void attemptToDeleteUpdateJar() {
+		long startTime = System.currentTimeMillis();
+		boolean keepTrying = true;
+		while(keepTrying) {
+			try {
+				Files.deleteIfExists(Paths.get(MCPPaths.UPDATE_JAR));
+				keepTrying = false;
+			} catch (IOException e) {
+				keepTrying = System.currentTimeMillis() - startTime < 10000;
+			}
+		}
+	}
 }

src/main/java/org/mcphackers/mcp/TaskParameter.java

@@ -99,10 +99,13 @@ private void initOptions() {
 		}
 		menuOptions.add(sideMenu);
 
-		String[] names = {TaskMode.decompile.name, TaskMode.recompile.name/*, TaskMode.build.name*/};
+		String[] names = {TaskMode.decompile.name, TaskMode.recompile.name, TaskMode.reobfuscate.name, TaskMode.build.name, "Running"};
 		TaskParameter[][] params = {
 				{TaskParameter.PATCHES, TaskParameter.INDENTION_STRING, TaskParameter.IGNORED_PACKAGES},
-				{TaskParameter.SOURCE_VERSION, TaskParameter.TARGET_VERSION, TaskParameter.BOOT_CLASS_PATH}
+				{TaskParameter.SOURCE_VERSION, TaskParameter.TARGET_VERSION, TaskParameter.BOOT_CLASS_PATH},
+				{TaskParameter.OBFUSCATION},
+				{TaskParameter.FULL_BUILD},
+				{TaskParameter.RUN_BUILD, TaskParameter.RUN_ARGS}
 		};
 		Map<TaskParameter, JMenuItem> resetOptions = new HashMap<>();
 		for(int i = 0; i < names.length; i++) {
@@ -123,7 +126,7 @@ private void initOptions() {
 						if(param.type == String[].class) {
 							s = "Enter a set of values\n(Separate values with comma)";
 						}
-						String value = owner.inputString(param.desc, s);
+						String value = (String)JOptionPane.showInputDialog(owner, s, param.desc, JOptionPane.PLAIN_MESSAGE, null, null, options.getParameter(param));
 						//TODO move this to a separate method so it can be used with other MCP implementations
 						if(value != null) {
 							try {
@@ -151,9 +154,9 @@ private void initOptions() {
 								if(value.contains(",")) {
 									try {
 										String[] values = value.split(",");
-										for(String value2 : values) {
-											value2.trim();
-											value2 = value2.replace("\\n", "\n").replace("\\t", "\t");
+										for(int i2 = 0 ; i2 < values.length; i2++) {
+											values[i2] = values[i2].trim();
+											values[i2] = values[i2].replace("\\n", "\n").replace("\\t", "\t");
 										}
 										options.setParameter(param, values);
 										return;