diff options
Diffstat (limited to 'logic/minecraft')
34 files changed, 110 insertions, 104 deletions
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" |