Reorganize logic code.

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"
 

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;

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"
 

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>

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>

gui/dialogs/InstanceSettings.h

@@ -17,7 +17,7 @@
 
 #include <QDialog>
 #include "settingsobject.h"
-#include "logic/JavaChecker.h"
+#include "logic/java/JavaChecker.h"
 
 namespace Ui
 {

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)

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"

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"
 

gui/dialogs/SettingsDialog.h

@@ -18,7 +18,7 @@
 #include <memory>
 #include <QDialog>
 
-#include "logic/JavaChecker.h"
+#include "logic/java/JavaChecker.h"
 
 class SettingsObject;
 

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,

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;