Fixed zip packaging on linux

Author: Lassebq

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

@@ -32,22 +32,18 @@ public void doTask() throws Exception {
 		List<String> cpList = new LinkedList<>();
 		if(side == SERVER) {
 			if(MCP.config.runBuild) {
-				cpList.add(FileUtil.absolutePathString(MCPConfig.BUILD_JAR_SERVER));
-			}
-			else {
-				cpList.add(FileUtil.absolutePathString(MCPConfig.SERVER_BIN));
-				cpList.add(FileUtil.absolutePathString(MCPConfig.SERVER));
+				cpList.add(FileUtil.absolutePathString(MCPConfig.BUILD_ZIP_SERVER));
 			}
+			cpList.add(FileUtil.absolutePathString(MCPConfig.SERVER_BIN));
+			cpList.add(FileUtil.absolutePathString(MCPConfig.SERVER));
 		}
 		else if (side == CLIENT) {
 			if(MCP.config.runBuild) {
-				cpList.add(FileUtil.absolutePathString(MCPConfig.BUILD_JAR_CLIENT));
+				cpList.add(FileUtil.absolutePathString(MCPConfig.BUILD_ZIP_CLIENT));
 			}
-			else {
-				cpList.add(FileUtil.absolutePathString(MCPConfig.CLIENT_BIN));
-				if(!Files.exists(Paths.get(MCPConfig.CLIENT_FIXED))) {
-					cpList.add(FileUtil.absolutePathString(MCPConfig.CLIENT));
-				}
+			cpList.add(FileUtil.absolutePathString(MCPConfig.CLIENT_BIN));
+			if(!Files.exists(Paths.get(MCPConfig.CLIENT_FIXED))) {
+				cpList.add(FileUtil.absolutePathString(MCPConfig.CLIENT));
 			}
 			List<String> libraries = new ArrayList();
 			try(Stream<Path> stream = Files.list(Paths.get(MCPConfig.LIB)).filter(library -> !library.endsWith(".jar")).filter(library -> !Files.isDirectory(library))) {
@@ -69,24 +65,26 @@ else if (side == CLIENT) {
 						"-Dorg.lwjgl.librarypath=" + natives,
 						"-Dnet.java.games.input.librarypath=" + natives,
 						"-cp", cp,
-						side == SERVER ? (VersionsParser.getServerVersion().startsWith("c") ? "com.mojang.minecraft.server.MinecraftServer" : "net.minecraft.server.MinecraftServer") : "Start"));
+						side == SERVER ? (VersionsParser.getServerVersion().startsWith("c") ? "com.mojang.minecraft.server.MinecraftServer" : "net.minecraft.server.MinecraftServer")
+																	  : MCP.config.runBuild ? "net.minecraft.client.Minecraft" : "Start"));
 		for(int i = 1; i < MCP.config.runArgs.length; i++) {
 			String arg = MCP.config.runArgs[i];
-			for(String arg2 : args) {
-				if(arg.indexOf("=") > 0 && arg2.indexOf("=") > 0) {
-					if(arg2.substring(0, arg2.indexOf("=")).equals(arg.substring(0, arg.indexOf("=")))) {
+			if(!arg.equals("-runbuild")) {
+				for(String arg2 : args) {
+					if(arg.indexOf("=") > 0 && arg2.indexOf("=") > 0) {
+						if(arg2.substring(0, arg2.indexOf("=")).equals(arg.substring(0, arg.indexOf("=")))) {
+							args.remove(arg2);
+							break;
+						}
+					}
+					else if(arg2.equals(arg)) {
 						args.remove(arg2);
 						break;
 					}
 				}
-				else if(arg2.equals(arg)) {
-					args.remove(arg2);
-					break;
-				}
+				args.add(1, arg);
 			}
-			args.add(1, arg);
 		}
-		//MCP.logger.println(args);
 		int exit = Util.runCommand(args.toArray(new String[0]), Paths.get(MCPConfig.JARS), true);
 		if(exit != 0) {
 			throw new RuntimeException("Finished with exit value " + exit);

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

@@ -179,13 +179,14 @@ public static void copyDirectory(Path sourceFolder, Path targetFolder) throws IO
 		copyDirectory(sourceFolder, targetFolder, new String[] {});
 	}
 
+	//FIXME: Path separators are broken on Linux
 	public static void compress(Path sourceDir, Path target) throws IOException {
 		final ZipOutputStream outputStream = new ZipOutputStream(new FileOutputStream(target.toFile()));
 		Files.walkFileTree(sourceDir, new SimpleFileVisitor<Path>() {
 			@Override
 			public FileVisitResult visitFile(Path file, BasicFileAttributes attributes) throws IOException {
 				Path targetFile = sourceDir.relativize(file);
-				outputStream.putNextEntry(new ZipEntry(targetFile.toString()));
+				outputStream.putNextEntry(new ZipEntry(targetFile.toString().replace("\\", "/")));
 				byte[] bytes = Files.readAllBytes(file);
 				outputStream.write(bytes, 0, bytes.length);
 				outputStream.closeEntry();

src/main/java/org/mcphackers/mcp/tools/mappings/MappingUtil.java

@@ -8,7 +8,6 @@
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.regex.Pattern;
 
@@ -82,7 +81,6 @@ public void visit(int version, int access, String name, String signature, String
 									super.visit(version, access, name, signature, superName, interfaces);
 								}
 
-								//TODO Figure out why it doesn't work
 								@Override
 								public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
 									if (kind == MappedElementKind.FIELD) {
@@ -97,7 +95,6 @@ public FieldVisitor visitField(int access, String name, String descriptor, Strin
 									return super.visitField(access, name, descriptor, signature, value);
 								}
 
-								//TODO Figure out why it doesn't work
 								@Override
 								public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
 									if (kind == MappedElementKind.METHOD) {