diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-01-31 16:59:03 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-04-02 11:30:24 +0200 |
| commit | 6f3aa65bd69f5155fa1ee56dee840e2e7e1d3c6f (patch) | |
| tree | 28aaf76918d1ff0ffe2a437573bb1ab7a012c4ec /logic/forge/ForgeInstaller.cpp | |
| parent | e508728246043fcaf8bee565e73b15e15eb2e531 (diff) | |
| download | PrismLauncher-6f3aa65bd69f5155fa1ee56dee840e2e7e1d3c6f.tar.gz PrismLauncher-6f3aa65bd69f5155fa1ee56dee840e2e7e1d3c6f.tar.bz2 PrismLauncher-6f3aa65bd69f5155fa1ee56dee840e2e7e1d3c6f.zip | |
NOISSUE Split MultiMC app object into MultiMC and Env
Diffstat (limited to 'logic/forge/ForgeInstaller.cpp')
| -rw-r--r-- | logic/forge/ForgeInstaller.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/logic/forge/ForgeInstaller.cpp b/logic/forge/ForgeInstaller.cpp index 01671306..19cecaeb 100644 --- a/logic/forge/ForgeInstaller.cpp +++ b/logic/forge/ForgeInstaller.cpp @@ -21,6 +21,7 @@ #include "logic/OneSixInstance.h" #include "logic/forge/ForgeVersionList.h" #include "logic/minecraft/VersionFilterData.h" +#include "logic/Env.h" #include <quazip.h> #include <quazipfile.h> @@ -28,7 +29,7 @@ #include <QStringList> #include <QRegularExpression> #include <QRegularExpressionMatch> -#include "MultiMC.h" + #include <QJsonDocument> #include <QJsonArray> #include <QSaveFile> @@ -86,7 +87,7 @@ void ForgeInstaller::prepare(const QString &filename, const QString &universalUr // where do we put the library? decode the mojang path OneSixLibrary lib(libraryName); - auto cacheentry = MMC->metacache()->resolveEntry("libraries", lib.storagePath()); + auto cacheentry = ENV.metacache()->resolveEntry("libraries", lib.storagePath()); finalPath = "libraries/" + lib.storagePath(); if (!ensureFilePathExists(finalPath)) return; @@ -110,7 +111,7 @@ void ForgeInstaller::prepare(const QString &filename, const QString &universalUr cacheentry->stale = false; cacheentry->md5sum = md5sum.result().toHex().constData(); - MMC->metacache()->updateEntry(cacheentry); + ENV.metacache()->updateEntry(cacheentry); } file.close(); @@ -275,7 +276,7 @@ bool ForgeInstaller::addLegacy(OneSixInstance *to) { return false; } - auto entry = MMC->metacache()->resolveEntry("minecraftforge", m_forge_version->filename()); + auto entry = ENV.metacache()->resolveEntry("minecraftforge", m_forge_version->filename()); finalPath = PathCombine(to->jarModsDir(), m_forge_version->filename()); if (!ensureFilePathExists(finalPath)) { @@ -346,7 +347,7 @@ protected: } void prepare(ForgeVersionPtr forgeVersion) { - auto entry = MMC->metacache()->resolveEntry("minecraftforge", forgeVersion->filename()); + auto entry = ENV.metacache()->resolveEntry("minecraftforge", forgeVersion->filename()); auto installFunction = [this, entry, forgeVersion]() { if (!install(entry, forgeVersion)) |