mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-12-25 15:16:02 +00:00
Code Issues Projects Releases Wiki Activity

GH-3012 add --offline and --name arguments

Browse Source 
These allow launching offline with a specified name from the command line.
This commit is contained in:
Petr Mrázek 2022-06-09 23:46:28 +02:00
parent 8235752dec
commit c7256744c6
4 changed files with 99 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
launcher/Application.cpp
View File

@ -247,6 +247,14 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
parser.addOption("profile");
parser.addShortOpt("profile", 'a');
parser.addDocumentation("profile", "Use the account specified by its profile name (only valid in combination with --launch)");
// --offline
parser.addSwitch("offline");
parser.addShortOpt("offline", 'o');
parser.addDocumentation("offline", "Launch offline (only valid in combination with --launch)");
// --name
parser.addOption("name");
parser.addShortOpt("name", 'n');
parser.addDocumentation("name", "When launching offline, use specified name (only makes sense in combination with --launch and --offline)");
// --alive
parser.addSwitch("alive");
parser.addDocumentation("alive", "Write a small '" + liveCheckFile + "' file after the launcher starts");
@ -290,6 +298,10 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
m_instanceIdToLaunch = args["launch"].toString();
m_serverToJoin = args["server"].toString();
m_profileToUse = args["profile"].toString();
if(args["offline"].toBool()) {
m_offline = true;
m_offlineName = args["name"].toString();
}
m_liveCheck = args["alive"].toBool();
m_zipToImport = args["import"].toUrl();
@ -355,20 +367,46 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
return;
}
if(m_instanceIdToLaunch.isEmpty() && !m_serverToJoin.isEmpty())
// all the things invalid when NOT trying to --launch
if(m_instanceIdToLaunch.isEmpty()) {
if(!m_serverToJoin.isEmpty())
{
std::cerr << "--server can only be used in combination with --launch!" << std::endl;
m_status = Application::Failed;
return;
}
if(m_instanceIdToLaunch.isEmpty() && !m_profileToUse.isEmpty())
if(!m_profileToUse.isEmpty())
{
std::cerr << "--account can only be used in combination with --launch!" << std::endl;
m_status = Application::Failed;
return;
}
if(m_offline)
{
std::cerr << "--offline can only be used in combination with --launch!" << std::endl;
m_status = Application::Failed;
return;
}
if(!m_offlineName.isEmpty())
{
std::cerr << "--offlineName can only be used in combination with --launch and --offline!" << std::endl;
m_status = Application::Failed;
return;
}
}
else {
// all the things invalid when trying to --launch
// online, and offline name is set
if(!m_offline && !m_offlineName.isEmpty()) {
std::cerr << "--offlineName can only be used in combination with --launch and --offline!" << std::endl;
m_status = Application::Failed;
return;
}
}
#if defined(Q_OS_MAC)
// move user data to new location if on macOS and it still exists in Contents/MacOS
QDir fi(applicationDirPath());
@ -473,6 +511,10 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
{
launch.args["profile"] = m_profileToUse;
}
if(m_offline) {
launch.args["offline_enabled"] = "true";
launch.args["offline_name"] = m_offlineName;
}
m_peerInstance->sendMessage(launch.serialize(), timeout);
}
m_status = Application::Succeeded;
@ -1030,6 +1072,7 @@ void Application::performMainStartupAction()
{
MinecraftServerTargetPtr serverToJoin = nullptr;
MinecraftAccountPtr accountToUse = nullptr;
bool offline = m_offline;
qDebug() << "<> Instance" << m_instanceIdToLaunch << "launching";
if(!m_serverToJoin.isEmpty())
@ -1048,7 +1091,7 @@ void Application::performMainStartupAction()
qDebug() << " Launching with account" << m_profileToUse;
}
launch(inst, true, nullptr, serverToJoin, accountToUse);
launch(inst, !offline, nullptr, serverToJoin, accountToUse, m_offlineName);
return;
}
}
@ -1121,6 +1164,8 @@ void Application::messageReceived(const QByteArray& message)
QString id = received.args["id"];
QString server = received.args["server"];
QString profile = received.args["profile"];
bool offline = received.args["offline_enabled"] == "true";
QString offlineName = received.args["offline_name"];
InstancePtr instance;
if(!id.isEmpty()) {
@ -1151,10 +1196,11 @@ void Application::messageReceived(const QByteArray& message)
launch(
instance,
true,
!offline,
nullptr,
serverObject,
accountObject
accountObject,
offlineName
);
}
else
@ -1252,7 +1298,8 @@ bool Application::launch(
bool online,
BaseProfilerFactory *profiler,
MinecraftServerTargetPtr serverToJoin,
MinecraftAccountPtr accountToUse
MinecraftAccountPtr accountToUse,
const QString& offlineName
) {
if(m_updateRunning)
{
@ -1276,6 +1323,7 @@ bool Application::launch(
controller->setProfiler(profiler);
controller->setServerToJoin(serverToJoin);
controller->setAccountToUse(accountToUse);
controller->setOfflineName(offlineName);
if(window)
{
controller->setParentWidget(window);

5
launcher/Application.h
View File

@ -154,7 +154,8 @@ public slots:
bool online = true,
BaseProfilerFactory *profiler = nullptr,
MinecraftServerTargetPtr serverToJoin = nullptr,
MinecraftAccountPtr accountToUse = nullptr
MinecraftAccountPtr accountToUse = nullptr,
const QString &offlineName = QString()
);
bool kill(InstancePtr instance);
@ -234,6 +235,8 @@ public:
QString m_instanceIdToLaunch;
QString m_serverToJoin;
QString m_profileToUse;
bool m_offline = false;
QString m_offlineName;
bool m_liveCheck = false;
QUrl m_zipToImport;
std::unique_ptr<QFile> logFile;

9
launcher/LaunchController.cpp
View File

@ -126,10 +126,12 @@ void LaunchController::login() {
}
case AccountState::Online: {
if(!m_session->wants_online) {
QString usedname;
if(m_offlineName.isEmpty()) {
// we ask the user for a player name
bool ok = false;
QString lastOfflinePlayerName = APPLICATION->settings()->get("LastOfflinePlayerName").toString();
QString usedname = lastOfflinePlayerName.isEmpty() ? m_session->player_name : lastOfflinePlayerName;
usedname = lastOfflinePlayerName.isEmpty() ? m_session->player_name : lastOfflinePlayerName;
QString name = QInputDialog::getText(
m_parentWidget,
tr("Player name"),
@ -148,6 +150,11 @@ void LaunchController::login() {
usedname = name;
APPLICATION->settings()->set("LastOfflinePlayerName", usedname);
}
}
else {
usedname = m_offlineName;
}
m_session->MakeOffline(usedname);
// offline flavored game from here :3
}

5
launcher/LaunchController.h
View File

@ -28,6 +28,10 @@ public:
m_online = online;
}
void setOfflineName(const QString &offlineName) {
m_offlineName = offlineName;
}
void setProfiler(BaseProfilerFactory *profiler) {
m_profiler = profiler;
}
@ -66,6 +70,7 @@ private slots:
private:
BaseProfilerFactory *m_profiler = nullptr;
bool m_online = true;
QString m_offlineName;
InstancePtr m_instance;
QWidget * m_parentWidget = nullptr;
InstanceWindow *m_console = nullptr;