Merge branch 'develop' into icon-indexing

Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>

1 files changed, 12 insertions, 21 deletions

diff --git a/launcher/minecraft/MinecraftInstance.h b/launcher/minecraft/MinecraftInstance.h
index 068b3008..c331cc6f 100644
--- a/launcher/minecraft/MinecraftInstance.h
+++ b/launcher/minecraft/MinecraftInstance.h
@@ -35,12 +35,12 @@
  */
 
 #pragma once
-#include "BaseInstance.h"
 #include <java/JavaVersion.h>
-#include "minecraft/mod/Mod.h"
-#include <QProcess>
 #include <QDir>
+#include <QProcess>
+#include "BaseInstance.h"
 #include "minecraft/launch/MinecraftServerTarget.h"
+#include "minecraft/mod/Mod.h"
 
 class ModFolderModel;
 class ResourceFolderModel;
@@ -52,12 +52,11 @@ class GameOptions;
 class LaunchStep;
 class PackProfile;
 
-class MinecraftInstance: public BaseInstance
-{
+class MinecraftInstance : public BaseInstance {
     Q_OBJECT
-public:
-    MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir);
-    virtual ~MinecraftInstance() {};
+   public:
+    MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString& rootDir);
+    virtual ~MinecraftInstance(){};
     virtual void saveNow() override;
 
     void loadSpecificSettings() override;
@@ -67,15 +66,9 @@ public:
     // FIXME: remove
     QSet<QString> traits() const override;
 
-    bool canEdit() const override
-    {
-        return true;
-    }
+    bool canEdit() const override { return true; }
 
-    bool canExport() const override
-    {
-        return true;
-    }
+    bool canExport() const override { return true; }
 
     ////// Directories and files //////
     QString jarModsDir() const;
@@ -143,7 +136,7 @@ public:
     QProcessEnvironment createLaunchEnvironment() override;
 
     /// guess log level from a line of minecraft log
-    MessageLevel::Enum guessLevel(const QString &line, MessageLevel::Enum level) override;
+    MessageLevel::Enum guessLevel(const QString& line, MessageLevel::Enum level) override;
 
     IPathMatcher::Ptr getLogFileMatcher() override;
 
@@ -163,12 +156,10 @@ public:
 
     virtual JavaVersion getJavaVersion();
 
-protected:
+   protected:
     QMap<QString, QString> createCensorFilterFromSession(AuthSessionPtr session);
-    QStringList validLaunchMethods();
-    QString launchMethod();
 
-protected: // data
+   protected:  // data
     std::shared_ptr<PackProfile> m_components;
     mutable std::shared_ptr<ModFolderModel> m_loader_mod_list;
     mutable std::shared_ptr<ModFolderModel> m_core_mod_list;