From 2fe27fd0daca14644a2a71456cd60c9a38befbdf Mon Sep 17 00:00:00 2001
From: Sky <git@bunnies.cc>
Date: Sun, 8 Dec 2013 06:12:53 +0000
Subject: More work on new assets system. Works given a properly constructed
 assets folder, no downloading yet

---
 logic/OneSixVersion.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'logic/OneSixVersion.cpp')

diff --git a/logic/OneSixVersion.cpp b/logic/OneSixVersion.cpp
index cc5b1de1..e586402b 100644
--- a/logic/OneSixVersion.cpp
+++ b/logic/OneSixVersion.cpp
@@ -17,6 +17,8 @@
 #include "logic/OneSixLibrary.h"
 #include "logic/OneSixRule.h"
 
+#include "logger/QsLog.h"
+
 std::shared_ptr<OneSixVersion> fromJsonV4(QJsonObject root,
 										  std::shared_ptr<OneSixVersion> fullVersion)
 {
@@ -60,6 +62,18 @@ std::shared_ptr<OneSixVersion> fromJsonV4(QJsonObject root,
 	fullVersion->releaseTime = root.value("releaseTime").toString();
 	fullVersion->time = root.value("time").toString();
 
+	auto assetsID = root.value("assets");
+	if (assetsID.isString())
+	{
+		fullVersion->assets = assetsID.toString();
+	}
+	else
+	{
+		fullVersion->assets = "legacy";
+	}
+
+	QLOG_DEBUG() << "Assets version:" << fullVersion->assets;
+
 	// Iterate through the list, if it's a list.
 	auto librariesValue = root.value("libraries");
 	if (!librariesValue.isArray())
@@ -151,7 +165,7 @@ std::shared_ptr<OneSixVersion> OneSixVersion::fromJson(QJsonObject root)
 		root.value("minimumLauncherVersion").toDouble();
 
 	// ADD MORE HERE :D
-	if (launcher_ver > 0 && launcher_ver <= 11)
+	if (launcher_ver > 0 && launcher_ver <= 12)
 		return fromJsonV4(root, readVersion);
 	else
 	{
-- 
cgit v1.2.3