summaryrefslogtreecommitdiffstats
path: root/logic/DerpVersionBuilder.cpp
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-01-22 15:20:48 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-01-22 15:20:48 +0100
commit0a592ab99bc68ad918f74206edf2a77cc257683c (patch)
tree9222c666b871f0e49bb1b6150d102bca8d2b552c /logic/DerpVersionBuilder.cpp
parentd166b4807223ec7cd0df6f26e05a2f364dc6121c (diff)
downloadMultiMC-0a592ab99bc68ad918f74206edf2a77cc257683c.tar
MultiMC-0a592ab99bc68ad918f74206edf2a77cc257683c.tar.gz
MultiMC-0a592ab99bc68ad918f74206edf2a77cc257683c.tar.lz
MultiMC-0a592ab99bc68ad918f74206edf2a77cc257683c.tar.xz
MultiMC-0a592ab99bc68ad918f74206edf2a77cc257683c.zip
Work towards liteloader support. Fix creating new instance
Diffstat (limited to 'logic/DerpVersionBuilder.cpp')
-rw-r--r--logic/DerpVersionBuilder.cpp18
1 files changed, 3 insertions, 15 deletions
diff --git a/logic/DerpVersionBuilder.cpp b/logic/DerpVersionBuilder.cpp
index d8091f32..b0da8205 100644
--- a/logic/DerpVersionBuilder.cpp
+++ b/logic/DerpVersionBuilder.cpp
@@ -24,6 +24,7 @@
#include <QMessageBox>
#include <QObject>
#include <QDir>
+#include <QDebug>
#include "DerpVersion.h"
#include "DerpInstance.h"
@@ -45,7 +46,7 @@ bool DerpVersionBuilder::build(DerpVersion *version, DerpInstance *instance, QWi
bool DerpVersionBuilder::build()
{
- clear();
+ m_version->clear();
QDir root(m_instance->instanceRoot());
QDir patches(root.absoluteFilePath("patches/"));
@@ -112,20 +113,6 @@ bool DerpVersionBuilder::build()
return true;
}
-void DerpVersionBuilder::clear()
-{
- m_version->id.clear();
- m_version->time.clear();
- m_version->releaseTime.clear();
- m_version->type.clear();
- m_version->assets.clear();
- m_version->processArguments.clear();
- m_version->minecraftArguments.clear();
- m_version->minimumLauncherVersion = 0xDEADBEAF;
- m_version->mainClass.clear();
- m_version->libraries.clear();
-}
-
void applyString(const QJsonObject &obj, const QString &key, QString &out)
{
if (obj.contains(key) && obj.value(key).isString())
@@ -181,6 +168,7 @@ bool DerpVersionBuilder::apply(const QJsonObject &object)
}
// libraries
+ if (object.contains("libraries"))
{
auto librariesValue = object.value("libraries");
if (!librariesValue.isArray())