dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: migrate map settings to json string

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2025-05-21 18:17:08 +03:00
parent 89be378ef6
commit 8c710fb8de
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
8 changed files with 54 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
launcher/minecraft/MinecraftInstance.cpp
View file

@ -38,6 +38,7 @@
#include "MinecraftInstance.h"
#include "Application.h"
#include "BuildConfig.h"
#include "Json.h"
#include "QObjectPtr.h"
#include "minecraft/launch/AutoInstallJava.h"
#include "minecraft/launch/CreateGameFolders.h"
@ -232,7 +233,7 @@ void MinecraftInstance::loadSpecificSettings()
m_settings->registerOverride(global_settings->getSetting("Env"), envSetting);
m_settings->registerSetting("UI/ColumnsOverride", false);
m_settings->registerSetting("UI/FolderResourceColumnVisibility", QVariantMap{});
m_settings->registerSetting("UI/FolderResourceColumnVisibility", "{}");
m_settings->set("InstanceType", "OneSix");
}
@ -623,7 +624,8 @@ QProcessEnvironment MinecraftInstance::createEnvironment()
}
// custom env
auto insertEnv = [&env](QMap<QString, QVariant> envMap) {
auto insertEnv = [&env](QString value) {
auto envMap = Json::toMap(value);
if (envMap.isEmpty())
return;
@ -634,9 +636,9 @@ QProcessEnvironment MinecraftInstance::createEnvironment()
bool overrideEnv = settings()->get("OverrideEnv").toBool();
if (!overrideEnv)
insertEnv(APPLICATION->settings()->get("Env").toMap());
insertEnv(APPLICATION->settings()->get("Env").toString());
else
insertEnv(settings()->get("Env").toMap());
insertEnv(settings()->get("Env").toString());
return env;
}