Improved testing with local version repo. Updated FF

Author: Lassebq

gradle.properties

@@ -1,5 +1,5 @@
 asm_version=9.3
-fernflower_version=77d9d70d5fe65425f79e630e922fcf1774d9640f
+fernflower_version=37b85df64bf1978cb781f44b826d0cbf3c074c85
 rdi_version=c3b784edb637d5d53c1ba5f292a23da97f383e62
 stitch_version=fdbe41ae758bf2501fc7addb0b78938c7f7da226
 jansi_version=2.4.0

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

@@ -13,6 +13,19 @@ public TextAreaOutputStream(JTextArea textArea, OutputStream out) {
     	this.textArea = textArea;
 	}
 
+    @Override
+    public void print(Object o) {
+		textArea.append(String.valueOf(o));
+        super.print(o);
+    }
+
+    @Override
+    public void println(Object o) {
+        super.println(o);
+		textArea.append("\n");
+		textArea.setCaretPosition(textArea.getDocument().getLength());
+    }
+
     @Override
     public void print(String s) {
 		textArea.append(s);

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

@@ -10,7 +10,7 @@
 
 public abstract class Task implements ProgressListener, TaskRunnable {
 
-	public enum Side {
+	public static enum Side {
 		ANY(-1, "Any"),
 		CLIENT(0, "Client"),
 		SERVER(1, "Server"),

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

@@ -19,7 +19,6 @@
 import org.mcphackers.mcp.tools.source.Constants;
 import org.mcphackers.mcp.tools.source.GLConstants;
 import org.mcphackers.mcp.tools.source.MathConstants;
-import org.mcphackers.rdi.injector.Injector;
 import org.mcphackers.rdi.injector.RDInjector;
 import org.mcphackers.rdi.util.IOUtil;
 
@@ -117,19 +116,18 @@ protected Stage[] setStages() {
 				Files.copy(remapped, tempExcOut);
 				for(Side sideLocal : sides) {
 					final Path exc = MCPPaths.get(mcp, MCPPaths.EXC, sideLocal);
+					RDInjector injector = new RDInjector(tempExcOut);
+					injector.fixInnerClasses();
+					injector.fixSwitchMaps();
+					injector.fixImplicitConstructors();
+					injector.fixBridges();
 					if (Files.exists(exc)) {
-						Injector injector = new RDInjector(tempExcOut)
-							.fixInnerClasses()
-							.fixImplicitConstructors()
-							.fixExceptions(exc);
-						injector.transform();
-						IOUtil.write(injector, Files.newOutputStream(excOut), tempExcOut);
-						Files.deleteIfExists(tempExcOut);
-						Files.copy(excOut, tempExcOut);
-					}
-					else {
-						Files.copy(tempExcOut, excOut);
+						injector.fixExceptions(exc);
 					}
+					injector.transform();
+					IOUtil.write(injector, Files.newOutputStream(excOut), tempExcOut);
+					Files.deleteIfExists(tempExcOut);
+					Files.copy(excOut, tempExcOut);
 				}
 				// Copying a fixed jar to libs
 				if(side == Side.CLIENT || side == Side.MERGED) {

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

@@ -51,12 +51,9 @@ public void doTask() throws Exception {
 		mcp.setCurrentVersion(VersionsParser.setCurrentVersion(mcp, chosenVersion));
 		String currentVersion = mcp.getCurrentVersion();
 
-		//TODO Better handling for local versions.json
-		if(Files.notExists(MCPPaths.get(mcp, "versions.json"))) {
-			setProgress("Downloading mappings", 5);
-			FileUtil.downloadFile(VersionsParser.downloadVersion(currentVersion), MCPPaths.get(mcp, MCPPaths.CONF + "conf.zip"));
-			FileUtil.unzip(MCPPaths.get(mcp, MCPPaths.CONF + "conf.zip"), MCPPaths.get(mcp, MCPPaths.CONF), true);
-		}
+		setProgress("Downloading mappings", 5);
+		FileUtil.downloadFile(VersionsParser.downloadVersion(currentVersion), MCPPaths.get(mcp, MCPPaths.CONF + "conf.zip"));
+		FileUtil.unzip(MCPPaths.get(mcp, MCPPaths.CONF + "conf.zip"), MCPPaths.get(mcp, MCPPaths.CONF), true);
 
 		Files.deleteIfExists(MCPPaths.get(mcp, MCPPaths.JAR_ORIGINAL, Side.CLIENT));
 		Files.deleteIfExists(MCPPaths.get(mcp, MCPPaths.JAR_ORIGINAL, Side.SERVER));

src/main/java/org/mcphackers/mcp/tools/VersionsParser.java

@@ -20,8 +20,8 @@
 import org.mcphackers.mcp.tasks.Task.Side;
 
 public abstract class VersionsParser {
-	
-	private static final String jsonURL = "https://mcphackers.github.io/versions/versions.json";
+
+	private static String versionsURL = "https://mcphackers.github.io/versions/";
 	private static Exception cause = null;
 
 	public static final JSONObject json = getJson();
@@ -64,13 +64,20 @@ private static void checkJson() throws Exception {
 	private static JSONObject getJson() {
 		try {
 			Path jsonPath = Paths.get("versions.json");
+			String jsonURL = versionsURL + "versions.json";
 			if(Files.exists(jsonPath) && !Files.isDirectory(jsonPath)) {
-				return Util.parseJSONFile(jsonPath);
-			}
-			else {
-				InputStream in = new URL(jsonURL).openStream();
-				return Util.parseJSONFile(in);
+				JSONObject jsonSource = Util.parseJSONFile(jsonPath);
+				if(jsonSource.has("source")) {
+					String src = jsonSource.getString("source");
+					if(!src.startsWith("http")) {
+						src = "file:" + src;
+					}
+					versionsURL = src;
+					jsonURL = src + "versions.json";
+				}
 			}
+			InputStream in = new URL(jsonURL).openStream();
+			return Util.parseJSONFile(in);
 		} catch (JSONException | IOException e) {
 			cause = e;
 		}
@@ -92,8 +99,7 @@ public static String getServerVersion(String version) throws Exception {
 
 	public static boolean hasServer(String version) throws Exception {
 		checkJson();
-		//TODO Better null pointer handling
-		return version == null || json.getJSONObject(version).has("server_url");
+		return json.getJSONObject(version).has("server_url");
 	}
 
 	public static String getDownloadURL(String version, Side side) throws Exception {
@@ -108,7 +114,7 @@ public static String getDownloadURL(String version, Side side) throws Exception
 	public static URL downloadVersion(String version) throws Exception {
 		checkJson();
 		if(json.getJSONObject(version).has("resources")) {
-			return new URL("https://mcphackers.github.io/versions/" + json.getJSONObject(version).getString("resources"));
+			return new URL(versionsURL + json.getJSONObject(version).getString("resources"));
 		}
 		throw new JSONException("Could not get download link for mappings");
 	}