diff options
| author | TheKodeToad <TheKodeToad@proton.me> | 2023-03-18 14:02:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-18 14:02:05 +0000 |
| commit | 1893871a99d26955e411b0b5dba4d2fe4368d96e (patch) | |
| tree | 998873a40d3da6622854b3fb84d973f7b29d70a3 /launcher/minecraft/MinecraftInstance.cpp | |
| parent | 8837f06e4e97ed966662b52db206facd7f91a489 (diff) | |
| parent | 45b0367d14f38d40af5cc8603f7daab05d83af5f (diff) | |
| download | PrismLauncher-1893871a99d26955e411b0b5dba4d2fe4368d96e.tar.gz PrismLauncher-1893871a99d26955e411b0b5dba4d2fe4368d96e.tar.bz2 PrismLauncher-1893871a99d26955e411b0b5dba4d2fe4368d96e.zip | |
Merge branch 'PrismLauncher:develop' into mrpack-export
Diffstat (limited to 'launcher/minecraft/MinecraftInstance.cpp')
| -rw-r--r-- | launcher/minecraft/MinecraftInstance.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index 4fe234c4..af4da5d0 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -290,6 +290,11 @@ QString MinecraftInstance::coreModsDir() const return FS::PathCombine(gameRoot(), "coremods"); } +QString MinecraftInstance::nilModsDir() const +{ + return FS::PathCombine(gameRoot(), "nilmods"); +} + QString MinecraftInstance::resourcePacksDir() const { return FS::PathCombine(gameRoot(), "resourcepacks"); @@ -1125,6 +1130,18 @@ std::shared_ptr<ModFolderModel> MinecraftInstance::coreModList() const return m_core_mod_list; } +std::shared_ptr<ModFolderModel> MinecraftInstance::nilModList() const +{ + if (!m_nil_mod_list) + { + bool is_indexed = !APPLICATION->settings()->get("ModMetadataDisabled").toBool(); + m_nil_mod_list.reset(new ModFolderModel(nilModsDir(), is_indexed, false)); + m_nil_mod_list->disableInteraction(isRunning()); + connect(this, &BaseInstance::runningStatusChanged, m_nil_mod_list.get(), &ModFolderModel::disableInteraction); + } + return m_nil_mod_list; +} + std::shared_ptr<ResourcePackFolderModel> MinecraftInstance::resourcePackList() const { if (!m_resource_pack_list) |