From eecad73cb92bca1216a0abc51b6d8d88bbbfdb56 Mon Sep 17 00:00:00 2001 From: Octol1ttle Date: Sun, 25 Jan 2026 16:45:11 +0500 Subject: [PATCH] refactor: FMLLibrariesTask -> LegacyFMLLibrariesTask Signed-off-by: Octol1ttle --- CMakeLists.txt | 2 +- buildconfig/BuildConfig.cpp.in | 2 +- buildconfig/BuildConfig.h | 2 +- launcher/CMakeLists.txt | 4 +-- launcher/minecraft/MinecraftInstance.cpp | 4 +-- ...iesTask.cpp => LegacyFMLLibrariesTask.cpp} | 26 +++++++++---------- ...brariesTask.h => LegacyFMLLibrariesTask.h} | 6 ++--- 7 files changed, 23 insertions(+), 23 deletions(-) rename launcher/minecraft/update/{FMLLibrariesTask.cpp => LegacyFMLLibrariesTask.cpp} (80%) rename launcher/minecraft/update/{FMLLibrariesTask.h => LegacyFMLLibrariesTask.h} (76%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bd00bb53..6346bfd2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -174,7 +174,7 @@ set(Launcher_NEWS_RSS_URL "https://prismlauncher.org/feed/feed.xml" CACHE STRING set(Launcher_NEWS_OPEN_URL "https://prismlauncher.org/news" CACHE STRING "URL that gets opened when the user clicks 'More News'") set(Launcher_HELP_URL "https://prismlauncher.org/wiki/help-pages/%1" CACHE STRING "URL (with arg %1 to be substituted with page-id) that gets opened when the user requests help") set(Launcher_LOGIN_CALLBACK_URL "https://prismlauncher.org/successful-login" CACHE STRING "URL that gets opened when the user successfully logins.") -set(Launcher_FMLLIBS_BASE_URL "https://files.prismlauncher.org/fmllibs/" CACHE STRING "URL for FML Libraries.") +set(Launcher_LEGACY_FMLLIBS_BASE_URL "https://files.prismlauncher.org/fmllibs/" CACHE STRING "URL for legacy (<=1.5.2) FML Libraries.") ######## Set version numbers ######## set(Launcher_VERSION_MAJOR 10) diff --git a/buildconfig/BuildConfig.cpp.in b/buildconfig/BuildConfig.cpp.in index 0a1ac334d..3c5c74e9f 100644 --- a/buildconfig/BuildConfig.cpp.in +++ b/buildconfig/BuildConfig.cpp.in @@ -111,7 +111,7 @@ Config::Config() MSA_CLIENT_ID = "@Launcher_MSA_CLIENT_ID@"; FLAME_API_KEY = "@Launcher_CURSEFORGE_API_KEY@"; META_URL = "@Launcher_META_URL@"; - FMLLIBS_BASE_URL = "@Launcher_FMLLIBS_BASE_URL@"; + LEGACY_FMLLIBS_BASE_URL = "@Launcher_LEGACY_FMLLIBS_BASE_URL@"; GLFW_LIBRARY_NAME = "@Launcher_GLFW_LIBRARY_NAME@"; OPENAL_LIBRARY_NAME = "@Launcher_OPENAL_LIBRARY_NAME@"; diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h index 045d987d4..1a03c7761 100644 --- a/buildconfig/BuildConfig.h +++ b/buildconfig/BuildConfig.h @@ -169,7 +169,7 @@ class Config { QString DEFAULT_RESOURCE_BASE = "https://resources.download.minecraft.net/"; QString LIBRARY_BASE = "https://libraries.minecraft.net/"; QString IMGUR_BASE_URL = "https://api.imgur.com/3/"; - QString FMLLIBS_BASE_URL; + QString LEGACY_FMLLIBS_BASE_URL; QString TRANSLATION_FILES_URL; QString MODPACKSCH_API_BASE_URL = "https://api.modpacks.ch/"; diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 11e507d1b..dea725c88 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -254,8 +254,8 @@ set(MINECRAFT_SOURCES minecraft/update/AssetUpdateTask.h minecraft/update/AssetUpdateTask.cpp - minecraft/update/FMLLibrariesTask.cpp - minecraft/update/FMLLibrariesTask.h + minecraft/update/LegacyFMLLibrariesTask.cpp + minecraft/update/LegacyFMLLibrariesTask.h minecraft/update/FoldersTask.cpp minecraft/update/FoldersTask.h minecraft/update/LibrariesTask.cpp diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index 46e9e5355..cd02ec4dc 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -69,7 +69,7 @@ #include "minecraft/launch/VerifyJavaInstall.h" #include "minecraft/update/AssetUpdateTask.h" -#include "minecraft/update/FMLLibrariesTask.h" +#include "minecraft/update/LegacyFMLLibrariesTask.h" #include "minecraft/update/FoldersTask.h" #include "minecraft/update/LibrariesTask.h" @@ -1107,7 +1107,7 @@ QList MinecraftInstance::createUpdateTask() // libraries download makeShared(this), // FML libraries download and copy into the instance - makeShared(this), + makeShared(this), // assets update makeShared(this), }; diff --git a/launcher/minecraft/update/FMLLibrariesTask.cpp b/launcher/minecraft/update/LegacyFMLLibrariesTask.cpp similarity index 80% rename from launcher/minecraft/update/FMLLibrariesTask.cpp rename to launcher/minecraft/update/LegacyFMLLibrariesTask.cpp index ce0c9a723..12f8f89c4 100644 --- a/launcher/minecraft/update/FMLLibrariesTask.cpp +++ b/launcher/minecraft/update/LegacyFMLLibrariesTask.cpp @@ -1,4 +1,4 @@ -#include "FMLLibrariesTask.h" +#include "LegacyFMLLibrariesTask.h" #include "FileSystem.h" #include "minecraft/MinecraftInstance.h" @@ -10,11 +10,11 @@ #include "net/ApiDownload.h" -FMLLibrariesTask::FMLLibrariesTask(MinecraftInstance* inst) +LegacyFMLLibrariesTask::LegacyFMLLibrariesTask(MinecraftInstance* inst) { m_inst = inst; } -void FMLLibrariesTask::executeTask() +void LegacyFMLLibrariesTask::executeTask() { // Get the mod list MinecraftInstance* inst = (MinecraftInstance*)m_inst; @@ -63,25 +63,25 @@ void FMLLibrariesTask::executeTask() Net::Download::Options options = Net::Download::Option::MakeEternal; for (auto& lib : fmlLibsToProcess) { auto entry = metacache->resolveEntry("fmllibs", lib.filename); - QString urlString = BuildConfig.FMLLIBS_BASE_URL + lib.filename; + QString urlString = BuildConfig.LEGACY_FMLLIBS_BASE_URL + lib.filename; dljob->addNetAction(Net::ApiDownload::makeCached(QUrl(urlString), entry, options)); } - connect(dljob.get(), &NetJob::succeeded, this, &FMLLibrariesTask::fmllibsFinished); - connect(dljob.get(), &NetJob::failed, this, &FMLLibrariesTask::fmllibsFailed); + connect(dljob.get(), &NetJob::succeeded, this, &LegacyFMLLibrariesTask::fmllibsFinished); + connect(dljob.get(), &NetJob::failed, this, &LegacyFMLLibrariesTask::fmllibsFailed); connect(dljob.get(), &NetJob::aborted, this, [this] { emitFailed(tr("Aborted")); }); - connect(dljob.get(), &NetJob::progress, this, &FMLLibrariesTask::progress); - connect(dljob.get(), &NetJob::stepProgress, this, &FMLLibrariesTask::propagateStepProgress); + connect(dljob.get(), &NetJob::progress, this, &LegacyFMLLibrariesTask::progress); + connect(dljob.get(), &NetJob::stepProgress, this, &LegacyFMLLibrariesTask::propagateStepProgress); downloadJob.reset(dljob); downloadJob->start(); } -bool FMLLibrariesTask::canAbort() const +bool LegacyFMLLibrariesTask::canAbort() const { return true; } -void FMLLibrariesTask::fmllibsFinished() +void LegacyFMLLibrariesTask::fmllibsFinished() { downloadJob.reset(); if (!fmlLibsToProcess.isEmpty()) { @@ -107,19 +107,19 @@ void FMLLibrariesTask::fmllibsFinished() } emitSucceeded(); } -void FMLLibrariesTask::fmllibsFailed(QString reason) +void LegacyFMLLibrariesTask::fmllibsFailed(QString reason) { QStringList failed = downloadJob->getFailedFiles(); QString failed_all = failed.join("\n"); emitFailed(tr("Failed to download the following files:\n%1\n\nReason:%2\nPlease try again.").arg(failed_all, reason)); } -bool FMLLibrariesTask::abort() +bool LegacyFMLLibrariesTask::abort() { if (downloadJob) { return downloadJob->abort(); } else { - qWarning() << "Prematurely aborted FMLLibrariesTask"; + qWarning() << "Prematurely aborted LegacyFMLLibrariesTask"; } return true; } diff --git a/launcher/minecraft/update/FMLLibrariesTask.h b/launcher/minecraft/update/LegacyFMLLibrariesTask.h similarity index 76% rename from launcher/minecraft/update/FMLLibrariesTask.h rename to launcher/minecraft/update/LegacyFMLLibrariesTask.h index 4fe2648e8..8aa416d72 100644 --- a/launcher/minecraft/update/FMLLibrariesTask.h +++ b/launcher/minecraft/update/LegacyFMLLibrariesTask.h @@ -5,11 +5,11 @@ class MinecraftInstance; -class FMLLibrariesTask : public Task { +class LegacyFMLLibrariesTask : public Task { Q_OBJECT public: - FMLLibrariesTask(MinecraftInstance* inst); - virtual ~FMLLibrariesTask() = default; + LegacyFMLLibrariesTask(MinecraftInstance* inst); + virtual ~LegacyFMLLibrariesTask() = default; void executeTask() override;