diff options
| author | Petr Mrázek <peterix@gmail.com> | 2021-11-21 23:21:12 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2021-11-21 23:21:12 +0100 |
| commit | 69213b1206e97f7d4db4270a4b3b0af41dc9e6fc (patch) | |
| tree | b53ca69422ce22cceee9e648171a678679075c1a /launcher/minecraft/update/FMLLibrariesTask.cpp | |
| parent | c2c56a2f6ceaedb8a3fa88c848b345db0fec7f9c (diff) | |
| download | PrismLauncher-69213b1206e97f7d4db4270a4b3b0af41dc9e6fc.tar.gz PrismLauncher-69213b1206e97f7d4db4270a4b3b0af41dc9e6fc.tar.bz2 PrismLauncher-69213b1206e97f7d4db4270a4b3b0af41dc9e6fc.zip | |
NOISSUE continue refactoring things to make tests pass
Diffstat (limited to 'launcher/minecraft/update/FMLLibrariesTask.cpp')
| -rw-r--r-- | launcher/minecraft/update/FMLLibrariesTask.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/launcher/minecraft/update/FMLLibrariesTask.cpp b/launcher/minecraft/update/FMLLibrariesTask.cpp index e7efb369..a5c6b1e3 100644 --- a/launcher/minecraft/update/FMLLibrariesTask.cpp +++ b/launcher/minecraft/update/FMLLibrariesTask.cpp @@ -1,10 +1,12 @@ -#include "Env.h" -#include <FileSystem.h> -#include <minecraft/VersionFilterData.h> #include "FMLLibrariesTask.h" + +#include "FileSystem.h" +#include "minecraft/VersionFilterData.h" #include "minecraft/MinecraftInstance.h" #include "minecraft/PackProfile.h" + #include "BuildConfig.h" +#include "Application.h" FMLLibrariesTask::FMLLibrariesTask(MinecraftInstance * inst) { @@ -60,7 +62,7 @@ void FMLLibrariesTask::executeTask() // download missing libs to our place setStatus(tr("Downloading FML libraries...")); auto dljob = new NetJob("FML libraries"); - auto metacache = ENV->metacache(); + auto metacache = APPLICATION->metacache(); for (auto &lib : fmlLibsToProcess) { auto entry = metacache->resolveEntry("fmllibs", lib.filename); @@ -72,7 +74,7 @@ void FMLLibrariesTask::executeTask() connect(dljob, &NetJob::failed, this, &FMLLibrariesTask::fmllibsFailed); connect(dljob, &NetJob::progress, this, &FMLLibrariesTask::progress); downloadJob.reset(dljob); - downloadJob->start(); + downloadJob->start(APPLICATION->network()); } bool FMLLibrariesTask::canAbort() const @@ -87,7 +89,7 @@ void FMLLibrariesTask::fmllibsFinished() { setStatus(tr("Copying FML libraries into the instance...")); MinecraftInstance *inst = (MinecraftInstance *)m_inst; - auto metacache = ENV->metacache(); + auto metacache = APPLICATION->metacache(); int index = 0; for (auto &lib : fmlLibsToProcess) { |