diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-01-27 22:31:07 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-04-02 00:14:06 +0200 |
| commit | 791221e923586bb717396ecf18bd13e57034df99 (patch) | |
| tree | 9f608af07375b38626c8964671620477158341ba /logic/LegacyUpdate.cpp | |
| parent | 593111b14463e9d5d08256061b981b5ab1cfb710 (diff) | |
| download | MultiMC-791221e923586bb717396ecf18bd13e57034df99.tar MultiMC-791221e923586bb717396ecf18bd13e57034df99.tar.gz MultiMC-791221e923586bb717396ecf18bd13e57034df99.tar.lz MultiMC-791221e923586bb717396ecf18bd13e57034df99.tar.xz MultiMC-791221e923586bb717396ecf18bd13e57034df99.zip | |
NOISSUE Refactors and moving of things
Diffstat (limited to 'logic/LegacyUpdate.cpp')
| -rw-r--r-- | logic/LegacyUpdate.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/logic/LegacyUpdate.cpp b/logic/LegacyUpdate.cpp index a6dae1b4..30f781ab 100644 --- a/logic/LegacyUpdate.cpp +++ b/logic/LegacyUpdate.cpp @@ -409,7 +409,7 @@ void LegacyUpdate::ModTheJar() } // Get the mod list - auto modList = inst->jarModList(); + auto modList = inst->getJarMods(); QFileInfo runnableJar(inst->runnableJar()); QFileInfo baseJar(inst->baseJar()); @@ -421,7 +421,7 @@ void LegacyUpdate::ModTheJar() // yes, this can happen if the instance only has the runnable jar and not the base jar // it *could* be assumed that such an instance is vanilla, but that wouldn't be safe // because that's not something mmc4 guarantees - if (runnableJar.isFile() && !baseJar.exists() && modList->empty()) + if (runnableJar.isFile() && !baseJar.exists() && modList.empty()) { inst->setShouldRebuild(false); emitSucceeded(); @@ -452,14 +452,12 @@ void LegacyUpdate::ModTheJar() return; } - // TaskStep(); // STEP 1 setStatus(tr("Installing mods: Opening minecraft.jar ...")); - const auto & mods = modList->allMods(); QString outputJarPath = runnableJar.filePath(); QString inputJarPath = baseJar.filePath(); - if(!JarUtils::createModdedJar(inputJarPath, outputJarPath, mods)) + if(!JarUtils::createModdedJar(inputJarPath, outputJarPath, modList)) { emitFailed(tr("Failed to create the custom Minecraft jar file.")); return; |