mirror/HMCL
2
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-01-30 14:39:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge resources.zip to allow multiple datapack zip containing resources.zip

Browse Source
This commit is contained in:
huanghongxun 2018-09-20 00:12:41 +08:00
parent aa8c386cdd
commit 8b52c46664
3 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/Datapack.java
View File

@ -10,9 +10,7 @@ import javafx.collections.ObservableList;
import org.jackhuang.hmcl.util.*;
import java.io.IOException;
import java.nio.file.FileSystem;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.*;
import java.util.*;
import java.util.logging.Level;
@ -48,7 +46,40 @@ public class Datapack {
}
if (isMultiple) {
new Unzipper(path, worldPath).setReplaceExistentFile(true).unzip();
new Unzipper(path, worldPath)
.setReplaceExistentFile(true)
.setFilter(new Unzipper.FileFilter() {
@Override
public boolean accept(Path destPath, boolean isDirectory, Path zipEntry, String entryPath) {
// We will merge resources.zip instead of replacement.
return !entryPath.equals("resources.zip");
}
})
.unzip();
try (FileSystem dest = CompressingUtils.createWritableZipFileSystem(worldPath.resolve("resources.zip"));
FileSystem zip = CompressingUtils.createReadOnlyZipFileSystem(path)) {
Path resourcesZip = zip.getPath("resources.zip");
if (Files.isRegularFile(resourcesZip)) {
Path temp = Files.createTempFile("hmcl", ".zip");
Files.copy(resourcesZip, temp, StandardCopyOption.REPLACE_EXISTING);
try (FileSystem resources = CompressingUtils.createReadOnlyZipFileSystem(temp)) {
FileUtils.copyDirectory(resources.getPath("/"), dest.getPath("/"));
}
}
Path packMcMeta = dest.getPath("pack.mcmeta");
Files.write(packMcMeta, Arrays.asList("{",
"\t\"pack\": {",
"\t\t\"pack_format\": 4,",
"\t\t\"description\": \"Modified by HMCL.\"",
"\t}",
"}"), StandardOpenOption.CREATE);
Path packPng = dest.getPath("pack.png");
if (Files.isRegularFile(packPng))
Files.delete(packPng);
}
} else {
FileUtils.copyFile(path.toFile(), datapacks.resolve(FileUtils.getName(path)).toFile());
}

2
HMCLCore/src/main/java/org/jackhuang/hmcl/util/CompressingUtils.java
View File

@ -74,7 +74,7 @@ public final class CompressingUtils {
// Since Java 8 throws ZipError stupidly
throw new ZipException(error.getMessage());
} catch (UnsupportedOperationException ex) {
throw new IOException("Not a zip file");
throw new IOException("Not a zip file", ex);
}
}

4
HMCLCore/src/main/java/org/jackhuang/hmcl/util/FileUtils.java
View File

@ -118,7 +118,7 @@ public final class FileUtils {
@Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
Path destFile = dest.resolve(src.relativize(file));
Files.copy(file, destFile);
Files.copy(file, destFile, StandardCopyOption.REPLACE_EXISTING);
return FileVisitResult.CONTINUE;
}
@ -126,7 +126,7 @@ public final class FileUtils {
@Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
Path destDir = dest.resolve(src.relativize(dir));
Files.createDirectory(destDir);
Files.createDirectories(destDir);
return FileVisitResult.CONTINUE;
}