CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE separate new mods model from the simple one

Browse Source 
It should list mods in various locations...
This commit is contained in:
Petr Mrázek
2018-07-15 14:04:09 +02:00
parent 128bce6acb
commit 03280cc62e
15 changed files with 582 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
api/logic/minecraft/MinecraftInstance.cpp
View File

@ -25,7 +25,8 @@
#include "meta/Index.h"
#include "meta/VersionList.h"
#include "ModList.h"
#include "SimpleModList.h"
#include "ModsModel.h"
#include "WorldList.h"
#include "icons/IIconList.h"
@ -178,6 +179,11 @@ QString MinecraftInstance::loaderModsDir() const
return FS::PathCombine(minecraftRoot(), "mods");
}
QString MinecraftInstance::modsCacheLocation() const
{
return FS::PathCombine(instanceRoot(), "mods.cache");
}
QString MinecraftInstance::coreModsDir() const
{
return FS::PathCombine(minecraftRoot(), "coremods");
@ -884,41 +890,51 @@ JavaVersion MinecraftInstance::getJavaVersion() const
return JavaVersion(settings()->get("JavaVersion").toString());
}
std::shared_ptr<ModList> MinecraftInstance::loaderModList() const
std::shared_ptr<SimpleModList> MinecraftInstance::loaderModList() const
{
if (!m_loader_mod_list)
{
m_loader_mod_list.reset(new ModList(loaderModsDir()));
m_loader_mod_list.reset(new SimpleModList(loaderModsDir()));
}
m_loader_mod_list->update();
return m_loader_mod_list;
}
std::shared_ptr<ModList> MinecraftInstance::coreModList() const
std::shared_ptr<ModsModel> MinecraftInstance::modsModel() const
{
if (!m_mods_model)
{
m_mods_model.reset(new ModsModel(loaderModsDir(), coreModsDir(), modsCacheLocation()));
}
m_mods_model->update();
return m_mods_model;
}
std::shared_ptr<SimpleModList> MinecraftInstance::coreModList() const
{
if (!m_core_mod_list)
{
m_core_mod_list.reset(new ModList(coreModsDir()));
m_core_mod_list.reset(new SimpleModList(coreModsDir()));
}
m_core_mod_list->update();
return m_core_mod_list;
}
std::shared_ptr<ModList> MinecraftInstance::resourcePackList() const
std::shared_ptr<SimpleModList> MinecraftInstance::resourcePackList() const
{
if (!m_resource_pack_list)
{
m_resource_pack_list.reset(new ModList(resourcePacksDir()));
m_resource_pack_list.reset(new SimpleModList(resourcePacksDir()));
}
m_resource_pack_list->update();
return m_resource_pack_list;
}
std::shared_ptr<ModList> MinecraftInstance::texturePackList() const
std::shared_ptr<SimpleModList> MinecraftInstance::texturePackList() const
{
if (!m_texture_pack_list)
{
m_texture_pack_list.reset(new ModList(texturePacksDir()));
m_texture_pack_list.reset(new SimpleModList(texturePacksDir()));
}
m_texture_pack_list->update();
return m_texture_pack_list;