0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #571 from Ryex/blocked-targetFolder

Browse Source 
fix(blockedmods): Track and use targetFolder for blocked files
This commit is contained in:
Sefa Eyeoglu 2022-12-09 08:33:10 +01:00 committed by GitHub
commit e427174ff0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
launcher/modplatform/flame/FlameInstanceCreationTask.cpp
View File

@ -419,6 +419,7 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
blocked_mod.hash = result.hash; blocked_mod.hash = result.hash;
blocked_mod.matched = false; blocked_mod.matched = false;
blocked_mod.localPath = ""; blocked_mod.localPath = "";
blocked_mod.targetFolder = result.targetFolder;
blocked_mods.append(blocked_mod); blocked_mods.append(blocked_mod);
@ -464,7 +465,7 @@ void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods)
continue; 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))); setStatus(tr("Copying Blocked Mods (%1 out of %2 are done)").arg(QString::number(i), QString::number(total)));

3
launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
View File

@ -195,6 +195,7 @@ void PackInstallTask::onResolveModsSucceeded()
blocked_mod.hash = results_file.hash; blocked_mod.hash = results_file.hash;
blocked_mod.matched = false; blocked_mod.matched = false;
blocked_mod.localPath = ""; blocked_mod.localPath = "";
blocked_mod.targetFolder = results_file.targetFolder;
m_blocked_mods.append(blocked_mod); m_blocked_mods.append(blocked_mod);
@ -366,7 +367,7 @@ void PackInstallTask::copyBlockedMods()
continue; 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))); setStatus(tr("Copying Blocked Mods (%1 out of %2 are done)").arg(QString::number(i), QString::number(total)));

1
launcher/ui/dialogs/BlockedModsDialog.h
View File

@ -41,6 +41,7 @@ struct BlockedMod {
QString hash; QString hash;
bool matched; bool matched;
QString localPath; QString localPath;
QString targetFolder;
}; };
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE