Merge pull request #878 from flowln/lazy_settings

2 files changed, 76 insertions, 67 deletions

diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 5a6f8de0..c677b677 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -115,6 +115,19 @@ private:
 MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
     : BaseInstance(globalSettings, settings, rootDir)
 {
+    m_components.reset(new PackProfile(this));
+}
+
+void MinecraftInstance::saveNow()
+{
+    m_components->saveNow();
+}
+
+void MinecraftInstance::loadSpecificSettings()
+{
+    if (isSpecificSettingsLoaded())
+        return;
+
     // Java Settings
     auto javaOverride = m_settings->registerSetting("OverrideJava", false);
     auto locationOverride = m_settings->registerSetting("OverrideJavaLocation", false);
@@ -124,64 +137,58 @@ MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsO
     auto javaOrLocation = std::make_shared<OrSetting>("JavaOrLocationOverride", javaOverride, locationOverride);
     auto javaOrArgs = std::make_shared<OrSetting>("JavaOrArgsOverride", javaOverride, argsOverride);
 
-    m_settings->registerOverride(globalSettings->getSetting("JavaPath"), javaOrLocation);
-    m_settings->registerOverride(globalSettings->getSetting("JvmArgs"), javaOrArgs);
-    m_settings->registerOverride(globalSettings->getSetting("IgnoreJavaCompatibility"), javaOrLocation);
-
-    // special!
-    m_settings->registerPassthrough(globalSettings->getSetting("JavaTimestamp"), javaOrLocation);
-    m_settings->registerPassthrough(globalSettings->getSetting("JavaVersion"), javaOrLocation);
-    m_settings->registerPassthrough(globalSettings->getSetting("JavaArchitecture"), javaOrLocation);
-
-    // Window Size
-    auto windowSetting = m_settings->registerSetting("OverrideWindow", false);
-    m_settings->registerOverride(globalSettings->getSetting("LaunchMaximized"), windowSetting);
-    m_settings->registerOverride(globalSettings->getSetting("MinecraftWinWidth"), windowSetting);
-    m_settings->registerOverride(globalSettings->getSetting("MinecraftWinHeight"), windowSetting);
-
-    // Memory
-    auto memorySetting = m_settings->registerSetting("OverrideMemory", false);
-    m_settings->registerOverride(globalSettings->getSetting("MinMemAlloc"), memorySetting);
-    m_settings->registerOverride(globalSettings->getSetting("MaxMemAlloc"), memorySetting);
-    m_settings->registerOverride(globalSettings->getSetting("PermGen"), memorySetting);
-
-    // Minecraft launch method
-    auto launchMethodOverride = m_settings->registerSetting("OverrideMCLaunchMethod", false);
-    m_settings->registerOverride(globalSettings->getSetting("MCLaunchMethod"), launchMethodOverride);
-
-    // Native library workarounds
-    auto nativeLibraryWorkaroundsOverride = m_settings->registerSetting("OverrideNativeWorkarounds", false);
-    m_settings->registerOverride(globalSettings->getSetting("UseNativeOpenAL"), nativeLibraryWorkaroundsOverride);
-    m_settings->registerOverride(globalSettings->getSetting("UseNativeGLFW"), nativeLibraryWorkaroundsOverride);
-
-    // Peformance related options
-    auto performanceOverride = m_settings->registerSetting("OverridePerformance", false);
-    m_settings->registerOverride(globalSettings->getSetting("EnableFeralGamemode"), performanceOverride);
-    m_settings->registerOverride(globalSettings->getSetting("EnableMangoHud"), performanceOverride);
-    m_settings->registerOverride(globalSettings->getSetting("UseDiscreteGpu"), performanceOverride);
-
-    // Game time
-    auto gameTimeOverride = m_settings->registerSetting("OverrideGameTime", false);
-    m_settings->registerOverride(globalSettings->getSetting("ShowGameTime"), gameTimeOverride);
-    m_settings->registerOverride(globalSettings->getSetting("RecordGameTime"), gameTimeOverride);
+    if (auto global_settings = globalSettings()) {
+        m_settings->registerOverride(global_settings->getSetting("JavaPath"), javaOrLocation);
+        m_settings->registerOverride(global_settings->getSetting("JvmArgs"), javaOrArgs);
+        m_settings->registerOverride(global_settings->getSetting("IgnoreJavaCompatibility"), javaOrLocation);
+
+        // special!
+        m_settings->registerPassthrough(global_settings->getSetting("JavaTimestamp"), javaOrLocation);
+        m_settings->registerPassthrough(global_settings->getSetting("JavaVersion"), javaOrLocation);
+        m_settings->registerPassthrough(global_settings->getSetting("JavaArchitecture"), javaOrLocation);
+
+        // Window Size
+        auto windowSetting = m_settings->registerSetting("OverrideWindow", false);
+        m_settings->registerOverride(global_settings->getSetting("LaunchMaximized"), windowSetting);
+        m_settings->registerOverride(global_settings->getSetting("MinecraftWinWidth"), windowSetting);
+        m_settings->registerOverride(global_settings->getSetting("MinecraftWinHeight"), windowSetting);
+
+        // Memory
+        auto memorySetting = m_settings->registerSetting("OverrideMemory", false);
+        m_settings->registerOverride(global_settings->getSetting("MinMemAlloc"), memorySetting);
+        m_settings->registerOverride(global_settings->getSetting("MaxMemAlloc"), memorySetting);
+        m_settings->registerOverride(global_settings->getSetting("PermGen"), memorySetting);
+
+        // Minecraft launch method
+        auto launchMethodOverride = m_settings->registerSetting("OverrideMCLaunchMethod", false);
+        m_settings->registerOverride(global_settings->getSetting("MCLaunchMethod"), launchMethodOverride);
+
+        // Native library workarounds
+        auto nativeLibraryWorkaroundsOverride = m_settings->registerSetting("OverrideNativeWorkarounds", false);
+        m_settings->registerOverride(global_settings->getSetting("UseNativeOpenAL"), nativeLibraryWorkaroundsOverride);
+        m_settings->registerOverride(global_settings->getSetting("UseNativeGLFW"), nativeLibraryWorkaroundsOverride);
+
+        // Peformance related options
+        auto performanceOverride = m_settings->registerSetting("OverridePerformance", false);
+        m_settings->registerOverride(global_settings->getSetting("EnableFeralGamemode"), performanceOverride);
+        m_settings->registerOverride(global_settings->getSetting("EnableMangoHud"), performanceOverride);
+        m_settings->registerOverride(global_settings->getSetting("UseDiscreteGpu"), performanceOverride);
+
+        // Miscellaneous
+        auto miscellaneousOverride = m_settings->registerSetting("OverrideMiscellaneous", false);
+        m_settings->registerOverride(global_settings->getSetting("CloseAfterLaunch"), miscellaneousOverride);
+        m_settings->registerOverride(global_settings->getSetting("QuitAfterGameStop"), miscellaneousOverride);
+
+        m_settings->set("InstanceType", "OneSix");
+    }
 
     // Join server on launch, this does not have a global override
     m_settings->registerSetting("JoinServerOnLaunch", false);
     m_settings->registerSetting("JoinServerOnLaunchAddress", "");
 
-    // Miscellaneous
-    auto miscellaneousOverride = m_settings->registerSetting("OverrideMiscellaneous", false);
-    m_settings->registerOverride(globalSettings->getSetting("CloseAfterLaunch"), miscellaneousOverride);
-    m_settings->registerOverride(globalSettings->getSetting("QuitAfterGameStop"), miscellaneousOverride);
-
-    m_settings->set("InstanceType", "OneSix");
+    qDebug() << "Instance-type specific settings were loaded!";
 
-    m_components.reset(new PackProfile(this));
-}
-
-void MinecraftInstance::saveNow()
-{
-    m_components->saveNow();
+    setSpecificSettingsLoaded(true);
 }
 
 QString MinecraftInstance::typeName() const
