mirror of
https://github.com/MultiMC/MultiMC5.git
synced 2024-09-02 21:19:25 +00:00
NOISSUE move files into paths that make more sense
This commit is contained in:
parent
71e4b147ec
commit
17ad1e64f8
@ -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"
|
||||
|
@ -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>
|
||||
|
||||
|
@ -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>
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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>
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "auth/MojangAccountList.h"
|
||||
#include "minecraft/auth/MojangAccountList.h"
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include "LoginDialog.h"
|
||||
#include "ui_LoginDialog.h"
|
||||
|
||||
#include "auth/YggdrasilTask.h"
|
||||
#include "minecraft/auth/YggdrasilTask.h"
|
||||
|
||||
#include <QtWidgets/QPushButton>
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
#include <QtWidgets/QDialog>
|
||||
#include <QtCore/QEventLoop>
|
||||
|
||||
#include "auth/MojangAccount.h"
|
||||
#include "minecraft/auth/MojangAccount.h"
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
@ -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"
|
||||
|
@ -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)
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
#include "minecraft/OneSixInstance.h"
|
||||
#include "minecraft/legacy/LegacyInstance.h"
|
||||
#include "pages/BasePage.h"
|
||||
#include <MultiMC.h>
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
#include "minecraft/OneSixInstance.h"
|
||||
#include "minecraft/onesix/OneSixInstance.h"
|
||||
#include "BasePage.h"
|
||||
#include <MultiMC.h>
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
#include "minecraft/OneSixInstance.h"
|
||||
#include "minecraft/onesix/OneSixInstance.h"
|
||||
#include "BasePage.h"
|
||||
|
||||
namespace Ui
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
#include "minecraft/OneSixInstance.h"
|
||||
#include "minecraft/onesix/OneSixInstance.h"
|
||||
#include "BasePage.h"
|
||||
#include <MultiMC.h>
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
#include "pages/BasePage.h"
|
||||
|
||||
#include "auth/MojangAccountList.h"
|
||||
#include "minecraft/auth/MojangAccountList.h"
|
||||
#include "MultiMC.h"
|
||||
|
||||
namespace Ui
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include <QFile>
|
||||
|
||||
#include "BaseInstaller.h"
|
||||
#include "minecraft/OneSixInstance.h"
|
||||
#include "minecraft/onesix/OneSixInstance.h"
|
||||
|
||||
BaseInstaller::BaseInstaller()
|
||||
{
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
#include "LaunchMinecraft.h"
|
||||
#include <launch/LaunchTask.h>
|
||||
#include <minecraft/OneSixInstance.h>
|
||||
#include <minecraft/MinecraftInstance.h>
|
||||
#include <FileSystem.h>
|
||||
#include <QStandardPaths>
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
#include <QUrl>
|
||||
#include <memory>
|
||||
|
||||
#include "minecraft/OneSixRule.h"
|
||||
#include "OneSixRule.h"
|
||||
#include "minecraft/OpSys.h"
|
||||
#include "GradleSpecifier.h"
|
||||
#include "net/URLConstants.h"
|
||||
|
@ -13,7 +13,8 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include "auth/MojangAccountList.h"
|
||||
#include "MojangAccountList.h"
|
||||
#include "MojangAccount.h"
|
||||
|
||||
#include <QIODevice>
|
||||
#include <QFile>
|
||||
@ -26,7 +27,6 @@
|
||||
|
||||
#include <QDebug>
|
||||
|
||||
#include "auth/MojangAccount.h"
|
||||
#include <FileSystem.h>
|
||||
|
||||
#define ACCOUNT_LIST_FORMAT_VERSION 2
|
@ -15,13 +15,13 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "MojangAccount.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QVariant>
|
||||
#include <QAbstractListModel>
|
||||
#include <QSharedPointer>
|
||||
|
||||
#include "auth/MojangAccount.h"
|
||||
|
||||
#include "multimc_logic_export.h"
|
||||
|
||||
/*!
|
@ -13,7 +13,8 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <auth/YggdrasilTask.h>
|
||||
#include "YggdrasilTask.h"
|
||||
#include "MojangAccount.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
@ -23,7 +24,7 @@
|
||||
#include <QByteArray>
|
||||
|
||||
#include <Env.h>
|
||||
#include <auth/MojangAccount.h>
|
||||
|
||||
#include <net/URLConstants.h>
|
||||
|
||||
#include <QDebug>
|
@ -22,7 +22,7 @@
|
||||
#include <QTimer>
|
||||
#include <qsslerror.h>
|
||||
|
||||
#include "auth/MojangAccount.h"
|
||||
#include "MojangAccount.h"
|
||||
|
||||
class QNetworkReply;
|
||||
|
@ -14,9 +14,8 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <auth/flows/AuthenticateTask.h>
|
||||
|
||||
#include <auth/MojangAccount.h>
|
||||
#include "AuthenticateTask.h"
|
||||
#include "../MojangAccount.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
@ -15,7 +15,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <auth/YggdrasilTask.h>
|
||||
#include "../YggdrasilTask.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QString>
|
@ -13,9 +13,8 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <auth/flows/RefreshTask.h>
|
||||
|
||||
#include <auth/MojangAccount.h>
|
||||
#include "RefreshTask.h"
|
||||
#include "../MojangAccount.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
@ -15,7 +15,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <auth/YggdrasilTask.h>
|
||||
#include "../YggdrasilTask.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QString>
|
@ -14,9 +14,8 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <auth/flows/ValidateTask.h>
|
||||
|
||||
#include <auth/MojangAccount.h>
|
||||
#include "ValidateTask.h"
|
||||
#include "../MojangAccount.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
@ -19,7 +19,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <auth/YggdrasilTask.h>
|
||||
#include "../YggdrasilTask.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QString>
|
@ -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"
|
@ -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 <QFile>
|
||||
#include <QTemporaryFile>
|
||||
|
||||
typedef std::shared_ptr<class ForgeMirrors> ForgeMirrorsPtr;
|
||||
|
||||
class ForgeMirrors : public NetAction
|
@ -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"
|
@ -15,6 +15,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "ForgeVersion.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QAbstractListModel>
|
||||
#include <QUrl>
|
||||
@ -23,7 +25,6 @@
|
||||
#include "BaseVersionList.h"
|
||||
#include "tasks/Task.h"
|
||||
#include "net/NetJob.h"
|
||||
#include "forge/ForgeVersion.h"
|
||||
|
||||
#include "multimc_logic_export.h"
|
||||
|
@ -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 <FileSystem.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;
|
||||
|
@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "minecraft/LegacyInstance.h"
|
||||
#include "minecraft/legacy/LegacyInstance.h"
|
||||
|
||||
class LegacyFTBInstance : public LegacyInstance
|
||||
{
|
@ -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 <settings/INISettingsObject.h>
|
||||
#include <FileSystem.h>
|
||||
|
||||
#include <QJsonArray>
|
||||
|
||||
OneSixFTBInstance::OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) :
|
||||
OneSixInstance(globalSettings, settings, rootDir)
|
||||
{
|
@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "minecraft/OneSixInstance.h"
|
||||
#include "minecraft/onesix/OneSixInstance.h"
|
||||
|
||||
class OneSixFTBInstance : public OneSixInstance
|
||||
{
|
@ -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 <launch/steps/LaunchMinecraft.h>
|
@ -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 <FileSystem.h>
|
||||
|
||||
LegacyUpdate::LegacyUpdate(BaseInstance *inst, QObject *parent) : Task(parent), m_inst(inst)
|
@ -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()
|
@ -19,7 +19,7 @@
|
||||
#include <QMap>
|
||||
|
||||
#include "BaseInstaller.h"
|
||||
#include "liteloader/LiteLoaderVersionList.h"
|
||||
#include "LiteLoaderVersionList.h"
|
||||
|
||||
#include "multimc_logic_export.h"
|
||||
|
@ -16,20 +16,20 @@
|
||||
#include <QIcon>
|
||||
#include <QDebug>
|
||||
|
||||
#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 <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 "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"
|
@ -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 <FileSystem.h>
|
@ -1,5 +1,5 @@
|
||||
#pragma once
|
||||
#include "ProfileStrategy.h"
|
||||
#include "minecraft/ProfileStrategy.h"
|
||||
|
||||
class OneSixInstance;
|
||||
|
@ -15,6 +15,7 @@
|
||||
|
||||
#include "Env.h"
|
||||
#include "OneSixUpdate.h"
|
||||
#include "OneSixInstance.h"
|
||||
|
||||
#include <QtNetwork>
|
||||
|
||||
@ -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"
|
Loading…
Reference in New Issue
Block a user