From 778baa6dbe9a7710b86771262bbe435bdd6ee574 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 4 Jun 2022 11:59:12 +0200
Subject: fix: always store InstanceType

---
 launcher/minecraft/MinecraftInstance.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'launcher/minecraft')

diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 61326fac..9ec4c17a 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -168,6 +168,8 @@ MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsO
     m_settings->registerOverride(globalSettings->getSetting("CloseAfterLaunch"), miscellaneousOverride);
     m_settings->registerOverride(globalSettings->getSetting("QuitAfterGameStop"), miscellaneousOverride);
 
+    m_settings->set("InstanceType", "OneSix");
+
     m_components.reset(new PackProfile(this));
 }
 
-- 
cgit 


From c2a43c6f40d4fd24b5d7e237d13befec17fb3e6b Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Sat, 4 Jun 2022 11:01:10 -0300
Subject: fix: hide .index folder on Windows

---
 launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'launcher/minecraft')

diff --git a/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp b/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
index cbe16567..a3fcd9d9 100644
--- a/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
@@ -22,6 +22,10 @@
 #include "FileSystem.h"
 #include "minecraft/mod/MetadataHandler.h"
 
+#ifdef Q_OS_WIN32
+#include <windows.h>
+#endif
+
 LocalModUpdateTask::LocalModUpdateTask(QDir index_dir, ModPlatform::IndexedPack& mod, ModPlatform::IndexedVersion& mod_version)
     : m_index_dir(index_dir), m_mod(mod), m_mod_version(mod_version)
 {
@@ -29,6 +33,10 @@ LocalModUpdateTask::LocalModUpdateTask(QDir index_dir, ModPlatform::IndexedPack&
     if (!FS::ensureFolderPathExists(index_dir.path())) {
         emitFailed(QString("Unable to create index for mod %1!").arg(m_mod.name));
     }
+
+#ifdef Q_OS_WIN32
+    SetFileAttributesA(index_dir.path().toStdString().c_str(), FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED);
+#endif
 }
 
 void LocalModUpdateTask::executeTask()
-- 
cgit 


From 8856c8cd62fe3f45faf1020e70fa3dc503eb3453 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 4 Jun 2022 15:30:34 +0200
Subject: refactor(test): fix loading mod metadata setting

---
 launcher/minecraft/MinecraftInstance.cpp            | 6 ++++--
 launcher/minecraft/mod/Mod.cpp                      | 2 +-
 launcher/minecraft/mod/ModFolderModel.cpp           | 4 ++--
 launcher/minecraft/mod/ModFolderModel.h             | 3 ++-
 launcher/minecraft/mod/ModFolderModel_test.cpp      | 4 ++--
 launcher/minecraft/mod/ResourcePackFolderModel.cpp  | 2 +-
 launcher/minecraft/mod/TexturePackFolderModel.cpp   | 2 +-
 launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp | 5 -----
 launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp  | 6 +++---
 launcher/minecraft/mod/tasks/ModFolderLoadTask.h    | 3 ++-
 10 files changed, 18 insertions(+), 19 deletions(-)

(limited to 'launcher/minecraft')

diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index e99d30fe..7e72601f 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/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);
     }
diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index 71a32d32..ff855230 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -161,7 +161,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);
 
diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index b2d8f03e..bb52bbe4 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -28,7 +28,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 +82,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();
 
diff --git a/launcher/minecraft/mod/ModFolderModel.h b/launcher/minecraft/mod/ModFolderModel.h
index 10a72691..efec2f3f 100644
--- a/launcher/minecraft/mod/ModFolderModel.h
+++ b/launcher/minecraft/mod/ModFolderModel.h
@@ -52,7 +52,7 @@ public:
         Enable,
         Toggle
     };
-    ModFolderModel(const QString &dir);
+    ModFolderModel(const QString &dir, bool is_indexed);
 
     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 +146,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;
