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

removed projectID

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-06-24 22:15:18 +03:00
parent f0e4e07c05
commit 69c21454ec
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
4 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
launcher/modplatform/flame/FlamePackExportTask.cpp
View File

@ -41,14 +41,12 @@ const QString FlamePackExportTask::TEMPLATE = "<li><a href={url}>{name}{authors}
FlamePackExportTask::FlamePackExportTask(const QString& name, FlamePackExportTask::FlamePackExportTask(const QString& name,
const QString& version, const QString& version,
const QString& author, const QString& author,
const QVariant& projectID,
InstancePtr instance, InstancePtr instance,
const QString& output, const QString& output,
MMCZip::FilterFunction filter) MMCZip::FilterFunction filter)
: name(name) : name(name)
, version(version) , version(version)
, author(author) , author(author)
, projectID(projectID)
, instance(instance) , instance(instance)
, mcInstance(dynamic_cast<MinecraftInstance*>(instance.get())) , mcInstance(dynamic_cast<MinecraftInstance*>(instance.get()))
, gameRoot(instance->gameRoot()) , gameRoot(instance->gameRoot())
@ -341,7 +339,7 @@ void FlamePackExportTask::buildZip()
content += QString(TEMPLATE) content += QString(TEMPLATE)
.replace("{name}", mod.name) .replace("{name}", mod.name)
.replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.addonId)) .replace("{url}", ModPlatform::getMetaURL(ModPlatform::ResourceProvider::FLAME, mod.addonId))
.replace("{authors}", !mod.authors.isEmpty() ? QString(" (by {%1})").arg(mod.authors) : ""); .replace("{authors}", !mod.authors.isEmpty() ? QString(" (by %1)").arg(mod.authors) : "");
} }
} }
content = "<ul>" + content + "</ul>"; content = "<ul>" + content + "</ul>";
@ -398,8 +396,6 @@ QByteArray FlamePackExportTask::generateIndex()
obj["name"] = name; obj["name"] = name;
obj["version"] = version; obj["version"] = version;
obj["author"] = author; obj["author"] = author;
if (projectID.toInt() != 0)
obj["projectID"] = projectID.toInt();
obj["overrides"] = "overrides"; obj["overrides"] = "overrides";
if (mcInstance) { if (mcInstance) {
QJsonObject version; QJsonObject version;

2
launcher/modplatform/flame/FlamePackExportTask.h
View File

@ -32,7 +32,6 @@ class FlamePackExportTask : public Task {
FlamePackExportTask(const QString& name, FlamePackExportTask(const QString& name,
const QString& version, const QString& version,
const QString& author, const QString& author,
const QVariant& projectID,
InstancePtr instance, InstancePtr instance,
const QString& output, const QString& output,
MMCZip::FilterFunction filter); MMCZip::FilterFunction filter);
@ -46,7 +45,6 @@ class FlamePackExportTask : public Task {
// inputs // inputs
const QString name, version, author; const QString name, version, author;
const QVariant projectID;
const InstancePtr instance; const InstancePtr instance;
MinecraftInstance* mcInstance; MinecraftInstance* mcInstance;
const QDir gameRoot; const QDir gameRoot;

6
launcher/ui/dialogs/ExportPackDialog.cpp
View File

@ -41,12 +41,10 @@ ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPla
ui->name->setText(instance->name()); ui->name->setText(instance->name());
if (m_provider == ModPlatform::ResourceProvider::MODRINTH) { if (m_provider == ModPlatform::ResourceProvider::MODRINTH) {
ui->summary->setText(instance->notes().split(QRegularExpression("\\r?\\n"))[0]); ui->summary->setText(instance->notes().split(QRegularExpression("\\r?\\n"))[0]);
ui->author->hide();
ui->authorLabel->hide();
} else { } else {
setWindowTitle("Export CurseForge Pack"); setWindowTitle("Export CurseForge Pack");
ui->version->setText(""); ui->version->setText("");
ui->summaryLabel->setText("ProjectID"); ui->summaryLabel->setText("Author");
} }
// ensure a valid pack is generated // ensure a valid pack is generated
@ -117,7 +115,7 @@ void ExportPackDialog::done(int result)
task = new ModrinthPackExportTask(ui->name->text(), ui->version->text(), ui->summary->text(), instance, output, task = new ModrinthPackExportTask(ui->name->text(), ui->version->text(), ui->summary->text(), instance, output,
[this](const QString& path) { return proxy->blockedPaths().covers(path); }); [this](const QString& path) { return proxy->blockedPaths().covers(path); });
else else
task = new FlamePackExportTask(ui->name->text(), ui->version->text(), ui->author->text(), ui->summary->text(), instance, output, task = new FlamePackExportTask(ui->name->text(), ui->version->text(), ui->summary->text(), instance, output,
[this](const QString& path) { return proxy->blockedPaths().covers(path); }); [this](const QString& path) { return proxy->blockedPaths().covers(path); });
connect(task, &Task::failed, connect(task, &Task::failed,

11
launcher/ui/dialogs/ExportPackDialog.ui
View File

@ -57,16 +57,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0">
<widget class="QLabel" name="authorLabel">
<property name="text">
<string>Author</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="author"/>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>