将 OS X 重命名为 macOS

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

@@ -88,7 +88,7 @@ public void start(Stage primaryStage) {
             }
 
             // https://lapcatsoftware.com/articles/app-translocation.html
-            if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX
+            if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS
                     && ConfigHolder.isNewlyCreated()
                     && System.getProperty("user.dir").startsWith("/private/var/folders/")) {
                 if (showAlert(AlertType.WARNING, i18n("fatal.mac_app_translocation"), ButtonType.YES, ButtonType.NO) == ButtonType.NO)
@@ -150,7 +150,7 @@ private static boolean isConfigInTempDir() {
                     || configPath.startsWith("/var/cache/")
                     || configPath.startsWith("/dev/shm/")
                     || configPath.contains("/Trash/");
-        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
+        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
             return configPath.startsWith("/var/folders/")
                     || configPath.startsWith("/private/var/folders/")
                     || configPath.startsWith("/tmp/")

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

@@ -67,7 +67,7 @@ public static void main(String[] args) {
             // This environment check will take ~300ms
             thread(Main::fixLetsEncrypt, "CA Certificate Check", true);
 
-        if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
+        if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS)
             initIcon();
 
         checkJavaFX();

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

@@ -83,7 +83,7 @@ public boolean isInstalled(Platform platform, GameJavaVersion gameJavaVersion) {
         try {
             return JavaManager.getExecutable(javaDir).toRealPath();
         } catch (IOException ignored) {
-            if (platform.getOperatingSystem() == OperatingSystem.OSX) {
+            if (platform.getOperatingSystem() == OperatingSystem.MACOS) {
                 try {
                     return JavaManager.getMacExecutable(javaDir).toRealPath();
                 } catch (IOException ignored1) {
@@ -98,14 +98,8 @@ public boolean isInstalled(Platform platform, GameJavaVersion gameJavaVersion) {
         return getJavaExecutable(platform, MOJANG_JAVA_PREFIX + gameJavaVersion.getComponent());
     }
 
-    @Override
-    public Collection<JavaRuntime> getAllJava(Platform platform) {
-        Path root = getPlatformRoot(platform);
-        if (!Files.isDirectory(root))
-            return Collections.emptyList();
-
-        ArrayList<JavaRuntime> list = new ArrayList<>();
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(root)) {
+    private static void getAllJava(List<JavaRuntime> list, Platform platform, Path platformRoot, boolean isManaged) {
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(platformRoot)) {
             for (Path file : stream) {
                 try {
                     String name = file.getFileName().toString();
@@ -115,7 +109,7 @@ public Collection<JavaRuntime> getAllJava(Platform platform) {
                         try {
                             executable = JavaManager.getExecutable(javaDir).toRealPath();
                         } catch (IOException e) {
-                            if (platform.getOperatingSystem() == OperatingSystem.OSX)
+                            if (platform.getOperatingSystem() == OperatingSystem.MACOS)
                                 executable = JavaManager.getMacExecutable(javaDir).toRealPath();
                             else
                                 throw e;
@@ -127,7 +121,7 @@ public Collection<JavaRuntime> getAllJava(Platform platform) {
                                 manifest = JsonUtils.fromJsonFully(input, JavaManifest.class);
                             }
 
-                            list.add(JavaRuntime.of(executable, manifest.getInfo(), true));
+                            list.add(JavaRuntime.of(executable, manifest.getInfo(), isManaged));
                         }
                     }
                 } catch (Throwable e) {
@@ -137,6 +131,23 @@ public Collection<JavaRuntime> getAllJava(Platform platform) {
 
         } catch (IOException ignored) {
         }
+    }
+
+    @Override
+    public Collection<JavaRuntime> getAllJava(Platform platform) {
+        Path platformRoot = getPlatformRoot(platform);
+        if (!Files.isDirectory(platformRoot))
+            return Collections.emptyList();
+
+        ArrayList<JavaRuntime> list = new ArrayList<>();
+
+        getAllJava(list, platform, platformRoot, true);
+        if (platform.getOperatingSystem() == OperatingSystem.MACOS) {
+            platformRoot = root.resolve(platform.getOperatingSystem().getMojangName() + "-" + platform.getArchitecture().getCheckedName());
+            if (Files.isDirectory(platformRoot))
+                getAllJava(list, platform, platformRoot, false);
+        }
+
         return list;
     }
 
@@ -149,7 +160,7 @@ public Task<JavaRuntime> getDownloadJavaTask(DownloadProvider downloadProvider,
             try {
                 executable = JavaManager.getExecutable(javaDir).toRealPath();
             } catch (IOException e) {
-                if (platform.getOperatingSystem() == OperatingSystem.OSX)
+                if (platform.getOperatingSystem() == OperatingSystem.MACOS)
                     executable = JavaManager.getMacExecutable(javaDir).toRealPath();
                 else
                     throw e;

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

@@ -75,7 +75,7 @@ public static String getMojangJavaPlatform(Platform platform) {
             } else if (Architecture.SYSTEM_ARCH == Architecture.X86_64) {
                 return "linux";
             }
-        } else if (platform.getOperatingSystem() == OperatingSystem.OSX) {
+        } else if (platform.getOperatingSystem() == OperatingSystem.MACOS) {
             if (Architecture.SYSTEM_ARCH == Architecture.X86_64) {
                 return "mac-os";
             } else if (Architecture.SYSTEM_ARCH == Architecture.ARM64) {
@@ -113,7 +113,7 @@ public static boolean isCompatible(Platform platform) {
                 if (Architecture.SYSTEM_ARCH == Architecture.X86_64)
                     return architecture == Architecture.X86;
                 break;
-            case OSX:
+            case MACOS:
                 if (Architecture.SYSTEM_ARCH == Architecture.ARM64)
                     return architecture == Architecture.X86_64;
                 break;
@@ -279,7 +279,7 @@ public static JavaRuntime findSuitableJava(Collection<JavaRuntime> javaRuntimes,
         LibraryAnalyzer analyzer = version != null ? LibraryAnalyzer.analyze(version, gameVersion != null ? gameVersion.toString() : null) : null;
 
         boolean forceX86 = Architecture.SYSTEM_ARCH == Architecture.ARM64
-                && (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS || OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
+                && (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS || OperatingSystem.CURRENT_OS == OperatingSystem.MACOS)
                 && (gameVersion == null || gameVersion.compareTo("1.6") < 0);
 
         GameJavaVersion suggestedJavaVersion =
@@ -349,9 +349,9 @@ private static Map<Path, JavaRuntime> searchPotentialJavaExecutables() {
                     searchAllJavaInRepository(javaRuntimes, Platform.WINDOWS_X86);
                 }
                 break;
-            case OSX:
+            case MACOS:
                 if (Architecture.SYSTEM_ARCH == Architecture.ARM64)
-                    searchAllJavaInRepository(javaRuntimes, Platform.OSX_X86_64);
+                    searchAllJavaInRepository(javaRuntimes, Platform.MACOS_X86_64);
                 break;
         }
 
@@ -375,7 +375,7 @@ private static Map<Path, JavaRuntime> searchPotentialJavaExecutables() {
                 searchAllJavaInDirectory(javaRuntimes, Paths.get("/usr/lib64/jvm")); // General locations
                 searchAllJavaInDirectory(javaRuntimes, Paths.get(System.getProperty("user.home"), "/.sdkman/candidates/java")); // SDKMAN!
                 break;
-            case OSX:
+            case MACOS:
                 searchJavaInMacJavaVirtualMachines(javaRuntimes, Paths.get("/Library/Java/JavaVirtualMachines"));
                 searchJavaInMacJavaVirtualMachines(javaRuntimes, Paths.get(System.getProperty("user.home"), "/Library/Java/JavaVirtualMachines"));
                 tryAddJavaExecutable(javaRuntimes, Paths.get("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java"));
@@ -405,7 +405,7 @@ private static Map<Path, JavaRuntime> searchPotentialJavaExecutables() {
                     .ifPresent(it -> searchAllOfficialJava(javaRuntimes, it, false));
         } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX && Architecture.SYSTEM_ARCH == Architecture.X86_64) {
             searchAllOfficialJava(javaRuntimes, Paths.get(System.getProperty("user.home"), ".minecraft/runtime"), false);
-        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
+        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
             searchAllOfficialJava(javaRuntimes, Paths.get(System.getProperty("user.home"), "Library/Application Support/minecraft/runtime"), false);
         }
         searchAllOfficialJava(javaRuntimes, CacheRepository.getInstance().getCacheDirectory().resolve("java"), true);
@@ -548,7 +548,7 @@ private static void tryAddJavaInComponentDir(Map<Path, JavaRuntime> javaRuntimes
             }
         }
 
-        if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
+        if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
             Path macPath = dir.resolve("jre.bundle/Contents/Home");
             if (Files.exists(macPath)) {
                 tryAddJavaHome(javaRuntimes, macPath);
@@ -587,8 +587,8 @@ private static void searchAllOfficialJava(Map<Path, JavaRuntime> javaRuntimes, P
                 }
                 searchAllOfficialJava(javaRuntimes, directory, getMojangJavaPlatform(Platform.WINDOWS_X86), verify);
             }
-        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX && Architecture.CURRENT_ARCH == Architecture.ARM64) {
-            searchAllOfficialJava(javaRuntimes, directory, getMojangJavaPlatform(Platform.OSX_X86_64), verify);
+        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS && Architecture.CURRENT_ARCH == Architecture.ARM64) {
+            searchAllOfficialJava(javaRuntimes, directory, getMojangJavaPlatform(Platform.MACOS_X86_64), verify);
         }
     }
 

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

@@ -293,8 +293,8 @@ public static void initialize(Stage stage) {
         if (!Architecture.SYSTEM_ARCH.isX86() && globalConfig().getPlatformPromptVersion() < 1) {
             Runnable continueAction = () -> globalConfig().setPlatformPromptVersion(1);
 
-            if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX && Architecture.SYSTEM_ARCH == Architecture.ARM64) {
-                Controllers.dialog(i18n("fatal.unsupported_platform.osx_arm64"), null, MessageType.INFO, continueAction);
+            if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS && Architecture.SYSTEM_ARCH == Architecture.ARM64) {
+                Controllers.dialog(i18n("fatal.unsupported_platform.macos_arm64"), null, MessageType.INFO, continueAction);
             } else if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS && Architecture.SYSTEM_ARCH == Architecture.ARM64) {
                 Controllers.dialog(i18n("fatal.unsupported_platform.windows_arm64"), null, MessageType.INFO, continueAction);
             } else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX &&

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

@@ -380,7 +380,7 @@ public static void openFolder(File file) {
         String openCommand;
         if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS)
             openCommand = "explorer.exe";
-        else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
+        else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS)
             openCommand = "/usr/bin/open";
         else if (OperatingSystem.CURRENT_OS.isLinuxOrBSD() && new File("/usr/bin/xdg-open").exists())
             openCommand = "/usr/bin/xdg-open";
@@ -433,7 +433,7 @@ public static void showFileInExplorer(Path file) {
         String[] openCommands;
         if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS)
             openCommands = new String[]{"explorer.exe", "/select,", path};
-        else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
+        else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS)
             openCommands = new String[]{"/usr/bin/open", "-R", path};
         else if (OperatingSystem.CURRENT_OS.isLinuxOrBSD() && which("dbus-send") != null)
             openCommands = new String[]{
@@ -515,7 +515,7 @@ public static void openLink(String link) {
             try {
                 java.awt.Desktop.getDesktop().browse(new URI(link));
             } catch (Throwable e) {
-                if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX)
+                if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS)
                     try {
                         Runtime.getRuntime().exec(new String[]{"/usr/bin/open", link});
                     } catch (IOException ex) {
@@ -776,7 +776,7 @@ public static void setIcon(Stage stage) {
         String icon;
         if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
             icon = "/assets/img/icon.png";
-        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.OSX) {
+        } else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
             icon = "/assets/img/icon-mac.png";
         } else {
             icon = "/assets/img/icon@4x.png";

HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java

@@ -116,10 +116,10 @@ public static Version patchNative(DefaultGameRepository repository,
         if (settings.isNotPatchNatives())
             return version;
 
-        if (arch.isX86() && (os == OperatingSystem.WINDOWS || os == OperatingSystem.LINUX || os == OperatingSystem.OSX))
+        if (arch.isX86() && (os == OperatingSystem.WINDOWS || os == OperatingSystem.LINUX || os == OperatingSystem.MACOS))
             return version;
 
-        if (arch == Architecture.ARM64 && (os == OperatingSystem.OSX || os == OperatingSystem.WINDOWS)
+        if (arch == Architecture.ARM64 && (os == OperatingSystem.MACOS || os == OperatingSystem.WINDOWS)
                 && gameVersionNumber != null
                 && gameVersionNumber.compareTo("1.19") >= 0)
             return version;

HMCL/src/main/resources/assets/HMCLauncher.sh

@@ -14,7 +14,7 @@ case "$OSTYPE" in
   linux*)
     _HMCL_OS="linux";;
   darwin*)
-    _HMCL_OS="osx";;
+    _HMCL_OS="macos";;
   freebsd*)
     _HMCL_OS="freebsd";;
   msys*|cygwin*)
@@ -159,7 +159,7 @@ case "$_HMCL_OS-$_HMCL_ARCH" in
   linux-x86|linux-x86_64|linux-arm64|linux-arm32|linux-riscv64|linux-loongarch64)
     _HMCL_JAVA_DOWNLOAD_PAGE="https://docs.hmcl.net/downloads/linux/$_HMCL_ARCH.html"
     ;;
-  osx-x86_64|osx-arm64)
+  macos-x86_64|macos-arm64)
     _HMCL_JAVA_DOWNLOAD_PAGE="https://docs.hmcl.net/downloads/macos/$_HMCL_ARCH.html"
     ;;
 esac

HMCL/src/main/resources/assets/lang/I18N.properties

@@ -400,7 +400,7 @@ fatal.unsupported_platform=Minecraft is not fully supported on your platform yet
    If you cannot launch Minecraft 1.17 and later, you can try switching the "Renderer" to "Software" in "Global/Instance-specific Settings → Advanced Settings" to use CPU rendering for better compatibility.
 fatal.unsupported_platform.loongarch=Hello Minecraft! Launcher has provided support for the Loongson platform.\n\
    If you encounter problems when playing a game, you can visit https://docs.hmcl.net/groups.html for help.
-fatal.unsupported_platform.osx_arm64=Hello Minecraft! Launcher has provided support for the Apple silicon platform, using native ARM Java to launch games to get a smoother gaming experience.\n\
+fatal.unsupported_platform.macos_arm64=Hello Minecraft! Launcher has provided support for the Apple silicon platform, using native ARM Java to launch games to get a smoother gaming experience.\n\
    If you encounter problems when playing a game, launching the game with Java based on x86-64 architecture may offer better compatibility.
 fatal.unsupported_platform.windows_arm64=Hello Minecraft! Launcher has provided native support for the Windows on Arm platform. If you encounter problems when playing a game, please try launching the game with Java based on x86 architecture.\n\
    \n\

HMCL/src/main/resources/assets/lang/I18N_es.properties

@@ -403,7 +403,7 @@ fatal.unsupported_platform=Minecraft aún no es totalmente compatible con tu pla
   Si no puedes iniciar Minecraft 1.17 y versiones posteriores, puedes probar a cambiar el «Renderizador» a «Software» en «Config. Global/Específica de instancia → Configuración avanzada» para utilizar el renderizado de la CPU y mejorar la compatibilidad.
 fatal.unsupported_platform.loongarch=Hello Minecraft! Launcher ha prestado apoyo a la plataforma Loongson.\n\
   Si tienes problemas al jugar, puedes visitar https://docs.hmcl.net/groups.html para obtener ayuda.
-fatal.unsupported_platform.osx_arm64=Hello Minecraft! Launcher ha proporcionado soporte para la plataforma de chips de Apple, utilizando Java nativo de ARM para ejecutar juegos y conseguir una experiencia de juego más fluida.\n\
+fatal.unsupported_platform.macos_arm64=Hello Minecraft! Launcher ha proporcionado soporte para la plataforma de chips de Apple, utilizando Java nativo de ARM para ejecutar juegos y conseguir una experiencia de juego más fluida.\n\
   Si tienes problemas al jugar a un juego, ejecutarlo con Java de arquitectura x86-64 puede tener mejor compatibilidad.
 fatal.unsupported_platform.windows_arm64=Hello Minecraft! Launcher ha proporcionado soporte nativo para la plataforma Windows en Arm. Si tiene problemas al jugar a un juego, intente iniciarlo con Java de arquitectura x86.\n\
   \n\

HMCL/src/main/resources/assets/lang/I18N_ru.properties

@@ -401,7 +401,7 @@ fatal.unsupported_platform=Minecraft еще не полностью поддер
   Если вы не можете запустить Minecraft 1.17 и более поздние версии, попробуйте переключить «Рендерер» на «Программный» в разделе «Глобальные настройки / Раздельные настройки для сборки → Расширенные настройки», чтобы использовать рендеринг процессора для лучшей совместимости.
 fatal.unsupported_platform.loongarch=Лаунчер обеспечил поддержку платформы Loongson.\n\
   Если у вас возникнут проблемы во время игры, вы можете обратиться за помощью на сайт https://docs.hmcl.net/groups.html.
-fatal.unsupported_platform.osx_arm64=Лаунчер обеспечил поддержку платформы Apple silicon, используя родную ARM Java для запуска игр, чтобы получить более плавный игровой опыт.\n\
+fatal.unsupported_platform.macos_arm64=Лаунчер обеспечил поддержку платформы Apple silicon, используя родную ARM Java для запуска игр, чтобы получить более плавный игровой опыт.\n\
   Если вы столкнулись с проблемами во время игры, запуск игры с Java на базе архитектуры x86-64 может обеспечить лучшую совместимость.
 fatal.unsupported_platform.windows_arm64=Лаунчер обеспечил нативную поддержку платформы Windows на архитектуре Arm. Если у вам возникли проблемы во время игры, попробуйте запустить игру с Java на базе архитектуры x86.\n\
   \n\