refactor: Allow merge mappings task in prod.

Author: PhoenixVX

…hackers/mcp/tasks/TaskMergeMappings.java …hackers/mcp/tasks/TaskMergeMappings.javasrc/test/java/org/mcphackers/mcp/tasks/TaskMergeMappings.java renamed to src/main/java/org/mcphackers/mcp/tasks/TaskMergeMappings.java src/test/java/org/mcphackers/mcp/tasks/TaskMergeMappings.java renamed to src/main/java/org/mcphackers/mcp/tasks/TaskMergeMappings.java

@@ -27,6 +27,8 @@ protected Stage[] setStages() {
 							// Only client mappings exist
 							MappingUtil.mergeMappings(clientMappings, mergedMappings);
 						}
+					} else {
+						throw new RuntimeException("client.tiny/server.tiny could not be found in the current directory!");
 					}
 				})
 		};

src/main/java/org/mcphackers/mcp/tasks/mode/TaskMode.java

@@ -16,6 +16,7 @@
 import org.mcphackers.mcp.tasks.TaskCreatePatch;
 import org.mcphackers.mcp.tasks.TaskDecompile;
 import org.mcphackers.mcp.tasks.TaskDownloadUpdate;
+import org.mcphackers.mcp.tasks.TaskMergeMappings;
 import org.mcphackers.mcp.tasks.TaskRecompile;
 import org.mcphackers.mcp.tasks.TaskReobfuscate;
 import org.mcphackers.mcp.tasks.TaskRun;
@@ -150,6 +151,11 @@ public class TaskMode {
 			.setProgressBars(true)
 			.addRequirement((mcp, side) -> Files.isReadable(MCPPaths.get(mcp, MCPPaths.SOURCE, side)))
 			.build();
+	public static TaskMode MERGE_MAPPINGS = new TaskModeBuilder()
+			.setName("mergemappings")
+			.setTaskClass(TaskMergeMappings.class)
+			.setProgressBars(false)
+			.build();
 	public static TaskMode EXIT = new TaskModeBuilder()
 			.setName("exit")
 			.setProgressBars(false)

src/main/resources/lang/en_US.lang

@@ -79,6 +79,8 @@ task.applypatch = Apply patch
 task.applypatch.desc = Apply patch from patches directory
 task.updatemcp = Update RetroMCP
 task.updatemcp.desc = Check for updates
+task.mergemappings = Merge mappings
+task.mergemappings.desc = Merges mappings into V2 format
 task.noDesc = No description provided
 
 task.stage.idle = Idle

src/test/java/org/mcphackers/mcp/TestPlugin.java

@@ -4,10 +4,7 @@
 
 import org.mcphackers.mcp.plugin.MCPPlugin;
 import org.mcphackers.mcp.tasks.Task;
-import org.mcphackers.mcp.tasks.TaskMergeMappings;
 import org.mcphackers.mcp.tasks.TaskStaged;
-import org.mcphackers.mcp.tasks.mode.TaskMode;
-import org.mcphackers.mcp.tasks.mode.TaskModeBuilder;
 
 public class TestPlugin implements MCPPlugin {
 	private final Logger logger = Logger.getLogger("testPlugin");
@@ -20,11 +17,6 @@ public String pluginId() {
     @Override
     public void init(MCP mcp) {
 		logger.info("Test plugin has initialized!");
-		TaskMode mergeMappingsTask = new TaskModeBuilder()
-				.setName("mergemappings")
-				.setTaskClass(TaskMergeMappings.class)
-				.setProgressBars(false)
-				.build();
     }
 
     @Override

src/test/resources/lang/en_US.lang

@@ -1,2 +0,0 @@
-task.mergemappings = Merge mappings
-task.mergemappings.desc = Merges mappings into V2 format