CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reveted back LocalResourceParse.cpp

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-07-21 19:20:45 +03:00
parent 60d0013bc4
commit 130abdc562
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
launcher/minecraft/mod/tasks/LocalResourceParse.cpp
View File

@ -30,19 +30,25 @@
#include "LocalTexturePackParseTask.h" #include "LocalTexturePackParseTask.h"
#include "LocalWorldSaveParseTask.h" #include "LocalWorldSaveParseTask.h"
static const QMap<PackedResourceType, QString> s_packed_type_names = { { PackedResourceType::ResourcePack, QObject::tr("resource pack") },
{ PackedResourceType::TexturePack, QObject::tr("texture pack") }, static const QMap<PackedResourceType, QString> s_packed_type_names = {
{ PackedResourceType::DataPack, QObject::tr("data pack") }, {PackedResourceType::ResourcePack, QObject::tr("resource pack")},
{ PackedResourceType::ShaderPack, QObject::tr("shader pack") }, {PackedResourceType::TexturePack, QObject::tr("texture pack")},
{ PackedResourceType::WorldSave, QObject::tr("world save") }, {PackedResourceType::DataPack, QObject::tr("data pack")},
{ PackedResourceType::Mod, QObject::tr("mod") }, {PackedResourceType::ShaderPack, QObject::tr("shader pack")},
{ PackedResourceType::UNKNOWN, QObject::tr("unknown") } }; {PackedResourceType::WorldSave, QObject::tr("world save")},
{PackedResourceType::Mod , QObject::tr("mod")},
{PackedResourceType::UNKNOWN, QObject::tr("unknown")}
};
namespace ResourceUtils { namespace ResourceUtils {
PackedResourceType identify(QFileInfo file) PackedResourceType identify(QFileInfo file){
{
if (file.exists() && file.isFile()) { if (file.exists() && file.isFile()) {
if (ResourcePackUtils::validate(file)) { if (ModUtils::validate(file)) {
// mods can contain resource and data packs so they must be tested first
qDebug() << file.fileName() << "is a mod";
return PackedResourceType::Mod;
} else if (ResourcePackUtils::validate(file)) {
qDebug() << file.fileName() << "is a resource pack"; qDebug() << file.fileName() << "is a resource pack";
return PackedResourceType::ResourcePack; return PackedResourceType::ResourcePack;
} else if (TexturePackUtils::validate(file)) { } else if (TexturePackUtils::validate(file)) {
@ -57,12 +63,8 @@ PackedResourceType identify(QFileInfo file)
} else if (ShaderPackUtils::validate(file)) { } else if (ShaderPackUtils::validate(file)) {
qDebug() << file.fileName() << "is a shader pack"; qDebug() << file.fileName() << "is a shader pack";
return PackedResourceType::ShaderPack; return PackedResourceType::ShaderPack;
} else if (ModUtils::validate(file)) {
// mods should be already filtered out by the API response
qDebug() << file.fileName() << "is a mod";
return PackedResourceType::Mod;
} else { } else {
qDebug() << "Can't Identify" << file.fileName(); qDebug() << "Can't Identify" << file.fileName() ;
} }
} else { } else {
qDebug() << "Can't find" << file.absolutePath(); qDebug() << "Can't find" << file.absolutePath();
@ -70,9 +72,8 @@ PackedResourceType identify(QFileInfo file)
return PackedResourceType::UNKNOWN; return PackedResourceType::UNKNOWN;
} }
QString getPackedTypeName(PackedResourceType type) QString getPackedTypeName(PackedResourceType type) {
{
return s_packed_type_names.constFind(type).value(); return s_packed_type_names.constFind(type).value();
} }
} // namespace ResourceUtils }