Merge pull request #878 from flowln/lazy_settings

1 files changed, 8 insertions, 6 deletions

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);