summaryrefslogtreecommitdiffstats
path: root/api/logic/minecraft/update
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-10-11 23:04:24 +0200
committerPetr Mrázek <peterix@gmail.com>2017-11-04 15:23:49 +0100
commitfede712a26937c5c0815cb9ed62320a8611794eb (patch)
tree1e881f91a01a235bf38710a795ad8add7a728208 /api/logic/minecraft/update
parent87edaa7dcd05db10399eda1b2769208a82a54cdf (diff)
downloadMultiMC-fede712a26937c5c0815cb9ed62320a8611794eb.tar
MultiMC-fede712a26937c5c0815cb9ed62320a8611794eb.tar.gz
MultiMC-fede712a26937c5c0815cb9ed62320a8611794eb.tar.lz
MultiMC-fede712a26937c5c0815cb9ed62320a8611794eb.tar.xz
MultiMC-fede712a26937c5c0815cb9ed62320a8611794eb.zip
NOISSUE rename MinecraftProfile to ComponentList
It is realistically a list of components. The fact that it also holds the final launch parameters is a design bug.
Diffstat (limited to 'api/logic/minecraft/update')
-rw-r--r--api/logic/minecraft/update/AssetUpdateTask.cpp6
-rw-r--r--api/logic/minecraft/update/FMLLibrariesTask.cpp4
-rw-r--r--api/logic/minecraft/update/LibrariesTask.cpp4
3 files changed, 7 insertions, 7 deletions
diff --git a/api/logic/minecraft/update/AssetUpdateTask.cpp b/api/logic/minecraft/update/AssetUpdateTask.cpp
index b67e630e..6919e0a6 100644
--- a/api/logic/minecraft/update/AssetUpdateTask.cpp
+++ b/api/logic/minecraft/update/AssetUpdateTask.cpp
@@ -1,7 +1,7 @@
#include "Env.h"
#include "AssetUpdateTask.h"
#include "minecraft/MinecraftInstance.h"
-#include "minecraft/MinecraftProfile.h"
+#include "minecraft/ComponentList.h"
#include "net/ChecksumValidator.h"
#include "minecraft/AssetsUtils.h"
@@ -12,7 +12,7 @@ AssetUpdateTask::AssetUpdateTask(MinecraftInstance * inst)
void AssetUpdateTask::executeTask()
{
setStatus(tr("Updating assets index..."));
- auto profile = m_inst->getMinecraftProfile();
+ auto profile = m_inst->getComponentList();
auto assets = profile->getMinecraftAssets();
QUrl indexUrl = assets->url;
QString localPath = assets->id + ".json";
@@ -48,7 +48,7 @@ void AssetUpdateTask::assetIndexFinished()
AssetsIndex index;
qDebug() << m_inst->name() << ": Finished asset index download";
- auto profile = m_inst->getMinecraftProfile();
+ auto profile = m_inst->getComponentList();
auto assets = profile->getMinecraftAssets();
QString asset_fname = "assets/indexes/" + assets->id + ".json";
diff --git a/api/logic/minecraft/update/FMLLibrariesTask.cpp b/api/logic/minecraft/update/FMLLibrariesTask.cpp
index 63428a48..e64b7a82 100644
--- a/api/logic/minecraft/update/FMLLibrariesTask.cpp
+++ b/api/logic/minecraft/update/FMLLibrariesTask.cpp
@@ -3,7 +3,7 @@
#include <minecraft/VersionFilterData.h>
#include "FMLLibrariesTask.h"
#include "minecraft/MinecraftInstance.h"
-#include "minecraft/MinecraftProfile.h"
+#include "minecraft/ComponentList.h"
FMLLibrariesTask::FMLLibrariesTask(MinecraftInstance * inst)
{
@@ -13,7 +13,7 @@ void FMLLibrariesTask::executeTask()
{
// Get the mod list
MinecraftInstance *inst = (MinecraftInstance *)m_inst;
- std::shared_ptr<MinecraftProfile> profile = inst->getMinecraftProfile();
+ std::shared_ptr<ComponentList> profile = inst->getComponentList();
bool forge_present = false;
if (!profile->hasTrait("legacyFML"))
diff --git a/api/logic/minecraft/update/LibrariesTask.cpp b/api/logic/minecraft/update/LibrariesTask.cpp
index c408f432..bbbd5f02 100644
--- a/api/logic/minecraft/update/LibrariesTask.cpp
+++ b/api/logic/minecraft/update/LibrariesTask.cpp
@@ -1,7 +1,7 @@
#include "Env.h"
#include "LibrariesTask.h"
#include "minecraft/MinecraftInstance.h"
-#include "minecraft/MinecraftProfile.h"
+#include "minecraft/ComponentList.h"
LibrariesTask::LibrariesTask(MinecraftInstance * inst)
{
@@ -21,7 +21,7 @@ void LibrariesTask::executeTask()
}
// Build a list of URLs that will need to be downloaded.
- std::shared_ptr<MinecraftProfile> profile = inst->getMinecraftProfile();
+ std::shared_ptr<ComponentList> profile = inst->getComponentList();
auto job = new NetJob(tr("Libraries for instance %1").arg(inst->name()));
downloadJob.reset(job);