diff --git a/launcher/minecraft/mod/ModFolderModel_test.cpp b/launcher/minecraft/mod/ModFolderModel_test.cpp
index 76f16ed5..429d82b3 100644
--- a/launcher/minecraft/mod/ModFolderModel_test.cpp
+++ b/launcher/minecraft/mod/ModFolderModel_test.cpp
@@ -32,7 +32,7 @@ slots:
         {
             QString folder = source;
             QTemporaryDir tempDir;
-            ModFolderModel m(tempDir.path());
+            ModFolderModel m(tempDir.path(), true);
             m.installMod(folder);
             verify(tempDir.path());
         }
@@ -41,7 +41,7 @@ slots:
         {
             QString folder = source + '/';
             QTemporaryDir tempDir;
-            ModFolderModel m(tempDir.path());
+            ModFolderModel m(tempDir.path(), true);
             m.installMod(folder);
             verify(tempDir.path());
         }
diff --git a/launcher/minecraft/mod/ResourcePackFolderModel.cpp b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
index f3d7f566..35d179ee 100644
--- a/launcher/minecraft/mod/ResourcePackFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
@@ -1,6 +1,6 @@
 #include "ResourcePackFolderModel.h"
 
-ResourcePackFolderModel::ResourcePackFolderModel(const QString &dir) : ModFolderModel(dir) {
+ResourcePackFolderModel::ResourcePackFolderModel(const QString &dir) : ModFolderModel(dir, false) {
 }
 
 QVariant ResourcePackFolderModel::headerData(int section, Qt::Orientation orientation, int role) const {
diff --git a/launcher/minecraft/mod/TexturePackFolderModel.cpp b/launcher/minecraft/mod/TexturePackFolderModel.cpp
index d5956da1..96fea33e 100644
--- a/launcher/minecraft/mod/TexturePackFolderModel.cpp
+++ b/launcher/minecraft/mod/TexturePackFolderModel.cpp
@@ -1,6 +1,6 @@
 #include "TexturePackFolderModel.h"
 
-TexturePackFolderModel::TexturePackFolderModel(const QString &dir) : ModFolderModel(dir) {
+TexturePackFolderModel::TexturePackFolderModel(const QString &dir) : ModFolderModel(dir, false) {
 }
 
 QVariant TexturePackFolderModel::headerData(int section, Qt::Orientation orientation, int role) const {
diff --git a/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp b/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
index cbe16567..b8170003 100644
--- a/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
@@ -35,11 +35,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);
 
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index 62d856f6..285225a0 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -38,13 +38,13 @@
 #include "Application.h"
 #include "minecraft/mod/MetadataHandler.h"
 
-ModFolderLoadTask::ModFolderLoadTask(QDir& mods_dir, QDir& index_dir) 
-    : m_mods_dir(mods_dir), m_index_dir(index_dir), m_result(new Result())
+ModFolderLoadTask::ModFolderLoadTask(QDir& mods_dir, QDir& index_dir, bool is_indexed) 
+    : 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();
     }
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.h b/launcher/minecraft/mod/tasks/ModFolderLoadTask.h
index 89a0f84e..bc162f43 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.h
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.h
@@ -55,7 +55,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 +65,6 @@ private:
 
 private:
     QDir& m_mods_dir, m_index_dir;
+    bool m_is_indexed;
     ResultPtr m_result;
 };
-- 
cgit 


From 32217a774f9902d3d523e7b7985bbe22060d0451 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 12 Jun 2022 12:39:04 +0200
Subject: fix(tests): wait until ModFolderModel has updated

---
 launcher/minecraft/mod/ModFolderModel_test.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'launcher/minecraft')

