0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE rename MinecraftProfile to ComponentList

Browse Source 
It is realistically a list of components. The fact that it also holds the final
launch parameters is a design bug.
This commit is contained in:
Petr Mrázek
2017-10-11 23:04:24 +02:00
parent 87edaa7dcd
commit fede712a26
21 changed files with 120 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/logic/minecraft/update/AssetUpdateTask.cpp
View File

@@ -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";

4
api/logic/minecraft/update/FMLLibrariesTask.cpp
View File

@@ -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"))

4
api/logic/minecraft/update/LibrariesTask.cpp
View File

@@ -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);