Partially fix plugin translation files + small fixes

Author: PhoenixVX

cli/src/main/java/org/mcphackers/mcp/main/MainCLI.java

@@ -150,10 +150,6 @@ public MainCLI(String[] args) {
 	}
 
 	public static void main(String[] args) {
-		if (args.length != 0) {
-			new MainCLI(args);
-			return;
-		}
 		AnsiConsole.systemInstall();
 		new MainCLI(args);
 	}

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

@@ -342,4 +342,10 @@ public List<Path> getLibraries() {
 			return DownloadData.getLibraries(MCPPaths.get(this, MCPPaths.LIB), getCurrentVersion());
 		}
 	}
+
+	public static void reloadPluginTranslations() {
+		pluginManager.getLoadedPlugins().forEach((key, plugin) -> {
+			MCP.TRANSLATOR.readTranslation(plugin.getClass());
+		});
+	}
 }

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

@@ -4,7 +4,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -17,22 +19,28 @@ public void changeLang(Language lang) {
 		translations.clear();
 		currentLang = lang;
 		readTranslation(MCP.class);
+		MCP.reloadPluginTranslations();
 	}
 
 	public void readTranslation(Class<?> cls) {
 		readTranslation(cls, DEFAULT_LANG);
-		readTranslation(cls, currentLang);
+		if (currentLang != DEFAULT_LANG) {
+			readTranslation(cls, currentLang);
+		}
 	}
 
 	private void readTranslation(Class<?> cls, Language lang) {
 		readTranslation(translations, cls, lang);
 	}
 
 	private void readTranslation(Map<String, String> map, Class<?> cls, Language lang) {
-		String resourceName = "/lang/" + lang.locale.toString() + ".lang";
-		//FIXME Hardcoded MCP.class because Class#getResourceAsStream return result is not the same as ClassLoader#getResourceAsStream
-		try (InputStream resource = (cls == MCP.class) ? cls.getResourceAsStream(resourceName) : cls.getClassLoader().getResourceAsStream(resourceName)) {
-			this.readTranslation(map, resource);
+		String resourceName = "lang/" + lang.locale.toString() + ".lang";
+		try {
+			Enumeration<URL> translations = cls.getClassLoader().getResources(resourceName);
+			while (translations.hasMoreElements()) {
+				URL url = translations.nextElement();
+				this.readTranslation(map, url.openStream());
+			}
 		} catch (IOException ex) {
 			ex.printStackTrace();
 		}

src/main/java/org/mcphackers/mcp/tasks/TaskSetup.java

@@ -39,7 +39,7 @@ public TaskSetup(MCP instance) {
 	@Override
 	protected Stage[] setStages() {
 		return new Stage[] {
-				stage(getLocalizedStage("setup"), () -> {
+				stage(getLocalizedStage("setup"), 0, () -> {
 					new TaskCleanup(mcp).cleanup();
 					FileUtil.createDirectories(MCPPaths.get(mcp, JARS));
 					FileUtil.createDirectories(MCPPaths.get(mcp, LIB));

src/test/resources/lang/en_US.lang

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