Fix reobfuscation

Author: Lassebq

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

@@ -1,22 +1,9 @@
 package org.mcphackers.mcp.tasks;
 
-import static org.mcphackers.mcp.MCPPaths.EXC;
-import static org.mcphackers.mcp.MCPPaths.GAMEDIR;
-import static org.mcphackers.mcp.MCPPaths.JARS_DIR;
-import static org.mcphackers.mcp.MCPPaths.JAR_ORIGINAL;
-import static org.mcphackers.mcp.MCPPaths.MAPPINGS;
-import static org.mcphackers.mcp.MCPPaths.MD5_DIR;
-import static org.mcphackers.mcp.MCPPaths.PATCHES;
-import static org.mcphackers.mcp.MCPPaths.PROJECT;
-import static org.mcphackers.mcp.MCPPaths.REMAPPED;
-import static org.mcphackers.mcp.MCPPaths.SOURCE;
-import static org.mcphackers.mcp.MCPPaths.SOURCE_JAR;
-import static org.mcphackers.mcp.MCPPaths.SOURCE_UNPATCHED;
+import static org.mcphackers.mcp.MCPPaths.*;
 
 import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.PrintStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
@@ -35,16 +22,14 @@
 import org.mcphackers.mcp.tools.versions.json.DependDownload;
 import org.mcphackers.mcp.tools.versions.json.Rule;
 import org.mcphackers.mcp.tools.versions.json.Version;
-import org.mcphackers.rdi.injector.RDInjector;
 import org.mcphackers.rdi.injector.data.ClassStorage;
 import org.mcphackers.rdi.injector.data.Mappings;
 import org.mcphackers.rdi.injector.transform.Transform;
+import org.mcphackers.rdi.nio.MappingsIO;
+import org.mcphackers.rdi.nio.RDInjector;
 import org.mcphackers.rdi.util.IOUtil;
 import org.objectweb.asm.tree.ClassNode;
 
-import codechicken.diffpatch.PatchOperation;
-import codechicken.diffpatch.util.PatchMode;
-
 public class TaskDecompile extends TaskStaged {
 	/*
 	 * Indexes of stages for plugin overrides
@@ -211,7 +196,7 @@ public static Mappings getMappings(Path mappingsPath, ClassStorage storage, Side
 			return null;
 		}
 		boolean joined = MappingUtil.readNamespaces(mappingsPath).contains("official");
-		Mappings mappings = Mappings.read(mappingsPath, joined ? "official" : side.name, "named");
+		Mappings mappings = MappingsIO.read(mappingsPath, joined ? "official" : side.name, "named");
 		for(String name : storage.getAllClasses()) {
 			if(name.indexOf('/') == -1 && !mappings.classes.containsKey(name)) {
 				mappings.classes.put(name, "net/minecraft/src/" + name);

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

@@ -18,9 +18,10 @@
 import org.mcphackers.mcp.tasks.mode.TaskParameter;
 import org.mcphackers.mcp.tools.FileUtil;
 import org.mcphackers.mcp.tools.mappings.MappingUtil;
-import org.mcphackers.rdi.injector.RDInjector;
 import org.mcphackers.rdi.injector.data.ClassStorage;
 import org.mcphackers.rdi.injector.data.Mappings;
+import org.mcphackers.rdi.nio.MappingsIO;
+import org.mcphackers.rdi.nio.RDInjector;
 import org.mcphackers.rdi.util.ClassStorageWriter;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
@@ -119,7 +120,7 @@ private Mappings getMappings(ClassStorage storage, Side side) throws IOException
 		}
 		final boolean enableObfuscation = mcp.getOptions().getBooleanParameter(TaskParameter.OBFUSCATION);
 		boolean joined = MappingUtil.readNamespaces(mappingsPath).contains("official");
-		Mappings mappings = Mappings.read(mappingsPath, "named", joined ? "official" : side.name);
+		Mappings mappings = MappingsIO.read(mappingsPath, "named", joined ? "official" : side.name);
 		modifyClassMappings(mappings, storage.getAllClasses(), enableObfuscation);
 		return mappings;
 	}
@@ -130,7 +131,7 @@ private void modifyClassMappings(Mappings mappings, List<String> classNames, boo
 		for(String className : classNames) {
 			String reobfName = mappings.classes.get(className);
 			if (reobfName == null /*&& !hashes.containsKey(className)*/) {
-				int i1 = className.indexOf('/');
+				int i1 = className.lastIndexOf('/');
 				String packageName = i1 == -1 ? "" : className.substring(0, i1 + 1);
 				String obfPackage = packageMappings.get(packageName);
 				String clsName = i1 == -1 ? className : className.substring(i1 + 1);
@@ -161,8 +162,8 @@ private void modifyClassMappings(Mappings mappings, List<String> classNames, boo
 	private static Map<String, String> getPackageMappings(Map<String, String> classMappings) {
 		Map<String, String> packageMappings = new HashMap<>();
 		for(Entry<String, String> entry : classMappings.entrySet()) {
-			int i1 = entry.getKey().indexOf('/');
-			int i2 = entry.getValue().indexOf('/');
+			int i1 = entry.getKey().lastIndexOf('/');
+			int i2 = entry.getValue().lastIndexOf('/');
 			String name1 = i1 == -1 ? "" : entry.getKey().substring(0, i1 + 1);
 			String name2 = i2 == -1 ? "" : entry.getKey().substring(0, i2 + 1);
 			packageMappings.put(name1, name2);

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

@@ -114,7 +114,7 @@ public static List<String> getLaunchArgs(MCP mcp) {
 			String arg = argsList.get(i);
 			switch (arg) {
 
-			case "${auth_player_name}": arg = "Player"; break;
+			case "${auth_player_name}": arg = "Player094"; break; //Player094 is a free username with no skin
 			case "${auth_session}": arg = "-"; break;
 			case "${user_properties}": arg = "{}"; break;
 			case "${version_name}": arg = ver.id; break;