diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-04-07 00:27:24 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-04-07 00:27:24 +0200 |
| commit | 795889d934e8f4ebe89be1a49a3417fd98e89be1 (patch) | |
| tree | c5b0d30d425003c4b88e84a2908e63eb5ed797b9 /api/logic/minecraft/ftb/FTBProfileStrategy.cpp | |
| parent | 160b5033a79e6b5ee9f3e2a001b96c677f41ddcb (diff) | |
| parent | 8e58d61150b0bdbe9eb91065d36342f3004fe97b (diff) | |
| download | MultiMC-795889d934e8f4ebe89be1a49a3417fd98e89be1.tar MultiMC-795889d934e8f4ebe89be1a49a3417fd98e89be1.tar.gz MultiMC-795889d934e8f4ebe89be1a49a3417fd98e89be1.tar.lz MultiMC-795889d934e8f4ebe89be1a49a3417fd98e89be1.tar.xz MultiMC-795889d934e8f4ebe89be1a49a3417fd98e89be1.zip | |
Merge branch 'feature/meta' into develop
Diffstat (limited to 'api/logic/minecraft/ftb/FTBProfileStrategy.cpp')
| -rw-r--r-- | api/logic/minecraft/ftb/FTBProfileStrategy.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/api/logic/minecraft/ftb/FTBProfileStrategy.cpp b/api/logic/minecraft/ftb/FTBProfileStrategy.cpp index e4e6a6ae..c3d9cc6a 100644 --- a/api/logic/minecraft/ftb/FTBProfileStrategy.cpp +++ b/api/logic/minecraft/ftb/FTBProfileStrategy.cpp @@ -2,7 +2,6 @@ #include "OneSixFTBInstance.h" #include "minecraft/VersionBuildError.h" -#include "minecraft/MinecraftVersionList.h" #include <FileSystem.h> #include <QDir> @@ -28,9 +27,8 @@ void FTBProfileStrategy::loadDefaultBuiltinPatches() if(QFile::exists(mcJson)) { auto file = ProfileUtils::parseJsonFile(QFileInfo(mcJson), false); - file->fileId = "net.minecraft"; + file->uid = "net.minecraft"; file->name = QObject::tr("Minecraft (tracked)"); - file->setVanilla(true); if(file->version.isEmpty()) { file->version = mcVersion; @@ -40,7 +38,8 @@ void FTBProfileStrategy::loadDefaultBuiltinPatches() addLib->setHint("local"); addLib->setStoragePrefix(nativeInstance->librariesPath().absolutePath()); } - minecraftPatch = std::dynamic_pointer_cast<ProfilePatch>(file); + minecraftPatch = std::make_shared<ProfilePatch>(file); + minecraftPatch->setVanilla(true); } else { @@ -65,8 +64,7 @@ void FTBProfileStrategy::loadDefaultBuiltinPatches() addLib->setHint("local"); addLib->setStoragePrefix(nativeInstance->librariesPath().absolutePath()); } - file->fileId = "org.multimc.ftb.pack"; - file->setVanilla(true); + file->uid = "org.multimc.ftb.pack"; file->name = QObject::tr("%1 (FTB pack)").arg(m_instance->name()); if(file->version.isEmpty()) { @@ -82,7 +80,8 @@ void FTBProfileStrategy::loadDefaultBuiltinPatches() } } } - packPatch = std::dynamic_pointer_cast<ProfilePatch>(file); + packPatch = std::make_shared<ProfilePatch>(file); + packPatch->setVanilla(true); } else { |