@@ -308,7 +315,7 @@ QDir MinecraftInstance::versionsPath() const
     return QDir::current().absoluteFilePath("versions");
 }
 
-QStringList MinecraftInstance::getClassPath() const
+QStringList MinecraftInstance::getClassPath()
 {
     QStringList jars, nativeJars;
     auto javaArchitecture = settings()->get("JavaArchitecture").toString();
@@ -323,7 +330,7 @@ QString MinecraftInstance::getMainClass() const
     return profile->getMainClass();
 }
 
-QStringList MinecraftInstance::getNativeJars() const
+QStringList MinecraftInstance::getNativeJars()
 {
     QStringList jars, nativeJars;
     auto javaArchitecture = settings()->get("JavaArchitecture").toString();
@@ -332,7 +339,7 @@ QStringList MinecraftInstance::getNativeJars() const
     return nativeJars;
 }
 
-QStringList MinecraftInstance::extraArguments() const
+QStringList MinecraftInstance::extraArguments()
 {
     auto list = BaseInstance::extraArguments();
     auto version = getPackProfile();
@@ -358,7 +365,7 @@ QStringList MinecraftInstance::extraArguments() const
     return list;
 }
 
-QStringList MinecraftInstance::javaArguments() const
+QStringList MinecraftInstance::javaArguments()
 {
     QStringList args;
 
@@ -415,7 +422,7 @@ QStringList MinecraftInstance::javaArguments() const
     return args;
 }
 