diff --git a/launcher/minecraft/mod/ModFolderModel_test.cpp b/launcher/minecraft/mod/ModFolderModel_test.cpp
index 429d82b3..21e905f4 100644
--- a/launcher/minecraft/mod/ModFolderModel_test.cpp
+++ b/launcher/minecraft/mod/ModFolderModel_test.cpp
@@ -32,8 +32,11 @@ slots:
         {
             QString folder = source;
             QTemporaryDir tempDir;
+            QEventLoop loop;
             ModFolderModel m(tempDir.path(), true);
+            connect(&m, &ModFolderModel::updateFinished, &loop, &QEventLoop::quit);
             m.installMod(folder);
+            loop.exec();
             verify(tempDir.path());
         }
 
@@ -41,8 +44,11 @@ slots:
         {
             QString folder = source + '/';
             QTemporaryDir tempDir;
+            QEventLoop loop;
             ModFolderModel m(tempDir.path(), true);
+            connect(&m, &ModFolderModel::updateFinished, &loop, &QEventLoop::quit);
             m.installMod(folder);
+            loop.exec();
             verify(tempDir.path());
         }
     }
-- 
cgit 


From 2ff0aa09e35eb6910ef0a030ea41f84a1ed95782 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 12 Jun 2022 12:22:48 +0200
Subject: fix: remove updater if it is not used

---
 launcher/minecraft/launch/LauncherPartLaunch.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'launcher/minecraft')

diff --git a/launcher/minecraft/launch/LauncherPartLaunch.cpp b/launcher/minecraft/launch/LauncherPartLaunch.cpp
index d7010355..d6fc11e7 100644
--- a/launcher/minecraft/launch/LauncherPartLaunch.cpp
+++ b/launcher/minecraft/launch/LauncherPartLaunch.cpp
@@ -16,6 +16,7 @@
 #include "LauncherPartLaunch.h"
 
 #include <QStandardPaths>
+#include <QRegularExpression>
 
 #include "launch/LaunchTask.h"
 #include "minecraft/MinecraftInstance.h"
-- 
cgit 


From a4ef0940ed76d646db1b1be1224da2baab4be9e2 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 12 Jun 2022 13:50:58 +0200
Subject: chore: add license headers

---
 launcher/minecraft/launch/LauncherPartLaunch.cpp   | 40 +++++++++++++-----
 launcher/minecraft/mod/Mod.cpp                     |  1 +
 launcher/minecraft/mod/ModFolderModel.cpp          | 49 +++++++++++++++-------
 launcher/minecraft/mod/ModFolderModel.h            | 49 +++++++++++++++-------
 launcher/minecraft/mod/ModFolderModel_test.cpp     | 34 +++++++++++++++
 launcher/minecraft/mod/ResourcePackFolderModel.cpp | 35 ++++++++++++++++
 launcher/minecraft/mod/TexturePackFolderModel.cpp  | 35 ++++++++++++++++
 .../minecraft/mod/tasks/LocalModUpdateTask.cpp     |  1 +
 launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp |  1 +
 launcher/minecraft/mod/tasks/ModFolderLoadTask.h   |  1 +
 10 files changed, 208 insertions(+), 38 deletions(-)

(limited to 'launcher/minecraft')

diff --git a/launcher/minecraft/launch/LauncherPartLaunch.cpp b/launcher/minecraft/launch/LauncherPartLaunch.cpp
index d6fc11e7..427bc32b 100644
--- a/launcher/minecraft/launch/LauncherPartLaunch.cpp
+++ b/launcher/minecraft/launch/LauncherPartLaunch.cpp
@@ -1,16 +1,36 @@
-/* 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");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  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.
  *
- *     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
- * 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.
+ *  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 "LauncherPartLaunch.h"
diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index ff855230..a85aecfb 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/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
diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index bb52bbe4..ded2d3a2 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -1,17 +1,38 @@
-/* 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.
- */
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  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
+*  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 "ModFolderModel.h"
 
diff --git a/launcher/minecraft/mod/ModFolderModel.h b/launcher/minecraft/mod/ModFolderModel.h
index efec2f3f..fcedae96 100644
--- a/launcher/minecraft/mod/ModFolderModel.h
+++ b/launcher/minecraft/mod/ModFolderModel.h
@@ -1,17 +1,38 @@
-/* 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.
- */
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+*  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
+*  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.
+*/
 
 #pragma once
 
