lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复未下载陶瓦联机时打开陶瓦联机页面抛出异常的问题 (#5166)

Browse Source
This commit is contained in:
Glavo
2026-01-11 21:00:35 +08:00
committed by GitHub
parent 3dc1631207
commit 9ea419c05b
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaMetadata.java
View File

@@ -169,6 +169,9 @@ public final class TerracottaMetadata {
public static void removeLegacyVersionFiles() { public static void removeLegacyVersionFiles() {
try (DirectoryStream<Path> terracotta = collectLegacyVersionFiles()) { try (DirectoryStream<Path> terracotta = collectLegacyVersionFiles()) {
if (terracotta == null)
return;
for (Path path : terracotta) { for (Path path : terracotta) {
try { try {
FileUtils.deleteDirectory(path); FileUtils.deleteDirectory(path);
@@ -183,13 +186,17 @@ public final class TerracottaMetadata {
public static boolean hasLegacyVersionFiles() throws IOException { public static boolean hasLegacyVersionFiles() throws IOException {
try (DirectoryStream<Path> terracotta = collectLegacyVersionFiles()) { try (DirectoryStream<Path> terracotta = collectLegacyVersionFiles()) {
return terracotta.iterator().hasNext(); return terracotta != null && terracotta.iterator().hasNext();
} }
} }
private static DirectoryStream<Path> collectLegacyVersionFiles() throws IOException { private static @Nullable DirectoryStream<Path> collectLegacyVersionFiles() throws IOException {
Path terracottaDir = Metadata.DEPENDENCIES_DIRECTORY.resolve("terracotta");
if (Files.notExists(terracottaDir))
return null;
VersionRange<VersionNumber> range = VersionNumber.atMost(LATEST); VersionRange<VersionNumber> range = VersionNumber.atMost(LATEST);
return Files.newDirectoryStream(Metadata.DEPENDENCIES_DIRECTORY.resolve("terracotta"), path -> { return Files.newDirectoryStream(terracottaDir, path -> {
String name = FileUtils.getName(path); String name = FileUtils.getName(path);
return !LATEST.equals(name) && range.contains(VersionNumber.asVersion(name)); return !LATEST.equals(name) && range.contains(VersionNumber.asVersion(name));
}); });