Gray out "Manage Skins" button for authlib-injector accounts

Support for this is blocked by #37, which we can get to after the 9.0 release.
unmojang · Oct 27, 2024 · 5c8bdf9 · 5c8bdf9
1 parent fab399c
commit 5c8bdf9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/launcher/minecraft/auth/AccountData.cpp b/launcher/minecraft/auth/AccountData.cpp
@@ -398,6 +398,11 @@ bool AccountData::usesCustomApiServers() const
     return type == AccountType::AuthlibInjector;
 }
 
+bool AccountData::supportsSkinManagement() const
+{
+    return type == AccountType::MSA;
+}
+
 QString AccountData::authServerUrl() const
 {
     if (usesCustomApiServers()) {

diff --git a/launcher/minecraft/auth/AccountData.h b/launcher/minecraft/auth/AccountData.h
@@ -96,6 +96,7 @@ struct AccountData {
     QJsonObject saveState() const;
     bool resumeStateFromV3(QJsonObject data);
 
+    bool supportsSkinManagement() const;
     bool usesCustomApiServers() const;
     QString authServerUrl() const;
     QString accountServerUrl() const;

diff --git a/launcher/minecraft/auth/MinecraftAccount.h b/launcher/minecraft/auth/MinecraftAccount.h
@@ -119,6 +119,8 @@ class MinecraftAccount : public QObject, public Usable {
 
     bool usesCustomApiServers() const { return data.usesCustomApiServers(); }
 
+    bool supportsSkinManagement() const { return data.supportsSkinManagement(); }
+
     QString accountDisplayString() const { return data.accountDisplayString(); }
 
     QString accessToken() const { return data.accessToken(); }

diff --git a/launcher/minecraft/auth/Parsers.cpp b/launcher/minecraft/auth/Parsers.cpp
@@ -379,6 +379,7 @@ bool parseMinecraftProfileMojang(QByteArray& data, MinecraftProfile& output)
                 // we don't know the cape ID as it is not returned from the session server
                 // so just fake it - changing capes is probably locked anyway :(
                 capeOut.alias = "cape";
+                capeOut.id = "00000000-0000-0000-0000-000000000000";
             }
         }
     }

diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
@@ -238,15 +238,17 @@ void AccountListPage::updateButtonStates()
     bool hasSelection = !selection.empty();
     bool accountIsReady = false;
     bool accountIsOnline = false;
+    bool accountSupportsSkinManagement = false;
     if (hasSelection) {
         QModelIndex selected = selection.first();
         MinecraftAccountPtr account = selected.data(AccountList::PointerRole).value<MinecraftAccountPtr>();
         accountIsReady = !account->isActive();
         accountIsOnline = account->accountType() != AccountType::Offline;
+        accountSupportsSkinManagement = account->supportsSkinManagement();
     }
     ui->actionRemove->setEnabled(accountIsReady);
     ui->actionSetDefault->setEnabled(accountIsReady);
-    ui->actionManageSkins->setEnabled(accountIsReady && accountIsOnline);
+    ui->actionManageSkins->setEnabled(accountIsReady && accountIsOnline && accountSupportsSkinManagement);
     ui->actionRefresh->setEnabled(accountIsReady && accountIsOnline);
 
     if (m_accounts->defaultAccount().get() == nullptr) {