fede/prismlauncher-crack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2024-06-24 20:12:40 +03:00
parent e57c2180da
commit 00b83efb9a
10 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
launcher/modplatform/CheckUpdateTask.h
View File

@@ -14,15 +14,9 @@ class CheckUpdateTask : public Task {
public:
CheckUpdateTask(QList<Mod*>& mods,
std::list<Version>& mcVersions,
std::optional<ModPlatform::ModLoaderTypes> loaders,
QList<ModPlatform::ModLoaderType> loadersList,
std::shared_ptr<ModFolderModel> mods_folder)
: Task(nullptr)
, m_mods(mods)
, m_game_versions(mcVersions)
, m_loaders(loaders)
, m_loaders_list(loadersList)
, m_mods_folder(mods_folder){};
: Task(nullptr), m_mods(mods), m_game_versions(mcVersions), m_loaders_list(loadersList), m_mods_folder(mods_folder){};
struct UpdatableMod {
QString name;
@@ -72,7 +66,6 @@ class CheckUpdateTask : public Task {
protected:
QList<Mod*>& m_mods;
std::list<Version>& m_game_versions;
std::optional<ModPlatform::ModLoaderTypes> m_loaders;
QList<ModPlatform::ModLoaderType> m_loaders_list;
std::shared_ptr<ModFolderModel> m_mods_folder;

3
launcher/modplatform/ModIndex.h
View File

@@ -25,7 +25,6 @@
#include <QVariant>
#include <QVector>
#include <memory>
#include <optional>
class QIODevice;
@@ -44,7 +43,7 @@ namespace ProviderCapabilities {
const char* name(ResourceProvider);
QString readableName(ResourceProvider);
QStringList hashType(ResourceProvider);
}; // namespace ProviderCapabilities
} // namespace ProviderCapabilities
struct ModpackAuthor {
QString name;

2
launcher/modplatform/flame/FlameCheckUpdate.cpp
View File

@@ -132,7 +132,7 @@ void FlameCheckUpdate::executeTask()
setStatus(tr("Getting API response from CurseForge for '%1'...").arg(mod->name()));
setProgress(i++, m_mods.size());
auto latest_vers = api.getLatestVersions({ { mod->metadata()->project_id.toString() }, m_game_versions, m_loaders });
auto latest_vers = api.getLatestVersions({ { mod->metadata()->project_id.toString() }, m_game_versions });
// Check if we were aborted while getting the latest version
if (m_was_aborted) {

3
launcher/modplatform/flame/FlameCheckUpdate.h
View File

@@ -9,10 +9,9 @@ class FlameCheckUpdate : public CheckUpdateTask {
public:
FlameCheckUpdate(QList<Mod*>& mods,
std::list<Version>& mcVersions,
std::optional<ModPlatform::ModLoaderTypes> loaders,
QList<ModPlatform::ModLoaderType> loadersList,
std::shared_ptr<ModFolderModel> mods_folder)
: CheckUpdateTask(mods, mcVersions, loaders, loadersList, mods_folder)
: CheckUpdateTask(mods, mcVersions, loadersList, mods_folder)
{}
public slots:

9
launcher/modplatform/modrinth/ModrinthCheckUpdate.cpp
View File

@@ -16,10 +16,9 @@ static ModrinthAPI api;
ModrinthCheckUpdate::ModrinthCheckUpdate(QList<Mod*>& mods,
std::list<Version>& mcVersions,
std::optional<ModPlatform::ModLoaderTypes> loaders,
QList<ModPlatform::ModLoaderType> loadersList,
std::shared_ptr<ModFolderModel> mods_folder)
: CheckUpdateTask(mods, mcVersions, loaders, loadersList, mods_folder)
: CheckUpdateTask(mods, mcVersions, loadersList, mods_folder)
, m_hash_type(ModPlatform::ProviderCapabilities::hashType(ModPlatform::ResourceProvider::MODRINTH).first())
{}
@@ -88,7 +87,7 @@ void ModrinthCheckUpdate::checkVersionsResponse(std::shared_ptr<QByteArray> resp
try {
for (auto hash : m_mappings.keys()) {
if (forceModLoaderCheck && !m_mappings[hash]->loaders().testAnyFlags(loader)) {
if (forceModLoaderCheck && !(m_mappings[hash]->loaders() & loader)) {
continue;
}
auto project_obj = doc[hash].toObject();
@@ -171,7 +170,7 @@ void ModrinthCheckUpdate::getUpdateModsForLoader(ModPlatform::ModLoaderTypes loa
QStringList hashes;
if (forceModLoaderCheck) {
for (auto hash : m_mappings.keys()) {
if (m_mappings[hash]->loaders().testAnyFlags(loader)) {
if (m_mappings[hash]->loaders() & loader) {
hashes.append(hash);
}
}
@@ -211,7 +210,7 @@ void ModrinthCheckUpdate::checkNextLoader()
m_next_loader_idx++;
setProgress(m_next_loader_idx * 2 - 1, 9);
for (auto m : m_mappings) {
if (m->loaders().testAnyFlag(flag)) {
if (m->loaders() & flag) {
getUpdateModsForLoader(flag, true);
return;
}

1
launcher/modplatform/modrinth/ModrinthCheckUpdate.h
View File

@@ -8,7 +8,6 @@ class ModrinthCheckUpdate : public CheckUpdateTask {
public:
ModrinthCheckUpdate(QList<Mod*>& mods,
std::list<Version>& mcVersions,
std::optional<ModPlatform::ModLoaderTypes> loaders,
QList<ModPlatform::ModLoaderType> loadersList,
std::shared_ptr<ModFolderModel> mods_folder);