fix: Clean up / Update MD5 task did not confirm before running

Author: PhoenixVX

gui/src/main/java/org/mcphackers/mcp/gui/TaskButton.java

@@ -8,6 +8,7 @@
 
 import org.mcphackers.mcp.MCP;
 import org.mcphackers.mcp.main.MainGUI;
+import org.mcphackers.mcp.tasks.Task;
 import org.mcphackers.mcp.tasks.mode.TaskMode;
 
 public class TaskButton extends JButton {
@@ -32,7 +33,18 @@ public TaskButton(MainGUI owner, TaskMode task, ActionListener defaultActionList
 	}
 
 	public static ActionListener performTask(MCP mcp, TaskMode mode) {
-		return event -> enqueueRunnable(() -> mcp.performTask(mode, mcp.getOptions().side));
+		return event -> enqueueRunnable(() -> {
+			if (mode.equals(TaskMode.CLEANUP) || mode.equals(TaskMode.UPDATE_MD5)) {
+				String confirmMessage = mode.equals(TaskMode.CLEANUP) ? MCP.TRANSLATOR.translateKey("mcp.confirmCleanup") : MCP.TRANSLATOR.translateKey("mcp.confirmUpdateMD5");
+
+				// This should never throw...
+				MainGUI main = (MainGUI) mcp;
+				int response = JOptionPane.showConfirmDialog(main.frame, confirmMessage, MCP.TRANSLATOR.translateKey("mcp.confirmAction"), JOptionPane.YES_NO_OPTION);
+				if (response == JOptionPane.YES_OPTION) {
+					mcp.performTask(mode, mcp.getOptions().side);
+				}
+			}
+		});
 	}
 
 	public boolean getEnabled() {

gui/src/main/java/org/mcphackers/mcp/main/MainGUI.java

@@ -55,7 +55,7 @@
  * GUI implementation of MCP
  */
 public class MainGUI extends MCP {
-	public static final TaskMode[] TASKS = {TaskMode.DECOMPILE, TaskMode.RECOMPILE, TaskMode.REOBFUSCATE, TaskMode.BUILD, TaskMode.UPDATE_MD5, TaskMode.CREATE_PATCH};
+	public static final TaskMode[] TASKS = {TaskMode.DECOMPILE, TaskMode.RECOMPILE, TaskMode.REOBFUSCATE, TaskMode.BUILD, TaskMode.CREATE_PATCH};
 	public static final String[] TABS = {"task.decompile", "task.recompile", "task.reobfuscate", "task.build", "options.running"};
 	public static final TaskParameter[][] TAB_PARAMETERS = {
 			{TaskParameter.PATCHES, TaskParameter.FERNFLOWER_OPTIONS, TaskParameter.IGNORED_PACKAGES, TaskParameter.OUTPUT_SRC, TaskParameter.DECOMPILE_RESOURCES, TaskParameter.GUESS_GENERICS, TaskParameter.STRIP_GENERICS},
@@ -347,22 +347,6 @@ public TaskButton getButton(TaskMode task) {
 				}
 			});
 			button = new TaskButton(this, task, defaultActionListener);
-		} else if (task == TaskMode.CLEANUP) {
-			ActionListener defaultActionListener = event -> Util.enqueueRunnable(() -> {
-				int response = JOptionPane.showConfirmDialog(frame, MCP.TRANSLATOR.translateKey("mcp.confirmCleanup"), MCP.TRANSLATOR.translateKey("mcp.confirmAction"), JOptionPane.YES_NO_OPTION);
-				if (response == JOptionPane.YES_OPTION) {
-					performTask(task, Side.ANY);
-				}
-			});
-			button = new TaskButton(this, task, defaultActionListener);
-		} else if (task == TaskMode.UPDATE_MD5) {
-			ActionListener defaultActionListener = event -> Util.enqueueRunnable(() -> {
-				int response = JOptionPane.showConfirmDialog(frame, MCP.TRANSLATOR.translateKey("mcp.confirmUpdateMD5"), MCP.TRANSLATOR.translateKey("mcp.confirmAction"), JOptionPane.YES_NO_OPTION);
-				if (response == JOptionPane.YES_OPTION) {
-					performTask(task, getSide());
-				}
-			});
-			button = new TaskButton(this, task, defaultActionListener);
 		} else {
 			button = new TaskButton(this, task);
 		}