fix: cannot rename game version sometimes

HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorController.java

@@ -59,6 +59,7 @@ import java.util.Locale;
 import java.util.Optional;
 import java.util.Random;
 import java.util.logging.Level;
+import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.toList;
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
@@ -170,8 +171,8 @@ public class DecoratorController {
         }
 
         List<Path> candidates;
-        try {
+        try (Stream<Path> stream = Files.list(imageDir)) {
-            candidates = Files.list(imageDir)
+            candidates = stream
                 .filter(Files::isRegularFile)
                     .filter(it -> {
                         String filename = it.getFileName().toString();

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListPage.java

@@ -43,6 +43,7 @@ import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
@@ -69,7 +70,7 @@ public class WorldListPage extends ListPageBase<WorldListItem> {
     }
 
     @Override
-    protected ToolbarListPageSkin createDefaultSkin() {
+    protected ToolbarListPageSkin<WorldListPage> createDefaultSkin() {
         return new WorldListPageSkin();
     }
 
@@ -87,7 +88,11 @@ public class WorldListPage extends ListPageBase<WorldListItem> {
         setLoading(true);
         return CompletableFuture
                 .runAsync(() -> gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(id)).orElse(null))
-                .thenApplyAsync(unused -> World.getWorlds(savesDir).parallel().collect(Collectors.toList()))
+                .thenApplyAsync(unused -> {
+                    try (Stream<World> stream = World.getWorlds(savesDir)) {
+                        return stream.parallel().collect(Collectors.toList());
+                    }
+                })
                 .whenCompleteAsync((result, exception) -> {
                     worlds = result;
                     setLoading(false);

HMCLCore/src/main/java/org/jackhuang/hmcl/game/World.java

@@ -102,12 +102,14 @@ public class World {
                 return;
             }
 
-            Path root = Files.list(fs.getPath("/")).filter(Files::isDirectory).findAny()
+            try (Stream<Path> stream = Files.list(fs.getPath("/"))) {
+                Path root = stream.filter(Files::isDirectory).findAny()
                         .orElseThrow(() -> new IOException("Not a valid world zip file"));
                 fileName = FileUtils.getName(root);
                 loadFromZipImpl(root);
             }
         }
+    }
 
     private void getWorldName(Path levelDat) throws IOException {
         CompoundTag nbt = parseLevelDat(levelDat);
@@ -173,7 +175,8 @@ public class World {
 
                     new Unzipper(file, worldDir).unzip();
                 } else {
-                    List<Path> subDirs = Files.list(fs.getPath("/")).collect(Collectors.toList());
+                    try (Stream<Path> stream = Files.list(fs.getPath("/"))) {
+                        List<Path> subDirs = stream.collect(Collectors.toList());
                         if (subDirs.size() != 1) {
                             throw new IOException("World zip malformed");
                         }
@@ -182,6 +185,7 @@ public class World {
                                 .setSubDirectory("/" + subDirectoryName + "/")
                                 .unzip();
                     }
+                }
 
             }
             new World(worldDir).rename(name);
@@ -211,7 +215,7 @@ public class World {
 
     public static Stream<World> getWorlds(Path savesDir) {
         try {
-            if (Files.exists(savesDir))
+            if (Files.exists(savesDir)) {
                 return Files.list(savesDir).flatMap(world -> {
                     try {
                         return Stream.of(new World(world));
@@ -220,6 +224,7 @@ public class World {
                         return Stream.empty();
                     }
                 });
+            }
         } catch (IOException e) {
             Logging.LOG.log(Level.WARNING, "Failed to read saves", e);
         }

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/Datapack.java

@@ -58,13 +58,16 @@ public class Datapack {
         Set<String> packs = new HashSet<>();
         for (Pack pack : info) packs.add(pack.getId());
 
-        if (Files.isDirectory(datapacks))
+        if (Files.isDirectory(datapacks)) {
-            for (Path datapack : Files.newDirectoryStream(datapacks)) {
+            try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(datapacks)) {
+                for (Path datapack : directoryStream) {
                     if (Files.isDirectory(datapack) && packs.contains(FileUtils.getName(datapack)))
                         FileUtils.deleteDirectory(datapack.toFile());
                     else if (Files.isRegularFile(datapack) && packs.contains(FileUtils.getNameWithoutExtension(datapack)))
                         Files.delete(datapack);
                 }
+            }
+        }
 
         if (isMultiple) {
             new Unzipper(path, worldPath)
@@ -148,8 +151,9 @@ public class Datapack {
     private void loadFromDir(Path dir) throws IOException {
         List<Pack> info = new ArrayList<>();
 
-        if (Files.isDirectory(dir))
+        if (Files.isDirectory(dir)) {
-            for (Path subDir : Files.newDirectoryStream(dir)) {
+            try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(dir)) {
+                for (Path subDir : directoryStream) {
                     if (Files.isDirectory(subDir)) {
                         Path mcmeta = subDir.resolve("pack.mcmeta");
                         Path mcmetaDisabled = subDir.resolve("pack.mcmeta.disabled");
@@ -188,6 +192,8 @@ public class Datapack {
                         }
                     }
                 }
+            }
+        }
 
         Platform.runLater(() -> this.info.setAll(info));
     }

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModManager.java

@@ -24,6 +24,7 @@ import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
@@ -91,16 +92,21 @@ public final class ModManager {
     public void refreshMods() throws IOException {
         modInfos.clear();
         if (Files.isDirectory(getModsDirectory())) {
-            for (Path subitem : Files.newDirectoryStream(getModsDirectory())) {
+            try (DirectoryStream<Path> modsDirectoryStream = Files.newDirectoryStream(getModsDirectory())) {
+                for (Path subitem : modsDirectoryStream) {
                     if (Files.isDirectory(subitem) && VersionNumber.isIntVersionNumber(FileUtils.getName(subitem))) {
                         // If the folder name is game version, forge will search mod in this subdirectory
-                    for (Path subsubitem : Files.newDirectoryStream(subitem))
+                        try (DirectoryStream<Path> subitemDirectoryStream = Files.newDirectoryStream(subitem)) {
+                            for (Path subsubitem : subitemDirectoryStream) {
                                 addModInfo(subsubitem.toFile());
+                            }
+                        }
                     } else {
                         addModInfo(subitem.toFile());
                     }
                 }
             }
+        }
         loaded = true;
     }
 

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/multimc/MultiMCInstanceConfiguration.java

@@ -30,6 +30,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Optional;
 import java.util.Properties;
+import java.util.stream.Stream;
 
 /**
  *
@@ -334,11 +335,13 @@ public final class MultiMCInstanceConfiguration {
 
     public static Path getRootPath(Path root) throws IOException {
         if (testPath(root)) return root;
-        Path candidate = Files.list(root).filter(Files::isDirectory).findAny()
+        try (Stream<Path> stream = Files.list(root)) {
+            Path candidate = stream.filter(Files::isDirectory).findAny()
                     .orElseThrow(() -> new IOException("Not a valid MultiMC modpack"));
             if (testPath(candidate)) return candidate;
             throw new IOException("Not a valid MultiMC modpack");
         }
+    }
 
     public static Modpack readMultiMCModpackManifest(Path modpackFile, Charset encoding) throws IOException {
         try (FileSystem fs = CompressingUtils.readonly(modpackFile).setEncoding(encoding).build()) {

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/multimc/MultiMCModpackInstallTask.java

@@ -36,6 +36,7 @@ import org.jackhuang.hmcl.util.io.IOUtils;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.DirectoryStream;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -148,8 +149,9 @@ public final class MultiMCModpackInstallTask extends Task<Void> {
             Path root = MultiMCInstanceConfiguration.getRootPath(fs.getPath("/"));
             Path patches = root.resolve("patches");
 
-            if (Files.exists(patches))
+            if (Files.exists(patches)) {
-                for (Path patchJson : Files.newDirectoryStream(patches)) {
+                try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(patches)) {
+                    for (Path patchJson : directoryStream) {
                         if (patchJson.toString().endsWith(".json")) {
                             // If json is malformed, we should stop installing this modpack instead of skipping it.
                             MultiMCInstancePatch multiMCPatch = JsonUtils.GSON.fromJson(IOUtils.readFullyAsString(Files.newInputStream(patchJson)), MultiMCInstancePatch.class);
@@ -164,6 +166,8 @@ public final class MultiMCModpackInstallTask extends Task<Void> {
                             version = version.addPatch(patch);
                         }
                     }
+                }
+            }
 
             Path libraries = root.resolve("libraries");
             if (Files.exists(libraries))

HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/JavaVersion.java

@@ -176,8 +176,8 @@ public final class JavaVersion {
 
         List<JavaVersion> javaVersions;
 
-        try {
+        try (Stream<Path> stream = searchPotentialJavaHomes()) {
-            javaVersions = lookupJavas(searchPotentialJavaHomes());
+            javaVersions = lookupJavas(stream);
         } catch (IOException e) {
             LOG.log(Level.WARNING, "Failed to search Java homes", e);
             javaVersions = new ArrayList<>();