清理 OperatingSystem (#3925)

Author: Glavo

HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java

@@ -296,7 +296,7 @@ public static void stopWithoutPlatform() {
             Controllers.getStage().close();
             Schedulers.shutdown();
             Controllers.shutdown();
-            Lang.executeDelayed(OperatingSystem::forceGC, TimeUnit.SECONDS, 5, true);
+            Lang.executeDelayed(System::gc, TimeUnit.SECONDS, 5, true);
         });
     }
 

HMCL/src/main/java/org/jackhuang/hmcl/java/JavaManager.java

@@ -41,6 +41,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.*;
 import java.util.*;
@@ -411,7 +412,7 @@ private static Map<Path, JavaRuntime> searchPotentialJavaExecutables() {
 
         // Search in PATH.
         if (System.getenv("PATH") != null) {
-            String[] paths = System.getenv("PATH").split(OperatingSystem.PATH_SEPARATOR);
+            String[] paths = System.getenv("PATH").split(File.pathSeparator);
             for (String path : paths) {
                 try {
                     tryAddJavaExecutable(javaRuntimes, Paths.get(path, OperatingSystem.CURRENT_OS.getJavaExecutable()));
@@ -421,7 +422,7 @@ private static Map<Path, JavaRuntime> searchPotentialJavaExecutables() {
         }
 
         if (System.getenv("HMCL_JRES") != null) {
-            String[] paths = System.getenv("HMCL_JRES").split(OperatingSystem.PATH_SEPARATOR);
+            String[] paths = System.getenv("HMCL_JRES").split(File.pathSeparator);
             for (String path : paths) {
                 try {
                     tryAddJavaHome(javaRuntimes, Paths.get(path));

HMCL/src/main/java/org/jackhuang/hmcl/ui/GameCrashWindow.java

@@ -265,7 +265,7 @@ private void exportGameCrashInfo() {
         Path logFile = Paths.get("minecraft-exported-crash-info-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss")) + ".zip").toAbsolutePath();
 
         CompletableFuture.supplyAsync(() ->
-                        logs.stream().map(Log::getLog).collect(Collectors.joining(OperatingSystem.LINE_SEPARATOR)))
+                        logs.stream().map(Log::getLog).collect(Collectors.joining("\n")))
                 .thenComposeAsync(logs ->
                         LogExporter.exportLogs(logFile, repository, launchOptions.getVersionName(), logs, new CommandBuilder().addAll(managedProcess.getCommands()).toString()))
                 .handleAsync((result, exception) -> {

HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeNewInstallTask.java

@@ -41,7 +41,6 @@
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.CommandBuilder;
 import org.jackhuang.hmcl.java.JavaRuntime;
-import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jackhuang.hmcl.util.platform.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 
@@ -140,7 +139,7 @@ public void execute() throws Exception {
                 classpath.add(file.toString());
             }
             classpath.add(jar.toString());
-            command.add(String.join(OperatingSystem.PATH_SEPARATOR, classpath));
+            command.add(String.join(File.pathSeparator, classpath));
 
             command.add(mainClass);
 

HMCLCore/src/main/java/org/jackhuang/hmcl/download/neoforge/NeoForgeOldInstallTask.java

@@ -37,7 +37,6 @@
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.CommandBuilder;
 import org.jackhuang.hmcl.java.JavaRuntime;
-import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jackhuang.hmcl.util.platform.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 
@@ -136,7 +135,7 @@ public void execute() throws Exception {
                 classpath.add(file.toString());
             }
             classpath.add(jar.toString());
-            command.add(String.join(OperatingSystem.PATH_SEPARATOR, classpath));
+            command.add(String.join(File.pathSeparator, classpath));
 
             command.add(mainClass);
 

HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java

@@ -255,7 +255,7 @@ private Command generateCommandLine(File nativeFolder) throws IOException {
         // Provided Minecraft arguments
         Path gameAssets = repository.getActualAssetDirectory(version.getId(), version.getAssetIndex().getId());
         Map<String, String> configuration = getConfigurations();
-        configuration.put("${classpath}", String.join(OperatingSystem.PATH_SEPARATOR, classpath));
+        configuration.put("${classpath}", String.join(File.pathSeparator, classpath));
         configuration.put("${game_assets}", gameAssets.toAbsolutePath().toString());
         configuration.put("${assets_root}", gameAssets.toAbsolutePath().toString());
 
@@ -434,7 +434,7 @@ protected Map<String, String> getConfigurations() {
                 pair("${resolution_width}", options.getWidth().toString()),
                 pair("${resolution_height}", options.getHeight().toString()),
                 pair("${library_directory}", repository.getLibrariesDirectory(version).getAbsolutePath()),
-                pair("${classpath_separator}", OperatingSystem.PATH_SEPARATOR),
+                pair("${classpath_separator}", File.pathSeparator),
                 pair("${primary_jar}", repository.getVersionJar(version).getAbsolutePath()),
                 pair("${language}", Locale.getDefault().toString()),
 
@@ -444,7 +444,7 @@ protected Map<String, String> getConfigurations() {
                 // when we propose this placeholder.
                 pair("${libraries_directory}", repository.getLibrariesDirectory(version).getAbsolutePath()),
                 // file_separator is used in -DignoreList
-                pair("${file_separator}", OperatingSystem.FILE_SEPARATOR),
+                pair("${file_separator}", File.separator),
                 pair("${primary_jar_name}", FileUtils.getName(repository.getVersionJar(version).toPath()))
         );
     }

HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java

@@ -17,8 +17,6 @@
  */
 package org.jackhuang.hmcl.util;
 
-import org.jackhuang.hmcl.util.platform.OperatingSystem;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.*;
@@ -42,7 +40,7 @@ public static String getStackTrace(Throwable throwable) {
     public static String getStackTrace(StackTraceElement[] elements) {
         StringBuilder builder = new StringBuilder();
         for (StackTraceElement element : elements)
-            builder.append("\tat ").append(element).append(OperatingSystem.LINE_SEPARATOR);
+            builder.append("\tat ").append(element).append(System.lineSeparator());
         return builder.toString();
     }
 

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

@@ -22,7 +22,6 @@
 import org.jackhuang.hmcl.util.platform.windows.WinTypes;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.Charset;
@@ -85,10 +84,6 @@ public String getJavaExecutable() {
      */
     public static final OperatingSystem CURRENT_OS = parseOSName(System.getProperty("os.name"));
 
-    public static final String PATH_SEPARATOR = File.pathSeparator;
-    public static final String FILE_SEPARATOR = File.separator;
-    public static final String LINE_SEPARATOR = System.lineSeparator();
-
     /**
      * The system default charset.
      */
@@ -296,16 +291,6 @@ public static boolean isWindows7OrLater() {
         return IS_WINDOWS_7_OR_LATER;
     }
 
-    @SuppressWarnings("removal")
-    public static void forceGC() {
-        System.gc();
-        try {
-            System.runFinalization();
-            System.gc();
-        } catch (NoSuchMethodError ignored) {
-        }
-    }
-
     public static Path getWorkingDirectory(String folder) {
         String home = System.getProperty("user.home", ".");
         switch (OperatingSystem.CURRENT_OS) {

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

@@ -47,7 +47,7 @@ private SystemUtils() {
             return null;
 
         try {
-            for (String item : path.split(OperatingSystem.PATH_SEPARATOR)) {
+            for (String item : path.split(File.pathSeparator)) {
                 try {
                     Path program = Paths.get(item, command);
                     if (Files.isExecutable(program))