From 20b9f2b42a3b58b6081af271774fbcc34025dccb Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Sun, 25 Jul 2021 19:11:59 +0200 Subject: NOISSUE Flatten gui and logic libraries into MultiMC --- api/logic/BaseInstaller.cpp | 61 - api/logic/BaseInstaller.h | 46 - api/logic/BaseInstance.cpp | 275 ----- api/logic/BaseInstance.h | 272 ----- api/logic/BaseVersion.h | 59 - api/logic/BaseVersionList.cpp | 99 -- api/logic/BaseVersionList.h | 122 -- api/logic/CMakeLists.txt | 564 --------- api/logic/Commandline.cpp | 483 -------- api/logic/Commandline.h | 252 ---- api/logic/DefaultVariable.h | 35 - api/logic/Env.cpp | 211 ---- api/logic/Env.h | 65 -- api/logic/Exception.h | 34 - api/logic/ExponentialSeries.h | 43 - api/logic/FileSystem.cpp | 457 -------- api/logic/FileSystem.h | 128 -- api/logic/FileSystem_test.cpp | 164 --- api/logic/Filter.cpp | 31 - api/logic/Filter.h | 44 - api/logic/GZip.cpp | 115 -- api/logic/GZip.h | 12 - api/logic/GZip_test.cpp | 57 - api/logic/InstanceCopyTask.cpp | 60 - api/logic/InstanceCopyTask.h | 32 - api/logic/InstanceCreationTask.cpp | 31 - api/logic/InstanceCreationTask.h | 23 - api/logic/InstanceImportTask.cpp | 456 -------- api/logic/InstanceImportTask.h | 73 -- api/logic/InstanceList.cpp | 867 -------------- api/logic/InstanceList.h | 175 --- api/logic/InstanceTask.cpp | 9 - api/logic/InstanceTask.h | 53 - api/logic/Json.cpp | 272 ----- api/logic/Json.h | 249 ---- api/logic/LoggedProcess.cpp | 176 --- api/logic/LoggedProcess.h | 80 -- api/logic/MMCStrings.cpp | 76 -- api/logic/MMCStrings.h | 10 - api/logic/MMCZip.cpp | 312 ----- api/logic/MMCZip.h | 94 -- api/logic/MessageLevel.cpp | 36 - api/logic/MessageLevel.h | 28 - api/logic/NullInstance.h | 76 -- api/logic/ProblemProvider.h | 49 - api/logic/QObjectPtr.h | 83 -- api/logic/RWStorage.h | 66 -- api/logic/RecursiveFileSystemWatcher.cpp | 111 -- api/logic/RecursiveFileSystemWatcher.h | 63 - api/logic/SeparatorPrefixTree.h | 298 ----- api/logic/Usable.h | 58 - api/logic/Version.cpp | 85 -- api/logic/Version.h | 107 -- api/logic/Version_test.cpp | 85 -- api/logic/WatchLock.h | 20 - api/logic/icons/IIconList.cpp | 7 - api/logic/icons/IIconList.h | 26 - api/logic/icons/IconUtils.cpp | 62 - api/logic/icons/IconUtils.h | 14 - api/logic/java/JavaChecker.cpp | 166 --- api/logic/java/JavaChecker.h | 63 - api/logic/java/JavaCheckerJob.cpp | 44 - api/logic/java/JavaCheckerJob.h | 61 - api/logic/java/JavaInstall.cpp | 28 - api/logic/java/JavaInstall.h | 38 - api/logic/java/JavaInstallList.cpp | 208 ---- api/logic/java/JavaInstallList.h | 83 -- api/logic/java/JavaUtils.cpp | 399 ------- api/logic/java/JavaUtils.h | 44 - api/logic/java/JavaVersion.cpp | 121 -- api/logic/java/JavaVersion.h | 50 - api/logic/java/JavaVersion_test.cpp | 116 -- api/logic/java/launch/CheckJava.cpp | 139 --- api/logic/java/launch/CheckJava.h | 45 - api/logic/launch/LaunchStep.cpp | 27 - api/logic/launch/LaunchStep.h | 50 - api/logic/launch/LaunchTask.cpp | 280 ----- api/logic/launch/LaunchTask.h | 125 -- api/logic/launch/LogModel.cpp | 167 --- api/logic/launch/LogModel.h | 60 - api/logic/launch/steps/LookupServerAddress.cpp | 95 -- api/logic/launch/steps/LookupServerAddress.h | 49 - api/logic/launch/steps/PostLaunchCommand.cpp | 84 -- api/logic/launch/steps/PostLaunchCommand.h | 41 - api/logic/launch/steps/PreLaunchCommand.cpp | 85 -- api/logic/launch/steps/PreLaunchCommand.h | 41 - api/logic/launch/steps/TextPrint.cpp | 29 - api/logic/launch/steps/TextPrint.h | 43 - api/logic/launch/steps/Update.cpp | 80 -- api/logic/launch/steps/Update.h | 45 - api/logic/meta/BaseEntity.cpp | 168 --- api/logic/meta/BaseEntity.h | 68 -- api/logic/meta/Index.cpp | 148 --- api/logic/meta/Index.h | 71 -- api/logic/meta/Index_test.cpp | 44 - api/logic/meta/JsonFormat.cpp | 218 ---- api/logic/meta/JsonFormat.h | 83 -- api/logic/meta/Version.cpp | 140 --- api/logic/meta/Version.h | 118 -- api/logic/meta/VersionList.cpp | 245 ---- api/logic/meta/VersionList.h | 101 -- api/logic/minecraft/AssetsUtils.cpp | 333 ------ api/logic/minecraft/AssetsUtils.h | 53 - api/logic/minecraft/Component.cpp | 439 ------- api/logic/minecraft/Component.h | 111 -- api/logic/minecraft/ComponentUpdateTask.cpp | 704 ----------- api/logic/minecraft/ComponentUpdateTask.h | 37 - api/logic/minecraft/ComponentUpdateTask_p.h | 32 - api/logic/minecraft/GradleSpecifier.h | 151 --- api/logic/minecraft/GradleSpecifier_test.cpp | 78 -- api/logic/minecraft/LaunchProfile.cpp | 319 ----- api/logic/minecraft/LaunchProfile.h | 104 -- api/logic/minecraft/Library.cpp | 309 ----- api/logic/minecraft/Library.h | 219 ---- api/logic/minecraft/Library_test.cpp | 272 ----- api/logic/minecraft/MinecraftInstance.cpp | 1054 ----------------- api/logic/minecraft/MinecraftInstance.h | 133 --- api/logic/minecraft/MinecraftLoadAndCheck.cpp | 45 - api/logic/minecraft/MinecraftLoadAndCheck.h | 48 - api/logic/minecraft/MinecraftUpdate.cpp | 182 --- api/logic/minecraft/MinecraftUpdate.h | 57 - api/logic/minecraft/MojangDownloadInfo.h | 82 -- api/logic/minecraft/MojangVersionFormat.cpp | 383 ------ api/logic/minecraft/MojangVersionFormat.h | 26 - api/logic/minecraft/MojangVersionFormat_test.cpp | 55 - api/logic/minecraft/OneSixVersionFormat.cpp | 391 ------- api/logic/minecraft/OneSixVersionFormat.h | 30 - api/logic/minecraft/OpSys.cpp | 42 - api/logic/minecraft/OpSys.h | 37 - api/logic/minecraft/PackProfile.cpp | 1225 -------------------- api/logic/minecraft/PackProfile.h | 152 --- api/logic/minecraft/PackProfile_p.h | 42 - api/logic/minecraft/ParseUtils.cpp | 34 - api/logic/minecraft/ParseUtils.h | 11 - api/logic/minecraft/ParseUtils_test.cpp | 45 - api/logic/minecraft/ProfileUtils.cpp | 178 --- api/logic/minecraft/ProfileUtils.h | 28 - api/logic/minecraft/Rule.cpp | 93 -- api/logic/minecraft/Rule.h | 101 -- api/logic/minecraft/VersionFile.cpp | 60 - api/logic/minecraft/VersionFile.h | 114 -- api/logic/minecraft/VersionFilterData.cpp | 71 -- api/logic/minecraft/VersionFilterData.h | 31 - api/logic/minecraft/World.cpp | 520 --------- api/logic/minecraft/World.h | 113 -- api/logic/minecraft/WorldList.cpp | 387 ------- api/logic/minecraft/WorldList.h | 131 --- api/logic/minecraft/auth-msa/BuildConfig.cpp.in | 9 - api/logic/minecraft/auth-msa/BuildConfig.h | 11 - api/logic/minecraft/auth-msa/CMakeLists.txt | 28 - api/logic/minecraft/auth-msa/context.cpp | 938 --------------- api/logic/minecraft/auth-msa/context.h | 128 -- api/logic/minecraft/auth-msa/main.cpp | 100 -- api/logic/minecraft/auth-msa/mainwindow.cpp | 97 -- api/logic/minecraft/auth-msa/mainwindow.h | 34 - api/logic/minecraft/auth-msa/mainwindow.ui | 72 -- api/logic/minecraft/auth/AuthSession.cpp | 30 - api/logic/minecraft/auth/AuthSession.h | 54 - api/logic/minecraft/auth/MojangAccount.cpp | 315 ----- api/logic/minecraft/auth/MojangAccount.h | 182 --- api/logic/minecraft/auth/MojangAccountList.cpp | 468 -------- api/logic/minecraft/auth/MojangAccountList.h | 201 ---- api/logic/minecraft/auth/YggdrasilTask.cpp | 255 ---- api/logic/minecraft/auth/YggdrasilTask.h | 151 --- .../minecraft/auth/flows/AuthenticateTask.cpp | 202 ---- api/logic/minecraft/auth/flows/AuthenticateTask.h | 46 - api/logic/minecraft/auth/flows/RefreshTask.cpp | 144 --- api/logic/minecraft/auth/flows/RefreshTask.h | 44 - api/logic/minecraft/auth/flows/ValidateTask.cpp | 61 - api/logic/minecraft/auth/flows/ValidateTask.h | 47 - api/logic/minecraft/gameoptions/GameOptions.cpp | 144 --- api/logic/minecraft/gameoptions/GameOptions.h | 34 - api/logic/minecraft/launch/ClaimAccount.cpp | 24 - api/logic/minecraft/launch/ClaimAccount.h | 37 - api/logic/minecraft/launch/CreateGameFolders.cpp | 28 - api/logic/minecraft/launch/CreateGameFolders.h | 37 - api/logic/minecraft/launch/DirectJavaLaunch.cpp | 148 --- api/logic/minecraft/launch/DirectJavaLaunch.h | 58 - api/logic/minecraft/launch/ExtractNatives.cpp | 111 -- api/logic/minecraft/launch/ExtractNatives.h | 38 - api/logic/minecraft/launch/LauncherPartLaunch.cpp | 218 ---- api/logic/minecraft/launch/LauncherPartLaunch.h | 60 - .../minecraft/launch/MinecraftServerTarget.cpp | 66 -- api/logic/minecraft/launch/MinecraftServerTarget.h | 30 - api/logic/minecraft/launch/ModMinecraftJar.cpp | 82 -- api/logic/minecraft/launch/ModMinecraftJar.h | 36 - api/logic/minecraft/launch/PrintInstanceInfo.cpp | 106 -- api/logic/minecraft/launch/PrintInstanceInfo.h | 41 - api/logic/minecraft/launch/ReconstructAssets.cpp | 36 - api/logic/minecraft/launch/ReconstructAssets.h | 33 - api/logic/minecraft/launch/ScanModFolders.cpp | 59 - api/logic/minecraft/launch/ScanModFolders.h | 42 - api/logic/minecraft/launch/VerifyJavaInstall.cpp | 34 - api/logic/minecraft/launch/VerifyJavaInstall.h | 17 - api/logic/minecraft/legacy/LegacyInstance.cpp | 256 ---- api/logic/minecraft/legacy/LegacyInstance.h | 142 --- api/logic/minecraft/legacy/LegacyModList.cpp | 136 --- api/logic/minecraft/legacy/LegacyModList.h | 49 - api/logic/minecraft/legacy/LegacyUpgradeTask.cpp | 138 --- api/logic/minecraft/legacy/LegacyUpgradeTask.h | 30 - api/logic/minecraft/mod/LocalModParseTask.cpp | 467 -------- api/logic/minecraft/mod/LocalModParseTask.h | 37 - api/logic/minecraft/mod/Mod.cpp | 151 --- api/logic/minecraft/mod/Mod.h | 117 -- api/logic/minecraft/mod/ModDetails.h | 17 - api/logic/minecraft/mod/ModFolderLoadTask.cpp | 18 - api/logic/minecraft/mod/ModFolderLoadTask.h | 29 - api/logic/minecraft/mod/ModFolderModel.cpp | 554 --------- api/logic/minecraft/mod/ModFolderModel.h | 149 --- api/logic/minecraft/mod/ModFolderModel_test.cpp | 53 - .../minecraft/mod/ResourcePackFolderModel.cpp | 23 - api/logic/minecraft/mod/ResourcePackFolderModel.h | 13 - api/logic/minecraft/mod/TexturePackFolderModel.cpp | 23 - api/logic/minecraft/mod/TexturePackFolderModel.h | 13 - api/logic/minecraft/services/SkinDelete.cpp | 42 - api/logic/minecraft/services/SkinDelete.h | 30 - api/logic/minecraft/services/SkinUpload.cpp | 66 -- api/logic/minecraft/services/SkinUpload.h | 39 - api/logic/minecraft/testdata/1.9-simple.json | 198 ---- api/logic/minecraft/testdata/1.9.json | 529 --------- api/logic/minecraft/testdata/codecwav-20101023.jar | 1 - api/logic/minecraft/testdata/lib-native-arch.json | 46 - api/logic/minecraft/testdata/lib-native.json | 52 - api/logic/minecraft/testdata/lib-simple.json | 11 - .../testdata/testname-testversion-linux-32.jar | 1 - api/logic/minecraft/update/AssetUpdateTask.cpp | 107 -- api/logic/minecraft/update/AssetUpdateTask.h | 28 - api/logic/minecraft/update/FMLLibrariesTask.cpp | 131 --- api/logic/minecraft/update/FMLLibrariesTask.h | 31 - api/logic/minecraft/update/FoldersTask.cpp | 21 - api/logic/minecraft/update/FoldersTask.h | 17 - api/logic/minecraft/update/LibrariesTask.cpp | 90 -- api/logic/minecraft/update/LibrariesTask.h | 26 - api/logic/modplatform/atlauncher/ATLPackIndex.cpp | 33 - api/logic/modplatform/atlauncher/ATLPackIndex.h | 36 - .../modplatform/atlauncher/ATLPackInstallTask.cpp | 764 ------------ .../modplatform/atlauncher/ATLPackInstallTask.h | 102 -- .../modplatform/atlauncher/ATLPackManifest.cpp | 218 ---- api/logic/modplatform/atlauncher/ATLPackManifest.h | 126 -- api/logic/modplatform/flame/FileResolvingTask.cpp | 63 - api/logic/modplatform/flame/FileResolvingTask.h | 34 - api/logic/modplatform/flame/FlamePackIndex.cpp | 92 -- api/logic/modplatform/flame/FlamePackIndex.h | 43 - api/logic/modplatform/flame/PackManifest.cpp | 126 -- api/logic/modplatform/flame/PackManifest.h | 62 - api/logic/modplatform/legacy_ftb/PackFetchTask.cpp | 172 --- api/logic/modplatform/legacy_ftb/PackFetchTask.h | 44 - api/logic/modplatform/legacy_ftb/PackHelpers.h | 45 - .../modplatform/legacy_ftb/PackInstallTask.cpp | 214 ---- api/logic/modplatform/legacy_ftb/PackInstallTask.h | 55 - .../modplatform/legacy_ftb/PrivatePackManager.cpp | 41 - .../modplatform/legacy_ftb/PrivatePackManager.h | 44 - .../modplatform/modpacksch/FTBPackInstallTask.cpp | 209 ---- .../modplatform/modpacksch/FTBPackInstallTask.h | 47 - .../modplatform/modpacksch/FTBPackManifest.cpp | 156 --- api/logic/modplatform/modpacksch/FTBPackManifest.h | 127 -- .../technic/SingleZipPackInstallTask.cpp | 141 --- .../modplatform/technic/SingleZipPackInstallTask.h | 65 -- .../modplatform/technic/SolderPackInstallTask.cpp | 207 ---- .../modplatform/technic/SolderPackInstallTask.h | 60 - .../modplatform/technic/TechnicPackProcessor.cpp | 208 ---- .../modplatform/technic/TechnicPackProcessor.h | 35 - api/logic/mojang/PackageManifest.cpp | 427 ------- api/logic/mojang/PackageManifest.h | 173 --- api/logic/mojang/PackageManifest_test.cpp | 344 ------ api/logic/mojang/testdata/1.8.0_202-x64.json | 1 - api/logic/mojang/testdata/inspect/a/b.txt | 0 api/logic/mojang/testdata/inspect/a/b/b.txt | 1 - api/logic/mojang/testdata/inspect_win/a/b.txt | 0 api/logic/mojang/testdata/inspect_win/a/b/b.txt | 0 api/logic/net/ByteArraySink.h | 62 - api/logic/net/ChecksumValidator.h | 55 - api/logic/net/Download.cpp | 309 ----- api/logic/net/Download.h | 76 -- api/logic/net/FileSink.cpp | 115 -- api/logic/net/FileSink.h | 28 - api/logic/net/HttpMetaCache.cpp | 273 ----- api/logic/net/HttpMetaCache.h | 125 -- api/logic/net/MetaCacheSink.cpp | 65 -- api/logic/net/MetaCacheSink.h | 22 - api/logic/net/Mode.h | 10 - api/logic/net/NetAction.h | 115 -- api/logic/net/NetJob.cpp | 218 ---- api/logic/net/NetJob.h | 91 -- api/logic/net/PasteUpload.cpp | 104 -- api/logic/net/PasteUpload.h | 49 - api/logic/net/Sink.h | 71 -- api/logic/net/Validator.h | 20 - api/logic/news/NewsChecker.cpp | 131 --- api/logic/news/NewsChecker.h | 105 -- api/logic/news/NewsEntry.cpp | 77 -- api/logic/news/NewsEntry.h | 65 -- api/logic/notifications/NotificationChecker.cpp | 129 --- api/logic/notifications/NotificationChecker.h | 63 - api/logic/pathmatcher/FSTreeMatcher.h | 21 - api/logic/pathmatcher/IPathMatcher.h | 12 - api/logic/pathmatcher/MultiMatcher.h | 31 - api/logic/pathmatcher/RegexpMatcher.h | 42 - api/logic/screenshots/ImgurAlbumCreation.cpp | 88 -- api/logic/screenshots/ImgurAlbumCreation.h | 44 - api/logic/screenshots/ImgurUpload.cpp | 114 -- api/logic/screenshots/ImgurUpload.h | 33 - api/logic/screenshots/Screenshot.h | 20 - api/logic/settings/INIFile.cpp | 163 --- api/logic/settings/INIFile.h | 38 - api/logic/settings/INIFile_test.cpp | 63 - api/logic/settings/INISettingsObject.cpp | 107 -- api/logic/settings/INISettingsObject.h | 66 -- api/logic/settings/OverrideSetting.cpp | 54 - api/logic/settings/OverrideSetting.h | 46 - api/logic/settings/PassthroughSetting.cpp | 69 -- api/logic/settings/PassthroughSetting.h | 45 - api/logic/settings/Setting.cpp | 53 - api/logic/settings/Setting.h | 119 -- api/logic/settings/SettingsObject.cpp | 142 --- api/logic/settings/SettingsObject.h | 214 ---- api/logic/status/StatusChecker.cpp | 148 --- api/logic/status/StatusChecker.h | 60 - api/logic/tasks/SequentialTask.cpp | 55 - api/logic/tasks/SequentialTask.h | 32 - api/logic/tasks/Task.cpp | 168 --- api/logic/tasks/Task.h | 108 -- .../testdata/FileSystem-test_createShortcut-unix | 6 - .../test_folder/assets/minecraft/textures/blah.txt | 1 - api/logic/testdata/test_folder/pack.mcmeta | 6 - api/logic/testdata/test_folder/pack.nfo | 1 - api/logic/tools/BaseExternalTool.cpp | 41 - api/logic/tools/BaseExternalTool.h | 60 - api/logic/tools/BaseProfiler.cpp | 36 - api/logic/tools/BaseProfiler.h | 39 - api/logic/tools/JProfiler.cpp | 116 -- api/logic/tools/JProfiler.h | 15 - api/logic/tools/JVisualVM.cpp | 104 -- api/logic/tools/JVisualVM.h | 15 - api/logic/tools/MCEditTool.cpp | 77 -- api/logic/tools/MCEditTool.h | 17 - api/logic/translations/POTranslator.cpp | 373 ------ api/logic/translations/POTranslator.h | 16 - api/logic/translations/TranslationsModel.cpp | 653 ----------- api/logic/translations/TranslationsModel.h | 65 -- api/logic/updater/DownloadTask.cpp | 173 --- api/logic/updater/DownloadTask.h | 98 -- api/logic/updater/DownloadTask_test.cpp | 195 ---- api/logic/updater/GoUpdate.cpp | 198 ---- api/logic/updater/GoUpdate.h | 127 -- api/logic/updater/UpdateChecker.cpp | 260 ----- api/logic/updater/UpdateChecker.h | 121 -- api/logic/updater/UpdateChecker_test.cpp | 147 --- api/logic/updater/testdata/1.json | 43 - api/logic/updater/testdata/2.json | 31 - api/logic/updater/testdata/channels.json | 23 - api/logic/updater/testdata/errorChannels.json | 23 - api/logic/updater/testdata/fileOneA | 1 - api/logic/updater/testdata/fileOneB | 3 - api/logic/updater/testdata/fileThree | 1 - api/logic/updater/testdata/fileTwo | 1 - api/logic/updater/testdata/garbageChannels.json | 22 - api/logic/updater/testdata/index.json | 9 - api/logic/updater/testdata/noChannels.json | 5 - api/logic/updater/testdata/oneChannel.json | 11 - .../tst_DownloadTask-test_writeInstallScript.xml | 17 - 361 files changed, 42538 deletions(-) delete mode 100644 api/logic/BaseInstaller.cpp delete mode 100644 api/logic/BaseInstaller.h delete mode 100644 api/logic/BaseInstance.cpp delete mode 100644 api/logic/BaseInstance.h delete mode 100644 api/logic/BaseVersion.h delete mode 100644 api/logic/BaseVersionList.cpp delete mode 100644 api/logic/BaseVersionList.h delete mode 100644 api/logic/CMakeLists.txt delete mode 100644 api/logic/Commandline.cpp delete mode 100644 api/logic/Commandline.h delete mode 100644 api/logic/DefaultVariable.h delete mode 100644 api/logic/Env.cpp delete mode 100644 api/logic/Env.h delete mode 100644 api/logic/Exception.h delete mode 100644 api/logic/ExponentialSeries.h delete mode 100644 api/logic/FileSystem.cpp delete mode 100644 api/logic/FileSystem.h delete mode 100644 api/logic/FileSystem_test.cpp delete mode 100644 api/logic/Filter.cpp delete mode 100644 api/logic/Filter.h delete mode 100644 api/logic/GZip.cpp delete mode 100644 api/logic/GZip.h delete mode 100644 api/logic/GZip_test.cpp delete mode 100644 api/logic/InstanceCopyTask.cpp delete mode 100644 api/logic/InstanceCopyTask.h delete mode 100644 api/logic/InstanceCreationTask.cpp delete mode 100644 api/logic/InstanceCreationTask.h delete mode 100644 api/logic/InstanceImportTask.cpp delete mode 100644 api/logic/InstanceImportTask.h delete mode 100644 api/logic/InstanceList.cpp delete mode 100644 api/logic/InstanceList.h delete mode 100644 api/logic/InstanceTask.cpp delete mode 100644 api/logic/InstanceTask.h delete mode 100644 api/logic/Json.cpp delete mode 100644 api/logic/Json.h delete mode 100644 api/logic/LoggedProcess.cpp delete mode 100644 api/logic/LoggedProcess.h delete mode 100644 api/logic/MMCStrings.cpp delete mode 100644 api/logic/MMCStrings.h delete mode 100644 api/logic/MMCZip.cpp delete mode 100644 api/logic/MMCZip.h delete mode 100644 api/logic/MessageLevel.cpp delete mode 100644 api/logic/MessageLevel.h delete mode 100644 api/logic/NullInstance.h delete mode 100644 api/logic/ProblemProvider.h delete mode 100644 api/logic/QObjectPtr.h delete mode 100644 api/logic/RWStorage.h delete mode 100644 api/logic/RecursiveFileSystemWatcher.cpp delete mode 100644 api/logic/RecursiveFileSystemWatcher.h delete mode 100644 api/logic/SeparatorPrefixTree.h delete mode 100644 api/logic/Usable.h delete mode 100644 api/logic/Version.cpp delete mode 100644 api/logic/Version.h delete mode 100644 api/logic/Version_test.cpp delete mode 100644 api/logic/WatchLock.h delete mode 100644 api/logic/icons/IIconList.cpp delete mode 100644 api/logic/icons/IIconList.h delete mode 100644 api/logic/icons/IconUtils.cpp delete mode 100644 api/logic/icons/IconUtils.h delete mode 100644 api/logic/java/JavaChecker.cpp delete mode 100644 api/logic/java/JavaChecker.h delete mode 100644 api/logic/java/JavaCheckerJob.cpp delete mode 100644 api/logic/java/JavaCheckerJob.h delete mode 100644 api/logic/java/JavaInstall.cpp delete mode 100644 api/logic/java/JavaInstall.h delete mode 100644 api/logic/java/JavaInstallList.cpp delete mode 100644 api/logic/java/JavaInstallList.h delete mode 100644 api/logic/java/JavaUtils.cpp delete mode 100644 api/logic/java/JavaUtils.h delete mode 100644 api/logic/java/JavaVersion.cpp delete mode 100644 api/logic/java/JavaVersion.h delete mode 100644 api/logic/java/JavaVersion_test.cpp delete mode 100644 api/logic/java/launch/CheckJava.cpp delete mode 100644 api/logic/java/launch/CheckJava.h delete mode 100644 api/logic/launch/LaunchStep.cpp delete mode 100644 api/logic/launch/LaunchStep.h delete mode 100644 api/logic/launch/LaunchTask.cpp delete mode 100644 api/logic/launch/LaunchTask.h delete mode 100644 api/logic/launch/LogModel.cpp delete mode 100644 api/logic/launch/LogModel.h delete mode 100644 api/logic/launch/steps/LookupServerAddress.cpp delete mode 100644 api/logic/launch/steps/LookupServerAddress.h delete mode 100644 api/logic/launch/steps/PostLaunchCommand.cpp delete mode 100644 api/logic/launch/steps/PostLaunchCommand.h delete mode 100644 api/logic/launch/steps/PreLaunchCommand.cpp delete mode 100644 api/logic/launch/steps/PreLaunchCommand.h delete mode 100644 api/logic/launch/steps/TextPrint.cpp delete mode 100644 api/logic/launch/steps/TextPrint.h delete mode 100644 api/logic/launch/steps/Update.cpp delete mode 100644 api/logic/launch/steps/Update.h delete mode 100644 api/logic/meta/BaseEntity.cpp delete mode 100644 api/logic/meta/BaseEntity.h delete mode 100644 api/logic/meta/Index.cpp delete mode 100644 api/logic/meta/Index.h delete mode 100644 api/logic/meta/Index_test.cpp delete mode 100644 api/logic/meta/JsonFormat.cpp delete mode 100644 api/logic/meta/JsonFormat.h delete mode 100644 api/logic/meta/Version.cpp delete mode 100644 api/logic/meta/Version.h delete mode 100644 api/logic/meta/VersionList.cpp delete mode 100644 api/logic/meta/VersionList.h delete mode 100644 api/logic/minecraft/AssetsUtils.cpp delete mode 100644 api/logic/minecraft/AssetsUtils.h delete mode 100644 api/logic/minecraft/Component.cpp delete mode 100644 api/logic/minecraft/Component.h delete mode 100644 api/logic/minecraft/ComponentUpdateTask.cpp delete mode 100644 api/logic/minecraft/ComponentUpdateTask.h delete mode 100644 api/logic/minecraft/ComponentUpdateTask_p.h delete mode 100644 api/logic/minecraft/GradleSpecifier.h delete mode 100644 api/logic/minecraft/GradleSpecifier_test.cpp delete mode 100644 api/logic/minecraft/LaunchProfile.cpp delete mode 100644 api/logic/minecraft/LaunchProfile.h delete mode 100644 api/logic/minecraft/Library.cpp delete mode 100644 api/logic/minecraft/Library.h delete mode 100644 api/logic/minecraft/Library_test.cpp delete mode 100644 api/logic/minecraft/MinecraftInstance.cpp delete mode 100644 api/logic/minecraft/MinecraftInstance.h delete mode 100644 api/logic/minecraft/MinecraftLoadAndCheck.cpp delete mode 100644 api/logic/minecraft/MinecraftLoadAndCheck.h delete mode 100644 api/logic/minecraft/MinecraftUpdate.cpp delete mode 100644 api/logic/minecraft/MinecraftUpdate.h delete mode 100644 api/logic/minecraft/MojangDownloadInfo.h delete mode 100644 api/logic/minecraft/MojangVersionFormat.cpp delete mode 100644 api/logic/minecraft/MojangVersionFormat.h delete mode 100644 api/logic/minecraft/MojangVersionFormat_test.cpp delete mode 100644 api/logic/minecraft/OneSixVersionFormat.cpp delete mode 100644 api/logic/minecraft/OneSixVersionFormat.h delete mode 100644 api/logic/minecraft/OpSys.cpp delete mode 100644 api/logic/minecraft/OpSys.h delete mode 100644 api/logic/minecraft/PackProfile.cpp delete mode 100644 api/logic/minecraft/PackProfile.h delete mode 100644 api/logic/minecraft/PackProfile_p.h delete mode 100644 api/logic/minecraft/ParseUtils.cpp delete mode 100644 api/logic/minecraft/ParseUtils.h delete mode 100644 api/logic/minecraft/ParseUtils_test.cpp delete mode 100644 api/logic/minecraft/ProfileUtils.cpp delete mode 100644 api/logic/minecraft/ProfileUtils.h delete mode 100644 api/logic/minecraft/Rule.cpp delete mode 100644 api/logic/minecraft/Rule.h delete mode 100644 api/logic/minecraft/VersionFile.cpp delete mode 100644 api/logic/minecraft/VersionFile.h delete mode 100644 api/logic/minecraft/VersionFilterData.cpp delete mode 100644 api/logic/minecraft/VersionFilterData.h delete mode 100644 api/logic/minecraft/World.cpp delete mode 100644 api/logic/minecraft/World.h delete mode 100644 api/logic/minecraft/WorldList.cpp delete mode 100644 api/logic/minecraft/WorldList.h delete mode 100644 api/logic/minecraft/auth-msa/BuildConfig.cpp.in delete mode 100644 api/logic/minecraft/auth-msa/BuildConfig.h delete mode 100644 api/logic/minecraft/auth-msa/CMakeLists.txt delete mode 100644 api/logic/minecraft/auth-msa/context.cpp delete mode 100644 api/logic/minecraft/auth-msa/context.h delete mode 100644 api/logic/minecraft/auth-msa/main.cpp delete mode 100644 api/logic/minecraft/auth-msa/mainwindow.cpp delete mode 100644 api/logic/minecraft/auth-msa/mainwindow.h delete mode 100644 api/logic/minecraft/auth-msa/mainwindow.ui delete mode 100644 api/logic/minecraft/auth/AuthSession.cpp delete mode 100644 api/logic/minecraft/auth/AuthSession.h delete mode 100644 api/logic/minecraft/auth/MojangAccount.cpp delete mode 100644 api/logic/minecraft/auth/MojangAccount.h delete mode 100644 api/logic/minecraft/auth/MojangAccountList.cpp delete mode 100644 api/logic/minecraft/auth/MojangAccountList.h delete mode 100644 api/logic/minecraft/auth/YggdrasilTask.cpp delete mode 100644 api/logic/minecraft/auth/YggdrasilTask.h delete mode 100644 api/logic/minecraft/auth/flows/AuthenticateTask.cpp delete mode 100644 api/logic/minecraft/auth/flows/AuthenticateTask.h delete mode 100644 api/logic/minecraft/auth/flows/RefreshTask.cpp delete mode 100644 api/logic/minecraft/auth/flows/RefreshTask.h delete mode 100644 api/logic/minecraft/auth/flows/ValidateTask.cpp delete mode 100644 api/logic/minecraft/auth/flows/ValidateTask.h delete mode 100644 api/logic/minecraft/gameoptions/GameOptions.cpp delete mode 100644 api/logic/minecraft/gameoptions/GameOptions.h delete mode 100644 api/logic/minecraft/launch/ClaimAccount.cpp delete mode 100644 api/logic/minecraft/launch/ClaimAccount.h delete mode 100644 api/logic/minecraft/launch/CreateGameFolders.cpp delete mode 100644 api/logic/minecraft/launch/CreateGameFolders.h delete mode 100644 api/logic/minecraft/launch/DirectJavaLaunch.cpp delete mode 100644 api/logic/minecraft/launch/DirectJavaLaunch.h delete mode 100644 api/logic/minecraft/launch/ExtractNatives.cpp delete mode 100644 api/logic/minecraft/launch/ExtractNatives.h delete mode 100644 api/logic/minecraft/launch/LauncherPartLaunch.cpp delete mode 100644 api/logic/minecraft/launch/LauncherPartLaunch.h delete mode 100644 api/logic/minecraft/launch/MinecraftServerTarget.cpp delete mode 100644 api/logic/minecraft/launch/MinecraftServerTarget.h delete mode 100644 api/logic/minecraft/launch/ModMinecraftJar.cpp delete mode 100644 api/logic/minecraft/launch/ModMinecraftJar.h delete mode 100644 api/logic/minecraft/launch/PrintInstanceInfo.cpp delete mode 100644 api/logic/minecraft/launch/PrintInstanceInfo.h delete mode 100644 api/logic/minecraft/launch/ReconstructAssets.cpp delete mode 100644 api/logic/minecraft/launch/ReconstructAssets.h delete mode 100644 api/logic/minecraft/launch/ScanModFolders.cpp delete mode 100644 api/logic/minecraft/launch/ScanModFolders.h delete mode 100644 api/logic/minecraft/launch/VerifyJavaInstall.cpp delete mode 100644 api/logic/minecraft/launch/VerifyJavaInstall.h delete mode 100644 api/logic/minecraft/legacy/LegacyInstance.cpp delete mode 100644 api/logic/minecraft/legacy/LegacyInstance.h delete mode 100644 api/logic/minecraft/legacy/LegacyModList.cpp delete mode 100644 api/logic/minecraft/legacy/LegacyModList.h delete mode 100644 api/logic/minecraft/legacy/LegacyUpgradeTask.cpp delete mode 100644 api/logic/minecraft/legacy/LegacyUpgradeTask.h delete mode 100644 api/logic/minecraft/mod/LocalModParseTask.cpp delete mode 100644 api/logic/minecraft/mod/LocalModParseTask.h delete mode 100644 api/logic/minecraft/mod/Mod.cpp delete mode 100644 api/logic/minecraft/mod/Mod.h delete mode 100644 api/logic/minecraft/mod/ModDetails.h delete mode 100644 api/logic/minecraft/mod/ModFolderLoadTask.cpp delete mode 100644 api/logic/minecraft/mod/ModFolderLoadTask.h delete mode 100644 api/logic/minecraft/mod/ModFolderModel.cpp delete mode 100644 api/logic/minecraft/mod/ModFolderModel.h delete mode 100644 api/logic/minecraft/mod/ModFolderModel_test.cpp delete mode 100644 api/logic/minecraft/mod/ResourcePackFolderModel.cpp delete mode 100644 api/logic/minecraft/mod/ResourcePackFolderModel.h delete mode 100644 api/logic/minecraft/mod/TexturePackFolderModel.cpp delete mode 100644 api/logic/minecraft/mod/TexturePackFolderModel.h delete mode 100644 api/logic/minecraft/services/SkinDelete.cpp delete mode 100644 api/logic/minecraft/services/SkinDelete.h delete mode 100644 api/logic/minecraft/services/SkinUpload.cpp delete mode 100644 api/logic/minecraft/services/SkinUpload.h delete mode 100644 api/logic/minecraft/testdata/1.9-simple.json delete mode 100644 api/logic/minecraft/testdata/1.9.json delete mode 100644 api/logic/minecraft/testdata/codecwav-20101023.jar delete mode 100644 api/logic/minecraft/testdata/lib-native-arch.json delete mode 100644 api/logic/minecraft/testdata/lib-native.json delete mode 100644 api/logic/minecraft/testdata/lib-simple.json delete mode 100644 api/logic/minecraft/testdata/testname-testversion-linux-32.jar delete mode 100644 api/logic/minecraft/update/AssetUpdateTask.cpp delete mode 100644 api/logic/minecraft/update/AssetUpdateTask.h delete mode 100644 api/logic/minecraft/update/FMLLibrariesTask.cpp delete mode 100644 api/logic/minecraft/update/FMLLibrariesTask.h delete mode 100644 api/logic/minecraft/update/FoldersTask.cpp delete mode 100644 api/logic/minecraft/update/FoldersTask.h delete mode 100644 api/logic/minecraft/update/LibrariesTask.cpp delete mode 100644 api/logic/minecraft/update/LibrariesTask.h delete mode 100644 api/logic/modplatform/atlauncher/ATLPackIndex.cpp delete mode 100644 api/logic/modplatform/atlauncher/ATLPackIndex.h delete mode 100644 api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp delete mode 100644 api/logic/modplatform/atlauncher/ATLPackInstallTask.h delete mode 100644 api/logic/modplatform/atlauncher/ATLPackManifest.cpp delete mode 100644 api/logic/modplatform/atlauncher/ATLPackManifest.h delete mode 100644 api/logic/modplatform/flame/FileResolvingTask.cpp delete mode 100644 api/logic/modplatform/flame/FileResolvingTask.h delete mode 100644 api/logic/modplatform/flame/FlamePackIndex.cpp delete mode 100644 api/logic/modplatform/flame/FlamePackIndex.h delete mode 100644 api/logic/modplatform/flame/PackManifest.cpp delete mode 100644 api/logic/modplatform/flame/PackManifest.h delete mode 100644 api/logic/modplatform/legacy_ftb/PackFetchTask.cpp delete mode 100644 api/logic/modplatform/legacy_ftb/PackFetchTask.h delete mode 100644 api/logic/modplatform/legacy_ftb/PackHelpers.h delete mode 100644 api/logic/modplatform/legacy_ftb/PackInstallTask.cpp delete mode 100644 api/logic/modplatform/legacy_ftb/PackInstallTask.h delete mode 100644 api/logic/modplatform/legacy_ftb/PrivatePackManager.cpp delete mode 100644 api/logic/modplatform/legacy_ftb/PrivatePackManager.h delete mode 100644 api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp delete mode 100644 api/logic/modplatform/modpacksch/FTBPackInstallTask.h delete mode 100644 api/logic/modplatform/modpacksch/FTBPackManifest.cpp delete mode 100644 api/logic/modplatform/modpacksch/FTBPackManifest.h delete mode 100644 api/logic/modplatform/technic/SingleZipPackInstallTask.cpp delete mode 100644 api/logic/modplatform/technic/SingleZipPackInstallTask.h delete mode 100644 api/logic/modplatform/technic/SolderPackInstallTask.cpp delete mode 100644 api/logic/modplatform/technic/SolderPackInstallTask.h delete mode 100644 api/logic/modplatform/technic/TechnicPackProcessor.cpp delete mode 100644 api/logic/modplatform/technic/TechnicPackProcessor.h delete mode 100644 api/logic/mojang/PackageManifest.cpp delete mode 100644 api/logic/mojang/PackageManifest.h delete mode 100644 api/logic/mojang/PackageManifest_test.cpp delete mode 100644 api/logic/mojang/testdata/1.8.0_202-x64.json delete mode 100755 api/logic/mojang/testdata/inspect/a/b.txt delete mode 120000 api/logic/mojang/testdata/inspect/a/b/b.txt delete mode 100644 api/logic/mojang/testdata/inspect_win/a/b.txt delete mode 100644 api/logic/mojang/testdata/inspect_win/a/b/b.txt delete mode 100644 api/logic/net/ByteArraySink.h delete mode 100644 api/logic/net/ChecksumValidator.h delete mode 100644 api/logic/net/Download.cpp delete mode 100644 api/logic/net/Download.h delete mode 100644 api/logic/net/FileSink.cpp delete mode 100644 api/logic/net/FileSink.h delete mode 100644 api/logic/net/HttpMetaCache.cpp delete mode 100644 api/logic/net/HttpMetaCache.h delete mode 100644 api/logic/net/MetaCacheSink.cpp delete mode 100644 api/logic/net/MetaCacheSink.h delete mode 100644 api/logic/net/Mode.h delete mode 100644 api/logic/net/NetAction.h delete mode 100644 api/logic/net/NetJob.cpp delete mode 100644 api/logic/net/NetJob.h delete mode 100644 api/logic/net/PasteUpload.cpp delete mode 100644 api/logic/net/PasteUpload.h delete mode 100644 api/logic/net/Sink.h delete mode 100644 api/logic/net/Validator.h delete mode 100644 api/logic/news/NewsChecker.cpp delete mode 100644 api/logic/news/NewsChecker.h delete mode 100644 api/logic/news/NewsEntry.cpp delete mode 100644 api/logic/news/NewsEntry.h delete mode 100644 api/logic/notifications/NotificationChecker.cpp delete mode 100644 api/logic/notifications/NotificationChecker.h delete mode 100644 api/logic/pathmatcher/FSTreeMatcher.h delete mode 100644 api/logic/pathmatcher/IPathMatcher.h delete mode 100644 api/logic/pathmatcher/MultiMatcher.h delete mode 100644 api/logic/pathmatcher/RegexpMatcher.h delete mode 100644 api/logic/screenshots/ImgurAlbumCreation.cpp delete mode 100644 api/logic/screenshots/ImgurAlbumCreation.h delete mode 100644 api/logic/screenshots/ImgurUpload.cpp delete mode 100644 api/logic/screenshots/ImgurUpload.h delete mode 100644 api/logic/screenshots/Screenshot.h delete mode 100644 api/logic/settings/INIFile.cpp delete mode 100644 api/logic/settings/INIFile.h delete mode 100644 api/logic/settings/INIFile_test.cpp delete mode 100644 api/logic/settings/INISettingsObject.cpp delete mode 100644 api/logic/settings/INISettingsObject.h delete mode 100644 api/logic/settings/OverrideSetting.cpp delete mode 100644 api/logic/settings/OverrideSetting.h delete mode 100644 api/logic/settings/PassthroughSetting.cpp delete mode 100644 api/logic/settings/PassthroughSetting.h delete mode 100644 api/logic/settings/Setting.cpp delete mode 100644 api/logic/settings/Setting.h delete mode 100644 api/logic/settings/SettingsObject.cpp delete mode 100644 api/logic/settings/SettingsObject.h delete mode 100644 api/logic/status/StatusChecker.cpp delete mode 100644 api/logic/status/StatusChecker.h delete mode 100644 api/logic/tasks/SequentialTask.cpp delete mode 100644 api/logic/tasks/SequentialTask.h delete mode 100644 api/logic/tasks/Task.cpp delete mode 100644 api/logic/tasks/Task.h delete mode 100755 api/logic/testdata/FileSystem-test_createShortcut-unix delete mode 100644 api/logic/testdata/test_folder/assets/minecraft/textures/blah.txt delete mode 100644 api/logic/testdata/test_folder/pack.mcmeta delete mode 100644 api/logic/testdata/test_folder/pack.nfo delete mode 100644 api/logic/tools/BaseExternalTool.cpp delete mode 100644 api/logic/tools/BaseExternalTool.h delete mode 100644 api/logic/tools/BaseProfiler.cpp delete mode 100644 api/logic/tools/BaseProfiler.h delete mode 100644 api/logic/tools/JProfiler.cpp delete mode 100644 api/logic/tools/JProfiler.h delete mode 100644 api/logic/tools/JVisualVM.cpp delete mode 100644 api/logic/tools/JVisualVM.h delete mode 100644 api/logic/tools/MCEditTool.cpp delete mode 100644 api/logic/tools/MCEditTool.h delete mode 100644 api/logic/translations/POTranslator.cpp delete mode 100644 api/logic/translations/POTranslator.h delete mode 100644 api/logic/translations/TranslationsModel.cpp delete mode 100644 api/logic/translations/TranslationsModel.h delete mode 100644 api/logic/updater/DownloadTask.cpp delete mode 100644 api/logic/updater/DownloadTask.h delete mode 100644 api/logic/updater/DownloadTask_test.cpp delete mode 100644 api/logic/updater/GoUpdate.cpp delete mode 100644 api/logic/updater/GoUpdate.h delete mode 100644 api/logic/updater/UpdateChecker.cpp delete mode 100644 api/logic/updater/UpdateChecker.h delete mode 100644 api/logic/updater/UpdateChecker_test.cpp delete mode 100644 api/logic/updater/testdata/1.json delete mode 100644 api/logic/updater/testdata/2.json delete mode 100644 api/logic/updater/testdata/channels.json delete mode 100644 api/logic/updater/testdata/errorChannels.json delete mode 100644 api/logic/updater/testdata/fileOneA delete mode 100644 api/logic/updater/testdata/fileOneB delete mode 100644 api/logic/updater/testdata/fileThree delete mode 100644 api/logic/updater/testdata/fileTwo delete mode 100644 api/logic/updater/testdata/garbageChannels.json delete mode 100644 api/logic/updater/testdata/index.json delete mode 100644 api/logic/updater/testdata/noChannels.json delete mode 100644 api/logic/updater/testdata/oneChannel.json delete mode 100644 api/logic/updater/testdata/tst_DownloadTask-test_writeInstallScript.xml (limited to 'api/logic') diff --git a/api/logic/BaseInstaller.cpp b/api/logic/BaseInstaller.cpp deleted file mode 100644 index d61c3fe9..00000000 --- a/api/logic/BaseInstaller.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* Copyright 2013-2021 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -#include "BaseInstaller.h" -#include "minecraft/MinecraftInstance.h" - -BaseInstaller::BaseInstaller() -{ - -} - -bool BaseInstaller::isApplied(MinecraftInstance *on) -{ - return QFile::exists(filename(on->instanceRoot())); -} - -bool BaseInstaller::add(MinecraftInstance *to) -{ - if (!patchesDir(to->instanceRoot()).exists()) - { - QDir(to->instanceRoot()).mkdir("patches"); - } - - if (isApplied(to)) - { - if (!remove(to)) - { - return false; - } - } - - return true; -} - -bool BaseInstaller::remove(MinecraftInstance *from) -{ - return QFile::remove(filename(from->instanceRoot())); -} - -QString BaseInstaller::filename(const QString &root) const -{ - return patchesDir(root).absoluteFilePath(id() + ".json"); -} -QDir BaseInstaller::patchesDir(const QString &root) const -{ - return QDir(root + "/patches/"); -} diff --git a/api/logic/BaseInstaller.h b/api/logic/BaseInstaller.h deleted file mode 100644 index 3e40b355..00000000 --- a/api/logic/BaseInstaller.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2013-2021 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include - -#include "multimc_logic_export.h" - -class MinecraftInstance; -class QDir; -class QString; -class QObject; -class Task; -class BaseVersion; -typedef std::shared_ptr BaseVersionPtr; - -class MULTIMC_LOGIC_EXPORT BaseInstaller -{ -public: - BaseInstaller(); - virtual ~BaseInstaller(){}; - bool isApplied(MinecraftInstance *on); - - virtual bool add(MinecraftInstance *to); - virtual bool remove(MinecraftInstance *from); - - virtual Task *createInstallTask(MinecraftInstance *instance, BaseVersionPtr version, QObject *parent) = 0; - -protected: - virtual QString id() const = 0; - QString filename(const QString &root) const; - QDir patchesDir(const QString &root) const; -}; diff --git a/api/logic/BaseInstance.cpp b/api/logic/BaseInstance.cpp deleted file mode 100644 index 46b45827..00000000 --- a/api/logic/BaseInstance.cpp +++ /dev/null @@ -1,275 +0,0 @@ -/* Copyright 2013-2021 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "BaseInstance.h" - -#include -#include -#include - -#include "settings/INISettingsObject.h" -#include "settings/Setting.h" -#include "settings/OverrideSetting.h" - -#include "FileSystem.h" -#include "Commandline.h" - -BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) - : QObject() -{ - m_settings = settings; - m_rootDir = rootDir; - - m_settings->registerSetting("name", "Unnamed Instance"); - m_settings->registerSetting("iconKey", "default"); - m_settings->registerSetting("notes", ""); - m_settings->registerSetting("lastLaunchTime", 0); - m_settings->registerSetting("totalTimePlayed", 0); - m_settings->registerSetting("lastTimePlayed", 0); - - // Custom Commands - auto commandSetting = m_settings->registerSetting({"OverrideCommands","OverrideLaunchCmd"}, false); - m_settings->registerOverride(globalSettings->getSetting("PreLaunchCommand"), commandSetting); - m_settings->registerOverride(globalSettings->getSetting("WrapperCommand"), commandSetting); - m_settings->registerOverride(globalSettings->getSetting("PostExitCommand"), commandSetting); - - // Console - auto consoleSetting = m_settings->registerSetting("OverrideConsole", false); - m_settings->registerOverride(globalSettings->getSetting("ShowConsole"), consoleSetting); - m_settings->registerOverride(globalSettings->getSetting("AutoCloseConsole"), consoleSetting); - m_settings->registerOverride(globalSettings->getSetting("ShowConsoleOnError"), consoleSetting); - m_settings->registerOverride(globalSettings->getSetting("LogPrePostOutput"), consoleSetting); - - m_settings->registerPassthrough(globalSettings->getSetting("ConsoleMaxLines"), nullptr); - m_settings->registerPassthrough(globalSettings->getSetting("ConsoleOverflowStop"), nullptr); -} - -QString BaseInstance::getPreLaunchCommand() -{ - return settings()->get("PreLaunchCommand").toString(); -} - -QString BaseInstance::getWrapperCommand() -{ - return settings()->get("WrapperCommand").toString(); -} - -QString BaseInstance::getPostExitCommand() -{ - return settings()->get("PostExitCommand").toString(); -} - -int BaseInstance::getConsoleMaxLines() const -{ - auto lineSetting = settings()->getSetting("ConsoleMaxLines"); - bool conversionOk = false; - int maxLines = lineSetting->get().toInt(&conversionOk); - if(!conversionOk) - { - maxLines = lineSetting->defValue().toInt(); - qWarning() << "ConsoleMaxLines has nonsensical value, defaulting to" << maxLines; - } - return maxLines; -} - -bool BaseInstance::shouldStopOnConsoleOverflow() const -{ - return settings()->get("ConsoleOverflowStop").toBool(); -} - -void BaseInstance::iconUpdated(QString key) -{ - if(iconKey() == key) - { - emit propertiesChanged(this); - } -} - -void BaseInstance::invalidate() -{ - changeStatus(Status::Gone); - qDebug() << "Instance" << id() << "has been invalidated."; -} - -void BaseInstance::changeStatus(BaseInstance::Status newStatus) -{ - Status status = currentStatus(); - if(status != newStatus) - { - m_status = newStatus; - emit statusChanged(status, newStatus); - } -} - -BaseInstance::Status BaseInstance::currentStatus() const -{ - return m_status; -} - -QString BaseInstance::id() const -{ - return QFileInfo(instanceRoot()).fileName(); -} - -bool BaseInstance::isRunning() const -{ - return m_isRunning; -} - -void BaseInstance::setRunning(bool running) -{ - if(running == m_isRunning) - return; - - m_isRunning = running; - - if(!m_settings->get("RecordGameTime").toBool()) - { - emit runningStatusChanged(running); - return; - } - - if(running) - { - m_timeStarted = QDateTime::currentDateTime(); - } - else - { - QDateTime timeEnded = QDateTime::currentDateTime(); - - qint64 current = settings()->get("totalTimePlayed").toLongLong(); - settings()->set("totalTimePlayed", current + m_timeStarted.secsTo(timeEnded)); - settings()->set("lastTimePlayed", m_timeStarted.secsTo(timeEnded)); - - emit propertiesChanged(this); - } - - emit runningStatusChanged(running); -} - -int64_t BaseInstance::totalTimePlayed() const -{ - qint64 current = settings()->get("totalTimePlayed").toLongLong(); - if(m_isRunning) - { - QDateTime timeNow = QDateTime::currentDateTime(); - return current + m_timeStarted.secsTo(timeNow); - } - return current; -} - -int64_t BaseInstance::lastTimePlayed() const -{ - if(m_isRunning) - { - QDateTime timeNow = QDateTime::currentDateTime(); - return m_timeStarted.secsTo(timeNow); - } - return settings()->get("lastTimePlayed").toLongLong(); -} - -void BaseInstance::resetTimePlayed() -{ - settings()->reset("totalTimePlayed"); - settings()->reset("lastTimePlayed"); -} - -QString BaseInstance::instanceType() const -{ - return m_settings->get("InstanceType").toString(); -} - -QString BaseInstance::instanceRoot() const -{ - return m_rootDir; -} - -SettingsObjectPtr BaseInstance::settings() const -{ - return m_settings; -} - -bool BaseInstance::canLaunch() const -{ - return (!hasVersionBroken() && !isRunning()); -} - -bool BaseInstance::reloadSettings() -{ - return m_settings->reload(); -} - -qint64 BaseInstance::lastLaunch() const -{ - return m_settings->get("lastLaunchTime").value(); -} - -void BaseInstance::setLastLaunch(qint64 val) -{ - //FIXME: if no change, do not set. setting involves saving a file. - m_settings->set("lastLaunchTime", val); - emit propertiesChanged(this); -} - -void BaseInstance::setNotes(QString val) -{ - //FIXME: if no change, do not set. setting involves saving a file. - m_settings->set("notes", val); -} - -QString BaseInstance::notes() const -{ - return m_settings->get("notes").toString(); -} - -void BaseInstance::setIconKey(QString val) -{ - //FIXME: if no change, do not set. setting involves saving a file. - m_settings->set("iconKey", val); - emit propertiesChanged(this); -} - -QString BaseInstance::iconKey() const -{ - return m_settings->get("iconKey").toString(); -} - -void BaseInstance::setName(QString val) -{ - //FIXME: if no change, do not set. setting involves saving a file. - m_settings->set("name", val); - emit propertiesChanged(this); -} - -QString BaseInstance::name() const -{ - return m_settings->get("name").toString(); -} - -QString BaseInstance::windowTitle() const -{ - return "MultiMC: " + name().replace(QRegExp("[ \n\r\t]+"), " "); -} - -// FIXME: why is this here? move it to MinecraftInstance!!! -QStringList BaseInstance::extraArguments() const -{ - return Commandline::splitArgs(settings()->get("JvmArgs").toString()); -} - -shared_qobject_ptr BaseInstance::getLaunchTask() -{ - return m_launchProcess; -} diff --git a/api/logic/BaseInstance.h b/api/logic/BaseInstance.h deleted file mode 100644 index d250e03e..00000000 --- a/api/logic/BaseInstance.h +++ /dev/null @@ -1,272 +0,0 @@ -/* Copyright 2013-2021 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once -#include - -#include -#include "QObjectPtr.h" -#include -#include -#include - -#include "settings/SettingsObject.h" - -#include "settings/INIFile.h" -#include "BaseVersionList.h" -#include "minecraft/auth/MojangAccount.h" -#include "MessageLevel.h" -#include "pathmatcher/IPathMatcher.h" - -#include "net/Mode.h" - -#include "multimc_logic_export.h" - -#include "minecraft/launch/MinecraftServerTarget.h" - -class QDir; -class Task; -class LaunchTask; -class BaseInstance; - -// pointer for lazy people -typedef std::shared_ptr InstancePtr; - -/*! - * \brief Base class for instances. - * This class implements many functions that are common between instances and - * provides a standard interface for all instances. - * - * To create a new instance type, create a new class inheriting from this class - * and implement the pure virtual functions. - */ -class MULTIMC_LOGIC_EXPORT BaseInstance : public QObject, public std::enable_shared_from_this -{ - Q_OBJECT -protected: - /// no-touchy! - BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir); - -public: /* types */ - enum class Status - { - Present, - Gone // either nuked or invalidated - }; - -public: - /// virtual destructor to make sure the destruction is COMPLETE - virtual ~BaseInstance() {}; - - virtual void saveNow() = 0; - - /*** - * the instance has been invalidated - it is no longer tracked by MultiMC for some reason, - * but it has not necessarily been deleted. - * - * Happens when the instance folder changes to some other location, or the instance is removed by external means. - */ - void invalidate(); - - /// The instance's ID. The ID SHALL be determined by MMC internally. The ID IS guaranteed to - /// be unique. - virtual QString id() const; - - void setRunning(bool running); - bool isRunning() const; - int64_t totalTimePlayed() const; - int64_t lastTimePlayed() const; - void resetTimePlayed(); - - /// get the type of this instance - QString instanceType() const; - - /// Path to the instance's root directory. - QString instanceRoot() const; - - /// Path to the instance's game root directory. - virtual QString gameRoot() const - { - return instanceRoot(); - } - - QString name() const; - void setName(QString val); - - /// Value used for instance window titles - QString windowTitle() const; - - QString iconKey() const; - void setIconKey(QString val); - - QString notes() const; - void setNotes(QString val); - - QString getPreLaunchCommand(); - QString getPostExitCommand(); - QString getWrapperCommand(); - - /// guess log level from a line of game log - virtual MessageLevel::Enum guessLevel(const QString &line, MessageLevel::Enum level) - { - return level; - }; - - virtual QStringList extraArguments() const; - - /// Traits. Normally inside the version, depends on instance implementation. - virtual QSet traits() const = 0; - - /** - * Gets the time that the instance was last launched. - * Stored in milliseconds since epoch. - */ - qint64 lastLaunch() const; - /// Sets the last launched time to 'val' milliseconds since epoch - void setLastLaunch(qint64 val = QDateTime::currentMSecsSinceEpoch()); - - /*! - * \brief Gets this instance's settings object. - * This settings object stores instance-specific settings. - * \return A pointer to this instance's settings object. - */ - virtual SettingsObjectPtr settings() const; - - /// returns a valid update task - virtual shared_qobject_ptr createUpdateTask(Net::Mode mode) = 0; - - /// returns a valid launcher (task container) - virtual shared_qobject_ptr createLaunchTask( - AuthSessionPtr account, MinecraftServerTargetPtr serverToJoin) = 0; - - /// returns the current launch task (if any) - shared_qobject_ptr getLaunchTask(); - - /*! - * Create envrironment variables for running the instance - */ - virtual QProcessEnvironment createEnvironment() = 0; - - /*! - * Returns a matcher that can maps relative paths within the instance to whether they are 'log files' - */ - virtual IPathMatcher::Ptr getLogFileMatcher() = 0; - - /*! - * Returns the root folder to use for looking up log files - */ - virtual QString getLogFileRoot() = 0; - - virtual QString getStatusbarDescription() = 0; - - /// FIXME: this really should be elsewhere... - virtual QString instanceConfigFolder() const = 0; - - /// get variables this instance exports - virtual QMap getVariables() const = 0; - - virtual QString typeName() const = 0; - - bool hasVersionBroken() const - { - return m_hasBrokenVersion; - } - void setVersionBroken(bool value) - { - if(m_hasBrokenVersion != value) - { - m_hasBrokenVersion = value; - emit propertiesChanged(this); - } - } - - bool hasUpdateAvailable() const - { - return m_hasUpdate; - } - void setUpdateAvailable(bool value) - { - if(m_hasUpdate != value) - { - m_hasUpdate = value; - emit propertiesChanged(this); - } - } - - bool hasCrashed() const - { - return m_crashed; - } - void setCrashed(bool value) - { - if(m_crashed != value) - { - m_crashed = value; - emit propertiesChanged(this); - } - } - - virtual bool canLaunch() const; - virtual bool canEdit() const = 0; - virtual bool canExport() const = 0; - - bool reloadSettings(); - - /** - * 'print' a verbose description of the instance into a QStringList - */ - virtual QStringList verboseDescription(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin) = 0; - - Status currentStatus() const; - - int getConsoleMaxLines() const; - bool shouldStopOnConsoleOverflow() const; - -protected: - void changeStatus(Status newStatus); - -signals: - /*! - * \brief Signal emitted when properties relevant to the instance view change - */ - void propertiesChanged(BaseInstance *inst); - - void launchTaskChanged(shared_qobject_ptr); - - void runningStatusChanged(bool running); - - void statusChanged(Status from, Status to); - -protected slots: - void iconUpdated(QString key); - -protected: /* data */ - QString m_rootDir; - SettingsObjectPtr m_settings; - // InstanceFlags m_flags; - bool m_isRunning = false; - shared_qobject_ptr m_launchProcess; - QDateTime m_timeStarted; - -private: /* data */ - Status m_status = Status::Present; - bool m_crashed = false; - bool m_hasUpdate = false; - bool m_hasBrokenVersion = false; -}; - -Q_DECLARE_METATYPE(shared_qobject_ptr) -//Q_DECLARE_METATYPE(BaseInstance::InstanceFlag) -//Q_DECLARE_OPERATORS_FOR_FLAGS(BaseInstance::InstanceFlags) diff --git a/api/logic/BaseVersion.h b/api/logic/BaseVersion.h deleted file mode 100644 index b88105fb..00000000 --- a/api/logic/BaseVersion.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright 2013-2021 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include -#include -#include - -/*! - * An abstract base class for versions. - */ -class BaseVersion -{ -public: - virtual ~BaseVersion() {} - /*! - * A string used to identify this version in config files. - * This should be unique within the version list or shenanigans will occur. - */ - virtual QString descriptor() = 0; - - /*! - * The name of this version as it is displayed to the user. - * For example: "1.5.1" - */ - virtual QString name() = 0; - - /*! - * This should return a string that describes - * the kind of version this is (Stable, Beta, Snapshot, whatever) - */ - virtual QString typeString() const = 0; - - virtual bool operator<(BaseVersion &a) - { - return name() < a.name(); - }; - virtual bool operator>(BaseVersion &a) - { - return name() > a.name(); - }; -}; - -typedef std::shared_ptr BaseVersionPtr; - -Q_DECLARE_METATYPE(BaseVersionPtr) diff --git a/api/logic/BaseVersionList.cpp b/api/logic/BaseVersionList.cpp deleted file mode 100644 index aa9cb6cf..00000000 --- a/api/logic/BaseVersionList.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/* Copyright 2013-2021 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "BaseVersio