ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'unmojang/fix-1.20' into develop

Browse Source
This commit is contained in:
Evan Goode 2024-05-03 17:44:15 -04:00
commit 614615a5fd
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
launcher/minecraft/MinecraftInstance.cpp
View File

@ -546,13 +546,7 @@ QStringList MinecraftInstance::processAuthArgs(AuthSessionPtr session) const
QString v = m_components->getProfile()->getMinecraftVersion(); QString v = m_components->getProfile()->getMinecraftVersion();
if (session->uses_custom_api_servers) { if (session->uses_custom_api_servers) {
if (v != "1.16.4" && v != "1.16.5") { bool using_authlib_injector = false;
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(); 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") {
@ -566,11 +560,21 @@ QStringList MinecraftInstance::processAuthArgs(AuthSessionPtr session) const
if (session->authlib_injector_metadata != "") { if (session->authlib_injector_metadata != "") {
args << "-Dauthlibinjector.yggdrasil.prefetched=" + session->authlib_injector_metadata; args << "-Dauthlibinjector.yggdrasil.prefetched=" + session->authlib_injector_metadata;
} }
using_authlib_injector = true;
break; break;
} }
} }
} else if (session->wants_online && (v == "1.16.4" || v == "1.16.5")) { if (!using_authlib_injector) {
// https://github.com/FabricMC/fabric-loom/issues/915#issuecomment-1609154390 qDebug() << "authlib-injector not found, setting -Dminecraft.api.*.host system properties.";
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;
}
}
// https://github.com/FabricMC/fabric-loom/issues/915#issuecomment-1609154390
if (!session->wants_online && (v == "1.16.4" || v == "1.16.5")) {
QString invalid_url{ "https://invalid.invalid" }; QString invalid_url{ "https://invalid.invalid" };
args << "-Dminecraft.api.env=custom"; args << "-Dminecraft.api.env=custom";
args << "-Dminecraft.api.auth.host=" + invalid_url; args << "-Dminecraft.api.auth.host=" + invalid_url;