Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #607 from dada513/curse_set

Browse Source
This commit is contained in:
dada513 2022-05-20 20:41:42 +02:00 committed by GitHub
commit 88a93945d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 68 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
launcher/Application.cpp
View File

@ -679,6 +679,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
// Custom MSA credentials
m_settings->registerSetting("MSAClientIDOverride", "");
m_settings->registerSetting("CFKeyOverride", "");
// Init page provider
{
@ -1508,3 +1509,13 @@ QString Application::getMSAClientID()
return BuildConfig.MSA_CLIENT_ID;
}
QString Application::getCurseKey()
{
QString keyOverride = m_settings->get("CFKeyOverride").toString();
if (!keyOverride.isEmpty()) {
return keyOverride;
}
return BuildConfig.CURSEFORGE_API_KEY;
}

1
launcher/Application.h
View File

@ -155,6 +155,7 @@ public:
QString getJarsPath();
QString getMSAClientID();
QString getCurseKey();
/// this is the root of the 'installation'. Used for automatic updates
const QString &root() {

3
launcher/net/Download.cpp
View File

@ -25,6 +25,7 @@
#include "MetaCacheSink.h"
#include "BuildConfig.h"
#include "Application.h"
namespace Net {
@ -96,7 +97,7 @@ void Download::startImpl()
request.setHeader(QNetworkRequest::UserAgentHeader, BuildConfig.USER_AGENT);
if (request.url().host().contains("api.curseforge.com")) {
request.setRawHeader("x-api-key", BuildConfig.CURSEFORGE_API_KEY.toUtf8());
request.setRawHeader("x-api-key", APPLICATION->getCurseKey().toUtf8());
};
QNetworkReply* rep = m_network->get(request);

4
launcher/ui/pages/global/APIPage.cpp
View File

@ -70,6 +70,8 @@ void APIPage::loadSettings()
ui->urlChoices->setCurrentText(pastebinURL);
QString msaClientID = s->get("MSAClientIDOverride").toString();
ui->msaClientID->setText(msaClientID);
QString curseKey = s->get("CFKeyOverride").toString();
ui->curseKey->setText(curseKey);
}
void APIPage::applySettings()
@ -79,6 +81,8 @@ void APIPage::applySettings()
s->set("PastebinURL", pastebinURL);
QString msaClientID = ui->msaClientID->text();
s->set("MSAClientIDOverride", msaClientID);
QString curseKey = ui->curseKey->text();
s->set("CFKeyOverride", curseKey);
}
bool APIPage::apply()

62
launcher/ui/pages/global/APIPage.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>491</width>
<height>474</height>
<width>603</width>
<height>530</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@ -148,17 +148,56 @@
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<widget class="QGroupBox" name="groupBox_curse">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>&amp;CurseForge Core API</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="Line" name="line_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</widget>
</item>
<item>
<widget class="QLabel" name="label_6">
<property name="text">
<string>Note: you probably don't need to set this if CurseForge already works.</string>
</property>
</spacer>
</widget>
</item>
<item>
<widget class="QLineEdit" name="curseKey">
<property name="enabled">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>(Default)</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>Enter a custom API Key for CurseForge here. </string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
@ -166,9 +205,6 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>tabWidget</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>