Fix for latest snapshot ``changes''

4 files changed, 54 insertions, 3 deletions

diff --git a/logic/OneSixLibrary.cpp b/logic/OneSixLibrary.cpp
index df04a0c7..ad4aec44 100644
--- a/logic/OneSixLibrary.cpp
+++ b/logic/OneSixLibrary.cpp
@@ -141,7 +141,8 @@ QJsonObject OneSixLibrary::toJson()
 	if (m_hint.size())
 		libRoot.insert("MMC-hint", m_hint);
 	if (m_base_url != "http://s3.amazonaws.com/Minecraft.Download/libraries/" &&
-		m_base_url != "https://s3.amazonaws.com/Minecraft.Download/libraries/")
+		m_base_url != "https://s3.amazonaws.com/Minecraft.Download/libraries/" &&
+		m_base_url != "https://libraries.minecraft.net/")
 		libRoot.insert("url", m_base_url);
 	if (isNative() && m_native_suffixes.size())
 	{
diff --git a/logic/OneSixLibrary.h b/logic/OneSixLibrary.h
index 3a772420..f8dc3aef 100644
--- a/logic/OneSixLibrary.h
+++ b/logic/OneSixLibrary.h
@@ -30,7 +30,7 @@ class OneSixLibrary
 private:
 	// basic values used internally (so far)
 	QString m_name;
-	QString m_base_url = "http://s3.amazonaws.com/Minecraft.Download/libraries/";
+	QString m_base_url = "https://libraries.minecraft.net/";
 	QList<std::shared_ptr<Rule>> m_rules;
 
 	// custom values
diff --git a/logic/OneSixVersion.cpp b/logic/OneSixVersion.cpp
index 4e2bbda5..cc5b1de1 100644
--- a/logic/OneSixVersion.cpp
+++ b/logic/OneSixVersion.cpp
@@ -151,7 +151,7 @@ std::shared_ptr<OneSixVersion> OneSixVersion::fromJson(QJsonObject root)
 		root.value("minimumLauncherVersion").toDouble();
 
 	// ADD MORE HERE :D
-	if (launcher_ver > 0 && launcher_ver <= 10)
+	if (launcher_ver > 0 && launcher_ver <= 11)
 		return fromJsonV4(root, readVersion);
 	else
 	{
diff --git a/logic/auth/AuthenticateTask.cpp b/logic/auth/AuthenticateTask.cpp
index a9c2c03f..bf7a54f9 100644
--- a/logic/auth/AuthenticateTask.cpp
+++ b/logic/auth/AuthenticateTask.cpp
@@ -133,6 +133,7 @@ bool AuthenticateTask::processResponse(QJsonObject responseData)
 	// Put the list of profiles we loaded into the MojangAccount object.
 	getMojangAccount()->loadProfiles(loadedProfiles);
 
+	
 
 	// Finally, we set the current profile to the correct value. This is pretty simple.
 	// We do need to make sure that the current profile that the server gave us 
@@ -153,7 +154,55 @@ bool AuthenticateTask::processResponse(QJsonObject responseData)
 		QLOG_ERROR() << "Server specified a selected profile that wasn't in the available profiles list.";
 		return false;
 	}
+
+	/*
+public class User
+{
+  private String id;
+  private List<Property> properties;
+
+  public String getId()
+  {
+    return this.id;
+  }
+
+  public List<Property> getProperties() {
+    return this.properties;
+  }
+  public class Property {
+    private String name;
+    private String value;
+
+    public Property() {  } 
+    public String getKey() { return this.name; }
+
+    public String getValue()
+    {
+      return this.value;
+    }
+  }
+}
+*/
 	
+	// this is what the vanilla launcher passes to the userProperties launch param
+	// doesn't seem to be used for anything so far? I don't get any of this data on my account
+	// (peterixxx)
+	// is it a good idea to log this?
+	if(responseData.contains("user"))
+	{
+		auto obj = responseData.value("user").toObject();
+		auto userId = obj.value("id").toString();
+		auto propArray = obj.value("properties").toArray();
+		QLOG_DEBUG() << "User ID: " << userId;
+		QLOG_DEBUG() << "User Properties: ";
+		for(auto prop: propArray)
+		{
+			auto propTuple = prop.toObject();
+			auto name = propTuple.value("name").toString();
+			auto value = propTuple.value("value").toString();
+			QLOG_DEBUG() << name << " : " << value;
+		}
+	}
 	
 	// We've made it through the minefield of possible errors. Return true to indicate that we've succeeded.
 	QLOG_DEBUG() << "Finished reading authentication response.";
@@ -178,3 +227,4 @@ QString AuthenticateTask::getStateMessage(const YggdrasilTask::State state) cons
 	}
 }
 
+