ihateninjas/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher synced 2026-04-23 09:05:03 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

refactor: FMLLibrariesTask -> LegacyFMLLibrariesTask

Browse source 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2026-01-25 16:45:11 +05:00
parent 7945a7c626
commit f0a17d82d9
No known key found for this signature in database
GPG key ID: B77C34313AEE1FFF
7 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -171,7 +171,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)

2
buildconfig/BuildConfig.cpp.in
View file

@ -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@";

2
buildconfig/BuildConfig.h
View file

@ -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/";

4
launcher/CMakeLists.txt
View file

@ -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

4
launcher/minecraft/MinecraftInstance.cpp
View file

@ -45,7 +45,7 @@
#include "minecraft/launch/ExtractNatives.h"
#include "minecraft/launch/PrintInstanceInfo.h"
#include "minecraft/update/AssetUpdateTask.h"
#include "minecraft/update/FMLLibrariesTask.h"
#include "minecraft/update/LegacyFMLLibrariesTask.h"
#include "minecraft/update/LibrariesTask.h"
#include "settings/Setting.h"
#include "settings/SettingsObject.h"
@ -1113,7 +1113,7 @@ QList<LaunchStep::Ptr> MinecraftInstance::createUpdateTask()
// libraries download
makeShared<LibrariesTask>(this),
// FML libraries download and copy into the instance
makeShared<FMLLibrariesTask>(this),
makeShared<LegacyFMLLibrariesTask>(this),
// assets update
makeShared<AssetUpdateTask>(this),
};

26
launcher/minecraft/update/FMLLibrariesTask.cpp → launcher/minecraft/update/LegacyFMLLibrariesTask.cpp
View file

@ -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;
}

6
launcher/minecraft/update/FMLLibrariesTask.h → launcher/minecraft/update/LegacyFMLLibrariesTask.h
View file

@ -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;