From 4c1856f99cd9defed8521ae848de72b02ac21788 Mon Sep 17 00:00:00 2001
From: xirren <xirren@outlook.com>
Date: Fri, 16 Jan 2026 14:48:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E9=99=A4=E5=85=A8=E5=B1=80.hmcl?=
 =?UTF-8?q?=E5=86=85Java?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HMCL/java.cpp |  3 ++-
 HMCL/main.cpp | 15 ---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/HMCL/java.cpp b/HMCL/java.cpp
index d82f210..f1cdc71 100644
--- a/HMCL/java.cpp
+++ b/HMCL/java.cpp
@@ -190,7 +190,8 @@ void HLSearchJavaInPath(HLJavaList &result, const std::wstring &path, LPCWSTR ja
       javaExecutable /= javaExecutableName;
 
       // https://github.com/HMCL-dev/HMCL/issues/4079
-      if (javaExecutable.path.find(L"\\Common Files\\Oracle\\Java\\") == std::wstring::npos) {
+      if ( (javaExecutable.path.find(L"\\Common Files\\Oracle\\Java\\") == std::wstring::npos) || 
+           (javaExecutable.path.find(L"\\COMMON FILES\\ORACLE\\JAVA\\") == std::wstring::npos) ) {
         HLDebugLogVerbose(L"Checking " + javaExecutable.path);
         result.TryAdd(javaExecutable);
       } else {
diff --git a/HMCL/main.cpp b/HMCL/main.cpp
index b091652..c40402d 100644
--- a/HMCL/main.cpp
+++ b/HMCL/main.cpp
@@ -130,21 +130,6 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd
     }
   }
 
-  {
-    const auto appDataPath = HLGetEnvPath(L"APPDATA");
-    if (appDataPath.has_value() && !appDataPath.value().path.empty()) {
-      HLPath hmclJavaDir = appDataPath.value() / L".hmcl\\java";
-      if (isARM64) {
-        hmclJavaDir /= L"windows-arm64";
-      } else if (isX64) {
-        hmclJavaDir /= L"windows-x86_64";
-      } else {
-        hmclJavaDir /= L"windows-x86";
-      }
-      HLSearchJavaInDir(javaRuntimes, hmclJavaDir, javaExecutableName);
-    }
-  }
-
   // Search Java in PATH
   {
     const auto paths = HLGetEnvVar(L"PATH");