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

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

31 files changed, 122 insertions, 107 deletions

diff --git a/launcher/minecraft/AssetsUtils.cpp b/launcher/minecraft/AssetsUtils.cpp
index 4923f0ef..4ef00707 100644
--- a/launcher/minecraft/AssetsUtils.cpp
+++ b/launcher/minecraft/AssetsUtils.cpp
@@ -46,8 +46,8 @@
 #include "AssetsUtils.h"
 #include "BuildConfig.h"
 #include "FileSystem.h"
+#include "net/ApiDownload.h"
 #include "net/ChecksumValidator.h"
-#include "net/Download.h"
 
 #include "Application.h"
 
@@ -279,7 +279,7 @@ NetAction::Ptr AssetObject::getDownloadAction()
 {
     QFileInfo objectFile(getLocalPath());
     if ((!objectFile.isFile()) || (objectFile.size() != size)) {
-        auto objectDL = Net::Download::makeFile(getUrl(), objectFile.filePath());
+        auto objectDL = Net::ApiDownload::makeFile(getUrl(), objectFile.filePath());
         if (hash.size()) {
             auto rawHash = QByteArray::fromHex(hash.toLatin1());
             objectDL->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawHash));
diff --git a/launcher/minecraft/Component.h b/launcher/minecraft/Component.h
index 00a912d6..3474a22e 100644
--- a/launcher/minecraft/Component.h
+++ b/launcher/minecraft/Component.h
@@ -25,7 +25,8 @@ class Component : public QObject, public ProblemProvider {
     Component(PackProfile* parent, std::shared_ptr<Meta::Version> version);
     Component(PackProfile* parent, const QString& uid, std::shared_ptr<VersionFile> file);
 
-    virtual ~Component(){};
+    virtual ~Component() {}
+
     void applyTo(LaunchProfile* profile);
 
     bool isEnabled();
diff --git a/launcher/minecraft/LaunchProfile.h b/launcher/minecraft/LaunchProfile.h
index 3acc1f19..12b31238 100644
--- a/launcher/minecraft/LaunchProfile.h
+++ b/launcher/minecraft/LaunchProfile.h
@@ -41,7 +41,7 @@
 
 class LaunchProfile : public ProblemProvider {
    public:
-    virtual ~LaunchProfile(){};
+    virtual ~LaunchProfile() {}
 
    public: /* application of profile variables from patches */
     void applyMinecraftVersion(const QString& id);
diff --git a/launcher/minecraft/Library.cpp b/launcher/minecraft/Library.cpp
index a9c20845..0e8ddf03 100644
--- a/launcher/minecraft/Library.cpp
+++ b/launcher/minecraft/Library.cpp
@@ -38,8 +38,8 @@
 
 #include <BuildConfig.h>
 #include <FileSystem.h>
+#include <net/ApiDownload.h>
 #include <net/ChecksumValidator.h>
-#include <net/Download.h>
 
 void Library::getApplicableFiles(const RuntimeContext& runtimeContext,
                                  QStringList& jar,
@@ -115,12 +115,12 @@ QList<NetAction::Ptr> Library::getDownloads(const RuntimeContext& runtimeContext
 
         if (sha1.size()) {
             auto rawSha1 = QByteArray::fromHex(sha1.toLatin1());
-            auto dl = Net::Download::makeCached(url, entry, options);
+            auto dl = Net::ApiDownload::makeCached(url, entry, options);
             dl->addValidator(new Net::ChecksumValidator(QCryptographicHash::Sha1, rawSha1));
             qDebug() << "Checksummed Download for:" << rawName().serialize() << "storage:" << storage << "url:" << url;
             out.append(dl);
         } else {
-            out.append(Net::Download::makeCached(url, entry, options));
+            out.append(Net::ApiDownload::makeCached(url, entry, options));
             qDebug() << "Download for:" << rawName().serialize() << "storage:" << storage << "url:" << url;
         }
         return true;
diff --git a/launcher/minecraft/MojangDownloadInfo.h b/launcher/minecraft/MojangDownloadInfo.h
index b98a0168..855dbe00 100644
--- a/launcher/minecraft/MojangDownloadInfo.h
+++ b/launcher/minecraft/MojangDownloadInfo.h
@@ -19,8 +19,8 @@ struct MojangDownloadInfo {
 };
 
 struct MojangLibraryDownloadInfo {
-    MojangLibraryDownloadInfo(MojangDownloadInfo::Ptr artifact) : artifact(artifact){};
-    MojangLibraryDownloadInfo(){};
+    MojangLibraryDownloadInfo(MojangDownloadInfo::Ptr artifact_) : artifact(artifact_) {}
+    MojangLibraryDownloadInfo() {}
 
     // types
     typedef std::shared_ptr<MojangLibraryDownloadInfo> Ptr;
@@ -47,18 +47,18 @@ struct MojangAssetIndexInfo : public MojangDownloadInfo {
     // methods
     MojangAssetIndexInfo() {}
 
-    MojangAssetIndexInfo(QString id)
+    MojangAssetIndexInfo(QString id_)
     {
-        this->id = id;
+        this->id = id_;
         // HACK: ignore assets from other version files than Minecraft
         // workaround for stupid assets issue caused by amazon:
         // https://www.theregister.co.uk/2017/02/28/aws_is_awol_as_s3_goes_haywire/
-        if (id == "legacy") {
+        if (id_ == "legacy") {
             url = "https://piston-meta.mojang.com/mc/assets/legacy/c0fd82e8ce9fbc93119e40d96d5a4e62cfa3f729/legacy.json";
         }
         // HACK
         else {
-            url = "https://s3.amazonaws.com/Minecraft.Download/indexes/" + id + ".json";
+            url = "https://s3.amazonaws.com/Minecraft.Download/indexes/" + id_ + ".json";
         }
         known = false;
     }
diff --git a/launcher/minecraft/OneSixVersionFormat.cpp b/launcher/minecraft/OneSixVersionFormat.cpp
index e2455325..306c95a6 100644
--- a/launcher/minecraft/OneSixVersionFormat.cpp
+++ b/launcher/minecraft/OneSixVersionFormat.cpp
@@ -350,7 +350,7 @@ QJsonDocument OneSixVersionFormat::versionFileToJson(const VersionFilePtr& patch
     }
 }
 
-LibraryPtr OneSixVersionFormat::plusJarModFromJson(ProblemContainer& problems,
+LibraryPtr OneSixVersionFormat::plusJarModFromJson([[maybe_unused]] ProblemContainer& problems,
                                                    const QJsonObject& libObj,
                                                    const QString& filename,
                                                    const QString& originalName)
diff --git a/launcher/minecraft/PackProfile.cpp b/launcher/minecraft/PackProfile.cpp
index 82fc779e..cf8270cd 100644
--- a/launcher/minecraft/PackProfile.cpp
+++ b/launcher/minecraft/PackProfile.cpp
@@ -204,10 +204,10 @@ static bool loadPackProfile(PackProfile* parent,
         }
         auto orderArray = Json::requireArray(obj.value("components"));
         for (auto item : orderArray) {
-            auto obj = Json::requireObject(item, "Component must be an object.");
-            container.append(componentFromJsonV1(parent, componentJsonPattern, obj));
+            auto comp_obj = Json::requireObject(item, "Component must be an object.");
+            container.append(componentFromJsonV1(parent, componentJsonPattern, comp_obj));
         }
-    } catch (const JSONValidationError& err) {
+    } catch ([[maybe_unused]] const JSONValidationError& err) {
         qCritical() << "Couldn't parse" << componentsFile.fileName() << ": bad file format";
         container.clear();
         return false;
@@ -377,7 +377,7 @@ void PackProfile::insertComponent(size_t index, ComponentPtr component)
         qWarning() << "Attempt to add a component that is already present!";
         return;
     }
-    beginInsertRows(QModelIndex(), index, index);
+    beginInsertRows(QModelIndex(), static_cast<int>(index), static_cast<int>(index));
     d->components.insert(index, component);
     d->componentIndex[id] = component;
     endInsertRows();
@@ -389,7 +389,7 @@ void PackProfile::componentDataChanged()
 {
     auto objPtr = qobject_cast<Component*>(sender());
     if (!objPtr) {
-        qWarning() << "PackProfile got dataChenged signal from a non-Component!";
+        qWarning() << "PackProfile got dataChanged signal from a non-Component!";
         return;
     }
     if (objPtr->getID() == "net.minecraft") {
@@ -405,7 +405,7 @@ void PackProfile::componentDataChanged()
         }
         index++;
     }
-    qWarning() << "PackProfile got dataChenged signal from a Component which does not belong to it!";
+    qWarning() << "PackProfile got dataChanged signal from a Component which does not belong to it!";
 }
 
 bool PackProfile::remove(const int index)
@@ -483,9 +483,9 @@ ComponentPtr PackProfile::getComponent(const QString& id)
     return (*iter);
 }
 
-ComponentPtr PackProfile::getComponent(int index)
+ComponentPtr PackProfile::getComponent(size_t index)
 {
-    if (index < 0 || index >= d->components.size()) {
+    if (index >= static_cast<size_t>(d->components.size())) {
         return nullptr;
     }
     return d->components[index];
@@ -547,7 +547,7 @@ QVariant PackProfile::data(const QModelIndex& index, int role) const
     return QVariant();
 }
 
-bool PackProfile::setData(const QModelIndex& index, const QVariant& value, int role)
+bool PackProfile::setData(const QModelIndex& index, [[maybe_unused]] const QVariant& value, int role)
 {
     if (!index.isValid() || index.row() < 0 || index.row() >= rowCount(index.parent())) {
         return false;
diff --git a/launcher/minecraft/PackProfile.h b/launcher/minecraft/PackProfile.h
index a5e5cb1a..ce44fa58 100644
--- a/launcher/minecraft/PackProfile.h
+++ b/launcher/minecraft/PackProfile.h
@@ -140,7 +140,7 @@ class PackProfile : public QAbstractListModel {
     ComponentPtr getComponent(const QString& id);
 
     /// get the profile component by index
-    ComponentPtr getComponent(int index);
+    ComponentPtr getComponent(size_t index);
 
     /// Add the component to the internal list of patches
     // todo(merged): is this the best approach
diff --git a/launcher/minecraft/ProfileUtils.cpp b/launcher/minecraft/ProfileUtils.cpp
index 18a4b7d0..d56ed14b 100644
--- a/launcher/minecraft/ProfileUtils.cpp
+++ b/launcher/minecraft/ProfileUtils.cpp
@@ -82,7 +82,7 @@ bool readOverrideOrders(QString path, PatchOrder& order)
         for (auto item : orderArray) {
             order.append(Json::requireString(item));
         }
-    } catch (const JSONValidationError& err) {
+    } catch ([[maybe_unused]] const JSONValidationError& err) {
         qCritical() << "Couldn't parse" << orderFile.fileName() << ": bad file format";
         qWarning() << "Ignoring overriden order";
         order.clear();
diff --git a/launcher/minecraft/Rule.h b/launcher/minecraft/Rule.h
index 483cd936..c6cdbc43 100644
--- a/launcher/minecraft/Rule.h
+++ b/launcher/minecraft/Rule.h
@@ -55,7 +55,7 @@ class Rule {
 
    public:
     Rule(RuleAction result) : m_result(result) {}
-    virtual ~Rule(){};
+    virtual ~Rule() {}
     virtual QJsonObject toJson() = 0;
     RuleAction apply(const Library* parent, const RuntimeContext& runtimeContext)
     {
diff --git a/launcher/minecraft/World.cpp b/launcher/minecraft/World.cpp
index 62e0279a..1a680ac5 100644
--- a/launcher/minecraft/World.cpp
+++ b/launcher/minecraft/World.cpp
@@ -368,11 +368,11 @@ optional<QString> read_string(nbt::value& parent, const char* name)
         }
         auto& tag_str = namedValue.as<nbt::tag_string>();
         return QString::fromStdString(tag_str.get());
-    } catch (const std::out_of_range& e) {
+    } catch ([[maybe_unused]] const std::out_of_range& e) {
         // fallback for old world formats
         qWarning() << "String NBT tag" << name << "could not be found.";
         return nullopt;
-    } catch (const std::bad_cast& e) {
+    } catch ([[maybe_unused]] const std::bad_cast& e) {
         // type mismatch
         qWarning() << "NBT tag" << name << "could not be converted to string.";
         return nullopt;
@@ -388,11 +388,11 @@ optional<int64_t> read_long(nbt::value& parent, const char* name)
         }
         auto& tag_str = namedValue.as<nbt::tag_long>();
         return tag_str.get();
-    } catch (const std::out_of_range& e) {
+    } catch ([[maybe_unused]] const std::out_of_range& e) {
         // fallback for old world formats
         qWarning() << "Long NBT tag" << name << "could not be found.";
         return nullopt;
-    } catch (const std::bad_cast& e) {
+    } catch ([[maybe_unused]] const std::bad_cast& e) {
         // type mismatch
         qWarning() << "NBT tag" << name << "could not be converted to long.";
         return nullopt;
@@ -408,11 +408,11 @@ optional<int> read_int(nbt::value& parent, const char* name)
         }
         auto& tag_str = namedValue.as<nbt::tag_int>();
         return tag_str.get();
-    } catch (const std::out_of_range& e) {
+    } catch ([[maybe_unused]] const std::out_of_range& e) {
         // fallback for old world formats
         qWarning() << "Int NBT tag" << name << "could not be found.";
         return nullopt;
-    } catch (const std::bad_cast& e) {
+    } catch ([[maybe_unused]] const std::bad_cast& e) {
         // type mismatch
         qWarning() << "NBT tag" << name << "could not be converted to int.";
         return nullopt;
diff --git a/launcher/minecraft/WorldList.cpp b/launcher/minecraft/WorldList.cpp
index a7348e57..812b13c7 100644
--- a/launcher/minecraft/WorldList.cpp
+++ b/launcher/minecraft/WorldList.cpp
@@ -255,7 +255,7 @@ QVariant WorldList::data(const QModelIndex& index, int role) const
     }
 }
 
-QVariant WorldList::headerData(int section, Qt::Orientation orientation, int role) const
+QVariant WorldList::headerData(int section, [[maybe_unused]] Qt::Orientation orientation, int role) const
 {
     switch (role) {
         case Qt::DisplayRole:
@@ -294,7 +294,6 @@ QVariant WorldList::headerData(int section, Qt::Orientation orientation, int rol
         default:
             return QVariant();
     }
-    return QVariant();
 }
 
 QStringList WorldList::mimeTypes() const
@@ -339,19 +338,19 @@ QMimeData* WorldList::mimeData(const QModelIndexList& indexes) const
     if (indexes.size() == 0)
         return new QMimeData();
 
-    QList<World> worlds;
+    QList<World> worlds_;
     for (auto idx : indexes) {
         if (idx.column() != 0)
             continue;
         int row = idx.row();
         if (row < 0 || row >= this->worlds.size())
             continue;
-        worlds.append(this->worlds[row]);
+        worlds_.append(this->worlds[row]);
     }
-    if (!worlds.size()) {
+    if (!worlds_.size()) {
         return new QMimeData();
     }
-    return new WorldMimeData(worlds);
+    return new WorldMimeData(worlds_);
 }
 
 Qt::ItemFlags WorldList::flags(const QModelIndex& index) const
diff --git a/launcher/minecraft/auth/AccountData.cpp b/launcher/minecraft/auth/AccountData.cpp
index b56f49cb..474bf7c6 100644
--- a/launcher/minecraft/auth/AccountData.cpp
+++ b/launcher/minecraft/auth/AccountData.cpp
@@ -311,7 +311,7 @@ bool AccountData::resumeStateFromV2(QJsonObject data)
         QJsonObject profileObject = profileVal.toObject();
         QString id = profileObject.value("id").toString("");
         QString name = profileObject.value("name").toString("");
-        bool legacy = profileObject.value("legacy").toBool(false);
+        bool legacy_ = profileObject.value("legacy").toBool(false);
         if (id.isEmpty() || name.isEmpty()) {
             qWarning() << "Unable to load a profile" << name << "because it was missing an ID or a name.";
             continue;
@@ -319,7 +319,7 @@ bool AccountData::resumeStateFromV2(QJsonObject data)
         if (id == currentProfile) {
             currentProfileIndex = index;
         }
-        profiles.append({ id, name, legacy });
+        profiles.append({ id, name, legacy_ });
     }
     auto& profile = profiles[currentProfileIndex];
 
diff --git a/launcher/minecraft/auth/AccountList.cpp b/launcher/minecraft/auth/AccountList.cpp
index 317af714..c534ea3b 100644
--- a/launcher/minecraft/auth/AccountList.cpp
+++ b/launcher/minecraft/auth/AccountList.cpp
@@ -353,7 +353,7 @@ QVariant AccountList::data(const QModelIndex& index, int role) const
     }
 }
 
-QVariant AccountList::headerData(int section, Qt::Orientation orientation, int role) const
+QVariant AccountList::headerData(int section, [[maybe_unused]] Qt::Orientation orientation, int role) const
 {
     switch (role) {
         case Qt::DisplayRole:
diff --git a/launcher/minecraft/auth/MinecraftAccount.cpp b/launcher/minecraft/auth/MinecraftAccount.cpp
index 1dcea207..6c2f0805 100644
--- a/launcher/minecraft/auth/MinecraftAccount.cpp
+++ b/launcher/minecraft/auth/MinecraftAccount.cpp
@@ -37,6 +37,7 @@
 
 #include "MinecraftAccount.h"
 
+#include <QColor>
 #include <QCryptographicHash>
 #include <QJsonArray>
 #include <QJsonDocument>
@@ -126,6 +127,11 @@ QPixmap MinecraftAccount::getFace() const
         return QPixmap();
     }
     QPixmap skin = QPixmap(8, 8);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    skin.fill(QColorConstants::Transparent);
+#else
+    skin.fill(QColor(0, 0, 0, 0));
+#endif
     QPainter painter(&skin);
     painter.drawPixmap(0, 0, skinTexture.copy(8, 8, 8, 8));
     painter.drawPixmap(0, 0, skinTexture.copy(40, 8, 8, 8));
diff --git a/launcher/minecraft/auth/Parsers.cpp b/launcher/minecraft/auth/Parsers.cpp
index 8dbe446a..f6179a93 100644
--- a/launcher/minecraft/auth/Parsers.cpp
+++ b/launcher/minecraft/auth/Parsers.cpp
@@ -113,16 +113,16 @@ bool parseXTokenResponse(QByteArray& data, Katabasis::Token& output, QString nam
         if (!item.isObject()) {
             continue;
         }
-        auto obj = item.toObject();
-        if (obj.contains("uhs")) {
+        auto obj_ = item.toObject();
+        if (obj_.contains("uhs")) {
             foundUHS = true;
         } else {
             continue;
         }
         // consume all 'display claims' ... whatever that means
-        for (auto iter = obj.begin(); iter != obj.end(); iter++) {
+        for (auto iter = obj_.begin(); iter != obj_.end(); iter++) {
             QString claim;
-            if (!getString(obj.value(iter.key()), claim)) {
+            if (!getString(obj_.value(iter.key()), claim)) {
                 qWarning() << "display claim " << iter.key() << " is not a string...";
                 return false;
             }
diff --git a/launcher/minecraft/auth/steps/EntitlementsStep.cpp b/launcher/minecraft/auth/steps/EntitlementsStep.cpp
index e942db52..0573dcb6 100644
--- a/launcher/minecraft/auth/steps/EntitlementsStep.cpp
+++ b/launcher/minecraft/auth/steps/EntitlementsStep.cpp
@@ -36,7 +36,9 @@ void EntitlementsStep::rehydrate()
     // NOOP, for now. We only save bools and there's nothing to check.
 }
 
-void EntitlementsStep::onRequestDone(QNetworkReply::NetworkError error, QByteArray data, QList<QNetworkReply::RawHeaderPair> headers)
+void EntitlementsStep::onRequestDone([[maybe_unused]] QNetworkReply::NetworkError error,
+                                     QByteArray data,
+                                     [[maybe_unused]] QList<QNetworkReply::RawHeaderPair> headers)
 {
     auto requestor = qobject_cast<AuthRequest*>(QObject::sender());
     requestor->deleteLater();
diff --git a/launcher/minecraft/gameoptions/GameOptions.cpp b/launcher/minecraft/gameoptions/GameOptions.cpp
index 443525ae..4f4fb99a 100644
--- a/launcher/minecraft/gameoptions/GameOptions.cpp
+++ b/launcher/minecraft/gameoptions/GameOptions.cpp
@@ -97,12 +97,11 @@ QVariant GameOptions::data(const QModelIndex& index, int role) const
         default:
             return QVariant();
     }
-    return QVariant();
 }
 
 int GameOptions::rowCount(const QModelIndex&) const
 {
-    return contents.size();
+    return static_cast<int>(contents.size());
 }
 
 int GameOptions::columnCount(const QModelIndex&) const
diff --git a/launcher/minecraft/launch/LauncherPartLaunch.cpp b/launcher/minecraft/launch/LauncherPartLaunch.cpp
index 05562ef2..44e5d0a6 100644
--- a/launcher/minecraft/launch/LauncherPartLaunch.cpp
+++ b/launcher/minecraft/launch/LauncherPartLaunch.cpp
@@ -53,7 +53,7 @@ LauncherPartLaunch::LauncherPartLaunch(LaunchTask* parent) : LaunchStep(parent)
     auto instance = parent->instance();
     if (instance->settings()->get("CloseAfterLaunch").toBool()) {
         std::shared_ptr<QMetaObject::Connection> connection{ new QMetaObject::Connection };
-        *connection = connect(&m_process, &LoggedProcess::log, this, [=](QStringList lines, MessageLevel::Enum level) {
+        *connection = connect(&m_process, &LoggedProcess::log, this, [=](QStringList lines, [[maybe_unused]] MessageLevel::Enum level) {
             qDebug() << lines;
             if (lines.filter(QRegularExpression(".*Setting user.+", QRegularExpression::CaseInsensitiveOption)).length() != 0) {
                 APPLICATION->closeAllWindows();
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index ca3ee11f..6dafecfc 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -72,7 +72,7 @@ class Mod : public Resource {
     auto metaurl() const -> QString;
 
     /** Get the intneral path to the mod's icon file*/
-    QString iconPath() const { return m_local_details.icon_file; };
+    QString iconPath() const { return m_local_details.icon_file; }
     /** Gets the icon of the mod, converted to a QPixmap for drawing, and scaled to size. */
     [[nodiscard]] QPixmap icon(QSize size, Qt::AspectRatioMode mode = Qt::AspectRatioMode::IgnoreAspectRatio) const;
     /** Thread-safe. */
diff --git a/launcher/minecraft/mod/ModDetails.h b/launcher/minecraft/mod/ModDetails.h
index 6a15219a..a00d5a24 100644
--- a/launcher/minecraft/mod/ModDetails.h
+++ b/launcher/minecraft/mod/ModDetails.h
@@ -60,17 +60,17 @@ struct ModLicense {
 
     ModLicense(const QString license)
     {
-        // FIXME: come up with a better license parseing.
+        // FIXME: come up with a better license parsing.
         // handle SPDX identifiers? https://spdx.org/licenses/
         auto parts = license.split(' ');
         QStringList notNameParts = {};
         for (auto part : parts) {
-            auto url = QUrl(part);
+            auto _url = QUrl(part);
             if (part.startsWith("(") && part.endsWith(")"))
-                url = QUrl(part.mid(1, part.size() - 2));
+                _url = QUrl(part.mid(1, part.size() - 2));
 
-            if (url.isValid() && !url.scheme().isEmpty() && !url.host().isEmpty()) {
-                this->url = url.toString();
+            if (_url.isValid() && !_url.scheme().isEmpty() && !_url.host().isEmpty()) {
+                this->url = _url.toString();
                 notNameParts.append(part);
                 continue;
             }
@@ -89,13 +89,9 @@ struct ModLicense {
         }
     }
 
-    ModLicense(const QString name, const QString id, const QString url, const QString description)
-    {
-        this->name = name;
-        this->id = id;
-        this->url = url;
-        this->description = description;
-    }
+    ModLicense(const QString& name_, const QString& id_, const QString& url_, const QString& description_)
+        : name(name_), id(id_), url(url_), description(description_)
+    {}
 
     ModLicense(const ModLicense& other) : name(other.name), id(other.id), url(other.url), description(other.description) {}
 
diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index 8dbe583d..280e70d7 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -62,6 +62,7 @@ ModFolderModel::ModFolderModel(const QString& dir, BaseInstance* instance, bool
     m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::NAME, SortType::VERSION, SortType::DATE, SortType::PROVIDER };
     m_column_resize_modes = { QHeaderView::ResizeToContents, QHeaderView::Interactive,      QHeaderView::Stretch,
                               QHeaderView::ResizeToContents, QHeaderView::ResizeToContents, QHeaderView::ResizeToContents };
+    m_columnsHideable = { false, true, false, true, true, true };
 }
 
 QVariant ModFolderModel::data(const QModelIndex& index, int role) const
@@ -137,7 +138,7 @@ QVariant ModFolderModel::data(const QModelIndex& index, int role) const
     }
 }
 
-QVariant ModFolderModel::headerData(int section, Qt::Orientation orientation, int role) const
+QVariant ModFolderModel::headerData(int section, [[maybe_unused]] Qt::Orientation orientation, int role) const
 {
     switch (role) {
         case Qt::DisplayRole:
diff --git a/launcher/minecraft/mod/ResourceFolderModel.cpp b/launcher/minecraft/mod/ResourceFolderModel.cpp
index fb454cac..0503b660 100644
--- a/launcher/minecraft/mod/ResourceFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourceFolderModel.cpp
@@ -451,7 +451,7 @@ QVariant ResourceFolderModel::data(const QModelIndex& index, int role) const
     }
 }
 
-bool ResourceFolderModel::setData(const QModelIndex& index, const QVariant& value, int role)
+bool ResourceFolderModel::setData(const QModelIndex& index, [[maybe_unused]] const QVariant& value, int role)
 {
     int row = index.row();
     if (row < 0 || row >= rowCount(index.parent()) || !index.isValid())
@@ -475,7 +475,7 @@ bool ResourceFolderModel::setData(const QModelIndex& index, const QVariant& valu
     return false;
 }
 
-QVariant ResourceFolderModel::headerData(int section, Qt::Orientation orientation, int role) const
+QVariant ResourceFolderModel::headerData(int section, [[maybe_unused]] Qt::Orientation orientation, int role) const
 {
     switch (role) {
         case Qt::DisplayRole:
@@ -555,6 +555,9 @@ QMenu* ResourceFolderModel::createHeaderContextMenu(QTreeView* tree)
     menu->addSeparator()->setText(tr("Show / Hide Columns"));
 
     for (int col = 0; col < columnCount(); ++col) {
+        // Skip creating actions for columns that should not be hidden
+        if (!m_columnsHideable.at(col))
+            continue;
         auto act = new QAction(menu);
         setupHeaderAction(act, col);
 
@@ -588,7 +591,8 @@ SortType ResourceFolderModel::columnToSortKey(size_t column) const
 }
 
 /* Standard Proxy Model for createFilterProxyModel */
-[[nodiscard]] bool ResourceFolderModel::ProxyModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
+[[nodiscard]] bool ResourceFolderModel::ProxyModel::filterAcceptsRow(int source_row,
+                                                                     [[maybe_unused]] const QModelIndex& source_parent) const
 {
     auto* model = qobject_cast<ResourceFolderModel*>(sourceModel());
     if (!model)
diff --git a/launcher/minec