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

NOISSUE Split MultiMC app object into MultiMC and Env

Browse Source
This commit is contained in:
Petr Mrázek
2015-01-31 16:59:03 +01:00
parent e508728246
commit 6f3aa65bd6
44 changed files with 343 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
logic/minecraft/MinecraftProcess.cpp
View File

@ -151,7 +151,7 @@ QStringList MinecraftProcess::javaArguments() const
args << "-Duser.language=en";
if (!m_nativeFolder.isEmpty())
args << QString("-Djava.library.path=%1").arg(m_nativeFolder);
args << "-jar" << PathCombine(MMC->bin(), "jars", "NewLaunch.jar");
args << "-jar" << PathCombine(QCoreApplication::applicationDirPath(), "jars", "NewLaunch.jar");
return args;
}

4
logic/minecraft/MinecraftVersion.cpp
View File

@ -152,9 +152,7 @@ QString MinecraftVersion::getPatchFilename()
bool MinecraftVersion::needsUpdate()
{
auto settings = MMC->settings();
bool result = m_versionSource == Remote || (hasUpdate() && settings->get("AutoUpdateMinecraftVersions").toBool());
return result;
return m_versionSource == Remote || hasUpdate();
}
bool MinecraftVersion::hasUpdate()

4
logic/minecraft/MinecraftVersionList.cpp
View File

@ -18,7 +18,7 @@
#include <QtAlgorithms>
#include <QtNetwork>
#include "MultiMC.h"
#include "logic/Env.h"
#include "MMCError.h"
#include "MinecraftVersionList.h"
@ -399,7 +399,7 @@ MCVListLoadTask::MCVListLoadTask(MinecraftVersionList *vlist)
void MCVListLoadTask::executeTask()
{
setStatus(tr("Loading instance version list..."));
auto worker = MMC->qnam();
auto worker = ENV.qnam();
vlistReply = worker->get(QNetworkRequest(
QUrl("http://" + URLConstants::AWS_DOWNLOAD_VERSIONS + "versions.json")));
connect(vlistReply, SIGNAL(finished()), this, SLOT(list_downloaded()));

1
logic/minecraft/VersionBuilder.cpp
View File

@ -26,7 +26,6 @@
#include <modutils.h>
#include <pathutils.h>
#include "MultiMC.h"
#include "logic/minecraft/VersionBuilder.h"
#include "logic/minecraft/MinecraftProfile.h"
#include "logic/minecraft/OneSixRule.h"