aboutsummaryrefslogtreecommitdiff
path: root/api/logic/minecraft/MinecraftInstance.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@users.noreply.github.com>2021-06-19 12:50:21 +0200
committerGitHub <noreply@github.com>2021-06-19 12:50:21 +0200
commit5f8d07c0092b6cc44f81104a3d7f9e7e49d9df5d (patch)
tree8fe8110d91c112d5596610df8045801e23e7212b /api/logic/minecraft/MinecraftInstance.cpp
parent25955c08179a9077ca7eef89d0f72eb7803bec08 (diff)
parentb246fc171e1e8c747b0aedd6b0b47b923cc8cfb7 (diff)
downloadPrismLauncher-5f8d07c0092b6cc44f81104a3d7f9e7e49d9df5d.tar.gz
PrismLauncher-5f8d07c0092b6cc44f81104a3d7f9e7e49d9df5d.tar.bz2
PrismLauncher-5f8d07c0092b6cc44f81104a3d7f9e7e49d9df5d.zip
Merge pull request #3875 from jamierocks/feature/gh-3033
GH-3033 Add filtering for version components
Diffstat (limited to 'api/logic/minecraft/MinecraftInstance.cpp')
-rw-r--r--api/logic/minecraft/MinecraftInstance.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/api/logic/minecraft/MinecraftInstance.cpp b/api/logic/minecraft/MinecraftInstance.cpp
index a1341e69..fdf9bd61 100644
--- a/api/logic/minecraft/MinecraftInstance.cpp
+++ b/api/logic/minecraft/MinecraftInstance.cpp
@@ -29,6 +29,8 @@
#include "meta/VersionList.h"
#include "mod/ModFolderModel.h"
+#include "mod/ResourcePackFolderModel.h"
+#include "mod/TexturePackFolderModel.h"
#include "WorldList.h"
#include "icons/IIconList.h"
@@ -986,7 +988,7 @@ std::shared_ptr<ModFolderModel> MinecraftInstance::resourcePackList() const
{
if (!m_resource_pack_list)
{
- m_resource_pack_list.reset(new ModFolderModel(resourcePacksDir()));
+ m_resource_pack_list.reset(new ResourcePackFolderModel(resourcePacksDir()));
m_resource_pack_list->disableInteraction(isRunning());
connect(this, &BaseInstance::runningStatusChanged, m_resource_pack_list.get(), &ModFolderModel::disableInteraction);
}
@@ -997,7 +999,7 @@ std::shared_ptr<ModFolderModel> MinecraftInstance::texturePackList() const
{
if (!m_texture_pack_list)
{
- m_texture_pack_list.reset(new ModFolderModel(texturePacksDir()));
+ m_texture_pack_list.reset(new TexturePackFolderModel(texturePacksDir()));
m_texture_pack_list->disableInteraction(isRunning());
connect(this, &BaseInstance::runningStatusChanged, m_texture_pack_list.get(), &ModFolderModel::disableInteraction);
}