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

Merge pull request #1067 from Scrumplex/classpath-epicness

Browse Source 
Move classpath definition into NewLaunch itself
This commit is contained in:
flow
2022-08-31 18:28:29 -03:00
committed by GitHub
parent ec29cedeb7 01505910f4
commit ba3ac85356
3 changed files with 76 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
launcher/minecraft/MinecraftInstance.cpp
View File

@ -570,6 +570,11 @@ QString MinecraftInstance::createLaunchScript(AuthSessionPtr session, MinecraftS
if(!profile)
return QString();
for (auto cp : getClassPath())
{
launchScript += "classPath " + cp + "\n";
}
auto mainClass = getMainClass();
if (!mainClass.isEmpty())
{

25
launcher/minecraft/launch/LauncherPartLaunch.cpp
View File

@ -95,8 +95,8 @@ bool fitsInLocal8bit(const QString & string)
void LauncherPartLaunch::executeTask()
{
QString jarPath = APPLICATION->getJarPath("NewLaunch.jar");
if (jarPath.isEmpty())
QString newLaunchJar = APPLICATION->getJarPath("NewLaunch.jar");
if (newLaunchJar.isEmpty())
{
const char *reason = QT_TR_NOOP("Launcher library could not be found. Please check your installation.");
emit logLine(tr(reason), MessageLevel::Fatal);
@ -119,9 +119,6 @@ void LauncherPartLaunch::executeTask()
// make detachable - this will keep the process running even if the object is destroyed
m_process.setDetachable(true);
auto classPath = minecraftInstance->getClassPath();
classPath.prepend(jarPath);
auto natPath = minecraftInstance->getNativePath();
#ifdef Q_OS_WIN
if (!fitsInLocal8bit(natPath))
@ -137,23 +134,7 @@ void LauncherPartLaunch::executeTask()
#endif
args << "-cp";
#ifdef Q_OS_WIN
QStringList processed;
for(auto & item: classPath)
{
if (!fitsInLocal8bit(item))
{
processed << shortPathName(item);
}
else
{
processed << item;
}
}
args << processed.join(';');
#else
args << classPath.join(':');
#endif
args << newLaunchJar;
args << "org.polymc.EntryPoint";
qDebug() << args.join(' ');