Skip to content

feat(modpacks): restore support for ftb modpacks, and fetch official curseforge api key #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
notwindstone merged 16 commits into from
Feb 15, 2026
Merged

feat(modpacks): restore support for ftb modpacks, and fetch official curseforge api key #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4f29667
feat(ftb): restore ftb pack support
LunisCandle Feb 8, 2026
6b6ee82
feat(ftb): add neoforge support to ftb
LunisCandle Feb 8, 2026
52eda41
feat(ftb): add metacache directory for ftb packs
LunisCandle Feb 8, 2026
25df6db
feat(curseforge): allow fetching official api key
LunisCandle Feb 8, 2026
f5d8a62
feat: allow curseforge to appear on new instance page regardless of …
LunisCandle Feb 8, 2026
1f16751
chore: remove prism's api key
LunisCandle Feb 8, 2026
90d80ae
chore: remove (now) incorrect message
LunisCandle Feb 8, 2026
32bc7af
fix(ftb): use QIcon instead of a non-existent getThemedIcon
notwindstone Feb 12, 2026
2651a8c
fix(ftb): replace missing methods with their alternatives
notwindstone Feb 12, 2026
668a805
fix: fix closure syntax and change the variable type
notwindstone Feb 12, 2026
762610f
fix(ftb): change the response variable type
notwindstone Feb 12, 2026
57ef1e1
chore(flame): remove unnecessary qt5 compatibility code
so5iso4ka Feb 15, 2026
5e93fb1
fix(flame): add missing return statements
so5iso4ka Feb 15, 2026
eafda60
refactor(flame): log API key in auth credentials category
so5iso4ka Feb 15, 2026
7c3c2dd
style: replace include guard with pragma once
so5iso4ka Feb 15, 2026
bdbeeca
feat(flame): move API key fetching to setup wizard
so5iso4ka Feb 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion launcher/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include "net/PasteUpload.h"
#include "tasks/Task.h"
#include "tools/GenericProfiler.h"
#include "ui/GuiUtil.h"
#include "ui/InstanceWindow.h"
#include "ui/MainWindow.h"
#include "ui/ToolTipFilter.h"
Expand All @@ -70,6 +71,7 @@
#include "ui/pages/global/ProxyPage.h"

#include "ui/setupwizard/AutoJavaWizardPage.h"
#include "ui/setupwizard/FlameApiKeyWizardPage.h"
#include "ui/setupwizard/JavaWizardPage.h"
#include "ui/setupwizard/LanguageWizardPage.h"
#include "ui/setupwizard/LoginWizardPage.h"
Expand Down Expand Up @@ -923,6 +925,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
m_settings->set("FlameKeyOverride", flameKey);
m_settings->reset("CFKeyOverride");
}
m_settings->registerSetting("FlameKeyShouldBeFetchedOnStartup", true);
m_settings->registerSetting("ModrinthToken", "");
m_settings->registerSetting("UserAgentOverride", "");

