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

fixed settings

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-07-15 00:28:58 +03:00
parent 2c2c39b42c
commit 7befd63cce
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
launcher/modplatform/import_ftb/PackInstallTask.cpp
View File

@ -53,17 +53,14 @@ void PackInstallTask::copySettings()
QString instanceConfigPath = FS::PathCombine(m_stagingPath, "instance.cfg"); QString instanceConfigPath = FS::PathCombine(m_stagingPath, "instance.cfg");
auto instanceSettings = std::make_shared<INISettingsObject>(instanceConfigPath); auto instanceSettings = std::make_shared<INISettingsObject>(instanceConfigPath);
instanceSettings->suspendSave(); instanceSettings->suspendSave();
instanceSettings->registerSetting("InstanceType", "OneSix"); MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath);
instanceSettings->set("InstanceType", "OneSix"); instance.settings()->set("InstanceType", "OneSix");
if (m_pack.jvmArgs.isValid() && !m_pack.jvmArgs.toString().isEmpty()) { if (m_pack.jvmArgs.isValid() && !m_pack.jvmArgs.toString().isEmpty()) {
instanceSettings->registerSetting("OverrideJavaArgs", true); instance.settings()->set("OverrideJavaArgs", true);
instanceSettings->set("OverrideJavaArgs", true); instance.settings()->set("JvmArgs", m_pack.jvmArgs.toString());
instanceSettings->registerSetting("JvmArgs", m_pack.jvmArgs.toString());
instanceSettings->set("JvmArgs", m_pack.jvmArgs.toString());
} }
MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath);
auto components = instance.getPackProfile(); auto components = instance.getPackProfile();
components->buildingFromScratch(); components->buildingFromScratch();
components->setComponentVersion("net.minecraft", m_pack.mcVersion, true); components->setComponentVersion("net.minecraft", m_pack.mcVersion, true);

1
launcher/ui/pages/modplatform/import_ftb/ListModel.cpp
View File

@ -17,7 +17,6 @@
*/ */
#include "ListModel.h" #include "ListModel.h"
#include <qnamespace.h>
#include <QDir> #include <QDir>
#include <QDirIterator> #include <QDirIterator>
#include <QFileInfo> #include <QFileInfo>