From 27f276ef13f49b4d21b6c17db5d4cd5e404ea259 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Sun, 31 Oct 2021 21:42:06 +0100 Subject: GH-1795 add terminal launch option to use a specific Minecraft profile Used like this: ``` ./MultiMC --launch 1.17.1 --profile MultiMCTest --server mc.hypixel.net ``` --- launcher/LaunchController.h | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) (limited to 'launcher/LaunchController.h') diff --git a/launcher/LaunchController.h b/launcher/LaunchController.h index 5f177e00..7ed4b09e 100644 --- a/launcher/LaunchController.h +++ b/launcher/LaunchController.h @@ -4,6 +4,7 @@ #include #include "minecraft/launch/MinecraftServerTarget.h" +#include "minecraft/auth/MinecraftAccount.h" class InstanceWindow; class LaunchController: public Task @@ -15,39 +16,45 @@ public: LaunchController(QObject * parent = nullptr); virtual ~LaunchController(){}; - void setInstance(InstancePtr instance) - { + void setInstance(InstancePtr instance) { m_instance = instance; } - InstancePtr instance() - { + + InstancePtr instance() { return m_instance; } - void setOnline(bool online) - { + + void setOnline(bool online) { m_online = online; } - void setProfiler(BaseProfilerFactory *profiler) - { + + void setProfiler(BaseProfilerFactory *profiler) { m_profiler = profiler; } - void setParentWidget(QWidget * widget) - { + + void setParentWidget(QWidget * widget) { m_parentWidget = widget; } - void setServerToJoin(MinecraftServerTargetPtr serverToJoin) - { + + void setServerToJoin(MinecraftServerTargetPtr serverToJoin) { m_serverToJoin = std::move(serverToJoin); } + + void setAccountToUse(MinecraftAccountPtr accountToUse) { + m_accountToUse = std::move(accountToUse); + } + QString id() { return m_instance->id(); } + bool abort() override; private: void login(); void launchInstance(); + void decideAccount(); private slots: void readyForLaunch(); @@ -62,6 +69,7 @@ private: InstancePtr m_instance; QWidget * m_parentWidget = nullptr; InstanceWindow *m_console = nullptr; + MinecraftAccountPtr m_accountToUse = nullptr; AuthSessionPtr m_session; shared_qobject_ptr m_launcher; MinecraftServerTargetPtr m_serverToJoin; -- cgit