Merge pull request #714 from Scrumplex/fix-tests

Fix mod metadata tests

launcher/Application.cpp

@@ -154,6 +154,7 @@ void appDebugOutput(QtMsgType type, const QMessageLogContext &context, const QSt
     fflush(stderr);
 }
 
+#ifdef LAUNCHER_WITH_UPDATER
 QString getIdealPlatform(QString currentPlatform) {
     auto info = Sys::getKernelInfo();
     switch(info.kernelType) {
@@ -192,6 +193,7 @@ QString getIdealPlatform(QString currentPlatform) {
     }
     return currentPlatform;
 }
+#endif
 
 }
 
@@ -754,6 +756,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         qDebug() << "<> Translations loaded.";
     }
 
+#ifdef LAUNCHER_WITH_UPDATER
     // initialize the updater
     if(BuildConfig.UPDATER_ENABLED)
     {
@@ -763,6 +766,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         m_updateChecker.reset(new UpdateChecker(m_network, channelUrl, BuildConfig.VERSION_CHANNEL, BuildConfig.VERSION_BUILD));
         qDebug() << "<> Updater started.";
     }
+#endif
 
     // Instance icons
     {
@@ -1408,7 +1412,9 @@ MainWindow* Application::showMainWindow(bool minimized)
         }
 
         m_mainWindow->checkInstancePathForProblems();
+#ifdef LAUNCHER_WITH_UPDATER
         connect(this, &Application::updateAllowedChanged, m_mainWindow, &MainWindow::updatesAllowedChanged);
+#endif
         connect(m_mainWindow, &MainWindow::isClosing, this, &Application::on_windowClose);
         m_openWindows++;
     }

launcher/Application.h

@@ -42,7 +42,10 @@
 #include <QIcon>
 #include <QDateTime>
 #include <QUrl>
+
+#ifdef LAUNCHER_WITH_UPDATER
 #include <updater/GoUpdate.h>
+#endif
 
 #include <BaseInstance.h>
 

launcher/CMakeLists.txt

@@ -156,27 +156,29 @@ set(LAUNCH_SOURCES
     launch/LogModel.h
 )
 
