summaryrefslogtreecommitdiffstats
path: root/logic/minecraft/ftb/FTBProfileStrategy.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-03-13 02:28:55 +0100
committerPetr Mrázek <peterix@gmail.com>2016-03-26 17:05:27 +0100
commit576d808d7197b4b7ef798891dfd138e2e8aae54f (patch)
tree1499c6ec2e2d0430bed906dd32ab1b75876d3e80 /logic/minecraft/ftb/FTBProfileStrategy.cpp
parentf63d1bc99c93705bdadb8221430bda60c89cc062 (diff)
downloadMultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar
MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar.gz
MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar.lz
MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar.xz
MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.zip
NOISSUE resolve library activeness during application to profile
Diffstat (limited to 'logic/minecraft/ftb/FTBProfileStrategy.cpp')
-rw-r--r--logic/minecraft/ftb/FTBProfileStrategy.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/logic/minecraft/ftb/FTBProfileStrategy.cpp b/logic/minecraft/ftb/FTBProfileStrategy.cpp
index 6f635fe8..d43fbf6e 100644
--- a/logic/minecraft/ftb/FTBProfileStrategy.cpp
+++ b/logic/minecraft/ftb/FTBProfileStrategy.cpp
@@ -19,6 +19,7 @@ void FTBProfileStrategy::loadDefaultBuiltinPatches()
// FIXME: this should be here, but it needs us to be able to deal with multiple libraries paths
// OneSixProfileStrategy::loadDefaultBuiltinPatches();
auto mcVersion = m_instance->intendedVersionId();
+ auto nativeInstance = dynamic_cast<OneSixFTBInstance *>(m_instance);
ProfilePatchPtr minecraftPatch;
{
@@ -34,6 +35,11 @@ void FTBProfileStrategy::loadDefaultBuiltinPatches()
{
file->version = mcVersion;
}
+ for(auto addLib: file->libraries)
+ {
+ addLib->setHint("local");
+ addLib->setStoragePrefix(nativeInstance->librariesPath().absolutePath());
+ }
minecraftPatch = std::dynamic_pointer_cast<ProfilePatch>(file);
}
else
@@ -44,7 +50,6 @@ void FTBProfileStrategy::loadDefaultBuiltinPatches()
}
profile->appendPatch(minecraftPatch);
- auto nativeInstance = dynamic_cast<OneSixFTBInstance *>(m_instance);
ProfilePatchPtr packPatch;
{
auto mcJson = m_instance->minecraftRoot() + "/pack.json";
@@ -55,7 +60,7 @@ void FTBProfileStrategy::loadDefaultBuiltinPatches()
// adapt the loaded file - the FTB patch file format is different than ours.
file->id.clear();
- for(auto addLib: file->addLibs)
+ for(auto addLib: file->libraries)
{
addLib->setHint("local");
addLib->setStoragePrefix(nativeInstance->librariesPath().absolutePath());