aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
authorflow <thiagodonato300@gmail.com>2022-04-15 20:35:17 -0300
committerflow <flowlnlnln@gmail.com>2022-05-23 14:42:27 -0300
commit5a34e8fd7c913bc138e1606baf9df2cd1a64baed (patch)
tree58fd00b20d6ee407a47067b16f3c5088825dd1a9 /launcher
parentfcfb2cfc3da9a8f897063db05fdf3aebc41a59ae (diff)
downloadPrismLauncher-5a34e8fd7c913bc138e1606baf9df2cd1a64baed.tar.gz
PrismLauncher-5a34e8fd7c913bc138e1606baf9df2cd1a64baed.tar.bz2
PrismLauncher-5a34e8fd7c913bc138e1606baf9df2cd1a64baed.zip
refactor: move mod tasks to their own subfolder
Makes the launcher/minecraft/mod/ folder a little more organized.
Diffstat (limited to 'launcher')
-rw-r--r--launcher/CMakeLists.txt12
-rw-r--r--launcher/ModDownloadTask.cpp3
-rw-r--r--launcher/ModDownloadTask.h9
-rw-r--r--launcher/minecraft/mod/ModFolderModel.cpp14
-rw-r--r--launcher/minecraft/mod/ModFolderModel.h4
-rw-r--r--launcher/minecraft/mod/tasks/LocalModParseTask.cpp (renamed from launcher/minecraft/mod/LocalModParseTask.cpp)0
-rw-r--r--launcher/minecraft/mod/tasks/LocalModParseTask.h (renamed from launcher/minecraft/mod/LocalModParseTask.h)8
-rw-r--r--launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp (renamed from launcher/minecraft/mod/LocalModUpdateTask.cpp)0
-rw-r--r--launcher/minecraft/mod/tasks/LocalModUpdateTask.h (renamed from launcher/minecraft/mod/LocalModUpdateTask.h)0
-rw-r--r--launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp (renamed from launcher/minecraft/mod/ModFolderLoadTask.cpp)0
-rw-r--r--launcher/minecraft/mod/tasks/ModFolderLoadTask.h (renamed from launcher/minecraft/mod/ModFolderLoadTask.h)7
11 files changed, 32 insertions, 25 deletions
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index b5c6fe91..b6df2851 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -327,16 +327,16 @@ set(MINECRAFT_SOURCES
minecraft/mod/ModDetails.h
minecraft/mod/ModFolderModel.h
minecraft/mod/ModFolderModel.cpp
- minecraft/mod/ModFolderLoadTask.h
- minecraft/mod/ModFolderLoadTask.cpp
- minecraft/mod/LocalModParseTask.h
- minecraft/mod/LocalModParseTask.cpp
- minecraft/mod/LocalModUpdateTask.h
- minecraft/mod/LocalModUpdateTask.cpp
minecraft/mod/ResourcePackFolderModel.h
minecraft/mod/ResourcePackFolderModel.cpp
minecraft/mod/TexturePackFolderModel.h
minecraft/mod/TexturePackFolderModel.cpp
+ minecraft/mod/tasks/ModFolderLoadTask.h
+ minecraft/mod/tasks/ModFolderLoadTask.cpp
+ minecraft/mod/tasks/LocalModParseTask.h
+ minecraft/mod/tasks/LocalModParseTask.cpp
+ minecraft/mod/tasks/LocalModUpdateTask.h
+ minecraft/mod/tasks/LocalModUpdateTask.cpp
# Assets
minecraft/AssetsUtils.h
diff --git a/launcher/ModDownloadTask.cpp b/launcher/ModDownloadTask.cpp
index ad1e64e3..52de9c94 100644
--- a/launcher/ModDownloadTask.cpp
+++ b/launcher/ModDownloadTask.cpp
@@ -1,6 +1,7 @@
#include "ModDownloadTask.h"
+
#include "Application.h"
-#include "minecraft/mod/LocalModUpdateTask.h"
+#include "minecraft/mod/tasks/LocalModUpdateTask.h"
ModDownloadTask::ModDownloadTask(ModPlatform::IndexedPack mod, ModPlatform::IndexedVersion version, const std::shared_ptr<ModFolderModel> mods)
: m_mod(mod), m_mod_version(version), mods(mods)
diff --git a/launcher/ModDownloadTask.h b/launcher/ModDownloadTask.h
index d292dfbb..5eaee187 100644
--- a/launcher/ModDownloadTask.h
+++ b/launcher/ModDownloadTask.h
@@ -1,12 +1,13 @@
#pragma once
+#include <QUrl>
#include "QObjectPtr.h"
-#include "minecraft/mod/LocalModUpdateTask.h"
-#include "modplatform/ModIndex.h"
-#include "tasks/SequentialTask.h"
#include "minecraft/mod/ModFolderModel.h"
+#include "modplatform/ModIndex.h"
#include "net/NetJob.h"
-#include <QUrl>
+
+#include "tasks/SequentialTask.h"
+#include "minecraft/mod/tasks/LocalModUpdateTask.h"
class ModDownloadTask : public SequentialTask {
Q_OBJECT
diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp
index 615cfc0c..936b68d3 100644
--- a/launcher/minecraft/mod/ModFolderModel.cpp
+++ b/launcher/minecraft/mod/ModFolderModel.cpp
@@ -14,17 +14,19 @@
*/
#include "ModFolderModel.h"
+
#include <FileSystem.h>
+#include <QDebug>
+#include <QFileSystemWatcher>
#include <QMimeData>
-#include <QUrl>
-#include <QUuid>
#include <QString>
-#include <QFileSystemWatcher>
-#include <QDebug>
-#include "ModFolderLoadTask.h"
#include <QThreadPool>
+#include <QUrl>
+#include <QUuid>
#include <algorithm>
-#include "LocalModParseTask.h"
+
+#include "minecraft/mod/tasks/LocalModParseTask.h"
+#include "minecraft/mod/tasks/ModFolderLoadTask.h"
ModFolderModel::ModFolderModel(const QString &dir) : QAbstractListModel(), m_dir(dir)
{
diff --git a/launcher/minecraft/mod/ModFolderModel.h b/launcher/minecraft/mod/ModFolderModel.h
index f8ad4ca8..10a72691 100644
--- a/launcher/minecraft/mod/ModFolderModel.h
+++ b/launcher/minecraft/mod/ModFolderModel.h
@@ -24,8 +24,8 @@
#include "Mod.h"
-#include "ModFolderLoadTask.h"
-#include "LocalModParseTask.h"
+#include "minecraft/mod/tasks/ModFolderLoadTask.h"
+#include "minecraft/mod/tasks/LocalModParseTask.h"
class LegacyInstance;
class BaseInstance;
diff --git a/launcher/minecraft/mod/LocalModParseTask.cpp b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
index a7bec5ae..a7bec5ae 100644
--- a/launcher/minecraft/mod/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
diff --git a/launcher/minecraft/mod/LocalModParseTask.h b/launcher/minecraft/mod/tasks/LocalModParseTask.h
index 0f119ba6..ed92394c 100644
--- a/launcher/minecraft/mod/LocalModParseTask.h
+++ b/launcher/minecraft/mod/tasks/LocalModParseTask.h
@@ -1,9 +1,11 @@
#pragma once
-#include <QRunnable>
+
#include <QDebug>
#include <QObject>
-#include "Mod.h"
-#include "ModDetails.h"
+#include <QRunnable>
+
+#include "minecraft/mod/Mod.h"
+#include "minecraft/mod/ModDetails.h"
class LocalModParseTask : public QObject, public QRunnable
{
diff --git a/launcher/minecraft/mod/LocalModUpdateTask.cpp b/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
index 63f5cf9a..63f5cf9a 100644
--- a/launcher/minecraft/mod/LocalModUpdateTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModUpdateTask.cpp
diff --git a/launcher/minecraft/mod/LocalModUpdateTask.h b/launcher/minecraft/mod/tasks/LocalModUpdateTask.h
index 866089e9..866089e9 100644
--- a/launcher/minecraft/mod/LocalModUpdateTask.h
+++ b/launcher/minecraft/mod/tasks/LocalModUpdateTask.h
diff --git a/launcher/minecraft/mod/ModFolderLoadTask.cpp b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
index fd4d6008..fd4d6008 100644
--- a/launcher/minecraft/mod/ModFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.cpp
diff --git a/launcher/minecraft/mod/ModFolderLoadTask.h b/launcher/minecraft/mod/tasks/ModFolderLoadTask.h
index c869f083..bb66022a 100644
--- a/launcher/minecraft/mod/ModFolderLoadTask.h
+++ b/launcher/minecraft/mod/tasks/ModFolderLoadTask.h
@@ -1,10 +1,11 @@
#pragma once
-#include <QRunnable>
-#include <QObject>
+
#include <QDir>
#include <QMap>
-#include "Mod.h"
+#include <QObject>
+#include <QRunnable>
#include <memory>
+#include "minecraft/mod/Mod.h"
class ModFolderLoadTask : public QObject, public QRunnable
{