CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added additional minecraft java path for windows

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-11-07 10:20:53 +02:00
parent baa988ec81
commit c78d35d699
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
launcher/java/JavaUtils.cpp
View File

@ -34,6 +34,7 @@
*/ */
#include <QDir> #include <QDir>
#include <QFileInfo>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
@ -440,18 +441,26 @@ QStringList getMinecraftJavaBundle()
{ {
QString partialPath; QString partialPath;
QString executable = "java"; QString executable = "java";
QStringList processpaths;
#if defined(Q_OS_OSX) #if defined(Q_OS_OSX)
partialPath = FS::PathCombine(QDir::homePath(), "Library/Application Support"); partialPath = FS::PathCombine(QDir::homePath(), "Library/Application Support");
#elif defined(Q_OS_WIN32) #elif defined(Q_OS_WIN32)
partialPath = QProcessEnvironment::systemEnvironment().value("LOCALAPPDATA", ""); partialPath = QProcessEnvironment::systemEnvironment().value("LOCALAPPDATA", "");
executable += "w.exe"; executable += "w.exe";
// add the following to the search
// C:\Users\USERNAME\AppData\Local\Packages\Microsoft.4297127D64EC6_8wekyb3d8bbwe\LocalCache\Local\runtime
auto minecraftInstaltionPath =
FS::PathCombine(QFileInfo(partialPath).absolutePath(), "Local", "Packages", "Microsoft.4297127D64EC6_8wekyb3d8bbwe");
minecraftInstaltionPath = FS::PathCombine(minecraftInstaltionPath, "LocalCache", "Local", "runtime");
processpaths << minecraftInstaltionPath;
#else #else
partialPath = QDir::homePath(); partialPath = QDir::homePath();
#endif #endif
auto minecraftPath = FS::PathCombine(partialPath, ".minecraft", "runtime"); auto minecraftDataPath = FS::PathCombine(partialPath, ".minecraft", "runtime");
QStringList javas; processpaths << minecraftDataPath;
QStringList processpaths{ minecraftPath };
QStringList javas;
while (!processpaths.isEmpty()) { while (!processpaths.isEmpty()) {
auto dirPath = processpaths.takeFirst(); auto dirPath = processpaths.takeFirst();
QDir dir(dirPath); QDir dir(dirPath);