Merge branch 'feature_skins' into develop

3 files changed, 128 insertions, 5 deletions

diff --git a/gui/logindialog.cpp b/gui/logindialog.cpp
index ed3983b7..aeaaaa9e 100644
--- a/gui/logindialog.cpp
+++ b/gui/logindialog.cpp
@@ -17,6 +17,13 @@
 #include "ui_logindialog.h"
 #include "keyring.h"
 #include "gui/platform.h"
+#include "MultiMC.h"
+
+#include <QFile>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QJsonParseError>
+#include "logic/net/HttpMetaCache.h"
 #include <logger/QsLog.h>
 
 LoginDialog::LoginDialog(QWidget *parent, const QString& loginErrMsg) :
@@ -51,6 +58,8 @@ LoginDialog::LoginDialog(QWidget *parent, const QString& loginErrMsg) :
 								   arg(loginErrMsg));
 	}
 	
+	ui->lblFace->setVisible(false);
+
 	resize(minimumSizeHint());
 	layout()->setSizeConstraint(QLayout::SetFixedSize);
 	Keyring * k = Keyring::instance();
@@ -151,13 +160,53 @@ void LoginDialog::userTextChanged ( const QString& user )
 	blockToggles = true;
 	Keyring * k = Keyring::instance();
 	QStringList sl = k->getStoredAccounts("minecraft");
+	bool gotFace = false;
+
 	if(sl.contains(user))
 	{
 		ui->rememberUsernameCheckbox->setChecked(true);
 		QString passwd = k->getPassword("minecraft",user);
 		ui->rememberPasswordCheckbox->setChecked(!passwd.isEmpty());
 		ui->passwordTextBox->setText(passwd);
+
+		QByteArray data;
+		{
+			auto filename = MMC->metacache()->resolveEntry("skins", "skins.json")->getFullPath();
+			QFile listFile(filename);
+			if(!listFile.open(QIODevice::ReadOnly))
+				return;
+			data = listFile.readAll();
+		}
+
+		QJsonParseError jsonError;
+		QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
+		QJsonObject root = jsonDoc.object();
+		QJsonObject mappings = root.value("mappings").toObject();
+
+		if(!mappings[user].isUndefined())
+		{
+			QJsonArray usernames = mappings.value(user).toArray();
+			if(!usernames.isEmpty())
+			{
+				QString mapped_username = usernames[0].toString();
+
+				if(!mapped_username.isEmpty())
+				{
+					QFile fskin(MMC->metacache()->resolveEntry("skins", mapped_username + ".png")->getFullPath());
+					if(fskin.exists())
+					{
+						QPixmap skin(MMC->metacache()->resolveEntry("skins", mapped_username + ".png")->getFullPath());
+						QPixmap face = skin.copy(8, 8, 8, 8).scaled(48, 48, Qt::KeepAspectRatio);
+
+						ui->lblFace->setPixmap(face);
+						gotFace = true;
+					}
+				}
+			}
+		}
 	}
+
+	ui->lblFace->setVisible(gotFace);
 	blockToggles = false;
 }
 
diff --git a/gui/logindialog.ui b/gui/logindialog.ui
index 0aaad52b..46965425 100644
--- a/gui/logindialog.ui
+++ b/gui/logindialog.ui
@@ -23,10 +23,34 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="usernameLabel">
+     <item row="0" column="4" rowspan="2">
+      <widget class="QLabel" name="lblFace">
+       <property name="minimumSize">
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>48</width>
+         <height>48</height>
+        </size>
+       </property>
+       <property name="sizeIncrement">
+        <size>
+         <width>1</width>
+         <height>1</height>
+        </size>
+       </property>
        <property name="text">
-        <string>Username:</string>
+        <string/>
+       </property>
+       <property name="pixmap">
+        <pixmap resource="../multimc.qrc">:/icons/instances/steve</pixmap>
+       </property>
+       <property name="scaledContents">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
@@ -37,6 +61,13 @@
        </property>
       </widget>
      </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="usernameLabel">
+       <property name="text">
+        <string>Username:</string>
+       </property>
+      </widget>
+     </item>
      <item row="1" column="0">
       <widget class="QLabel" name="passwordLabel">
        <property name="text">
@@ -54,7 +85,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="2" rowspan="2">
+     <item row="0" column="5" rowspan="2">
       <widget class="QPushButton" name="forgetButton">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
@@ -111,7 +142,9 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../multimc.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>loginButtonBox</sender>
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 2efcda44..ab718f98 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -57,6 +57,7 @@
 #include "logic/lists/JavaVersionList.h"
 
 #include "logic/net/LoginTask.h"
+
 #include "logic/BaseInstance.h"
 #include "logic/InstanceFactory.h"
 #include "logic/MinecraftProcess.h"
@@ -517,6 +518,46 @@ void MainWindow::onLoginComplete()
 		tDialog.exec(updateTask);
 		delete updateTask;
 	}
+
+	auto job = new DownloadJob("Player skin: " + m_activeLogin.player_name);
+
+	auto meta = MMC->metacache()->resolveEntry("skins", m_activeLogin.player_name + ".png");
+	job->addCacheDownload(QUrl("http://skins.minecraft.net/MinecraftSkins/" + m_activeLogin.player_name + ".png"), meta);
+	meta->stale = true;
+
+	job->start();
+	auto filename = MMC->metacache()->resolveEntry("skins", "skins.json")->getFullPath();
+	QFile listFile(filename);
+
+	// Add skin mapping
+	QByteArray data;
+	{
+		if(!listFile.open(QIODevice::ReadWrite))
+		{
+			QLOG_ERROR() << "Failed to open/make skins list JSON";
+			return;
+		}
+
+		data = listFile.readAll();
+	}
+
+	QJsonParseError jsonError;
+	QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &jsonError);
+	QJsonObject root = jsonDoc.object();
+	QJsonObject mappings = root.value("mappings").toObject();
+	QJsonArray usernames = mappings.value(m_activeLogin.username).toArray();
+
+	if(!usernames.contains(m_activeLogin.player_name))
+	{
+		usernames.prepend(m_activeLogin.player_name);
+		mappings[m_activeLogin.username] = usernames;
+		root["mappings"] = mappings;
+		jsonDoc.setObject(root);
+
+		// QJson hack - shouldn't have to clear the file every time a save happens
+		listFile.resize(0);
+		listFile.write(jsonDoc.toJson());
+	}
 }
 
 void MainWindow::onGameUpdateComplete()