-QMap<QString, QString> MinecraftInstance::getVariables() const
+QMap<QString, QString> MinecraftInstance::getVariables()
 {
     QMap<QString, QString> out;
     out.insert("INST_NAME", name());
@@ -943,9 +950,9 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         process->appendStep(new CreateGameFolders(pptr));
     }
 
-    if (!serverToJoin && m_settings->get("JoinServerOnLaunch").toBool())
+    if (!serverToJoin && settings()->get("JoinServerOnLaunch").toBool())
     {
-        QString fullAddress = m_settings->get("JoinServerOnLaunchAddress").toString();
+        QString fullAddress = settings()->get("JoinServerOnLaunchAddress").toString();
         serverToJoin.reset(new MinecraftServerTarget(MinecraftServerTarget::parse(fullAddress)));
     }
 
@@ -1053,10 +1060,10 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
 
 QString MinecraftInstance::launchMethod()
 {
-    return m_settings->get("MCLaunchMethod").toString();
+    return settings()->get("MCLaunchMethod").toString();
 }
 
-JavaVersion MinecraftInstance::getJavaVersion() const
+JavaVersion MinecraftInstance::getJavaVersion()
 {
     return JavaVersion(settings()->get("JavaVersion").toString());
 }
diff --git a/launcher/minecraft/MinecraftInstance.h b/launcher/minecraft/MinecraftInstance.h
index 8e1c67f2..7a75f452 100644
--- a/launcher/minecraft/MinecraftInstance.h
+++ b/launcher/minecraft/MinecraftInstance.h
@@ -20,6 +20,8 @@ public:
     virtual ~MinecraftInstance() {};
     virtual void saveNow() override;
 
+    void loadSpecificSettings() override;
+
     // FIXME: remove
     QString typeName() const override;
     // FIXME: remove
@@ -79,15 +81,15 @@ public:
     //////  Launch stuff //////
     Task::Ptr createUpdateTask(Net::Mode mode) override;
     shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr account, MinecraftServerTargetPtr serverToJoin) override;
-    QStringList extraArguments() const override;
+    QStringList extraArguments() override;
     QStringList verboseDescription(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin) override;
     QList<Mod*> getJarMods() const;
     QString createLaunchScript(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin);
     /// get arguments passed to java
-    QStringList javaArguments() const;
+    QStringList javaArguments();
 
     /// get variables for launch command variable substitution/environment
-    QMap<QString, QString> getVariables() const override;
+    QMap<QString, QString> getVariables() override;
 
     /// create an environment for launching processes
     QProcessEnvironment createEnvironment() override;
@@ -103,16 +105,16 @@ public:
     QString getStatusbarDescription() override;
 
     // FIXME: remove
-    virtual QStringList getClassPath() const;
+    virtual QStringList getClassPath();
     // FIXME: remove
-    virtual QStringList getNativeJars() const;
+    virtual QStringList getNativeJars();
     // FIXME: remove
     virtual QString getMainClass() const;
 
     // FIXME: remove
     virtual QStringList processMinecraftArgs(AuthSessionPtr account, MinecraftServerTargetPtr serverToJoin) const;
 
-    virtual JavaVersion getJavaVersion() const;
+    virtual JavaVersion getJavaVersion();
 
 protected:
     QMap<QString, QString> createCensorFilterFromSession(AuthSessionPtr session);