diff options
Diffstat (limited to 'logic')
120 files changed, 611 insertions, 318 deletions
diff --git a/logic/BaseInstaller.cpp b/logic/BaseInstaller.cpp index b2cdefbc..d8e83bb2 100644 --- a/logic/BaseInstaller.cpp +++ b/logic/BaseInstaller.cpp @@ -15,8 +15,8 @@ #include <QFile> -#include "logic/BaseInstaller.h" -#include "logic/minecraft/OneSixInstance.h" +#include "BaseInstaller.h" +#include "minecraft/OneSixInstance.h" BaseInstaller::BaseInstaller() { diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp index 902c9e7e..69bc7597 100644 --- a/logic/BaseInstance.cpp +++ b/logic/BaseInstance.cpp @@ -18,14 +18,14 @@ #include <QFileInfo> #include <QDir> -#include "logic/settings/INISettingsObject.h" -#include "logic/settings/Setting.h" -#include "logic/settings/OverrideSetting.h" +#include "settings/INISettingsObject.h" +#include "settings/Setting.h" +#include "settings/OverrideSetting.h" #include "pathutils.h" #include <cmdutils.h> -#include "logic/minecraft/MinecraftVersionList.h" -#include "logic/icons/IconList.h" +#include "minecraft/MinecraftVersionList.h" +#include "icons/IconList.h" BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) : QObject() diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h index 3a4fa4a6..6a8ba11c 100644 --- a/logic/BaseInstance.h +++ b/logic/BaseInstance.h @@ -19,11 +19,11 @@ #include <QDateTime> #include <QSet> -#include "logic/settings/SettingsObject.h" +#include "settings/SettingsObject.h" -#include "logic/settings/INIFile.h" -#include "logic/BaseVersionList.h" -#include "logic/auth/MojangAccount.h" +#include "settings/INIFile.h" +#include "BaseVersionList.h" +#include "auth/MojangAccount.h" class QDir; class Task; @@ -186,7 +186,7 @@ protected slots: protected: QString m_rootDir; QString m_group; - std::shared_ptr<SettingsObject> m_settings; + SettingsObjectPtr m_settings; InstanceFlags m_flags; bool m_isRunning = false; }; diff --git a/logic/BaseProcess.cpp b/logic/BaseProcess.cpp index b0509d46..749efe0a 100644 --- a/logic/BaseProcess.cpp +++ b/logic/BaseProcess.cpp @@ -14,7 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "logic/BaseProcess.h" + +#include "BaseProcess.h" #include <QDebug> #include <QDir> #include <QEventLoop> diff --git a/logic/BaseVersionList.cpp b/logic/BaseVersionList.cpp index fe8af278..7752b14c 100644 --- a/logic/BaseVersionList.cpp +++ b/logic/BaseVersionList.cpp @@ -13,8 +13,8 @@ * limitations under the License. */ -#include "logic/BaseVersionList.h" -#include "logic/BaseVersion.h" +#include "BaseVersionList.h" +#include "BaseVersion.h" BaseVersionList::BaseVersionList(QObject *parent) : QAbstractListModel(parent) { diff --git a/logic/BaseVersionList.h b/logic/BaseVersionList.h index f8737b32..584d6ca7 100644 --- a/logic/BaseVersionList.h +++ b/logic/BaseVersionList.h @@ -19,7 +19,7 @@ #include <QVariant> #include <QAbstractListModel> -#include "logic/BaseVersion.h" +#include "BaseVersion.h" class Task; diff --git a/logic/CMakeLists.txt b/logic/CMakeLists.txt new file mode 100644 index 00000000..cf55695d --- /dev/null +++ b/logic/CMakeLists.txt @@ -0,0 +1,258 @@ +project(MultiMC-Logic) + +SET(LOGIC_SOURCES + # LOGIC - Base classes and infrastructure + BaseInstaller.h + BaseInstaller.cpp + BaseVersionList.h + BaseVersionList.cpp + InstanceList.h + InstanceList.cpp + BaseVersion.h + BaseProcess.h + BaseProcess.cpp + BaseInstance.h + BaseInstance.cpp + MMCError.h + + # WARNING: globals live here + Env.h + Env.cpp + + # JSON parsing helpers + MMCJson.h + MMCJson.cpp + + # RW lock protected map + RWStorage.h + + # A variable that has an implicit default value and keeps track of changes + DefaultVariable.h + + # a smart pointer wrapper intended for safer use with Qt signal/slot mechanisms + QObjectPtr.h + + # network stuffs + net/NetAction.h + net/MD5EtagDownload.h + net/MD5EtagDownload.cpp + net/ByteArrayDownload.h + net/ByteArrayDownload.cpp + net/CacheDownload.h + net/CacheDownload.cpp + net/NetJob.h + net/NetJob.cpp + net/HttpMetaCache.h + net/HttpMetaCache.cpp + net/PasteUpload.h + net/PasteUpload.cpp + net/URLConstants.h + 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 + + # Update system + updater/GoUpdate.h + updater/GoUpdate.cpp + updater/UpdateChecker.h + updater/UpdateChecker.cpp + updater/DownloadTask.h + updater/DownloadTask.cpp + + # Notifications - short warning messages + notifications/NotificationChecker.h + notifications/NotificationChecker.cpp + + # News System + news/NewsChecker.h + news/NewsChecker.cpp + news/NewsEntry.h + news/NewsEntry.cpp + + # Status system + status/StatusChecker.h + 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/SkinUtils.h + minecraft/SkinUtils.cpp + minecraft/JarUtils.h + minecraft/JarUtils.cpp + minecraft/GradleSpecifier.h + minecraft/MinecraftProfile.cpp + minecraft/MinecraftProfile.h + minecraft/JarMod.cpp + minecraft/JarMod.h + minecraft/MinecraftInstance.cpp + minecraft/MinecraftInstance.h + minecraft/MinecraftProcess.cpp + minecraft/MinecraftProcess.h + minecraft/MinecraftVersion.cpp + minecraft/MinecraftVersion.h + minecraft/MinecraftVersionList.cpp + minecraft/MinecraftVersionList.h + minecraft/NullProfileStrategy.h + minecraft/OneSixLibrary.cpp + minecraft/OneSixLibrary.h + minecraft/OneSixProfileStrategy.cpp + minecraft/OneSixProfileStrategy.h + minecraft/OneSixRule.cpp + minecraft/OneSixRule.h + minecraft/OpSys.cpp + minecraft/OpSys.h + minecraft/ParseUtils.cpp + minecraft/ParseUtils.h + minecraft/ProfileUtils.cpp + minecraft/ProfileUtils.h + minecraft/ProfileStrategy.h + minecraft/RawLibrary.cpp + minecraft/RawLibrary.h + minecraft/VersionBuilder.cpp + minecraft/VersionBuilder.h + minecraft/VersionBuildError.h + minecraft/VersionFile.cpp + minecraft/VersionFile.h + minecraft/ProfilePatch.h + minecraft/VersionSource.h + minecraft/VersionFilterData.h + minecraft/VersionFilterData.cpp + minecraft/Mod.h + minecraft/Mod.cpp + minecraft/ModList.h + minecraft/ModList.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 + + # A Recursive file system watcher + RecursiveFileSystemWatcher.h + RecursiveFileSystemWatcher.cpp + + # the screenshots feature + screenshots/Screenshot.h + screenshots/ImgurUpload.h + screenshots/ImgurUpload.cpp + screenshots/ImgurAlbumCreation.h + screenshots/ImgurAlbumCreation.cpp + + # Icons + icons/MMCIcon.h + icons/MMCIcon.cpp + icons/IconList.h + icons/IconList.cpp + + # Tasks + tasks/ProgressProvider.h + tasks/Task.h + tasks/Task.cpp + tasks/ThreadTask.h + tasks/ThreadTask.cpp + tasks/SequentialTask.h + tasks/SequentialTask.cpp + + # Settings + settings/INIFile.cpp + settings/INIFile.h + settings/INISettingsObject.cpp + settings/INISettingsObject.h + settings/OverrideSetting.cpp + settings/OverrideSetting.h + settings/Setting.cpp + settings/Setting.h + settings/SettingsObject.cpp + settings/SettingsObject.h + + # Java related code + java/JavaChecker.h + java/JavaChecker.cpp + java/JavaUtils.h + java/JavaUtils.cpp + java/JavaVersionList.h + java/JavaVersionList.cpp + java/JavaCheckerJob.h + java/JavaCheckerJob.cpp + + # Assets + minecraft/AssetsUtils.h + 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 + + # Liteloader and related things + liteloader/LiteLoaderInstaller.h + liteloader/LiteLoaderInstaller.cpp + liteloader/LiteLoaderVersionList.h + liteloader/LiteLoaderVersionList.cpp + + # Translations + trans/TranslationDownloader.h + trans/TranslationDownloader.cpp + + # Tools + tools/BaseExternalTool.cpp + tools/BaseExternalTool.h + tools/BaseProfiler.cpp + tools/BaseProfiler.h + tools/JProfiler.cpp + tools/JProfiler.h + tools/JVisualVM.cpp + tools/JVisualVM.h + tools/MCEditTool.cpp + tools/MCEditTool.h + +) +################################ COMPILE ################################ + +# Add common library +add_library(MultiMC_logic STATIC ${LOGIC_SOURCES}) + +# Link +target_link_libraries(MultiMC_logic xz-embedded unpack200 iconfix libUtil LogicalGui ${QUAZIP_LIBRARIES} + Qt5::Core Qt5::Xml Qt5::Widgets Qt5::Network Qt5::Concurrent Qt5::WebKitWidgets + ${MultiMC_LINK_ADDITIONAL_LIBS}) + +add_dependencies(MultiMC_logic QuaZIP) diff --git a/logic/Env.cpp b/logic/Env.cpp index 69986be2..0607c7ea 100644 --- a/logic/Env.cpp +++ b/logic/Env.cpp @@ -1,5 +1,5 @@ #include "Env.h" -#include "logic/net/HttpMetaCache.h" +#include "net/HttpMetaCache.h" #include "icons/IconList.h" #include "BaseVersion.h" #include "BaseVersionList.h" @@ -7,7 +7,7 @@ #include <QNetworkProxy> #include <QNetworkAccessManager> #include <QDebug> -#include "logic/tasks/Task.h" +#include "tasks/Task.h" #include <QDebug> /* diff --git a/logic/InstanceList.cpp b/logic/InstanceList.cpp index 10faf1ca..013de31e 100644 --- a/logic/InstanceList.cpp +++ b/logic/InstanceList.cpp @@ -27,16 +27,16 @@ #include <pathutils.h> #include <QDebug> -#include "logic/InstanceList.h" -#include "logic/icons/IconList.h" -#include "logic/BaseInstance.h" +#include "InstanceList.h" +#include "icons/IconList.h" +#include "BaseInstance.h" //FIXME: this really doesn't belong *here* -#include "logic/minecraft/OneSixInstance.h" -#include "logic/minecraft/LegacyInstance.h" +#include "minecraft/OneSixInstance.h" +#include "minecraft/LegacyInstance.h" #include "minecraft/MinecraftVersion.h" #include "settings/INISettingsObject.h" -#include "logic/ftb/FTBPlugin.h" +#include "ftb/FTBPlugin.h" const static int GROUP_FILE_FORMAT_VERSION = 1; diff --git a/logic/InstanceList.h b/logic/InstanceList.h index 9600ffe9..07a71ffb 100644 --- a/logic/InstanceList.h +++ b/logic/InstanceList.h @@ -19,7 +19,7 @@ #include <QAbstractListModel> #include <QSet> -#include "logic/BaseInstance.h" +#include "BaseInstance.h" class BaseInstance; class QDir; diff --git a/logic/MMCError.h b/logic/MMCError.h new file mode 100644 index 00000000..e81054a6 --- /dev/null +++ b/logic/MMCError.h @@ -0,0 +1,25 @@ +#pragma once +#include <exception> +#include <QString> +#include <QDebug> + +class MMCError : public std::exception +{ +public: + MMCError(QString cause) + { + exceptionCause = cause; + qCritical() << "Exception: " + cause; + }; + virtual ~MMCError() noexcept {} + virtual const char *what() const noexcept + { + return exceptionCause.toLocal8Bit(); + }; + virtual QString cause() const + { + return exceptionCause; + } +private: + QString exceptionCause; +}; diff --git a/logic/auth/MojangAccountList.cpp b/logic/auth/MojangAccountList.cpp index abed9b24..b69b9b81 100644 --- a/logic/auth/MojangAccountList.cpp +++ b/logic/auth/MojangAccountList.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "logic/auth/MojangAccountList.h" +#include "auth/MojangAccountList.h" #include <QIODevice> #include <QFile> @@ -26,7 +26,7 @@ #include <QDebug> -#include "logic/auth/MojangAccount.h" +#include "auth/MojangAccount.h" #include <pathutils.h> #define ACCOUNT_LIST_FORMAT_VERSION 2 diff --git a/logic/auth/MojangAccountList.h b/logic/auth/MojangAccountList.h index 383d9dc4..b68343f2 100644 --- a/logic/auth/MojangAccountList.h +++ b/logic/auth/MojangAccountList.h @@ -20,7 +20,7 @@ #include <QAbstractListModel> #include <QSharedPointer> -#include "logic/auth/MojangAccount.h" +#include "auth/MojangAccount.h" /*! * \brief List of available Mojang accounts. diff --git a/logic/auth/YggdrasilTask.cpp b/logic/auth/YggdrasilTask.cpp index 4d5c2594..3b6e0cfb 100644 --- a/logic/auth/YggdrasilTask.cpp +++ b/logic/auth/YggdrasilTask.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include <logic/auth/YggdrasilTask.h> +#include <auth/YggdrasilTask.h> #include <QObject> #include <QString> @@ -22,9 +22,9 @@ #include <QNetworkReply> #include <QByteArray> -#include <logic/Env.h> -#include <logic/auth/MojangAccount.h> -#include <logic/net/URLConstants.h> +#include <Env.h> +#include <auth/MojangAccount.h> +#include <net/URLConstants.h> #include <QDebug> diff --git a/logic/auth/YggdrasilTask.h b/logic/auth/YggdrasilTask.h index 1677bcf5..306d7358 100644 --- a/logic/auth/YggdrasilTask.h +++ b/logic/auth/YggdrasilTask.h @@ -15,14 +15,14 @@ #pragma once -#include <logic/tasks/Task.h> +#include <tasks/Task.h> #include <QString> #include <QJsonObject> #include <QTimer> #include <qsslerror.h> -#include "logic/auth/MojangAccount.h" +#include "auth/MojangAccount.h" class QNetworkReply; diff --git a/logic/auth/flows/AuthenticateTask.cpp b/logic/auth/flows/AuthenticateTask.cpp index 4141f00d..b26769d9 100644 --- a/logic/auth/flows/AuthenticateTask.cpp +++ b/logic/auth/flows/AuthenticateTask.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include <logic/auth/flows/AuthenticateTask.h> +#include <auth/flows/AuthenticateTask.h> -#include <logic/auth/MojangAccount.h> +#include <auth/MojangAccount.h> #include <QJsonDocument> #include <QJsonObject> diff --git a/logic/auth/flows/AuthenticateTask.h b/logic/auth/flows/AuthenticateTask.h index 8b5f3efc..65975ae5 100644 --- a/logic/auth/flows/AuthenticateTask.h +++ b/logic/auth/flows/AuthenticateTask.h @@ -15,7 +15,7 @@ #pragma once -#include <logic/auth/YggdrasilTask.h> +#include <auth/YggdrasilTask.h> #include <QObject> #include <QString> diff --git a/logic/auth/flows/RefreshTask.cpp b/logic/auth/flows/RefreshTask.cpp index 2216c7e4..83511200 100644 --- a/logic/auth/flows/RefreshTask.cpp +++ b/logic/auth/flows/RefreshTask.cpp @@ -13,9 +13,9 @@ * limitations under the License. */ -#include <logic/auth/flows/RefreshTask.h> +#include <auth/flows/RefreshTask.h> -#include <logic/auth/MojangAccount.h> +#include <auth/MojangAccount.h> #include <QJsonDocument> #include <QJsonObject> diff --git a/logic/auth/flows/RefreshTask.h b/logic/auth/flows/RefreshTask.h index 1b556776..6894e963 100644 --- a/logic/auth/flows/RefreshTask.h +++ b/logic/auth/flows/RefreshTask.h @@ -15,7 +15,7 @@ #pragma once -#include <logic/auth/YggdrasilTask.h> +#include <auth/YggdrasilTask.h> #include <QObject> #include <QString> diff --git a/logic/auth/flows/ValidateTask.cpp b/logic/auth/flows/ValidateTask.cpp index 21afb596..9a4dcd6d 100644 --- a/logic/auth/flows/ValidateTask.cpp +++ b/logic/auth/flows/ValidateTask.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include <logic/auth/flows/ValidateTask.h> +#include <auth/flows/ValidateTask.h> -#include <logic/auth/MojangAccount.h> +#include <auth/MojangAccount.h> #include <QJsonDocument> #include <QJsonObject> diff --git a/logic/auth/flows/ValidateTask.h b/logic/auth/flows/ValidateTask.h index aa9da912..204596f9 100644 --- a/logic/auth/flows/ValidateTask.h +++ b/logic/auth/flows/ValidateTask.h @@ -19,7 +19,7 @@ #pragma once -#include <logic/auth/YggdrasilTask.h> +#include <auth/YggdrasilTask.h> #include <QObject> #include <QString> diff --git a/logic/forge/ForgeInstaller.cpp b/logic/forge/ForgeInstaller.cpp index cbd96869..ee68069b 100644 --- a/logic/forge/ForgeInstaller.cpp +++ b/logic/forge/ForgeInstaller.cpp @@ -14,14 +14,14 @@ */ #include "ForgeInstaller.h" -#include "logic/minecraft/MinecraftProfile.h" -#include "logic/minecraft/OneSixLibrary.h" -#include "logic/net/HttpMetaCache.h" -#include "logic/tasks/Task.h" -#include "logic/minecraft/OneSixInstance.h" -#include "logic/forge/ForgeVersionList.h" -#include "logic/minecraft/VersionFilterData.h" -#include "logic/Env.h" +#include "minecraft/MinecraftProfile.h" +#include "minecraft/OneSixLibrary.h" +#include "net/HttpMetaCache.h" +#include "tasks/Task.h" +#include "minecraft/OneSixInstance.h" +#include "forge/ForgeVersionList.h" +#include "minecraft/VersionFilterData.h" +#include "Env.h" #include <quazip.h> #include <quazipfile.h> diff --git a/logic/forge/ForgeInstaller.h b/logic/forge/ForgeInstaller.h index e85582fd..1b31d39f 100644 --- a/logic/forge/ForgeInstaller.h +++ b/logic/forge/ForgeInstaller.h @@ -15,7 +15,7 @@ #pragma once -#include "logic/BaseInstaller.h" +#include "BaseInstaller.h" #include <QString> #include <memory> diff --git a/logic/forge/ForgeMirrors.cpp b/logic/forge/ForgeMirrors.cpp index e922fcc3..0dea0826 100644 --- a/logic/forge/ForgeMirrors.cpp +++ b/logic/forge/ForgeMirrors.cpp @@ -1,4 +1,4 @@ -#include "logic/Env.h" +#include "Env.h" #include "ForgeMirrors.h" #include <QDebug> #include <algorithm> diff --git a/logic/forge/ForgeMirrors.h b/logic/forge/ForgeMirrors.h index 21d91a11..e7c90fa5 100644 --- a/logic/forge/ForgeMirrors.h +++ b/logic/forge/ForgeMirrors.h @@ -15,10 +15,10 @@ #pragma once -#include "logic/net/NetAction.h" -#include "logic/net/HttpMetaCache.h" -#include "logic/net/NetJob.h" -#include "logic/forge/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; diff --git a/logic/forge/ForgeVersion.cpp b/logic/forge/ForgeVersion.cpp index f3e64204..b859a28c 100644 --- a/logic/forge/ForgeVersion.cpp +++ b/logic/forge/ForgeVersion.cpp @@ -1,5 +1,5 @@ #include "ForgeVersion.h" -#include "logic/minecraft/VersionFilterData.h" +#include "minecraft/VersionFilterData.h" #include <QObject> QString ForgeVersion::name() diff --git a/logic/forge/ForgeVersion.h b/logic/forge/ForgeVersion.h index e3c1aab9..e77d32f1 100644 --- a/logic/forge/ForgeVersion.h +++ b/logic/forge/ForgeVersion.h @@ -1,7 +1,7 @@ #pragma once #include <QString> #include <memory> -#include "logic/BaseVersion.h" +#include "BaseVersion.h" struct ForgeVersion; typedef std::shared_ptr<ForgeVersion> ForgeVersionPtr; diff --git a/logic/forge/ForgeVersionList.cpp b/logic/forge/ForgeVersionList.cpp index 260f84eb..56ffad11 100644 --- a/logic/forge/ForgeVersionList.cpp +++ b/logic/forge/ForgeVersionList.cpp @@ -13,11 +13,11 @@ * limitations under the License. */ -#include "logic/forge/ForgeVersionList.h" -#include "logic/forge/ForgeVersion.h" -#include "logic/net/NetJob.h" -#include "logic/net/URLConstants.h" -#include "logic/Env.h" +#include "forge/ForgeVersionList.h" +#include "forge/ForgeVersion.h" +#include "net/NetJob.h" +#include "net/URLConstants.h" +#include "Env.h" #include <QtNetwork> #include <QtXml> diff --git a/logic/forge/ForgeVersionList.h b/logic/forge/ForgeVersionList.h index 6bc9e0a9..75e1dd78 100644 --- a/logic/forge/ForgeVersionList.h +++ b/logic/forge/ForgeVersionList.h @@ -20,10 +20,10 @@ #include <QUrl> #include <QNetworkReply> -#include "logic/BaseVersionList.h" -#include "logic/tasks/Task.h" -#include "logic/net/NetJob.h" -#include "logic/forge/ForgeVersion.h" +#include "BaseVersionList.h" +#include "tasks/Task.h" +#include "net/NetJob.h" +#include "forge/ForgeVersion.h" class ForgeVersionList : public BaseVersionList { diff --git a/logic/forge/ForgeXzDownload.cpp b/logic/forge/ForgeXzDownload.cpp index 65b20959..712deb33 100644 --- a/logic/forge/ForgeXzDownload.cpp +++ b/logic/forge/ForgeXzDownload.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "logic/Env.h" +#include "Env.h" #include "ForgeXzDownload.h" #include <pathutils.h> diff --git a/logic/forge/ForgeXzDownload.h b/logic/forge/ForgeXzDownload.h index 49cedbdf..45722812 100644 --- a/logic/forge/ForgeXzDownload.h +++ b/logic/forge/ForgeXzDownload.h @@ -15,8 +15,8 @@ #pragma once -#include "logic/net/NetAction.h" -#include "logic/net/HttpMetaCache.h" +#include "net/NetAction.h" +#include "net/HttpMetaCache.h" #include <QFile> #include <QTemporaryFile> #include "ForgeMirror.h" diff --git a/logic/forge/LegacyForge.h b/logic/forge/LegacyForge.h index 5bc43fbf..f51d5e85 100644 --- a/logic/forge/LegacyForge.h +++ b/logic/forge/LegacyForge.h @@ -15,7 +15,7 @@ #pragma once -#include "logic/minecraft/Mod.h" +#include "minecraft/Mod.h" class MinecraftForge : public Mod { diff --git a/logic/ftb/FTBPlugin.cpp b/logic/ftb/FTBPlugin.cpp index de04e485..88f6e793 100644 --- a/logic/ftb/FTBPlugin.cpp +++ b/logic/ftb/FTBPlugin.cpp @@ -2,11 +2,11 @@ #include "FTBVersion.h" #include "LegacyFTBInstance.h" #include "OneSixFTBInstance.h" -#include <logic/BaseInstance.h> -#include <logic/icons/IconList.h> -#include <logic/InstanceList.h> -#include <logic/minecraft/MinecraftVersionList.h> -#include <logic/settings/INISettingsObject.h> +#include <BaseInstance.h> +#include <icons/IconList.h> +#include <InstanceList.h> +#include <minecraft/MinecraftVersionList.h> +#include <settings/INISettingsObject.h> #include <pathutils.h> #include "QDebug" #include <QXmlStreamReader> diff --git a/logic/ftb/FTBPlugin.h b/logic/ftb/FTBPlugin.h index 8a38e2bb..30913d19 100644 --- a/logic/ftb/FTBPlugin.h +++ b/logic/ftb/FTBPlugin.h @@ -1,6 +1,6 @@ #pragma once -#include <logic/BaseInstance.h> +#include <BaseInstance.h> // Pseudo-plugin for FTB related things. Super derpy! class FTBPlugin diff --git a/logic/ftb/FTBProfileStrategy.cpp b/logic/ftb/FTBProfileStrategy.cpp index 87be0ff9..cc20b247 100644 --- a/logic/ftb/FTBProfileStrategy.cpp +++ b/logic/ftb/FTBProfileStrategy.cpp @@ -1,7 +1,7 @@ -#include "logic/ftb/FTBProfileStrategy.h" -#include "logic/minecraft/VersionBuildError.h" -#include "logic/ftb/OneSixFTBInstance.h" -#include "logic/minecraft/MinecraftVersionList.h" +#include "ftb/FTBProfileStrategy.h" +#include "minecraft/VersionBuildError.h" +#include "ftb/OneSixFTBInstance.h" +#include "minecraft/MinecraftVersionList.h" #include <pathutils.h> #include <QDir> diff --git a/logic/ftb/FTBVersion.h b/logic/ftb/FTBVersion.h index dbd9c29e..805319b4 100644 --- a/logic/ftb/FTBVersion.h +++ b/logic/ftb/FTBVersion.h @@ -1,5 +1,5 @@ #pragma once -#include <logic/minecraft/MinecraftVersion.h> +#include <minecraft/MinecraftVersion.h> class FTBVersion : public BaseVersion { diff --git a/logic/ftb/LegacyFTBInstance.cpp b/logic/ftb/LegacyFTBInstance.cpp index 43a9b42a..e7490679 100644 --- a/logic/ftb/LegacyFTBInstance.cpp +++ b/logic/ftb/LegacyFTBInstance.cpp @@ -1,5 +1,5 @@ #include "LegacyFTBInstance.h" -#include <logic/settings/INISettingsObject.h> +#include <settings/INISettingsObject.h> #include <QDir> LegacyFTBInstance::LegacyFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) : diff --git a/logic/ftb/LegacyFTBInstance.h b/logic/ftb/LegacyFTBInstance.h index 80c6c5ab..3bacf653 100644 --- a/logic/ftb/LegacyFTBInstance.h +++ b/logic/ftb/LegacyFTBInstance.h @@ -1,6 +1,6 @@ #pragma once -#include "logic/minecraft/LegacyInstance.h" +#include "minecraft/LegacyInstance.h" class LegacyFTBInstance : public LegacyInstance { diff --git a/logic/ftb/OneSixFTBInstance.cpp b/logic/ftb/OneSixFTBInstance.cpp index 4902be08..7374b78f 100644 --- a/logic/ftb/OneSixFTBInstance.cpp +++ b/logic/ftb/OneSixFTBInstance.cpp @@ -1,13 +1,13 @@ #include "OneSixFTBInstance.h" #include "FTBProfileStrategy.h" -#include "logic/minecraft/MinecraftProfile.h" -#include "logic/minecraft/OneSixLibrary.h" -#include "logic/minecraft/VersionBuilder.h" -#include "logic/tasks/SequentialTask.h" -#include "logic/forge/ForgeInstaller.h" -#include "logic/forge/ForgeVersionList.h" -#include <logic/settings/INISettingsObject.h> +#include "minecraft/MinecraftProfile.h" +#include "minecraft/OneSixLibrary.h" +#include "minecraft/VersionBuilder.h" +#include "tasks/SequentialTask.h" +#include "forge/ForgeInstaller.h" +#include "forge/ForgeVersionList.h" +#include <settings/INISettingsObject.h> #include "pathutils.h" OneSixFTBInstance::OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) : diff --git a/logic/ftb/OneSixFTBInstance.h b/logic/ftb/OneSixFTBInstance.h index 7af7c770..dd652fd1 100644 --- a/logic/ftb/OneSixFTBInstance.h +++ b/logic/ftb/OneSixFTBInstance.h @@ -1,6 +1,6 @@ #pragma once -#include "logic/minecraft/OneSixInstance.h" +#include "minecraft/OneSixInstance.h" class OneSixLibrary; diff --git a/logic/icons/IconList.h b/logic/icons/IconList.h index 124ecf27..07fb1379 100644 --- a/logic/icons/IconList.h +++ b/logic/icons/IconList.h @@ -22,8 +22,8 @@ #include <QtGui/QIcon> #include <memory> #include "MMCIcon.h" -#include "logic/settings/Setting.h" -#include "logic/Env.h" // there is a global icon list inside Env. +#include "settings/Setting.h" +#include "Env.h" // there is a global icon list inside Env. class QFileSystemWatcher; diff --git a/logic/java/JavaCheckerJob.h b/logic/java/JavaCheckerJob.h index eba3751a..a98d88cd 100644 --- a/logic/java/JavaCheckerJob.h +++ b/logic/java/JavaCheckerJob.h @@ -18,7 +18,7 @@ #include <QtNetwork> #include <QLabel> #include "JavaChecker.h" -#include "logic/tasks/ProgressProvider.h" +#include "tasks/ProgressProvider.h" class JavaCheckerJob; typedef std::shared_ptr<JavaCheckerJob> JavaCheckerJobPtr; diff --git a/logic/java/JavaUtils.cpp b/logic/java/JavaUtils.cpp index 3cacbbd2..ac1d60e4 100644 --- a/logic/java/JavaUtils.cpp +++ b/logic/java/JavaUtils.cpp @@ -18,13 +18,13 @@ #include <QDir> #include <QStringList> -#include <logic/settings/Setting.h> +#include <settings/Setting.h> #include <pathutils.h> #include <QDebug> -#include "logic/java/JavaUtils.h" -#include "logic/java/JavaCheckerJob.h" -#include "logic/java/JavaVersionList.h" +#include "java/JavaUtils.h" +#include "java/JavaCheckerJob.h" +#include "java/JavaVersionList.h" JavaUtils::JavaUtils() { diff --git a/logic/java/JavaVersionList.cpp b/logic/java/JavaVersionList.cpp index 4f8592ce..bb5f025f 100644 --- a/logic/java/JavaVersionList.cpp +++ b/logic/java/JavaVersionList.cpp @@ -19,9 +19,9 @@ #include <QDebug> -#include "logic/java/JavaVersionList.h" -#include "logic/java/JavaCheckerJob.h" -#include "logic/java/JavaUtils.h" +#include "java/JavaVersionList.h" +#include "java/JavaCheckerJob.h" +#include "java/JavaUtils.h" JavaVersionList::JavaVersionList(QObject *parent) : BaseVersionList(parent) { diff --git a/logic/java/JavaVersionList.h b/logic/java/JavaVersionList.h index 288f0608..820bd5a6 100644 --- a/logic/java/JavaVersionList.h +++ b/logic/java/JavaVersionList.h @@ -18,9 +18,9 @@ #include <QObject> #include <QAbstractListModel> -#include "logic/BaseVersionList.h" -#include "logic/tasks/Task.h" -#include "logic/java/JavaCheckerJob.h" +#include "BaseVersionList.h" +#include "tasks/Task.h" +#include "java/JavaCheckerJob.h" class JavaListLoadTask; diff --git a/logic/liteloader/LiteLoaderInstaller.cpp b/logic/liteloader/LiteLoaderInstaller.cpp index fadcc790..ab802380 100644 --- a/logic/liteloader/LiteLoaderInstaller.cpp +++ b/logic/liteloader/LiteLoaderInstaller.cpp @@ -20,10 +20,10 @@ #include <QDebug> -#include "logic/minecraft/MinecraftProfile.h" -#include "logic/minecraft/OneSixLibrary.h" -#include "logic/minecraft/OneSixInstance.h" -#include "logic/liteloader/LiteLoaderVersionList.h" +#include "minecraft/MinecraftProfile.h" +#include "minecraft/OneSixLibrary.h" +#include "minecraft/OneSixInstance.h" +#include "liteloader/LiteLoaderVersionList.h" LiteLoaderInstaller::LiteLoaderInstaller() : BaseInstaller() { diff --git a/logic/liteloader/LiteLoaderInstaller.h b/logic/liteloader/LiteLoaderInstaller.h index b326cc3e..51d58706 100644 --- a/logic/liteloader/LiteLoaderInstaller.h +++ b/logic/liteloader/LiteLoaderInstaller.h @@ -18,8 +18,8 @@ #include <QString> #include <QMap> -#include "logic/BaseInstaller.h" -#include "logic/liteloader/LiteLoaderVersionList.h" +#include "BaseInstaller.h" +#include "liteloader/LiteLoaderVersionList.h" class LiteLoaderInstaller : public BaseInstaller { diff --git a/logic/liteloader/LiteLoaderVersionList.cpp b/logic/liteloader/LiteLoaderVersionList.cpp index 89ea5df5..2e54afdf 100644 --- a/logic/liteloader/LiteLoaderVersionList.cpp +++ b/logic/liteloader/LiteLoaderVersionList.cpp @@ -14,9 +14,9 @@ */ #include "LiteLoaderVersionList.h" -#include "logic/Env.h" -#include "logic/net/URLConstants.h" -#include <MMCError.h> +#include "Env.h" +#include "net/URLConstants.h" +#include "MMCError.h" #include <QtXml> diff --git a/logic/liteloader/LiteLoaderVersionList.h b/logic/liteloader/LiteLoaderVersionList.h index f9764d72..fd20fcfa 100644 --- a/logic/liteloader/LiteLoaderVersionList.h +++ b/logic/liteloader/LiteLoaderVersionList.h @@ -19,11 +19,11 @@ #include <QString> #include <QStringList> -#include "logic/BaseVersion.h" -#include "logic/BaseVersionList.h" -#include "logic/tasks/Task.h" -#include "logic/net/NetJob.h" -#include <logic/minecraft/RawLibrary.h> +#include "BaseVersion.h" +#include "BaseVersionList.h" +#include "tasks/Task.h" +#include "net/NetJob.h" +#include <minecraft/RawLibrary.h> class LLListLoadTask; class QNetworkReply; diff --git a/logic/minecraft/GradleSpecifier.h b/logic/minecraft/GradleSpecifier.h index 411aed65..18308537 100644 --- a/logic/minecraft/GradleSpecifier.h +++ b/logic/minecraft/GradleSpecifier.h @@ -2,7 +2,7 @@ #include <QString> #include <QStringList> -#include "logic/DefaultVariable.h" +#include "DefaultVariable.h" struct GradleSpecifier { diff --git a/logic/minecraft/JarMod.cpp b/logic/minecraft/JarMod.cpp index fce8a492..c7ba58f1 100644 --- a/logic/minecraft/JarMod.cpp +++ b/logic/minecraft/JarMod.cpp @@ -1,5 +1,5 @@ #include "JarMod.h" -#include "logic/MMCJson.h" +#include "MMCJson.h" using namespace MMCJson; JarmodPtr Jarmod::fromJson(const QJsonObject &libObj, const QString &filename) diff --git a/logic/minecraft/JarUtils.cpp b/logic/minecraft/JarUtils.cpp index 59326aba..b8fb6f0d 100644 --- a/logic/minecraft/JarUtils.cpp +++ b/logic/minecraft/JarUtils.cpp @@ -1,4 +1,4 @@ -#include "logic/minecraft/JarUtils.h" +#include "minecraft/JarUtils.h" #include <quazip.h> #include <quazipfile.h> #include <JlCompress.h> diff --git a/logic/minecraft/LegacyInstance.cpp b/logic/minecraft/LegacyInstance.cpp index c0fe1513..a330842d 100644 --- a/logic/minecraft/LegacyInstance.cpp +++ b/logic/minecraft/LegacyInstance.cpp @@ -16,15 +16,17 @@ #include <QFileInfo> #include <QDir> #include <QImage> -#include <logic/settings/Setting.h> +#include <settings/Setting.h> #include <pathutils.h> #include <cmdutils.h> #include "LegacyInstance.h" -#include "logic/minecraft/LegacyUpdate.h" -#include "logic/icons/IconList.h" -#include "logic/minecraft/MinecraftProcess.h" +#include "minecraft/LegacyUpdate.h" +#include "icons/IconList.h" +#include "minecraft/MinecraftProcess.h" +#include "minecraft/ModList.h" +/* #include "gui/pages/LegacyUpgradePage.h" #include "gui/pages/ModFolderPage.h" #include "gui/pages/LegacyJarModPage.h" @@ -32,6 +34,7 @@ #include <gui/pages/InstanceSettingsPage.h> #include <gui/pages/NotesPage.h> #include <gui/pages/ScreenshotsPage.h> +*/ LegacyInstance::LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) : MinecraftInstance(globalSettings, settings, rootDir) @@ -53,6 +56,7 @@ LegacyInstance::LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectP settings->registerSetting("CustomBaseJar", ""); } +/* QList<BasePage *> LegacyInstance::getPages() { QList<BasePage *> values; @@ -74,6 +78,7 @@ QString LegacyInstance::dialogTitle() { return tr("Edit Instance (%1)").arg(name()); } +*/ QString LegacyInstance::baseJar() const { diff --git a/logic/minecraft/LegacyInstance.h b/logic/minecraft/LegacyInstance.h index 353718c1..64bcb08b 100644 --- a/logic/minecraft/LegacyInstance.h +++ b/logic/minecraft/LegacyInstance.h @@ -15,13 +15,12 @@ #pragma once -#include "logic/minecraft/MinecraftInstance.h" -#include "gui/pages/BasePageProvider.h" +#include "minecraft/MinecraftInstance.h" class ModList; class Task; -class LegacyInstance : public MinecraftInstance, public BasePageProvider +class LegacyInstance : public MinecraftInstance { Q_OBJECT public: @@ -36,9 +35,11 @@ public: //! Path to the instance's modlist file. QString modListFile() const; + /* ////// Edit Instance Dialog stuff ////// virtual QList<BasePage *> getPages(); virtual QString dialogTitle(); + */ ////// Mod Lists ////// std::shared_ptr<ModList> jarModList() const ; diff --git a/logic/minecraft/LegacyUpdate.cpp b/logic/minecraft/LegacyUpdate.cpp index d853536a..e2fffbb3 100644 --- a/logic/minecraft/LegacyUpdate.cpp +++ b/logic/minecraft/LegacyUpdate.cpp @@ -20,16 +20,16 @@ #include <JlCompress.h> #include <QDebug> -#include "logic/Env.h" -#include "logic/BaseInstance.h" -#include "logic/net/URLConstants.h" - -#include "logic/minecraft/JarUtils.h" -#include "logic/minecraft/LegacyUpdate.h" -#include "logic/minecraft/LwjglVersionList.h" -#include "logic/minecraft/MinecraftVersionList.h" -#include "logic/minecraft/ModList.h" -#include "logic/minecraft/LegacyInstance.h" +#include "Env.h" +#include "BaseInstance.h" +#include "net/URLConstants.h" + +#include "minecraft/JarUtils.h" +#include "minecraft/LegacyUpdate.h" +#include "minecraft/LwjglVersionList.h" +#include "minecraft/MinecraftVersionList.h" +#include "minecraft/ModList.h" +#include "minecraft/LegacyInstance.h" LegacyUpdate::LegacyUpdate(BaseInstance *inst, QObject *parent) : Task(parent), m_inst(inst) { diff --git a/logic/minecraft/LegacyUpdate.h b/logic/minecraft/LegacyUpdate.h index 78e456a1..61de75d3 100644 --- a/logic/minecraft/LegacyUpdate.h +++ b/logic/minecraft/LegacyUpdate.h @@ -19,9 +19,9 @@ #include <QList> #include <QUrl> -#include "logic/net/NetJob.h" -#include "logic/tasks/Task.h" -#include "logic/minecraft/VersionFilterData.h" +#include "net/NetJob.h" +#include "tasks/Task.h" +#include "minecraft/VersionFilterData.h" class MinecraftVersion; class BaseInstance; diff --git a/logic/minecraft/LwjglVersionList.cpp b/logic/minecraft/LwjglVersionList.cpp index 9e101b74..bb017368 100644 --- a/logic/minecraft/LwjglVersionList.cpp +++ b/logic/minecraft/LwjglVersionList.cpp @@ -14,7 +14,7 @@ */ #include "LwjglVersionList.h" -#include "logic/Env.h" +#include "Env.h" #include <QtNetwork> #include <QtXml> diff --git a/logic/minecraft/LwjglVersionList.h b/logic/minecraft/LwjglVersionList.h index c364fa13..9584f837 100644 --- a/logic/minecraft/LwjglVersionList.h +++ b/logic/minecraft/LwjglVersionList.h @@ -21,8 +21,8 @@ #include <QNetworkReply> #include <memory> -#include "logic/BaseVersion.h" -#include "logic/BaseVersionList.h" +#include "BaseVersion.h" +#include "BaseVersionList.h" class LWJGLVersion; typedef std::shared_ptr<LWJGLVersion> PtrLWJGLVersion; diff --git a/logic/minecraft/MinecraftInstance.cpp b/logic/minecraft/MinecraftInstance.cpp index 93aeecd1..e4273cb9 100644 --- a/logic/minecraft/MinecraftInstance.cpp +++ b/logic/minecraft/MinecraftInstance.cpp @@ -1,8 +1,8 @@ #include "MinecraftInstance.h" -#include "logic/settings/SettingsObject.h" +#include "settings/SettingsObject.h" #include <pathutils.h> -#include "logic/Env.h" -#include "logic/minecraft/MinecraftVersionList.h" +#include "Env.h" +#include "minecraft/MinecraftVersionList.h" MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) : BaseInstance(globalSettings, settings, rootDir) diff --git a/logic/minecraft/MinecraftInstance.h b/logic/minecraft/MinecraftInstance.h index 63519ae8..d7ae18ea 100644 --- a/logic/minecraft/MinecraftInstance.h +++ b/logic/minecraft/MinecraftInstance.h @@ -1,6 +1,6 @@ #pragma once -#include "logic/BaseInstance.h" -#include "logic/minecraft/Mod.h" +#include "BaseInstance.h" +#include "minecraft/Mod.h" class ModList; diff --git a/logic/minecraft/MinecraftProcess.cpp b/logic/minecraft/MinecraftProcess.cpp index 75287856..9d18ad90 100644 --- a/logic/minecraft/MinecraftProcess.cpp +++ b/logic/minecraft/MinecraftProcess.cpp @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "logic/minecraft/MinecraftProcess.h" -#include "logic/BaseInstance.h" +#include "minecraft/MinecraftProcess.h" +#include "BaseInstance.h" #include <QDataStream> #include <QFile> diff --git a/logic/minecraft/MinecraftProcess.h b/logic/minecraft/MinecraftProcess.h index 30a59e91..34c02b77 100644 --- a/logic/minecraft/MinecraftProcess.h +++ b/logic/minecraft/MinecraftProcess.h @@ -18,8 +18,8 @@ #pragma once #include <QString> -#include "logic/minecraft/MinecraftInstance.h" -#include "logic/BaseProcess.h" +#include "minecraft/MinecraftInstance.h" +#include "BaseProcess.h" /** * The MinecraftProcess class diff --git a/logic/minecraft/MinecraftProfile.cpp b/logic/minecraft/MinecraftProfile.cpp index 27277ab2..f38f8378 100644 --- a/logic/minecraft/MinecraftProfile.cpp +++ b/logic/minecraft/MinecraftProfile.cpp @@ -19,8 +19,8 @@ #include <QJsonArray> #include <pathutils.h> -#include "logic/minecraft/MinecraftProfile.h" -#include "logic/minecraft/VersionBuilder.h" +#include "minecraft/MinecraftProfile.h" +#include "minecraft/VersionBuilder.h" #include "ProfileUtils.h" #include "NullProfileStrategy.h" diff --git a/logic/minecraft/MinecraftVersion.cpp b/logic/minecraft/MinecraftVersion.cpp index 0d484497..977a1892 100644 --- a/logic/minecraft/MinecraftVersion.cpp +++ b/logic/minecraft/MinecraftVersion.cpp @@ -3,7 +3,7 @@ #include "VersionBuildError.h" #include "VersionBuilder.h" #include "ProfileUtils.h" -#include "logic/settings/SettingsObject.h" +#include "settings/SettingsObject.h" bool MinecraftVersion::usesLegacyLauncher() { diff --git a/logic/minecraft/MinecraftVersion.h b/logic/minecraft/MinecraftVersion.h index fbb209f2..9ee8425a 100644 --- a/logic/minecraft/MinecraftVersion.h +++ b/logic/minecraft/MinecraftVersion.h @@ -19,7 +19,7 @@ #include <QSet> #include <QDateTime> -#include "logic/BaseVersion.h" +#include "BaseVersion.h" #include "ProfilePatch.h" #include "VersionFile.h" #include "VersionSource.h" diff --git a/logic/minecraft/MinecraftVersionList.cpp b/logic/minecraft/MinecraftVersionList.cpp index 2f549752..34c1e3d4 100644 --- a/logic/minecraft/MinecraftVersionList.cpp +++ b/logic/minecraft/MinecraftVersionList.cpp @@ -14,15 +14,15 @@ */ #include <QtXml> -#include "logic/MMCJson.h" +#include "MMCJson.h" #include <QtAlgorithms> #include <QtNetwork> -#include "logic/Env.h" +#include "Env.h" #include "MMCError.h" #include "MinecraftVersionList.h" -#include "logic/net/URLConstants.h" +#include "net/URLConstants.h" #include "ParseUtils.h" #include "ProfileUtils.h" diff --git a/logic/minecraft/MinecraftVersionList.h b/logic/minecraft/MinecraftVersionList.h index be9f8581..3266fc2d 100644 --- a/logic/minecraft/MinecraftVersionList.h +++ b/logic/minecraft/MinecraftVersionList.h @@ -19,10 +19,10 @@ #include <QList> #include <QSet> -#include "logic/BaseVersionList.h" -#include "logic/tasks/Task.h" -#include "logic/minecraft/MinecraftVersion.h" -#include <logic/net/NetJob.h> +#include "BaseVersionList.h" +#include "tasks/Task.h" +#include "minecraft/MinecraftVersion.h" +#include <net/NetJob.h> class MCVListLoadTask; class MCVListVersionUpdateTask; diff --git a/logic/minecraft/Mod.cpp b/logic/minecraft/Mod.cpp index 7fa4905e..f8eb4faf 100644 --- a/logic/minecraft/Mod.cpp +++ b/logic/minecraft/Mod.cpp @@ -24,7 +24,7 @@ #include "Mod.h" #include <pathutils.h> -#include "logic/settings/INIFile.h" +#include "settings/INIFile.h" #include <QDebug> Mod::Mod(const QFileInfo &file) diff --git a/logic/minecraft/ModList.h b/logic/minecraft/ModList.h index e227356b..70eb5569 100644 --- a/logic/minecraft/ModList.h +++ b/logic/minecraft/ModList.h @@ -20,7 +20,7 @@ #include <QDir> #include <QAbstractListModel> -#include "logic/minecraft/Mod.h" +#include "minecraft/Mod.h" class LegacyInstance; class BaseInstance; diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/OneSixInstance.cpp index f43275ab..915314d0 100644 --- a/logic/minecraft/OneSixInstance.cpp +++ b/logic/minecraft/OneSixInstance.cpp @@ -18,16 +18,16 @@ #include <QDebug> #include "MMCError.h" -#include "logic/minecraft/OneSixInstance.h" +#include "minecraft/OneSixInstance.h" -#include "logic/minecraft/OneSixUpdate.h" -#include "logic/minecraft/MinecraftProfile.h" -#include "logic/minecraft/VersionBuildError.h" -#include "logic/minecraft/MinecraftProcess.h" -#include "logic/minecraft/OneSixProfileStrategy.h" +#include "minecraft/OneSixUpdate.h" +#include "minecraft/MinecraftProfile.h" +#include "minecraft/VersionBuildError.h" +#include "minecraft/MinecraftProcess.h" +#include "minecraft/OneSixProfileStrategy.h" -#include "logic/minecraft/AssetsUtils.h" -#include "logic/icons/IconList.h" +#include "minecraft/AssetsUtils.h" +#include "icons/IconList.h" OneSixInstance::OneSixInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) : MinecraftInstance(globalSettings, settings, rootDir) diff --git a/logic/minecraft/OneSixInstance.h b/logic/minecraft/OneSixInstance.h index 79e67bd2..dd5ddf5e 100644 --- a/logic/minecraft/OneSixInstance.h +++ b/logic/minecraft/OneSixInstance.h @@ -15,10 +15,10 @@ #pragma once -#include "logic/minecraft/MinecraftInstance.h" +#include "minecraft/MinecraftInstance.h" -#include "logic/minecraft/MinecraftProfile.h" -#include "logic/minecraft/ModList.h" +#include "minecraft/MinecraftProfile.h" +#include "minecraft/ModList.h" class OneSixInstance : public MinecraftInstance { diff --git a/logic/minecraft/OneSixLibrary.h b/logic/minecraft/OneSixLibrary.h index bdd3c85e..76e04c2c 100644 --- a/logic/minecraft/OneSixLibrary.h +++ b/logic/minecraft/OneSixLibrary.h @@ -22,9 +22,9 @@ #include <QDir> #include <memory> -#include "logic/net/URLConstants.h" -#include "logic/minecraft/OpSys.h" -#include "logic/minecraft/RawLibrary.h" +#include "net/URLConstants.h" +#include "minecraft/OpSys.h" +#include "minecraft/RawLibrary.h" class OneSixLibrary; typedef std::shared_ptr<OneSixLibrary> OneSixLibraryPtr; diff --git a/logic/minecraft/OneSixProfileStrategy.cpp b/logic/minecraft/OneSixProfileStrategy.cpp index 6d80963f..4f596d12 100644 --- a/logic/minecraft/OneSixProfileStrategy.cpp +++ b/logic/minecraft/OneSixProfileStrategy.cpp @@ -1,8 +1,8 @@ -#include "logic/minecraft/OneSixProfileStrategy.h" -#include "logic/minecraft/VersionBuildError.h" -#include "logic/minecraft/OneSixInstance.h" -#include "logic/minecraft/MinecraftVersionList.h" -#include "logic/Env.h" +#include "minecraft/OneSixProfileStrategy.h" +#include "minecraft/VersionBuildError.h" +#include "minecraft/OneSixInstance.h" +#include "minecraft/MinecraftVersionList.h" +#include "Env.h" #include <pathutils.h> #include <QDir> diff --git a/logic/minecraft/OneSixUpdate.cpp b/logic/minecraft/OneSixUpdate.cpp index f9ab6c65..6cea2341 100644 --- a/logic/minecraft/OneSixUpdate.cpp +++ b/logic/minecraft/OneSixUpdate.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "logic/Env.h" +#include "Env.h" #include "OneSixUpdate.h" #include <QtNetwork> @@ -25,15 +25,15 @@ #include <pathutils.h> #include <JlCompress.h> -#include "logic/BaseInstance.h" -#include "logic/minecraft/MinecraftVersionList.h" -#include "logic/minecraft/MinecraftProfile.h" -#include "logic/minecraft/OneSixLibrary.h" -#include "logic/minecraft/OneSixInstance.h" -#include "logic/forge/ForgeMirrors.h" -#include "logic/net/URLConstants.h" -#include "logic/minecraft/AssetsUtils.h" -#include "logic/minecraft/JarUtils.h" +#include "BaseInstance.h" +#include "minecraft/MinecraftVersionList.h" +#include "minecraft/MinecraftProfile.h" +#include "minecraft/OneSixLibrary.h" +#include "minecraft/OneSixInstance.h" +#include "forge/ForgeMirrors.h" +#include "net/URLConstants.h" +#include "minecraft/AssetsUtils.h" +#include "minecraft/JarUtils.h" OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent), m_inst(inst) { diff --git a/logic/minecraft/OneSixUpdate.h b/logic/minecraft/OneSixUpdate.h index e3571e5a..c8c3b03f 100644 --- a/logic/minecraft/OneSixUpdate.h +++ b/logic/minecraft/OneSixUpdate.h @@ -19,9 +19,9 @@ #include <QList> #include <QUrl> -#include "logic/net/NetJob.h" -#include "logic/tasks/Task.h" -#include "logic/minecraft/VersionFilterData.h" +#include "net/NetJob.h" +#include "tasks/Task.h" +#include "minecraft/VersionFilterData.h" #include <quazip.h> class MinecraftVersion; diff --git a/logic/minecraft/ParseUtils.cpp b/logic/minecraft/ParseUtils.cpp index f94de6ff..49e0e0ca 100644 --- a/logic/minecraft/ParseUtils.cpp +++ b/logic/minecraft/ParseUtils.cpp @@ -1,7 +1,7 @@ #include <QDateTime> #include <QString> #include "ParseUtils.h" -#include <logic/MMCJson.h> +#include <MMCJson.h> QDateTime timeFromS3Time(QString str) { diff --git a/logic/minecraft/ProfileUtils.cpp b/logic/minecraft/ProfileUtils.cpp index 21fcb2ef..3eaca920 100644 --- a/logic/minecraft/ProfileUtils.cpp +++ b/logic/minecraft/ProfileUtils.cpp @@ -1,6 +1,6 @@ #include "ProfileUtils.h" -#include "logic/minecraft/VersionFilterData.h" -#include "logic/MMCJson.h" +#include "minecraft/VersionFilterData.h" +#include "MMCJson.h" #include <QDebug> #include <QJsonDocument> diff --git a/logic/minecraft/RawLibrary.cpp b/logic/minecraft/RawLibrary.cpp index 87dbf3ec..3c771895 100644 --- a/logic/minecraft/RawLibrary.cpp +++ b/logic/minecraft/RawLibrary.cpp @@ -1,4 +1,4 @@ -#include "logic/MMCJson.h" +#include "MMCJson.h" using namespace MMCJson; #include "RawLibrary.h" diff --git a/logic/minecraft/RawLibrary.h b/logic/minecraft/RawLibrary.h index 6263f99a..a3990740 100644 --- a/logic/minecraft/RawLibrary.h +++ b/logic/minecraft/RawLibrary.h @@ -7,10 +7,10 @@ #include <QDir> #include <memory> -#include "logic/minecraft/OneSixRule.h" -#include "logic/minecraft/OpSys.h" +#include "minecraft/OneSixRule.h" +#include "minecraft/OpSys.h" #include "GradleSpecifier.h" -#include "logic/net/URLConstants.h" +#include "net/URLConstants.h" class RawLibrary; typedef std::shared_ptr<RawLibrary> RawLibraryPtr; diff --git a/logic/minecraft/SkinUtils.cpp b/logic/minecraft/SkinUtils.cpp index f44c9c70..e6e513a5 100644 --- a/logic/minecraft/SkinUtils.cpp +++ b/logic/minecraft/SkinUtils.cpp @@ -13,9 +13,9 @@ * limitations under the License. */ -#include "logic/minecraft/SkinUtils.h" -#include "logic/net/HttpMetaCache.h" -#include "logic/Env.h" +#include "minecraft/SkinUtils.h" +#include "net/HttpMetaCache.h" +#include "Env.h" #include <QFile> #include <QJsonDocument> diff --git a/logic/minecraft/VersionBuilder.cpp b/logic/minecraft/VersionBuilder.cpp index bc29c187..4d58b060 100644 --- a/logic/minecraft/VersionBuilder.cpp +++ b/logic/minecraft/VersionBuilder.cpp @@ -26,17 +26,17 @@ #include <modutils.h> #include <pathutils.h> -#include "logic/minecraft/VersionBuilder.h" -#include "logic/minecraft/MinecraftProfile.h" -#include "logic/minecraft/OneSixRule.h" -#include "logic/minecraft/ProfilePatch.h" -#include "logic/minecraft/VersionFile.h" +#include "minecraft/VersionBuilder.h" +#include "minecraft/MinecraftProfile.h" +#include "minecraft/OneSixRule.h" +#include "minecraft/ProfilePatch.h" +#include "minecraft/VersionFile.h" #include "VersionBuildError.h" #include "MinecraftVersionList.h" #include "ProfileUtils.h" -#include "logic/minecraft/OneSixInstance.h" -#include "logic/MMCJson.h" +#include "minecraft/OneSixInstance.h" +#include "MMCJson.h" #include <QDebug> diff --git a/logic/minecraft/VersionFile.cpp b/logic/minecraft/VersionFile.cpp index 275be12e..0a20efcb 100644 --- a/logic/minecraft/VersionFile.cpp +++ b/logic/minecraft/VersionFile.cpp @@ -4,13 +4,13 @@ #include <QDebug> -#include "logic/minecraft/VersionFile.h" -#include "logic/minecraft/OneSixLibrary.h" -#include "logic/minecraft/MinecraftProfile.h" -#include "logic/minecraft/JarMod.h" +#include "minecraft/VersionFile.h" +#include "minecraft/OneSixLibrary.h" +#include "minecraft/MinecraftProfile.h" +#include "minecraft/JarMod.h" #include "ParseUtils.h" -#include "logic/MMCJson.h" +#include "MMCJson.h" using namespace MMCJson; #include "VersionBuildError.h" diff --git a/logic/minecraft/VersionFile.h b/logic/minecraft/VersionFile.h index 1e8772af..346a8dcd 100644 --- a/logic/minecraft/VersionFile.h +++ b/logic/minecraft/VersionFile.h @@ -4,8 +4,8 @@ #include <QStringList> #include <QDateTime> #include <memory> -#include "logic/minecraft/OpSys.h" -#include "logic/minecraft/OneSixRule.h" +#include "minecraft/OpSys.h" +#include "minecraft/OneSixRule.h" #include "ProfilePatch.h" #include "MMCError.h" #include "OneSixLibrary.h" diff --git a/logic/net/ByteArrayDownload.cpp b/logic/net/ByteArrayDownload.cpp index 7a41ee28..151487f0 100644 --- a/logic/net/ByteArrayDownload.cpp +++ b/logic/net/ByteArrayDownload.cpp @@ -14,7 +14,7 @@ */ #include "ByteArrayDownload.h" -#include "logic/Env.h" +#include "Env.h" #include <QDebug> ByteArrayDownload::ByteArrayDownload(QUrl url) : NetAction() diff --git a/logic/net/CacheDownload.cpp b/logic/net/CacheDownload.cpp index 0bbe75c3..a4fac6ef 100644 --- a/logic/net/CacheDownload.cpp +++ b/logic/net/CacheDownload.cpp @@ -20,7 +20,7 @@ #include <QFileInfo> #include <QDateTime> #include <QDebug> -#include "logic/Env.h" +#include "Env.h" CacheDownload::CacheDownload(QUrl url, MetaEntryPtr entry) : NetAction(), md5sum(QCryptographicHash::Md5) diff --git a/logic/net/HttpMetaCache.cpp b/logic/net/HttpMetaCache.cpp index 7e52f16c..bfd2cb42 100644 --- a/logic/net/HttpMetaCache.cpp +++ b/logic/net/HttpMetaCache.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "logic/Env.h" +#include "Env.h" #include "HttpMetaCache.h" #include <pathutils.h> diff --git a/logic/net/MD5EtagDownload.cpp b/logic/net/MD5EtagDownload.cpp index 03752ea8..651ab602 100644 --- a/logic/net/MD5EtagDownload.cpp +++ b/logic/net/MD5EtagDownload.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "logic/Env.h" +#include "Env.h" #include "MD5EtagDownload.h" #include <pathutils.h> #include <QCryptographicHash> diff --git a/logic/net/NetAction.h b/logic/net/NetAction.h index b306bdfe..7c5bd5de 100644 --- a/logic/net/NetAction.h +++ b/logic/net/NetAction.h @@ -19,7 +19,7 @@ #include <QUrl> #include <memory> #include <QNetworkReply> -#include <logic/QObjectPtr.h> +#include <QObjectPtr.h> enum JobStatus { diff --git a/logic/net/NetJob.h b/logic/net/NetJob.h index 708afa79..7f7b418c 100644 --- a/logic/net/NetJob.h +++ b/logic/net/NetJob.h @@ -21,8 +21,8 @@ #include "MD5EtagDownload.h" #include "CacheDownload.h" #include "HttpMetaCache.h" -#include "logic/tasks/ProgressProvider.h" -#include "logic/QObjectPtr.h" +#include "tasks/ProgressProvider.h" +#include "QObjectPtr.h" class NetJob; typedef QObjectPtr<NetJob> NetJobPtr; diff --git a/logic/net/PasteUpload.cpp b/logic/net/PasteUpload.cpp index 6bed0887..b780194f 100644 --- a/logic/net/PasteUpload.cpp +++ b/logic/net/PasteUpload.cpp @@ -1,5 +1,5 @@ #include "PasteUpload.h" -#include "logic/Env.h" +#include "Env.h" #include <QDebug> #include <QJsonObject> #include <QJsonDocument> diff --git a/logic/net/PasteUpload.h b/logic/net/PasteUpload.h index 307d592b..e353f421 100644 --- a/logic/net/PasteUpload.h +++ b/logic/net/PasteUpload.h @@ -1,5 +1,5 @@ #pragma once -#include "logic/tasks/Task.h" +#include "tasks/Task.h" #include <QMessageBox> #include <QNetworkReply> #include <memory> diff --git a/logic/news/NewsChecker.h b/logic/news/NewsChecker.h index d4855208..3a0f9ec8 100644 --- a/logic/news/NewsChecker.h +++ b/logic/news/NewsChecker.h @@ -19,7 +19,7 @@ #include <QString> #include <QList> -#include <logic/net/NetJob.h> +#include <net/NetJob.h> #include "NewsEntry.h" diff --git a/logic/notifications/NotificationChecker.cpp b/logic/notifications/NotificationChecker.cpp index 77721770..4e35cacc 100644 --- a/logic/notifications/NotificationChecker.cpp +++ b/logic/notifications/NotificationChecker.cpp @@ -5,8 +5,8 @@ #include <QJsonArray> #include <QDebug> -#include "logic/Env.h" -#include "logic/net/CacheDownload.h" +#include "Env.h" +#include "net/CacheDownload.h" NotificationChecker::NotificationChecker(QObject *parent) diff --git a/logic/notifications/NotificationChecker.h b/logic/notifications/NotificationChecker.h index a3e615db..92bc23dc 100644 --- a/logic/notifications/NotificationChecker.h +++ b/logic/notifications/NotificationChecker.h @@ -2,8 +2,8 @@ #include <QObject> -#include "logic/net/NetJob.h" -#include "logic/net/CacheDownload.h" +#include "net/NetJob.h" +#include "net/CacheDownload.h" class NotificationChecker : public QObject { diff --git a/logic/screenshots/ImgurAlbumCreation.cpp b/logic/screenshots/ImgurAlbumCreation.cpp index f7cc2971..f332c220 100644 --- a/logic/screenshots/ImgurAlbumCreation.cpp +++ b/logic/screenshots/ImgurAlbumCreation.cpp @@ -6,8 +6,8 @@ #include <QUrl> #include <QStringList> -#include "logic/net/URLConstants.h" -#include "logic/Env.h" +#include "net/URLConstants.h" +#include "Env.h" #include <QDebug> ImgurAlbumCreation::ImgurAlbumCreation(QList<ScreenshotPtr> screenshots) : NetAction(), m_screenshots(screenshots) diff --git a/logic/screenshots/ImgurAlbumCreation.h b/logic/screenshots/ImgurAlbumCreation.h index 6e8fbe94..f4adf6f2 100644 --- a/logic/screenshots/ImgurAlbumCreation.h +++ b/logic/screenshots/ImgurAlbumCreation.h @@ -1,5 +1,5 @@ #pragma once -#include "logic/net/NetAction.h" +#include "net/NetAction.h" #include "Screenshot.h" typedef std::shared_ptr<class ImgurAlbumCreation> ImgurAlbumCreationPtr; diff --git a/logic/screenshots/ImgurUpload.cpp b/logic/screenshots/ImgurUpload.cpp index 4ae37dfa..053156b9 100644 --- a/logic/screenshots/ImgurUpload.cpp +++ b/logic/screenshots/ImgurUpload.cpp @@ -8,8 +8,8 @@ #include <QFile> #include <QUrl> -#include "logic/net/URLConstants.h" -#include "logic/Env.h" +#include "net/URLConstants.h" +#include "Env.h" #include <QDebug> ImgurUpload::ImgurUpload(ScreenshotPtr shot) : NetAction(), m_shot(shot) diff --git a/logic/screenshots/ImgurUpload.h b/logic/screenshots/ImgurUpload.h index 1111a8d0..f569ac3e 100644 --- a/logic/screenshots/ImgurUpload.h +++ b/logic/screenshots/ImgurUpload.h @@ -1,5 +1,5 @@ #pragma once -#include "logic/net/NetAction.h" +#include "net/NetAction.h" #include "Screenshot.h" typedef std::shared_ptr<class ImgurUpload> ImgurUploadPtr; diff --git a/logic/settings/INIFile.cpp b/logic/settings/INIFile.cpp index cc35aa83..27534f12 100644 --- a/logic/settings/INIFile.cpp +++ b/logic/settings/INIFile.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "logic/settings/INIFile.h" +#include "settings/INIFile.h" #include <QFile> #include <QTextStream> diff --git a/logic/settings/INISettingsObject.h b/logic/settings/INISettingsObject.h index a862135f..4d26ddf1 100644 --- a/logic/settings/INISettingsObject.h +++ b/logic/settings/INISettingsObject.h @@ -17,9 +17,9 @@ #include <QObject> -#include "logic/settings/INIFile.h" +#include "settings/INIFile.h" -#include "logic/settings/SettingsObject.h" +#include "settings/SettingsObject.h" /*! * \brief A settings object that stores its settings in an INIFile. diff --git a/logic/settings/Setting.cpp b/logic/settings/Setting.cpp index c2cffd11..b17101a2 100644 --- a/logic/settings/Setting.cpp +++ b/logic/settings/Setting.cpp @@ -14,7 +14,7 @@ */ #include "Setting.h" -#include "logic/settings/SettingsObject.h" +#include "settings/SettingsObject.h" Setting::Setting(QStringList synonyms, QVariant defVal) : QObject(), m_synonyms(synonyms), m_defVal(defVal) diff --git a/logic/settings/SettingsObject.cpp b/logic/settings/SettingsObject.cpp index 280c07fa..e88eae49 100644 --- a/logic/settings/SettingsObject.cpp +++ b/logic/settings/SettingsObject.cpp @@ -13,9 +13,9 @@ * limitations under the License. */ -#include "logic/settings/SettingsObject.h" -#include "logic/settings/Setting.h" -#include "logic/settings/OverrideSetting.h" +#include "settings/SettingsObject.h" +#include "settings/Setting.h" +#include "settings/OverrideSetting.h" #include <QDebug> #include <QVariant> diff --git a/logic/status/StatusChecker.cpp b/logic/status/StatusChecker.cpp index 0e60db40..5e6cc612 100644 --- a/logic/status/StatusChecker.cpp +++ b/logic/status/StatusChecker.cpp @@ -15,10 +15,9 @@ #include "StatusChecker.h" -#include <logic/net/URLConstants.h> +#include <net/URLConstants.h> #include <QByteArray> -#include <QDomDocument> #include <QDebug> @@ -40,7 +39,7 @@ void StatusChecker::reloadStatus() // qDebug() << "Ignored request to reload status. Currently reloading already."; return; } - + // qDebug() << "Reloading status."; NetJob* job = new NetJob("Status JSON"); diff --git a/logic/status/StatusChecker.h b/logic/status/StatusChecker.h index 503d9f28..316066fe 100644 --- a/logic/status/StatusChecker.h +++ b/logic/status/StatusChecker.h @@ -19,7 +19,7 @@ #include <QString> #include <QList> -#include <logic/net/NetJob.h> +#include <net/NetJob.h> class StatusChecker : public QObject { diff --git a/logic/tools/BaseExternalTool.cpp b/logic/tools/BaseExternalTool.cpp index 04edece8..d2931db7 100644 --- a/logic/tools/BaseExternalTool.cpp +++ b/logic/tools/BaseExternalTool.cpp @@ -8,11 +8,10 @@ #include <windows.h> #endif -#include "logic/BaseInstance.h" -#include "MultiMC.h" +#include "BaseInstance.h" -BaseExternalTool::BaseExternalTool(InstancePtr instance, QObject *parent) - : QObject(parent), m_instance(instance) +BaseExternalTool::BaseExternalTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent) + : QObject(parent), m_instance(instance), globalSettings(settings) { } @@ -30,8 +29,8 @@ qint64 BaseExternalTool::pid(QProcess *process) #endif } -BaseDetachedTool::BaseDetachedTool(InstancePtr instance, QObject *parent) - : BaseExternalTool(instance, parent) +BaseDetachedTool::BaseDetachedTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent) + : BaseExternalTool(settings, instance, parent) { } diff --git a/logic/tools/BaseExternalTool.h b/logic/tools/BaseExternalTool.h index 8b8b2790..3c0b23ed 100644 --- a/logic/tools/BaseExternalTool.h +++ b/logic/tools/BaseExternalTool.h @@ -1,7 +1,7 @@ #pragma once #include <QObject> -#include <logic/BaseInstance.h> +#include <BaseInstance.h> class BaseInstance; class SettingsObject; @@ -11,12 +11,12 @@ class BaseExternalTool : public QObject { Q_OBJECT public: - explicit BaseExternalTool(InstancePtr instance, QObject *parent = 0); + explicit BaseExternalTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0); virtual ~BaseExternalTool(); protected: InstancePtr m_instance; - + SettingsObjectPtr globalSettings; qint64 pid(QProcess *process); }; @@ -24,7 +24,7 @@ class BaseDetachedTool : public BaseExternalTool { Q_OBJECT public: - explicit BaseDetachedTool(InstancePtr instance, QObject *parent = 0); + explicit BaseDetachedTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0); public slots: @@ -41,12 +41,15 @@ public: virtual QString name() const = 0; - virtual void registerSettings(std::shared_ptr<SettingsObject> settings) = 0; + virtual void registerSettings(SettingsObjectPtr settings) = 0; virtual BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) = 0; virtual bool check(QString *error) = 0; virtual bool check(const QString &path, QString *error) = 0; + +protected: + SettingsObjectPtr globalSettings; }; class BaseDetachedToolFactory : public BaseExternalToolFactory diff --git a/logic/tools/BaseProfiler.cpp b/logic/tools/BaseProfiler.cpp index d3c8d41e..2c9fed9b 100644 --- a/logic/tools/BaseProfiler.cpp +++ b/logic/tools/BaseProfiler.cpp @@ -2,8 +2,8 @@ #include <QProcess> -BaseProfiler::BaseProfiler(InstancePtr instance, QObject *parent) - : BaseExternalTool(instance, parent) +BaseProfiler::BaseProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject *parent) + : BaseExternalTool(settings, instance, parent) { } diff --git a/logic/tools/BaseProfiler.h b/logic/tools/BaseProfiler.h index decaa5b8..56397489 100644 --- a/logic/tools/BaseProfiler.h +++ b/logic/tools/BaseProfiler.h @@ -11,7 +11,7 @@ class BaseProfiler : public BaseExternalTool { Q_OBJECT public: - explicit BaseProfiler(InstancePtr instance, QObject *parent = 0); + explicit BaseProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0); public slots: diff --git a/logic/tools/JProfiler.cpp b/logic/tools/JProfiler.cpp index 7cdf0268..d53ec615 100644 --- a/logic/tools/JProfiler.cpp +++ b/logic/tools/JProfiler.cpp @@ -3,22 +3,23 @@ #include <QDir> #include <QMessageBox> -#include "logic/settings/SettingsObject.h" -#include "logic/BaseProcess.h" -#include "logic/BaseInstance.h" -#include "MultiMC.h" +#include "settings/SettingsObject.h" +#include "BaseProcess.h" +#include "BaseInstance.h" -JProfiler::JProfiler(InstancePtr instance, QObject *parent) : BaseProfiler(instance, parent) +JProfiler::JProfiler(SettingsObjectPtr settings, InstancePtr instance, + QObject *parent) + : BaseProfiler(settings, instance, parent) { } void JProfiler::beginProfilingImpl(BaseProcess *process) { - int port = MMC->settings()->get("JProfilerPort").toInt(); + int port = globalSettings->get("JProfilerPort").toInt(); QProcess *profiler = new QProcess(this); profiler->setArguments(QStringList() << "-d" << QString::number(pid(process)) << "--gui" << "-p" << QString::number(port)); - profiler->setProgram(QDir(MMC->settings()->get("JProfilerPath").toString()) + profiler->setProgram(QDir(globalSettings->get("JProfilerPath").toString()) #ifdef Q_OS_WIN .absoluteFilePath("bin/jpenable.exe")); #else @@ -44,20 +45,21 @@ void JProfiler::beginProfilingImpl(BaseProcess *process) m_profilerProcess = profiler; } -void JProfilerFactory::registerSettings(std::shared_ptr<SettingsObject> settings) +void JProfilerFactory::registerSettings(SettingsObjectPtr settings) { settings->registerSetting("JProfilerPath"); settings->registerSetting("JProfilerPort", 42042); + globalSettings = settings; } BaseExternalTool *JProfilerFactory::createTool(InstancePtr instance, QObject *parent) { - return new JProfiler(instance, parent); + return new JProfiler(globalSettings, instance, parent); } bool JProfilerFactory::check(QString *error) { - return check(MMC->settings()->get("JProfilerPath").toString(), error); + return check(globalSettings->get("JProfilerPath").toString(), error); } bool JProfilerFactory::check(const QString &path, QString *error) diff --git a/logic/tools/JProfiler.h b/logic/tools/JProfiler.h index 0763a799..11df0779 100644 --- a/logic/tools/JProfiler.h +++ b/logic/tools/JProfiler.h @@ -6,7 +6,7 @@ class JProfiler : public BaseProfiler { Q_OBJECT public: - JProfiler(InstancePtr instance, QObject *parent = 0); + JProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0); protected: void beginProfilingImpl(BaseProcess *process); @@ -16,7 +16,7 @@ class JProfilerFactory : public BaseProfilerFactory { public: QString name() const override { return "JProfiler"; } - void registerSettings(std::shared_ptr<SettingsObject> settings) override; + void registerSettings(SettingsObjectPtr settings) override; BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) override; bool check(QString *error) override; bool check(const QString &path, QString *error) override; diff --git a/logic/tools/JVisualVM.cpp b/logic/tools/JVisualVM.cpp index 312be863..d258fde9 100644 --- a/logic/tools/JVisualVM.cpp +++ b/logic/tools/JVisualVM.cpp @@ -3,12 +3,12 @@ #include <QDir> #include <QStandardPaths> -#include "logic/settings/SettingsObject.h" -#include "logic/BaseProcess.h" -#include "logic/BaseInstance.h" -#include "MultiMC.h" +#include "settings/SettingsObject.h" +#include "BaseProcess.h" +#include "BaseInstance.h" -JVisualVM::JVisualVM(InstancePtr instance, QObject *parent) : BaseProfiler(instance, parent) +JVisualVM::JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject *parent) + : BaseProfiler(settings, instance, parent) { } @@ -16,7 +16,7 @@ void JVisualVM::beginProfilingImpl(BaseProcess *process) { QProcess *profiler = new QProcess(this); profiler->setArguments(QStringList() << "--openpid" << QString::number(pid(process))); - profiler->setProgram(MMC->settings()->get("JVisualVMPath").toString()); + profiler->setProgram(globalSettings->get("JVisualVMPath").toString()); connect(profiler, &QProcess::started, [this]() { emit readyToLaunch(tr("JVisualVM started")); }); connect(profiler, @@ -37,7 +37,7 @@ void JVisualVM::beginProfilingImpl(BaseProcess *process) m_profilerProcess = profiler; } -void JVisualVMFactory::registerSettings(std::shared_ptr<SettingsObject> settings) +void JVisualVMFactory::registerSettings(SettingsObjectPtr settings) { QString defaultValue = QStandardPaths::findExecutable("jvisualvm"); if (defaultValue.isNull()) @@ -45,16 +45,17 @@ void JVisualVMFactory::registerSettings(std::shared_ptr<SettingsObject> settings defaultValue = QStandardPaths::findExecutable("visualvm"); } settings->registerSetting("JVisualVMPath", defaultValue); + globalSettings = settings; } BaseExternalTool *JVisualVMFactory::createTool(InstancePtr instance, QObject *parent) { - return new JVisualVM(instance, parent); + return new JVisualVM(globalSettings, instance, parent); } bool JVisualVMFactory::check(QString *error) { - return check(MMC->settings()->get("JVisualVMPath").toString(), error); + return check(globalSettings->get("JVisualVMPath").toString(), error); } bool JVisualVMFactory::check(const QString &path, QString *error) diff --git a/logic/tools/JVisualVM.h b/logic/tools/JVisualVM.h index 2a273568..f4ffe1bd 100644 --- a/logic/tools/JVisualVM.h +++ b/logic/tools/JVisualVM.h @@ -6,7 +6,7 @@ class JVisualVM : public BaseProfiler { Q_OBJECT public: - JVisualVM(InstancePtr instance, QObject *parent = 0); + JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0); protected: void beginProfilingImpl(BaseProcess *process); @@ -16,7 +16,7 @@ class JVisualVMFactory : public BaseProfilerFactory { public: QString name() const override { return "JVisualVM"; } - void registerSettings(std::shared_ptr<SettingsObject> settings) override; + void registerSettings(SettingsObjectPtr settings) override; BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) override; bool check(QString *error) override; bool check(const QString &path, QString *error) override; diff --git a/logic/tools/MCEditTool.cpp b/logic/tools/MCEditTool.cpp index c918d5d0..058eede8 100644 --- a/logic/tools/MCEditTool.cpp +++ b/logic/tools/MCEditTool.cpp @@ -6,14 +6,14 @@ #include <QUrl> // FIXME: mixing logic and UI!!!! #include <QInputDialog> +#include <QApplication> -#include "logic/settings/SettingsObject.h" -#include "logic/BaseInstance.h" -#include "logic/minecraft/MinecraftInstance.h" -#include "MultiMC.h" +#include "settings/SettingsObject.h" +#include "BaseInstance.h" +#include "minecraft/MinecraftInstance.h" -MCEditTool::MCEditTool(InstancePtr instance, QObject *parent) - : BaseDetachedTool(instance, parent) +MCEditTool::MCEditTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent) + : BaseDetachedTool(settings, instance, parent) { } @@ -37,8 +37,7 @@ QString MCEditTool::getSave() const } } bool ok = true; - const QString save = QInputDialog::getItem( - MMC->activeWindow(), tr("MCEdit"), tr("Choose which world to open:"), + const QString save = QInputDialog::getItem(QApplication::activeWindow(), tr("MCEdit"), tr("Choose which world to open:"), worlds, 0, false, &ok); if (ok) { @@ -49,7 +48,7 @@ QString MCEditTool::getSave() const void MCEditTool::runImpl() { - const QString mceditPath = MMC->settings()->get("MCEditPath").toString(); + const QString mceditPath = globalSettings->get("MCEditPath").toString(); const QString save = getSave(); if (save.isNull()) { @@ -80,17 +79,18 @@ void MCEditTool::runImpl() #endif } -void MCEditFactory::registerSettings(std::shared_ptr<SettingsObject> settings) +void MCEditFactory::registerSettings(SettingsObjectPtr settings) { settings->registerSetting("MCEditPath"); + globalSettings = settings; } BaseExternalTool *MCEditFactory::createTool(InstancePtr instance, QObject *parent) { - return new MCEditTool(instance, parent); + return new MCEditTool(globalSettings, instance, parent); } bool MCEditFactory::check(QString *error) { - return check(MMC->settings()->get("MCEditPath").toString(), error); + return check(globalSettings->get("MCEditPath").toString(), error); } bool MCEditFactory::check(const QString &path, QString *error) { diff --git a/logic/tools/MCEditTool.h b/logic/tools/MCEditTool.h index b5cfc64e..bd40f02d 100644 --- a/logic/tools/MCEditTool.h +++ b/logic/tools/MCEditTool.h @@ -6,7 +6,7 @@ class MCEditTool : public BaseDetachedTool { Q_OBJECT public: - explicit MCEditTool(InstancePtr instance, QObject *parent = 0); + explicit MCEditTool(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0); protected: QString getSave() const; @@ -17,7 +17,7 @@ class MCEditFactory : public BaseDetachedToolFactory { public: QString name() const override { return "MCEdit"; } - void registerSettings(std::shared_ptr<SettingsObject> settings) override; + void registerSettings(SettingsObjectPtr settings) override; BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) override; bool check(QString *error) override; bool check(const QString &path, QString *error) override; diff --git a/logic/trans/TranslationDownloader.cpp b/logic/trans/TranslationDownloader.cpp index e977b65c..ccc4d590 100644 --- a/logic/trans/TranslationDownloader.cpp +++ b/logic/trans/TranslationDownloader.cpp @@ -1,9 +1,8 @@ #include "TranslationDownloader.h" -#include "logic/net/NetJob.h" -#include "logic/net/ByteArrayDownload.h" -#include "logic/net/CacheDownload.h" -#include "logic/net/URLConstants.h" -#include "logic/Env.h" +#include "net/NetJob.h" +#include "net/CacheDownload.h" +#include "net/URLConstants.h" +#include "Env.h" #include <QDebug> TranslationDownloader::TranslationDownloader() diff --git a/logic/updater/DownloadTask.cpp b/logic/updater/DownloadTask.cpp index badbc0d0..65d894f9 100644 --- a/logic/updater/DownloadTask.cpp +++ b/logic/updater/DownloadTask.cpp @@ -15,9 +15,9 @@ #include "DownloadTask.h" -#include "logic/updater/UpdateChecker.h" +#include "updater/UpdateChecker.h" #include "GoUpdate.h" -#include "logic/net/NetJob.h" +#include "net/NetJob.h" #include "pathutils.h" #include <QFile> diff --git a/logic/updater/DownloadTask.h b/logic/updater/DownloadTask.h index 2b8c6299..24e39415 100644 --- a/logic/updater/DownloadTask.h +++ b/logic/updater/DownloadTask.h @@ -15,8 +15,8 @@ #pragma once -#include "logic/tasks/Task.h" -#include "logic/net/NetJob.h" +#include "tasks/Task.h" +#include "net/NetJob.h" #include "GoUpdate.h" namespace GoUpdate diff --git a/logic/updater/GoUpdate.cpp b/logic/updater/GoUpdate.cpp index 84dc164c..21bef2c0 100644 --- a/logic/updater/GoUpdate.cpp +++ b/logic/updater/GoUpdate.cpp @@ -3,7 +3,7 @@ #include <QDebug> #include <QDomDocument> #include <QFile> -#include <logic/Env.h> +#include <Env.h> namespace GoUpdate { diff --git a/logic/updater/GoUpdate.h b/logic/updater/GoUpdate.h index bea6cce7..c58fd1eb 100644 --- a/logic/updater/GoUpdate.h +++ b/logic/updater/GoUpdate.h @@ -1,6 +1,6 @@ #pragma once #include <QByteArray> -#include <logic/net/NetJob.h> +#include <net/NetJob.h> namespace GoUpdate { diff --git a/logic/updater/UpdateChecker.h b/logic/updater/UpdateChecker.h index 0eaceea0..760245cd 100644 --- a/logic/updater/UpdateChecker.h +++ b/logic/updater/UpdateChecker.h @@ -15,7 +15,7 @@ #pragma once -#include "logic/net/NetJob.h" +#include "net/NetJob.h" #include "GoUpdate.h" #include <QUrl> |