Merge branch 'develop' into feat/acknowledge_release_type

Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>

1 files changed, 19 insertions, 19 deletions

diff --git a/launcher/minecraft/mod/tasks/LocalResourceParse.cpp b/launcher/minecraft/mod/tasks/LocalResourceParse.cpp
index 4d760df2..d5a09083 100644
--- a/launcher/minecraft/mod/tasks/LocalResourceParse.cpp
+++ b/launcher/minecraft/mod/tasks/LocalResourceParse.cpp
@@ -19,7 +19,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <QObject> 
+#include <QObject>
 
 #include "LocalResourceParse.h"
 
@@ -30,21 +30,23 @@
 #include "LocalTexturePackParseTask.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")},
-    {PackedResourceType::DataPack, QObject::tr("data pack")},
-    {PackedResourceType::ShaderPack, QObject::tr("shader pack")},
-    {PackedResourceType::WorldSave, QObject::tr("world save")},
-    {PackedResourceType::Mod , QObject::tr("mod")},
-    {PackedResourceType::UNKNOWN, QObject::tr("unknown")}
-};
+static const QMap<PackedResourceType, QString> s_packed_type_names = { { PackedResourceType::ResourcePack, QObject::tr("resource pack") },
+                                                                       { PackedResourceType::TexturePack, QObject::tr("texture pack") },
+                                                                       { PackedResourceType::DataPack, QObject::tr("data pack") },
+                                                                       { PackedResourceType::ShaderPack, QObject::tr("shader pack") },
+                                                                       { PackedResourceType::WorldSave, QObject::tr("world save") },
+                                                                       { PackedResourceType::Mod, QObject::tr("mod") },
+                                                                       { PackedResourceType::UNKNOWN, QObject::tr("unknown") } };
 
 namespace ResourceUtils {
-PackedResourceType identify(QFileInfo file){
+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 +55,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;
@@ -63,7 +62,7 @@ PackedResourceType identify(QFileInfo file){
             qDebug() << file.fileName() << "is a shader pack";
             return PackedResourceType::ShaderPack;
         } else {
-            qDebug() << "Can't Identify" << file.fileName() ;
+            qDebug() << "Can't Identify" << file.fileName();
         }
     } else {
         qDebug() << "Can't find" << file.absolutePath();
@@ -71,8 +70,9 @@ PackedResourceType identify(QFileInfo file){
     return PackedResourceType::UNKNOWN;
 }
 
-QString getPackedTypeName(PackedResourceType type) {
+QString getPackedTypeName(PackedResourceType type)
+{
     return s_packed_type_names.constFind(type).value();
 }
 
-}
+}  // namespace ResourceUtils