0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change naming from Derp -> OneSix until the new instance type supports legacy

Browse Source
This commit is contained in:
Jan Dalheimer
2014-01-24 18:12:02 +01:00
parent 156bc8f276
commit 7d5787025a
35 changed files with 375 additions and 821 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
logic/ForgeInstaller.cpp
View File

@@ -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))
{