summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt107
-rw-r--r--MultiMC.cpp8
-rw-r--r--gui/MainWindow.cpp10
-rw-r--r--gui/MainWindow.h5
-rw-r--r--gui/dialogs/CopyInstanceDialog.cpp1
-rw-r--r--gui/dialogs/InstanceEditDialog.cpp4
-rw-r--r--gui/dialogs/InstanceSettings.cpp7
-rw-r--r--gui/dialogs/InstanceSettings.h2
-rw-r--r--gui/dialogs/LwjglSelectDialog.cpp2
-rw-r--r--gui/dialogs/NewInstanceDialog.cpp2
-rw-r--r--gui/dialogs/SettingsDialog.cpp7
-rw-r--r--gui/dialogs/SettingsDialog.h2
-rw-r--r--gui/dialogs/VersionSelectDialog.cpp2
-rw-r--r--gui/groupview/InstanceDelegate.cpp2
-rw-r--r--logic/BaseInstaller.cpp9
-rw-r--r--logic/BaseInstance.cpp2
-rw-r--r--logic/BaseInstance.h2
-rw-r--r--logic/BaseVersionList.cpp (renamed from logic/lists/BaseVersionList.cpp)2
-rw-r--r--logic/BaseVersionList.h (renamed from logic/lists/BaseVersionList.h)0
-rw-r--r--logic/InstanceFactory.cpp27
-rw-r--r--logic/InstanceLauncher.cpp2
-rw-r--r--logic/InstanceList.cpp (renamed from logic/lists/InstanceList.cpp)6
-rw-r--r--logic/InstanceList.h (renamed from logic/lists/InstanceList.h)0
-rw-r--r--logic/LegacyUpdate.cpp20
-rw-r--r--logic/LwjglVersionList.cpp (renamed from logic/lists/LwjglVersionList.cpp)0
-rw-r--r--logic/LwjglVersionList.h (renamed from logic/lists/LwjglVersionList.h)0
-rw-r--r--logic/OneSixFTBInstance.cpp6
-rw-r--r--logic/OneSixInstance.cpp21
-rw-r--r--logic/OneSixInstance.h4
-rw-r--r--logic/OneSixInstance_p.h7
-rw-r--r--logic/OneSixUpdate.cpp19
-rw-r--r--logic/forge/ForgeInstaller.cpp4
-rw-r--r--logic/forge/ForgeVersionList.h2
-rw-r--r--logic/java/JavaChecker.cpp (renamed from logic/JavaChecker.cpp)0
-rw-r--r--logic/java/JavaChecker.h (renamed from logic/JavaChecker.h)0
-rw-r--r--logic/java/JavaCheckerJob.cpp (renamed from logic/JavaCheckerJob.cpp)0
-rw-r--r--logic/java/JavaCheckerJob.h (renamed from logic/JavaCheckerJob.h)0
-rw-r--r--logic/java/JavaUtils.cpp (renamed from logic/JavaUtils.cpp)8
-rw-r--r--logic/java/JavaUtils.h (renamed from logic/JavaUtils.h)2
-rw-r--r--logic/java/JavaVersionList.cpp (renamed from logic/lists/JavaVersionList.cpp)10
-rw-r--r--logic/java/JavaVersionList.h (renamed from logic/lists/JavaVersionList.h)4
-rw-r--r--logic/liteloader/LiteLoaderInstaller.cpp4
-rw-r--r--logic/liteloader/LiteLoaderVersionList.h4
-rw-r--r--logic/minecraft/MinecraftVersion.h (renamed from logic/MinecraftVersion.h)2
-rw-r--r--logic/minecraft/MinecraftVersionList.cpp (renamed from logic/lists/MinecraftVersionList.cpp)0
-rw-r--r--logic/minecraft/MinecraftVersionList.h (renamed from logic/lists/MinecraftVersionList.h)4
-rw-r--r--logic/minecraft/OneSixLibrary.cpp (renamed from logic/OneSixLibrary.cpp)0
-rw-r--r--logic/minecraft/OneSixLibrary.h (renamed from logic/OneSixLibrary.h)2
-rw-r--r--logic/minecraft/OneSixRule.cpp (renamed from logic/OneSixRule.cpp)0
-rw-r--r--logic/minecraft/OneSixRule.h (renamed from logic/OneSixRule.h)2
-rw-r--r--logic/minecraft/OneSixVersionBuilder.cpp (renamed from logic/OneSixVersionBuilder.cpp)17
-rw-r--r--logic/minecraft/OneSixVersionBuilder.h (renamed from logic/OneSixVersionBuilder.h)0
-rw-r--r--logic/minecraft/OpSys.cpp (renamed from logic/OpSys.cpp)0
-rw-r--r--logic/minecraft/OpSys.h (renamed from logic/OpSys.h)0
-rw-r--r--logic/minecraft/VersionFile.cpp (renamed from logic/VersionFile.cpp)10
-rw-r--r--logic/minecraft/VersionFile.h (renamed from logic/VersionFile.h)4
-rw-r--r--logic/minecraft/VersionFinal.cpp (renamed from logic/VersionFinal.cpp)10
-rw-r--r--logic/minecraft/VersionFinal.h (renamed from logic/VersionFinal.h)0
58 files changed, 188 insertions, 189 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8686023..4459b92e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -359,17 +359,13 @@ SET(MULTIMC_SOURCES
gui/groupview/InstanceDelegate.cpp
gui/groupview/InstanceDelegate.h
- # Base classes and infrastructure
+ # LOGIC - Base classes and infrastructure
logic/BaseVersion.h
- logic/MinecraftVersion.h
logic/InstanceFactory.h
logic/InstanceFactory.cpp
logic/BaseInstance.h
logic/BaseInstance.cpp
logic/BaseInstance_p.h
-
- logic/MinecraftProcess.h
- logic/MinecraftProcess.cpp
logic/Mod.h
logic/Mod.cpp
logic/ModList.h
@@ -379,9 +375,27 @@ SET(MULTIMC_SOURCES
logic/VersionFilterData.h
logic/VersionFilterData.cpp
- # Basic instance launcher for starting from terminal
+ # Instance launch
logic/InstanceLauncher.h
logic/InstanceLauncher.cpp
+ logic/MinecraftProcess.h
+ logic/MinecraftProcess.cpp
+
+ # URN parser/resolver
+ logic/URNResolver.cpp
+ logic/URNResolver.h
+
+ # Annoying nag screen logic
+ logic/NagUtils.h
+ logic/NagUtils.cpp
+
+ # Player skin utilities
+ logic/SkinUtils.h
+ logic/SkinUtils.cpp
+
+ # misc model filter
+ logic/EnabledItemFilter.h
+ logic/EnabledItemFilter.cpp
# JSON parsing helpers
logic/MMCJson.h
@@ -453,22 +467,34 @@ SET(MULTIMC_SOURCES
logic/OneSixInstance_p.h
# OneSix version json infrastructure
- logic/OneSixVersionBuilder.h
- logic/OneSixVersionBuilder.cpp
- logic/VersionFile.h
- logic/VersionFile.cpp
- logic/VersionFinal.h
- logic/VersionFinal.cpp
- logic/OneSixLibrary.h
- logic/OneSixLibrary.cpp
- logic/OneSixRule.h
- logic/OneSixRule.cpp
- logic/OpSys.h
- logic/OpSys.cpp
-
- # Mod installers
+ logic/minecraft/MinecraftVersion.h
+ logic/minecraft/OneSixVersionBuilder.h
+ logic/minecraft/OneSixVersionBuilder.cpp
+ logic/minecraft/VersionFile.h
+ logic/minecraft/VersionFile.cpp
+ logic/minecraft/VersionFinal.h
+ logic/minecraft/VersionFinal.cpp
+ logic/minecraft/OneSixLibrary.h
+ logic/minecraft/OneSixLibrary.cpp
+ logic/minecraft/OneSixRule.h
+ logic/minecraft/OneSixRule.cpp
+ logic/minecraft/MinecraftVersionList.h
+ logic/minecraft/MinecraftVersionList.cpp
+
+ # Trivial operating system utilities
+ logic/minecraft/OpSys.h
+ logic/minecraft/OpSys.cpp
+
+ # Various base classes
logic/BaseInstaller.h
logic/BaseInstaller.cpp
+ logic/BaseVersionList.h
+ logic/BaseVersionList.cpp
+
+ logic/InstanceList.h
+ logic/InstanceList.cpp
+ logic/LwjglVersionList.h
+ logic/LwjglVersionList.cpp
# FTB
logic/OneSixFTBInstance.h
@@ -476,18 +502,6 @@ SET(MULTIMC_SOURCES
logic/LegacyFTBInstance.h
logic/LegacyFTBInstance.cpp
- # Lists
- logic/lists/InstanceList.h
- logic/lists/InstanceList.cpp
- logic/lists/BaseVersionList.h
- logic/lists/BaseVersionList.cpp
- logic/lists/MinecraftVersionList.h
- logic/lists/MinecraftVersionList.cpp
- logic/lists/LwjglVersionList.h
- logic/lists/LwjglVersionList.cpp
- logic/lists/JavaVersionList.h
- logic/lists/JavaVersionList.cpp
-
# the screenshots feature
logic/screenshots/Screenshot.h
logic/screenshots/Screenshot.cpp
@@ -504,11 +518,6 @@ SET(MULTIMC_SOURCES
logic/icons/IconList.h
logic/icons/IconList.cpp
-
- # misc model/view
- logic/EnabledItemFilter.h
- logic/EnabledItemFilter.cpp
-
# Tasks
logic/tasks/ProgressProvider.h
logic/tasks/Task.h
@@ -518,17 +527,15 @@ SET(MULTIMC_SOURCES
logic/tasks/SequentialTask.h
logic/tasks/SequentialTask.cpp
- # Utilities
- logic/JavaChecker.h
- logic/JavaChecker.cpp
- logic/JavaUtils.h
- logic/JavaUtils.cpp
- logic/NagUtils.h
- logic/NagUtils.cpp
- logic/SkinUtils.h
- logic/SkinUtils.cpp
- logic/JavaCheckerJob.h
- logic/JavaCheckerJob.cpp
+ # Java related code
+ logic/java/JavaChecker.h
+ logic/java/JavaChecker.cpp
+ logic/java/JavaUtils.h
+ logic/java/JavaUtils.cpp
+ logic/java/JavaVersionList.h
+ logic/java/JavaVersionList.cpp
+ logic/java/JavaCheckerJob.h
+ logic/java/JavaCheckerJob.cpp
# Assets
logic/assets/AssetsMigrateTask.h
@@ -568,10 +575,6 @@ SET(MULTIMC_SOURCES
logic/liteloader/LiteLoaderInstaller.cpp
logic/liteloader/LiteLoaderVersionList.h
logic/liteloader/LiteLoaderVersionList.cpp
-
- # MultiMC URN resolver
- logic/URNResolver.cpp
- logic/URNResolver.h
)
diff --git a/MultiMC.cpp b/MultiMC.cpp
index 6b5545c1..073646ec 100644
--- a/MultiMC.cpp
+++ b/MultiMC.cpp
@@ -12,11 +12,11 @@
#include <QDesktopServices>
#include "gui/dialogs/VersionSelectDialog.h"
-#include "logic/lists/InstanceList.h"
+#include "logic/InstanceList.h"
#include "logic/auth/MojangAccountList.h"
#include "logic/icons/IconList.h"
-#include "logic/lists/LwjglVersionList.h"
-#include "logic/lists/MinecraftVersionList.h"
+#include "logic/LwjglVersionList.h"
+#include "logic/minecraft/MinecraftVersionList.h"
#include "logic/liteloader/LiteLoaderVersionList.h"
#include "logic/forge/ForgeVersionList.h"
@@ -29,7 +29,7 @@
#include "logic/net/HttpMetaCache.h"
#include "logic/net/URLConstants.h"
-#include "logic/JavaUtils.h"
+#include "logic/java/JavaUtils.h"
#include "logic/updater/UpdateChecker.h"
#include "logic/updater/NotificationChecker.h"
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 95f2ac4c..679938f3 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -69,11 +69,11 @@
#include "gui/ConsoleWindow.h"
-#include "logic/lists/InstanceList.h"
-#include "logic/lists/MinecraftVersionList.h"
-#include "logic/lists/LwjglVersionList.h"
+#include "logic/InstanceList.h"
+#include "logic/minecraft/MinecraftVersionList.h"
+#include "logic/LwjglVersionList.h"
#include "logic/icons/IconList.h"
-#include "logic/lists/JavaVersionList.h"
+#include "logic/java/JavaVersionList.h"
#include "logic/auth/flows/AuthenticateTask.h"
#include "logic/auth/flows/RefreshTask.h"
@@ -91,7 +91,7 @@
#include "logic/InstanceFactory.h"
#include "logic/MinecraftProcess.h"
#include "logic/OneSixUpdate.h"
-#include "logic/JavaUtils.h"
+#include "logic/java/JavaUtils.h"
#include "logic/NagUtils.h"
#include "logic/SkinUtils.h"
diff --git a/gui/MainWindow.h b/gui/MainWindow.h
index 0cd2e84b..cc8b7c99 100644
--- a/gui/MainWindow.h
+++ b/gui/MainWindow.h
@@ -19,11 +19,10 @@
#include <QProcess>
#include <QTimer>
-#include "logic/lists/InstanceList.h"
+#include "logic/InstanceList.h"
#include "logic/BaseInstance.h"
-
#include "logic/auth/MojangAccount.h"
-#include <logic/net/NetJob.h>
+#include "logic/net/NetJob.h"
class QToolButton;
class LabeledToolButton;
diff --git a/gui/dialogs/CopyInstanceDialog.cpp b/gui/dialogs/CopyInstanceDialog.cpp
index 71429367..188cf274 100644
--- a/gui/dialogs/CopyInstanceDialog.cpp
+++ b/gui/dialogs/CopyInstanceDialog.cpp
@@ -28,7 +28,6 @@
#include "logic/InstanceFactory.h"
#include "logic/BaseVersion.h"
#include "logic/icons/IconList.h"
-#include "logic/lists/MinecraftVersionList.h"
#include "logic/tasks/Task.h"
#include "logic/BaseInstance.h"
diff --git a/gui/dialogs/InstanceEditDialog.cpp b/gui/dialogs/InstanceEditDialog.cpp
index a74f3dcb..fc2d6a75 100644
--- a/gui/dialogs/InstanceEditDialog.cpp
+++ b/gui/dialogs/InstanceEditDialog.cpp
@@ -34,13 +34,13 @@
#include "InstanceSettings.h"
#include "logic/ModList.h"
-#include "logic/VersionFinal.h"
+#include "logic/minecraft/VersionFinal.h"
#include "logic/EnabledItemFilter.h"
#include "logic/forge/ForgeVersionList.h"
#include "logic/forge/ForgeInstaller.h"
#include "logic/liteloader/LiteLoaderVersionList.h"
#include "logic/liteloader/LiteLoaderInstaller.h"
-#include "logic/OneSixVersionBuilder.h"
+#include "logic/minecraft/OneSixVersionBuilder.h"
#include "logic/auth/MojangAccountList.h"
#include <QAbstractItemModel>
diff --git a/gui/dialogs/InstanceSettings.cpp b/gui/dialogs/InstanceSettings.cpp
index edb4a921..9f0cae3b 100644
--- a/gui/dialogs/InstanceSettings.cpp
+++ b/gui/dialogs/InstanceSettings.cpp
@@ -23,10 +23,11 @@
#include "gui/Platform.h"
#include "gui/dialogs/VersionSelectDialog.h"
-#include "logic/JavaUtils.h"
#include "logic/NagUtils.h"
-#include "logic/lists/JavaVersionList.h"
-#include "logic/JavaChecker.h"
+
+#include "logic/java/JavaUtils.h"
+#include "logic/java/JavaVersionList.h"
+#include "logic/java/JavaChecker.h"
#include <QFileDialog>
#include <QMessageBox>
diff --git a/gui/dialogs/InstanceSettings.h b/gui/dialogs/InstanceSettings.h
index e296db4c..6895589f 100644
--- a/gui/dialogs/InstanceSettings.h
+++ b/gui/dialogs/InstanceSettings.h
@@ -17,7 +17,7 @@
#include <QDialog>
#include "settingsobject.h"
-#include "logic/JavaChecker.h"
+#include "logic/java/JavaChecker.h"
namespace Ui
{
diff --git a/gui/dialogs/LwjglSelectDialog.cpp b/gui/dialogs/LwjglSelectDialog.cpp
index 046a4e2e..e64228b2 100644
--- a/gui/dialogs/LwjglSelectDialog.cpp
+++ b/gui/dialogs/LwjglSelectDialog.cpp
@@ -18,7 +18,7 @@
#include "ui_LwjglSelectDialog.h"
#include "gui/Platform.h"
-#include "logic/lists/LwjglVersionList.h"
+#include "logic/LwjglVersionList.h"
LWJGLSelectDialog::LWJGLSelectDialog(QWidget *parent)
: QDialog(parent), ui(new Ui::LWJGLSelectDialog)
diff --git a/gui/dialogs/NewInstanceDialog.cpp b/gui/dialogs/NewInstanceDialog.cpp
index c7b273af..3192a1cd 100644
--- a/gui/dialogs/NewInstanceDialog.cpp
+++ b/gui/dialogs/NewInstanceDialog.cpp
@@ -20,7 +20,7 @@
#include "logic/InstanceFactory.h"
#include "logic/BaseVersion.h"
#include "logic/icons/IconList.h"
-#include "logic/lists/MinecraftVersionList.h"
+#include "logic/minecraft/MinecraftVersionList.h"
#include "logic/tasks/Task.h"
#include "gui/Platform.h"
diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp
index 2dd19077..4c69c785 100644
--- a/gui/dialogs/SettingsDialog.cpp
+++ b/gui/dialogs/SettingsDialog.cpp
@@ -22,10 +22,11 @@
#include "gui/dialogs/VersionSelectDialog.h"
#include "gui/dialogs/CustomMessageBox.h"
-#include "logic/JavaUtils.h"
#include "logic/NagUtils.h"
-#include "logic/lists/JavaVersionList.h"
-#include <logic/JavaChecker.h>
+
+#include "logic/java/JavaUtils.h"
+#include "logic/java/JavaVersionList.h"
+#include "logic/java/JavaChecker.h"
#include "logic/updater/UpdateChecker.h"
diff --git a/gui/dialogs/SettingsDialog.h b/gui/dialogs/SettingsDialog.h
index d8495fdd..c65e9fb5 100644
--- a/gui/dialogs/SettingsDialog.h
+++ b/gui/dialogs/SettingsDialog.h
@@ -18,7 +18,7 @@
#include <memory>
#include <QDialog>
-#include "logic/JavaChecker.h"
+#include "logic/java/JavaChecker.h"
class SettingsObject;
diff --git a/gui/dialogs/VersionSelectDialog.cpp b/gui/dialogs/VersionSelectDialog.cpp
index cae5a732..fd8b569d 100644
--- a/gui/dialogs/VersionSelectDialog.cpp
+++ b/gui/dialogs/VersionSelectDialog.cpp
@@ -24,7 +24,7 @@
#include "gui/Platform.h"
#include <logic/BaseVersion.h>
-#include <logic/lists/BaseVersionList.h>
+#include <logic/BaseVersionList.h>
#include <logic/tasks/Task.h>
VersionSelectDialog::VersionSelectDialog(BaseVersionList *vlist, QString title, QWidget *parent,
diff --git a/gui/groupview/InstanceDelegate.cpp b/gui/groupview/InstanceDelegate.cpp
index cd26ddaa..64dc31d2 100644
--- a/gui/groupview/InstanceDelegate.cpp
+++ b/gui/groupview/InstanceDelegate.cpp
@@ -22,7 +22,7 @@
#include "GroupView.h"
#include "logic/BaseInstance.h"
-#include "logic/lists/InstanceList.h"
+#include "logic/InstanceList.h"
QCache<QString, QPixmap> ListViewDelegate::m_pixmapCache;
diff --git a/logic/BaseInstaller.cpp b/logic/BaseInstaller.cpp
index 669fd0ac..5660eb07 100644
--- a/logic/BaseInstaller.cpp
+++ b/logic/BaseInstaller.cpp
@@ -13,15 +13,10 @@
* limitations under the License.
*/
-#include "BaseInstaller.h"
-
#include <QFile>
-#include "VersionFinal.h"
-#include "OneSixLibrary.h"
-#include "OneSixInstance.h"
-
-#include "cmdutils.h"
+#include "logic/BaseInstaller.h"
+#include "logic/OneSixInstance.h"
BaseInstaller::BaseInstaller()
{
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp
index 5fa62593..59aada40 100644
--- a/logic/BaseInstance.cpp
+++ b/logic/BaseInstance.cpp
@@ -27,7 +27,7 @@
#include "pathutils.h"
#include <cmdutils.h>
-#include "lists/MinecraftVersionList.h"
+#include "logic/minecraft/MinecraftVersionList.h"
#include "logic/icons/IconList.h"
BaseInstance::BaseInstance(BaseInstancePrivate *d_in, const QString &rootDir,
diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h
index 41ceda39..d272dc71 100644
--- a/logic/BaseInstance.h
+++ b/logic/BaseInstance.h
@@ -22,7 +22,7 @@
#include <settingsobject.h>
#include "inifile.h"
-#include "lists/BaseVersionList.h"
+#include "logic/BaseVersionList.h"
#include "logic/auth/MojangAccount.h"
class QDialog;
diff --git a/logic/lists/BaseVersionList.cpp b/logic/BaseVersionList.cpp
index 6e2c5282..b34750b5 100644
--- a/logic/lists/BaseVersionList.cpp
+++ b/logic/BaseVersionList.cpp
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-#include "logic/lists/BaseVersionList.h"
+#include "logic/BaseVersionList.h"
#include "logic/BaseVersion.h"
BaseVersionList::BaseVersionList(QObject *parent) : QAbstractListModel(parent)
diff --git a/logic/lists/BaseVersionList.h b/logic/BaseVersionList.h
index 21b44e8d..21b44e8d 100644
--- a/logic/lists/BaseVersionList.h
+++ b/logic/BaseVersionList.h
diff --git a/logic/InstanceFactory.cpp b/logic/InstanceFactory.cpp
index 955a3f5b..c0a392e0 100644
--- a/logic/InstanceFactory.cpp
+++ b/logic/InstanceFactory.cpp
@@ -13,27 +13,26 @@
* limitations under the License.
*/
-#include "InstanceFactory.h"
-
#include <QDir>
#include <QFileInfo>
-
-#include "BaseInstance.h"
-#include "LegacyInstance.h"
-#include "LegacyFTBInstance.h"
-#include "OneSixInstance.h"
-#include "OneSixFTBInstance.h"
-#include "OneSixInstance.h"
-#include "BaseVersion.h"
-#include "MinecraftVersion.h"
-
-#include "inifile.h"
+#include <inifile.h>
#include <inisettingsobject.h>
#include <setting.h>
-#include "pathutils.h"
+#include <pathutils.h>
#include "logger/QsLog.h"
+#include "logic/InstanceFactory.h"
+
+#include "logic/BaseInstance.h"
+#include "logic/LegacyInstance.h"
+#include "logic/LegacyFTBInstance.h"
+#include "logic/OneSixInstance.h"
+#include "logic/OneSixFTBInstance.h"
+#include "logic/OneSixInstance.h"
+#include "logic/BaseVersion.h"
+#include "logic/minecraft/MinecraftVersion.h"
+
InstanceFactory InstanceFactory::loader;
InstanceFactory::InstanceFactory() : QObject(NULL)
diff --git a/logic/InstanceLauncher.cpp b/logic/InstanceLauncher.cpp
index c0079d80..9170c87f 100644
--- a/logic/InstanceLauncher.cpp
+++ b/logic/InstanceLauncher.cpp
@@ -22,7 +22,7 @@
#include "gui/dialogs/ProgressDialog.h"
#include "logic/MinecraftProcess.h"
-#include "logic/lists/InstanceList.h"
+#include "logic/InstanceList.h"
InstanceLauncher::InstanceLauncher(QString instId) : QObject(), instId(instId)
{
diff --git a/logic/lists/InstanceList.cpp b/logic/InstanceList.cpp
index 8808d6b5..7b9c8b2b 100644
--- a/logic/lists/InstanceList.cpp
+++ b/logic/InstanceList.cpp
@@ -27,13 +27,13 @@
#include <pathutils.h>
#include "MultiMC.h"
-#include "logic/lists/InstanceList.h"
+#include "logic/InstanceList.h"
#include "logic/icons/IconList.h"
-#include "logic/lists/MinecraftVersionList.h"
+#include "logic/minecraft/MinecraftVersionList.h"
#include "logic/BaseInstance.h"
#include "logic/InstanceFactory.h"
#include "logger/QsLog.h"
-#include <gui/groupview/GroupView.h>
+#include "gui/groupview/GroupView.h"
const static int GROUP_FILE_FORMAT_VERSION = 1;
diff --git a/logic/lists/InstanceList.h b/logic/InstanceList.h
index f0bbb7ec..f0bbb7ec 100644
--- a/logic/lists/InstanceList.h
+++ b/logic/InstanceList.h
diff --git a/logic/LegacyUpdate.cpp b/logic/LegacyUpdate.cpp
index aea88c95..00ee795d 100644
--- a/logic/LegacyUpdate.cpp
+++ b/logic/LegacyUpdate.cpp
@@ -13,20 +13,24 @@
* limitations under the License.
*/
-#include "LegacyUpdate.h"
-#include "lists/LwjglVersionList.h"
-#include "lists/MinecraftVersionList.h"
-#include "BaseInstance.h"
-#include "LegacyInstance.h"
-#include "MultiMC.h"
-#include "ModList.h"
+#include <QStringList>
+
#include <pathutils.h>
#include <quazip.h>
#include <quazipfile.h>
#include <JlCompress.h>
+
+#include "logic/LegacyUpdate.h"
+#include "logic/LwjglVersionList.h"
+#include "logic/minecraft/MinecraftVersionList.h"
+#include "logic/BaseInstance.h"
+#include "logic/LegacyInstance.h"
+#include "MultiMC.h"
+#include "logic/ModList.h"
+
#include "logger/QsLog.h"
#include "logic/net/URLConstants.h"
-#include <QStringList>
+
LegacyUpdate::LegacyUpdate(BaseInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
{
diff --git a/logic/lists/LwjglVersionList.cpp b/logic/LwjglVersionList.cpp
index df46d7be..df46d7be 100644
--- a/logic/lists/LwjglVersionList.cpp
+++ b/logic/LwjglVersionList.cpp
diff --git a/logic/lists/LwjglVersionList.h b/logic/LwjglVersionList.h
index fa57e8eb..fa57e8eb 100644
--- a/logic/lists/LwjglVersionList.h
+++ b/logic/LwjglVersionList.h
diff --git a/logic/OneSixFTBInstance.cpp b/logic/OneSixFTBInstance.cpp
index 131dbde3..491b15ba 100644
--- a/logic/OneSixFTBInstance.cpp
+++ b/logic/OneSixFTBInstance.cpp
@@ -1,12 +1,12 @@
#include "OneSixFTBInstance.h"
-#include "VersionFinal.h"
-#include "OneSixLibrary.h"
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/minecraft/OneSixLibrary.h"
+#include "logic/minecraft/OneSixVersionBuilder.h"
#include "tasks/SequentialTask.h"
#include "forge/ForgeInstaller.h"
#include "forge/ForgeVersionList.h"
#include "OneSixInstance_p.h"
-#include "OneSixVersionBuilder.h"
#include "MultiMC.h"
#include "pathutils.h"
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp
index 67953f95..2c67f7a9 100644
--- a/logic/OneSixInstance.cpp
+++ b/logic/OneSixInstance.cpp
@@ -13,21 +13,22 @@
* limitations under the License.
*/
-#include "OneSixInstance.h"
-
#include <QIcon>
-
-#include "OneSixInstance_p.h"
-#include "OneSixUpdate.h"
-#include "VersionFinal.h"
-#include "pathutils.h"
+#include <pathutils.h>
#include "logger/QsLog.h"
-#include "assets/AssetsUtils.h"
#include "MultiMC.h"
+#include "MMCError.h"
+
+#include "logic/OneSixInstance.h"
+
+#include "logic/OneSixInstance_p.h"
+#include "logic/OneSixUpdate.h"
+#include "logic/minecraft/VersionFinal.h"
+
+#include "logic/assets/AssetsUtils.h"
#include "icons/IconList.h"
-#include "MinecraftProcess.h"
+#include "logic/MinecraftProcess.h"
#include "gui/dialogs/InstanceEditDialog.h"
-#include <MMCError.h>
OneSixInstance::OneSixInstance(const QString &rootDir, SettingsObject *settings,
QObject *parent)
diff --git a/logic/OneSixInstance.h b/logic/OneSixInstance.h
index 80b197c4..00653def 100644
--- a/logic/OneSixInstance.h
+++ b/logic/OneSixInstance.h
@@ -17,8 +17,8 @@
#include "BaseInstance.h"
-#include "VersionFinal.h"
-#include "ModList.h"
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/ModList.h"
class OneSixInstance : public BaseInstance
{
diff --git a/logic/OneSixInstance_p.h b/logic/OneSixInstance_p.h
index e75a8da3..90802c24 100644
--- a/logic/OneSixInstance_p.h
+++ b/logic/OneSixInstance_p.h
@@ -15,9 +15,10 @@
#pragma once
-#include "BaseInstance_p.h"
-#include "VersionFinal.h"
-#include "ModList.h"
+#include "logic/BaseInstance_p.h"
+
+class ModList;
+class VersionFinal;
class OneSixInstancePrivate : public BaseInstancePrivate
{
diff --git a/logic/OneSixUpdate.cpp b/logic/OneSixUpdate.cpp
index 230ef9a9..66a699fe 100644
--- a/logic/OneSixUpdate.cpp
+++ b/logic/OneSixUpdate.cpp
@@ -22,18 +22,17 @@
#include <QFileInfo>
#include <QTextStream>
#include <QDataStream>
+#include <pathutils.h>
+#include <JlCompress.h>
-#include "BaseInstance.h"
-#include "lists/MinecraftVersionList.h"
-#include "VersionFinal.h"
-#include "OneSixLibrary.h"
-#include "OneSixInstance.h"
+#include "logic/BaseInstance.h"
+#include "logic/minecraft/MinecraftVersionList.h"
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/minecraft/OneSixLibrary.h"
+#include "logic/OneSixInstance.h"
#include "logic/forge/ForgeMirrors.h"
-#include "net/URLConstants.h"
-#include "assets/AssetsUtils.h"
-
-#include "pathutils.h"
-#include <JlCompress.h>
+#include "logic/net/URLConstants.h"
+#include "logic/assets/AssetsUtils.h"
OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent)
: Task(parent), m_inst(inst)
diff --git a/logic/forge/ForgeInstaller.cpp b/logic/forge/ForgeInstaller.cpp
index 3b13a7cd..0e7b26f7 100644
--- a/logic/forge/ForgeInstaller.cpp
+++ b/logic/forge/ForgeInstaller.cpp
@@ -14,8 +14,8 @@
*/
#include "ForgeInstaller.h"
-#include "logic/VersionFinal.h"
-#include "logic/OneSixLibrary.h"
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/minecraft/OneSixLibrary.h"
#include "logic/net/HttpMetaCache.h"
#include "logic/tasks/Task.h"
#include "logic/OneSixInstance.h"
diff --git a/logic/forge/ForgeVersionList.h b/logic/forge/ForgeVersionList.h
index 2c020b0f..477edb3d 100644
--- a/logic/forge/ForgeVersionList.h
+++ b/logic/forge/ForgeVersionList.h
@@ -20,7 +20,7 @@
#include <QUrl>
#include <QNetworkReply>
-#include "logic/lists/BaseVersionList.h"
+#include "logic/BaseVersionList.h"
#include "logic/tasks/Task.h"
#include "logic/net/NetJob.h"
#include "logic/forge/ForgeVersion.h"
diff --git a/logic/JavaChecker.cpp b/logic/java/JavaChecker.cpp
index b87ee3d5..b87ee3d5 100644
--- a/logic/JavaChecker.cpp
+++ b/logic/java/JavaChecker.cpp
diff --git a/logic/JavaChecker.h b/logic/java/JavaChecker.h
index e19895f7..e19895f7 100644
--- a/logic/JavaChecker.h
+++ b/logic/java/JavaChecker.h
diff --git a/logic/JavaCheckerJob.cpp b/logic/java/JavaCheckerJob.cpp
index b0aea758..b0aea758 100644
--- a/logic/JavaCheckerJob.cpp
+++ b/logic/java/JavaCheckerJob.cpp
diff --git a/logic/JavaCheckerJob.h b/logic/java/JavaCheckerJob.h
index 132a92d4..132a92d4 100644
--- a/logic/JavaCheckerJob.h
+++ b/logic/java/JavaCheckerJob.h
diff --git a/logic/JavaUtils.cpp b/logic/java/JavaUtils.cpp
index 3a3046bd..1be93a9b 100644
--- a/logic/JavaUtils.cpp
+++ b/logic/java/JavaUtils.cpp
@@ -16,7 +16,6 @@
#include <QStringList>
#include <QString>
#include <QDir>
-#include <QMessageBox>
#include <QStringList>
#include <setting.h>
@@ -24,11 +23,10 @@
#include "MultiMC.h"
-#include "JavaUtils.h"
#include "logger/QsLog.h"
-#include "gui/dialogs/VersionSelectDialog.h"
-#include "JavaCheckerJob.h"
-#include "lists/JavaVersionList.h"
+#include "logic/java/JavaUtils.h"
+#include "logic/java/JavaCheckerJob.h"
+#include "logic/java/JavaVersionList.h"
JavaUtils::JavaUtils()
{
diff --git a/logic/JavaUtils.h b/logic/java/JavaUtils.h
index 22a68ef3..af92100f 100644
--- a/logic/JavaUtils.h
+++ b/logic/java/JavaUtils.h
@@ -21,7 +21,7 @@
#include <osutils.h>
#include "JavaCheckerJob.h"
#include "JavaChecker.h"
-#include "lists/JavaVersionList.h"
+#include "JavaVersionList.h"
#if WINDOWS
#include <windows.h>
diff --git a/logic/lists/JavaVersionList.cpp b/logic/java/JavaVersionList.cpp
index 4fd0bc19..dcb6ced6 100644
--- a/logic/lists/JavaVersionList.cpp
+++ b/logic/java/JavaVersionList.cpp
@@ -13,16 +13,16 @@
* limitations under the License.
*/
-#include "JavaVersionList.h"
-#include "MultiMC.h"
-
#include <QtNetwork>
#include <QtXml>
#include <QRegExp>
+#include "MultiMC.h"
#include "logger/QsLog.h"
-#include "logic/JavaCheckerJob.h"
-#include "logic/JavaUtils.h"
+
+#include "logic/java/JavaVersionList.h"
+#include "logic/java/JavaCheckerJob.h"
+#include "logic/java/JavaUtils.h"
JavaVersionList::JavaVersionList(QObject *parent) : BaseVersionList(parent)
{
diff --git a/logic/lists/JavaVersionList.h b/logic/java/JavaVersionList.h
index e6cc8e5f..a46f33a2 100644
--- a/logic/lists/JavaVersionList.h
+++ b/logic/java/JavaVersionList.h
@@ -18,9 +18,9 @@
#include <QObject>
#include <QAbstractListModel>
-#include "BaseVersionList.h"
+#include "logic/BaseVersionList.h"
#include "logic/tasks/Task.h"
-#include "logic/JavaCheckerJob.h"
+#include "logic/java/JavaCheckerJob.h"
class JavaListLoadTask;
diff --git a/logic/liteloader/LiteLoaderInstaller.cpp b/logic/liteloader/LiteLoaderInstaller.cpp
index 1a94e644..0a16ac6d 100644
--- a/logic/liteloader/LiteLoaderInstaller.cpp
+++ b/logic/liteloader/LiteLoaderInstaller.cpp
@@ -20,8 +20,8 @@
#include "logger/QsLog.h"
-#include "logic/VersionFinal.h"
-#include "logic/OneSixLibrary.h"
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/minecraft/OneSixLibrary.h"
#include "logic/OneSixInstance.h"
#include "MultiMC.h"
#include "logic/liteloader/LiteLoaderVersionList.h"
diff --git a/logic/liteloader/LiteLoaderVersionList.h b/logic/liteloader/LiteLoaderVersionList.h
index aa35f1ca..0aecc3e1 100644
--- a/logic/liteloader/LiteLoaderVersionList.h
+++ b/logic/liteloader/LiteLoaderVersionList.h
@@ -19,9 +19,9 @@
#include <QString>
#include <QStringList>
-#include "logic/lists/BaseVersionList.h"
-#include "logic/tasks/Task.h"
#include "logic/BaseVersion.h"
+#include "logic/BaseVersionList.h"
+#include "logic/tasks/Task.h"
#include "logic/net/NetJob.h"
class LLListLoadTask;
diff --git a/logic/MinecraftVersion.h b/logic/minecraft/MinecraftVersion.h
index 61f803b5..3be25912 100644
--- a/logic/MinecraftVersion.h
+++ b/logic/minecraft/MinecraftVersion.h
@@ -15,7 +15,7 @@
#pragma once
-#include "BaseVersion.h"
+#include "logic/BaseVersion.h"
#include <QStringList>
#include <QSet>
diff --git a/logic/lists/MinecraftVersionList.cpp b/logic/minecraft/MinecraftVersionList.cpp
index cdf5fa77..cdf5fa77 100644
--- a/logic/lists/MinecraftVersionList.cpp
+++ b/logic/minecraft/MinecraftVersionList.cpp
diff --git a/logic/lists/MinecraftVersionList.h b/logic/minecraft/MinecraftVersionList.h
index 4698fd8f..18b9b21e 100644
--- a/logic/lists/MinecraftVersionList.h
+++ b/logic/minecraft/MinecraftVersionList.h
@@ -19,9 +19,9 @@
#include <QList>
#include <QSet>
-#include "BaseVersionList.h"
+#include "logic/BaseVersionList.h"
#include "logic/tasks/Task.h"
-#include "logic/MinecraftVersion.h"
+#include "logic/minecraft/MinecraftVersion.h"
class MCVListLoadTask;
class QNetworkReply;
diff --git a/logic/OneSixLibrary.cpp b/logic/minecraft/OneSixLibrary.cpp
index 45fa169e..45fa169e 100644
--- a/logic/OneSixLibrary.cpp
+++ b/logic/minecraft/OneSixLibrary.cpp
diff --git a/logic/OneSixLibrary.h b/logic/minecraft/OneSixLibrary.h
index 1c7169ce..13df0606 100644
--- a/logic/OneSixLibrary.h
+++ b/logic/minecraft/OneSixLibrary.h
@@ -23,7 +23,7 @@
#include <memory>
#include "logic/net/URLConstants.h"
-#include "OpSys.h"
+#include "logic/minecraft/OpSys.h"
class Rule;
diff --git a/logic/OneSixRule.cpp b/logic/minecraft/OneSixRule.cpp
index d8d13b50..d8d13b50 100644
--- a/logic/OneSixRule.cpp
+++ b/logic/minecraft/OneSixRule.cpp
diff --git a/logic/OneSixRule.h b/logic/minecraft/OneSixRule.h
index 426e2886..2c569b9f 100644
--- a/logic/OneSixRule.h
+++ b/logic/minecraft/OneSixRule.h
@@ -17,7 +17,7 @@
#include <QString>
-#include "logic/OneSixLibrary.h"
+#include "logic/minecraft/OneSixLibrary.h"
enum RuleAction
{
diff --git a/logic/OneSixVersionBuilder.cpp b/logic/minecraft/OneSixVersionBuilder.cpp
index 3fb96c5e..da8f956c 100644
--- a/logic/OneSixVersionBuilder.cpp
+++ b/logic/minecraft/OneSixVersionBuilder.cpp
@@ -13,8 +13,6 @@
* limitations under the License.
*/
-#include "OneSixVersionBuilder.h"
-
#include <QList>
#include <QJsonObject>
#include <QJsonArray>
@@ -25,13 +23,16 @@
#include <QObject>
#include <QDir>
#include <QDebug>
+#include <modutils.h>
+
+#include "logic/minecraft/OneSixVersionBuilder.h"
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/minecraft/OneSixRule.h"
+#include "logic/minecraft/VersionFile.h"
+
+#include "logic/OneSixInstance.h"
+#include "logic/MMCJson.h"
-#include "VersionFinal.h"
-#include "OneSixInstance.h"
-#include "OneSixRule.h"
-#include "VersionFile.h"
-#include "MMCJson.h"
-#include "modutils.h"
#include "logger/QsLog.h"
OneSixVersionBuilder::OneSixVersionBuilder()
diff --git a/logic/OneSixVersionBuilder.h b/logic/minecraft/OneSixVersionBuilder.h
index 6646584e..6646584e 100644
--- a/logic/OneSixVersionBuilder.h
+++ b/logic/minecraft/OneSixVersionBuilder.h
diff --git a/logic/OpSys.cpp b/logic/minecraft/OpSys.cpp
index e001b7f3..e001b7f3 100644
--- a/logic/OpSys.cpp
+++ b/logic/minecraft/OpSys.cpp
diff --git a/logic/OpSys.h b/logic/minecraft/OpSys.h
index 363c87d7..363c87d7 100644
--- a/logic/OpSys.h
+++ b/logic/minecraft/OpSys.h
diff --git a/logic/VersionFile.cpp b/logic/minecraft/VersionFile.cpp
index 87936b6a..a011ce1a 100644
--- a/logic/VersionFile.cpp
+++ b/logic/minecraft/VersionFile.cpp
@@ -1,13 +1,13 @@
#include <QJsonArray>
#include <QJsonDocument>
-
#include <modutils.h>
#include "logger/QsLog.h"
-#include "logic/VersionFile.h"
-#include "logic/OneSixLibrary.h"
-#include "logic/VersionFinal.h"
-#include "MMCJson.h"
+
+#include "logic/minecraft/VersionFile.h"
+#include "logic/minecraft/OneSixLibrary.h"
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/MMCJson.h"
using namespace MMCJson;
diff --git a/logic/VersionFile.h b/logic/minecraft/VersionFile.h
index ae0c58a0..8234445b 100644
--- a/logic/VersionFile.h
+++ b/logic/minecraft/VersionFile.h
@@ -3,8 +3,8 @@
#include <QString>
#include <QStringList>
#include <memory>
-#include "logic/OpSys.h"
-#include "logic/OneSixRule.h"
+#include "logic/minecraft/OpSys.h"
+#include "logic/minecraft/OneSixRule.h"
#include "MMCError.h"
class VersionFinal;
diff --git a/logic/VersionFinal.cpp b/logic/minecraft/VersionFinal.cpp
index b8690740..fbf6a160 100644
--- a/logic/VersionFinal.cpp
+++ b/logic/minecraft/VersionFinal.cpp
@@ -13,17 +13,15 @@
* limitations under the License.
*/
-#include "VersionFinal.h"
-
#include <QDebug>
#include <QFile>
#include <QDir>
-
-#include "OneSixVersionBuilder.h"
-#include "OneSixInstance.h"
-#include "VersionFilterData.h"
#include <pathutils.h>
+#include "logic/minecraft/VersionFinal.h"
+#include "logic/minecraft/OneSixVersionBuilder.h"
+#include "logic/OneSixInstance.h"
+
VersionFinal::VersionFinal(OneSixInstance *instance, QObject *parent)
: QAbstractListModel(parent), m_instance(instance)
{
diff --git a/logic/VersionFinal.h b/logic/minecraft/VersionFinal.h
index ceb90f57..ceb90f57 100644
--- a/logic/VersionFinal.h
+++ b/logic/minecraft/VersionFinal.h