summaryrefslogtreecommitdiffstats
path: root/logic
diff options
context:
space:
mode:
Diffstat (limited to 'logic')
-rw-r--r--logic/BaseInstaller.cpp2
-rw-r--r--logic/BaseInstance.h2
-rw-r--r--logic/CMakeLists.txt102
-rw-r--r--logic/InstanceList.cpp6
-rw-r--r--logic/launch/steps/LaunchMinecraft.cpp2
-rw-r--r--logic/minecraft/RawLibrary.h2
-rw-r--r--logic/minecraft/auth/AuthSession.cpp (renamed from logic/auth/AuthSession.cpp)0
-rw-r--r--logic/minecraft/auth/AuthSession.h (renamed from logic/auth/AuthSession.h)0
-rw-r--r--logic/minecraft/auth/MojangAccount.cpp (renamed from logic/auth/MojangAccount.cpp)0
-rw-r--r--logic/minecraft/auth/MojangAccount.h (renamed from logic/auth/MojangAccount.h)0
-rw-r--r--logic/minecraft/auth/MojangAccountList.cpp (renamed from logic/auth/MojangAccountList.cpp)4
-rw-r--r--logic/minecraft/auth/MojangAccountList.h (renamed from logic/auth/MojangAccountList.h)4
-rw-r--r--logic/minecraft/auth/YggdrasilTask.cpp (renamed from logic/auth/YggdrasilTask.cpp)5
-rw-r--r--logic/minecraft/auth/YggdrasilTask.h (renamed from logic/auth/YggdrasilTask.h)2
-rw-r--r--logic/minecraft/auth/flows/AuthenticateTask.cpp (renamed from logic/auth/flows/AuthenticateTask.cpp)5
-rw-r--r--logic/minecraft/auth/flows/AuthenticateTask.h (renamed from logic/auth/flows/AuthenticateTask.h)2
-rw-r--r--logic/minecraft/auth/flows/RefreshTask.cpp (renamed from logic/auth/flows/RefreshTask.cpp)5
-rw-r--r--logic/minecraft/auth/flows/RefreshTask.h (renamed from logic/auth/flows/RefreshTask.h)2
-rw-r--r--logic/minecraft/auth/flows/ValidateTask.cpp (renamed from logic/auth/flows/ValidateTask.cpp)5
-rw-r--r--logic/minecraft/auth/flows/ValidateTask.h (renamed from logic/auth/flows/ValidateTask.h)2
-rw-r--r--logic/minecraft/forge/ForgeInstaller.cpp (renamed from logic/forge/ForgeInstaller.cpp)5
-rw-r--r--logic/minecraft/forge/ForgeInstaller.h (renamed from logic/forge/ForgeInstaller.h)0
-rw-r--r--logic/minecraft/forge/ForgeMirror.h (renamed from logic/forge/ForgeMirror.h)0
-rw-r--r--logic/minecraft/forge/ForgeMirrors.cpp (renamed from logic/forge/ForgeMirrors.cpp)0
-rw-r--r--logic/minecraft/forge/ForgeMirrors.h (renamed from logic/forge/ForgeMirrors.h)5
-rw-r--r--logic/minecraft/forge/ForgeVersion.cpp (renamed from logic/forge/ForgeVersion.cpp)0
-rw-r--r--logic/minecraft/forge/ForgeVersion.h (renamed from logic/forge/ForgeVersion.h)0
-rw-r--r--logic/minecraft/forge/ForgeVersionList.cpp (renamed from logic/forge/ForgeVersionList.cpp)5
-rw-r--r--logic/minecraft/forge/ForgeVersionList.h (renamed from logic/forge/ForgeVersionList.h)3
-rw-r--r--logic/minecraft/forge/ForgeXzDownload.cpp (renamed from logic/forge/ForgeXzDownload.cpp)0
-rw-r--r--logic/minecraft/forge/ForgeXzDownload.h (renamed from logic/forge/ForgeXzDownload.h)0
-rw-r--r--logic/minecraft/forge/LegacyForge.cpp (renamed from logic/forge/LegacyForge.cpp)0
-rw-r--r--logic/minecraft/forge/LegacyForge.h (renamed from logic/forge/LegacyForge.h)0
-rw-r--r--logic/minecraft/ftb/FTBPlugin.cpp (renamed from logic/ftb/FTBPlugin.cpp)0
-rw-r--r--logic/minecraft/ftb/FTBPlugin.h (renamed from logic/ftb/FTBPlugin.h)0
-rw-r--r--logic/minecraft/ftb/FTBProfileStrategy.cpp (renamed from logic/ftb/FTBProfileStrategy.cpp)5
-rw-r--r--logic/minecraft/ftb/FTBProfileStrategy.h (renamed from logic/ftb/FTBProfileStrategy.h)4
-rw-r--r--logic/minecraft/ftb/FTBVersion.h (renamed from logic/ftb/FTBVersion.h)0
-rw-r--r--logic/minecraft/ftb/LegacyFTBInstance.cpp (renamed from logic/ftb/LegacyFTBInstance.cpp)0
-rw-r--r--logic/minecraft/ftb/LegacyFTBInstance.h (renamed from logic/ftb/LegacyFTBInstance.h)2
-rw-r--r--logic/minecraft/ftb/OneSixFTBInstance.cpp (renamed from logic/ftb/OneSixFTBInstance.cpp)4
-rw-r--r--logic/minecraft/ftb/OneSixFTBInstance.h (renamed from logic/ftb/OneSixFTBInstance.h)2
-rw-r--r--logic/minecraft/legacy/LegacyInstance.cpp (renamed from logic/minecraft/LegacyInstance.cpp)2
-rw-r--r--logic/minecraft/legacy/LegacyInstance.h (renamed from logic/minecraft/LegacyInstance.h)0
-rw-r--r--logic/minecraft/legacy/LegacyUpdate.cpp (renamed from logic/minecraft/LegacyUpdate.cpp)4
-rw-r--r--logic/minecraft/legacy/LegacyUpdate.h (renamed from logic/minecraft/LegacyUpdate.h)0
-rw-r--r--logic/minecraft/legacy/LwjglVersionList.cpp (renamed from logic/minecraft/LwjglVersionList.cpp)0
-rw-r--r--logic/minecraft/legacy/LwjglVersionList.h (renamed from logic/minecraft/LwjglVersionList.h)0
-rw-r--r--logic/minecraft/liteloader/LiteLoaderInstaller.cpp (renamed from logic/liteloader/LiteLoaderInstaller.cpp)4
-rw-r--r--logic/minecraft/liteloader/LiteLoaderInstaller.h (renamed from logic/liteloader/LiteLoaderInstaller.h)2
-rw-r--r--logic/minecraft/liteloader/LiteLoaderVersionList.cpp (renamed from logic/liteloader/LiteLoaderVersionList.cpp)0
-rw-r--r--logic/minecraft/liteloader/LiteLoaderVersionList.h (renamed from logic/liteloader/LiteLoaderVersionList.h)0
-rw-r--r--logic/minecraft/onesix/OneSixInstance.cpp (renamed from logic/minecraft/OneSixInstance.cpp)20
-rw-r--r--logic/minecraft/onesix/OneSixInstance.h (renamed from logic/minecraft/OneSixInstance.h)0
-rw-r--r--logic/minecraft/onesix/OneSixProfileStrategy.cpp (renamed from logic/minecraft/OneSixProfileStrategy.cpp)5
-rw-r--r--logic/minecraft/onesix/OneSixProfileStrategy.h (renamed from logic/minecraft/OneSixProfileStrategy.h)2
-rw-r--r--logic/minecraft/onesix/OneSixUpdate.cpp (renamed from logic/minecraft/OneSixUpdate.cpp)4
-rw-r--r--logic/minecraft/onesix/OneSixUpdate.h (renamed from logic/minecraft/OneSixUpdate.h)0
58 files changed, 118 insertions, 112 deletions
diff --git a/logic/BaseInstaller.cpp b/logic/BaseInstaller.cpp
index d8e83bb2..cb762ebd 100644
--- a/logic/BaseInstaller.cpp
+++ b/logic/BaseInstaller.cpp
@@ -16,7 +16,7 @@
#include <QFile>
#include "BaseInstaller.h"
-#include "minecraft/OneSixInstance.h"
+#include "minecraft/onesix/OneSixInstance.h"
BaseInstaller::BaseInstaller()
{
diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h
index cc8ebb02..392cb3d9 100644
--- a/logic/BaseInstance.h
+++ b/logic/BaseInstance.h
@@ -24,7 +24,7 @@
#include "settings/INIFile.h"
#include "BaseVersionList.h"
-#include "auth/MojangAccount.h"
+#include "minecraft/auth/MojangAccount.h"
#include "launch/MessageLevel.h"
#include "pathmatcher/IPathMatcher.h"
diff --git a/logic/CMakeLists.txt b/logic/CMakeLists.txt
index 0a6cbbf6..40311baf 100644
--- a/logic/CMakeLists.txt
+++ b/logic/CMakeLists.txt
@@ -95,20 +95,20 @@ set(LOGIC_SOURCES
net/URLConstants.cpp
# Yggdrasil login stuff
- auth/AuthSession.h
- auth/AuthSession.cpp
- auth/MojangAccountList.h
- auth/MojangAccountList.cpp
- auth/MojangAccount.h
- auth/MojangAccount.cpp
- auth/YggdrasilTask.h
- auth/YggdrasilTask.cpp
- auth/flows/AuthenticateTask.h
- auth/flows/AuthenticateTask.cpp
- auth/flows/RefreshTask.cpp
- auth/flows/RefreshTask.cpp
- auth/flows/ValidateTask.h
- auth/flows/ValidateTask.cpp
+ minecraft/auth/AuthSession.h
+ minecraft/auth/AuthSession.cpp
+ minecraft/auth/MojangAccountList.h
+ minecraft/auth/MojangAccountList.cpp
+ minecraft/auth/MojangAccount.h
+ minecraft/auth/MojangAccount.cpp
+ minecraft/auth/YggdrasilTask.h
+ minecraft/auth/YggdrasilTask.cpp
+ minecraft/auth/flows/AuthenticateTask.h
+ minecraft/auth/flows/AuthenticateTask.cpp
+ minecraft/auth/flows/RefreshTask.cpp
+ minecraft/auth/flows/RefreshTask.cpp
+ minecraft/auth/flows/ValidateTask.h
+ minecraft/auth/flows/ValidateTask.cpp
# Game launch logic
launch/steps/CheckJava.cpp
@@ -157,16 +157,18 @@ set(LOGIC_SOURCES
status/StatusChecker.cpp
# Minecraft support
- minecraft/OneSixUpdate.h
- minecraft/OneSixUpdate.cpp
- minecraft/OneSixInstance.h
- minecraft/OneSixInstance.cpp
- minecraft/LegacyUpdate.h
- minecraft/LegacyUpdate.cpp
- minecraft/LegacyInstance.h
- minecraft/LegacyInstance.cpp
- minecraft/LwjglVersionList.h
- minecraft/LwjglVersionList.cpp
+ minecraft/onesix/OneSixUpdate.h
+ minecraft/onesix/OneSixUpdate.cpp
+ minecraft/onesix/OneSixInstance.h
+ minecraft/onesix/OneSixInstance.cpp
+ minecraft/onesix/OneSixProfileStrategy.cpp
+ minecraft/onesix/OneSixProfileStrategy.h
+ minecraft/legacy/LegacyUpdate.h
+ minecraft/legacy/LegacyUpdate.cpp
+ minecraft/legacy/LegacyInstance.h
+ minecraft/legacy/LegacyInstance.cpp
+ minecraft/legacy/LwjglVersionList.h
+ minecraft/legacy/LwjglVersionList.cpp
minecraft/SkinUtils.h
minecraft/SkinUtils.cpp
minecraft/GradleSpecifier.h
@@ -181,8 +183,6 @@ set(LOGIC_SOURCES
minecraft/MinecraftVersionList.cpp
minecraft/MinecraftVersionList.h
minecraft/NullProfileStrategy.h
- minecraft/OneSixProfileStrategy.cpp
- minecraft/OneSixProfileStrategy.h
minecraft/OneSixRule.cpp
minecraft/OneSixRule.h
minecraft/OpSys.cpp
@@ -211,14 +211,14 @@ set(LOGIC_SOURCES
minecraft/WorldList.cpp
# FTB
- ftb/OneSixFTBInstance.h
- ftb/OneSixFTBInstance.cpp
- ftb/LegacyFTBInstance.h
- ftb/LegacyFTBInstance.cpp
- ftb/FTBProfileStrategy.h
- ftb/FTBProfileStrategy.cpp
- ftb/FTBPlugin.h
- ftb/FTBPlugin.cpp
+ minecraft/ftb/OneSixFTBInstance.h
+ minecraft/ftb/OneSixFTBInstance.cpp
+ minecraft/ftb/LegacyFTBInstance.h
+ minecraft/ftb/LegacyFTBInstance.cpp
+ minecraft/ftb/FTBProfileStrategy.h
+ minecraft/ftb/FTBProfileStrategy.cpp
+ minecraft/ftb/FTBPlugin.h
+ minecraft/ftb/FTBPlugin.cpp
# A Recursive file system watcher
RecursiveFileSystemWatcher.h
@@ -278,25 +278,25 @@ set(LOGIC_SOURCES
minecraft/AssetsUtils.cpp
# Forge and all things forge related
- forge/ForgeVersion.h
- forge/ForgeVersion.cpp
- forge/ForgeVersionList.h
- forge/ForgeVersionList.cpp
- forge/ForgeMirror.h
- forge/ForgeMirrors.h
- forge/ForgeMirrors.cpp
- forge/ForgeXzDownload.h
- forge/ForgeXzDownload.cpp
- forge/LegacyForge.h
- forge/LegacyForge.cpp
- forge/ForgeInstaller.h
- forge/ForgeInstaller.cpp
+ minecraft/forge/ForgeVersion.h
+ minecraft/forge/ForgeVersion.cpp
+ minecraft/forge/ForgeVersionList.h
+ minecraft/forge/ForgeVersionList.cpp
+ minecraft/forge/ForgeMirror.h
+ minecraft/forge/ForgeMirrors.h
+ minecraft/forge/ForgeMirrors.cpp
+ minecraft/forge/ForgeXzDownload.h
+ minecraft/forge/ForgeXzDownload.cpp
+ minecraft/forge/LegacyForge.h
+ minecraft/forge/LegacyForge.cpp
+ minecraft/forge/ForgeInstaller.h
+ minecraft/forge/ForgeInstaller.cpp
# Liteloader and related things
- liteloader/LiteLoaderInstaller.h
- liteloader/LiteLoaderInstaller.cpp
- liteloader/LiteLoaderVersionList.h
- liteloader/LiteLoaderVersionList.cpp
+ minecraft/liteloader/LiteLoaderInstaller.h
+ minecraft/liteloader/LiteLoaderInstaller.cpp
+ minecraft/liteloader/LiteLoaderVersionList.h
+ minecraft/liteloader/LiteLoaderVersionList.cpp
# Translations
trans/TranslationDownloader.h
diff --git a/logic/InstanceList.cpp b/logic/InstanceList.cpp
index a8acdf05..8197fe24 100644
--- a/logic/InstanceList.cpp
+++ b/logic/InstanceList.cpp
@@ -31,11 +31,11 @@
#include "BaseInstance.h"
//FIXME: this really doesn't belong *here*
-#include "minecraft/OneSixInstance.h"
-#include "minecraft/LegacyInstance.h"
+#include "minecraft/onesix/OneSixInstance.h"
+#include "minecraft/legacy/LegacyInstance.h"
+#include "minecraft/ftb/FTBPlugin.h"
#include "minecraft/MinecraftVersion.h"
#include "settings/INISettingsObject.h"
-#include "ftb/FTBPlugin.h"
#include "NullInstance.h"
#include "FileSystem.h"
#include "pathmatcher/RegexpMatcher.h"
diff --git a/logic/launch/steps/LaunchMinecraft.cpp b/logic/launch/steps/LaunchMinecraft.cpp
index 05b1d948..b0fe056f 100644
--- a/logic/launch/steps/LaunchMinecraft.cpp
+++ b/logic/launch/steps/LaunchMinecraft.cpp
@@ -15,7 +15,7 @@
#include "LaunchMinecraft.h"
#include <launch/LaunchTask.h>
-#include <minecraft/OneSixInstance.h>
+#include <minecraft/MinecraftInstance.h>
#include <FileSystem.h>
#include <QStandardPaths>
diff --git a/logic/minecraft/RawLibrary.h b/logic/minecraft/RawLibrary.h
index 7f0aed2f..62791239 100644
--- a/logic/minecraft/RawLibrary.h
+++ b/logic/minecraft/RawLibrary.h
@@ -8,7 +8,7 @@
#include <QUrl>
#include <memory>
-#include "minecraft/OneSixRule.h"
+#include "OneSixRule.h"
#include "minecraft/OpSys.h"
#include "GradleSpecifier.h"
#include "net/URLConstants.h"
diff --git a/logic/auth/AuthSession.cpp b/logic/minecraft/auth/AuthSession.cpp
index 8758bfbd..8758bfbd 100644
--- a/logic/auth/AuthSession.cpp
+++ b/logic/minecraft/auth/AuthSession.cpp
diff --git a/logic/auth/AuthSession.h b/logic/minecraft/auth/AuthSession.h
index dede90a9..dede90a9 100644
--- a/logic/auth/AuthSession.h
+++ b/logic/minecraft/auth/AuthSession.h
diff --git a/logic/auth/MojangAccount.cpp b/logic/minecraft/auth/MojangAccount.cpp
index 69a24c09..69a24c09 100644
--- a/logic/auth/MojangAccount.cpp
+++ b/logic/minecraft/auth/MojangAccount.cpp
diff --git a/logic/auth/MojangAccount.h b/logic/minecraft/auth/MojangAccount.h
index 2de0c19c..2de0c19c 100644
--- a/logic/auth/MojangAccount.h
+++ b/logic/minecraft/auth/MojangAccount.h
diff --git a/logic/auth/MojangAccountList.cpp b/logic/minecraft/auth/MojangAccountList.cpp
index dac3d67f..26cbc81a 100644
--- a/logic/auth/MojangAccountList.cpp
+++ b/logic/minecraft/auth/MojangAccountList.cpp
@@ -13,7 +13,8 @@
* limitations under the License.
*/
-#include "auth/MojangAccountList.h"
+#include "MojangAccountList.h"
+#include "MojangAccount.h"
#include <QIODevice>
#include <QFile>
@@ -26,7 +27,6 @@
#include <QDebug>
-#include "auth/MojangAccount.h"
#include <FileSystem.h>
#define ACCOUNT_LIST_FORMAT_VERSION 2
diff --git a/logic/auth/MojangAccountList.h b/logic/minecraft/auth/MojangAccountList.h
index 49b71fab..c40fa6a3 100644
--- a/logic/auth/MojangAccountList.h
+++ b/logic/minecraft/auth/MojangAccountList.h
@@ -15,13 +15,13 @@
#pragma once
+#include "MojangAccount.h"
+
#include <QObject>
#include <QVariant>
#include <QAbstractListModel>
#include <QSharedPointer>
-#include "auth/MojangAccount.h"
-
#include "multimc_logic_export.h"
/*!
diff --git a/logic/auth/YggdrasilTask.cpp b/logic/minecraft/auth/YggdrasilTask.cpp
index 929ab0bf..c6971c9f 100644
--- a/logic/auth/YggdrasilTask.cpp
+++ b/logic/minecraft/auth/YggdrasilTask.cpp
@@ -13,7 +13,8 @@
* limitations under the License.
*/
-#include <auth/YggdrasilTask.h>
+#include "YggdrasilTask.h"
+#include "MojangAccount.h"
#include <QObject>
#include <QString>
@@ -23,7 +24,7 @@
#include <QByteArray>
#include <Env.h>
-#include <auth/MojangAccount.h>
+
#include <net/URLConstants.h>
#include <QDebug>
diff --git a/logic/auth/YggdrasilTask.h b/logic/minecraft/auth/YggdrasilTask.h
index d989bee3..c84cfc06 100644
--- a/logic/auth/YggdrasilTask.h
+++ b/logic/minecraft/auth/YggdrasilTask.h
@@ -22,7 +22,7 @@
#include <QTimer>
#include <qsslerror.h>
-#include "auth/MojangAccount.h"
+#include "MojangAccount.h"
class QNetworkReply;
diff --git a/logic/auth/flows/AuthenticateTask.cpp b/logic/minecraft/auth/flows/AuthenticateTask.cpp
index a609d28b..8d136f0b 100644
--- a/logic/auth/flows/AuthenticateTask.cpp
+++ b/logic/minecraft/auth/flows/AuthenticateTask.cpp
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-#include <auth/flows/AuthenticateTask.h>
-
-#include <auth/MojangAccount.h>
+#include "AuthenticateTask.h"
+#include "../MojangAccount.h"
#include <QJsonDocument>
#include <QJsonObject>
diff --git a/logic/auth/flows/AuthenticateTask.h b/logic/minecraft/auth/flows/AuthenticateTask.h
index 65975ae5..398fab98 100644
--- a/logic/auth/flows/AuthenticateTask.h
+++ b/logic/minecraft/auth/flows/AuthenticateTask.h
@@ -15,7 +15,7 @@
#pragma once
-#include <auth/YggdrasilTask.h>
+#include "../YggdrasilTask.h"
#include <QObject>
#include <QString>
diff --git a/logic/auth/flows/RefreshTask.cpp b/logic/minecraft/auth/flows/RefreshTask.cpp
index 83511200..a0fb2e48 100644
--- a/logic/auth/flows/RefreshTask.cpp
+++ b/logic/minecraft/auth/flows/RefreshTask.cpp
@@ -13,9 +13,8 @@
* limitations under the License.
*/
-#include <auth/flows/RefreshTask.h>
-
-#include <auth/MojangAccount.h>
+#include "RefreshTask.h"
+#include "../MojangAccount.h"
#include <QJsonDocument>
#include <QJsonObject>
diff --git a/logic/auth/flows/RefreshTask.h b/logic/minecraft/auth/flows/RefreshTask.h
index 6894e963..17714b4f 100644
--- a/logic/auth/flows/RefreshTask.h
+++ b/logic/minecraft/auth/flows/RefreshTask.h
@@ -15,7 +15,7 @@
#pragma once
-#include <auth/YggdrasilTask.h>
+#include "../YggdrasilTask.h"
#include <QObject>
#include <QString>
diff --git a/logic/auth/flows/ValidateTask.cpp b/logic/minecraft/auth/flows/ValidateTask.cpp
index 9a4dcd6d..4deceb6a 100644
--- a/logic/auth/flows/ValidateTask.cpp
+++ b/logic/minecraft/auth/flows/ValidateTask.cpp
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-#include <auth/flows/ValidateTask.h>
-
-#include <auth/MojangAccount.h>
+#include "ValidateTask.h"
+#include "../MojangAccount.h"
#include <QJsonDocument>
#include <QJsonObject>
diff --git a/logic/auth/flows/ValidateTask.h b/logic/minecraft/auth/flows/ValidateTask.h
index 204596f9..77d628a0 100644
--- a/logic/auth/flows/ValidateTask.h
+++ b/logic/minecraft/auth/flows/ValidateTask.h
@@ -19,7 +19,7 @@
#pragma once
-#include <auth/YggdrasilTask.h>
+#include "../YggdrasilTask.h"
#include <QObject>
#include <QString>
diff --git a/logic/forge/ForgeInstaller.cpp b/logic/minecraft/forge/ForgeInstaller.cpp
index 78acb8d4..a9283e5d 100644
--- a/logic/forge/ForgeInstaller.cpp
+++ b/logic/minecraft/forge/ForgeInstaller.cpp
@@ -14,12 +14,13 @@
*/
#include "ForgeInstaller.h"
+#include "ForgeVersionList.h"
+
#include "minecraft/MinecraftProfile.h"
#include "minecraft/GradleSpecifier.h"
#include "net/HttpMetaCache.h"
#include "tasks/Task.h"
-#include "minecraft/OneSixInstance.h"
-#include "forge/ForgeVersionList.h"
+#include "minecraft/onesix/OneSixInstance.h"
#include "minecraft/VersionFilterData.h"
#include "Env.h"
#include "Exception.h"
diff --git a/logic/forge/ForgeInstaller.h b/logic/minecraft/forge/ForgeInstaller.h
index 0de762b6..0de762b6 100644
--- a/logic/forge/ForgeInstaller.h
+++ b/logic/minecraft/forge/ForgeInstaller.h
diff --git a/logic/forge/ForgeMirror.h b/logic/minecraft/forge/ForgeMirror.h
index 2518dffe..2518dffe 100644
--- a/logic/forge/ForgeMirror.h
+++ b/logic/minecraft/forge/ForgeMirror.h
diff --git a/logic/forge/ForgeMirrors.cpp b/logic/minecraft/forge/ForgeMirrors.cpp
index a2fc2c62..a2fc2c62 100644
--- a/logic/forge/ForgeMirrors.cpp
+++ b/logic/minecraft/forge/ForgeMirrors.cpp
diff --git a/logic/forge/ForgeMirrors.h b/logic/minecraft/forge/ForgeMirrors.h
index e7c90fa5..0312829b 100644
--- a/logic/forge/ForgeMirrors.h
+++ b/logic/minecraft/forge/ForgeMirrors.h
@@ -15,12 +15,15 @@
#pragma once
+#include "ForgeXzDownload.h"
+
#include "net/NetAction.h"
#include "net/HttpMetaCache.h"
#include "net/NetJob.h"
-#include "forge/ForgeXzDownload.h"
+
#include <QFile>
#include <QTemporaryFile>
+
typedef std::shared_ptr<class ForgeMirrors> ForgeMirrorsPtr;
class ForgeMirrors : public NetAction
diff --git a/logic/forge/ForgeVersion.cpp b/logic/minecraft/forge/ForgeVersion.cpp
index b859a28c..b859a28c 100644
--- a/logic/forge/ForgeVersion.cpp
+++ b/logic/minecraft/forge/ForgeVersion.cpp
diff --git a/logic/forge/ForgeVersion.h b/logic/minecraft/forge/ForgeVersion.h
index e77d32f1..e77d32f1 100644
--- a/logic/forge/ForgeVersion.h
+++ b/logic/minecraft/forge/ForgeVersion.h
diff --git a/logic/forge/ForgeVersionList.cpp b/logic/minecraft/forge/ForgeVersionList.cpp
index a05ced99..9b418310 100644
--- a/logic/forge/ForgeVersionList.cpp
+++ b/logic/minecraft/forge/ForgeVersionList.cpp
@@ -13,8 +13,9 @@
* limitations under the License.
*/
-#include "forge/ForgeVersionList.h"
-#include "forge/ForgeVersion.h"
+#include "ForgeVersionList.h"
+#include "ForgeVersion.h"
+
#include "net/NetJob.h"
#include "net/URLConstants.h"
#include "Env.h"
diff --git a/logic/forge/ForgeVersionList.h b/logic/minecraft/forge/ForgeVersionList.h
index dbf4b5de..308503e3 100644
--- a/logic/forge/ForgeVersionList.h
+++ b/logic/minecraft/forge/ForgeVersionList.h
@@ -15,6 +15,8 @@
#pragma once
+#include "ForgeVersion.h"
+
#include <QObject>
#include <QAbstractListModel>
#include <QUrl>
@@ -23,7 +25,6 @@
#include "BaseVersionList.h"
#include "tasks/Task.h"
#include "net/NetJob.h"
-#include "forge/ForgeVersion.h"
#include "multimc_logic_export.h"
diff --git a/logic/forge/ForgeXzDownload.cpp b/logic/minecraft/forge/ForgeXzDownload.cpp
index 6009e31e..6009e31e 100644
--- a/logic/forge/ForgeXzDownload.cpp
+++ b/logic/minecraft/forge/ForgeXzDownload.cpp
diff --git a/logic/forge/ForgeXzDownload.h b/logic/minecraft/forge/ForgeXzDownload.h
index 45722812..45722812 100644
--- a/logic/forge/ForgeXzDownload.h
+++ b/logic/minecraft/forge/ForgeXzDownload.h
diff --git a/logic/forge/LegacyForge.cpp b/logic/minecraft/forge/LegacyForge.cpp
index aa2c8063..aa2c8063 100644
--- a/logic/forge/LegacyForge.cpp
+++ b/logic/minecraft/forge/LegacyForge.cpp
diff --git a/logic/forge/LegacyForge.h b/logic/minecraft/forge/LegacyForge.h
index f51d5e85..f51d5e85 100644
--- a/logic/forge/LegacyForge.h
+++ b/logic/minecraft/forge/LegacyForge.h
diff --git a/logic/ftb/FTBPlugin.cpp b/logic/minecraft/ftb/FTBPlugin.cpp
index 8a08f916..8a08f916 100644
--- a/logic/ftb/FTBPlugin.cpp
+++ b/logic/minecraft/ftb/FTBPlugin.cpp
diff --git a/logic/ftb/FTBPlugin.h b/logic/minecraft/ftb/FTBPlugin.h
index 6851d8a5..6851d8a5 100644
--- a/logic/ftb/FTBPlugin.h
+++ b/logic/minecraft/ftb/FTBPlugin.h
diff --git a/logic/ftb/FTBProfileStrategy.cpp b/logic/minecraft/ftb/FTBProfileStrategy.cpp
index 53b43eec..c4bfa27b 100644
--- a/logic/ftb/FTBProfileStrategy.cpp
+++ b/logic/minecraft/ftb/FTBProfileStrategy.cpp
@@ -1,6 +1,7 @@
-#include "ftb/FTBProfileStrategy.h"
+#include "FTBProfileStrategy.h"
+#include "OneSixFTBInstance.h"
+
#include "minecraft/VersionBuildError.h"
-#include "ftb/OneSixFTBInstance.h"
#include "minecraft/MinecraftVersionList.h"
#include <FileSystem.h>
diff --git a/logic/ftb/FTBProfileStrategy.h b/logic/minecraft/ftb/FTBProfileStrategy.h
index 4810b9de..522af098 100644
--- a/logic/ftb/FTBProfileStrategy.h
+++ b/logic/minecraft/ftb/FTBProfileStrategy.h
@@ -1,6 +1,6 @@
#pragma once
-#include "../minecraft/ProfileStrategy.h"
-#include "../minecraft/OneSixProfileStrategy.h"
+#include "minecraft/ProfileStrategy.h"
+#include "minecraft/onesix/OneSixProfileStrategy.h"
class OneSixFTBInstance;
diff --git a/logic/ftb/FTBVersion.h b/logic/minecraft/ftb/FTBVersion.h
index 805319b4..805319b4 100644
--- a/logic/ftb/FTBVersion.h
+++ b/logic/minecraft/ftb/FTBVersion.h
diff --git a/logic/ftb/LegacyFTBInstance.cpp b/logic/minecraft/ftb/LegacyFTBInstance.cpp
index a7091f1d..a7091f1d 100644
--- a/logic/ftb/LegacyFTBInstance.cpp
+++ b/logic/minecraft/ftb/LegacyFTBInstance.cpp
diff --git a/logic/ftb/LegacyFTBInstance.h b/logic/minecraft/ftb/LegacyFTBInstance.h
index c878dcc6..3f3f5edf 100644
--- a/logic/ftb/LegacyFTBInstance.h
+++ b/logic/minecraft/ftb/LegacyFTBInstance.h
@@ -1,6 +1,6 @@
#pragma once
-#include "minecraft/LegacyInstance.h"
+#include "minecraft/legacy/LegacyInstance.h"
class LegacyFTBInstance : public LegacyInstance
{
diff --git a/logic/ftb/OneSixFTBInstance.cpp b/logic/minecraft/ftb/OneSixFTBInstance.cpp
index 54a3d2bd..19ec870a 100644
--- a/logic/ftb/OneSixFTBInstance.cpp
+++ b/logic/minecraft/ftb/OneSixFTBInstance.cpp
@@ -4,11 +4,11 @@
#include "minecraft/MinecraftProfile.h"
#include "minecraft/GradleSpecifier.h"
#include "tasks/SequentialTask.h"
-#include "forge/ForgeInstaller.h"
-#include "forge/ForgeVersionList.h"
#include <settings/INISettingsObject.h>
#include <FileSystem.h>
+#include <QJsonArray>
+
OneSixFTBInstance::OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) :
OneSixInstance(globalSettings, settings, rootDir)
{
diff --git a/logic/ftb/OneSixFTBInstance.h b/logic/minecraft/ftb/OneSixFTBInstance.h
index add6b51c..09a2dcb0 100644
--- a/logic/ftb/OneSixFTBInstance.h
+++ b/logic/minecraft/ftb/OneSixFTBInstance.h
@@ -1,6 +1,6 @@
#pragma once
-#include "minecraft/OneSixInstance.h"
+#include "minecraft/onesix/OneSixInstance.h"
class OneSixFTBInstance : public OneSixInstance
{
diff --git a/logic/minecraft/LegacyInstance.cpp b/logic/minecraft/legacy/LegacyInstance.cpp
index 227fd601..056079f6 100644
--- a/logic/minecraft/LegacyInstance.cpp
+++ b/logic/minecraft/legacy/LegacyInstance.cpp
@@ -20,7 +20,7 @@
#include "LegacyInstance.h"
-#include "minecraft/LegacyUpdate.h"
+#include "minecraft/legacy/LegacyUpdate.h"
#include "icons/IconList.h"
#include "launch/LaunchTask.h"
#include <launch/steps/LaunchMinecraft.h>
diff --git a/logic/minecraft/LegacyInstance.h b/logic/minecraft/legacy/LegacyInstance.h
index a2ab86de..a2ab86de 100644
--- a/logic/minecraft/LegacyInstance.h
+++ b/logic/minecraft/legacy/LegacyInstance.h
diff --git a/logic/minecraft/LegacyUpdate.cpp b/logic/minecraft/legacy/LegacyUpdate.cpp
index 2fd8e3cb..af787f8c 100644
--- a/logic/minecraft/LegacyUpdate.cpp
+++ b/logic/minecraft/legacy/LegacyUpdate.cpp
@@ -25,10 +25,10 @@
#include "LegacyUpdate.h"
-#include "minecraft/LwjglVersionList.h"
+#include "LwjglVersionList.h"
#include "minecraft/MinecraftVersionList.h"
#include "minecraft/ModList.h"
-#include "minecraft/LegacyInstance.h"
+#include "LegacyInstance.h"
#include <FileSystem.h>
LegacyUpdate::LegacyUpdate(BaseInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
diff --git a/logic/minecraft/LegacyUpdate.h b/logic/minecraft/legacy/LegacyUpdate.h
index c52bf934..c52bf934 100644
--- a/logic/minecraft/LegacyUpdate.h
+++ b/logic/minecraft/legacy/LegacyUpdate.h
diff --git a/logic/minecraft/LwjglVersionList.cpp b/logic/minecraft/legacy/LwjglVersionList.cpp
index bb017368..bb017368 100644
--- a/logic/minecraft/LwjglVersionList.cpp
+++ b/logic/minecraft/legacy/LwjglVersionList.cpp
diff --git a/logic/minecraft/LwjglVersionList.h b/logic/minecraft/legacy/LwjglVersionList.h
index f043f6e2..f043f6e2 100644
--- a/logic/minecraft/LwjglVersionList.h
+++ b/logic/minecraft/legacy/LwjglVersionList.h
diff --git a/logic/liteloader/LiteLoaderInstaller.cpp b/logic/minecraft/liteloader/LiteLoaderInstaller.cpp
index 555d16c1..3fefe273 100644
--- a/logic/liteloader/LiteLoaderInstaller.cpp
+++ b/logic/minecraft/liteloader/LiteLoaderInstaller.cpp
@@ -22,8 +22,8 @@
#include "minecraft/MinecraftProfile.h"
#include "minecraft/RawLibrary.h"
-#include "minecraft/OneSixInstance.h"
-#include "liteloader/LiteLoaderVersionList.h"
+#include "minecraft/onesix/OneSixInstance.h"
+#include "minecraft/liteloader/LiteLoaderVersionList.h"
#include "Exception.h"
LiteLoaderInstaller::LiteLoaderInstaller() : BaseInstaller()
diff --git a/logic/liteloader/LiteLoaderInstaller.h b/logic/minecraft/liteloader/LiteLoaderInstaller.h
index 5afa4f6c..fe0aee3d 100644
--- a/logic/liteloader/LiteLoaderInstaller.h
+++ b/logic/minecraft/liteloader/LiteLoaderInstaller.h
@@ -19,7 +19,7 @@
#include <QMap>
#include "BaseInstaller.h"
-#include "liteloader/LiteLoaderVersionList.h"
+#include "LiteLoaderVersionList.h"
#include "multimc_logic_export.h"
diff --git a/logic/liteloader/LiteLoaderVersionList.cpp b/logic/minecraft/liteloader/LiteLoaderVersionList.cpp
index 1d200e48..1d200e48 100644
--- a/logic/liteloader/LiteLoaderVersionList.cpp
+++ b/logic/minecraft/liteloader/LiteLoaderVersionList.cpp
diff --git a/logic/liteloader/LiteLoaderVersionList.h b/logic/minecraft/liteloader/LiteLoaderVersionList.h
index 43bb270d..43bb270d 100644
--- a/logic/liteloader/LiteLoaderVersionList.h
+++ b/logic/minecraft/liteloader/LiteLoaderVersionList.h
diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/onesix/OneSixInstance.cpp
index 9a3920cc..54381a99 100644
--- a/logic/minecraft/OneSixInstance.cpp
+++ b/logic/minecraft/onesix/OneSixInstance.cpp
@@ -16,20 +16,20 @@
#include <QIcon>
#include <QDebug>
-#include "minecraft/OneSixInstance.h"
+#include "OneSixInstance.h"
+#include "OneSixUpdate.h"
+#include "OneSixProfileStrategy.h"
-#include "minecraft/OneSixUpdate.h"
#include "minecraft/MinecraftProfile.h"
#include "minecraft/VersionBuildError.h"
#include "launch/LaunchTask.h"
-#include <launch/steps/PreLaunchCommand.h>
-#include <launch/steps/Update.h>
-#include <launch/steps/LaunchMinecraft.h>
-#include <launch/steps/PostLaunchCommand.h>
-#include <launch/steps/TextPrint.h>
-#include <launch/steps/ModMinecraftJar.h>
-#include <launch/steps/CheckJava.h>
-#include "minecraft/OneSixProfileStrategy.h"
+#include "launch/steps/PreLaunchCommand.h"
+#include "launch/steps/Update.h"
+#include "launch/steps/LaunchMinecraft.h"
+#include "launch/steps/PostLaunchCommand.h"
+#include "launch/steps/TextPrint.h"
+#include "launch/steps/ModMinecraftJar.h"
+#include "launch/steps/CheckJava.h"
#include "MMCZip.h"
#include "minecraft/AssetsUtils.h"
diff --git a/logic/minecraft/OneSixInstance.h b/logic/minecraft/onesix/OneSixInstance.h
index 824e3786..824e3786 100644
--- a/logic/minecraft/OneSixInstance.h
+++ b/logic/minecraft/onesix/OneSixInstance.h
diff --git a/logic/minecraft/OneSixProfileStrategy.cpp b/logic/minecraft/onesix/OneSixProfileStrategy.cpp
index 3e3534a0..35ca769f 100644
--- a/logic/minecraft/OneSixProfileStrategy.cpp
+++ b/logic/minecraft/onesix/OneSixProfileStrategy.cpp
@@ -1,6 +1,7 @@
-#include "minecraft/OneSixProfileStrategy.h"
+#include "OneSixProfileStrategy.h"
+#include "OneSixInstance.h"
+
#include "minecraft/VersionBuildError.h"
-#include "minecraft/OneSixInstance.h"
#include "minecraft/MinecraftVersionList.h"
#include "Env.h"
#include <FileSystem.h>
diff --git a/logic/minecraft/OneSixProfileStrategy.h b/logic/minecraft/onesix/OneSixProfileStrategy.h
index a6abe964..96c1ba7b 100644
--- a/logic/minecraft/OneSixProfileStrategy.h
+++ b/logic/minecraft/onesix/OneSixProfileStrategy.h
@@ -1,5 +1,5 @@
#pragma once
-#include "ProfileStrategy.h"
+#include "minecraft/ProfileStrategy.h"
class OneSixInstance;
diff --git a/logic/minecraft/OneSixUpdate.cpp b/logic/minecraft/onesix/OneSixUpdate.cpp
index 5babb0b6..3fd66920 100644
--- a/logic/minecraft/OneSixUpdate.cpp
+++ b/logic/minecraft/onesix/OneSixUpdate.cpp
@@ -15,6 +15,7 @@
#include "Env.h"
#include "OneSixUpdate.h"
+#include "OneSixInstance.h"
#include <QtNetwork>
@@ -28,8 +29,7 @@
#include "minecraft/MinecraftVersionList.h"
#include "minecraft/MinecraftProfile.h"
#include "minecraft/RawLibrary.h"
-#include "minecraft/OneSixInstance.h"
-#include "forge/ForgeMirrors.h"
+#include "minecraft/forge/ForgeMirrors.h"
#include "net/URLConstants.h"
#include "minecraft/AssetsUtils.h"
#include "Exception.h"
diff --git a/logic/minecraft/OneSixUpdate.h b/logic/minecraft/onesix/OneSixUpdate.h
index 6901e3d6..6901e3d6 100644
--- a/logic/minecraft/OneSixUpdate.h
+++ b/logic/minecraft/onesix/OneSixUpdate.h