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

Fix wrong mod file name

Browse Source
This commit is contained in:
timoreo
2022-02-04 16:24:19 +01:00
parent 00e12b776b
commit 86935068f5
5 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
launcher/ui/pages/modplatform/flame/FlameModPage.cpp
View File

@ -140,14 +140,15 @@ void FlameModPage::onSelectionChanged(QModelIndex first, QModelIndex second)
auto packProfile = ((MinecraftInstance *)m_instance)->getPackProfile();
QString mcVersion = packProfile->getComponentVersion("net.minecraft");
QString loaderString = (packProfile->getComponentVersion("net.minecraftforge").isEmpty()) ? "fabric" : "forge";
for(const auto& version : current.versions) {
for(int i = 0; i < current.versions.size(); i++) {
auto version = current.versions[i];
if(!version.mcVersion.contains(mcVersion)){
continue;
}
ui->versionSelectionBox->addItem(version.version, QVariant(version.downloadUrl));
ui->versionSelectionBox->addItem(version.version, QVariant(i));
}
if(ui->versionSelectionBox->count() == 0){
ui->versionSelectionBox->addItem(tr("No Valid Version found!"), QVariant(""));
ui->versionSelectionBox->addItem(tr("No Valid Version found!"), QVariant(-1));
}
suggestCurrent();
@ -156,11 +157,11 @@ void FlameModPage::onSelectionChanged(QModelIndex first, QModelIndex second)
}
else
{
for(auto version : current.versions) {
ui->versionSelectionBox->addItem(version.version, QVariant(version.downloadUrl));
for(int i = 0; i < current.versions.size(); i++) {
ui->versionSelectionBox->addItem(current.versions[i].version, QVariant(i));
}
if(ui->versionSelectionBox->count() == 0){
ui->versionSelectionBox->addItem(tr("No Valid Version found!"), QVariant(""));
ui->versionSelectionBox->addItem(tr("No Valid Version found!"), QVariant(-1));
}
suggestCurrent();
}
@ -173,22 +174,23 @@ void FlameModPage::suggestCurrent()
return;
}
if (selectedVersion.isEmpty())
if (selectedVersion == -1)
{
dialog->setSuggestedMod();
return;
}
dialog->setSuggestedMod(current.name, new ModDownloadTask(selectedVersion, current.versions.at(0).fileName ,dialog->mods));
auto version = current.versions[selectedVersion];
dialog->setSuggestedMod(current.name, new ModDownloadTask(version.downloadUrl, version.fileName , dialog->mods));
}
void FlameModPage::onVersionSelectionChanged(QString data)
{
if(data.isNull() || data.isEmpty())
{
selectedVersion = "";
selectedVersion = -1;
return;
}
selectedVersion = ui->versionSelectionBox->currentData().toString();
selectedVersion = ui->versionSelectionBox->currentData().toInt();
suggestCurrent();
}

2
launcher/ui/pages/modplatform/flame/FlameModPage.h
View File

@ -63,5 +63,5 @@ private:
FlameMod::ListModel* listModel = nullptr;
FlameMod::IndexedPack current;
QString selectedVersion;
int selectedVersion = -1;
};