mirror of
https://github.com/UltimMC/Launcher.git
synced 2025-10-03 08:41:42 +00:00
NOISSUE Add support for joining servers via Quick Play
This commit is contained in:
@@ -48,6 +48,7 @@
|
||||
#include "MinecraftLoadAndCheck.h"
|
||||
#include "minecraft/gameoptions/GameOptions.h"
|
||||
#include "minecraft/update/FoldersTask.h"
|
||||
#include "minecraft/VersionFilterData.h"
|
||||
|
||||
#define IBUS "@im=ibus"
|
||||
|
||||
@@ -425,10 +426,17 @@ QStringList MinecraftInstance::processMinecraftArgs(
|
||||
|
||||
if (serverToJoin && !serverToJoin->address.isEmpty())
|
||||
{
|
||||
args_pattern += " --server " + serverToJoin->address;
|
||||
args_pattern += " --port " + QString::number(serverToJoin->port);
|
||||
if (m_components->getComponent("net.minecraft")->getReleaseDateTime() >= g_VersionFilterData.quickPlayBeginsDate)
|
||||
{
|
||||
args_pattern += " --quickPlayMultiplayer " + serverToJoin->address + ":" + QString::number(serverToJoin->port);
|
||||
}
|
||||
else
|
||||
{
|
||||
args_pattern += " --server " + serverToJoin->address;
|
||||
args_pattern += " --port " + QString::number(serverToJoin->port);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
QMap<QString, QString> token_mapping;
|
||||
// yggdrasil!
|
||||
if(session) {
|
||||
@@ -489,6 +497,7 @@ QString MinecraftInstance::createLaunchScript(AuthSessionPtr session, MinecraftS
|
||||
|
||||
if (serverToJoin && !serverToJoin->address.isEmpty())
|
||||
{
|
||||
launchScript += "useQuickPlay " + QString::number(m_components->getComponent("net.minecraft")->getReleaseDateTime() >= g_VersionFilterData.quickPlayBeginsDate) + "\n";
|
||||
launchScript += "serverAddress " + serverToJoin->address + "\n";
|
||||
launchScript += "serverPort " + QString::number(serverToJoin->port) + "\n";
|
||||
}
|
||||
|
@@ -66,7 +66,8 @@ VersionFilterData::VersionFilterData()
|
||||
"net.java.jutils:jutils", "org.lwjgl.lwjgl:lwjgl",
|
||||
"org.lwjgl.lwjgl:lwjgl_util", "org.lwjgl.lwjgl:lwjgl-platform"};
|
||||
|
||||
java8BeginsDate = timeFromS3Time("2017-03-30T09:32:19+00:00");
|
||||
java16BeginsDate = timeFromS3Time("2021-05-12T11:19:15+00:00");
|
||||
java17BeginsDate = timeFromS3Time("2021-11-16T17:04:48+00:00");
|
||||
java8BeginsDate = timeFromS3Time("2017-03-30T09:32:19+00:00");
|
||||
java16BeginsDate = timeFromS3Time("2021-05-12T11:19:15+00:00");
|
||||
java17BeginsDate = timeFromS3Time("2021-11-16T17:04:48+00:00");
|
||||
quickPlayBeginsDate = timeFromS3Time("2023-04-05T12:05:17+00:00");
|
||||
}
|
||||
|
@@ -27,5 +27,7 @@ struct VersionFilterData
|
||||
QDateTime java16BeginsDate;
|
||||
// release data of first version to require Java 17 (1.18 Pre Release 2)
|
||||
QDateTime java17BeginsDate;
|
||||
// release date of first version to use --quickPlayMultiplayer instead of --server/--port for directly joining servers
|
||||
QDateTime quickPlayBeginsDate;
|
||||
};
|
||||
extern VersionFilterData g_VersionFilterData;
|
||||
|
Reference in New Issue
Block a user