Expand Down Expand Up @@ -1046,6 +1049,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
m_metacache->addBase("FlameMods", QDir("cache/FlameMods").absolutePath());
m_metacache->addBase("ModrinthPacks", QDir("cache/ModrinthPacks").absolutePath());
m_metacache->addBase("ModrinthModpacks", QDir("cache/ModrinthModpacks").absolutePath());
m_metacache->addBase("ModpacksCHPacks", QDir("cache/ModpacksCHPacks").absolutePath());
m_metacache->addBase("translations", QDir("translations").absolutePath());
m_metacache->addBase("meta", QDir("meta").absolutePath());
m_metacache->addBase("java", QDir("cache/java").absolutePath());
Expand Down Expand Up @@ -1262,8 +1266,10 @@ bool Application::createSetupWizard()
bool validWidgets = m_themeManager->isValidApplicationTheme(settings()->get("ApplicationTheme").toString());
bool validIcons = m_themeManager->isValidIconTheme(settings()->get("IconTheme").toString());
bool login = !m_accounts->anyAccountIsValid() && capabilities() & Application::SupportsMSA;
bool fetchFlameAPIKey = settings()->get("FlameKeyShouldBeFetchedOnStartup").toBool();
bool themeInterventionRequired = !validWidgets || !validIcons;
bool wizardRequired = javaRequired || languageRequired || pasteInterventionRequired || themeInterventionRequired || askjava || login;
bool wizardRequired =
javaRequired || languageRequired || pasteInterventionRequired || themeInterventionRequired || askjava || login || fetchFlameAPIKey;
if (wizardRequired) {
// set default theme after going into theme wizard
if (!validIcons)
Expand Down Expand Up @@ -1303,6 +1309,11 @@ bool Application::createSetupWizard()
if (login) {
m_setupWizard->addPage(new LoginWizardPage(m_setupWizard));
}

if (fetchFlameAPIKey) {
m_setupWizard->addPage(new FlameAPIKeyWizardPage(m_setupWizard));
}

connect(m_setupWizard, &QDialog::finished, this, &Application::setupWizardFinished);
m_setupWizard->show();
}
Expand Down
20 changes: 20 additions & 0 deletions launcher/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ set(NET_SOURCES
net/ChecksumValidator.h
net/Download.cpp
net/Download.h
net/FetchFlameAPIKey.cpp
net/FetchFlameAPIKey.h
net/FileSink.cpp
net/FileSink.h
net/Head.cpp
Expand Down Expand Up @@ -587,6 +589,13 @@ set(MODRINTH_SOURCES
modplatform/modrinth/ModrinthPackExportTask.h
)

set(MODPACKSCH_SOURCES
modplatform/modpacksch/FTBPackInstallTask.h
modplatform/modpacksch/FTBPackInstallTask.cpp
modplatform/modpacksch/FTBPackManifest.h
modplatform/modpacksch/FTBPackManifest.cpp
)

set(PACKWIZ_SOURCES
modplatform/packwiz/Packwiz.h
modplatform/packwiz/Packwiz.cpp
Expand Down Expand Up @@ -814,6 +823,7 @@ set(LOGIC_SOURCES
${FTB_SOURCES}
${FLAME_SOURCES}
${MODRINTH_SOURCES}
${MODPACKSCH_SOURCES}
${PACKWIZ_SOURCES}
${TECHNIC_SOURCES}
${ATLAUNCHER_SOURCES}
Expand Down Expand Up @@ -903,6 +913,8 @@ SET(LAUNCHER_SOURCES
ui/setupwizard/SetupWizard.h
ui/setupwizard/SetupWizard.cpp
ui/setupwizard/BaseWizardPage.h
ui/setupwizard/FlameApiKeyWizardPage.cpp
ui/setupwizard/FlameApiKeyWizardPage.h
ui/setupwizard/JavaWizardPage.cpp
ui/setupwizard/JavaWizardPage.h
ui/setupwizard/LanguageWizardPage.cpp
Expand Down Expand Up @@ -1056,6 +1068,13 @@ SET(LAUNCHER_SOURCES
ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h

ui/pages/modplatform/ftb/FtbFilterModel.cpp
ui/pages/modplatform/ftb/FtbFilterModel.h
ui/pages/modplatform/ftb/FtbListModel.cpp
ui/pages/modplatform/ftb/FtbListModel.h
ui/pages/modplatform/ftb/FtbPage.cpp
ui/pages/modplatform/ftb/FtbPage.h

ui/pages/modplatform/legacy_ftb/Page.cpp
ui/pages/modplatform/legacy_ftb/Page.h
ui/pages/modplatform/legacy_ftb/ListModel.h
Expand Down Expand Up @@ -1291,6 +1310,7 @@ qt_wrap_ui(LAUNCHER_UI
ui/pages/modplatform/import_ftb/ImportFTBPage.ui
ui/pages/modplatform/ImportPage.ui
ui/pages/modplatform/OptionalModDialog.ui
ui/pages/modplatform/ftb/FtbPage.ui
ui/pages/modplatform/modrinth/ModrinthPage.ui
ui/pages/modplatform/technic/TechnicPage.ui
ui/widgets/CustomCommands.ui
Expand Down
Loading
Loading