Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods

launcher/minecraft/mod/Mod.cpp

@@ -274,7 +274,7 @@ QPixmap Mod::icon(QSize size, Qt::AspectRatioMode mode) const
         return {};
 
     if (m_pack_image_cache_key.was_ever_used) {
-        qDebug() << "Mod" << name() << "Had it's icon evicted form the cache. reloading...";
+        qDebug() << "Mod" << name() << "Had it's icon evicted from the cache. reloading...";
         PixmapCache::markCacheMissByEviciton();
     }
     // Image got evicted from the cache or an attempt to load it has not been made. load it and retry.

launcher/minecraft/mod/ResourceFolderModel.cpp

@@ -284,7 +284,12 @@ void ResourceFolderModel::resolveResource(Resource* res)
     connect(
         task.get(), &Task::failed, this, [=] { onParseFailed(ticket, res->internal_id()); }, Qt::ConnectionType::QueuedConnection);
     connect(
-        task.get(), &Task::finished, this, [=] { m_active_parse_tasks.remove(ticket); }, Qt::ConnectionType::QueuedConnection);
+        task.get(), &Task::finished, this,
+        [=] {
+            m_active_parse_tasks.remove(ticket);
+            emit parseFinished();
+        },
+        Qt::ConnectionType::QueuedConnection);
 
     m_helper_thread_task.addTask(task);
 
@@ -617,3 +622,26 @@ QString ResourceFolderModel::instDirPath() const
 {
     return QFileInfo(m_instance->instanceRoot()).absoluteFilePath();
 }
+
+void ResourceFolderModel::onParseFailed(int ticket, QString resource_id)
+{
+    auto iter = m_active_parse_tasks.constFind(ticket);
+    if (iter == m_active_parse_tasks.constEnd())
+        return;
+
+    auto removed_index = m_resources_index[resource_id];
+    auto removed_it = m_resources.begin() + removed_index;
+    Q_ASSERT(removed_it != m_resources.end());
+
+    beginRemoveRows(QModelIndex(), removed_index, removed_index);
+    m_resources.erase(removed_it);
+
+    // update index
+    m_resources_index.clear();
+    int idx = 0;
+    for (auto const& mod : qAsConst(m_resources)) {
+        m_resources_index[mod->internal_id()] = idx;
+        idx++;
+    }
+    endRemoveRows();
+}

launcher/minecraft/mod/ResourceFolderModel.h

@@ -143,6 +143,7 @@ class ResourceFolderModel : public QAbstractListModel {
 
    signals:
     void updateFinished();
+    void parseFinished();
 
    protected:
     /** This creates a new update task to be executed by update().
@@ -189,11 +190,7 @@ class ResourceFolderModel : public QAbstractListModel {
      *  if the resource is complex and has more stuff to parse.
      */
     virtual void onParseSucceeded(int ticket, QString resource_id);
-    virtual void onParseFailed(int ticket, QString resource_id)
-    {
-        Q_UNUSED(ticket);
-        Q_UNUSED(resource_id);
-    }
+    virtual void onParseFailed(int ticket, QString resource_id);
 
    protected:
     // Represents the relationship between a column's index (represented by the list index), and it's sorting key.

launcher/minecraft/mod/ShaderPack.cpp

@@ -35,8 +35,3 @@ bool ShaderPack::valid() const
 {
     return m_pack_format != ShaderPackFormat::INVALID;
 }
-
-bool ShaderPack::applyFilter(QRegularExpression filter) const
-{
-    return valid() && Resource::applyFilter(filter);
-}

launcher/minecraft/mod/ShaderPack.h

@@ -54,7 +54,6 @@ class ShaderPack : public Resource {
     void setPackFormat(ShaderPackFormat new_format);
 
     bool valid() const override;
-    [[nodiscard]] bool applyFilter(QRegularExpression filter) const override;
 
    protected:
     mutable QMutex m_data_lock;

launcher/minecraft/mod/tasks/LocalModParseTask.cpp

@@ -469,7 +469,7 @@ bool processZIP(Mod& mod, [[maybe_unused]] ProcessingLevel level)
 
     QuaZipFile file(&zip);
 
-    if (zip.setCurrentFile("META-INF/mods.toml")) {
+    if (zip.setCurrentFile("META-INF/mods.toml") || zip.setCurrentFile("META-INF/neoforge.mods.toml")) {
         if (!file.open(QIODevice::ReadOnly)) {
             zip.close();
             return false;
@@ -746,7 +746,7 @@ void LocalModParseTask::executeTask()
     m_result->details = mod.details();
 
     if (m_aborted)
-        emit finished();
+        emitAborted();
     else
         emitSucceeded();
 }

launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp

@@ -286,8 +286,10 @@ bool LocalResourcePackParseTask::abort()
 
 void LocalResourcePackParseTask::executeTask()
 {
-    if (!ResourcePackUtils::process(m_resource_pack))
+    if (!ResourcePackUtils::process(m_resource_pack)) {
+        emitFailed("this is not a resource pack");
         return;
+    }
 
     if (m_aborted)
         emitAborted();

launcher/minecraft/mod/tasks/LocalShaderPackParseTask.cpp

@@ -103,8 +103,10 @@ bool LocalShaderPackParseTask::abort()
 
 void LocalShaderPackParseTask::executeTask()
 {
-    if (!ShaderPackUtils::process(m_shader_pack))
+    if (!ShaderPackUtils::process(m_shader_pack)) {
+        emitFailed("this is not a shader pack");
         return;
+    }
 
     if (m_aborted)
         emitAborted();

launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp

@@ -241,8 +241,10 @@ bool LocalTexturePackParseTask::abort()
 
 void LocalTexturePackParseTask::executeTask()
 {
-    if (!TexturePackUtils::process(m_texture_pack))
+    if (!TexturePackUtils::process(m_texture_pack)) {
+        emitFailed("this is not a texture pack");
         return;
+    }
 
     if (m_aborted)
         emitAborted();