Merge branch 'develop' into better-launch

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

1 files changed, 22 insertions, 74 deletions

diff --git a/launcher/NullInstance.h b/launcher/NullInstance.h
index b0ec89f4..c79600e7 100644
--- a/launcher/NullInstance.h
+++ b/launcher/NullInstance.h
@@ -38,91 +38,39 @@
 #include "BaseInstance.h"
 #include "launch/LaunchTask.h"
 
-class NullInstance: public BaseInstance
-{
+class NullInstance : public BaseInstance {
     Q_OBJECT
-public:
+   public:
     NullInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString& rootDir)
-    :BaseInstance(globalSettings, settings, rootDir)
+        : BaseInstance(globalSettings, settings, rootDir)
     {
         setVersionBroken(true);
     }
-    virtual ~NullInstance() {};
-    void saveNow() override
-    {
-    }
-    void loadSpecificSettings() override
-    {
-        setSpecificSettingsLoaded(true);
-    }
-    QString getStatusbarDescription() override
-    {
-        return tr("Unknown instance type");
-    };
-    QSet< QString > traits() const override
-    {
-        return {};
-    };
-    QString instanceConfigFolder() const override
-    {
-        return instanceRoot();
-    };
-    shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr, MinecraftServerTargetPtr) override
-    {
-        return nullptr;
-    }
-    shared_qobject_ptr< Task > createUpdateTask(Net::Mode mode) override
-    {
-        return nullptr;
-    }
-    QProcessEnvironment createEnvironment() override
-    {
-        return QProcessEnvironment();
-    }
-    QProcessEnvironment createLaunchEnvironment() override
-    {
-        return QProcessEnvironment();
-    }
-    QMap<QString, QString> getVariables() override
-    {
-        return QMap<QString, QString>();
-    }
-    IPathMatcher::Ptr getLogFileMatcher() override
-    {
-        return nullptr;
-    }
-    QString getLogFileRoot() override
-    {
-        return instanceRoot();
-    }
-    QString typeName() const override
-    {
-        return "Null";
-    }
-    bool canExport() const override
-    {
-        return false;
-    }
-    bool canEdit() const override
-    {
-        return false;
-    }
-    bool canLaunch() const override
-    {
-        return false;
-    }
-    void populateLaunchMenu(QMenu* menu) override
-    {
-    }
+    virtual ~NullInstance(){};
+    void saveNow() override {}
+    void loadSpecificSettings() override { setSpecificSettingsLoaded(true); }
+    QString getStatusbarDescription() override { return tr("Unknown instance type"); };
+    QSet<QString> traits() const override { return {}; };
+    QString instanceConfigFolder() const override { return instanceRoot(); };
+    shared_qobject_ptr<LaunchTask> createLaunchTask(AuthSessionPtr, MinecraftServerTargetPtr) override { return nullptr; }
+    shared_qobject_ptr<Task> createUpdateTask([[maybe_unused]] Net::Mode mode) override { return nullptr; }
+    QProcessEnvironment createEnvironment() override { return QProcessEnvironment(); }
+    QProcessEnvironment createLaunchEnvironment() override { return QProcessEnvironment(); }
+    QMap<QString, QString> getVariables() override { return QMap<QString, QString>(); }
+    IPathMatcher::Ptr getLogFileMatcher() override { return nullptr; }
+    QString getLogFileRoot() override { return instanceRoot(); }
+    QString typeName() const override { return "Null"; }
+    bool canExport() const override { return false; }
+    bool canEdit() const override { return false; }
+    bool canLaunch() const override { return false; }
+    void populateLaunchMenu(QMenu* menu) override {}
     QStringList verboseDescription(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin) override
     {
         QStringList out;
         out << "Null instance - placeholder.";
         return out;
     }
-    QString modsRoot() const override {
-        return QString();
-    }
+    QString modsRoot() const override { return QString(); }
     void updateRuntimeContext()
     {
         // NOOP