RDI update

Author: Lassebq

gradle.properties

@@ -1,6 +1,6 @@
 asm_version=9.4
 fernflower_version=27416e1ed8b6955a64c78bfc21351db5b2412edc
-rdi_version=669ba3a
+rdi_version=c4d6594
 jansi_version=2.4.0
 json_version=20220924
 diffpatch_version=c639936cdbed7e28c7833316161dcb7fae80d0b6

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

@@ -176,6 +176,7 @@ public ClassStorage applyInjector() throws IOException {
 			}
 		}
 		injector.addTransform(storage -> Transform.decomposeVars(storage));
+		injector.addTransform(storage -> Transform.fixTryCatchRange(storage));
 		injector.addTransform(storage -> Transform.replaceCommonConstants(storage));
 		if(hasLWJGL) injector.addVisitor(new GLConstants(null));
 		injector.restoreSourceFile();

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

@@ -57,8 +57,10 @@ protected Stage[] setStages() {
 				if (!Files.exists(srcPath)) {
 					throw new IOException(side.getName() + " sources not found!");
 				}
-				if(Files.list(srcPath).collect(Collectors.toList()).isEmpty()) {
-					return;
+				try(Stream<Path> paths = Files.list(srcPath)) {
+					if(paths.collect(Collectors.toList()).isEmpty()) {
+						return;
+					}
 				}
 
 				final List<File> src = collectSource();

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

@@ -32,9 +32,9 @@ public TaskRun(Side side, MCP instance) {
 	@Override
 	public void doTask() throws Exception {
 		Version currentVersion = mcp.getCurrentVersion();
-		Side runSide = mcp.getOptions().side;
-		if(runSide == Side.ANY) {
-			runSide = side;
+		Side mcpSide = mcp.getOptions().side;
+		if(mcpSide == Side.ANY) {
+			mcpSide = side;
 		}
 
 		String main = getMain(mcp, currentVersion, side);
@@ -45,7 +45,7 @@ public void doTask() throws Exception {
 
 		boolean runBuild = mcp.getOptions().getBooleanParameter(TaskParameter.RUN_BUILD);
 		String[] runArgs = mcp.getOptions().getStringArrayParameter(TaskParameter.RUN_ARGS);
-		List<Path> cpList = getClasspath(mcp, currentVersion, runSide, runBuild);
+		List<Path> cpList = getClasspath(mcp, currentVersion, mcpSide, side, runBuild);
 
 		List<String> classPath = new ArrayList<>();
 		cpList.forEach(p -> classPath.add(p.toAbsolutePath().toString()));
@@ -170,7 +170,7 @@ public static Path getOriginalMCDir() {
 		}
 	}
 
-	private static List<Path> getClasspath(MCP mcp, Version version, Side side, boolean runBuild) {
+	private static List<Path> getClasspath(MCP mcp, Version version, Side side, Side runSide, boolean runBuild) {
 		List<Path> cpList = new ArrayList<>();
 		if(runBuild) {
 			cpList.add(MCPPaths.get(mcp, BUILD_ZIP, side));
@@ -182,11 +182,9 @@ private static List<Path> getClasspath(MCP mcp, Version version, Side side, bool
 			cpList.add(MCPPaths.get(mcp, REMAPPED, side));
 		}
 		else {
-			cpList.add(MCPPaths.get(mcp, JAR_ORIGINAL, side));
-		}
-		if(side == Side.CLIENT || side == Side.MERGED) {
-			cpList.addAll(mcp.getLibraries());
+			cpList.add(MCPPaths.get(mcp, JAR_ORIGINAL, runSide));
 		}
+		cpList.addAll(mcp.getLibraries());
 		return cpList;
 	}
 }

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

@@ -18,7 +18,7 @@ public enum TaskParameter {
 	OBFUSCATION("obf", Boolean.class, false),
 	FULL_BUILD("fullbuild", Boolean.class, false),
 	RUN_BUILD("runbuild", Boolean.class, false),
-	RUN_ARGS("runargs", String[].class, new String[] {"-Xms1024M", "-Xmx1024M", "-Djava.util.Arrays.useLegacyMergeSort=true"}),
+	RUN_ARGS("runargs", String[].class, new String[] {"-Xms1024M", "-Xmx1024M"}),
 	SETUP_VERSION("setup", String.class, null),
 	SOURCE_VERSION("source", Integer.class, -1),
 	TARGET_VERSION("target", Integer.class, -1),

src/main/java/org/mcphackers/mcp/tools/injector/TransformUtil.java

@@ -0,0 +1,26 @@
+package org.mcphackers.mcp.tools.injector;
+
+import org.mcphackers.rdi.injector.data.ClassStorage;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.TryCatchBlockNode;
+
+public class TransformUtil {
+
+	public static final void fixTryCatchRange(ClassStorage storage) {
+		for(ClassNode node : storage) {
+			for(MethodNode m : node.methods) {
+				for(TryCatchBlockNode tryCatch : m.tryCatchBlocks) {
+					AbstractInsnNode endNode = tryCatch.handler.getPrevious();
+					if(endNode.getOpcode() == Opcodes.RETURN || endNode.getOpcode() == Opcodes.GOTO) {
+						if(endNode.getPrevious() != tryCatch.end) {
+							System.out.println("Found a bad try catch in " + m.name + m.desc + " at index " + m.tryCatchBlocks.indexOf(tryCatch));
+						}
+					}
+				}
+			}
+		}
+	}	
+}