Massive re-organization.

53 files changed, 223 insertions, 185 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0022b29e..9aa75f4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,15 +61,15 @@ add_subdirectory(launcher)
 
 # Add the util library.
 add_subdirectory(libutil)
-include_directories(${LIBMMCUTIL_INCLUDE_DIR})
+include_directories(${LIBUTIL_INCLUDE_DIR})
 
 # Add the settings library.
 add_subdirectory(libsettings)
-include_directories(${LIBMMCSETTINGS_INCLUDE_DIR})
+include_directories(${LIBSETTINGS_INCLUDE_DIR})
 
 # Add the instance library.
-add_subdirectory(libinstance)
-include_directories(${LIBMMCINST_INCLUDE_DIR})
+add_subdirectory(libmultimc)
+include_directories(${LIBMULTIMC_INCLUDE_DIR})
 
 # Add the stdinstance plugin.
 add_subdirectory(plugins/stdinstance)
@@ -150,7 +150,7 @@ MESSAGE(STATUS "Job URL: ${MultiMC_JOB_URL}")
 
 ######## Configure header ########
 configure_file("${PROJECT_SOURCE_DIR}/config.h.in"
-			   "${PROJECT_BINARY_DIR}/config.h")
+			   "${PROJECT_BINARY_DIR}/include/config.h")
 
 
 ################################ FILES ################################
@@ -167,14 +167,6 @@ gui/browserdialog.h
 gui/aboutdialog.h
 gui/consolewindow.h
 
-data/version.h
-data/userinfo.h
-data/loginresponse.h
-data/appsettings.h
-data/minecraftprocess.h
-
-data/plugin/pluginmanager.h
-
 multimc_pragma.h
 
 java/annotations.h
@@ -184,10 +176,6 @@ java/javaendian.h
 java/errors.h
 java/javautils.h
 java/membuffer.h
-
-tasks/task.h
-tasks/logintask.h
-tasks/gameupdatetask.h
 )
 
 
@@ -195,14 +183,6 @@ tasks/gameupdatetask.h
 SET(MULTIMC_SOURCES
 main.cpp
 
-data/version.cpp
-data/userinfo.cpp
-data/loginresponse.cpp
-data/appsettings.cpp
-
-data/plugin/pluginmanager.cpp
-data/minecraftprocess.cpp
-
 gui/mainwindow.cpp
 gui/modeditwindow.cpp
 gui/settingsdialog.cpp
@@ -215,10 +195,6 @@ gui/consolewindow.cpp
 
 java/javautils.cpp
 java/annotations.cpp
-
-tasks/task.cpp
-tasks/logintask.cpp
-tasks/gameupdatetask.cpp
 )
 
 
