External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-24 12:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Ely.by skin support implemented with room for the future"

Browse Source 
This reverts commit a6a627ab2d.
This commit is contained in:
Zakhar Afonin
2021-06-10 21:39:11 +03:00
parent a6a627ab2d
commit 53ae05d675
3 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/MainWindow.cpp
View File

@@ -771,15 +771,8 @@ 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(skinsBase + skinsArg + ".png"), meta);
auto action = Net::Download::makeCached(QUrl(BuildConfig.SKINS_BASE + profile.id + ".png"), meta);
skin_dls.append(action);
meta->setStale(true);
}

9
application/pages/global/AccountListPage.cpp
View File

@@ -172,15 +172,8 @@ 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(skinsBase + skinsArg + ".png"), meta);
auto action = Net::Download::makeCached(QUrl(BuildConfig.SKINS_BASE + profile.id + ".png"), meta);
job->addNetAction(action);
meta->setStale(true);
}

4
buildconfig/BuildConfig.h
View File

@@ -67,6 +67,7 @@ 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/";
@@ -76,9 +77,6 @@ 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/";