From 396400b60d56ac39779b8a72d21f535b50d48372 Mon Sep 17 00:00:00 2001 From: Zakhar Afonin Date: Sat, 12 Jun 2021 08:46:53 +0300 Subject: [PATCH] UI improvement: Ely.by skins in launcher --- application/MainWindow.cpp | 9 ++++++++- application/pages/global/AccountListPage.cpp | 9 ++++++++- buildconfig/BuildConfig.h | 4 +++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp index ff5a4c70..3e730ab8 100644 --- a/application/MainWindow.cpp +++ b/application/MainWindow.cpp @@ -771,8 +771,15 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow } for (auto profile : account->profiles()) { + auto skinsBase = BuildConfig.SKINS_BASE_MOJANG; + auto skinsArg = profile.id; + if (account->loginType() == "elyby") + { + skinsBase = BuildConfig.SKINS_BASE_ELYBY; + skinsArg = profile.name; + } auto meta = Env::getInstance().metacache()->resolveEntry("skins", profile.id + ".png"); - auto action = Net::Download::makeCached(QUrl(BuildConfig.SKINS_BASE + profile.id + ".png"), meta); + auto action = Net::Download::makeCached(QUrl(skinsBase + skinsArg + ".png"), meta); skin_dls.append(action); meta->setStale(true); } diff --git a/application/pages/global/AccountListPage.cpp b/application/pages/global/AccountListPage.cpp index f2cf8ad8..7e318499 100644 --- a/application/pages/global/AccountListPage.cpp +++ b/application/pages/global/AccountListPage.cpp @@ -175,8 +175,15 @@ void AccountListPage::addAccount(const QString &errMsg) for (AccountProfile profile : account->profiles()) { + auto skinsBase = BuildConfig.SKINS_BASE_MOJANG; + auto skinsArg = profile.id; + if (account->loginType() == "elyby") + { + skinsBase = BuildConfig.SKINS_BASE_ELYBY; + skinsArg = profile.name; + } auto meta = Env::getInstance().metacache()->resolveEntry("skins", profile.id + ".png"); - auto action = Net::Download::makeCached(QUrl(BuildConfig.SKINS_BASE + profile.id + ".png"), meta); + auto action = Net::Download::makeCached(QUrl(skinsBase + skinsArg + ".png"), meta); job->addNetAction(action); meta->setStale(true); } diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h index b7694cbb..d70f1614 100644 --- a/buildconfig/BuildConfig.h +++ b/buildconfig/BuildConfig.h @@ -67,7 +67,6 @@ public: QString RESOURCE_BASE = "https://resources.download.minecraft.net/"; QString LIBRARY_BASE = "https://libraries.minecraft.net/"; - QString SKINS_BASE = "https://crafatar.com/skins/"; QString MOJANG_STATUS_URL = "https://status.mojang.com/check"; QString IMGUR_BASE_URL = "https://api.imgur.com/3/"; QString FMLLIBS_BASE_URL = "https://files.multimc.org/fmllibs/"; @@ -77,6 +76,9 @@ public: QString AUTH_BASE_MOJANG = "https://authserver.mojang.com/"; QString AUTH_BASE_ELYBY = "https://authserver.ely.by/auth/"; + QString SKINS_BASE_MOJANG = "https://crafatar.com/skins/"; + QString SKINS_BASE_ELYBY = "http://skinsystem.ely.by/skins/"; + QString MODPACKSCH_API_BASE_URL = "https://api.modpacks.ch/"; QString LEGACY_FTB_CDN_BASE_URL = "https://dist.creeper.host/FTB2/";