aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-02-27 19:58:40 +0100
committerPetr Mrázek <peterix@gmail.com>2016-02-27 19:58:40 +0100
commit17ad1e64f824fba6d8f153191effdb2af7d387c8 (patch)
tree3c0996cab5cff0dcf3807afe08df66dda3a50ec4
parent71e4b147ec3b8c5f3e2a004920ffbc0a3b6e18c8 (diff)
downloadPrismLauncher-17ad1e64f824fba6d8f153191effdb2af7d387c8.tar.gz
PrismLauncher-17ad1e64f824fba6d8f153191effdb2af7d387c8.tar.bz2
PrismLauncher-17ad1e64f824fba6d8f153191effdb2af7d387c8.zip
NOISSUE move files into paths that make more sense
Diffstat
-rw-r--r--application/InstancePageProvider.h4
-rw-r--r--application/LaunchInteraction.cpp4
-rw-r--r--application/MainWindow.cpp4
-rw-r--r--application/MainWindow.h2
-rw-r--r--application/MultiMC.cpp12
-rw-r--r--application/dialogs/AccountSelectDialog.h2
-rw-r--r--application/dialogs/LoginDialog.cpp2
-rw-r--r--application/dialogs/LoginDialog.h2
-rw-r--r--application/pages/LegacyJarModPage.cpp2
-rw-r--r--application/pages/LegacyUpgradePage.cpp2
-rw-r--r--application/pages/LegacyUpgradePage.h2
-rw-r--r--application/pages/ModFolderPage.h2
-rw-r--r--application/pages/VersionPage.cpp14
-rw-r--r--application/pages/VersionPage.h2
-rw-r--r--application/pages/WorldListPage.h2
-rw-r--r--application/pages/global/AccountListPage.cpp2
-rw-r--r--application/pages/global/AccountListPage.h2
-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
75 files changed, 148 insertions, 144 deletions
diff --git a/application/InstancePageProvider.h b/application/InstancePageProvider.h
index 1b283896..bfc60291 100644
--- a/application/InstancePageProvider.h
+++ b/application/InstancePageProvider.h
@@ -1,6 +1,6 @@
#pragma once
-#include "minecraft/OneSixInstance.h"
-#include "minecraft/LegacyInstance.h"
+#include "minecraft/onesix/OneSixInstance.h"
+#include "minecraft/legacy/LegacyInstance.h"
#include <FileSystem.h>
#include "pages/BasePage.h"
#include "pages/VersionPage.h"
diff --git a/application/LaunchInteraction.cpp b/application/LaunchInteraction.cpp
index 4033d87c..1caa054a 100644
--- a/application/LaunchInteraction.cpp
+++ b/application/LaunchInteraction.cpp
@@ -1,5 +1,5 @@
#include "LaunchInteraction.h"
-#include <auth/MojangAccountList.h>
+#include <minecraft/auth/MojangAccountList.h>
#include "MultiMC.h"
#include "dialogs/CustomMessageBox.h"
#include "dialogs/AccountSelectDialog.h"
@@ -12,7 +12,7 @@
#include <QLineEdit>
#include <QInputDialog>
#include <tasks/Task.h>
-#include <auth/YggdrasilTask.h>
+#include <minecraft/auth/YggdrasilTask.h>
#include <launch/steps/TextPrint.h>
#include <QStringList>
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp
index a9d8d1e9..1345835f 100644
--- a/application/MainWindow.cpp
+++ b/application/MainWindow.cpp
@@ -50,14 +50,12 @@
#include <Env.h>
#include <InstanceList.h>
#include <MMCZip.h>
-#include <auth/flows/AuthenticateTask.h>
-#include <auth/flows/RefreshTask.h>
#include <icons/IconList.h>
#include <java/JavaUtils.h>
#include <java/JavaInstallList.h>
#include <launch/LaunchTask.h>
#include <minecraft/MinecraftVersionList.h>
-#include <minecraft/LwjglVersionList.h>
+#include <minecraft/legacy/LwjglVersionList.h>
#include <minecraft/SkinUtils.h>
#include <net/URLConstants.h>
#include <net/NetJob.h>
diff --git a/application/MainWindow.h b/application/MainWindow.h
index 17de6966..363d163e 100644
--- a/application/MainWindow.h
+++ b/application/MainWindow.h
@@ -22,7 +22,7 @@
#include <QTimer>
#include "BaseInstance.h"
-#include "auth/MojangAccount.h"
+#include "minecraft/auth/MojangAccount.h"
#include "net/NetJob.h"
#include "updater/GoUpdate.h"
diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp
index d5779321..63a3b40b 100644
--- a/application/MultiMC.cpp
+++ b/application/MultiMC.cpp
@@ -20,13 +20,13 @@
#include <QDebug>
#include "InstanceList.h"
-#include "auth/MojangAccountList.h"
+#include <minecraft/auth/MojangAccountList.h>
#include "icons/IconList.h"
-#include "minecraft/LwjglVersionList.h"
+//FIXME: get rid of this
+#include "minecraft/legacy/LwjglVersionList.h"
#include "minecraft/MinecraftVersionList.h"
-#include "liteloader/LiteLoaderVersionList.h"
-
-#include "forge/ForgeVersionList.h"
+#include "minecraft/liteloader/LiteLoaderVersionList.h"
+#include "minecraft/forge/ForgeVersionList.h"
#include "net/HttpMetaCache.h"
#include "net/URLConstants.h"
@@ -49,7 +49,7 @@
#include "handlers/IconResourceHandler.h"
#include "handlers/WebResourceHandler.h"
-#include "ftb/FTBPlugin.h"
+#include "minecraft/ftb/FTBPlugin.h"
#include <Commandline.h>
#include <FileSystem.h>
diff --git a/application/dialogs/AccountSelectDialog.h b/application/dialogs/AccountSelectDialog.h
index 21784032..7ae79314 100644
--- a/application/dialogs/AccountSelectDialog.h
+++ b/application/dialogs/AccountSelectDialog.h
@@ -19,7 +19,7 @@
#include <memory>
-#include "auth/MojangAccountList.h"
+#include "minecraft/auth/MojangAccountList.h"
namespace Ui
{
diff --git a/application/dialogs/LoginDialog.cpp b/application/dialogs/LoginDialog.cpp
index 7e0f7df8..d7a655fc 100644
--- a/application/dialogs/LoginDialog.cpp
+++ b/application/dialogs/LoginDialog.cpp
@@ -16,7 +16,7 @@
#include "LoginDialog.h"
#include "ui_LoginDialog.h"
-#include "auth/YggdrasilTask.h"
+#include "minecraft/auth/YggdrasilTask.h"
#include <QtWidgets/QPushButton>
diff --git a/application/dialogs/LoginDialog.h b/application/dialogs/LoginDialog.h
index 63c95fb8..74efeb77 100644
--- a/application/dialogs/LoginDialog.h
+++ b/application/dialogs/LoginDialog.h
@@ -18,7 +18,7 @@
#include <QtWidgets/QDialog>
#include <QtCore/QEventLoop>
-#include "auth/MojangAccount.h"
+#include "minecraft/auth/MojangAccount.h"
namespace Ui
{
diff --git a/application/pages/LegacyJarModPage.cpp b/application/pages/LegacyJarModPage.cpp
index b329ba70..174176fb 100644
--- a/application/pages/LegacyJarModPage.cpp
+++ b/application/pages/LegacyJarModPage.cpp
@@ -23,7 +23,7 @@
#include "dialogs/ProgressDialog.h"
#include "dialogs/ModEditDialogCommon.h"
#include "minecraft/ModList.h"
-#include "minecraft/LegacyInstance.h"
+#include "minecraft/legacy/LegacyInstance.h"
#include "Env.h"
#include <DesktopServices.h>
#include "MultiMC.h"
diff --git a/application/pages/LegacyUpgradePage.cpp b/application/pages/LegacyUpgradePage.cpp
index 49998c50..14cb916d 100644
--- a/application/pages/LegacyUpgradePage.cpp
+++ b/application/pages/LegacyUpgradePage.cpp
@@ -1,7 +1,7 @@
#include "LegacyUpgradePage.h"
#include "ui_LegacyUpgradePage.h"
-#include "minecraft/LegacyInstance.h"
+#include "minecraft/legacy/LegacyInstance.h"
LegacyUpgradePage::LegacyUpgradePage(LegacyInstance *inst, QWidget *parent)
: QWidget(parent), ui(new Ui::LegacyUpgradePage), m_inst(inst)
diff --git a/application/pages/LegacyUpgradePage.h b/application/pages/LegacyUpgradePage.h
index 8d1131c8..ff9965f1 100644
--- a/application/pages/LegacyUpgradePage.h
+++ b/application/pages/LegacyUpgradePage.h
@@ -17,7 +17,7 @@
#include <QWidget>
-#include "minecraft/OneSixInstance.h"
+#include "minecraft/legacy/LegacyInstance.h"
#include "pages/BasePage.h"
#include <MultiMC.h>
diff --git a/application/pages/ModFolderPage.h b/application/pages/ModFolderPage.h
index 0870aa64..23b2f67d 100644
--- a/application/pages/ModFolderPage.h
+++ b/application/pages/ModFolderPage.h
@@ -17,7 +17,7 @@
#include <QWidget>
-#include "minecraft/OneSixInstance.h"
+#include "minecraft/onesix/OneSixInstance.h"
#include "BasePage.h"
#include <MultiMC.h>
diff --git a/application/pages/VersionPage.cpp b/application/pages/VersionPage.cpp
index f01a2d62..42e4a9bf 100644
--- a/application/pages/VersionPage.cpp
+++ b/application/pages/VersionPage.cpp
@@ -36,14 +36,14 @@
#include <QUrl>
#include "minecraft/MinecraftProfile.h"
-#include "forge/ForgeVersionList.h"
-#include "forge/ForgeInstaller.h"
-#include "liteloader/LiteLoaderVersionList.h"
-#include "liteloader/LiteLoaderInstaller.h"
-#include "auth/MojangAccountList.h"
+#include "minecraft/forge/ForgeVersionList.h"
+#include "minecraft/forge/ForgeInstaller.h"
+#include "minecraft/liteloader/LiteLoaderVersionList.h"
+#include "minecraft/liteloader/LiteLoaderInstaller.h"
+#include "minecraft/auth/MojangAccountList.h"
#include "minecraft/Mod.h"
-#include <minecraft/MinecraftVersion.h>
-#include <minecraft/MinecraftVersionList.h>
+#include "minecraft/MinecraftVersion.h"
+#include "minecraft/MinecraftVersionList.h"
#include "icons/IconList.h"
#include "Exception.h"
diff --git a/application/pages/VersionPage.h b/application/pages/VersionPage.h
index 216bc30e..e7b07ac3 100644
--- a/application/pages/VersionPage.h
+++ b/application/pages/VersionPage.h
@@ -17,7 +17,7 @@
#include <QWidget>
-#include "minecraft/OneSixInstance.h"
+#include "minecraft/onesix/OneSixInstance.h"
#include "BasePage.h"
namespace Ui
diff --git a/application/pages/WorldListPage.h b/application/pages/WorldListPage.h
index 7a7cf591..8a9fc16f 100644
--- a/application/pages/WorldListPage.h
+++ b/application/pages/WorldListPage.h
@@ -17,7 +17,7 @@
#include <QWidget>
-#include "minecraft/OneSixInstance.h"
+#include "minecraft/onesix/OneSixInstance.h"
#include "BasePage.h"
#include <MultiMC.h>
diff --git a/application/pages/global/AccountListPage.cpp b/application/pages/global/AccountListPage.cpp
index 62267f13..84d317c1 100644
--- a/application/pages/global/AccountListPage.cpp
+++ b/application/pages/global/AccountListPage.cpp
@@ -29,7 +29,7 @@
#include "dialogs/LoginDialog.h"
#include "dialogs/CustomMessageBox.h"
#include "tasks/Task.h"
-#include "auth/YggdrasilTask.h"
+#include "minecraft/auth/YggdrasilTask.h"
#include "MultiMC.h"
diff --git a/application/pages/global/AccountListPage.h b/application/pages/global/AccountListPage.h
index 7803e044..5701dfcb 100644
--- a/application/pages/global/AccountListPage.h
+++ b/application/pages/global/AccountListPage.h
@@ -20,7 +20,7 @@
#include "pages/BasePage.h"
-#include "auth/MojangAccountList.h"
+#include "minecraft/auth/MojangAccountList.h"
#include "MultiMC.h"
namespace Ui
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/Legac