AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-08-03 19:36:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #3218: 修复复制游戏版本里的“复制存档”选项失效问题 (#3868)

Browse Source
This commit is contained in:
e74yp8 2025-05-12 23:21:20 +08:00 committed by GitHub
parent 7cdf4504d1
commit b69602b735
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java
View File

@ -151,18 +151,24 @@ public class HMCLGameRepository extends DefaultGameRepository {
Version fromVersion = getVersion(srcId); Version fromVersion = getVersion(srcId);
if (Files.exists(dstDir)) throw new IOException("Version exists"); List<String> blackList = new ArrayList<>(ModAdviser.MODPACK_BLACK_LIST);
FileUtils.copyDirectory(srcDir, dstDir); blackList.add(srcId + ".jar");
blackList.add(srcId + ".json");
if (!copySaves)
blackList.add("saves");
Path fromJson = dstDir.resolve(srcId + ".json"); if (Files.exists(dstDir)) throw new IOException("Version exists");
Path fromJar = dstDir.resolve(srcId + ".jar"); FileUtils.copyDirectory(srcDir, dstDir, path -> Modpack.acceptFile(path, blackList, null));
Path fromJson = srcDir.resolve(srcId + ".json");
Path fromJar = srcDir.resolve(srcId + ".jar");
Path toJson = dstDir.resolve(dstId + ".json"); Path toJson = dstDir.resolve(dstId + ".json");
Path toJar = dstDir.resolve(dstId + ".jar"); Path toJar = dstDir.resolve(dstId + ".jar");
if (Files.exists(fromJar)) { if (Files.exists(fromJar)) {
Files.move(fromJar, toJar); Files.copy(fromJar, toJar);
} }
Files.move(fromJson, toJson); Files.copy(fromJson, toJson);
FileUtils.writeText(toJson.toFile(), JsonUtils.GSON.toJson(fromVersion.setId(dstId))); FileUtils.writeText(toJson.toFile(), JsonUtils.GSON.toJson(fromVersion.setId(dstId)));
@ -176,12 +182,6 @@ public class HMCLGameRepository extends DefaultGameRepository {
File srcGameDir = getRunDirectory(srcId); File srcGameDir = getRunDirectory(srcId);
File dstGameDir = getRunDirectory(dstId); File dstGameDir = getRunDirectory(dstId);
List<String> blackList = new ArrayList<>(ModAdviser.MODPACK_BLACK_LIST);
blackList.add(srcId + ".jar");
blackList.add(srcId + ".json");
if (!copySaves)
blackList.add("saves");
if (originalGameDirType != GameDirectoryType.VERSION_FOLDER) if (originalGameDirType != GameDirectoryType.VERSION_FOLDER)
FileUtils.copyDirectory(srcGameDir.toPath(), dstGameDir.toPath(), path -> Modpack.acceptFile(path, blackList, null)); FileUtils.copyDirectory(srcGameDir.toPath(), dstGameDir.toPath(), path -> Modpack.acceptFile(path, blackList, null));
} }