summaryrefslogtreecommitdiffstats
path: root/libmultimc
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-07-14 18:33:31 +0200
committerPetr Mrázek <peterix@gmail.com>2013-07-14 18:33:31 +0200
commit33b9b25da7d3d29f949c9418295de257d437c9f8 (patch)
tree65eea838f89ed182636890c1ce6f678ad4fc1276 /libmultimc
parentc96ac2460522b9567a10831bcd1d8a6bc9f36d9d (diff)
downloadMultiMC-33b9b25da7d3d29f949c9418295de257d437c9f8.tar
MultiMC-33b9b25da7d3d29f949c9418295de257d437c9f8.tar.gz
MultiMC-33b9b25da7d3d29f949c9418295de257d437c9f8.tar.lz
MultiMC-33b9b25da7d3d29f949c9418295de257d437c9f8.tar.xz
MultiMC-33b9b25da7d3d29f949c9418295de257d437c9f8.zip
More work on the downloader and 1.6 instance creation
Diffstat (limited to 'libmultimc')
-rw-r--r--libmultimc/include/instance.h30
-rw-r--r--libmultimc/src/gameupdatetask.cpp51
-rw-r--r--libmultimc/src/instance.cpp2
3 files changed, 61 insertions, 22 deletions
diff --git a/libmultimc/include/instance.h b/libmultimc/include/instance.h
index 717f8816..526025be 100644
--- a/libmultimc/include/instance.h
+++ b/libmultimc/include/instance.h
@@ -80,16 +80,7 @@ class LIBMULTIMC_EXPORT Instance : public QObject
* This returns true if shouldForceUpdate game is true or if the intended and
* current versions don't match.
*/
- Q_PROPERTY(bool shouldUpdateGame READ shouldUpdateGame STORED false)
-
- /*!
- * Whether or not the game will be forced to update on the next launch.
- * If this is set to true, shouldUpdateGame will be true, regardless of whether or not
- * the current and intended versions match.
- * It should be noted that this is set to false automatically when game updates are run.
- */
- Q_PROPERTY(bool shouldForceUpdateGame READ shouldForceUpdateGame WRITE setShouldForceUpdateGame)
-
+ Q_PROPERTY(bool shouldUpdate READ shouldUpdate WRITE setShouldUpdate)
/*!
* The instance's current version.
@@ -236,14 +227,17 @@ public:
virtual QString intendedVersion() const { return settings().get("IntendedJarVersion").toString(); }
virtual void setIntendedVersion(QString val) { settings().set("IntendedJarVersion", val); }
- virtual bool shouldUpdateGame() const
- { return shouldForceUpdateGame() || intendedVersion() != currentVersion(); }
-
- virtual bool shouldForceUpdateGame() const { return settings().get("ShouldForceUpdate").toBool(); }
- virtual void setShouldForceUpdateGame(bool val) { settings().set("ShouldForceUpdate", val); }
-
-
-
+ virtual bool shouldUpdate() const
+ {
+ QVariant var = settings().get("ShouldUpdate");
+ if(!var.isValid() || var.toBool() == false)
+ {
+ return intendedVersion() != currentVersion();
+ }
+ return true;
+ }
+ virtual void setShouldUpdate(bool val) { settings().set("ShouldUpdate", val); }
+
//// Timestamps ////
virtual qint64 lastLaunch() const { return settings().get("lastLaunchTime").value<qint64>(); }
diff --git a/libmultimc/src/gameupdatetask.cpp b/libmultimc/src/gameupdatetask.cpp
index a8abb0b6..b6c1f936 100644
--- a/libmultimc/src/gameupdatetask.cpp
+++ b/libmultimc/src/gameupdatetask.cpp
@@ -112,6 +112,52 @@ void GameUpdateTask::versionFileFinished()
getLegacyJar();
return;
}
+ /*
+ // Iterate through the list.
+ QJsonObject groupList = root.value("libraries").toObject();
+
+ for (QJsonObject::iterator iter = groupList.begin();
+ iter != groupList.end(); iter++)
+ {
+ QString groupName = iter.key();
+
+ // If not an object, complain and skip to the next one.
+ if (!iter.value().isObject())
+ {
+ qWarning(QString("Group '%1' in the group list should "
+ "be an object.").arg(groupName).toUtf8());
+ continue;
+ }
+
+ QJsonObject groupObj = iter.value().toObject();
+
+ // Create the group object.
+ InstanceGroup *group = new InstanceGroup(groupName, this);
+ groups.push_back(group);
+
+ // If 'hidden' isn't a bool value, just assume it's false.
+ if (groupObj.value("hidden").isBool() && groupObj.value("hidden").toBool())
+ {
+ group->setHidden(groupObj.value("hidden").toBool());
+ }
+
+ if (!groupObj.value("instances").isArray())
+ {
+ qWarning(QString("Group '%1' in the group list is invalid. "
+ "It should contain an array "
+ "called 'instances'.").arg(groupName).toUtf8());
+ continue;
+ }
+
+ // Iterate through the list of instances in the group.
+ QJsonArray instancesArray = groupObj.value("instances").toArray();
+
+ for (QJsonArray::iterator iter2 = instancesArray.begin();
+ iter2 != instancesArray.end(); iter2++)
+ {
+ groupMap[(*iter2).toString()] = groupName;
+ }
+ }*/
// save the version file in $instanceId/version.json and versions/$version/$version.json
QString version_id = targetVersion->descriptor();
@@ -148,10 +194,9 @@ void GameUpdateTask::versionFileFinished()
void GameUpdateTask::jarlibFinished()
{
+ m_inst->setCurrentVersion(targetVersion->descriptor());
+ m_inst->setShouldUpdate(false);
exit(1);
- // YAYAYAYAYYAYAAUAYAYYAYYY!!!!
- // WEE DID IT!
- // YESSSSS!
}
void GameUpdateTask::jarlibFailed()
diff --git a/libmultimc/src/instance.cpp b/libmultimc/src/instance.cpp
index 08cd6605..fde31cf3 100644
--- a/libmultimc/src/instance.cpp
+++ b/libmultimc/src/instance.cpp
@@ -34,7 +34,7 @@ Instance::Instance(const QString &rootDir, QObject *parent) :
settings().registerSetting(new Setting("iconKey", "default"));
settings().registerSetting(new Setting("notes", ""));
settings().registerSetting(new Setting("NeedsRebuild", true));
- settings().registerSetting(new Setting("ShouldForceUpdate", false));
+ settings().registerSetting(new Setting("ShouldUpdate", false));
settings().registerSetting(new Setting("JarVersion", "Unknown"));
settings().registerSetting(new Setting("LwjglVersion", "2.9.0"));
settings().registerSetting(new Setting("IntendedJarVersion", ""));