From 295869185707dd49290e050b3982aedd51b93f98 Mon Sep 17 00:00:00 2001
From: porter milton <57007161+porterporter@users.noreply.github.com>
Date: Tue, 25 Jun 2024 23:16:26 +0000
Subject: [PATCH] add ~/Library/Java/JavaVirtualMachines/* to java installation
 detection

Signed-off-by: porter milton <57007161+porterporter@users.noreply.github.com>
---
 launcher/java/JavaUtils.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
index b6c51be78..29db8c026 100644
--- a/launcher/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.cpp
@@ -378,6 +378,14 @@ QList<QString> JavaUtils::FindJavaPaths()
     // javas downloaded by sdkman
     javas.append(FS::PathCombine(home, ".sdkman/candidates/java"));
 
+    // java in user library folder (like from intellij downloads)
+    QDir userLibraryJVMDir(FS::PathCombine(home, "Library/Java/JavaVirtualMachines/"));
+    QStringList userLibraryJVMJavas = userLibraryJVMDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+    foreach (const QString& java, userLibraryJVMJavas) {
+        javas.append(userLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Home/bin/java");
+        javas.append(userLibraryJVMDir.absolutePath() + "/" + java + "/Contents/Commands/java");
+    }
+
     javas.append(getMinecraftJavaBundle());
     javas = addJavasFromEnv(javas);
     javas.removeDuplicates();