diff --git a/application/InstancePageProvider.h b/application/InstancePageProvider.h index 1b283896d..bfc602913 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 #include "pages/BasePage.h" #include "pages/VersionPage.h" diff --git a/application/LaunchInteraction.cpp b/application/LaunchInteraction.cpp index 4033d87c0..1caa054af 100644 --- a/application/LaunchInteraction.cpp +++ b/application/LaunchInteraction.cpp @@ -1,5 +1,5 @@ #include "LaunchInteraction.h" -#include +#include #include "MultiMC.h" #include "dialogs/CustomMessageBox.h" #include "dialogs/AccountSelectDialog.h" @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp index a9d8d1e9a..1345835fa 100644 --- a/application/MainWindow.cpp +++ b/application/MainWindow.cpp @@ -50,14 +50,12 @@ #include #include #include -#include -#include #include #include #include #include #include -#include +#include #include #include #include diff --git a/application/MainWindow.h b/application/MainWindow.h index 17de6966f..363d163e3 100644 --- a/application/MainWindow.h +++ b/application/MainWindow.h @@ -22,7 +22,7 @@ #include #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 d57793217..63a3b40b0 100644 --- a/application/MultiMC.cpp +++ b/application/MultiMC.cpp @@ -20,13 +20,13 @@ #include #include "InstanceList.h" -#include "auth/MojangAccountList.h" +#include #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 #include diff --git a/application/dialogs/AccountSelectDialog.h b/application/dialogs/AccountSelectDialog.h index 217840329..7ae79314b 100644 --- a/application/dialogs/AccountSelectDialog.h +++ b/application/dialogs/AccountSelectDialog.h @@ -19,7 +19,7 @@ #include -#include "auth/MojangAccountList.h" +#include "minecraft/auth/MojangAccountList.h" namespace Ui { diff --git a/application/dialogs/LoginDialog.cpp b/application/dialogs/LoginDialog.cpp index 7e0f7df87..d7a655fc1 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 diff --git a/application/dialogs/LoginDialog.h b/application/dialogs/LoginDialog.h index 63c95fb80..74efeb77f 100644 --- a/application/dialogs/LoginDialog.h +++ b/application/dialogs/LoginDialog.h @@ -18,7 +18,7 @@ #include #include -#include "auth/MojangAccount.h" +#include "minecraft/auth/MojangAccount.h" namespace Ui { diff --git a/application/pages/LegacyJarModPage.cpp b/application/pages/LegacyJarModPage.cpp index b329ba70f..174176fb2 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 #include "MultiMC.h" diff --git a/application/pages/LegacyUpgradePage.cpp b/application/pages/LegacyUpgradePage.cpp index 49998c506..14cb916d3 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 8d1131c88..ff9965f1e 100644 --- a/application/pages/LegacyUpgradePage.h +++ b/application/pages/LegacyUpgradePage.h @@ -17,7 +17,7 @@ #include -#include "minecraft/OneSixInstance.h" +#include "minecraft/legacy/LegacyInstance.h" #include "pages/BasePage.h" #include diff --git a/application/pages/ModFolderPage.h b/application/pages/ModFolderPage.h index 0870aa64c..23b2f67de 100644 --- a/application/pages/ModFolderPage.h +++ b/application/pages/ModFolderPage.h @@ -17,7 +17,7 @@ #include -#include "minecraft/OneSixInstance.h" +#include "minecraft/onesix/OneSixInstance.h" #include "BasePage.h" #include diff --git a/application/pages/VersionPage.cpp b/application/pages/VersionPage.cpp index f01a2d627..42e4a9bfb 100644 --- a/application/pages/VersionPage.cpp +++ b/application/pages/VersionPage.cpp @@ -36,14 +36,14 @@ #include #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 -#include +#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 216bc30e5..e7b07ac30 100644 --- a/application/pages/VersionPage.h +++ b/application/pages/VersionPage.h @@ -17,7 +17,7 @@ #include -#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 7a7cf591c..8a9fc16ff 100644 --- a/application/pages/WorldListPage.h +++ b/application/pages/WorldListPage.h @@ -17,7 +17,7 @@ #include -#include "minecraft/OneSixInstance.h" +#include "minecraft/onesix/OneSixInstance.h" #include "BasePage.h" #include diff --git a/application/pages/global/AccountListPage.cpp b/application/pages/global/AccountListPage.cpp index 62267f134..84d317c1e 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 7803e044a..5701dfcbc 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 d8e83bb22..cb762ebd6 100644 --- a/logic/BaseInstaller.cpp +++ b/logic/BaseInstaller.cpp @@ -16,7 +16,7 @@ #include #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 cc8ebb024..392cb3d99 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 0a6cbbf66..40311baf5 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/LegacyInstance.h + minecraft/legacy/LegacyInstance.cpp + minecraft/legacy/LwjglVersionList.h + minecraft/legacy/LwjglVersionList.cpp minecraft/SkinUtils.h minecraft/SkinUtils.cpp minecraft/GradleSpecifier.h @@ -181,8 +183,6 @@ set(LOGIC_SOURCES minecraft/MinecraftVersionList.cpp minecraft/MinecraftVersionList.h minecraft/NullProfileStrategy.h - minecraft/OneSixProfileStrategy.cpp - minecraft/OneSixProfileStrategy.h minecraft/OneSixRule.cpp minecraft/OneSixRule.h minecraft/OpSys.cpp @@ -211,14 +211,14 @@ set(LOGIC_SOURCES minecraft/WorldList.cpp # FTB - ftb/OneSixFTBInstance.h - ftb/OneSixFTBInstance.cpp - ftb/LegacyFTBInstance.h - ftb/LegacyFTBInstance.cpp - ftb/FTBProfileStrategy.h - ftb/FTBProfileStrategy.cpp - ftb/FTBPlugin.h - ftb/FTBPlugin.cpp + minecraft/ftb/OneSixFTBInstance.h + minecraft/ftb/OneSixFTBInstance.cpp + minecraft/ftb/LegacyFTBInstance.h + minecraft/ftb/LegacyFTBInstance.cpp + minecraft/ftb/FTBProfileStrategy.h + minecraft/ftb/FTBProfileStrategy.cpp + minecraft/ftb/FTBPlugin.h + minecraft/ftb/FTBPlugin.cpp # A Recursive file system watcher RecursiveFileSystemWatcher.h @@ -278,25 +278,25 @@ set(LOGIC_SOURCES minecraft/AssetsUtils.cpp # Forge and all things forge related - forge/ForgeVersion.h - forge/ForgeVersion.cpp - forge/ForgeVersionList.h - forge/ForgeVersionList.cpp - forge/ForgeMirror.h - forge/ForgeMirrors.h - forge/ForgeMirrors.cpp - forge/ForgeXzDownload.h - forge/ForgeXzDownload.cpp - forge/LegacyForge.h - forge/LegacyForge.cpp - forge/ForgeInstaller.h - forge/ForgeInstaller.cpp + minecraft/forge/ForgeVersion.h + minecraft/forge/ForgeVersion.cpp + minecraft/forge/ForgeVersionList.h + minecraft/forge/ForgeVersionList.cpp + minecraft/forge/ForgeMirror.h + minecraft/forge/ForgeMirrors.h + minecraft/forge/ForgeMirrors.cpp + minecraft/forge/ForgeXzDownload.h + minecraft/forge/ForgeXzDownload.cpp + minecraft/forge/LegacyForge.h + minecraft/forge/LegacyForge.cpp + minecraft/forge/ForgeInstaller.h + minecraft/forge/ForgeInstaller.cpp # Liteloader and related things - liteloader/LiteLoaderInstaller.h - liteloader/LiteLoaderInstaller.cpp - liteloader/LiteLoaderVersionList.h - liteloader/LiteLoaderVersionList.cpp + minecraft/liteloader/LiteLoaderInstaller.h + minecraft/liteloader/LiteLoaderInstaller.cpp + minecraft/liteloader/LiteLoaderVersionList.h + minecraft/liteloader/LiteLoaderVersionList.cpp # Translations trans/TranslationDownloader.h diff --git a/logic/InstanceList.cpp b/logic/InstanceList.cpp index a8acdf055..8197fe248 100644 --- a/logic/InstanceList.cpp +++ b/logic/InstanceList.cpp @@ -31,11 +31,11 @@ #include "BaseInstance.h" //FIXME: this really doesn't belong *here* -#include "minecraft/OneSixInstance.h" -#include "minecraft/LegacyInstance.h" +#include "minecraft/onesix/OneSixInstance.h" +#include "minecraft/legacy/LegacyInstance.h" +#include "minecraft/ftb/FTBPlugin.h" #include "minecraft/MinecraftVersion.h" #include "settings/INISettingsObject.h" -#include "ftb/FTBPlugin.h" #include "NullInstance.h" #include "FileSystem.h" #include "pathmatcher/RegexpMatcher.h" diff --git a/logic/launch/steps/LaunchMinecraft.cpp b/logic/launch/steps/LaunchMinecraft.cpp index 05b1d9489..b0fe056f9 100644 --- a/logic/launch/steps/LaunchMinecraft.cpp +++ b/logic/launch/steps/LaunchMinecraft.cpp @@ -15,7 +15,7 @@ #include "LaunchMinecraft.h" #include -#include +#include #include #include diff --git a/logic/minecraft/RawLibrary.h b/logic/minecraft/RawLibrary.h index 7f0aed2f6..62791239f 100644 --- a/logic/minecraft/RawLibrary.h +++ b/logic/minecraft/RawLibrary.h @@ -8,7 +8,7 @@ #include #include -#include "minecraft/OneSixRule.h" +#include "OneSixRule.h" #include "minecraft/OpSys.h" #include "GradleSpecifier.h" #include "net/URLConstants.h" diff --git a/logic/auth/AuthSession.cpp b/logic/minecraft/auth/AuthSession.cpp similarity index 100% rename from logic/auth/AuthSession.cpp rename to logic/minecraft/auth/AuthSession.cpp diff --git a/logic/auth/AuthSession.h b/logic/minecraft/auth/AuthSession.h similarity index 100% rename from logic/auth/AuthSession.h rename to logic/minecraft/auth/AuthSession.h diff --git a/logic/auth/MojangAccount.cpp b/logic/minecraft/auth/MojangAccount.cpp similarity index 100% rename from logic/auth/MojangAccount.cpp rename to logic/minecraft/auth/MojangAccount.cpp diff --git a/logic/auth/MojangAccount.h b/logic/minecraft/auth/MojangAccount.h similarity index 100% rename from logic/auth/MojangAccount.h rename to logic/minecraft/auth/MojangAccount.h diff --git a/logic/auth/MojangAccountList.cpp b/logic/minecraft/auth/MojangAccountList.cpp similarity index 99% rename from logic/auth/MojangAccountList.cpp rename to logic/minecraft/auth/MojangAccountList.cpp index dac3d67f0..26cbc81a4 100644 --- a/logic/auth/MojangAccountList.cpp +++ b/logic/minecraft/auth/MojangAccountList.cpp @@ -13,7 +13,8 @@ * limitations under the License. */ -#include "auth/MojangAccountList.h" +#include "MojangAccountList.h" +#include "MojangAccount.h" #include #include @@ -26,7 +27,6 @@ #include -#include "auth/MojangAccount.h" #include #define ACCOUNT_LIST_FORMAT_VERSION 2 diff --git a/logic/auth/MojangAccountList.h b/logic/minecraft/auth/MojangAccountList.h similarity index 99% rename from logic/auth/MojangAccountList.h rename to logic/minecraft/auth/MojangAccountList.h index 49b71fabb..c40fa6a38 100644 --- a/logic/auth/MojangAccountList.h +++ b/logic/minecraft/auth/MojangAccountList.h @@ -15,13 +15,13 @@ #pragma once +#include "MojangAccount.h" + #include #include #include #include -#include "auth/MojangAccount.h" - #include "multimc_logic_export.h" /*! diff --git a/logic/auth/YggdrasilTask.cpp b/logic/minecraft/auth/YggdrasilTask.cpp similarity index 99% rename from logic/auth/YggdrasilTask.cpp rename to logic/minecraft/auth/YggdrasilTask.cpp index 929ab0bfd..c6971c9f7 100644 --- a/logic/auth/YggdrasilTask.cpp +++ b/logic/minecraft/auth/YggdrasilTask.cpp @@ -13,7 +13,8 @@ * limitations under the License. */ -#include +#include "YggdrasilTask.h" +#include "MojangAccount.h" #include #include @@ -23,7 +24,7 @@ #include #include -#include + #include #include diff --git a/logic/auth/YggdrasilTask.h b/logic/minecraft/auth/YggdrasilTask.h similarity index 99% rename from logic/auth/YggdrasilTask.h rename to logic/minecraft/auth/YggdrasilTask.h index d989bee3c..c84cfc06c 100644 --- a/logic/auth/YggdrasilTask.h +++ b/logic/minecraft/auth/YggdrasilTask.h @@ -22,7 +22,7 @@ #include #include -#include "auth/MojangAccount.h" +#include "MojangAccount.h" class QNetworkReply; diff --git a/logic/auth/flows/AuthenticateTask.cpp b/logic/minecraft/auth/flows/AuthenticateTask.cpp similarity index 98% rename from logic/auth/flows/AuthenticateTask.cpp rename to logic/minecraft/auth/flows/AuthenticateTask.cpp index a609d28b5..8d136f0be 100644 --- a/logic/auth/flows/AuthenticateTask.cpp +++ b/logic/minecraft/auth/flows/AuthenticateTask.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - -#include +#include "AuthenticateTask.h" +#include "../MojangAccount.h" #include #include diff --git a/logic/auth/flows/AuthenticateTask.h b/logic/minecraft/auth/flows/AuthenticateTask.h similarity index 97% rename from logic/auth/flows/AuthenticateTask.h rename to logic/minecraft/auth/flows/AuthenticateTask.h index 65975ae5b..398fab987 100644 --- a/logic/auth/flows/AuthenticateTask.h +++ b/logic/minecraft/auth/flows/AuthenticateTask.h @@ -15,7 +15,7 @@ #pragma once -#include +#include "../YggdrasilTask.h" #include #include diff --git a/logic/auth/flows/RefreshTask.cpp b/logic/minecraft/auth/flows/RefreshTask.cpp similarity index 98% rename from logic/auth/flows/RefreshTask.cpp rename to logic/minecraft/auth/flows/RefreshTask.cpp index 835112000..a0fb2e485 100644 --- a/logic/auth/flows/RefreshTask.cpp +++ b/logic/minecraft/auth/flows/RefreshTask.cpp @@ -13,9 +13,8 @@ * limitations under the License. */ -#include - -#include +#include "RefreshTask.h" +#include "../MojangAccount.h" #include #include diff --git a/logic/auth/flows/RefreshTask.h b/logic/minecraft/auth/flows/RefreshTask.h similarity index 97% rename from logic/auth/flows/RefreshTask.h rename to logic/minecraft/auth/flows/RefreshTask.h index 6894e9638..17714b4f2 100644 --- a/logic/auth/flows/RefreshTask.h +++ b/logic/minecraft/auth/flows/RefreshTask.h @@ -15,7 +15,7 @@ #pragma once -#include +#include "../YggdrasilTask.h" #include #include diff --git a/logic/auth/flows/ValidateTask.cpp b/logic/minecraft/auth/flows/ValidateTask.cpp similarity index 95% rename from logic/auth/flows/ValidateTask.cpp rename to logic/minecraft/auth/flows/ValidateTask.cpp index 9a4dcd6de..4deceb6ac 100644 --- a/logic/auth/flows/ValidateTask.cpp +++ b/logic/minecraft/auth/flows/ValidateTask.cpp @@ -14,9 +14,8 @@ * limitations under the License. */ -#include - -#include +#include "ValidateTask.h" +#include "../MojangAccount.h" #include #include diff --git a/logic/auth/flows/ValidateTask.h b/logic/minecraft/auth/flows/ValidateTask.h similarity index 97% rename from logic/auth/flows/ValidateTask.h rename to logic/minecraft/auth/flows/ValidateTask.h index 204596f9e..77d628a0a 100644 --- a/logic/auth/flows/ValidateTask.h +++ b/logic/minecraft/auth/flows/ValidateTask.h @@ -19,7 +19,7 @@ #pragma once -#include +#include "../YggdrasilTask.h" #include #include diff --git a/logic/forge/ForgeInstaller.cpp b/logic/minecraft/forge/ForgeInstaller.cpp similarity index 99% rename from logic/forge/ForgeInstaller.cpp rename to logic/minecraft/forge/ForgeInstaller.cpp index 78acb8d4e..a9283e5d9 100644 --- a/logic/forge/ForgeInstaller.cpp +++ b/logic/minecraft/forge/ForgeInstaller.cpp @@ -14,12 +14,13 @@ */ #include "ForgeInstaller.h" +#include "ForgeVersionList.h" + #include "minecraft/MinecraftProfile.h" #include "minecraft/GradleSpecifier.h" #include "net/HttpMetaCache.h" #include "tasks/Task.h" -#include "minecraft/OneSixInstance.h" -#include "forge/ForgeVersionList.h" +#include "minecraft/onesix/OneSixInstance.h" #include "minecraft/VersionFilterData.h" #include "Env.h" #include "Exception.h" diff --git a/logic/forge/ForgeInstaller.h b/logic/minecraft/forge/ForgeInstaller.h similarity index 100% rename from logic/forge/ForgeInstaller.h rename to logic/minecraft/forge/ForgeInstaller.h diff --git a/logic/forge/ForgeMirror.h b/logic/minecraft/forge/ForgeMirror.h similarity index 100% rename from logic/forge/ForgeMirror.h rename to logic/minecraft/forge/ForgeMirror.h diff --git a/logic/forge/ForgeMirrors.cpp b/logic/minecraft/forge/ForgeMirrors.cpp similarity index 100% rename from logic/forge/ForgeMirrors.cpp rename to logic/minecraft/forge/ForgeMirrors.cpp diff --git a/logic/forge/ForgeMirrors.h b/logic/minecraft/forge/ForgeMirrors.h similarity index 97% rename from logic/forge/ForgeMirrors.h rename to logic/minecraft/forge/ForgeMirrors.h index e7c90fa5a..0312829b0 100644 --- a/logic/forge/ForgeMirrors.h +++ b/logic/minecraft/forge/ForgeMirrors.h @@ -15,12 +15,15 @@ #pragma once +#include "ForgeXzDownload.h" + #include "net/NetAction.h" #include "net/HttpMetaCache.h" #include "net/NetJob.h" -#include "forge/ForgeXzDownload.h" + #include #include + typedef std::shared_ptr ForgeMirrorsPtr; class ForgeMirrors : public NetAction diff --git a/logic/forge/ForgeVersion.cpp b/logic/minecraft/forge/ForgeVersion.cpp similarity index 100% rename from logic/forge/ForgeVersion.cpp rename to logic/minecraft/forge/ForgeVersion.cpp diff --git a/logic/forge/ForgeVersion.h b/logic/minecraft/forge/ForgeVersion.h similarity index 100% rename from logic/forge/ForgeVersion.h rename to logic/minecraft/forge/ForgeVersion.h diff --git a/logic/forge/ForgeVersionList.cpp b/logic/minecraft/forge/ForgeVersionList.cpp similarity index 99% rename from logic/forge/ForgeVersionList.cpp rename to logic/minecraft/forge/ForgeVersionList.cpp index a05ced992..9b4183109 100644 --- a/logic/forge/ForgeVersionList.cpp +++ b/logic/minecraft/forge/ForgeVersionList.cpp @@ -13,8 +13,9 @@ * limitations under the License. */ -#include "forge/ForgeVersionList.h" -#include "forge/ForgeVersion.h" +#include "ForgeVersionList.h" +#include "ForgeVersion.h" + #include "net/NetJob.h" #include "net/URLConstants.h" #include "Env.h" diff --git a/logic/forge/ForgeVersionList.h b/logic/minecraft/forge/ForgeVersionList.h similarity index 98% rename from logic/forge/ForgeVersionList.h rename to logic/minecraft/forge/ForgeVersionList.h index dbf4b5ded..308503e3c 100644 --- a/logic/forge/ForgeVersionList.h +++ b/logic/minecraft/forge/ForgeVersionList.h @@ -15,6 +15,8 @@ #pragma once +#include "ForgeVersion.h" + #include #include #include @@ -23,7 +25,6 @@ #include "BaseVersionList.h" #include "tasks/Task.h" #include "net/NetJob.h" -#include "forge/ForgeVersion.h" #include "multimc_logic_export.h" diff --git a/logic/forge/ForgeXzDownload.cpp b/logic/minecraft/forge/ForgeXzDownload.cpp similarity index 100% rename from logic/forge/ForgeXzDownload.cpp rename to logic/minecraft/forge/ForgeXzDownload.cpp diff --git a/logic/forge/ForgeXzDownload.h b/logic/minecraft/forge/ForgeXzDownload.h similarity index 100% rename from logic/forge/ForgeXzDownload.h rename to logic/minecraft/forge/ForgeXzDownload.h diff --git a/logic/forge/LegacyForge.cpp b/logic/minecraft/forge/LegacyForge.cpp similarity index 100% rename from logic/forge/LegacyForge.cpp rename to logic/minecraft/forge/LegacyForge.cpp diff --git a/logic/forge/LegacyForge.h b/logic/minecraft/forge/LegacyForge.h similarity index 100% rename from logic/forge/LegacyForge.h rename to logic/minecraft/forge/LegacyForge.h diff --git a/logic/ftb/FTBPlugin.cpp b/logic/minecraft/ftb/FTBPlugin.cpp similarity index 100% rename from logic/ftb/FTBPlugin.cpp rename to logic/minecraft/ftb/FTBPlugin.cpp diff --git a/logic/ftb/FTBPlugin.h b/logic/minecraft/ftb/FTBPlugin.h similarity index 100% rename from logic/ftb/FTBPlugin.h rename to logic/minecraft/ftb/FTBPlugin.h diff --git a/logic/ftb/FTBProfileStrategy.cpp b/logic/minecraft/ftb/FTBProfileStrategy.cpp similarity index 97% rename from logic/ftb/FTBProfileStrategy.cpp rename to logic/minecraft/ftb/FTBProfileStrategy.cpp index 53b43eecb..c4bfa27b8 100644 --- a/logic/ftb/FTBProfileStrategy.cpp +++ b/logic/minecraft/ftb/FTBProfileStrategy.cpp @@ -1,6 +1,7 @@ -#include "ftb/FTBProfileStrategy.h" +#include "FTBProfileStrategy.h" +#include "OneSixFTBInstance.h" + #include "minecraft/VersionBuildError.h" -#include "ftb/OneSixFTBInstance.h" #include "minecraft/MinecraftVersionList.h" #include diff --git a/logic/ftb/FTBProfileStrategy.h b/logic/minecraft/ftb/FTBProfileStrategy.h similarity index 86% rename from logic/ftb/FTBProfileStrategy.h rename to logic/minecraft/ftb/FTBProfileStrategy.h index 4810b9dee..522af0983 100644 --- a/logic/ftb/FTBProfileStrategy.h +++ b/logic/minecraft/ftb/FTBProfileStrategy.h @@ -1,6 +1,6 @@ #pragma once -#include "../minecraft/ProfileStrategy.h" -#include "../minecraft/OneSixProfileStrategy.h" +#include "minecraft/ProfileStrategy.h" +#include "minecraft/onesix/OneSixProfileStrategy.h" class OneSixFTBInstance; diff --git a/logic/ftb/FTBVersion.h b/logic/minecraft/ftb/FTBVersion.h similarity index 100% rename from logic/ftb/FTBVersion.h rename to logic/minecraft/ftb/FTBVersion.h diff --git a/logic/ftb/LegacyFTBInstance.cpp b/logic/minecraft/ftb/LegacyFTBInstance.cpp similarity index 100% rename from logic/ftb/LegacyFTBInstance.cpp rename to logic/minecraft/ftb/LegacyFTBInstance.cpp diff --git a/logic/ftb/LegacyFTBInstance.h b/logic/minecraft/ftb/LegacyFTBInstance.h similarity index 87% rename from logic/ftb/LegacyFTBInstance.h rename to logic/minecraft/ftb/LegacyFTBInstance.h index c878dcc64..3f3f5edf5 100644 --- a/logic/ftb/LegacyFTBInstance.h +++ b/logic/minecraft/ftb/LegacyFTBInstance.h @@ -1,6 +1,6 @@ #pragma once -#include "minecraft/LegacyInstance.h" +#include "minecraft/legacy/LegacyInstance.h" class LegacyFTBInstance : public LegacyInstance { diff --git a/logic/ftb/OneSixFTBInstance.cpp b/logic/minecraft/ftb/OneSixFTBInstance.cpp similarity index 98% rename from logic/ftb/OneSixFTBInstance.cpp rename to logic/minecraft/ftb/OneSixFTBInstance.cpp index 54a3d2bd0..19ec870a1 100644 --- a/logic/ftb/OneSixFTBInstance.cpp +++ b/logic/minecraft/ftb/OneSixFTBInstance.cpp @@ -4,11 +4,11 @@ #include "minecraft/MinecraftProfile.h" #include "minecraft/GradleSpecifier.h" #include "tasks/SequentialTask.h" -#include "forge/ForgeInstaller.h" -#include "forge/ForgeVersionList.h" #include #include +#include + OneSixFTBInstance::OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) : OneSixInstance(globalSettings, settings, rootDir) { diff --git a/logic/ftb/OneSixFTBInstance.h b/logic/minecraft/ftb/OneSixFTBInstance.h similarity index 93% rename from logic/ftb/OneSixFTBInstance.h rename to logic/minecraft/ftb/OneSixFTBInstance.h index add6b51c7..09a2dcb06 100644 --- a/logic/ftb/OneSixFTBInstance.h +++ b/logic/minecraft/ftb/OneSixFTBInstance.h @@ -1,6 +1,6 @@ #pragma once -#include "minecraft/OneSixInstance.h" +#include "minecraft/onesix/OneSixInstance.h" class OneSixFTBInstance : public OneSixInstance { diff --git a/logic/minecraft/LegacyInstance.cpp b/logic/minecraft/legacy/LegacyInstance.cpp similarity index 99% rename from logic/minecraft/LegacyInstance.cpp rename to logic/minecraft/legacy/LegacyInstance.cpp index 227fd6018..056079f65 100644 --- a/logic/minecraft/LegacyInstance.cpp +++ b/logic/minecraft/legacy/LegacyInstance.cpp @@ -20,7 +20,7 @@ #include "LegacyInstance.h" -#include "minecraft/LegacyUpdate.h" +#include "minecraft/legacy/LegacyUpdate.h" #include "icons/IconList.h" #include "launch/LaunchTask.h" #include diff --git a/logic/minecraft/LegacyInstance.h b/logic/minecraft/legacy/LegacyInstance.h similarity index 100% rename from logic/minecraft/LegacyInstance.h rename to logic/minecraft/legacy/LegacyInstance.h diff --git a/logic/minecraft/LegacyUpdate.cpp b/logic/minecraft/legacy/LegacyUpdate.cpp similarity index 99% rename from logic/minecraft/LegacyUpdate.cpp rename to logic/minecraft/legacy/LegacyUpdate.cpp index 2fd8e3cbc..af787f8c5 100644 --- a/logic/minecraft/LegacyUpdate.cpp +++ b/logic/minecraft/legacy/LegacyUpdate.cpp @@ -25,10 +25,10 @@ #include "LegacyUpdate.h" -#include "minecraft/LwjglVersionList.h" +#include "LwjglVersionList.h" #include "minecraft/MinecraftVersionList.h" #include "minecraft/ModList.h" -#include "minecraft/LegacyInstance.h" +#include "LegacyInstance.h" #include LegacyUpdate::LegacyUpdate(BaseInstance *inst, QObject *parent) : Task(parent), m_inst(inst) diff --git a/logic/minecraft/LegacyUpdate.h b/logic/minecraft/legacy/LegacyUpdate.h similarity index 100% rename from logic/minecraft/LegacyUpdate.h rename to logic/minecraft/legacy/LegacyUpdate.h diff --git a/logic/minecraft/LwjglVersionList.cpp b/logic/minecraft/legacy/LwjglVersionList.cpp similarity index 100% rename from logic/minecraft/LwjglVersionList.cpp rename to logic/minecraft/legacy/LwjglVersionList.cpp diff --git a/logic/minecraft/LwjglVersionList.h b/logic/minecraft/legacy/LwjglVersionList.h similarity index 100% rename from logic/minecraft/LwjglVersionList.h rename to logic/minecraft/legacy/LwjglVersionList.h diff --git a/logic/liteloader/LiteLoaderInstaller.cpp b/logic/minecraft/liteloader/LiteLoaderInstaller.cpp similarity index 97% rename from logic/liteloader/LiteLoaderInstaller.cpp rename to logic/minecraft/liteloader/LiteLoaderInstaller.cpp index 555d16c11..3fefe2731 100644 --- a/logic/liteloader/LiteLoaderInstaller.cpp +++ b/logic/minecraft/liteloader/LiteLoaderInstaller.cpp @@ -22,8 +22,8 @@ #include "minecraft/MinecraftProfile.h" #include "minecraft/RawLibrary.h" -#include "minecraft/OneSixInstance.h" -#include "liteloader/LiteLoaderVersionList.h" +#include "minecraft/onesix/OneSixInstance.h" +#include "minecraft/liteloader/LiteLoaderVersionList.h" #include "Exception.h" LiteLoaderInstaller::LiteLoaderInstaller() : BaseInstaller() diff --git a/logic/liteloader/LiteLoaderInstaller.h b/logic/minecraft/liteloader/LiteLoaderInstaller.h similarity index 96% rename from logic/liteloader/LiteLoaderInstaller.h rename to logic/minecraft/liteloader/LiteLoaderInstaller.h index 5afa4f6c7..fe0aee3d3 100644 --- a/logic/liteloader/LiteLoaderInstaller.h +++ b/logic/minecraft/liteloader/LiteLoaderInstaller.h @@ -19,7 +19,7 @@ #include #include "BaseInstaller.h" -#include "liteloader/LiteLoaderVersionList.h" +#include "LiteLoaderVersionList.h" #include "multimc_logic_export.h" diff --git a/logic/liteloader/LiteLoaderVersionList.cpp b/logic/minecraft/liteloader/LiteLoaderVersionList.cpp similarity index 100% rename from logic/liteloader/LiteLoaderVersionList.cpp rename to logic/minecraft/liteloader/LiteLoaderVersionList.cpp diff --git a/logic/liteloader/LiteLoaderVersionList.h b/logic/minecraft/liteloader/LiteLoaderVersionList.h similarity index 100% rename from logic/liteloader/LiteLoaderVersionList.h rename to logic/minecraft/liteloader/LiteLoaderVersionList.h diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/onesix/OneSixInstance.cpp similarity index 97% rename from logic/minecraft/OneSixInstance.cpp rename to logic/minecraft/onesix/OneSixInstance.cpp index 9a3920cc1..54381a99f 100644 --- a/logic/minecraft/OneSixInstance.cpp +++ b/logic/minecraft/onesix/OneSixInstance.cpp @@ -16,20 +16,20 @@ #include #include -#include "minecraft/OneSixInstance.h" +#include "OneSixInstance.h" +#include "OneSixUpdate.h" +#include "OneSixProfileStrategy.h" -#include "minecraft/OneSixUpdate.h" #include "minecraft/MinecraftProfile.h" #include "minecraft/VersionBuildError.h" #include "launch/LaunchTask.h" -#include -#include -#include -#include -#include -#include -#include -#include "minecraft/OneSixProfileStrategy.h" +#include "launch/steps/PreLaunchCommand.h" +#include "launch/steps/Update.h" +#include "launch/steps/LaunchMinecraft.h" +#include "launch/steps/PostLaunchCommand.h" +#include "launch/steps/TextPrint.h" +#include "launch/steps/ModMinecraftJar.h" +#include "launch/steps/CheckJava.h" #include "MMCZip.h" #include "minecraft/AssetsUtils.h" diff --git a/logic/minecraft/OneSixInstance.h b/logic/minecraft/onesix/OneSixInstance.h similarity index 100% rename from logic/minecraft/OneSixInstance.h rename to logic/minecraft/onesix/OneSixInstance.h diff --git a/logic/minecraft/OneSixProfileStrategy.cpp b/logic/minecraft/onesix/OneSixProfileStrategy.cpp similarity index 99% rename from logic/minecraft/OneSixProfileStrategy.cpp rename to logic/minecraft/onesix/OneSixProfileStrategy.cpp index 3e3534a02..35ca769fe 100644 --- a/logic/minecraft/OneSixProfileStrategy.cpp +++ b/logic/minecraft/onesix/OneSixProfileStrategy.cpp @@ -1,6 +1,7 @@ -#include "minecraft/OneSixProfileStrategy.h" +#include "OneSixProfileStrategy.h" +#include "OneSixInstance.h" + #include "minecraft/VersionBuildError.h" -#include "minecraft/OneSixInstance.h" #include "minecraft/MinecraftVersionList.h" #include "Env.h" #include diff --git a/logic/minecraft/OneSixProfileStrategy.h b/logic/minecraft/onesix/OneSixProfileStrategy.h similarity index 94% rename from logic/minecraft/OneSixProfileStrategy.h rename to logic/minecraft/onesix/OneSixProfileStrategy.h index a6abe9646..96c1ba7b7 100644 --- a/logic/minecraft/OneSixProfileStrategy.h +++ b/logic/minecraft/onesix/OneSixProfileStrategy.h @@ -1,5 +1,5 @@ #pragma once -#include "ProfileStrategy.h" +#include "minecraft/ProfileStrategy.h" class OneSixInstance; diff --git a/logic/minecraft/OneSixUpdate.cpp b/logic/minecraft/onesix/OneSixUpdate.cpp similarity index 99% rename from logic/minecraft/OneSixUpdate.cpp rename to logic/minecraft/onesix/OneSixUpdate.cpp index 5babb0b67..3fd66920d 100644 --- a/logic/minecraft/OneSixUpdate.cpp +++ b/logic/minecraft/onesix/OneSixUpdate.cpp @@ -15,6 +15,7 @@ #include "Env.h" #include "OneSixUpdate.h" +#include "OneSixInstance.h" #include @@ -28,8 +29,7 @@ #include "minecraft/MinecraftVersionList.h" #include "minecraft/MinecraftProfile.h" #include "minecraft/RawLibrary.h" -#include "minecraft/OneSixInstance.h" -#include "forge/ForgeMirrors.h" +#include "minecraft/forge/ForgeMirrors.h" #include "net/URLConstants.h" #include "minecraft/AssetsUtils.h" #include "Exception.h" diff --git a/logic/minecraft/OneSixUpdate.h b/logic/minecraft/onesix/OneSixUpdate.h similarity index 100% rename from logic/minecraft/OneSixUpdate.h rename to logic/minecraft/onesix/OneSixUpdate.h