Normalize zip entries when reading and use pathSeparator where applicable.

Author: PhoenixVX

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

@@ -85,10 +85,10 @@ protected Stage[] setStages() {
 							List<String> bootcp = new ArrayList<>();
 							bootclasspath.forEach(p -> bootcp.add(p.toAbsolutePath().toString()));
 							if (!bootclasspath.isEmpty()) {
-								options.addAll(Arrays.asList("-bootclasspath", String.join(System.getProperty("path.separator"), bootcp)));
+								options.addAll(Arrays.asList("-bootclasspath", String.join(File.pathSeparator, bootcp)));
 							}
 
-							options.addAll(Arrays.asList("-cp", String.join(System.getProperty("path.separator"), cp)));
+							options.addAll(Arrays.asList("-cp", String.join(File.pathSeparator, cp)));
 
 							setProgress(3);
 

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

@@ -96,7 +96,7 @@ public static void extract(final InputStream zipFile, final Path destDir) throws
 		try (ZipInputStream zipInputStream = new ZipInputStream(zipFile)) {
 			ZipEntry entry;
 			while ((entry = zipInputStream.getNextEntry()) != null) {
-				Path toPath = destDir.resolve(entry.getName());
+				Path toPath = destDir.resolve(entry.getName()).normalize();
 				Files.deleteIfExists(toPath);
 				if (!entry.isDirectory()) {
 					createDirectories(toPath.getParent());
@@ -115,7 +115,7 @@ public static void extract(final Path zipFile, final Path destDir, Function<ZipE
 		try (ZipInputStream zipInputStream = new ZipInputStream(Files.newInputStream(zipFile))) {
 			ZipEntry entry;
 			while ((entry = zipInputStream.getNextEntry()) != null) {
-				Path toPath = destDir.resolve(entry.getName());
+				Path toPath = destDir.resolve(entry.getName()).normalize();
 				Files.deleteIfExists(toPath);
 				if (match.apply(entry)) {
 					if (!entry.isDirectory()) {