diff options
author | TheKodeToad <TheKodeToad@proton.me> | 2023-08-27 18:21:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-27 18:21:14 +0100 |
commit | 9110fbf2829a48c36fe37cabfb438e165956bbcf (patch) | |
tree | c7f63d81c29dfbe4b2c2ecc9ad1b1525bd7499a6 /launcher/ui/dialogs | |
parent | e3b04d10cf4a234a1735b145a0a594b9241c84d1 (diff) | |
parent | c5aac24a93df4961bbd70260ab9812f1fd836779 (diff) | |
download | PrismLauncher-9110fbf2829a48c36fe37cabfb438e165956bbcf.tar.gz PrismLauncher-9110fbf2829a48c36fe37cabfb438e165956bbcf.tar.bz2 PrismLauncher-9110fbf2829a48c36fe37cabfb438e165956bbcf.zip |
Merge pull request #1560 from Trial97/curse_multiple_loaders2
Add suport for flame multiple loaders
Diffstat (limited to 'launcher/ui/dialogs')
-rw-r--r-- | launcher/ui/dialogs/ModUpdateDialog.cpp | 6 | ||||
-rw-r--r-- | launcher/ui/dialogs/ResourceDownloadDialog.cpp | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/launcher/ui/dialogs/ModUpdateDialog.cpp b/launcher/ui/dialogs/ModUpdateDialog.cpp index 0af1ec59..1f0fa7cd 100644 --- a/launcher/ui/dialogs/ModUpdateDialog.cpp +++ b/launcher/ui/dialogs/ModUpdateDialog.cpp @@ -5,8 +5,6 @@ #include "ScrollMessageBox.h" #include "ui_ReviewMessageBox.h" -#include "FileSystem.h" -#include "Json.h" #include "Markdown.h" #include "tasks/ConcurrentTask.h" @@ -30,9 +28,9 @@ static std::list<Version> mcVersions(BaseInstance* inst) return { static_cast<MinecraftInstance*>(inst)->getPackProfile()->getComponent("net.minecraft")->getVersion() }; } -static std::optional<ResourceAPI::ModLoaderTypes> mcLoaders(BaseInstance* inst) +static std::optional<ModPlatform::ModLoaderTypes> mcLoaders(BaseInstance* inst) { - return { static_cast<MinecraftInstance*>(inst)->getPackProfile()->getModLoaders() }; + return { static_cast<MinecraftInstance*>(inst)->getPackProfile()->getSupportedModLoaders() }; } ModUpdateDialog::ModUpdateDialog(QWidget* parent, diff --git a/launcher/ui/dialogs/ResourceDownloadDialog.cpp b/launcher/ui/dialogs/ResourceDownloadDialog.cpp index 4b82c0c5..9e121bb6 100644 --- a/launcher/ui/dialogs/ResourceDownloadDialog.cpp +++ b/launcher/ui/dialogs/ResourceDownloadDialog.cpp @@ -279,7 +279,7 @@ QList<BasePage*> ModDownloadDialog::getPages() { QList<BasePage*> pages; - auto loaders = static_cast<MinecraftInstance*>(m_instance)->getPackProfile()->getModLoaders().value(); + auto loaders = static_cast<MinecraftInstance*>(m_instance)->getPackProfile()->getSupportedModLoaders().value(); if (ModrinthAPI::validateModLoaders(loaders)) pages.append(ModrinthModPage::create(this, *m_instance)); |