From 8cf88ffc580310e2e814d097358ff783cd5c4416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 7 Aug 2017 00:46:29 +0200 Subject: GH-1314 add UI for custom minecraft jar addition Also changes the text of the jar mod addition button. It should be clearer what it does and hopefully will not confuse as many people. --- api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp') diff --git a/api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp b/api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp index 42148e67..13310e92 100644 --- a/api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp +++ b/api/logic/minecraft/onesix/update/FMLLibrariesTask.cpp @@ -45,7 +45,7 @@ void FMLLibrariesTask::executeTask() // now check the lib folder inside the instance for files. for (auto &lib : libList) { - QFileInfo libInfo(FS::PathCombine(inst->libDir(), lib.filename)); + QFileInfo libInfo(FS::PathCombine(inst->FMLlibDir(), lib.filename)); if (libInfo.exists()) continue; fmlLibsToProcess.append(lib); @@ -95,13 +95,13 @@ void FMLLibrariesTask::fmllibsFinished() { progress(index, fmlLibsToProcess.size()); auto entry = metacache->resolveEntry("fmllibs", lib.filename); - auto path = FS::PathCombine(inst->libDir(), lib.filename); + auto path = FS::PathCombine(inst->FMLlibDir(), lib.filename); if (!FS::ensureFilePathExists(path)) { emitFailed(tr("Failed creating FML library folder inside the instance.")); return; } - if (!QFile::copy(entry->getFullPath(), FS::PathCombine(inst->libDir(), lib.filename))) + if (!QFile::copy(entry->getFullPath(), FS::PathCombine(inst->FMLlibDir(), lib.filename))) { emitFailed(tr("Failed copying Forge/FML library: %1.").arg(lib.filename)); return; -- cgit v1.2.3