diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-01-24 18:12:02 +0100 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2014-01-24 18:12:02 +0100 |
| commit | 7d5787025aa5cebf6778f71e79f248f10b8541c9 (patch) | |
| tree | bb80eb6a4e313b19da00a9ad8d0e1248aaa50212 /logic/ForgeInstaller.cpp | |
| parent | 156bc8f27656c115bf1b023cd4ebc5f629df3887 (diff) | |
| download | MultiMC-7d5787025aa5cebf6778f71e79f248f10b8541c9.tar MultiMC-7d5787025aa5cebf6778f71e79f248f10b8541c9.tar.gz MultiMC-7d5787025aa5cebf6778f71e79f248f10b8541c9.tar.lz MultiMC-7d5787025aa5cebf6778f71e79f248f10b8541c9.tar.xz MultiMC-7d5787025aa5cebf6778f71e79f248f10b8541c9.zip | |
Change naming from Derp -> OneSix until the new instance type supports legacy
Diffstat (limited to 'logic/ForgeInstaller.cpp')
| -rw-r--r-- | logic/ForgeInstaller.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/logic/ForgeInstaller.cpp b/logic/ForgeInstaller.cpp index 35663ddd..863c3dfd 100644 --- a/logic/ForgeInstaller.cpp +++ b/logic/ForgeInstaller.cpp @@ -14,15 +14,15 @@ */ #include "ForgeInstaller.h" -#include "DerpVersion.h" -#include "DerpLibrary.h" +#include "OneSixVersion.h" +#include "OneSixLibrary.h" #include "net/HttpMetaCache.h" #include <quazip.h> #include <quazipfile.h> #include <pathutils.h> #include <QStringList> #include "MultiMC.h" -#include "DerpInstance.h" +#include "OneSixInstance.h" #include <QJsonDocument> #include <QJsonArray> @@ -31,7 +31,7 @@ ForgeInstaller::ForgeInstaller(QString filename, QString universal_url) { - std::shared_ptr<DerpVersion> newVersion; + std::shared_ptr<OneSixVersion> newVersion; m_universal_url = universal_url; QuaZip zip(filename); @@ -64,7 +64,7 @@ ForgeInstaller::ForgeInstaller(QString filename, QString universal_url) // read the forge version info { - newVersion = DerpVersion::fromJson(versionInfoVal.toObject()); + newVersion = OneSixVersion::fromJson(versionInfoVal.toObject()); if (!newVersion) return; } @@ -74,7 +74,7 @@ ForgeInstaller::ForgeInstaller(QString filename, QString universal_url) internalPath = installObj.value("filePath").toString(); // where do we put the library? decode the mojang path - DerpLibrary lib(libraryName); + OneSixLibrary lib(libraryName); lib.finalize(); auto cacheentry = MMC->metacache()->resolveEntry("libraries", lib.storagePath()); @@ -109,7 +109,7 @@ ForgeInstaller::ForgeInstaller(QString filename, QString universal_url) realVersionId = m_forge_version->id = installObj.value("minecraft").toString(); } -bool ForgeInstaller::add(DerpInstance *to) +bool ForgeInstaller::add(OneSixInstance *to) { if (!BaseInstaller::add(to)) { |