CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE debranding for real, initial work

Browse Source 
This is probably very broken on macOS and Windows and will need a lot of work to complete fully.
This commit is contained in:
Petr Mrázek
2021-10-13 01:59:25 +02:00
parent 6a4130c914
commit 441ab7eedc
112 changed files with 944 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
launcher/LaunchController.cpp
View File

@ -1,7 +1,7 @@
#include "LaunchController.h"
#include "MainWindow.h"
#include <minecraft/auth/AccountList.h>
#include "MultiMC.h"
#include "Launcher.h"
#include "dialogs/CustomMessageBox.h"
#include "dialogs/ProfileSelectDialog.h"
#include "dialogs/ProgressDialog.h"
@ -39,7 +39,7 @@ void LaunchController::login() {
JavaCommon::checkJVMArgs(m_instance->settings()->get("JvmArgs").toString(), m_parentWidget);
// Find an account to use.
std::shared_ptr<AccountList> accounts = MMC->accounts();
std::shared_ptr<AccountList> accounts = LAUNCHER->accounts();
if (accounts->count() <= 0)
{
// Tell the user they need to log in at least one account in order to play.
@ -56,7 +56,7 @@ void LaunchController::login() {
if (reply == QMessageBox::Yes)
{
// Open the account manager.
MMC->ShowGlobalSettings(m_parentWidget, "accounts");
LAUNCHER->ShowGlobalSettings(m_parentWidget, "accounts");
}
}
@ -254,7 +254,7 @@ void LaunchController::launchInstance()
auto showConsole = m_instance->settings()->get("ShowConsole").toBool();
if(!console && showConsole)
{
MMC->showInstanceWindow(m_instance);
LAUNCHER->showInstanceWindow(m_instance);
}
connect(m_launcher.get(), &LaunchTask::readyForLaunch, this, &LaunchController::readyForLaunch);
connect(m_launcher.get(), &LaunchTask::succeeded, this, &LaunchController::onSucceeded);
@ -360,7 +360,7 @@ void LaunchController::onFailed(QString reason)
{
if(m_instance->settings()->get("ShowConsoleOnError").toBool())
{
MMC->showInstanceWindow(m_instance, "console");
LAUNCHER->showInstanceWindow(m_instance, "console");
}
emitFailed(reason);
}