UltimMC: Misc improvements all over the place

UltimMC · Mar 6, 2024 · bd4dcdb · bd4dcdb
1 parent c57d58f
commit bd4dcdb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 18 deletions.
diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h
@@ -96,15 +96,6 @@ class Config
     QString FMLLIBS_BASE_URL = "https://files.multimc.org/fmllibs/";
     QString TRANSLATIONS_BASE_URL = "https://files.multimc.org/translations/";
 
-
-    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/";
 
     QString ATL_DOWNLOAD_SERVER_URL = "https://download.nodecdn.net/containers/atl/";

diff --git a/launcher/AuthServer.cpp b/launcher/AuthServer.cpp
@@ -65,7 +65,7 @@ void processRequest(Request *request, Response *response)
     qDebug() << "Processing request";
     if (request->url == "/")
     {
-        response->body = "{\"Status\":\"OK\",\"Runtime-Mode\":\"productionMode\",\"Application-Author\":\"Mojang Web Force\",\"Application-Description\":\"Mojang Public API.\",\"Specification-Version\":\"3.58.0\",\"Application-Name\":\"yggdrasil.accounts.restlet.server.public\",\"Implementation-Version\":\"3.58.0_build194\",\"Application-Owner\":\"Mojang\"}";
+        response->body = "{\"Status\":\"OK\",\"Runtime-Mode\":\"productionMode\",\"Application-Author\":\"Mojang Web Force\",\"Application-Description\":\"Mojang Public API.\",\"Specification-Version\":\"6.0.0\",\"Application-Name\":\"yggdrasil.accounts.restlet.server.public\",\"Implementation-Version\":\"6.0.0\",\"Application-Owner\":\"Mojang\"}";
         response->statusCode = 200;
         response->headers["Content-Type"] = "application/json; charset=utf-8";
         return;

diff --git a/launcher/minecraft/auth/Yggdrasil.cpp b/launcher/minecraft/auth/Yggdrasil.cpp
@@ -209,11 +209,6 @@ void Yggdrasil::processResponse(QJsonObject responseData) {
     m_data->yggdrasilToken.validity = Katabasis::Validity::Certain;
     m_data->yggdrasilToken.issueInstant = QDateTime::currentDateTimeUtc();
 
-
-    if(responseData.contains("selectedProfile")) {
-        //m_data->minecraftProfile = responseData.value("selectedProfile").toObject();
-    }
-
     // We've made it through the minefield of possible errors. Return true to indicate that
     // we've succeeded.
     qDebug() << "Finished reading authentication response.";

diff --git a/launcher/ui/dialogs/LocalLoginDialog.ui b/launcher/ui/dialogs/LocalLoginDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>421</width>
-    <height>198</height>
+    <height>100</height>
    </rect>
   </property>
   <property name="sizePolicy">

diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
@@ -223,8 +223,13 @@ void AccountListPage::updateButtonStates()
     }
     ui->actionRemove->setEnabled(accountIsReady);
     ui->actionSetDefault->setEnabled(accountIsReady);
-    ui->actionUploadSkin->setEnabled(accountIsReady);
-    ui->actionDeleteSkin->setEnabled(accountIsReady);
+    // Don't enable skin change buttons for dummy and ely.by accounts, they don't work.
+    if (hasSelection) {
+        if (account->provider()->id() != "dummy" && account->provider()->id() != "elyby") {
+            ui->actionUploadSkin->setEnabled(accountIsReady);
+            ui->actionDeleteSkin->setEnabled(accountIsReady);
+        }
+    }
     ui->actionRefresh->setEnabled(accountIsReady);
 
     if(m_accounts->defaultAccount().get() == nullptr) {