mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-12-27 03:14:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5389 from arthomnix/mrpack-config-fix

Browse Source 
NOISSUE Fix configs sometimes not being included in exported mrpacks
This commit is contained in:
Petr Mrázek 2024-12-16 02:06:53 +01:00 committed by GitHub
commit a180553d0f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
launcher/modplatform/modrinth/ModrinthInstanceExportTask.cpp
View File

@ -225,9 +225,10 @@ void InstanceExportTask::lookupSucceeded()
if (tmp.isValid()) {
Json::write(indexJson, tmp.path() + "/modrinth.index.json");
QDir tmpDir(tmp.path());
QDir gameDir(m_instance->gameRoot());
if (!failedFiles.isEmpty()) {
QDir tmpDir(tmp.path());
QDir gameDir(m_instance->gameRoot());
for (const auto &file : failedFiles) {
QString src = file.absoluteFilePath();
tmpDir.mkpath("overrides/" + gameDir.relativeFilePath(file.absolutePath()));
@ -237,17 +238,17 @@ void InstanceExportTask::lookupSucceeded()
return;
}
}
}
if (m_settings.includeGameConfig) {
tmpDir.mkdir("overrides");
QFile::copy(gameDir.absoluteFilePath("options.txt"), tmpDir.absoluteFilePath("overrides/options.txt"));
}
if (m_settings.includeGameConfig) {
tmpDir.mkdir("overrides");
QFile::copy(gameDir.absoluteFilePath("options.txt"), tmpDir.absoluteFilePath("overrides/options.txt"));
}
if (m_settings.includeModConfigs) {
tmpDir.mkdir("overrides");
FS::copy copy(m_instance->gameRoot() + "/config", tmpDir.absoluteFilePath("overrides/config"));
copy();
}
if (m_settings.includeModConfigs) {
tmpDir.mkdir("overrides");
FS::copy copy(gameDir.absoluteFilePath("config"), tmpDir.absoluteFilePath("overrides/config"));
copy();
}
setStatus(tr("Zipping modpack..."));