feat(auth): load Ely and authlib-injector patches from metadata

Signed-off-by: so5iso4ka <so5iso4ka@icloud.com>

Author: so5iso4ka

CMakeLists.txt

@@ -201,13 +201,7 @@ set(Launcher_UPDATER_GITHUB_REPO "https://github.com/FreesmTeam/FreesmLauncher"
 set(Launcher_BUILD_ARTIFACT "" CACHE STRING "Artifact name to help the updater identify valid artifacts.")
 
 # The metadata server
-set(Launcher_META_URL "https://meta.prismlauncher.org/v1/" CACHE STRING "URL to fetch Launcher's meta files from.")
-
-# Ely.by metadata URL
-set(Launcher_EPL_META_URL "https://freesmlauncher.org/metadata/epl_metadata.json" CACHE STRING "URL to fetch Ely authlibs metadata")
-
-# Ely.by metadata fallback URL
-set(Launcher_EPL_META_FALLBACK_URL "https://raw.githubusercontent.com/FreesmTeam/FreesmLauncher/refs/heads/develop/epl_metadata.json" CACHE STRING "Fallback URL to fetch Ely authlibs metadata")
+set(Launcher_META_URL "https://meta.freesmlauncher.org/v1/" CACHE STRING "URL to fetch Launcher's meta files from.")
 
 # Imgur API Client ID
 set(Launcher_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can get from Imgur when you register an application")

buildconfig/BuildConfig.cpp.in

@@ -116,8 +116,6 @@ Config::Config()
     ELYBY_CLIENT_ID = "@Launcher_ELYBY_CLIENT_ID@";
     FLAME_API_KEY = "@Launcher_CURSEFORGE_API_KEY@";
     META_URL = "@Launcher_META_URL@";
-    EPL_META_URL = "@Launcher_EPL_META_URL@";
-    EPL_META_FALLBACK_URL = "@Launcher_EPL_META_FALLBACK_URL@";
     LEGACY_FMLLIBS_BASE_URL = "@Launcher_LEGACY_FMLLIBS_BASE_URL@";
 
     GLFW_LIBRARY_NAME = "@Launcher_GLFW_LIBRARY_NAME@";

buildconfig/BuildConfig.h

@@ -175,9 +175,6 @@ class Config {
      */
     QString META_URL;
 
-    QString EPL_META_URL;
-    QString EPL_META_FALLBACK_URL;
-
     QString GLFW_LIBRARY_NAME;
     QString OPENAL_LIBRARY_NAME;
 

epl_metadata.json

@@ -469,7 +469,7 @@ QString BaseInstance::windowTitle() const
 }
 
 // FIXME: why is this here? move it to MinecraftInstance!!!
-QStringList BaseInstance::extraArguments()
+QStringList BaseInstance::extraArguments(AuthSessionPtr session)
 {
     return Commandline::splitArgs(settings()->get("JvmArgs").toString());
 }

launcher/BaseInstance.cpp

@@ -168,7 +168,7 @@ class BaseInstance : public QObject {
     void setManagedPack(const QString& type, const QString& id, const QString& name, const QString& versionId, const QString& version);
     void copyManagedPack(BaseInstance& other);
 
-    virtual QStringList extraArguments();
+    virtual QStringList extraArguments(AuthSessionPtr session);
 
     /// Traits. Normally inside the version, depends on instance implementation.
     virtual QSet<QString> traits() const = 0;

launcher/BaseInstance.h

@@ -276,10 +276,12 @@ set(MINECRAFT_SOURCES
     minecraft/update/LibrariesTask.cpp
     minecraft/update/LibrariesTask.h
 
-    minecraft/launch/ApplyLibraryOverrides.cpp
-    minecraft/launch/ApplyLibraryOverrides.h
+    minecraft/launch/ApplyLibraryOverride.cpp
+    minecraft/launch/ApplyLibraryOverride.h
     minecraft/launch/ApplyAuthlibInjector.cpp
     minecraft/launch/ApplyAuthlibInjector.h
+    minecraft/launch/ApplyElyPatch.cpp
+    minecraft/launch/ApplyElyPatch.h
     minecraft/launch/ClaimAccount.cpp
     minecraft/launch/ClaimAccount.h
     minecraft/launch/CreateGameFolders.cpp

launcher/CMakeLists.txt

@@ -48,7 +48,6 @@
 #include "java/JavaVersion.h"
 
 #include "launch/ApplyAuthlibInjector.h"
-#include "launch/ApplyLibraryOverrides.h"
 #include "launch/LaunchTask.h"
 #include "launch/SetDiscordActivity.h"
 #include "launch/TaskStepWrapper.h"
@@ -59,6 +58,8 @@
 #include "launch/steps/QuitAfterGameStop.h"
 #include "launch/steps/TextPrint.h"
 
+#include "minecraft/launch/ApplyAuthlibInjector.h"
+#include "minecraft/launch/ApplyElyPatch.h"
 #include "minecraft/launch/AutoInstallJava.h"
 #include "minecraft/launch/ClaimAccount.h"
 #include "minecraft/launch/CreateGameFolders.h"
@@ -71,7 +72,6 @@
 #include "minecraft/launch/ReconstructAssets.h"
 #include "minecraft/launch/ScanModFolders.h"
 #include "minecraft/launch/VerifyJavaInstall.h"
-#include "minecraft/ScreenshotsWatcher.h"
 
 #include "minecraft/update/AssetUpdateTask.h"
 #include "minecraft/update/FoldersTask.h"
@@ -89,6 +89,8 @@
 
 #include "WorldList.h"
 
+#include "minecraft/ScreenshotsWatcher.h"
+
 #include "AssetsUtils.h"
 #include "MinecraftLoadAndCheck.h"
 #include "PackProfile.h"
@@ -523,9 +525,9 @@ static QString replaceTokensIn(const QString& text, const QMap<QString, QString>
     return result;
 }
 
-QStringList MinecraftInstance::extraArguments()
+QStringList MinecraftInstance::extraArguments(AuthSessionPtr session)
 {
-    auto list = BaseInstance::extraArguments();
+    auto list = BaseInstance::extraArguments(nullptr);
     auto version = getPackProfile();
     if (!version)
         return list;
@@ -545,7 +547,11 @@ QStringList MinecraftInstance::extraArguments()
     for (const auto& agent : agents) {
         QStringList jar, temp1, temp2, temp3;
         agent.library->getApplicableFiles(runtimeContext(), jar, temp1, temp2, temp3, getLocalLibraryPath());
-        list.append("-javaagent:" + jar[0] + (agent.argument.isEmpty() ? "" : "=" + agent.argument));
+        QString arg = agent.argument;
+        if (session && agent.library->artifactPrefix() == "moe.yushi:authlibinjector") {
+            arg = replaceTokensIn(arg, { { "authlib_injector_auth_url", session->authlib_injector_auth_url } });
+        }
+        list.append("-javaagent:" + jar[0] + (agent.argument.isEmpty() ? "" : "=" + arg));
     }
 
     {
@@ -579,14 +585,14 @@ QStringList MinecraftInstance::extraArguments()
     return list;
 }
 
-QStringList MinecraftInstance::javaArguments()
+QStringList MinecraftInstance::javaArguments(AuthSessionPtr session)
 {
     QStringList args;
 
     args << "-Duser.language=en";
 
     // custom args go first. we want to override them if we have our own here.
-    args.append(extraArguments());
+    args.append(extraArguments(std::move(session)));
 
     // OSX dock icon and name
 #ifdef Q_OS_MAC
@@ -667,7 +673,7 @@ QMap<QString, QString> MinecraftInstance::getVariables()
     out.insert("INST_DIR", QDir::toNativeSeparators(QDir(instanceRoot()).absolutePath()));
     out.insert("INST_MC_DIR", QDir::toNativeSeparators(QDir(gameRoot()).absolutePath()));
     out.insert("INST_JAVA", QDir::toNativeSeparators(QDir(settings()->get("JavaPath").toString()).absolutePath()));
-    out.insert("INST_JAVA_ARGS", javaArguments().join(' '));
+    out.insert("INST_JAVA_ARGS", javaArguments(nullptr).join(' '));
     out.insert("NO_COLOR", "1");
 #ifdef Q_OS_MACOS
     // get library for Steam overlay support
@@ -1171,8 +1177,8 @@ LaunchTask* MinecraftInstance::createLaunchTask(AuthSessionPtr session, Minecraf
     }
 
     // load meta
+    auto mode = session->launchMode != LaunchMode::Offline ? Net::Mode::Online : Net::Mode::Offline;
     {
-        auto mode = session->launchMode != LaunchMode::Offline ? Net::Mode::Online : Net::Mode::Offline;
         process->appendStep(makeShared<TaskStepWrapper>(pptr, makeShared<MinecraftLoadAndCheck>(this, mode)));
     }
 
@@ -1191,13 +1197,15 @@ LaunchTask* MinecraftInstance::createLaunchTask(AuthSessionPtr session, Minecraf
         process->appendStep(step);
     }
 
+    if (session->wants_ely_patch) {
+        process->appendStep(makeShared<ApplyElyPatch>(pptr, m_runtimeContext, mode));
+    } else if (session->wants_authlib_injector) {
+        process->appendStep(makeShared<ApplyAuthlibInjector>(pptr, m_runtimeContext, mode));
+    }
+
     // if we aren't in offline mode
     if (session->launchMode != LaunchMode::Offline) {
         process->appendStep(makeShared<ClaimAccount>(pptr, session));
-        process->appendStep(makeShared<ApplyLibraryOverrides>(pptr, session));
-        if (session->wants_authlib_injector) {
-            process->appendStep(makeShared<ApplyAuthlibInjector>(pptr, session));
-        }
         for (auto t : createUpdateTask()) {
             process->appendStep(makeShared<TaskStepWrapper>(pptr, t));
         }

launcher/minecraft/MinecraftInstance.cpp

@@ -128,12 +128,12 @@ class MinecraftInstance : public BaseInstance {
     //////  Launch stuff //////
     QList<Task::Ptr> createUpdateTask() override;
     LaunchTask* createLaunchTask(AuthSessionPtr account, MinecraftTarget::Ptr targetToJoin) override;
-    QStringList extraArguments() override;
+    QStringList extraArguments(AuthSessionPtr session) override;
     QStringList verboseDescription(AuthSessionPtr session, MinecraftTarget::Ptr targetToJoin) override;
     QList<Mod*> getJarMods() const;
     QString createLaunchScript(AuthSessionPtr session, MinecraftTarget::Ptr targetToJoin);
     /// get arguments passed to java
-    QStringList javaArguments();
+    QStringList javaArguments(AuthSessionPtr session);
     QString getLauncher();
     bool shouldApplyOnlineFixes();