Clean up authlib-injector merge, mostly clang-format

Signed-off-by: Evan Goode <mail@evangoo.de>

launcher/LaunchController.h

@@ -38,10 +38,10 @@
 #include <tools/BaseProfiler.h>
 #include <QObject>
 
-#include "minecraft/auth/MinecraftAccount.h"
-#include "minecraft/launch/MinecraftServerTarget.h"
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
+#include "minecraft/auth/MinecraftAccount.h"
+#include "minecraft/launch/MinecraftServerTarget.h"
 
 class InstanceWindow;
 class LaunchController : public Task {

launcher/minecraft/MinecraftInstance.cpp

@@ -533,18 +533,15 @@ QString MinecraftInstance::getLauncher()
 QStringList MinecraftInstance::processAuthArgs(AuthSessionPtr session) const
 {
     QStringList args;
-    if(session->uses_custom_api_servers)
+    if (session->uses_custom_api_servers) {
-    {
         args << "-Dminecraft.api.env=custom";
         args << "-Dminecraft.api.auth.host=" + session->auth_server_url;
         args << "-Dminecraft.api.account.host=" + session->account_server_url;
         args << "-Dminecraft.api.session.host=" + session->session_server_url;
         args << "-Dminecraft.api.services.host=" + session->services_server_url;
         auto agents = m_components->getProfile()->getAgents();
-        for (auto agent : agents)
+        for (auto agent : agents) {
-        {
+            if (agent->library()->artifactPrefix() == "moe.yushi:authlibinjector") {
-            if (agent->library()->artifactPrefix() == "moe.yushi:authlibinjector")
-            {
                 QStringList jar, temp1, temp2, temp3;
                 agent->library()->getApplicableFiles(runtimeContext(), jar, temp1, temp2, temp3, getLocalLibraryPath());
                 QString argument{ agent->argument() };
@@ -558,7 +555,6 @@ QStringList MinecraftInstance::processAuthArgs(AuthSessionPtr session) const
             }
             break;
         }
-
     }
     return args;
 }

launcher/minecraft/MinecraftInstance.h

@@ -35,10 +35,10 @@
  */
 
 #pragma once
-#include <unordered_set>
 #include <java/JavaVersion.h>
 #include <QDir>
 #include <QProcess>
+#include <unordered_set>
 #include "BaseInstance.h"
 #include "minecraft/launch/MinecraftServerTarget.h"
 #include "minecraft/mod/Mod.h"

launcher/minecraft/auth/MinecraftAccount.h

@@ -86,10 +86,7 @@ class MinecraftAccount : public QObject, public Usable {
     explicit MinecraftAccount(QObject* parent = 0);
 
     static MinecraftAccountPtr createFromUsername(const QString& username);
-    static MinecraftAccountPtr createFromUsernameAuthlibInjector(
+    static MinecraftAccountPtr createFromUsernameAuthlibInjector(const QString& username, const QString& authlibInjectorUrl);
-        const QString& username,
-        const QString& authlibInjectorUrl
-    );
 
     static MinecraftAccountPtr createBlankMSA();
 
@@ -123,29 +120,17 @@ class MinecraftAccount : public QObject, public Usable {
    public: /* queries */
     QString internalId() const { return data.internalId; }
 
-    QString authlibInjectorUrl() const {
+    QString authlibInjectorUrl() const { return data.authlibInjectorUrl; }
-        return data.authlibInjectorUrl;
-    }
 
-    QString authServerUrl() const {
+    QString authServerUrl() const { return data.authServerUrl(); }
-        return data.authServerUrl();
-    }
 
-    QString accountServerUrl() const {
+    QString accountServerUrl() const { return data.accountServerUrl(); }
-        return data.accountServerUrl();
-    }
 
-    QString sessionServerUrl() const {
+    QString sessionServerUrl() const { return data.sessionServerUrl(); }
-        return data.sessionServerUrl();
-    }
 
-    QString servicesServerUrl() const {
+    QString servicesServerUrl() const { return data.servicesServerUrl(); }
-        return data.servicesServerUrl();
-    }
 
-    bool usesCustomApiServers() const {
+    bool usesCustomApiServers() const { return data.usesCustomApiServers(); }
-        return data.usesCustomApiServers();
-    }
 
     QString accountDisplayString() const { return data.accountDisplayString(); }
 

launcher/minecraft/auth/Yggdrasil.cpp

@@ -25,8 +25,8 @@
 
 #include <QDebug>
 
-#include "BuildConfig.h"
 #include "Application.h"
+#include "BuildConfig.h"
 
 Yggdrasil::Yggdrasil(AccountData* data, QObject* parent) : AccountTask(data, parent)
 {

launcher/minecraft/auth/flows/AuthlibInjector.cpp

@@ -1,25 +1,21 @@
 #include "AuthlibInjector.h"
 
-#include "minecraft/auth/steps/YggdrasilStep.h"
-#include "minecraft/auth/steps/MinecraftProfileStepMojang.h"
-#include "minecraft/auth/steps/GetSkinStep.h"
 #include "minecraft/auth/steps/AuthlibInjectorMetadataStep.h"
+#include "minecraft/auth/steps/GetSkinStep.h"
+#include "minecraft/auth/steps/MinecraftProfileStepMojang.h"
+#include "minecraft/auth/steps/YggdrasilStep.h"
 
-AuthlibInjectorRefresh::AuthlibInjectorRefresh(
+AuthlibInjectorRefresh::AuthlibInjectorRefresh(AccountData* data, QObject* parent) : AuthFlow(data, parent)
-    AccountData *data,
+{
-    QObject *parent
-) : AuthFlow(data, parent) {
     m_steps.append(makeShared<YggdrasilStep>(m_data, QString()));
     m_steps.append(makeShared<MinecraftProfileStepMojang>(m_data));
     m_steps.append(makeShared<AuthlibInjectorMetadataStep>(m_data));
     m_steps.append(makeShared<GetSkinStep>(m_data));
 }
 
-AuthlibInjectorLogin::AuthlibInjectorLogin(
+AuthlibInjectorLogin::AuthlibInjectorLogin(AccountData* data, QString password, QObject* parent)
-    AccountData *data,
+    : AuthFlow(data, parent), m_password(password)
-    QString password,
+{
-    QObject *parent
-): AuthFlow(data, parent), m_password(password) {
     m_steps.append(makeShared<YggdrasilStep>(m_data, m_password));
     m_steps.append(makeShared<MinecraftProfileStepMojang>(m_data));
     m_steps.append(makeShared<AuthlibInjectorMetadataStep>(m_data));

launcher/minecraft/auth/flows/AuthlibInjector.h

@@ -1,25 +1,16 @@
 #pragma once
 #include "AuthFlow.h"
 
-class AuthlibInjectorRefresh : public AuthFlow
+class AuthlibInjectorRefresh : public AuthFlow {
-{
     Q_OBJECT
    public:
-    explicit AuthlibInjectorRefresh(
+    explicit AuthlibInjectorRefresh(AccountData* data, QObject* parent = 0);
-        AccountData *data,
-        QObject *parent = 0
-    );
 };
 
-class AuthlibInjectorLogin : public AuthFlow
+class AuthlibInjectorLogin : public AuthFlow {
-{
     Q_OBJECT
    public:
-    explicit AuthlibInjectorLogin(
+    explicit AuthlibInjectorLogin(AccountData* data, QString password, QObject* parent = 0);
-        AccountData *data,
-        QString password,
-        QObject *parent = 0
-    );
 
    private:
     QString m_password;

launcher/minecraft/auth/steps/AuthlibInjectorMetadataStep.h

@@ -4,7 +4,6 @@
 #include "QObjectPtr.h"
 #include "minecraft/auth/AuthStep.h"
 
-
 class AuthlibInjectorMetadataStep : public AuthStep {
     Q_OBJECT
 

launcher/minecraft/services/CapeChange.h

@@ -1,11 +1,11 @@
 #pragma once
 
+#include <minecraft/auth/MinecraftAccount.h>
 #include <QFile>
 #include <QtNetwork/QtNetwork>
 #include <memory>
 #include "QObjectPtr.h"
 #include "tasks/Task.h"
-#include <minecraft/auth/MinecraftAccount.h>
 
 class CapeChange : public Task {
     Q_OBJECT

launcher/minecraft/services/SkinDelete.h

@@ -1,9 +1,9 @@
 #pragma once
 
+#include <minecraft/auth/MinecraftAccount.h>
 #include <QFile>
 #include <QtNetwork/QtNetwork>
 #include "tasks/Task.h"
-#include <minecraft/auth/MinecraftAccount.h>
 
 typedef shared_qobject_ptr<class SkinDelete> SkinDeletePtr;
 

launcher/ui/pages/instance/VersionPage.cpp

@@ -381,12 +381,7 @@ void VersionPage::on_actionChange_version_triggered()
         return;
     }
     auto uid = list->uid();
-    // FIXME: this is a horrible HACK. Get version filtering information from the actual metadata...
+
-    // unsure if the above comment still applies
-    if (uid == "moe.yushi.authlibinjector") {
-        on_actionInstall_AuthlibInjector_triggered();
-        return;
-    }
     VersionSelectDialog vselect(list.get(), tr("Change %1 version").arg(name), this);
     if (uid == "net.fabricmc.intermediary" || uid == "org.quiltmc.hashed") {
         vselect.setEmptyString(tr("No intermediary mappings versions are currently available."));
@@ -428,8 +423,7 @@ void VersionPage::on_actionDownload_All_triggered()
 void VersionPage::openInstallAuthlibInjector()
 {
     auto vlist = APPLICATION->metadataIndex()->get("moe.yushi.authlibinjector");
-    if(!vlist)
+    if (!vlist) {
-    {
         return;
     }
     VersionSelectDialog vselect(vlist.get(), tr("Select authlib-injector version"), this);
@@ -437,13 +431,11 @@ void VersionPage::openInstallAuthlibInjector()
     vselect.setEmptyErrorString(tr("Couldn't load or download the authlib-injector version lists!"));
 
     auto currentVersion = m_profile->getComponentVersion("moe.yushi.authlibinjector");
-    if(!currentVersion.isEmpty())
+    if (!currentVersion.isEmpty()) {
-    {
         vselect.setCurrentVersion(currentVersion);
     }
 
-    if (vselect.exec() && vselect.selectedVersion())
+    if (vselect.exec() && vselect.selectedVersion()) {
-    {
         auto vsn = vselect.selectedVersion();
         m_profile->setComponentVersion("moe.yushi.authlibinjector", vsn->descriptor());
         m_profile->resolve(Net::Mode::Online);