fix: Align the windows java path

xmcl-runtime/java/JavaService.ts

@@ -16,6 +16,7 @@ import { readdirIfPresent } from '../util/fs'
 import { requireString } from '../util/object'
 import { SafeFile, createSafeFile } from '../util/persistance'
 import { ensureClass, getJavaArch } from './detectJVMArch'
+import { getMojangJavaPaths, getOpenJdkPaths, getOrcaleJavaPaths } from './javaPaths'
 
 @ExposeServiceKey(JavaServiceKey)
 export class JavaService extends StatefulService<JavaState> implements IJavaService {
@@ -204,9 +205,11 @@ export class JavaService extends StatefulService<JavaState> implements IJavaServ
       this.log('Force update or no local cache found. Scan java through the disk.')
       const commonLocations = [] as string[]
       if (this.app.platform.os === 'windows') {
-        let files = await readdirIfPresent('C:\\Program Files\\Java')
-        files = files.map(f => join('C:\\Program Files\\Java', f, 'bin', 'java.exe'))
-        commonLocations.push(...files)
+        commonLocations.push(
+          ...await getMojangJavaPaths(),
+          ...await getOrcaleJavaPaths(),
+          ...await getOpenJdkPaths(),
+        )
       }
       const javas = await scanLocalJava(commonLocations)
       const infos = await Promise.all(javas.map(async (j) => ({ ...j, valid: true, arch: await getJavaArch(this.app, j.path) })))

xmcl-runtime/java/javaPaths.ts

@@ -0,0 +1,21 @@
+import { readdir } from 'fs-extra'
+import { join } from 'path'
+
+export async function getMojangJavaPaths() {
+  const runtimeDir = 'C:\\Program Files (x86)\\Minecraft Launcher\\runtime'
+  const runtimes = await readdir(runtimeDir).catch(() => [])
+  const arch = process.arch === 'ia32' ? 'x86' : 'x64'
+  const platformArch = `windows-${arch}`
+  return runtimes.map((runtime) => join(runtimeDir, runtime, platformArch, runtime, 'bin', 'javaw.exe'))
+    .flat()
+}
+
+export async function getOrcaleJavaPaths() {
+  const files = await readdir('C:\\Program Files\\Java').catch(() => [])
+  return files.map(f => join('C:\\Program Files\\Java', f, 'bin', 'javaw.exe'))
+}
+
+export async function getOpenJdkPaths() {
+  const files = await readdir('C:\\Program Files\\AdoptOpenJDK').catch(() => [])
+  return files.map(f => join('C:\\Program Files\\AdoptOpenJDK', f, 'bin', 'javaw.exe'))
+}