SCRATCH move things to the right places

CMakeLists.txt

@@ -390,10 +390,10 @@ SET(MULTIMC_SOURCES
 	logic/BaseProcess.cpp
 	logic/BaseInstance.h
 	logic/BaseInstance.cpp
-	logic/Mod.h
+	logic/minecraft/Mod.h
-	logic/Mod.cpp
+	logic/minecraft/Mod.cpp
-	logic/ModList.h
+	logic/minecraft/ModList.h
-	logic/ModList.cpp
+	logic/minecraft/ModList.cpp
 
 	# sets and maps for deciding based on versions
 	logic/minecraft/VersionFilterData.h
@@ -404,8 +404,8 @@ SET(MULTIMC_SOURCES
 	gui/NagUtils.cpp
 
 	# Player skin utilities
-	logic/SkinUtils.h
+	logic/minecraft/SkinUtils.h
-	logic/SkinUtils.cpp
+	logic/minecraft/SkinUtils.cpp
 
 	# misc model filter
 
@@ -459,8 +459,8 @@ SET(MULTIMC_SOURCES
 	logic/updater/UpdateChecker.cpp
 	logic/updater/DownloadUpdateTask.h
 	logic/updater/DownloadUpdateTask.cpp
-	logic/updater/NotificationChecker.h
+	logic/notifications/NotificationChecker.h
-	logic/updater/NotificationChecker.cpp
+	logic/notifications/NotificationChecker.cpp
 
 	# News System
 	logic/news/NewsChecker.h
@@ -473,23 +473,23 @@ SET(MULTIMC_SOURCES
 	logic/status/StatusChecker.cpp
 
 	# legacy instances
-	logic/LegacyInstance.h
+	logic/minecraft/LegacyInstance.h
-	logic/LegacyInstance.cpp
+	logic/minecraft/LegacyInstance.cpp
-	logic/LegacyUpdate.h
+	logic/minecraft/LegacyUpdate.h
-	logic/LegacyUpdate.cpp
+	logic/minecraft/LegacyUpdate.cpp
 
 	# OneSix instances
-	logic/OneSixUpdate.h
+	logic/minecraft/OneSixUpdate.h
-	logic/OneSixUpdate.cpp
+	logic/minecraft/OneSixUpdate.cpp
-	logic/OneSixInstance.h
+	logic/minecraft/OneSixInstance.h
-	logic/OneSixInstance.cpp
+	logic/minecraft/OneSixInstance.cpp
 
 	# a smart pointer wrapper intended for safer use with Qt signal/slot mechanisms
 	logic/QObjectPtr.h
 
 	# Common utils for instances
-	logic/JarUtils.h
+	logic/minecraft/JarUtils.h
-	logic/JarUtils.cpp
+	logic/minecraft/JarUtils.cpp
 
 	# Minecraft support
 	logic/minecraft/GradleSpecifier.h
@@ -541,8 +541,8 @@ SET(MULTIMC_SOURCES
 
 	logic/InstanceList.h
 	logic/InstanceList.cpp
-	logic/LwjglVersionList.h
+	logic/minecraft/LwjglVersionList.h
-	logic/LwjglVersionList.cpp
+	logic/minecraft/LwjglVersionList.cpp
 
 	# FTB
 	logic/ftb/OneSixFTBInstance.h
@@ -599,8 +599,8 @@ SET(MULTIMC_SOURCES
 	logic/java/JavaCheckerJob.cpp
 
 	# Assets
-	logic/assets/AssetsUtils.h
+	logic/minecraft/AssetsUtils.h
-	logic/assets/AssetsUtils.cpp
+	logic/minecraft/AssetsUtils.cpp
 
 	# Tools
 	logic/tools/BaseExternalTool.h

MultiMC.cpp

@@ -16,7 +16,7 @@
 #include "logic/InstanceList.h"
 #include "logic/auth/MojangAccountList.h"
 #include "logic/icons/IconList.h"
-#include "logic/LwjglVersionList.h"
+#include "logic/minecraft/LwjglVersionList.h"
 #include "logic/minecraft/MinecraftVersionList.h"
 #include "logic/liteloader/LiteLoaderVersionList.h"
 

gui/MainWindow.cpp

@@ -362,7 +362,7 @@ namespace Ui {
 
 #include "logic/InstanceList.h"
 #include "logic/minecraft/MinecraftVersionList.h"
-#include "logic/LwjglVersionList.h"
+#include "logic/minecraft/LwjglVersionList.h"
 #include "logic/icons/IconList.h"
 #include "logic/java/JavaVersionList.h"
 
@@ -378,18 +378,15 @@ namespace Ui {
 #include "logic/Env.h"
 
 #include "logic/BaseInstance.h"
-#include "logic/OneSixInstance.h"
 #include "logic/BaseProcess.h"
-#include "logic/OneSixUpdate.h"
 #include "logic/java/JavaUtils.h"
 #include "gui/NagUtils.h"
-#include "logic/SkinUtils.h"
+#include "logic/minecraft/SkinUtils.h"
 
-#include "logic/LegacyInstance.h"
+//#include "logic/minecraft/LegacyInstance.h"
 
-#include "logic/assets/AssetsUtils.h"
 #include <logic/updater/UpdateChecker.h>
-#include <logic/updater/NotificationChecker.h>
+#include <logic/notifications/NotificationChecker.h>
 #include <logic/tasks/ThreadTask.h>
 #include "logic/net/CacheDownload.h"
 

gui/dialogs/ModEditDialogCommon.h

@@ -2,7 +2,7 @@
 #include <QModelIndex>
 #include <QDesktopServices>
 #include <QWidget>
-#include <logic/Mod.h>
+#include <logic/minecraft/Mod.h>
 
 bool lastfirst(QModelIndexList &list, int &first, int &last);
 

gui/dialogs/NotificationDialog.h

@@ -3,7 +3,7 @@
 
 #include <QDialog>
 
-#include "logic/updater/NotificationChecker.h"
+#include "logic/notifications/NotificationChecker.h"
 
 namespace Ui {
 class NotificationDialog;

gui/pages/InstanceSettingsPage.h

@@ -17,9 +17,9 @@
 
 #include <QWidget>
 
-#include "logic/OneSixInstance.h"
 #include "logic/net/NetJob.h"
 #include "logic/java/JavaChecker.h"
+#include "logic/BaseInstance.h"
 #include "BasePage.h"
 #include "MultiMC.h"
 

gui/pages/LegacyJarModPage.cpp

@@ -25,8 +25,8 @@
 #include "gui/dialogs/VersionSelectDialog.h"
 #include "gui/dialogs/ProgressDialog.h"
 #include "gui/dialogs/ModEditDialogCommon.h"
-#include "logic/ModList.h"
+#include "logic/minecraft/ModList.h"
-#include "logic/LegacyInstance.h"
+#include "logic/minecraft/LegacyInstance.h"
 #include "logic/forge/ForgeVersion.h"
 #include "logic/forge/ForgeVersionList.h"
 #include "logic/Env.h"

gui/pages/LegacyUpgradePage.cpp

@@ -1,7 +1,7 @@
 #include "LegacyUpgradePage.h"
 #include "ui_LegacyUpgradePage.h"
 
-#include "logic/LegacyInstance.h"
+#include "logic/minecraft/LegacyInstance.h"
 
 LegacyUpgradePage::LegacyUpgradePage(LegacyInstance *inst, QWidget *parent)
 	: QWidget(parent), ui(new Ui::LegacyUpgradePage), m_inst(inst)

gui/pages/LegacyUpgradePage.h

@@ -17,9 +17,9 @@
 
 #include <QWidget>
 
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 #include "logic/net/NetJob.h"
-#include "BasePage.h"
+#include "gui/pages/BasePage.h"
 #include <MultiMC.h>
 
 namespace Ui

gui/pages/ModFolderPage.cpp

@@ -28,8 +28,8 @@
 #include "MultiMC.h"
 #include "gui/dialogs/CustomMessageBox.h"
 #include "gui/dialogs/ModEditDialogCommon.h"
-#include "logic/ModList.h"
+#include "logic/minecraft/ModList.h"
-#include "logic/Mod.h"
+#include "logic/minecraft/Mod.h"
 #include "logic/minecraft/VersionFilterData.h"
 
 ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, QString id,

gui/pages/ModFolderPage.h

@@ -17,7 +17,7 @@
 
 #include <QWidget>
 
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 #include "logic/net/NetJob.h"
 #include "BasePage.h"
 #include <MultiMC.h>

gui/pages/ScreenshotsPage.h

@@ -17,7 +17,6 @@
 
 #include <QWidget>
 
-#include "logic/OneSixInstance.h"
 #include "BasePage.h"
 #include <MultiMC.h>
 

gui/pages/VersionPage.cpp

@@ -37,7 +37,6 @@
 #include <QString>
 #include <QUrl>
 
-#include "logic/ModList.h"
 #include "logic/minecraft/MinecraftProfile.h"
 #include "logic/forge/ForgeVersionList.h"
 #include "logic/forge/ForgeInstaller.h"
@@ -45,7 +44,7 @@
 #include "logic/liteloader/LiteLoaderInstaller.h"
 #include "logic/minecraft/VersionBuilder.h"
 #include "logic/auth/MojangAccountList.h"
-#include "logic/Mod.h"
+#include "logic/minecraft/Mod.h"
 #include "logic/icons/IconList.h"
 
 

gui/pages/VersionPage.h

@@ -17,7 +17,7 @@
 
 #include <QWidget>
 
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 #include "logic/net/NetJob.h"
 #include "BasePage.h"
 

gui/widgets/MCModInfoFrame.h

@@ -16,7 +16,7 @@
 #pragma once
 
 #include <QFrame>
-#include "logic/Mod.h"
+#include "logic/minecraft/Mod.h"
 
 namespace Ui
 {

logic/BaseInstaller.cpp

@@ -16,7 +16,7 @@
 #include <QFile>
 
 #include "logic/BaseInstaller.h"
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 
 BaseInstaller::BaseInstaller()
 {

logic/BaseInstance.h

@@ -24,18 +24,13 @@
 #include "logic/settings/INIFile.h"
 #include "logic/BaseVersionList.h"
 #include "logic/auth/MojangAccount.h"
-#include "Mod.h"
 
-class ModList;
-class QDialog;
 class QDir;
 class Task;
 class BaseProcess;
-class OneSixUpdate;
+class BaseInstance;
-class BaseInstancePrivate;
 
 // pointer for lazy people
-class BaseInstance;
 typedef std::shared_ptr<BaseInstance> InstancePtr;
 
 /*!

logic/InstanceList.cpp

@@ -25,16 +25,18 @@
 #include <QXmlStreamReader>
 #include <QRegularExpression>
 #include <pathutils.h>
+#include <QDebug>
 
 #include "logic/InstanceList.h"
 #include "logic/icons/IconList.h"
-#include "logic/minecraft/MinecraftVersionList.h"
 #include "logic/BaseInstance.h"
-#include "logic/ftb/FTBPlugin.h"
+
+//FIXME: this really doesn't belong *here*
+#include "logic/minecraft/OneSixInstance.h"
+#include "logic/minecraft/LegacyInstance.h"
+#include "minecraft/MinecraftVersion.h"
 #include "settings/INISettingsObject.h"
-#include "OneSixInstance.h"
+#include "logic/ftb/FTBPlugin.h"
-#include "LegacyInstance.h"
-#include <QDebug>
 
 const static int GROUP_FILE_FORMAT_VERSION = 1;
 

logic/forge/ForgeInstaller.cpp

@@ -18,7 +18,7 @@
 #include "logic/minecraft/OneSixLibrary.h"
 #include "logic/net/HttpMetaCache.h"
 #include "logic/tasks/Task.h"
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 #include "logic/forge/ForgeVersionList.h"
 #include "logic/minecraft/VersionFilterData.h"
 #include "logic/Env.h"

logic/forge/LegacyForge.h

@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "logic/Mod.h"
+#include "logic/minecraft/Mod.h"
 
 class MinecraftForge : public Mod
 {

logic/ftb/LegacyFTBInstance.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "logic/LegacyInstance.h"
+#include "logic/minecraft/LegacyInstance.h"
 
 class LegacyFTBInstance : public LegacyInstance
 {

logic/ftb/OneSixFTBInstance.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 
 class OneSixLibrary;
 

logic/liteloader/LiteLoaderInstaller.cpp

@@ -22,7 +22,7 @@
 
 #include "logic/minecraft/MinecraftProfile.h"
 #include "logic/minecraft/OneSixLibrary.h"
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 #include "logic/liteloader/LiteLoaderVersionList.h"
 
 LiteLoaderInstaller::LiteLoaderInstaller() : BaseInstaller()

logic/minecraft/JarUtils.cpp

@@ -1,4 +1,4 @@
-#include "JarUtils.h"
+#include "logic/minecraft/JarUtils.h"
 #include <quazip.h>
 #include <quazipfile.h>
 #include <JlCompress.h>

logic/minecraft/LegacyInstance.cpp

@@ -22,7 +22,7 @@
 
 #include "LegacyInstance.h"
 
-#include "logic/LegacyUpdate.h"
+#include "logic/minecraft/LegacyUpdate.h"
 #include "logic/icons/IconList.h"
 #include "logic/minecraft/MinecraftProcess.h"
 #include "gui/pages/LegacyUpgradePage.h"

logic/minecraft/LegacyUpdate.cpp

@@ -14,23 +14,22 @@
  */
 
 #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 "logic/Env.h"
-#include "logic/ModList.h"
-
 #include <QDebug>
+
+#include "logic/Env.h"
+#include "logic/BaseInstance.h"
 #include "logic/net/URLConstants.h"
-#include "JarUtils.h"
+
+#include "logic/minecraft/JarUtils.h"
+#include "logic/minecraft/LegacyUpdate.h"
+#include "logic/minecraft/LwjglVersionList.h"
+#include "logic/minecraft/MinecraftVersionList.h"
+#include "logic/minecraft/ModList.h"
+#include "logic/minecraft/LegacyInstance.h"
 
 LegacyUpdate::LegacyUpdate(BaseInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
 {

logic/minecraft/LwjglVersionList.h

@@ -19,10 +19,10 @@
 #include <QAbstractListModel>
 #include <QUrl>
 #include <QNetworkReply>
-
 #include <memory>
-#include "BaseVersion.h"
+
-#include "BaseVersionList.h"
+#include "logic/BaseVersion.h"
+#include "logic/BaseVersionList.h"
 
 class LWJGLVersion;
 typedef std::shared_ptr<LWJGLVersion> PtrLWJGLVersion;

logic/minecraft/MinecraftInstance.h

@@ -1,5 +1,8 @@
 #pragma once
 #include "logic/BaseInstance.h"
+#include "logic/minecraft/Mod.h"
+
+class ModList;
 
 class MinecraftInstance: public BaseInstance
 {

logic/minecraft/MinecraftProfile.cpp

@@ -23,7 +23,6 @@
 #include "logic/minecraft/VersionBuilder.h"
 #include "ProfileUtils.h"
 #include "NullProfileStrategy.h"
-#include "logic/OneSixInstance.h"
 
 MinecraftProfile::MinecraftProfile(ProfileStrategy *strategy)
 	: QAbstractListModel()

logic/minecraft/ModList.cpp

@@ -14,7 +14,6 @@
  */
 
 #include "ModList.h"
-#include "LegacyInstance.h"
 #include <pathutils.h>
 #include <QMimeData>
 #include <QUrl>

logic/minecraft/ModList.h

@@ -20,7 +20,7 @@
 #include <QDir>
 #include <QAbstractListModel>
 
-#include "logic/Mod.h"
+#include "logic/minecraft/Mod.h"
 
 class LegacyInstance;
 class BaseInstance;

logic/minecraft/OneSixInstance.cpp

@@ -18,15 +18,15 @@
 #include <QDebug>
 #include "MMCError.h"
 
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 
-#include "logic/OneSixUpdate.h"
+#include "logic/minecraft/OneSixUpdate.h"
 #include "logic/minecraft/MinecraftProfile.h"
-#include "minecraft/VersionBuildError.h"
+#include "logic/minecraft/VersionBuildError.h"
 #include "logic/minecraft/MinecraftProcess.h"
-#include "minecraft/OneSixProfileStrategy.h"
+#include "logic/minecraft/OneSixProfileStrategy.h"
 
-#include "logic/assets/AssetsUtils.h"
+#include "logic/minecraft/AssetsUtils.h"
 #include "logic/icons/IconList.h"
 #include "gui/pagedialog/PageDialog.h"
 #include "gui/pages/VersionPage.h"

logic/minecraft/OneSixInstance.h

@@ -18,7 +18,7 @@
 #include "logic/minecraft/MinecraftInstance.h"
 
 #include "logic/minecraft/MinecraftProfile.h"
-#include "logic/ModList.h"
+#include "logic/minecraft/ModList.h"
 #include "gui/pages/BasePageProvider.h"
 
 class OneSixInstance : public MinecraftInstance, public BasePageProvider

logic/minecraft/OneSixProfileStrategy.cpp

@@ -1,6 +1,6 @@
 #include "logic/minecraft/OneSixProfileStrategy.h"
 #include "logic/minecraft/VersionBuildError.h"
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 #include "logic/minecraft/MinecraftVersionList.h"
 #include "logic/Env.h"
 

logic/minecraft/OneSixUpdate.cpp

@@ -29,11 +29,11 @@
 #include "logic/minecraft/MinecraftVersionList.h"
 #include "logic/minecraft/MinecraftProfile.h"
 #include "logic/minecraft/OneSixLibrary.h"
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 #include "logic/forge/ForgeMirrors.h"
 #include "logic/net/URLConstants.h"
-#include "logic/assets/AssetsUtils.h"
+#include "logic/minecraft/AssetsUtils.h"
-#include "JarUtils.h"
+#include "logic/minecraft/JarUtils.h"
 
 OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
 {

logic/minecraft/SkinUtils.cpp

@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-#include "logic/SkinUtils.h"
+#include "logic/minecraft/SkinUtils.h"
-#include "net/HttpMetaCache.h"
+#include "logic/net/HttpMetaCache.h"
 #include "logic/Env.h"
 
 #include <QFile>

logic/minecraft/VersionBuilder.cpp

@@ -35,7 +35,7 @@
 #include "MinecraftVersionList.h"
 #include "ProfileUtils.h"
 
-#include "logic/OneSixInstance.h"
+#include "logic/minecraft/OneSixInstance.h"
 #include "logic/MMCJson.h"
 
 #include <QDebug>