diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-26 21:33:15 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-26 21:33:15 +0300 |
| commit | c778dcbc9c326c1bf563852d7393bf43c1514346 (patch) | |
| tree | b0b556492b5c83d07858f60d56feadca64983648 /launcher/minecraft/mod/tasks/LocalResourceParse.cpp | |
| parent | d7f4e40f85d1e253fe62e1c9e1cfb1842ffb0c86 (diff) | |
| parent | a0944dab7a8fff9b5d9c2c8d35cc55349c93a3cd (diff) | |
| download | PrismLauncher-c778dcbc9c326c1bf563852d7393bf43c1514346.tar.gz PrismLauncher-c778dcbc9c326c1bf563852d7393bf43c1514346.tar.bz2 PrismLauncher-c778dcbc9c326c1bf563852d7393bf43c1514346.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
Diffstat (limited to 'launcher/minecraft/mod/tasks/LocalResourceParse.cpp')
| -rw-r--r-- | launcher/minecraft/mod/tasks/LocalResourceParse.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/launcher/minecraft/mod/tasks/LocalResourceParse.cpp b/launcher/minecraft/mod/tasks/LocalResourceParse.cpp index 4d760df2..0894049c 100644 --- a/launcher/minecraft/mod/tasks/LocalResourceParse.cpp +++ b/launcher/minecraft/mod/tasks/LocalResourceParse.cpp @@ -44,7 +44,11 @@ static const QMap<PackedResourceType, QString> s_packed_type_names = { namespace ResourceUtils { PackedResourceType identify(QFileInfo file){ 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"; return PackedResourceType::ResourcePack; } else if (TexturePackUtils::validate(file)) { @@ -53,9 +57,6 @@ PackedResourceType identify(QFileInfo file){ } else if (DataPackUtils::validate(file)) { qDebug() << file.fileName() << "is a data pack"; return PackedResourceType::DataPack; - } else if (ModUtils::validate(file)) { - qDebug() << file.fileName() << "is a mod"; - return PackedResourceType::Mod; } else if (WorldSaveUtils::validate(file)) { qDebug() << file.fileName() << "is a world save"; return PackedResourceType::WorldSave; |