diff options
author | TheKodeToad <TheKodeToad@proton.me> | 2023-07-21 11:02:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-21 11:02:57 +0100 |
commit | 0be4db30eb98f65543b30d6a2d970ef1df64633b (patch) | |
tree | 2135c398f3d01816a0f508dd5e29e155625793cc /launcher/minecraft/MinecraftInstance.cpp | |
parent | 4c6929038159a29c437b30616daa0b2672531e4d (diff) | |
parent | 821dd8400b1a27ab1f932200bfa77d7a04edef5d (diff) | |
download | PrismLauncher-0be4db30eb98f65543b30d6a2d970ef1df64633b.tar.gz PrismLauncher-0be4db30eb98f65543b30d6a2d970ef1df64633b.tar.bz2 PrismLauncher-0be4db30eb98f65543b30d6a2d970ef1df64633b.zip |
Merge branch 'PrismLauncher:develop' into better-component-installation
Diffstat (limited to 'launcher/minecraft/MinecraftInstance.cpp')
-rw-r--r-- | launcher/minecraft/MinecraftInstance.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index 4867cc7a..342e634f 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -4,6 +4,7 @@ * Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net> * Copyright (C) 2022 Jamie Mansfield <jmansfield@cadixdev.org> * Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me> + * Copyright (c) 2023 seth <getchoo at tuta dot io> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -186,6 +187,10 @@ void MinecraftInstance::loadSpecificSettings() m_settings->registerOverride(global_settings->getSetting("CloseAfterLaunch"), miscellaneousOverride); m_settings->registerOverride(global_settings->getSetting("QuitAfterGameStop"), miscellaneousOverride); + // Mod loader specific options + auto modLoaderSettings = m_settings->registerSetting("OverrideModLoaderSettings", false); + m_settings->registerOverride(global_settings->getSetting("DisableQuiltBeacon"), modLoaderSettings); + m_settings->set("InstanceType", "OneSix"); } @@ -391,6 +396,12 @@ QStringList MinecraftInstance::extraArguments() agent->library()->getApplicableFiles(runtimeContext(), jar, temp1, temp2, temp3, getLocalLibraryPath()); list.append("-javaagent:"+jar[0]+(agent->argument().isEmpty() ? "" : "="+agent->argument())); } + + { + const auto loaders = version->getModLoaders(); + if (loaders.has_value() && loaders.value() & ResourceAPI::Quilt && settings()->get("DisableQuiltBeacon").toBool()) + list.append("-Dloader.disable_beacon=true"); + } return list; } |