diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-12-09 08:33:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-09 08:33:10 +0100 |
| commit | e427174ff0f2605e6f293d4cbcd4afb3df64ab26 (patch) | |
| tree | 1ffda4b0b5e1bb228b0ed14124265b7aee41895d | |
| parent | 9ad4ae5340a2a75ae14a9ca8f232855a0ea17d4f (diff) | |
| parent | 0f48e0fc06fa89aabea639da8a91fc539c70e138 (diff) | |
| download | PrismLauncher-e427174ff0f2605e6f293d4cbcd4afb3df64ab26.tar.gz PrismLauncher-e427174ff0f2605e6f293d4cbcd4afb3df64ab26.tar.bz2 PrismLauncher-e427174ff0f2605e6f293d4cbcd4afb3df64ab26.zip | |
Merge pull request #571 from Ryex/blocked-targetFolder
fix(blockedmods): Track and use targetFolder for blocked files
| -rw-r--r-- | launcher/modplatform/flame/FlameInstanceCreationTask.cpp | 3 | ||||
| -rw-r--r-- | launcher/modplatform/modpacksch/FTBPackInstallTask.cpp | 3 | ||||
| -rw-r--r-- | launcher/ui/dialogs/BlockedModsDialog.h | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp index f9258f24..ef635243 100644 --- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp +++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp @@ -419,6 +419,7 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop) blocked_mod.hash = result.hash; blocked_mod.matched = false; blocked_mod.localPath = ""; + blocked_mod.targetFolder = result.targetFolder; blocked_mods.append(blocked_mod); @@ -464,7 +465,7 @@ void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods) continue; } - auto dest_path = FS::PathCombine(m_stagingPath, "minecraft", "mods", mod.name); + auto dest_path = FS::PathCombine(m_stagingPath, "minecraft", mod.targetFolder, mod.name); setStatus(tr("Copying Blocked Mods (%1 out of %2 are done)").arg(QString::number(i), QString::number(total))); diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp index 48caa938..2979663d 100644 --- a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp +++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp @@ -195,6 +195,7 @@ void PackInstallTask::onResolveModsSucceeded() blocked_mod.hash = results_file.hash; blocked_mod.matched = false; blocked_mod.localPath = ""; + blocked_mod.targetFolder = results_file.targetFolder; m_blocked_mods.append(blocked_mod); @@ -366,7 +367,7 @@ void PackInstallTask::copyBlockedMods() continue; } - auto dest_path = FS::PathCombine(m_stagingPath, ".minecraft", "mods", mod.name); + auto dest_path = FS::PathCombine(m_stagingPath, ".minecraft", mod.targetFolder, mod.name); setStatus(tr("Copying Blocked Mods (%1 out of %2 are done)").arg(QString::number(i), QString::number(total))); diff --git a/launcher/ui/dialogs/BlockedModsDialog.h b/launcher/ui/dialogs/BlockedModsDialog.h index f63d04b4..014f488a 100644 --- a/launcher/ui/dialogs/BlockedModsDialog.h +++ b/launcher/ui/dialogs/BlockedModsDialog.h @@ -41,6 +41,7 @@ struct BlockedMod { QString hash; bool matched; QString localPath; + QString targetFolder; }; QT_BEGIN_NAMESPACE |