-# Old update system
+if (Launcher_UPDATER_BASE)
-set(UPDATE_SOURCES
+    set(Launcher_APP_BINARY_DEFS "-DLAUNCHER_WITH_UPDATER ${Launcher_APP_BINARY_DEFS}")
-    updater/GoUpdate.h
+    # Old update system
-    updater/GoUpdate.cpp
+    set(UPDATE_SOURCES
-    updater/UpdateChecker.h
+        updater/GoUpdate.h
-    updater/UpdateChecker.cpp
+        updater/GoUpdate.cpp
-    updater/DownloadTask.h
+        updater/UpdateChecker.h
-    updater/DownloadTask.cpp
+        updater/UpdateChecker.cpp
-)
+        updater/DownloadTask.h
-
+        updater/DownloadTask.cpp
-add_unit_test(UpdateChecker
-    SOURCES updater/UpdateChecker_test.cpp
-    LIBS Launcher_logic
-    DATA updater/testdata
     )
 
-add_unit_test(DownloadTask
+    add_unit_test(UpdateChecker
-    SOURCES updater/DownloadTask_test.cpp
+        SOURCES updater/UpdateChecker_test.cpp
-    LIBS Launcher_logic
+        LIBS Launcher_logic
-    DATA updater/testdata
+        DATA updater/testdata
     )
+    add_unit_test(DownloadTask
+        SOURCES updater/DownloadTask_test.cpp
+        LIBS Launcher_logic
+        DATA updater/testdata
+    )
+endif()
 
 # Backend for the news bar... there's usually no news.
 set(NEWS_SOURCES

launcher/ModDownloadTask.cpp

@@ -2,6 +2,7 @@
 /*
 *  PolyMC - Minecraft Launcher
 *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -21,12 +22,14 @@
 #include "Application.h"
 #include "minecraft/mod/ModFolderModel.h"
 
-ModDownloadTask::ModDownloadTask(ModPlatform::IndexedPack mod, ModPlatform::IndexedVersion version, const std::shared_ptr<ModFolderModel> mods)
+ModDownloadTask::ModDownloadTask(ModPlatform::IndexedPack mod, ModPlatform::IndexedVersion version, const std::shared_ptr<ModFolderModel> mods, bool is_indexed)
     : m_mod(mod), m_mod_version(version), mods(mods)
 {
-    m_update_task.reset(new LocalModUpdateTask(mods->indexDir(), m_mod, m_mod_version));
+    if (is_indexed) {
+        m_update_task.reset(new LocalModUpdateTask(mods->indexDir(), m_mod, m_mod_version));
 
-    addTask(m_update_task);
+        addTask(m_update_task);
+    }
 
     m_filesNetJob.reset(new NetJob(tr("Mod download"), APPLICATION->network()));
     m_filesNetJob->setStatus(tr("Downloading mod:\n%1").arg(m_mod_version.downloadUrl));

launcher/ModDownloadTask.h

@@ -2,6 +2,7 @@
 /*
 *  PolyMC - Minecraft Launcher
 *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -29,7 +30,7 @@ class ModFolderModel;
 class ModDownloadTask : public SequentialTask {
     Q_OBJECT
 public:
-    explicit ModDownloadTask(ModPlatform::IndexedPack mod, ModPlatform::IndexedVersion version, const std::shared_ptr<ModFolderModel> mods);
+    explicit ModDownloadTask(ModPlatform::IndexedPack mod, ModPlatform::IndexedVersion version, const std::shared_ptr<ModFolderModel> mods, bool is_indexed);
     const QString& getFilename() const { return m_mod_version.fileName; }
 
 private:

launcher/minecraft/MinecraftInstance.cpp

@@ -1015,7 +1015,8 @@ std::shared_ptr<ModFolderModel> MinecraftInstance::loaderModList() const
 {
     if (!m_loader_mod_list)
     {
-        m_loader_mod_list.reset(new ModFolderModel(modsRoot()));
+        bool is_indexed = !APPLICATION->settings()->get("ModMetadataDisabled").toBool();
+        m_loader_mod_list.reset(new ModFolderModel(modsRoot(), is_indexed));
         m_loader_mod_list->disableInteraction(isRunning());
         connect(this, &BaseInstance::runningStatusChanged, m_loader_mod_list.get(), &ModFolderModel::disableInteraction);
     }
@@ -1026,7 +1027,8 @@ std::shared_ptr<ModFolderModel> MinecraftInstance::coreModList() const
 {
     if (!m_core_mod_list)
     {
-        m_core_mod_list.reset(new ModFolderModel(coreModsDir()));
+        bool is_indexed = !APPLICATION->settings()->get("ModMetadataDisabled").toBool();
+        m_core_mod_list.reset(new ModFolderModel(coreModsDir(), is_indexed));
         m_core_mod_list->disableInteraction(isRunning());
         connect(this, &BaseInstance::runningStatusChanged, m_core_mod_list.get(), &ModFolderModel::disableInteraction);
     }

launcher/minecraft/launch/LauncherPartLaunch.cpp

@@ -1,21 +1,42 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *  This program is free software: you can redistribute it and/or modify
- * you may not use this file except in compliance with the License.
+ *  it under the terms of the GNU General Public License as published by
- * You may obtain a copy of the License at
+ *  the Free Software Foundation, version 3.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
+ *  You should have received a copy of the GNU General Public License
- * distributed under the License is distributed on an "AS IS" BASIS,
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
- * See the License for the specific language governing permissions and
+ * This file incorporates work covered by the following copyright and
- * limitations under the License.
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 #include "LauncherPartLaunch.h"
 
 #include <QStandardPaths>
+#include <QRegularExpression>
 
 #include "launch/LaunchTask.h"
 #include "minecraft/MinecraftInstance.h"

launcher/minecraft/mod/Mod.cpp

@@ -2,6 +2,7 @@
 /*
 *  PolyMC - Minecraft Launcher
 *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -165,7 +166,7 @@ auto Mod::destroy(QDir& index_dir) -> bool
 {
     auto n = name();
     // FIXME: This can fail to remove the metadata if the
-    // "DontUseModMetadata" setting is on, since there could
+    // "ModMetadataDisabled" setting is on, since there could
     // be a name mismatch!
     Metadata::remove(index_dir, n);
 

launcher/minecraft/mod/ModFolderModel.cpp

@@ -1,17 +1,38 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
- *
+/*
- * Licensed under the Apache License, Version 2.0 (the "License");
+*  PolyMC - Minecraft Launcher
- * you may not use this file except in compliance with the License.
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
- * You may obtain a copy of the License at
+*  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *
+*
- *     http://www.apache.org/licenses/LICENSE-2.0
+*  This program is free software: you can redistribute it and/or modify
- *
+*  it under the terms of the GNU General Public License as published by
- * Unless required by applicable law or agreed to in writing, software
+*  the Free Software Foundation, version 3.
- * distributed under the License is distributed on an "AS IS" BASIS,
+*
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  This program is distributed in the hope that it will be useful,
- * See the License for the specific language governing permissions and
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
- * limitations under the License.
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- */
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*
+* This file incorporates work covered by the following copyright and
+* permission notice:
+*
+*      Copyright 2013-2021 MultiMC Contributors
+*
+*      Licensed under the Apache License, Version 2.0 (the "License");
+*      you may not use this file except in compliance with the License.
+*      You may obtain a copy of the License at
+*
+*          http://www.apache.org/licenses/LICENSE-2.0
+*
+*      Unless required by applicable law or agreed to in writing, software
+*      distributed under the License is distributed on an "AS IS" BASIS,
+*      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*      See the License for the specific language governing permissions and
+*      limitations under the License.
+*/
 
 #include "ModFolderModel.h"
 
@@ -28,7 +49,7 @@
 #include "minecraft/mod/tasks/LocalModParseTask.h"
 #include "minecraft/mod/tasks/ModFolderLoadTask.h"
 
-ModFolderModel::ModFolderModel(const QString &dir) : QAbstractListModel(), m_dir(dir)
+ModFolderModel::ModFolderModel(const QString &dir, bool is_indexed) : QAbstractListModel(), m_dir(dir), m_is_indexed(is_indexed)
 {
     FS::ensureFolderPathExists(m_dir.absolutePath());
     m_dir.setFilter(QDir::Readable | QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs);
@@ -82,7 +103,7 @@ bool ModFolderModel::update()
     }
 
     auto index_dir = indexDir();
-    auto task = new ModFolderLoadTask(dir(), index_dir);
+    auto task = new ModFolderLoadTask(dir(), index_dir, m_is_indexed);
 
     m_update = task->result();
 

launcher/minecraft/mod/ModFolderModel.h

@@ -1,17 +1,38 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
- *
+/*
- * Licensed under the Apache License, Version 2.0 (the "License");
+*  PolyMC - Minecraft Launcher
- * you may not use this file except in compliance with the License.
+*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
- * You may obtain a copy of the License at
+*  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *
+*
- *     http://www.apache.org/licenses/LICENSE-2.0
+*  This program is free software: you can redistribute it and/or modify
- *
+*  it under the terms of the GNU General Public License as published by
- * Unless required by applicable law or agreed to in writing, software
+*  the Free Software Foundation, version 3.
- * distributed under the License is distributed on an "AS IS" BASIS,
+*
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  This program is distributed in the hope that it will be useful,
- * See the License for the specific language governing permissions and
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
- * limitations under the License.
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- */
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*
+* This file incorporates work covered by the following copyright and
+* permission notice:
+*
+*      Copyright 2013-2021 MultiMC Contributors
+*
+*      Licensed under the Apache License, Version 2.0 (the "License");
+*      you may not use this file except in compliance with the License.
+*      You may obtain a copy of the License at
+*
+*          http://www.apache.org/licenses/LICENSE-2.0
+*
+*      Unless required by applicable law or agreed to in writing, software
+*      distributed under the License is distributed on an "AS IS" BASIS,
+*      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*      See the License for the specific language governing permissions and
+*      limitations under the License.
+*/
 
 #pragma once
 
@@ -52,7 +73,7 @@ public:
         Enable,
         Toggle
     };
-    ModFolderModel(const QString &dir);
+    ModFolderModel(const QString &dir, bool is_indexed = false);
 
     virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
@@ -146,6 +167,7 @@ protected:
     bool scheduled_update = false;
     bool interaction_disabled = false;
     QDir m_dir;
+    bool m_is_indexed;
     QMap<QString, int> modsIndex;
     QMap<int, LocalModParseTask::ResultPtr> activeTickets;
     int nextResolutionTicket = 0;

launcher/minecraft/mod/ModFolderModel_test.cpp

@@ -1,3 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+*
+*  This program is free software: you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation, version 3.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*
+* This file incorporates work covered by the following copyright and
+* permission notice:
+*
+*      Copyright 2013-2021 MultiMC Contributors
+*
+*      Licensed under the Apache License, Version 2.0 (the "License");
+*      you may not use this file except in compliance with the License.
+*      You may obtain a copy of the License at
+*
+*          http://www.apache.org/licenses/LICENSE-2.0
+*
+*      Unless required by applicable law or agreed to in writing, software
+*      distributed under the License is distributed on an "AS IS" BASIS,
+*      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*      See the License for the specific language governing permissions and
+*      limitations under the License.
+*/
 
 #include <QTest>
 #include <QTemporaryDir>
@@ -32,8 +66,11 @@ slots:
         {
             QString folder = source;
             QTemporaryDir tempDir;
-            ModFolderModel m(tempDir.path());
+            QEventLoop loop;
+            ModFolderModel m(tempDir.path(), true);
+            connect(&m, &ModFolderModel::updateFinished, &loop, &QEventLoop::quit);
             m.installMod(folder);
+            loop.exec();
             verify(tempDir.path());
         }
 
@@ -41,8 +78,11 @@ slots:
         {
             QString folder = source + '/';
             QTemporaryDir tempDir;
-            ModFolderModel m(tempDir.path());
+            QEventLoop loop;
+            ModFolderModel m(tempDir.path(), true);
+            connect(&m, &ModFolderModel::updateFinished, &loop, &QEventLoop::quit);
             m.installMod(folder);
+            loop.exec();
             verify(tempDir.path());
         }
     }

launcher/minecraft/mod/ResourcePackFolderModel.cpp

@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+*
+*  This program is free software: you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation, version 3.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*
+* This file incorporates work covered by the following copyright and
+* permission notice:
+*
+*      Copyright 2013-2021 MultiMC Contributors
+*
+*      Licensed under the Apache License, Version 2.0 (the "License");
+*      you may not use this file except in compliance with the License.
+*      You may obtain a copy of the License at
+*
+*          http://www.apache.org/licenses/LICENSE-2.0
+*
+*      Unless required by applicable law or agreed to in writing, software
+*      distributed under the License is distributed on an "AS IS" BASIS,
+*      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*      See the License for the specific language governing permissions and
+*      limitations under the License.
+*/
+
 #include "ResourcePackFolderModel.h"
 
 ResourcePackFolderModel::ResourcePackFolderModel(const QString &dir) : ModFolderModel(dir) {

launcher/minecraft/mod/TexturePackFolderModel.cpp

@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  PolyMC - Minecraft Launcher
+*  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+*
+*  This program is free software: you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation, version 3.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*
+* This file incorporates work covered by the following copyright and
+* permission notice:
+*
+*      Copyright 2013-2021 MultiMC Contributors
+*
+*      Licensed under the Apache License, Version 2.0 (the "License");
+*      you may not use this file except in compliance with the License.
+*      You may obtain a copy of the License at
+*
+*          http://www.apache.org/licenses/LICENSE-2.0
+*
+*      Unless required by applicable law or agreed to in writing, software
+*      distributed under the License is distributed on an "AS IS" BASIS,
+*      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*      See the License for the specific language governing permissions and
+*      limitations under the License.
+*/
+
 #include "TexturePackFolderModel.h"
 
 TexturePackFolderModel::TexturePackFolderModel(const QString &dir) : ModFolderModel(dir) {

launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp

@@ -2,6 +2,7 @@
 /*
 *  PolyMC - Minecraft Launcher
 *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -35,11 +36,6 @@ void LocalModUpdateTask::executeTask()
 {
     setStatus(tr("Updating index for mod:\n%1").arg(m_mod.name));
 
-    if(APPLICATION->settings()->get("DontUseModMetadata").toBool()){
-        emitSucceeded();
-        return;
-    }
-
     auto pw_mod = Metadata::create(m_index_dir, m_mod, m_mod_version);
     Metadata::update(m_index_dir, pw_mod);
 

launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp

@@ -2,6 +2,7 @@
 /*
 *  PolyMC - Minecraft Launcher
 *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -38,13 +39,13 @@
 #include "Application.h"
 #include "minecraft/mod/MetadataHandler.h"
 
-ModFolderLoadTask::ModFolderLoadTask(QDir& mods_dir, QDir& index_dir) 
+ModFolderLoadTask::ModFolderLoadTask(QDir& mods_dir, QDir& index_dir, bool is_indexed) 
-    : m_mods_dir(mods_dir), m_index_dir(index_dir), m_result(new Result())
+    : m_mods_dir(mods_dir), m_index_dir(index_dir), m_is_indexed(is_indexed), m_result(new Result())
 {}
 
 void ModFolderLoadTask::run()
 {
-    if (!APPLICATION->settings()->get("ModMetadataDisabled").toBool()) {
+    if (m_is_indexed) {
         // Read metadata first
         getFromMetadata();
     }

launcher/minecraft/mod/tasks/ModFolderLoadTask.h

@@ -2,6 +2,7 @@
 /*
 *  PolyMC - Minecraft Launcher
 *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+*  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
 *
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -55,7 +56,7 @@ public:
     }
 
 public:
-    ModFolderLoadTask(QDir& mods_dir, QDir& index_dir);
+    ModFolderLoadTask(QDir& mods_dir, QDir& index_dir, bool is_indexed);
     void run();
 signals:
     void succeeded();
@@ -65,5 +66,6 @@ private:
 
 private:
     QDir& m_mods_dir, m_index_dir;
+    bool m_is_indexed;
     ResultPtr m_result;
 };

launcher/modplatform/packwiz/Packwiz_test.cpp

@@ -1,20 +1,21 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
-*  PolyMC - Minecraft Launcher
+ *  PolyMC - Minecraft Launcher
-*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
-*
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
-*  This program is free software: you can redistribute it and/or modify
+ *
-*  it under the terms of the GNU General Public License as published by
+ *  This program is free software: you can redistribute it and/or modify
-*  the Free Software Foundation, version 3.
+ *  it under the terms of the GNU General Public License as published by
-*
+ *  the Free Software Foundation, version 3.
-*  This program is distributed in the hope that it will be useful,
+ *
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  This program is distributed in the hope that it will be useful,
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  GNU General Public License for more details.
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*
+ *  GNU General Public License for more details.
-*  You should have received a copy of the GNU General Public License
+ *
-*  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *  You should have received a copy of the GNU General Public License
-*/
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 
 #include <QTemporaryDir>
 #include <QTest>
@@ -61,7 +62,7 @@ class PackwizTest : public QObject {
         QVERIFY(index_dir.entryList().contains(name_mod));
 
         // Try without the .pw.toml at the end
-        name_mod.chop(5);
+        name_mod.chop(8);
 
         auto metadata = Packwiz::V1::getIndexForMod(index_dir, name_mod);
 

launcher/net/PasteUpload.cpp

@@ -3,6 +3,7 @@
  *  PolyMC - Minecraft Launcher
  *  Copyright (C) 2022 Lenny McLennington <lenny@sneed.church>
  *  Copyright (C) 2022 Swirl <swurl@swurl.xyz>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -43,6 +44,8 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QFile>
+#include <QHttpPart>
+#include <QUrlQuery>
 
 std::array<PasteUpload::PasteTypeInfo, 4> PasteUpload::PasteTypes = {
     {{"0x0.st", "https://0x0.st", ""},

launcher/ui/GuiUtil.cpp

@@ -2,6 +2,7 @@
 /*
  *  PolyMC - Minecraft Launcher
  *  Copyright (C) 2022 Lenny McLennington <lenny@sneed.church>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -38,6 +39,7 @@
 #include <QClipboard>
 #include <QApplication>
 #include <QFileDialog>
+#include <QStandardPaths>
 
 #include "ui/dialogs/ProgressDialog.h"
 #include "ui/dialogs/CustomMessageBox.h"

launcher/ui/MainWindow.cpp

@@ -1,21 +1,42 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- * Authors: Andrew Okin
+ *  This program is free software: you can redistribute it and/or modify
- *          Peterix
+ *  it under the terms of the GNU General Public License as published by
- *          Orochimarufan <orochimarufan.x3@gmail.com>
+ *  the Free Software Foundation, version 3.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *  This program is distributed in the hope that it will be useful,
- * you may not use this file except in compliance with the License.
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- * You may obtain a copy of the License at
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
- * Unless required by applicable law or agreed to in writing, software
+ * This file incorporates work covered by the following copyright and
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * permission notice:
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
- * See the License for the specific language governing permissions and
+ *      Copyright 2013-2021 MultiMC Contributors
- * limitations under the License.
+ *
+ *      Authors: Andrew Okin
+ *               Peterix
+ *               Orochimarufan <orochimarufan.x3@gmail.com>
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
+
 #include "Application.h"
 #include "BuildConfig.h"
 
@@ -1010,6 +1031,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
     }
 
 
+#ifdef LAUNCHER_WITH_UPDATER
     if(BuildConfig.UPDATER_ENABLED)
     {
         bool updatesAllowed = APPLICATION->updatesAreAllowed();
@@ -1028,6 +1050,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
             updater->checkForUpdate(APPLICATION->settings()->get("UpdateChannel").toString(), false);
         }
     }
+#endif
 
     setSelectedInstanceById(APPLICATION->settings()->get("SelectedInstance").toString());
 
@@ -1337,6 +1360,7 @@ void MainWindow::repopulateAccountsMenu()
     ui->profileMenu->addAction(ui->actionManageAccounts);
 }
 
+#ifdef LAUNCHER_WITH_UPDATER
 void MainWindow::updatesAllowedChanged(bool allowed)
 {
     if(!BuildConfig.UPDATER_ENABLED)
@@ -1345,6 +1369,7 @@ void MainWindow::updatesAllowedChanged(bool allowed)
     }
     ui->actionCheckUpdate->setEnabled(allowed);
 }
+#endif
 
 /*
  * Assumes the sender is a QAction
@@ -1450,6 +1475,7 @@ void MainWindow::updateNewsLabel()
     }
 }
 
+#ifdef LAUNCHER_WITH_UPDATER
 void MainWindow::updateAvailable(GoUpdate::Status status)
 {
     if(!APPLICATION->updatesAreAllowed())
@@ -1475,6 +1501,7 @@ void MainWindow::updateNotAvailable()
     UpdateDialog dlg(false, this);
     dlg.exec();
 }
+#endif
 
 QList<int> stringToIntList(const QString &string)
 {
@@ -1496,6 +1523,7 @@ QString intListToString(const QList<int> &list)
     return slist.join(',');
 }
 
+#ifdef LAUNCHER_WITH_UPDATER
 void MainWindow::downloadUpdates(GoUpdate::Status status)
 {
     if(!APPLICATION->updatesAreAllowed())
@@ -1529,6 +1557,7 @@ void MainWindow::downloadUpdates(GoUpdate::Status status)
         CustomMessageBox::selectable(this, tr("Error"), updateTask.failReason(), QMessageBox::Warning)->show();
     }
 }
+#endif
 
 void MainWindow::onCatToggled(bool state)
 {
@@ -1841,6 +1870,7 @@ void MainWindow::on_actionConfig_Folder_triggered()
     }
 }
 
+#ifdef LAUNCHER_WITH_UPDATER
 void MainWindow::checkForUpdates()
 {
     if(BuildConfig.UPDATER_ENABLED)
@@ -1853,6 +1883,7 @@ void MainWindow::checkForUpdates()
         qWarning() << "Updater not set up. Cannot check for updates.";
     }
 }
+#endif
 
 void MainWindow::on_actionSettings_triggered()
 {

launcher/ui/MainWindow.h

@@ -1,16 +1,40 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ *  This program is free software: you can redistribute it and/or modify
- * you may not use this file except in compliance with the License.
+ *  it under the terms of the GNU General Public License as published by
- * You may obtain a copy of the License at
+ *  the Free Software Foundation, version 3.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
+ *  You should have received a copy of the GNU General Public License
- * distributed under the License is distributed on an "AS IS" BASIS,
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
- * See the License for the specific language governing permissions and
+ * This file incorporates work covered by the following copyright and
- * limitations under the License.
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Authors: Andrew Okin
+ *               Peterix
+ *               Orochimarufan <orochimarufan.x3@gmail.com>
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 #pragma once
@@ -54,7 +78,9 @@ public:
 
     void checkInstancePathForProblems();
 
+#ifdef LAUNCHER_WITH_UPDATER
     void updatesAllowedChanged(bool allowed);
+#endif
 
     void droppedURLs(QList<QUrl> urls);
 signals:
@@ -100,7 +126,9 @@ private slots:
 
     void on_actionViewCentralModsFolder_triggered();
 
+#ifdef LAUNCHER_WITH_UPDATER
     void checkForUpdates();
+#endif
 
     void on_actionSettings_triggered();
 
@@ -167,9 +195,11 @@ private slots:
 
     void startTask(Task *task);
 
+#ifdef LAUNCHER_WITH_UPDATER
     void updateAvailable(GoUpdate::Status status);
 
     void updateNotAvailable();
+#endif
 
     void defaultAccountChanged();
 
@@ -179,10 +209,12 @@ private slots:
 
     void updateNewsLabel();
 
+#ifdef LAUNCHER_WITH_UPDATER
     /*!
      * Runs the DownloadTask and installs updates.
      */
     void downloadUpdates(GoUpdate::Status status);
+#endif
 
     void konamiTriggered();
 

launcher/ui/pages/global/LanguagePage.cpp

@@ -2,6 +2,7 @@
 /*
  *  PolyMC - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

launcher/ui/pages/global/LanguagePage.h

@@ -2,6 +2,7 @@
 /*
  *  PolyMC - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

launcher/ui/pages/global/LauncherPage.cpp

@@ -78,6 +78,7 @@ LauncherPage::LauncherPage(QWidget *parent) : QWidget(parent), ui(new Ui::Launch
     m_languageModel = APPLICATION->translations();
     loadSettings();
 
+#ifdef LAUNCHER_WITH_UPDATER
     if(BuildConfig.UPDATER_ENABLED)
     {
         QObject::connect(APPLICATION->updateChecker().get(), &UpdateChecker::channelListLoaded, this, &LauncherPage::refreshUpdateChannelList);
@@ -90,11 +91,9 @@ LauncherPage::LauncherPage(QWidget *parent) : QWidget(parent), ui(new Ui::Launch
         {
             APPLICATION->updateChecker()->updateChanList(false);
         }
+        ui->updateSettingsBox->setHidden(false);
     }
-    else
+#endif
-    {
-        ui->updateSettingsBox->setHidden(true);
-    }
     connect(ui->fontSizeBox, SIGNAL(valueChanged(int)), SLOT(refreshFontPreview()));
     connect(ui->consoleFont, SIGNAL(currentFontChanged(QFont)), SLOT(refreshFontPreview()));
 }
@@ -189,6 +188,7 @@ void LauncherPage::on_metadataDisableBtn_clicked()
     ui->metadataWarningLabel->setHidden(!ui->metadataDisableBtn->isChecked());
 }
 
+#ifdef LAUNCHER_WITH_UPDATER
 void LauncherPage::refreshUpdateChannelList()
 {
     // Stop listening for selection changes. It's going to change a lot while we update it and
@@ -260,6 +260,7 @@ void LauncherPage::refreshUpdateChannelDesc()
         m_currentUpdateChannel = selected.id;
     }
 }
+#endif
 
 void LauncherPage::applySettings()
 {
@@ -450,7 +451,7 @@ void LauncherPage::loadSettings()
     }
 
     // Mods
-    ui->metadataDisableBtn->setChecked(s->get("DontUseModMetadata").toBool());
+    ui->metadataDisableBtn->setChecked(s->get("ModMetadataDisabled").toBool());
     ui->metadataWarningLabel->setHidden(!ui->metadataDisableBtn->isChecked());
 }
 

launcher/ui/pages/global/LauncherPage.h

@@ -90,6 +90,7 @@ slots:
     void on_iconsDirBrowseBtn_clicked();
     void on_metadataDisableBtn_clicked();
 
+#ifdef LAUNCHER_WITH_UPDATER
     /*!
      * Updates the list of update channels in the combo box.
      */
@@ -100,13 +101,13 @@ slots:
      */
     void refreshUpdateChannelDesc();
 
+    void updateChannelSelectionChanged(int index);
+#endif
     /*!
      * Updates the font preview
      */
     void refreshFontPreview();
 
-    void updateChannelSelectionChanged(int index);
-
 private:
     Ui::LauncherPage *ui;
 

launcher/ui/pages/global/LauncherPage.ui

@@ -50,6 +50,9 @@
          <property name="title">
           <string>Update Settings</string>
          </property>
+         <property name="visible">
+          <bool>false</bool>
+         </property>
          <layout class="QVBoxLayout" name="verticalLayout_7">
           <item>
            <widget class="QCheckBox" name="autoUpdateCheckBox">

launcher/ui/pages/instance/LogPage.cpp

@@ -2,6 +2,7 @@
 /*
  *  PolyMC - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -39,6 +40,7 @@
 #include "Application.h"
 
 #include <QIcon>
+#include <QIdentityProxyModel>
 #include <QScrollBar>
 #include <QShortcut>
 

launcher/ui/pages/instance/ModFolderPage.cpp

@@ -2,6 +2,7 @@
 /*
  *  PolyMC - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

launcher/ui/pages/instance/ModFolderPage.h

@@ -41,6 +41,7 @@
 #include "ui/pages/BasePage.h"
 
 #include <Application.h>
+#include <QSortFilterProxyModel>
 
 class ModFolderModel;
 namespace Ui

launcher/ui/pages/instance/ScreenshotsPage.cpp

@@ -2,6 +2,7 @@
 /*
  *  PolyMC - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

launcher/ui/pages/instance/ScreenshotsPage.h

@@ -35,6 +35,7 @@
 
 #pragma once
 
+#include <QItemSelection>
 #include <QMainWindow>
 
 #include "ui/pages/BasePage.h"

launcher/ui/pages/instance/ServersPage.cpp

@@ -2,6 +2,7 @@
 /*
  *  PolyMC - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -47,6 +48,7 @@
 
 #include <QFileSystemWatcher>
 #include <QMenu>
+#include <QTimer>
 
 static const int COLUMN_COUNT = 2; // 3 , TBD: latency and other nice things.
 

launcher/ui/pages/instance/WorldListPage.cpp

@@ -2,6 +2,7 @@
 /*
  *  PolyMC - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -46,6 +47,7 @@
 #include <QInputDialog>
 #include <QProcess>
 #include <Qt>
+#include <QSortFilterProxyModel>
 
 #include "tools/MCEditTool.h"
 #include "FileSystem.h"

launcher/ui/pages/modplatform/ModPage.cpp

@@ -1,4 +1,40 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
 #include "ModPage.h"
+#include "Application.h"
 #include "ui_ModPage.h"
 
 #include <QKeyEvent>
@@ -150,7 +186,8 @@ void ModPage::onModSelected()
     if (dialog->isModSelected(current.name, version.fileName)) {
         dialog->removeSelectedMod(current.name);
     } else {
-        dialog->addSelectedMod(current.name, new ModDownloadTask(current, version, dialog->mods));
+        bool is_indexed = !APPLICATION->settings()->get("ModMetadataDisabled").toBool();
+        dialog->addSelectedMod(current.name, new ModDownloadTask(current, version, dialog->mods, is_indexed));
     }
 
     updateSelectionButton();

launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp

@@ -1,3 +1,38 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
 #include "ListModel.h"
 #include "Application.h"
 
@@ -11,6 +46,8 @@
 
 #include <BuildConfig.h>
 
+#include <net/NetJob.h>
+
 namespace LegacyFTB {
 
 FilterModel::FilterModel(QObject *parent) : QSortFilterProxyModel(parent)

launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp

@@ -2,6 +2,7 @@
 /*
  *  PolyMC - Minecraft Launcher
  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

launcher/ui/pages/modplatform/modrinth/ModrinthModel.h

@@ -39,6 +39,7 @@
 
 #include "modplatform/modrinth/ModrinthPackManifest.h"
 #include "ui/pages/modplatform/modrinth/ModrinthPage.h"
+#include "net/NetJob.h"
 
 class ModPage;
 class Version;