@@ -272,9 +248,9 @@ ADD_EXECUTABLE(MultiMC MACOSX_BUNDLE WIN32
 # Link
 QT5_USE_MODULES(MultiMC Widgets Network WebKitWidgets)
 TARGET_LINK_LIBRARIES(MultiMC quazip patchlib 
-libmmcutil libmmcsettings libmmcinst
+libUtil libSettings libMultiMC
 ${MultiMC_LINK_ADDITIONAL_LIBS})
-ADD_DEPENDENCIES(MultiMC MultiMCLauncher libmmcutil libmmcsettings libmmcinst)
+ADD_DEPENDENCIES(MultiMC MultiMCLauncher libUtil libSettings libMultiMC)
 
 
 ################################ INSTALLATION AND PACKAGING ################################
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 447a6619..6866da28 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -41,10 +41,10 @@
 #include "gui/aboutdialog.h"
 
 #include "instancelist.h"
-#include "data/appsettings.h"
-#include "data/version.h"
+#include "appsettings.h"
+#include "version.h"
 
-#include "tasks/logintask.h"
+#include "logintask.h"
 
 // Opens the given file in the default application.
 // TODO: Move this somewhere.
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index a57b8db4..5ea575a6 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -19,7 +19,7 @@
 #include <QMainWindow>
 
 #include "instancelist.h"
-#include "data/loginresponse.h"
+#include "loginresponse.h"
 
 namespace Ui
 {
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index 7c8eacd1..38844509 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -16,7 +16,7 @@
 #include "settingsdialog.h"
 #include "ui_settingsdialog.h"
 
-#include "data/appsettings.h"
+#include "appsettings.h"
 
 #include <QFileDialog>
 #include <QMessageBox>
diff --git a/gui/taskdialog.cpp b/gui/taskdialog.cpp
index a8738fe3..9b1ddf23 100644
--- a/gui/taskdialog.cpp
+++ b/gui/taskdialog.cpp
@@ -18,7 +18,7 @@
 
 #include <QKeyEvent>
 
-#include "tasks/task.h"
+#include "task.h"
 
 TaskDialog::TaskDialog(QWidget *parent) :
 	QDialog(parent),
diff --git a/libinstance/CMakeLists.txt b/libinstance/CMakeLists.txt
deleted file mode 100644
index d0a9aa08..00000000
--- a/libinstance/CMakeLists.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-project(libmmcinst)
-
-set(CMAKE_AUTOMOC ON)
-
-# Find Qt
-find_package(Qt5Core REQUIRED)
-
-# Include Qt headers.
-include_directories(${Qt5Base_INCLUDE_DIRS})
-include_directories(${Qt5Network_INCLUDE_DIRS})
-
-# Include utility library.
-include_directories(${CMAKE_SOURCE_DIR}/libutil/include)
-
-# Include utility library.
-include_directories(${CMAKE_SOURCE_DIR}/libsettings/include)
-
-SET(LIBINST_HEADERS
-include/libinstance_config.h
-
-include/instancetypeinterface.h
-
-include/instance.h
-include/instancelist.h
-include/instanceloader.h
-
-include/instversion.h
-include/instversionlist.h
-)
-
-SET(LIBINST_SOURCES
-src/instance.cpp
-src/instancelist.cpp
-src/instanceloader.cpp
-
-src/instversion.cpp
-src/instversionlist.cpp
-)
-
-# Set the include dir path.
-SET(LIBMMCINST_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
-
-add_definitions(-DLIBMMCINST_LIBRARY)
-
-add_library(libmmcinst SHARED ${LIBINST_SOURCES} ${LIBINST_HEADERS})
-qt5_use_modules(libmmcinst Core)
-target_link_libraries(libmmcinst libmmcutil libmmcsettings)
diff --git a/libmultimc/CMakeLists.txt b/libmultimc/CMakeLists.txt
new file mode 100644
index 00000000..06102d9f
--- /dev/null
+++ b/libmultimc/CMakeLists.txt
@@ -0,0 +1,96 @@
+project(libMultiMC)
+
+set(CMAKE_AUTOMOC ON)
+
+# Find Qt
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Network REQUIRED)
+
+# Include Qt headers.
+include_directories(${Qt5Base_INCLUDE_DIRS})
+include_directories(${Qt5Network_INCLUDE_DIRS})
+
+# Include utility library.
+include_directories(${CMAKE_SOURCE_DIR}/libutil/include)
+
+# Include settings library.
+include_directories(${CMAKE_SOURCE_DIR}/libsettings/include)
+
+SET(LIBINST_HEADERS
+include/libmmc_config.h
+
+
+# Instance Stuff
+include/instance.h
+include/instancelist.h
+include/instanceloader.h
+
+include/instversion.h
+include/instversionlist.h
+
+
+# Plugin Stuff
+include/pluginmanager.h
+include/instancetypeinterface.h
+
+
+# Tasks
+include/task.h
+include/logintask.h
+include/gameupdatetask.h
+
+
+# Login Data
+include/userinfo.h
+include/loginresponse.h
+
+
+# Misc Data
+include/version.h
+include/appsettings.h
+include/minecraftprocess.h
+)
+
+SET(LIBINST_SOURCES
+# Instance Stuff
+src/instance.cpp
+src/instancelist.cpp
+src/instanceloader.cpp
+
+src/instversion.cpp
+src/instversionlist.cpp
+
+
+# Plugin Stuff
+src/pluginmanager.cpp
+
+
+# Tasks
+src/task.cpp
+src/logintask.cpp
+src/gameupdatetask.cpp
+
+
+# Login Data
+src/userinfo.cpp
+src/loginresponse.cpp
+
+
+# Misc Data
+src/version.cpp
+src/appsettings.cpp
+src/minecraftprocess.cpp
+)
+
+# Set the include dir path.
+SET(LIBMULTIMC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
+
+# Include self.
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories(${CMAKE_BINARY_DIR}/include)
+
+add_definitions(-DLIBMULTIMC_LIBRARY)
+
+add_library(libMultiMC SHARED ${LIBINST_SOURCES} ${LIBINST_HEADERS})
+qt5_use_modules(libMultiMC Core Network)
+target_link_libraries(libMultiMC libUtil libSettings)
diff --git a/data/appsettings.h b/libmultimc/include/appsettings.h
index ba4ef242..66ffb7b5 100644
--- a/data/appsettings.h
+++ b/libmultimc/include/appsettings.h
@@ -20,7 +20,9 @@
 
 #include <basicsettingsobject.h>
 
-class AppSettings : public BasicSettingsObject
+#include "libmmc_config.h"
+
+class LIBMULTIMC_EXPORT AppSettings : public BasicSettingsObject
 {
 	Q_OBJECT
 public:
diff --git a/tasks/gameupdatetask.h b/libmultimc/include/gameupdatetask.h
index b768f6f9..eabfbd1f 100644
--- a/tasks/gameupdatetask.h
+++ b/libmultimc/include/gameupdatetask.h
@@ -18,13 +18,15 @@
 
 #include <QObject>
 
-#include <data/loginresponse.h>
+#include "loginresponse.h"
+
+#include "libmmc_config.h"
 
 /*!
  * \brief The game update task is the task that handles downloading instances.
  * Each instance type has its own class inheriting from this base game update task.
  */
-class GameUpdateTask : public QObject
+class LIBMULTIMC_EXPORT GameUpdateTask : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/libinstance/include/instance.h b/libmultimc/include/instance.h
index 9c89fbc3..7de61343 100644
--- a/libinstance/include/instance.h
+++ b/libmultimc/include/instance.h
@@ -23,7 +23,7 @@
 
 #include "inifile.h"
 
-#include "libinstance_config.h"
+#include "libmmc_config.h"
 
 class InstanceList;
 
@@ -35,7 +35,7 @@ class InstanceList;
  * To create a new instance type, create a new class inheriting from this class
  * and implement the pure virtual functions.
  */
-class LIBMMCINST_EXPORT Instance : public QObject
+class LIBMULTIMC_EXPORT Instance : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/libinstance/include/instancelist.h b/libmultimc/include/instancelist.h
index d5b8c196..d4e7556a 100644
--- a/libinstance/include/instancelist.h
+++ b/libmultimc/include/instancelist.h
@@ -22,11 +22,11 @@
 
 #include "siglist.h"
 
-#include "libinstance_config.h"
+#include "libmmc_config.h"
 
 class Instance;
 
-class LIBMMCINST_EXPORT InstanceList : public QObject, public SigList< QSharedPointer<Instance> >
+class LIBMULTIMC_EXPORT InstanceList : public QObject, public SigList< QSharedPointer<Instance> >
 {
 	Q_OBJECT
 public:
diff --git a/libinstance/include/instanceloader.h b/libmultimc/include/instanceloader.h
index 96be36fb..3326d7d0 100644
--- a/libinstance/include/instanceloader.h
+++ b/libmultimc/include/instanceloader.h
@@ -20,7 +20,7 @@
 #include <QMap>
 #include <QList>
 
-#include "libinstance_config.h"
+#include "libmmc_config.h"
 
 class InstanceTypeInterface;
 class Instance;
@@ -32,7 +32,7 @@ typedef QList<const InstanceTypeInterface *> InstTypeList;
  * Instance types are registered with the instance loader through its registerInstType() function. 
  * Creating instances is done through the InstanceLoader's createInstance() function. This function takes 
  */
-class LIBMMCINST_EXPORT InstanceLoader : public QObject
+class LIBMULTIMC_EXPORT InstanceLoader : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/libinstance/include/instancetypeinterface.h b/libmultimc/include/instancetypeinterface.h
index 30a12d99..30a12d99 100644
--- a/libinstance/include/instancetypeinterface.h
+++ b/libmultimc/include/instancetypeinterface.h
diff --git a/libinstance/include/instversion.h b/libmultimc/include/instversion.h
index c505c5a3..3c6b7ac9 100644
--- a/libinstance/include/instversion.h
+++ b/libmultimc/include/instversion.h
@@ -18,11 +18,11 @@
 
 #include <QObject>
 
-#include "libinstance_config.h"
+#include "libmmc_config.h"
 
 class InstVersionList;
 
-class LIBMMCINST_EXPORT InstVersion : public QObject
+class LIBMULTIMC_EXPORT InstVersion : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/libinstance/include/instversionlist.h b/libmultimc/include/instversionlist.h
index 2cd9ed1e..d64a286f 100644
--- a/libinstance/include/instversionlist.h
+++ b/libmultimc/include/instversionlist.h
@@ -18,7 +18,7 @@
 
 #include <QObject>
 
-#include "libinstance_config.h"
+#include "libmmc_config.h"
 
 class InstVersion;
 
@@ -26,7 +26,7 @@ class InstVersion;
 // the lists that keep track of the available game versions for that instance. 
 // This list will not be loaded on startup. It will be loaded when the list's 
 // load function is called.
-class LIBMMCINST_EXPORT InstVersionList : public QObject
+class LIBMULTIMC_EXPORT InstVersionList : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/libinstance/include/libinstance_config.h b/libmultimc/include/libmmc_config.h
index 2e6dc884..0ff2154a 100644
--- a/libinstance/include/libinstance_config.h
+++ b/libmultimc/include/libmmc_config.h
@@ -18,10 +18,10 @@
 
 #include <QtCore/QtGlobal>
 
-#ifdef LIBMMCINST_LIBRARY
-#  define LIBMMCINST_EXPORT Q_DECL_EXPORT
+#ifdef LIBMULTIMC_LIBRARY
+#  define LIBMULTIMC_EXPORT Q_DECL_EXPORT
 #else
-#  define LIBMMCINST_EXPORT Q_DECL_IMPORT
+#  define LIBMULTIMC_EXPORT Q_DECL_IMPORT
 #endif
 
 //#endif // LIBINSTANCE_CONFIG_H
diff --git a/data/loginresponse.h b/libmultimc/include/loginresponse.h
index c30897c3..0b06a972 100644
--- a/data/loginresponse.h
+++ b/libmultimc/include/loginresponse.h
@@ -18,10 +18,12 @@
 
 #include <QObject>
 
+#include "libmmc_config.h"
+
 /*!
  * \brief The LoginResponse class represents a response received from Minecraft's login servers.
  */
-class LoginResponse : public QObject
+class LIBMULTIMC_EXPORT LoginResponse : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/tasks/logintask.h b/libmultimc/include/logintask.h
index d96bfec7..c1efb223 100644
--- a/tasks/logintask.h
+++ b/libmultimc/include/logintask.h
@@ -18,13 +18,15 @@
 
 #include "task.h"
 
-#include "data/userinfo.h"
-#include "data/loginresponse.h"
+#include "userinfo.h"
+#include "loginresponse.h"
+
+#include "libmmc_config.h"
 
 //class QNetworkAccessManager;
 class QNetworkReply;
 
-class LoginTask : public Task
+class LIBMULTIMC_EXPORT LoginTask : public Task
 {
 	Q_OBJECT
 public:
diff --git a/data/minecraftprocess.h b/libmultimc/include/minecraftprocess.h
index bede9486..8986f7ad 100644
--- a/data/minecraftprocess.h
+++ b/libmultimc/include/minecraftprocess.h
@@ -19,15 +19,15 @@
 
 #include <QProcess>
 
-#include "gui/consolewindow.h"
-
 #include "instance.h"
 
+#include "libmmc_config.h"
+
 /**
  * @file data/minecraftprocess.h
  * @brief The MinecraftProcess class
  */
-class MinecraftProcess : public QProcess
+class LIBMULTIMC_EXPORT MinecraftProcess : public QProcess
 {
     Q_OBJECT
 public:
@@ -38,7 +38,7 @@ public:
      * @param session the minecraft session id
      * @param console the instance console window
      */
-    MinecraftProcess(InstancePtr inst, QString user, QString session, ConsoleWindow *console);
+    MinecraftProcess(InstancePtr inst, QString user, QString session);
 
     /**
      * @brief launch minecraft
@@ -78,7 +78,6 @@ signals:
     void ended();
 
 protected:
-    ConsoleWindow *m_console;
     InstancePtr m_instance;
     QString m_user;
     QString m_session;
diff --git a/data/plugin/pluginmanager.h b/libmultimc/include/pluginmanager.h
index b93fd6d2..1fc22a6c 100644
--- a/data/plugin/pluginmanager.h
+++ b/libmultimc/include/pluginmanager.h
@@ -20,10 +20,12 @@
 #include <QList>
 #include <QPluginLoader>
 
+#include "libmmc_config.h"
+
 /*!
  * \brief This class is a singleton that manages loading plugins.
  */
-class PluginManager : public QObject
+class LIBMULTIMC_EXPORT PluginManager : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/tasks/task.h b/libmultimc/include/task.h
index 0124d8cf..b1a3052d 100644
--- a/tasks/task.h
+++ b/libmultimc/include/task.h
@@ -20,7 +20,9 @@
 #include <QThread>
 #include <QString>
 
-class Task : public QThread
+#include "libmmc_config.h"
+
+class LIBMULTIMC_EXPORT Task : public QThread
 {
 	Q_OBJECT
 public:
diff --git a/data/userinfo.h b/libmultimc/include/userinfo.h
index 486ce2a6..280f98de 100644
--- a/data/userinfo.h
+++ b/libmultimc/include/userinfo.h
@@ -18,7 +18,9 @@
 
 #include <QObject>
 
-class UserInfo : public QObject
+#include "libmmc_config.h"
+
+class LIBMULTIMC_EXPORT UserInfo : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/data/version.h b/libmultimc/include/version.h
index d5d276db..3025260b 100644
--- a/data/version.h
+++ b/libmultimc/include/version.h
@@ -18,10 +18,12 @@
 
 #include <QObject>
 
+#include "libmmc_config.h"
+
 /*!
  * \brief The Version class represents a MultiMC version number.
  */
-class Version : public QObject
+class LIBMULTIMC_EXPORT Version : public QObject
 {
 	Q_OBJECT
 public:
diff --git a/data/appsettings.cpp b/libmultimc/src/appsettings.cpp
index 6b724cd9..68d2c015 100644
--- a/data/appsettings.cpp
+++ b/libmultimc/src/appsettings.cpp
@@ -18,7 +18,7 @@
 #include <setting.h>
 
 #include <QPoint>
-#include <QColor>
+//#include <QColor>
 
 AppSettings::AppSettings(QObject *parent) :
 	BasicSettingsObject(parent)
@@ -41,9 +41,9 @@ AppSettings::AppSettings(QObject *parent) :
 	registerSetting(new Setting("InstanceToolbarPosition", QPoint()));
 	
 	// Console Colors
-	registerSetting(new Setting("SysMessageColor", QColor(Qt::blue)));
-	registerSetting(new Setting("StdOutColor", QColor(Qt::black)));
-	registerSetting(new Setting("StdErrColor", QColor(Qt::red)));
+//	registerSetting(new Setting("SysMessageColor", QColor(Qt::blue)));
+//	registerSetting(new Setting("StdOutColor", QColor(Qt::black)));
+//	registerSetting(new Setting("StdErrColor", QColor(Qt::red)));
 	
 	// Window Size
 	registerSetting(new Setting("LaunchCompatMode", false));
diff --git a/tasks/gameupdatetask.cpp b/libmultimc/src/gameupdatetask.cpp
index c152147e..c152147e 100644
--- a/tasks/gameupdatetask.cpp
+++ b/