diff --git a/launcher/minecraft/mod/ModFolderModel_test.cpp b/launcher/minecraft/mod/ModFolderModel_test.cpp
index 21e905f4..34a3b83a 100644
--- a/launcher/minecraft/mod/ModFolderModel_test.cpp
+++ b/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>
diff --git a/launcher/minecraft/mod/ResourcePackFolderModel.cpp b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
index 35d179ee..fb1f1d29 100644
--- a/launcher/minecraft/mod/ResourcePackFolderModel.cpp
+++ b/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, false) {
diff --git a/launcher/minecraft/mod/TexturePackFolderModel.cpp b/launcher/minecraft/mod/TexturePackFolderModel.cpp
index 96fea33e..644dfd77 100644
--- a/launcher/minecraft/mod/TexturePackFolderModel.cpp
+++ b/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, false) {
diff --git a/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp b/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
index b8170003..018bc6e3 100644
--- a/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
+++ b/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
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index 285225a0..af67d305 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/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
diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.h b/launcher/minecraft/mod/tasks/ModFolderLoadTask.h
index bc162f43..088f873e 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.h
+++ b/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
-- 
cgit 


From 40ccd1a46910012f80285f7b6982a5919e2a9dcf Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Sat, 4 Jun 2022 23:11:25 -0300
Subject: fix: handling of incomplete mods

(i.e. mods without ModDetails that may have metadata)
---
 launcher/minecraft/mod/Mod.cpp | 44 ++++++++++++++++++++++++++++++------------
 launcher/minecraft/mod/Mod.h   |  8 ++++++--
 2 files changed, 38 insertions(+), 14 deletions(-)

(limited to 'launcher/minecraft')

diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp
index 71a32d32..39c7efd8 100644
--- a/launcher/minecraft/mod/Mod.cpp
+++ b/launcher/minecraft/mod/Mod.cpp
@@ -58,8 +58,6 @@ Mod::Mod(const QFileInfo& file)
 
 Mod::Mod(const QDir& mods_dir, const Metadata::ModStruct& metadata)
     : m_file(mods_dir.absoluteFilePath(metadata.filename))
-    // It is weird, but name is not reliable for comparing with the JAR files name
-    // FIXME: Maybe use hash when implemented?
     , m_internal_id(metadata.filename)
     , m_name(metadata.name)
 {
@@ -131,7 +129,7 @@ auto Mod::enable(bool value) -> bool
             return false;
     } else {
         path += ".disabled";
-        
+
         if (!file.rename(path))
             return false;
     }
@@ -145,16 +143,22 @@ auto Mod::enable(bool value) -> bool
 
 void Mod::setStatus(ModStatus status)
 {
-    if(m_localDetails.get())
+    if (m_localDetails) {
         m_localDetails->status = status;
+    } else {
+        m_temp_status = status;
+    }
 }
 void Mod::setMetadata(Metadata::ModStruct* metadata)
 {
-    if(status() == ModStatus::NoMetadata)
+    if (status() == ModStatus::NoMetadata)
         setStatus(ModStatus::Installed);
 
-    if(m_localDetails.get())
+    if (m_localDetails) {
         m_localDetails->metadata.reset(metadata);
+    } else {
+        m_temp_metadata.reset(metadata);
+    }
 }
 
 auto Mod::destroy(QDir& index_dir) -> bool
@@ -205,20 +209,36 @@ auto Mod::authors() const -> QStringList
 
 auto Mod::status() const -> ModStatus
 {
+    if (!m_localDetails)
+        return m_temp_status;
     return details().status;
 }
 
+auto Mod::metadata() -> std::shared_ptr<Metadata::ModStruct>
+{
+    if (m_localDetails)
+        return m_localDetails->metadata;
+    return m_temp_metadata;
+}
+
+auto Mod::metadata() const -> const std::shared_ptr<Metadata::ModStruct>
+{
+    if (m_localDetails)
+        return m_localDetails->metadata;
+    return m_temp_metadata;
+}
+
 void Mod::finishResolvingWithDetails(std::shared_ptr<ModDetails> details)
 {
     m_resolving = false;
     m_resolved = true;
     m_localDetails = details;
 
-    if (status() != ModStatus::NoMetadata 
-            && m_temp_metadata.get()
-            && m_temp_metadata->isValid() && 
-            m_localDetails.get()) {
-        
-        m_localDetails->metadata.swap(m_temp_metadata);
+    if (m_localDetails && m_temp_metadata && m_temp_metadata->isValid()) {
+        m_localDetails->metadata = m_temp_metadata;
+        if (status() == ModStatus::NoMetadata)
+            setStatus(ModStatus::Installed);
     }
+
+    setStatus(m_temp_status);
 }
diff --git a/launcher/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h
index 96d471b4..5f9c4684 100644
--- a/launcher/minecraft/mod/Mod.h
+++ b/launcher/minecraft/mod/Mod.h
@@ -73,8 +73,8 @@ public:
     auto authors()     const -> QStringList;
     auto status()      const -> ModStatus;
 
-    auto metadata() const -> const std::shared_ptr<Metadata::ModStruct> { return details().metadata; };
-    auto metadata() -> std::shared_ptr<Metadata::ModStruct> { return m_localDetails->metadata; };
+    auto metadata() -> std::shared_ptr<Metadata::ModStruct>;
+    auto metadata() const -> const std::shared_ptr<Metadata::ModStruct>;
 
     void setStatus(ModStatus status);
     void setMetadata(Metadata::ModStruct* metadata);
@@ -109,6 +109,10 @@ protected:
     /* If the mod has metadata, this will be filled in the constructor, and passed to 
      * the ModDetails when calling finishResolvingWithDetails */
     std::shared_ptr<Metadata::ModStruct> m_temp_metadata;
+
+    /* Set the mod status while it doesn't have local details just yet */
+    ModStatus m_temp_status = ModStatus::NotInstalled;
+
     std::shared_ptr<ModDetails> m_localDetails;
 
     bool m_enabled = true;
-- 
cgit 


From 9f1f37e78023d66ce01481c05fa73db9eba0882a Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Tue, 7 Jun 2022 22:32:13 -0300
Subject: fix: correctly handle disabled mods with metadata

im stupid
---
 launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp | 29 ++++++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

(limited to 'launcher/minecraft')

diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index 62d856f6..bde32b3e 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -53,12 +53,31 @@ void ModFolderLoadTask::run()
     m_mods_dir.refresh();
     for (auto entry : m_mods_dir.entryInfoList()) {
         Mod mod(entry);
-        if(m_result->mods.contains(mod.internal_id())){
-            m_result->mods[mod.internal_id()].setStatus(ModStatus::Installed);
+
+        if (mod.enabled()) {
+            if (m_result->mods.contains(mod.internal_id())) {
+                m_result->mods[mod.internal_id()].setStatus(ModStatus::Installed);
+            }
+            else {
+                m_result->mods[mod.internal_id()] = mod;
+                m_result->mods[mod.internal_id()].setStatus(ModStatus::NoMetadata);
+            }
         }
-        else {
-            m_result->mods[mod.internal_id()] = mod;
-            m_result->mods[mod.internal_id()].setStatus(ModStatus::NoMetadata);
+        else { 
+            QString chopped_id = mod.internal_id().chopped(9);
+            if (m_result->mods.contains(chopped_id)) {
+                m_result->mods[mod.internal_id()] = mod;
+
+                auto metadata = m_result->mods[chopped_id].metadata();
+                mod.setMetadata(new Metadata::ModStruct(*metadata));
+
+                m_result->mods[mod.internal_id()].setStatus(ModStatus::Installed);
+                m_result->mods.remove(chopped_id);
+            }
+            else {
+                m_result->mods[mod.internal_id()] = mod;
+                m_result->mods[mod.internal_id()].setStatus(ModStatus::NoMetadata);
+            }
         }
     }
 
-- 
cgit 


From 4448418b63715bc64acbb19bd75bedf725cb4165 Mon Sep 17 00:00:00 2001
From: flow <flowlnlnln@gmail.com>
Date: Sun, 12 Jun 2022 09:44:03 -0300
Subject: fix: segfault when the same mod is present enabled and disabled at
 once

This maintains the previous behaviour
---
 launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'launcher/minecraft')

diff --git a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index bde32b3e..80242fef 100644
--- a/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
@@ -69,10 +69,12 @@ void ModFolderLoadTask::run()
                 m_result->mods[mod.internal_id()] = mod;
 
                 auto metadata = m_result->mods[chopped_id].metadata();
-                mod.setMetadata(new Metadata::ModStruct(*metadata));
+                if (metadata) {
+                    mod.setMetadata(new Metadata::ModStruct(*metadata));
 
-                m_result->mods[mod.internal_id()].setStatus(ModStatus::Installed);
-                m_result->mods.remove(chopped_id);
+                    m_result->mods[mod.internal_id()].setStatus(ModStatus::Installed);
+                    m_result->mods.remove(chopped_id);
+                }
             }
             else {
                 m_result->mods[mod.internal_id()] = mod;
-- 
cgit 


From 4be9e6a0bc0a4ac6b47ead7008b8a6a811c63b4d Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 13 Jun 2022 22:03:12 +0200
Subject: refactor: make is_indexed false by default

Co-authored-by: flow <flowlnlnln@gmail.com>
---
 launcher/minecraft/mod/ModFolderModel.h            | 2 +-
 launcher/minecraft/mod/ResourcePackFolderModel.cpp | 2 +-
 launcher/minecraft/mod/TexturePackFolderModel.cpp  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'launcher/minecraft')

diff --git a/launcher/minecraft/mod/ModFolderModel.h b/launcher/minecraft/mod/ModFolderModel.h
index fcedae96..24b4d358 100644
--- a/launcher/minecraft/mod/ModFolderModel.h
+++ b/launcher/minecraft/mod/ModFolderModel.h
@@ -73,7 +73,7 @@ public:
         Enable,
         Toggle
     };
-    ModFolderModel(const QString &dir, bool is_indexed);
+    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;
diff --git a/launcher/minecraft/mod/ResourcePackFolderModel.cpp b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
index fb1f1d29..276804ed 100644
--- a/launcher/minecraft/mod/ResourcePackFolderModel.cpp
+++ b/launcher/minecraft/mod/ResourcePackFolderModel.cpp
@@ -35,7 +35,7 @@
 
 #include "ResourcePackFolderModel.h"
 
-ResourcePackFolderModel::ResourcePackFolderModel(const QString &dir) : ModFolderModel(dir, false) {
+ResourcePackFolderModel::ResourcePackFolderModel(const QString &dir) : ModFolderModel(dir) {
 }
 
 QVariant ResourcePackFolderModel::headerData(int section, Qt::Orientation orientation, int role) const {
diff --git a/launcher/minecraft/mod/TexturePackFolderModel.cpp b/launcher/minecraft/mod/TexturePackFolderModel.cpp
index 644dfd77..e3a22219 100644
--- a/launcher/minecraft/mod/TexturePackFolderModel.cpp
+++ b/launcher/minecraft/mod/TexturePackFolderModel.cpp
@@ -35,7 +35,7 @@
 
 #include "TexturePackFolderModel.h"
 
-TexturePackFolderModel::TexturePackFolderModel(const QString &dir) : ModFolderModel(dir, false) {
+TexturePackFolderModel::TexturePackFolderModel(const QString &dir) : ModFolderModel(dir) {
 }
 
 QVariant TexturePackFolderModel::headerData(int section, Qt::Orientation orientation, int role) const {
-- 
cgit