ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix bundled java detection on mac

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2024-04-23 08:52:17 +03:00
parent 5eeb3b7768
commit dbfd535b38
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
launcher/java/JavaUtils.cpp
View File

@ -441,13 +441,13 @@ QString JavaUtils::getJavaCheckPath()
QStringList getMinecraftJavaBundle() QStringList getMinecraftJavaBundle()
{ {
QString partialPath;
QString executable = "java"; QString executable = "java";
QStringList processpaths; QStringList processpaths;
#if defined(Q_OS_OSX) #if defined(Q_OS_OSX)
partialPath = FS::PathCombine(QDir::homePath(), "Library/Application Support"); processpaths << FS::PathCombine(QDir::homePath(), FS::PathCombine("Library", "Application Support", "minecraft", "runtime"));
#elif defined(Q_OS_WIN32) #elif defined(Q_OS_WIN32)
partialPath = QProcessEnvironment::systemEnvironment().value("LOCALAPPDATA", ""); QString partialPath = QProcessEnvironment::systemEnvironment().value("LOCALAPPDATA", "");
processpaths << FS::PathCombine(partialPath, ".minecraft", "runtime");
executable += "w.exe"; executable += "w.exe";
// add the microsoft store version of the launcher to the search. the current path is: // add the microsoft store version of the launcher to the search. the current path is:
@ -457,10 +457,8 @@ QStringList getMinecraftJavaBundle()
minecraftMSStorePath = FS::PathCombine(minecraftMSStorePath, "LocalCache", "Local", "runtime"); minecraftMSStorePath = FS::PathCombine(minecraftMSStorePath, "LocalCache", "Local", "runtime");
processpaths << minecraftMSStorePath; processpaths << minecraftMSStorePath;
#else #else
partialPath = QDir::homePath(); processpaths << FS::PathCombine(QDir::homePath(), ".minecraft", "runtime");
#endif #endif
auto minecraftDataPath = FS::PathCombine(partialPath, ".minecraft", "runtime");
processpaths << minecraftDataPath;
QStringList javas; QStringList javas;
while (!processpaths.isEmpty()) { while (!processpaths.isEmpty()) {