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

Merge pull request #675 from flowln/generalize_mod_model

Browse Source
This commit is contained in:
Sefa Eyeoglu
2023-01-23 23:58:52 +01:00
committed by GitHub
parent 04e4900415 ea5020e188
commit 16477a8f6c
80 changed files with 2908 additions and 1921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/ui/pages/instance/ManagedPackPage.cpp
View File

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2022 flow <flowlnlnln@gmail.com>
// SPDX-FileCopyrightText: 2022 flowln <flowlnlnln@gmail.com>
//
// SPDX-License-Identifier: GPL-3.0-only

4
launcher/ui/pages/instance/ManagedPackPage.h
View File

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2022 flow <flowlnlnln@gmail.com>
// SPDX-FileCopyrightText: 2022 flowln <flowlnlnln@gmail.com>
//
// SPDX-License-Identifier: GPL-3.0-only
@ -12,6 +12,8 @@
#include "modplatform/flame/FlameAPI.h"
#include "modplatform/flame/FlamePackIndex.h"
#include "net/NetJob.h"
#include "ui/pages/BasePage.h"
#include <QWidget>

8
launcher/ui/pages/instance/ModFolderPage.cpp
View File

@ -49,8 +49,8 @@
#include "ui/GuiUtil.h"
#include "ui/dialogs/CustomMessageBox.h"
#include "ui/dialogs/ModDownloadDialog.h"
#include "ui/dialogs/ModUpdateDialog.h"
#include "ui/dialogs/ResourceDownloadDialog.h"
#include "DesktopServices.h"
@ -59,7 +59,7 @@
#include "minecraft/mod/Mod.h"
#include "minecraft/mod/ModFolderModel.h"
#include "modplatform/ModAPI.h"
#include "modplatform/ResourceAPI.h"
#include "Version.h"
#include "tasks/ConcurrentTask.h"
@ -153,12 +153,12 @@ void ModFolderPage::installMods()
return; // this is a null instance or a legacy instance
auto profile = static_cast<MinecraftInstance*>(m_instance)->getPackProfile();
if (profile->getModLoaders() == ModAPI::Unspecified) {
if (!profile->getModLoaders().has_value()) {
QMessageBox::critical(this, tr("Error"), tr("Please install a mod loader first!"));
return;
}
ModDownloadDialog mdownload(m_model, this, m_instance);
ResourceDownload::ModDownloadDialog mdownload(this, m_model, m_instance);
if (mdownload.exec()) {
ConcurrentTask* tasks = new ConcurrentTask(this);
connect(tasks, &Task::failed, [this, tasks](QString reason) {

1
launcher/ui/pages/instance/ResourcePackPage.h
View File

@ -73,3 +73,4 @@ public:
return true;
}
};