ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Make 'SuggestAuthlibInjector' setting actually have an effect; clang-format

Browse Source 
Signed-off-by: Evan Goode <mail@evangoo.de>
This commit is contained in:
Evan Goode 2023-09-04 23:57:33 -04:00
parent 9d442a0348
commit afe33b9de5
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
launcher/LaunchController.cpp
View File

@ -47,6 +47,7 @@
#include "ui/dialogs/ProfileSetupDialog.h" #include "ui/dialogs/ProfileSetupDialog.h"
#include "ui/dialogs/ProgressDialog.h" #include "ui/dialogs/ProgressDialog.h"
#include <QCheckBox>
#include <QHostAddress> #include <QHostAddress>
#include <QHostInfo> #include <QHostInfo>
#include <QInputDialog> #include <QInputDialog>
@ -54,7 +55,6 @@
#include <QList> #include <QList>
#include <QPushButton> #include <QPushButton>
#include <QStringList> #include <QStringList>
#include <QCheckBox>
#include "BuildConfig.h" #include "BuildConfig.h"
#include "JavaCommon.h" #include "JavaCommon.h"
@ -143,26 +143,27 @@ void LaunchController::login()
if (m_accountToUse->usesCustomApiServers()) { if (m_accountToUse->usesCustomApiServers()) {
MinecraftInstancePtr inst = std::dynamic_pointer_cast<MinecraftInstance>(m_instance); MinecraftInstancePtr inst = std::dynamic_pointer_cast<MinecraftInstance>(m_instance);
if (inst->getPackProfile()->getComponentVersion("moe.yushi.authlibinjector") == "") { const auto suggestAuthlibInjector = m_instance->settings()->get("SuggestAuthlibInjector").toBool();
const auto& authlibInjectorVersion = inst->getPackProfile()->getComponentVersion("moe.yushi.authlibinjector");
if (suggestAuthlibInjector && authlibInjectorVersion == "") {
// Account uses custom API servers, but authlib-injector is missing // Account uses custom API servers, but authlib-injector is missing
// Prompt user to install authlib-injector on the instance before launching // Prompt user to install authlib-injector on the instance before launching
QMessageBox msgBox{m_parentWidget}; QMessageBox msgBox{ m_parentWidget };
msgBox.setWindowTitle(tr("Missing authlib-injector")); msgBox.setWindowTitle(tr("Missing authlib-injector"));
msgBox.setText(tr("authlib-injector is not installed.")); msgBox.setText(tr("authlib-injector is not installed."));
msgBox.setInformativeText(tr( msgBox.setInformativeText(
"You are logging in using an account that uses custom API servers, but authlib-injector " tr("You are logging in using an account that uses custom API servers, but authlib-injector "
"is not installed on this instance.\n\n" "is not installed on this instance.\n\n"
"Would you like to install authlib-injector now?" "Would you like to install authlib-injector now?"));
));
msgBox.setStandardButtons(QMessageBox::Cancel | QMessageBox::Ignore | QMessageBox::Yes); msgBox.setStandardButtons(QMessageBox::Cancel | QMessageBox::Ignore | QMessageBox::Yes);
msgBox.setDefaultButton(QMessageBox::Yes); msgBox.setDefaultButton(QMessageBox::Yes);
msgBox.setModal(true); msgBox.setModal(true);
QCheckBox* checkBox = new QCheckBox("Don't ask again", m_parentWidget); QCheckBox* checkBox = new QCheckBox("Don't ask again", m_parentWidget);
checkBox->setChecked(!m_instance->settings()->get("SuggestAuthlibInjector").toBool()); checkBox->setChecked(!suggestAuthlibInjector);
msgBox.setCheckBox(checkBox); msgBox.setCheckBox(checkBox);
const auto & result = msgBox.exec(); const auto& result = msgBox.exec();
m_instance->settings()->set("SuggestAuthlibInjector", !checkBox->isChecked()); m_instance->settings()->set("SuggestAuthlibInjector", !checkBox->isChecked());
@ -173,8 +174,8 @@ void LaunchController::login()
return; return;
case QMessageBox::Yes: case QMessageBox::Yes:
if (result == QMessageBox::Yes) { if (result == QMessageBox::Yes) {
const auto & window = APPLICATION->showInstanceWindow(m_instance, "version"); const auto& window = APPLICATION->showInstanceWindow(m_instance, "version");
const auto & page = dynamic_cast<VersionPage *>(window->getPage("version")); const auto& page = dynamic_cast<VersionPage*>(window->getPage("version"));
if (page != nullptr) { if (page != nullptr) {
page->openInstallAuthlibInjector(); page->openInstallAuthlibInjector();
} }