diff --git a/CMakeLists.txt b/CMakeLists.txt index be6f7dfef..521fdaadc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -175,7 +175,7 @@ if(MultiMC_LAYOUT_REAL STREQUAL "mac-bundle") set(INSTALL_BUNDLE "full") # Add the icon - install(FILES application/resources/MultiMC.icns DESTINATION ${RESOURCES_DEST_DIR}) + install(FILES launcher/resources/MultiMC.icns DESTINATION ${RESOURCES_DEST_DIR}) elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-bundle") set(BINARY_DEST_DIR "bin") @@ -198,7 +198,7 @@ elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-bundle") SET(MultiMC_BINARY_RPATH "$ORIGIN/") # Install basic runner script - install(PROGRAMS application/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR}) + install(PROGRAMS launcher/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR}) elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-nodeps") set(BINARY_DEST_DIR "bin") @@ -215,7 +215,7 @@ elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-nodeps") SET(MultiMC_BINARY_RPATH "$ORIGIN/") # Install basic runner script - install(PROGRAMS application/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR}) + install(PROGRAMS launcher/package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR}) elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-system") set(MultiMC_APP_BINARY_NAME "multimc" CACHE STRING "Name of the MultiMC binary") @@ -283,8 +283,6 @@ add_subdirectory(libraries/katabasis) # An OAuth2 library that tried to do too m ############################### Built Artifacts ############################### add_subdirectory(buildconfig) -add_subdirectory(api/logic) -add_subdirectory(api/gui) # NOTE: this must always be last to appease the CMake deity of quirky install command evaluation order. -add_subdirectory(application) +add_subdirectory(launcher) diff --git a/api/gui/CMakeLists.txt b/api/gui/CMakeLists.txt deleted file mode 100644 index ad116a43d..000000000 --- a/api/gui/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -project(MultiMC_gui LANGUAGES CXX) - -set(GUI_SOURCES - DesktopServices.h - DesktopServices.cpp - - # Icons - icons/MMCIcon.h - icons/MMCIcon.cpp - icons/IconList.h - icons/IconList.cpp - - SkinUtils.cpp - SkinUtils.h -) -################################ COMPILE ################################ - -add_library(MultiMC_gui SHARED ${GUI_SOURCES}) -set_target_properties(MultiMC_gui PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1) - -generate_export_header(MultiMC_gui) - -# Link -target_link_libraries(MultiMC_gui MultiMC_iconfix MultiMC_logic Qt5::Gui) - -# Mark and export headers -target_include_directories(MultiMC_gui PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") - -# Install it -install( - TARGETS MultiMC_gui - RUNTIME DESTINATION ${LIBRARY_DEST_DIR} - LIBRARY DESTINATION ${LIBRARY_DEST_DIR} -) \ No newline at end of file diff --git a/api/gui/DesktopServices.h b/api/gui/DesktopServices.h deleted file mode 100644 index 606fa52cb..000000000 --- a/api/gui/DesktopServices.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#include -#include -#include "multimc_gui_export.h" - -/** - * This wraps around QDesktopServices and adds workarounds where needed - * Use this instead of QDesktopServices! - */ -namespace DesktopServices -{ - /** - * Open a file in whatever application is applicable - */ - MULTIMC_GUI_EXPORT bool openFile(const QString &path); - - /** - * Open a file in the specified application - */ - MULTIMC_GUI_EXPORT bool openFile(const QString &application, const QString &path, const QString & workingDirectory = QString(), qint64 *pid = 0); - - /** - * Run an application - */ - MULTIMC_GUI_EXPORT bool run(const QString &application,const QStringList &args, const QString & workingDirectory = QString(), qint64 *pid = 0); - - /** - * Open a directory - */ - MULTIMC_GUI_EXPORT bool openDirectory(const QString &path, bool ensureExists = false); - - /** - * Open the URL, most likely in a browser. Maybe. - */ - MULTIMC_GUI_EXPORT bool openUrl(const QUrl &url); -} diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt deleted file mode 100644 index 6d269714a..000000000 --- a/api/logic/CMakeLists.txt +++ /dev/null @@ -1,564 +0,0 @@ -project(MultiMC_logic) - -include (UnitTest) - -set(CORE_SOURCES - # LOGIC - Base classes and infrastructure - BaseInstaller.h - BaseInstaller.cpp - BaseVersionList.h - BaseVersionList.cpp - InstanceList.h - InstanceList.cpp - InstanceTask.h - InstanceTask.cpp - LoggedProcess.h - LoggedProcess.cpp - MessageLevel.cpp - MessageLevel.h - BaseVersion.h - BaseInstance.h - BaseInstance.cpp - NullInstance.h - MMCZip.h - MMCZip.cpp - MMCStrings.h - MMCStrings.cpp - - # Basic instance manipulation tasks (derived from InstanceTask) - InstanceCreationTask.h - InstanceCreationTask.cpp - InstanceCopyTask.h - InstanceCopyTask.cpp - InstanceImportTask.h - InstanceImportTask.cpp - - # Use tracking separate from memory management - Usable.h - - # Prefix tree where node names are strings between separators - SeparatorPrefixTree.h - - # WARNING: globals live here - Env.h - Env.cpp - - # String filters - Filter.h - Filter.cpp - - # JSON parsing helpers - Json.h - Json.cpp - - FileSystem.h - FileSystem.cpp - - Exception.h - - # 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 - - # Compression support - GZip.h - GZip.cpp - - # Command line parameter parsing - Commandline.h - Commandline.cpp - - # Version number string support - Version.h - Version.cpp - - # A Recursive file system watcher - RecursiveFileSystemWatcher.h - RecursiveFileSystemWatcher.cpp -) - -add_unit_test(FileSystem - SOURCES FileSystem_test.cpp - LIBS MultiMC_logic - DATA testdata - ) - -add_unit_test(GZip - SOURCES GZip_test.cpp - LIBS MultiMC_logic - ) - -set(PATHMATCHER_SOURCES - # Path matchers - pathmatcher/FSTreeMatcher.h - pathmatcher/IPathMatcher.h - pathmatcher/MultiMatcher.h - pathmatcher/RegexpMatcher.h -) - -set(NET_SOURCES - # network stuffs - net/ByteArraySink.h - net/ChecksumValidator.h - net/Download.cpp - net/Download.h - net/FileSink.cpp - net/FileSink.h - net/HttpMetaCache.cpp - net/HttpMetaCache.h - net/MetaCacheSink.cpp - net/MetaCacheSink.h - net/NetAction.h - net/NetJob.cpp - net/NetJob.h - net/PasteUpload.cpp - net/PasteUpload.h - net/Sink.h - net/Validator.h -) - -# Game launch logic -set(LAUNCH_SOURCES - launch/steps/LookupServerAddress.cpp - launch/steps/LookupServerAddress.h - launch/steps/PostLaunchCommand.cpp - launch/steps/PostLaunchCommand.h - launch/steps/PreLaunchCommand.cpp - launch/steps/PreLaunchCommand.h - launch/steps/TextPrint.cpp - launch/steps/TextPrint.h - launch/steps/Update.cpp - launch/steps/Update.h - launch/LaunchStep.cpp - launch/LaunchStep.h - launch/LaunchTask.cpp - launch/LaunchTask.h - launch/LogModel.cpp - launch/LogModel.h -) - -# Old update system -set(UPDATE_SOURCES - updater/GoUpdate.h - updater/GoUpdate.cpp - updater/UpdateChecker.h - updater/UpdateChecker.cpp - updater/DownloadTask.h - updater/DownloadTask.cpp -) - -add_unit_test(UpdateChecker - SOURCES updater/UpdateChecker_test.cpp - LIBS MultiMC_logic - DATA updater/testdata - ) - -add_unit_test(DownloadTask - SOURCES updater/DownloadTask_test.cpp - LIBS MultiMC_logic - DATA updater/testdata - ) - -# Rarely used notifications -set(NOTIFICATIONS_SOURCES - # Notifications - short warning messages - notifications/NotificationChecker.h - notifications/NotificationChecker.cpp -) - -# Backend for the news bar... there's usually no news. -set(NEWS_SOURCES - # News System - news/NewsChecker.h - news/NewsChecker.cpp - news/NewsEntry.h - news/NewsEntry.cpp -) - -# Icon interface -set(ICONS_SOURCES - # Icons System and related code - icons/IIconList.h - icons/IIconList.cpp - icons/IconUtils.h - icons/IconUtils.cpp -) - -# Minecraft services status checker -set(STATUS_SOURCES - # Status system - status/StatusChecker.h - status/StatusChecker.cpp -) - -# Support for Minecraft instances and launch -set(MINECRAFT_SOURCES - # Minecraft support - minecraft/auth/AuthSession.h - minecraft/auth/AuthSession.cpp - minecraft/auth/MojangAccountList.h - minecraft/auth/MojangAccountList.cpp - minecraft/auth/MojangAccount.h - minecraft/auth/MojangAccount.cpp - minecraft/auth/YggdrasilTask.h - minecraft/auth/YggdrasilTask.cpp - minecraft/auth/flows/AuthenticateTask.h - minecraft/auth/flows/AuthenticateTask.cpp - minecraft/auth/flows/RefreshTask.cpp - minecraft/auth/flows/RefreshTask.cpp - minecraft/auth/flows/ValidateTask.h - minecraft/auth/flows/ValidateTask.cpp - - minecraft/gameoptions/GameOptions.h - minecraft/gameoptions/GameOptions.cpp - - minecraft/update/AssetUpdateTask.h - minecraft/update/AssetUpdateTask.cpp - minecraft/update/FMLLibrariesTask.cpp - minecraft/update/FMLLibrariesTask.h - minecraft/update/FoldersTask.cpp - minecraft/update/FoldersTask.h - minecraft/update/LibrariesTask.cpp - minecraft/update/LibrariesTask.h - - minecraft/launch/ClaimAccount.cpp - minecraft/launch/ClaimAccount.h - minecraft/launch/CreateGameFolders.cpp - minecraft/launch/CreateGameFolders.h - minecraft/launch/ModMinecraftJar.cpp - minecraft/launch/ModMinecraftJar.h - minecraft/launch/DirectJavaLaunch.cpp - minecraft/launch/DirectJavaLaunch.h - minecraft/launch/ExtractNatives.cpp - minecraft/launch/ExtractNatives.h - minecraft/launch/LauncherPartLaunch.cpp - minecraft/launch/LauncherPartLaunch.h - minecraft/launch/MinecraftServerTarget.cpp - minecraft/launch/MinecraftServerTarget.h - minecraft/launch/PrintInstanceInfo.cpp - minecraft/launch/PrintInstanceInfo.h - minecraft/launch/ReconstructAssets.cpp - minecraft/launch/ReconstructAssets.h - minecraft/launch/ScanModFolders.cpp - minecraft/launch/ScanModFolders.h - minecraft/launch/VerifyJavaInstall.cpp - minecraft/launch/VerifyJavaInstall.h - - minecraft/legacy/LegacyModList.h - minecraft/legacy/LegacyModList.cpp - minecraft/legacy/LegacyInstance.h - minecraft/legacy/LegacyInstance.cpp - minecraft/legacy/LegacyUpgradeTask.h - minecraft/legacy/LegacyUpgradeTask.cpp - - minecraft/GradleSpecifier.h - minecraft/MinecraftInstance.cpp - minecraft/MinecraftInstance.h - minecraft/LaunchProfile.cpp - minecraft/LaunchProfile.h - minecraft/Component.cpp - minecraft/Component.h - minecraft/PackProfile.cpp - minecraft/PackProfile.h - minecraft/ComponentUpdateTask.cpp - minecraft/ComponentUpdateTask.h - minecraft/MinecraftLoadAndCheck.h - minecraft/MinecraftLoadAndCheck.cpp - minecraft/MinecraftUpdate.h - minecraft/MinecraftUpdate.cpp - minecraft/MojangVersionFormat.cpp - minecraft/MojangVersionFormat.h - minecraft/Rule.cpp - minecraft/Rule.h - minecraft/OneSixVersionFormat.cpp - minecraft/OneSixVersionFormat.h - minecraft/OpSys.cpp - minecraft/OpSys.h - minecraft/ParseUtils.cpp - minecraft/ParseUtils.h - minecraft/ProfileUtils.cpp - minecraft/ProfileUtils.h - minecraft/Library.cpp - minecraft/Library.h - minecraft/MojangDownloadInfo.h - minecraft/VersionFile.cpp - minecraft/VersionFile.h - minecraft/VersionFilterData.h - minecraft/VersionFilterData.cpp - minecraft/World.h - minecraft/World.cpp - minecraft/WorldList.h - minecraft/WorldList.cpp - - minecraft/mod/Mod.h - minecraft/mod/Mod.cpp - minecraft/mod/ModDetails.h - minecraft/mod/ModFolderModel.h - minecraft/mod/ModFolderModel.cpp - minecraft/mod/ModFolderLoadTask.h - minecraft/mod/ModFolderLoadTask.cpp - minecraft/mod/LocalModParseTask.h - minecraft/mod/LocalModParseTask.cpp - minecraft/mod/ResourcePackFolderModel.h - minecraft/mod/ResourcePackFolderModel.cpp - minecraft/mod/TexturePackFolderModel.h - minecraft/mod/TexturePackFolderModel.cpp - - # Assets - minecraft/AssetsUtils.h - minecraft/AssetsUtils.cpp - - # Minecraft services - minecraft/services/SkinUpload.cpp - minecraft/services/SkinUpload.h - minecraft/services/SkinDelete.cpp - minecraft/services/SkinDelete.h - - mojang/PackageManifest.h - mojang/PackageManifest.cpp - ) - -add_unit_test(GradleSpecifier - SOURCES minecraft/GradleSpecifier_test.cpp - LIBS MultiMC_logic - ) - -add_executable(PackageManifest - mojang/PackageManifest_test.cpp -) -target_link_libraries(PackageManifest - MultiMC_logic - Qt5::Test -) -target_include_directories(PackageManifest - PRIVATE ../../cmake/UnitTest/ -) -add_test( - NAME PackageManifest - COMMAND PackageManifest - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -) - -add_unit_test(MojangVersionFormat - SOURCES minecraft/MojangVersionFormat_test.cpp - LIBS MultiMC_logic - DATA minecraft/testdata - ) - -add_unit_test(Library - SOURCES minecraft/Library_test.cpp - LIBS MultiMC_logic - ) - -# FIXME: shares data with FileSystem test -add_unit_test(ModFolderModel - SOURCES minecraft/mod/ModFolderModel_test.cpp - DATA testdata - LIBS MultiMC_logic - ) - -add_unit_test(ParseUtils - SOURCES minecraft/ParseUtils_test.cpp - LIBS MultiMC_logic - ) - -# the screenshots feature -set(SCREENSHOTS_SOURCES - screenshots/Screenshot.h - screenshots/ImgurUpload.h - screenshots/ImgurUpload.cpp - screenshots/ImgurAlbumCreation.h - screenshots/ImgurAlbumCreation.cpp -) - -set(TASKS_SOURCES - # Tasks - tasks/Task.h - tasks/Task.cpp - tasks/SequentialTask.h - tasks/SequentialTask.cpp -) - -set(SETTINGS_SOURCES - # Settings - settings/INIFile.cpp - settings/INIFile.h - settings/INISettingsObject.cpp - settings/INISettingsObject.h - settings/OverrideSetting.cpp - settings/OverrideSetting.h - settings/PassthroughSetting.cpp - settings/PassthroughSetting.h - settings/Setting.cpp - settings/Setting.h - settings/SettingsObject.cpp - settings/SettingsObject.h -) - -add_unit_test(INIFile - SOURCES settings/INIFile_test.cpp - LIBS MultiMC_logic - ) - -set(JAVA_SOURCES - # Java related code - java/launch/CheckJava.cpp - java/launch/CheckJava.h - java/JavaChecker.h - java/JavaChecker.cpp - java/JavaCheckerJob.h - java/JavaCheckerJob.cpp - java/JavaInstall.h - java/JavaInstall.cpp - java/JavaInstallList.h - java/JavaInstallList.cpp - java/JavaUtils.h - java/JavaUtils.cpp - java/JavaVersion.h - java/JavaVersion.cpp -) - -add_unit_test(JavaVersion - SOURCES java/JavaVersion_test.cpp - LIBS MultiMC_logic - ) - -set(TRANSLATIONS_SOURCES - translations/TranslationsModel.h - translations/TranslationsModel.cpp - translations/POTranslator.h - translations/POTranslator.cpp -) - -set(TOOLS_SOURCES - # 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 -) - -set(META_SOURCES - # Metadata sources - meta/JsonFormat.cpp - meta/JsonFormat.h - meta/BaseEntity.cpp - meta/BaseEntity.h - meta/VersionList.cpp - meta/VersionList.h - meta/Version.cpp - meta/Version.h - meta/Index.cpp - meta/Index.h -) - -set(FTB_SOURCES - modplatform/legacy_ftb/PackFetchTask.h - modplatform/legacy_ftb/PackFetchTask.cpp - modplatform/legacy_ftb/PackInstallTask.h - modplatform/legacy_ftb/PackInstallTask.cpp - modplatform/legacy_ftb/PrivatePackManager.h - modplatform/legacy_ftb/PrivatePackManager.cpp - - modplatform/legacy_ftb/PackHelpers.h -) - -set(FLAME_SOURCES - # Flame - modplatform/flame/FlamePackIndex.cpp - modplatform/flame/FlamePackIndex.h - modplatform/flame/PackManifest.h - modplatform/flame/PackManifest.cpp - modplatform/flame/FileResolvingTask.h - modplatform/flame/FileResolvingTask.cpp -) - -set(MODPACKSCH_SOURCES - modplatform/modpacksch/FTBPackInstallTask.h - modplatform/modpacksch/FTBPackInstallTask.cpp - modplatform/modpacksch/FTBPackManifest.h - modplatform/modpacksch/FTBPackManifest.cpp -) - -set(TECHNIC_SOURCES - modplatform/technic/SingleZipPackInstallTask.h - modplatform/technic/SingleZipPackInstallTask.cpp - modplatform/technic/SolderPackInstallTask.h - modplatform/technic/SolderPackInstallTask.cpp - modplatform/technic/TechnicPackProcessor.h - modplatform/technic/TechnicPackProcessor.cpp -) - -set(ATLAUNCHER_SOURCES - modplatform/atlauncher/ATLPackIndex.cpp - modplatform/atlauncher/ATLPackIndex.h - modplatform/atlauncher/ATLPackInstallTask.cpp - modplatform/atlauncher/ATLPackInstallTask.h - modplatform/atlauncher/ATLPackManifest.cpp - modplatform/atlauncher/ATLPackManifest.h -) - -add_unit_test(Index - SOURCES meta/Index_test.cpp - LIBS MultiMC_logic - ) - -################################ COMPILE ################################ - -# we need zlib -find_package(ZLIB REQUIRED) - -set(LOGIC_SOURCES - ${CORE_SOURCES} - ${PATHMATCHER_SOURCES} - ${NET_SOURCES} - ${LAUNCH_SOURCES} - ${UPDATE_SOURCES} - ${NOTIFICATIONS_SOURCES} - ${NEWS_SOURCES} - ${STATUS_SOURCES} - ${MINECRAFT_SOURCES} - ${SCREENSHOTS_SOURCES} - ${TASKS_SOURCES} - ${SETTINGS_SOURCES} - ${JAVA_SOURCES} - ${TRANSLATIONS_SOURCES} - ${TOOLS_SOURCES} - ${META_SOURCES} - ${ICONS_SOURCES} - ${FTB_SOURCES} - ${FLAME_SOURCES} - ${MODPACKSCH_SOURCES} - ${TECHNIC_SOURCES} - ${ATLAUNCHER_SOURCES} -) - -add_library(MultiMC_logic SHARED ${LOGIC_SOURCES}) -set_target_properties(MultiMC_logic PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1) - -generate_export_header(MultiMC_logic) - -# Link -target_link_libraries(MultiMC_logic systeminfo MultiMC_quazip MultiMC_classparser ${NBT_NAME} ${ZLIB_LIBRARIES} optional-bare tomlc99 BuildConfig) -target_link_libraries(MultiMC_logic Qt5::Core Qt5::Xml Qt5::Network Qt5::Concurrent) - -# Mark and export headers -target_include_directories(MultiMC_logic PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" PRIVATE "${ZLIB_INCLUDE_DIRS}") - -# Install it -install( - TARGETS MultiMC_logic - RUNTIME DESTINATION ${LIBRARY_DEST_DIR} - LIBRARY DESTINATION ${LIBRARY_DEST_DIR} -) diff --git a/api/logic/MMCStrings.h b/api/logic/MMCStrings.h deleted file mode 100644 index 493ba3d2f..000000000 --- a/api/logic/MMCStrings.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include - -#include "multimc_logic_export.h" - -namespace Strings -{ - int MULTIMC_LOGIC_EXPORT naturalCompare(const QString &s1, const QString &s2, Qt::CaseSensitivity cs); -} diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt deleted file mode 100644 index ab2b99604..000000000 --- a/application/CMakeLists.txt +++ /dev/null @@ -1,417 +0,0 @@ -project(application) - -################################ FILES ################################ - -######## Sources and headers ######## -SET(MULTIMC_SOURCES - # Application base - main.cpp - MultiMC.h - MultiMC.cpp - UpdateController.cpp - UpdateController.h - - # GUI - general utilities - GuiUtil.h - GuiUtil.cpp - ColumnResizer.h - ColumnResizer.cpp - InstanceProxyModel.h - InstanceProxyModel.cpp - VersionProxyModel.h - VersionProxyModel.cpp - ColorCache.h - ColorCache.cpp - HoeDown.h - - # Super secret! - KonamiCode.h - KonamiCode.cpp - - # GUI - windows - MainWindow.h - MainWindow.cpp - InstanceWindow.h - InstanceWindow.cpp - - # GUI - setup wizard - setupwizard/SetupWizard.h - setupwizard/SetupWizard.cpp - setupwizard/AnalyticsWizardPage.cpp - setupwizard/AnalyticsWizardPage.h - setupwizard/BaseWizardPage.h - setupwizard/JavaWizardPage.cpp - setupwizard/JavaWizardPage.h - setupwizard/LanguageWizardPage.cpp - setupwizard/LanguageWizardPage.h - - # GUI - themes - themes/FusionTheme.cpp - themes/FusionTheme.h - themes/BrightTheme.cpp - themes/BrightTheme.h - themes/CustomTheme.cpp - themes/CustomTheme.h - themes/DarkTheme.cpp - themes/DarkTheme.h - themes/ITheme.cpp - themes/ITheme.h - themes/SystemTheme.cpp - themes/SystemTheme.h - - # Processes - LaunchController.h - LaunchController.cpp - - # page provider for instances - InstancePageProvider.h - - # Common java checking UI - JavaCommon.h - JavaCommon.cpp - - # GUI - paged dialog base - pages/BasePage.h - pages/BasePageContainer.h - pages/BasePageProvider.h - - # GUI - instance pages - pages/instance/GameOptionsPage.cpp - pages/instance/GameOptionsPage.h - pages/instance/VersionPage.cpp - pages/instance/VersionPage.h - pages/instance/TexturePackPage.h - pages/instance/ResourcePackPage.h - pages/instance/ModFolderPage.cpp - pages/instance/ModFolderPage.h - pages/instance/NotesPage.cpp - pages/instance/NotesPage.h - pages/instance/LogPage.cpp - pages/instance/LogPage.h - pages/instance/InstanceSettingsPage.cpp - pages/instance/InstanceSettingsPage.h - pages/instance/ScreenshotsPage.cpp - pages/instance/ScreenshotsPage.h - pages/instance/OtherLogsPage.cpp - pages/instance/OtherLogsPage.h - pages/instance/ServersPage.cpp - pages/instance/ServersPage.h - pages/instance/LegacyUpgradePage.cpp - pages/instance/LegacyUpgradePage.h - pages/instance/WorldListPage.cpp - pages/instance/WorldListPage.h - - # GUI - global settings pages - pages/global/AccountListPage.cpp - pages/global/AccountListPage.h - pages/global/CustomCommandsPage.cpp - pages/global/CustomCommandsPage.h - pages/global/ExternalToolsPage.cpp - pages/global/ExternalToolsPage.h - pages/global/JavaPage.cpp - pages/global/JavaPage.h - pages/global/LanguagePage.cpp - pages/global/LanguagePage.h - pages/global/MinecraftPage.cpp - pages/global/MinecraftPage.h - pages/global/MultiMCPage.cpp - pages/global/MultiMCPage.h - pages/global/ProxyPage.cpp - pages/global/ProxyPage.h - pages/global/PasteEEPage.cpp - pages/global/PasteEEPage.h - - # GUI - platform pages - pages/modplatform/VanillaPage.cpp - pages/modplatform/VanillaPage.h - - pages/modplatform/atlauncher/AtlFilterModel.cpp - pages/modplatform/atlauncher/AtlFilterModel.h - pages/modplatform/atlauncher/AtlListModel.cpp - pages/modplatform/atlauncher/AtlListModel.h - pages/modplatform/atlauncher/AtlOptionalModDialog.cpp - pages/modplatform/atlauncher/AtlOptionalModDialog.h - pages/modplatform/atlauncher/AtlPage.cpp - pages/modplatform/atlauncher/AtlPage.h - - pages/modplatform/ftb/FtbFilterModel.cpp - pages/modplatform/ftb/FtbFilterModel.h - pages/modplatform/ftb/FtbListModel.cpp - pages/modplatform/ftb/FtbListModel.h - pages/modplatform/ftb/FtbPage.cpp - pages/modplatform/ftb/FtbPage.h - - pages/modplatform/legacy_ftb/Page.cpp - pages/modplatform/legacy_ftb/Page.h - pages/modplatform/legacy_ftb/ListModel.h - pages/modplatform/legacy_ftb/ListModel.cpp - - pages/modplatform/flame/FlameModel.cpp - pages/modplatform/flame/FlameModel.h - pages/modplatform/flame/FlamePage.cpp - pages/modplatform/flame/FlamePage.h - - pages/modplatform/technic/TechnicModel.cpp - pages/modplatform/technic/TechnicModel.h - pages/modplatform/technic/TechnicPage.cpp - pages/modplatform/technic/TechnicPage.h - - pages/modplatform/ImportPage.cpp - pages/modplatform/ImportPage.h - - # GUI - dialogs - dialogs/AboutDialog.cpp - dialogs/AboutDialog.h - dialogs/ProfileSelectDialog.cpp - dialogs/ProfileSelectDialog.h - dialogs/CopyInstanceDialog.cpp - dialogs/CopyInstanceDialog.h - dialogs/CustomMessageBox.cpp - dialogs/CustomMessageBox.h - dialogs/EditAccountDialog.cpp - dialogs/EditAccountDialog.h - dialogs/ExportInstanceDialog.cpp - dialogs/ExportInstanceDialog.h - dialogs/IconPickerDialog.cpp - dialogs/IconPickerDialog.h - dialogs/LoginDialog.cpp - dialogs/LoginDialog.h - dialogs/NewComponentDialog.cpp - dialogs/NewComponentDialog.h - dialogs/NewInstanceDialog.cpp - dialogs/NewInstanceDialog.h - dialogs/NotificationDialog.cpp - dialogs/NotificationDialog.h - pagedialog/PageDialog.cpp - pagedialog/PageDialog.h - dialogs/ProgressDialog.cpp - dialogs/ProgressDialog.h - dialogs/UpdateDialog.cpp - dialogs/UpdateDialog.h - dialogs/VersionSelectDialog.cpp - dialogs/VersionSelectDialog.h - dialogs/SkinUploadDialog.cpp - dialogs/SkinUploadDialog.h - - - # GUI - widgets - widgets/Common.cpp - widgets/Common.h - widgets/CustomCommands.cpp - widgets/CustomCommands.h - widgets/DropLabel.cpp - widgets/DropLabel.h - widgets/FocusLineEdit.cpp - widgets/FocusLineEdit.h - widgets/IconLabel.cpp - widgets/IconLabel.h - widgets/JavaSettingsWidget.cpp - widgets/JavaSettingsWidget.h - widgets/LabeledToolButton.cpp - widgets/LabeledToolButton.h - widgets/LanguageSelectionWidget.cpp - widgets/LanguageSelectionWidget.h - widgets/LineSeparator.cpp - widgets/LineSeparator.h - widgets/LogView.cpp - widgets/LogView.h - widgets/MCModInfoFrame.cpp - widgets/MCModInfoFrame.h - widgets/ModListView.cpp - widgets/ModListView.h - widgets/PageContainer.cpp - widgets/PageContainer.h - widgets/PageContainer_p.h - widgets/ServerStatus.cpp - widgets/ServerStatus.h - widgets/VersionListView.cpp - widgets/VersionListView.h - widgets/VersionSelectWidget.cpp - widgets/VersionSelectWidget.h - widgets/ProgressWidget.h - widgets/ProgressWidget.cpp - widgets/WideBar.h - widgets/WideBar.cpp - - # GUI - instance group view - groupview/GroupedProxyModel.cpp - groupview/GroupedProxyModel.h - groupview/AccessibleGroupView.cpp - groupview/AccessibleGroupView.h - groupview/AccessibleGroupView_p.h - groupview/GroupView.cpp - groupview/GroupView.h - groupview/InstanceDelegate.cpp - groupview/InstanceDelegate.h - groupview/VisualGroup.cpp - groupview/VisualGroup.h - ) - -######## UIs ######## -SET(MULTIMC_UIS - # Instance pages - pages/instance/GameOptionsPage.ui - pages/instance/VersionPage.ui - pages/instance/ModFolderPage.ui - pages/instance/LogPage.ui - pages/instance/InstanceSettingsPage.ui - pages/instance/NotesPage.ui - pages/instance/ScreenshotsPage.ui - pages/instance/OtherLogsPage.ui - pages/instance/LegacyUpgradePage.ui - pages/instance/ServersPage.ui - pages/instance/WorldListPage.ui - - # Global settings pages - pages/global/AccountListPage.ui - pages/global/ExternalToolsPage.ui - pages/global/JavaPage.ui - pages/global/MinecraftPage.ui - pages/global/MultiMCPage.ui - pages/global/ProxyPage.ui - pages/global/PasteEEPage.ui - - # Platform pages - pages/modplatform/VanillaPage.ui - pages/modplatform/atlauncher/AtlPage.ui - pages/modplatform/ftb/FtbPage.ui - pages/modplatform/legacy_ftb/Page.ui - pages/modplatform/flame/FlamePage.ui - pages/modplatform/technic/TechnicPage.ui - pages/modplatform/ImportPage.ui - - # Platform Dialogs - pages/modplatform/atlauncher/AtlOptionalModDialog.ui - - # Dialogs - dialogs/CopyInstanceDialog.ui - dialogs/NewComponentDialog.ui - dialogs/NewInstanceDialog.ui - dialogs/AboutDialog.ui - dialogs/ProgressDialog.ui - dialogs/IconPickerDialog.ui - dialogs/ProfileSelectDialog.ui - dialogs/EditAccountDialog.ui - dialogs/ExportInstanceDialog.ui - dialogs/LoginDialog.ui - dialogs/UpdateDialog.ui - dialogs/NotificationDialog.ui - dialogs/SkinUploadDialog.ui - - # Widgets/other - widgets/CustomCommands.ui - widgets/MCModInfoFrame.ui -) - -set(MULTIMC_QRCS - resources/backgrounds/backgrounds.qrc - resources/multimc/multimc.qrc - resources/pe_dark/pe_dark.qrc - resources/pe_light/pe_light.qrc - resources/pe_colored/pe_colored.qrc - resources/pe_blue/pe_blue.qrc - resources/OSX/OSX.qrc - resources/iOS/iOS.qrc - resources/flat/flat.qrc - resources/documents/documents.qrc -) - -######## Windows resource files ######## -if(WIN32) - set(MULTIMC_RCS resources/multimc.rc) -endif() - -# Qt 5 stuff -qt5_wrap_ui(MULTIMC_UI ${MULTIMC_UIS}) -qt5_add_resources(MULTIMC_RESOURCES ${MULTIMC_QRCS}) - -# Add executable -add_executable(MultiMC MACOSX_BUNDLE WIN32 ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES} ${MULTIMC_RCS}) -target_link_libraries(MultiMC MultiMC_gui ${QUAZIP_LIBRARIES} hoedown MultiMC_rainbow LocalPeer ganalytics) -if(DEFINED MultiMC_APP_BINARY_NAME) - set_target_properties(MultiMC PROPERTIES OUTPUT_NAME "${MultiMC_APP_BINARY_NAME}") -endif() -if(DEFINED MultiMC_BINARY_RPATH) - SET_TARGET_PROPERTIES(MultiMC PROPERTIES INSTALL_RPATH "${MultiMC_BINARY_RPATH}") -endif() -if(DEFINED MultiMC_APP_BINARY_DEFS) - target_compile_definitions(MultiMC PRIVATE ${MultiMC_APP_BINARY_DEFS}) -endif() - -install(TARGETS MultiMC - BUNDLE DESTINATION ${BUNDLE_DEST_DIR} COMPONENT Runtime - LIBRARY DESTINATION ${LIBRARY_DEST_DIR} COMPONENT Runtime - RUNTIME DESTINATION ${BINARY_DEST_DIR} COMPONENT Runtime -) - -#### The MultiMC bundle mess! #### -# Bundle utilities are used to complete the portable packages - they add all the libraries that would otherwise be missing on the target system. -# NOTE: it seems that this absolutely has to be here, and nowhere else. -if(INSTALL_BUNDLE STREQUAL "full") - # Add qt.conf - this makes Qt stop looking for things outside the bundle - install( - CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${RESOURCES_DEST_DIR}/qt.conf\" \" \")" - COMPONENT Runtime - ) - # Bundle plugins - if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") - # Image formats - install( - DIRECTORY "${QT_PLUGINS_DIR}/imageformats" - DESTINATION ${PLUGIN_DEST_DIR} - COMPONENT Runtime - REGEX "tga|tiff|mng|webp" EXCLUDE - ) - # Icon engines - install( - DIRECTORY "${QT_PLUGINS_DIR}/iconengines" - DESTINATION ${PLUGIN_DEST_DIR} - COMPONENT Runtime - REGEX "fontawesome" EXCLUDE - ) - # Platform plugins - install( - DIRECTORY "${QT_PLUGINS_DIR}/platforms" - DESTINATION ${PLUGIN_DEST_DIR} - COMPONENT Runtime - REGEX "minimal|linuxfb|offscreen" EXCLUDE - ) - else() - # Image formats - install( - DIRECTORY "${QT_PLUGINS_DIR}/imageformats" - DESTINATION ${PLUGIN_DEST_DIR} - COMPONENT Runtime - REGEX "tga|tiff|mng|webp" EXCLUDE - REGEX "d\\." EXCLUDE - REGEX "_debug\\." EXCLUDE - REGEX "\\.dSYM" EXCLUDE - ) - # Icon engines - install( - DIRECTORY "${QT_PLUGINS_DIR}/iconengines" - DESTINATION ${PLUGIN_DEST_DIR} - COMPONENT Runtime - REGEX "fontawesome" EXCLUDE - REGEX "d\\." EXCLUDE - REGEX "_debug\\." EXCLUDE - REGEX "\\.dSYM" EXCLUDE - ) - # Platform plugins - install( - DIRECTORY "${QT_PLUGINS_DIR}/platforms" - DESTINATION ${PLUGIN_DEST_DIR} - COMPONENT Runtime - REGEX "minimal|linuxfb|offscreen" EXCLUDE - REGEX "d\\." EXCLUDE - REGEX "_debug\\." EXCLUDE - REGEX "\\.dSYM" EXCLUDE - ) - endif() - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" - @ONLY - ) - install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" COMPONENT Runtime) -endif() diff --git a/api/logic/BaseInstaller.cpp b/launcher/BaseInstaller.cpp similarity index 100% rename from api/logic/BaseInstaller.cpp rename to launcher/BaseInstaller.cpp diff --git a/api/logic/BaseInstaller.h b/launcher/BaseInstaller.h similarity index 94% rename from api/logic/BaseInstaller.h rename to launcher/BaseInstaller.h index 3e40b3554..b2e6a14d6 100644 --- a/api/logic/BaseInstaller.h +++ b/launcher/BaseInstaller.h @@ -17,8 +17,6 @@ #include -#include "multimc_logic_export.h" - class MinecraftInstance; class QDir; class QString; @@ -27,7 +25,7 @@ class Task; class BaseVersion; typedef std::shared_ptr BaseVersionPtr; -class MULTIMC_LOGIC_EXPORT BaseInstaller +class BaseInstaller { public: BaseInstaller(); diff --git a/api/logic/BaseInstance.cpp b/launcher/BaseInstance.cpp similarity index 100% rename from api/logic/BaseInstance.cpp rename to launcher/BaseInstance.cpp diff --git a/api/logic/BaseInstance.h b/launcher/BaseInstance.h similarity index 98% rename from api/logic/BaseInstance.h rename to launcher/BaseInstance.h index d250e03e0..833646c05 100644 --- a/api/logic/BaseInstance.h +++ b/launcher/BaseInstance.h @@ -32,8 +32,6 @@ #include "net/Mode.h" -#include "multimc_logic_export.h" - #include "minecraft/launch/MinecraftServerTarget.h" class QDir; @@ -52,7 +50,7 @@ typedef std::shared_ptr InstancePtr; * 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 +class BaseInstance : public QObject, public std::enable_shared_from_this { Q_OBJECT protected: diff --git a/api/logic/BaseVersion.h b/launcher/BaseVersion.h similarity index 100% rename from api/logic/BaseVersion.h rename to launcher/BaseVersion.h diff --git a/api/logic/BaseVersionList.cpp b/launcher/BaseVersionList.cpp similarity index 100% rename from api/logic/BaseVersionList.cpp rename to launcher/BaseVersionList.cpp diff --git a/api/logic/BaseVersionList.h b/launcher/BaseVersionList.h similarity index 97% rename from api/logic/BaseVersionList.h rename to launcher/BaseVersionList.h index 29e21bdb1..ce7abce19 100644 --- a/api/logic/BaseVersionList.h +++ b/launcher/BaseVersionList.h @@ -21,7 +21,6 @@ #include "BaseVersion.h" #include "tasks/Task.h" -#include "multimc_logic_export.h" #include "QObjectPtr.h" /*! @@ -36,7 +35,7 @@ * all have a default implementation, but they can be overridden by plugins to * change the behavior of the list. */ -class MULTIMC_LOGIC_EXPORT BaseVersionList : public QAbstractListModel +class BaseVersionList : public QAbstractListModel { Q_OBJECT public: diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt new file mode 100644 index 000000000..e3ef5039a --- /dev/null +++ b/launcher/CMakeLists.txt @@ -0,0 +1,1001 @@ +project(application) + +################################ FILES ################################ + +######## Sources and headers ######## + +include (UnitTest) + +set(CORE_SOURCES + # LOGIC - Base classes and infrastructure + BaseInstaller.h + BaseInstaller.cpp + BaseVersionList.h + BaseVersionList.cpp + InstanceList.h + InstanceList.cpp + InstanceTask.h + InstanceTask.cpp + LoggedProcess.h + LoggedProcess.cpp + MessageLevel.cpp + MessageLevel.h + BaseVersion.h + BaseInstance.h + BaseInstance.cpp + NullInstance.h + MMCZip.h + MMCZip.cpp + MMCStrings.h + MMCStrings.cpp + + # Basic instance manipulation tasks (derived from InstanceTask) + InstanceCreationTask.h + InstanceCreationTask.cpp + InstanceCopyTask.h + InstanceCopyTask.cpp + InstanceImportTask.h + InstanceImportTask.cpp + + # Use tracking separate from memory management + Usable.h + + # Prefix tree where node names are strings between separators + SeparatorPrefixTree.h + + # WARNING: globals live here + Env.h + Env.cpp + + # String filters + Filter.h + Filter.cpp + + # JSON parsing helpers + Json.h + Json.cpp + + FileSystem.h + FileSystem.cpp + + Exception.h + + # 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 + + # Compression support + GZip.h + GZip.cpp + + # Command line parameter parsing + Commandline.h + Commandline.cpp + + # Version number string support + Version.h + Version.cpp + + # A Recursive file system watcher + RecursiveFileSystemWatcher.h + RecursiveFileSystemWatcher.cpp +) + +add_unit_test(FileSystem + SOURCES FileSystem_test.cpp + LIBS MultiMC_logic + DATA testdata + ) + +add_unit_test(GZip + SOURCES GZip_test.cpp + LIBS MultiMC_logic + ) + +set(PATHMATCHER_SOURCES + # Path matchers + pathmatcher/FSTreeMatcher.h + pathmatcher/IPathMatcher.h + pathmatcher/MultiMatcher.h + pathmatcher/RegexpMatcher.h +) + +set(NET_SOURCES + # network stuffs + net/ByteArraySink.h + net/ChecksumValidator.h + net/Download.cpp + net/Download.h + net/FileSink.cpp + net/FileSink.h + net/HttpMetaCache.cpp + net/HttpMetaCache.h + net/MetaCacheSink.cpp + net/MetaCacheSink.h + net/NetAction.h + net/NetJob.cpp + net/NetJob.h + net/PasteUpload.cpp + net/PasteUpload.h + net/Sink.h + net/Validator.h +) + +# Game launch logic +set(LAUNCH_SOURCES + launch/steps/LookupServerAddress.cpp + launch/steps/LookupServerAddress.h + launch/steps/PostLaunchCommand.cpp + launch/steps/PostLaunchCommand.h + launch/steps/PreLaunchCommand.cpp + launch/steps/PreLaunchCommand.h + launch/steps/TextPrint.cpp + launch/steps/TextPrint.h + launch/steps/Update.cpp + launch/steps/Update.h + launch/LaunchStep.cpp + launch/LaunchStep.h + launch/LaunchTask.cpp + launch/LaunchTask.h + launch/LogModel.cpp + launch/LogModel.h +) + +# Old update system +set(UPDATE_SOURCES + updater/GoUpdate.h + updater/GoUpdate.cpp + updater/UpdateChecker.h + updater/UpdateChecker.cpp + updater/DownloadTask.h + updater/DownloadTask.cpp +) + +add_unit_test(UpdateChecker + SOURCES updater/UpdateChecker_test.cpp + LIBS MultiMC_logic + DATA updater/testdata + ) + +add_unit_test(DownloadTask + SOURCES updater/DownloadTask_test.cpp + LIBS MultiMC_logic + DATA updater/testdata + ) + +# Rarely used notifications +set(NOTIFICATIONS_SOURCES + # Notifications - short warning messages + notifications/NotificationChecker.h + notifications/NotificationChecker.cpp +) + +# Backend for the news bar... there's usually no news. +set(NEWS_SOURCES + # News System + news/NewsChecker.h + news/NewsChecker.cpp + news/NewsEntry.h + news/NewsEntry.cpp +) + +# Icon interface +set(ICONS_SOURCES + # Icons System and related code + icons/IIconList.h + icons/IIconList.cpp + icons/IconUtils.h + icons/IconUtils.cpp +) + +# Minecraft services status checker +set(STATUS_SOURCES + # Status system + status/StatusChecker.h + status/StatusChecker.cpp +) + +# Support for Minecraft instances and launch +set(MINECRAFT_SOURCES + # Minecraft support + minecraft/auth/AuthSession.h + minecraft/auth/AuthSession.cpp + minecraft/auth/MojangAccountList.h + minecraft/auth/MojangAccountList.cpp + minecraft/auth/MojangAccount.h + minecraft/auth/MojangAccount.cpp + minecraft/auth/YggdrasilTask.h + minecraft/auth/YggdrasilTask.cpp + minecraft/auth/flows/AuthenticateTask.h + minecraft/auth/flows/AuthenticateTask.cpp + minecraft/auth/flows/RefreshTask.cpp + minecraft/auth/flows/RefreshTask.cpp + minecraft/auth/flows/ValidateTask.h + minecraft/auth/flows/ValidateTask.cpp + + minecraft/gameoptions/GameOptions.h + minecraft/gameoptions/GameOptions.cpp + + minecraft/update/AssetUpdateTask.h + minecraft/update/AssetUpdateTask.cpp + minecraft/update/FMLLibrariesTask.cpp + minecraft/update/FMLLibrariesTask.h + minecraft/update/FoldersTask.cpp + minecraft/update/FoldersTask.h + minecraft/update/LibrariesTask.cpp + minecraft/update/LibrariesTask.h + + minecraft/launch/ClaimAccount.cpp + minecraft/launch/ClaimAccount.h + minecraft/launch/CreateGameFolders.cpp + minecraft/launch/CreateGameFolders.h + minecraft/launch/ModMinecraftJar.cpp + minecraft/launch/ModMinecraftJar.h + minecraft/launch/DirectJavaLaunch.cpp + minecraft/launch/DirectJavaLaunch.h + minecraft/launch/ExtractNatives.cpp + minecraft/launch/ExtractNatives.h + minecraft/launch/LauncherPartLaunch.cpp + minecraft/launch/LauncherPartLaunch.h + minecraft/launch/MinecraftServerTarget.cpp + minecraft/launch/MinecraftServerTarget.h + minecraft/launch/PrintInstanceInfo.cpp + minecraft/launch/PrintInstanceInfo.h + minecraft/launch/ReconstructAssets.cpp + minecraft/launch/ReconstructAssets.h + minecraft/launch/ScanModFolders.cpp + minecraft/launch/ScanModFolders.h + minecraft/launch/VerifyJavaInstall.cpp + minecraft/launch/VerifyJavaInstall.h + + minecraft/legacy/LegacyModList.h + minecraft/legacy/LegacyModList.cpp + minecraft/legacy/LegacyInstance.h + minecraft/legacy/LegacyInstance.cpp + minecraft/legacy/LegacyUpgradeTask.h + minecraft/legacy/LegacyUpgradeTask.cpp + + minecraft/GradleSpecifier.h + minecraft/MinecraftInstance.cpp + minecraft/MinecraftInstance.h + minecraft/LaunchProfile.cpp + minecraft/LaunchProfile.h + minecraft/Component.cpp + minecraft/Component.h + minecraft/PackProfile.cpp + minecraft/PackProfile.h + minecraft/ComponentUpdateTask.cpp + minecraft/ComponentUpdateTask.h + minecraft/MinecraftLoadAndCheck.h + minecraft/MinecraftLoadAndCheck.cpp + minecraft/MinecraftUpdate.h + minecraft/MinecraftUpdate.cpp + minecraft/MojangVersionFormat.cpp + minecraft/MojangVersionFormat.h + minecraft/Rule.cpp + minecraft/Rule.h + minecraft/OneSixVersionFormat.cpp + minecraft/OneSixVersionFormat.h + minecraft/OpSys.cpp + minecraft/OpSys.h + minecraft/ParseUtils.cpp + minecraft/ParseUtils.h + minecraft/ProfileUtils.cpp + minecraft/ProfileUtils.h + minecraft/Library.cpp + minecraft/Library.h + minecraft/MojangDownloadInfo.h + minecraft/VersionFile.cpp + minecraft/VersionFile.h + minecraft/VersionFilterData.h + minecraft/VersionFilterData.cpp + minecraft/World.h + minecraft/World.cpp + minecraft/WorldList.h + minecraft/WorldList.cpp + + minecraft/mod/Mod.h + minecraft/mod/Mod.cpp + minecraft/mod/ModDetails.h + minecraft/mod/ModFolderModel.h + minecraft/mod/ModFolderModel.cpp + minecraft/mod/ModFolderLoadTask.h + minecraft/mod/ModFolderLoadTask.cpp + minecraft/mod/LocalModParseTask.h + minecraft/mod/LocalModParseTask.cpp + minecraft/mod/ResourcePackFolderModel.h + minecraft/mod/ResourcePackFolderModel.cpp + minecraft/mod/TexturePackFolderModel.h + minecraft/mod/TexturePackFolderModel.cpp + + # Assets + minecraft/AssetsUtils.h + minecraft/AssetsUtils.cpp + + # Minecraft services + minecraft/services/SkinUpload.cpp + minecraft/services/SkinUpload.h + minecraft/services/SkinDelete.cpp + minecraft/services/SkinDelete.h + + mojang/PackageManifest.h + mojang/PackageManifest.cpp + ) + +add_unit_test(GradleSpecifier + SOURCES minecraft/GradleSpecifier_test.cpp + LIBS MultiMC_logic + ) + +add_executable(PackageManifest + mojang/PackageManifest_test.cpp +) +target_link_libraries(PackageManifest + MultiMC_logic + Qt5::Test +) +target_include_directories(PackageManifest + PRIVATE ../cmake/UnitTest/ +) +add_test( + NAME PackageManifest + COMMAND PackageManifest + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +) + +add_unit_test(MojangVersionFormat + SOURCES minecraft/MojangVersionFormat_test.cpp + LIBS MultiMC_logic + DATA minecraft/testdata + ) + +add_unit_test(Library + SOURCES minecraft/Library_test.cpp + LIBS MultiMC_logic + ) + +# FIXME: shares data with FileSystem test +add_unit_test(ModFolderModel + SOURCES minecraft/mod/ModFolderModel_test.cpp + DATA testdata + LIBS MultiMC_logic + ) + +add_unit_test(ParseUtils + SOURCES minecraft/ParseUtils_test.cpp + LIBS MultiMC_logic + ) + +# the screenshots feature +set(SCREENSHOTS_SOURCES + screenshots/Screenshot.h + screenshots/ImgurUpload.h + screenshots/ImgurUpload.cpp + screenshots/ImgurAlbumCreation.h + screenshots/ImgurAlbumCreation.cpp +) + +set(TASKS_SOURCES + # Tasks + tasks/Task.h + tasks/Task.cpp + tasks/SequentialTask.h + tasks/SequentialTask.cpp +) + +set(SETTINGS_SOURCES + # Settings + settings/INIFile.cpp + settings/INIFile.h + settings/INISettingsObject.cpp + settings/INISettingsObject.h + settings/OverrideSetting.cpp + settings/OverrideSetting.h + settings/PassthroughSetting.cpp + settings/PassthroughSetting.h + settings/Setting.cpp + settings/Setting.h + settings/SettingsObject.cpp + settings/SettingsObject.h +) + +add_unit_test(INIFile + SOURCES settings/INIFile_test.cpp + LIBS MultiMC_logic + ) + +set(JAVA_SOURCES + # Java related code + java/launch/CheckJava.cpp + java/launch/CheckJava.h + java/JavaChecker.h + java/JavaChecker.cpp + java/JavaCheckerJob.h + java/JavaCheckerJob.cpp + java/JavaInstall.h + java/JavaInstall.cpp + java/JavaInstallList.h + java/JavaInstallList.cpp + java/JavaUtils.h + java/JavaUtils.cpp + java/JavaVersion.h + java/JavaVersion.cpp +) + +add_unit_test(JavaVersion + SOURCES java/JavaVersion_test.cpp + LIBS MultiMC_logic + ) + +set(TRANSLATIONS_SOURCES + translations/TranslationsModel.h + translations/TranslationsModel.cpp + translations/POTranslator.h + translations/POTranslator.cpp +) + +set(TOOLS_SOURCES + # 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 +) + +set(META_SOURCES + # Metadata sources + meta/JsonFormat.cpp + meta/JsonFormat.h + meta/BaseEntity.cpp + meta/BaseEntity.h + meta/VersionList.cpp + meta/VersionList.h + meta/Version.cpp + meta/Version.h + meta/Index.cpp + meta/Index.h +) + +set(FTB_SOURCES + modplatform/legacy_ftb/PackFetchTask.h + modplatform/legacy_ftb/PackFetchTask.cpp + modplatform/legacy_ftb/PackInstallTask.h + modplatform/legacy_ftb/PackInstallTask.cpp + modplatform/legacy_ftb/PrivatePackManager.h + modplatform/legacy_ftb/PrivatePackManager.cpp + + modplatform/legacy_ftb/PackHelpers.h +) + +set(FLAME_SOURCES + # Flame + modplatform/flame/FlamePackIndex.cpp + modplatform/flame/FlamePackIndex.h + modplatform/flame/PackManifest.h + modplatform/flame/PackManifest.cpp + modplatform/flame/FileResolvingTask.h + modplatform/flame/FileResolvingTask.cpp +) + +set(MODPACKSCH_SOURCES + modplatform/modpacksch/FTBPackInstallTask.h + modplatform/modpacksch/FTBPackInstallTask.cpp + modplatform/modpacksch/FTBPackManifest.h + modplatform/modpacksch/FTBPackManifest.cpp +) + +set(TECHNIC_SOURCES + modplatform/technic/SingleZipPackInstallTask.h + modplatform/technic/SingleZipPackInstallTask.cpp + modplatform/technic/SolderPackInstallTask.h + modplatform/technic/SolderPackInstallTask.cpp + modplatform/technic/TechnicPackProcessor.h + modplatform/technic/TechnicPackProcessor.cpp +) + +set(ATLAUNCHER_SOURCES + modplatform/atlauncher/ATLPackIndex.cpp + modplatform/atlauncher/ATLPackIndex.h + modplatform/atlauncher/ATLPackInstallTask.cpp + modplatform/atlauncher/ATLPackInstallTask.h + modplatform/atlauncher/ATLPackManifest.cpp + modplatform/atlauncher/ATLPackManifest.h +) + +add_unit_test(Index + SOURCES meta/Index_test.cpp + LIBS MultiMC_logic + ) + +################################ COMPILE ################################ + +# we need zlib +find_package(ZLIB REQUIRED) + +set(LOGIC_SOURCES + ${CORE_SOURCES} + ${PATHMATCHER_SOURCES} + ${NET_SOURCES} + ${LAUNCH_SOURCES} + ${UPDATE_SOURCES} + ${NOTIFICATIONS_SOURCES} + ${NEWS_SOURCES} + ${STATUS_SOURCES} + ${MINECRAFT_SOURCES} + ${SCREENSHOTS_SOURCES} + ${TASKS_SOURCES} + ${SETTINGS_SOURCES} + ${JAVA_SOURCES} + ${TRANSLATIONS_SOURCES} + ${TOOLS_SOURCES} + ${META_SOURCES} + ${ICONS_SOURCES} + ${FTB_SOURCES} + ${FLAME_SOURCES} + ${MODPACKSCH_SOURCES} + ${TECHNIC_SOURCES} + ${ATLAUNCHER_SOURCES} +) + +SET(MULTIMC_SOURCES + # Application base + MultiMC.h + MultiMC.cpp + UpdateController.cpp + UpdateController.h + + # GUI - general utilities + DesktopServices.h + DesktopServices.cpp + GuiUtil.h + GuiUtil.cpp + ColumnResizer.h + ColumnResizer.cpp + InstanceProxyModel.h + InstanceProxyModel.cpp + VersionProxyModel.h + VersionProxyModel.cpp + ColorCache.h + ColorCache.cpp + HoeDown.h + + # Super secret! + KonamiCode.h + KonamiCode.cpp + + # Icons + icons/MMCIcon.h + icons/MMCIcon.cpp + icons/IconList.h + icons/IconList.cpp + + # GUI - windows + MainWindow.h + MainWindow.cpp + InstanceWindow.h + InstanceWindow.cpp + + # FIXME: maybe find a better home for this. + SkinUtils.cpp + SkinUtils.h + + # GUI - setup wizard + setupwizard/SetupWizard.h + setupwizard/SetupWizard.cpp + setupwizard/AnalyticsWizardPage.cpp + setupwizard/AnalyticsWizardPage.h + setupwizard/BaseWizardPage.h + setupwizard/JavaWizardPage.cpp + setupwizard/JavaWizardPage.h + setupwizard/LanguageWizardPage.cpp + setupwizard/LanguageWizardPage.h + + # GUI - themes + themes/FusionTheme.cpp + themes/FusionTheme.h + themes/BrightTheme.cpp + themes/BrightTheme.h + themes/CustomTheme.cpp + themes/CustomTheme.h + themes/DarkTheme.cpp + themes/DarkTheme.h + themes/ITheme.cpp + themes/ITheme.h + themes/SystemTheme.cpp + themes/SystemTheme.h + + # Processes + LaunchController.h + LaunchController.cpp + + # page provider for instances + InstancePageProvider.h + + # Common java checking UI + JavaCommon.h + JavaCommon.cpp + + # GUI - paged dialog base + pages/BasePage.h + pages/BasePageContainer.h + pages/BasePageProvider.h + + # GUI - instance pages + pages/instance/GameOptionsPage.cpp + pages/instance/GameOptionsPage.h + pages/instance/VersionPage.cpp + pages/instance/VersionPage.h + pages/instance/TexturePackPage.h + pages/instance/ResourcePackPage.h + pages/instance/ModFolderPage.cpp + pages/instance/ModFolderPage.h + pages/instance/NotesPage.cpp + pages/instance/NotesPage.h + pages/instance/LogPage.cpp + pages/instance/LogPage.h + pages/instance/InstanceSettingsPage.cpp + pages/instance/InstanceSettingsPage.h + pages/instance/ScreenshotsPage.cpp + pages/instance/ScreenshotsPage.h + pages/instance/OtherLogsPage.cpp + pages/instance/OtherLogsPage.h + pages/instance/ServersPage.cpp + pages/instance/ServersPage.h + pages/instance/LegacyUpgradePage.cpp + pages/instance/LegacyUpgradePage.h + pages/instance/WorldListPage.cpp + pages/instance/WorldListPage.h + + # GUI - global settings pages + pages/global/AccountListPage.cpp + pages/global/AccountListPage.h + pages/global/CustomCommandsPage.cpp + pages/global/CustomCommandsPage.h + pages/global/ExternalToolsPage.cpp + pages/global/ExternalToolsPage.h + pages/global/JavaPage.cpp + pages/global/JavaPage.h + pages/global/LanguagePage.cpp + pages/global/LanguagePage.h + pages/global/MinecraftPage.cpp + pages/global/MinecraftPage.h + pages/global/MultiMCPage.cpp + pages/global/MultiMCPage.h + pages/global/ProxyPage.cpp + pages/global/ProxyPage.h + pages/global/PasteEEPage.cpp + pages/global/PasteEEPage.h + + # GUI - platform pages + pages/modplatform/VanillaPage.cpp + pages/modplatform/VanillaPage.h + + pages/modplatform/atlauncher/AtlFilterModel.cpp + pages/modplatform/atlauncher/AtlFilterModel.h + pages/modplatform/atlauncher/AtlListModel.cpp + pages/modplatform/atlauncher/AtlListModel.h + pages/modplatform/atlauncher/AtlOptionalModDialog.cpp + pages/modplatform/atlauncher/AtlOptionalModDialog.h + pages/modplatform/atlauncher/AtlPage.cpp + pages/modplatform/atlauncher/AtlPage.h + + pages/modplatform/ftb/FtbFilterModel.cpp + pages/modplatform/ftb/FtbFilterModel.h + pages/modplatform/ftb/FtbListModel.cpp + pages/modplatform/ftb/FtbListModel.h + pages/modplatform/ftb/FtbPage.cpp + pages/modplatform/ftb/FtbPage.h + + pages/modplatform/legacy_ftb/Page.cpp + pages/modplatform/legacy_ftb/Page.h + pages/modplatform/legacy_ftb/ListModel.h + pages/modplatform/legacy_ftb/ListModel.cpp + + pages/modplatform/flame/FlameModel.cpp + pages/modplatform/flame/FlameModel.h + pages/modplatform/flame/FlamePage.cpp + pages/modplatform/flame/FlamePage.h + + pages/modplatform/technic/TechnicModel.cpp + pages/modplatform/technic/TechnicModel.h + pages/modplatform/technic/TechnicPage.cpp + pages/modplatform/technic/TechnicPage.h + + pages/modplatform/ImportPage.cpp + pages/modplatform/ImportPage.h + + # GUI - dialogs + dialogs/AboutDialog.cpp + dialogs/AboutDialog.h + dialogs/ProfileSelectDialog.cpp + dialogs/ProfileSelectDialog.h + dialogs/CopyInstanceDialog.cpp + dialogs/CopyInstanceDialog.h + dialogs/CustomMessageBox.cpp + dialogs/CustomMessageBox.h + dialogs/EditAccountDialog.cpp + dialogs/EditAccountDialog.h + dialogs/ExportInstanceDialog.cpp + dialogs/ExportInstanceDialog.h + dialogs/IconPickerDialog.cpp + dialogs/IconPickerDialog.h + dialogs/LoginDialog.cpp + dialogs/LoginDialog.h + dialogs/NewComponentDialog.cpp + dialogs/NewComponentDialog.h + dialogs/NewInstanceDialog.cpp + dialogs/NewInstanceDialog.h + dialogs/NotificationDialog.cpp + dialogs/NotificationDialog.h + pagedialog/PageDialog.cpp + pagedialog/PageDialog.h + dialogs/ProgressDialog.cpp + dialogs/ProgressDialog.h + dialogs/UpdateDialog.cpp + dialogs/UpdateDialog.h + dialogs/VersionSelectDialog.cpp + dialogs/VersionSelectDialog.h + dialogs/SkinUploadDialog.cpp + dialogs/SkinUploadDialog.h + + + # GUI - widgets + widgets/Common.cpp + widgets/Common.h + widgets/CustomCommands.cpp + widgets/CustomCommands.h + widgets/DropLabel.cpp + widgets/DropLabel.h + widgets/FocusLineEdit.cpp + widgets/FocusLineEdit.h + widgets/IconLabel.cpp + widgets/IconLabel.h + widgets/JavaSettingsWidget.cpp + widgets/JavaSettingsWidget.h + widgets/LabeledToolButton.cpp + widgets/LabeledToolButton.h + widgets/LanguageSelectionWidget.cpp + widgets/LanguageSelectionWidget.h + widgets/LineSeparator.cpp + widgets/LineSeparator.h + widgets/LogView.cpp + widgets/LogView.h + widgets/MCModInfoFrame.cpp + widgets/MCModInfoFrame.h + widgets/ModListView.cpp + widgets/ModListView.h + widgets/PageContainer.cpp + widgets/PageContainer.h + widgets/PageContainer_p.h + widgets/ServerStatus.cpp + widgets/ServerStatus.h + widgets/VersionListView.cpp + widgets/VersionListView.h + widgets/VersionSelectWidget.cpp + widgets/VersionSelectWidget.h + widgets/ProgressWidget.h + widgets/ProgressWidget.cpp + widgets/WideBar.h + widgets/WideBar.cpp + + # GUI - instance group view + groupview/GroupedProxyModel.cpp + groupview/GroupedProxyModel.h + groupview/AccessibleGroupView.cpp + groupview/AccessibleGroupView.h + groupview/AccessibleGroupView_p.h + groupview/GroupView.cpp + groupview/GroupView.h + groupview/InstanceDelegate.cpp + groupview/InstanceDelegate.h + groupview/VisualGroup.cpp + groupview/VisualGroup.h + ) + +######## UIs ######## +SET(MULTIMC_UIS + # Instance pages + pages/instance/GameOptionsPage.ui + pages/instance/VersionPage.ui + pages/instance/ModFolderPage.ui + pages/instance/LogPage.ui + pages/instance/InstanceSettingsPage.ui + pages/instance/NotesPage.ui + pages/instance/ScreenshotsPage.ui + pages/instance/OtherLogsPage.ui + pages/instance/LegacyUpgradePage.ui + pages/instance/ServersPage.ui + pages/instance/WorldListPage.ui + + # Global settings pages + pages/global/AccountListPage.ui + pages/global/ExternalToolsPage.ui + pages/global/JavaPage.ui + pages/global/MinecraftPage.ui + pages/global/MultiMCPage.ui + pages/global/ProxyPage.ui + pages/global/PasteEEPage.ui + + # Platform pages + pages/modplatform/VanillaPage.ui + pages/modplatform/atlauncher/AtlPage.ui + pages/modplatform/ftb/FtbPage.ui + pages/modplatform/legacy_ftb/Page.ui + pages/modplatform/flame/FlamePage.ui + pages/modplatform/technic/TechnicPage.ui + pages/modplatform/ImportPage.ui + + # Platform Dialogs + pages/modplatform/atlauncher/AtlOptionalModDialog.ui + + # Dialogs + dialogs/CopyInstanceDialog.ui + dialogs/NewComponentDialog.ui + dialogs/NewInstanceDialog.ui + dialogs/AboutDialog.ui + dialogs/ProgressDialog.ui + dialogs/IconPickerDialog.ui + dialogs/ProfileSelectDialog.ui + dialogs/EditAccountDialog.ui + dialogs/ExportInstanceDialog.ui + dialogs/LoginDialog.ui + dialogs/UpdateDialog.ui + dialogs/NotificationDialog.ui + dialogs/SkinUploadDialog.ui + + # Widgets/other + widgets/CustomCommands.ui + widgets/MCModInfoFrame.ui +) + +set(MULTIMC_QRCS + resources/backgrounds/backgrounds.qrc + resources/multimc/multimc.qrc + resources/pe_dark/pe_dark.qrc + resources/pe_light/pe_light.qrc + resources/pe_colored/pe_colored.qrc + resources/pe_blue/pe_blue.qrc + resources/OSX/OSX.qrc + resources/iOS/iOS.qrc + resources/flat/flat.qrc + resources/documents/documents.qrc +) + +######## Windows resource files ######## +if(WIN32) + set(MULTIMC_RCS resources/multimc.rc) +endif() + +# Qt 5 stuff +qt5_wrap_ui(MULTIMC_UI ${MULTIMC_UIS}) +qt5_add_resources(MULTIMC_RESOURCES ${MULTIMC_QRCS}) + +# Add executable +add_library(MultiMC_logic STATIC ${LOGIC_SOURCES} ${MULTIMC_SOURCES} ${MULTIMC_UI} ${MULTIMC_RESOURCES}) +target_link_libraries(MultiMC_logic + systeminfo + MultiMC_quazip + MultiMC_classparser + ${NBT_NAME} + ${ZLIB_LIBRARIES} + optional-bare + tomlc99 + BuildConfig +) +target_link_libraries(MultiMC_logic + Qt5::Core + Qt5::Xml + Qt5::Network + Qt5::Concurrent + Qt5::Gui +) +target_link_libraries(MultiMC_logic + MultiMC_iconfix + ${QUAZIP_LIBRARIES} + hoedown + MultiMC_rainbow + LocalPeer + ganalytics +) + +add_executable(MultiMC MACOSX_BUNDLE WIN32 main.cpp ${MULTIMC_RCS}) +target_link_libraries(MultiMC MultiMC_logic) + +if(DEFINED MultiMC_APP_BINARY_NAME) + set_target_properties(MultiMC PROPERTIES OUTPUT_NAME "${MultiMC_APP_BINARY_NAME}") +endif() +if(DEFINED MultiMC_BINARY_RPATH) + SET_TARGET_PROPERTIES(MultiMC PROPERTIES INSTALL_RPATH "${MultiMC_BINARY_RPATH}") +endif() +if(DEFINED MultiMC_APP_BINARY_DEFS) + target_compile_definitions(MultiMC PRIVATE ${MultiMC_APP_BINARY_DEFS}) +endif() + +install(TARGETS MultiMC + BUNDLE DESTINATION ${BUNDLE_DEST_DIR} COMPONENT Runtime + LIBRARY DESTINATION ${LIBRARY_DEST_DIR} COMPONENT Runtime + RUNTIME DESTINATION ${BINARY_DEST_DIR} COMPONENT Runtime +) + +#### The MultiMC bundle mess! #### +# Bundle utilities are used to complete the portable packages - they add all the libraries that would otherwise be missing on the target system. +# NOTE: it seems that this absolutely has to be here, and nowhere else. +if(INSTALL_BUNDLE STREQUAL "full") + # Add qt.conf - this makes Qt stop looking for things outside the bundle + install( + CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${RESOURCES_DEST_DIR}/qt.conf\" \" \")" + COMPONENT Runtime + ) + # Bundle plugins + if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") + # Image formats + install( + DIRECTORY "${QT_PLUGINS_DIR}/imageformats" + DESTINATION ${PLUGIN_DEST_DIR} + COMPONENT Runtime + REGEX "tga|tiff|mng|webp" EXCLUDE + ) + # Icon engines + install( + DIRECTORY "${QT_PLUGINS_DIR}/iconengines" + DESTINATION ${PLUGIN_DEST_DIR} + COMPONENT Runtime + REGEX "fontawesome" EXCLUDE + ) + # Platform plugins + install( + DIRECTORY "${QT_PLUGINS_DIR}/platforms" + DESTINATION ${PLUGIN_DEST_DIR} + COMPONENT Runtime + REGEX "minimal|linuxfb|offscreen" EXCLUDE + ) + else() + # Image formats + install( + DIRECTORY "${QT_PLUGINS_DIR}/imageformats" + DESTINATION ${PLUGIN_DEST_DIR} + COMPONENT Runtime + REGEX "tga|tiff|mng|webp" EXCLUDE + REGEX "d\\." EXCLUDE + REGEX "_debug\\." EXCLUDE + REGEX "\\.dSYM" EXCLUDE + ) + # Icon engines + install( + DIRECTORY "${QT_PLUGINS_DIR}/iconengines" + DESTINATION ${PLUGIN_DEST_DIR} + COMPONENT Runtime + REGEX "fontawesome" EXCLUDE + REGEX "d\\." EXCLUDE + REGEX "_debug\\." EXCLUDE + REGEX "\\.dSYM" EXCLUDE + ) + # Platform plugins + install( + DIRECTORY "${QT_PLUGINS_DIR}/platforms" + DESTINATION ${PLUGIN_DEST_DIR} + COMPONENT Runtime + REGEX "minimal|linuxfb|offscreen" EXCLUDE + REGEX "d\\." EXCLUDE + REGEX "_debug\\." EXCLUDE + REGEX "\\.dSYM" EXCLUDE + ) + endif() + configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" + @ONLY + ) + install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" COMPONENT Runtime) +endif() diff --git a/application/ColorCache.cpp b/launcher/ColorCache.cpp similarity index 100% rename from application/ColorCache.cpp rename to launcher/ColorCache.cpp diff --git a/application/ColorCache.h b/launcher/ColorCache.h similarity index 100% rename from application/ColorCache.h rename to launcher/ColorCache.h diff --git a/application/ColumnResizer.cpp b/launcher/ColumnResizer.cpp similarity index 100% rename from application/ColumnResizer.cpp rename to launcher/ColumnResizer.cpp diff --git a/application/ColumnResizer.h b/launcher/ColumnResizer.h similarity index 100% rename from application/ColumnResizer.h rename to launcher/ColumnResizer.h diff --git a/api/logic/Commandline.cpp b/launcher/Commandline.cpp similarity index 100% rename from api/logic/Commandline.cpp rename to launcher/Commandline.cpp diff --git a/api/logic/Commandline.h b/launcher/Commandline.h similarity index 96% rename from api/logic/Commandline.h rename to launcher/Commandline.h index 09c1707e5..a4e7aa611 100644 --- a/api/logic/Commandline.h +++ b/launcher/Commandline.h @@ -25,8 +25,6 @@ #include #include -#include "multimc_logic_export.h" - /** * @file libutil/include/cmdutils.h * @brief commandline parsing and processing utilities @@ -40,7 +38,7 @@ namespace Commandline * @param args the argument string * @return a QStringList containing all arguments */ -MULTIMC_LOGIC_EXPORT QStringList splitArgs(QString args); +QStringList splitArgs(QString args); /** * @brief The FlagStyle enum @@ -83,7 +81,7 @@ enum Enum /** * @brief The ParsingError class */ -class MULTIMC_LOGIC_EXPORT ParsingError : public std::runtime_error +class ParsingError : public std::runtime_error { public: ParsingError(const QString &what); @@ -92,7 +90,7 @@ public: /** * @brief The Parser class */ -class MULTIMC_LOGIC_EXPORT Parser +class Parser { public: /** diff --git a/api/logic/DefaultVariable.h b/launcher/DefaultVariable.h similarity index 100% rename from api/logic/DefaultVariable.h rename to launcher/DefaultVariable.h diff --git a/api/gui/DesktopServices.cpp b/launcher/DesktopServices.cpp similarity index 100% rename from api/gui/DesktopServices.cpp rename to launcher/DesktopServices.cpp diff --git a/launcher/DesktopServices.h b/launcher/DesktopServices.h new file mode 100644 index 000000000..1c081da41 --- /dev/null +++ b/launcher/DesktopServices.h @@ -0,0 +1,36 @@ +#pragma once + +#include +#include + +/** + * This wraps around QDesktopServices and adds workarounds where needed + * Use this instead of QDesktopServices! + */ +namespace DesktopServices +{ + /** + * Open a file in whatever application is applicable + */ + bool openFile(const QString &path); + + /** + * Open a file in the specified application + */ + bool openFile(const QString &application, const QString &path, const QString & workingDirectory = QString(), qint64 *pid = 0); + + /** + * Run an application + */ + bool run(const QString &application,const QStringList &args, const QString & workingDirectory = QString(), qint64 *pid = 0); + + /** + * Open a directory + */ + bool openDirectory(const QString &path, bool ensureExists = false); + + /** + * Open the URL, most likely in a browser. Maybe. + */ + bool openUrl(const QUrl &url); +} diff --git a/api/logic/Env.cpp b/launcher/Env.cpp similarity index 100% rename from api/logic/Env.cpp rename to launcher/Env.cpp diff --git a/api/logic/Env.h b/launcher/Env.h similarity index 95% rename from api/logic/Env.h rename to launcher/Env.h index 8b9b827e5..7d1a8bc9a 100644 --- a/api/logic/Env.h +++ b/launcher/Env.h @@ -5,8 +5,6 @@ #include #include -#include "multimc_logic_export.h" - #include "QObjectPtr.h" class QNetworkAccessManager; @@ -25,7 +23,7 @@ class Index; #define ENV (Env::getInstance()) -class MULTIMC_LOGIC_EXPORT Env +class Env { friend class MultiMC; private: diff --git a/api/logic/Exception.h b/launcher/Exception.h similarity index 86% rename from api/logic/Exception.h rename to launcher/Exception.h index 9400b3f86..fe0b86b5f 100644 --- a/api/logic/Exception.h +++ b/launcher/Exception.h @@ -6,9 +6,7 @@ #include #include -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT Exception : public std::exception +class Exception : public std::exception { public: Exception(const QString &message) : std::exception(), m_message(message) diff --git a/api/logic/ExponentialSeries.h b/launcher/ExponentialSeries.h similarity index 100% rename from api/logic/ExponentialSeries.h rename to launcher/ExponentialSeries.h diff --git a/api/logic/FileSystem.cpp b/launcher/FileSystem.cpp similarity index 100% rename from api/logic/FileSystem.cpp rename to launcher/FileSystem.cpp diff --git a/api/logic/FileSystem.h b/launcher/FileSystem.h similarity index 58% rename from api/logic/FileSystem.h rename to launcher/FileSystem.h index 55ec6a58f..8f6e8b489 100644 --- a/api/logic/FileSystem.h +++ b/launcher/FileSystem.h @@ -5,14 +5,13 @@ #include "Exception.h" #include "pathmatcher/IPathMatcher.h" -#include "multimc_logic_export.h" #include #include namespace FS { -class MULTIMC_LOGIC_EXPORT FileSystemException : public ::Exception +class FileSystemException : public ::Exception { public: FileSystemException(const QString &message) : Exception(message) {} @@ -21,31 +20,31 @@ public: /** * write data to a file safely */ -MULTIMC_LOGIC_EXPORT void write(const QString &filename, const QByteArray &data); +void write(const QString &filename, const QByteArray &data); /** * read data from a file safely\ */ -MULTIMC_LOGIC_EXPORT QByteArray read(const QString &filename); +QByteArray read(const QString &filename); /** * Update the last changed timestamp of an existing file */ -MULTIMC_LOGIC_EXPORT bool updateTimestamp(const QString & filename); +bool updateTimestamp(const QString & filename); /** * Creates all the folders in a path for the specified path * last segment of the path is treated as a file name and is ignored! */ -MULTIMC_LOGIC_EXPORT bool ensureFilePathExists(QString filenamepath); +bool ensureFilePathExists(QString filenamepath); /** * Creates all the folders in a path for the specified path * last segment of the path is treated as a folder name and is created! */ -MULTIMC_LOGIC_EXPORT bool ensureFolderPathExists(QString filenamepath); +bool ensureFolderPathExists(QString filenamepath); -class MULTIMC_LOGIC_EXPORT copy +class copy { public: copy(const QString & src, const QString & dst) @@ -81,13 +80,13 @@ private: /** * Delete a folder recursively */ -MULTIMC_LOGIC_EXPORT bool deletePath(QString path); +bool deletePath(QString path); -MULTIMC_LOGIC_EXPORT QString PathCombine(const QString &path1, const QString &path2); -MULTIMC_LOGIC_EXPORT QString PathCombine(const QString &path1, const QString &path2, const QString &path3); -MULTIMC_LOGIC_EXPORT QString PathCombine(const QString &path1, const QString &path2, const QString &path3, const QString &path4); +QString PathCombine(const QString &path1, const QString &path2); +QString PathCombine(const QString &path1, const QString &path2, const QString &path3); +QString PathCombine(const QString &path1, const QString &path2, const QString &path3, const QString &path4); -MULTIMC_LOGIC_EXPORT QString AbsolutePath(QString path); +QString AbsolutePath(QString path); /** * Resolve an executable @@ -99,7 +98,7 @@ MULTIMC_LOGIC_EXPORT QString AbsolutePath(QString path); * * @return absolute path to executable or null string */ -MULTIMC_LOGIC_EXPORT QString ResolveExecutable(QString path); +QString ResolveExecutable(QString path); /** * Normalize path @@ -109,20 +108,20 @@ MULTIMC_LOGIC_EXPORT QString ResolveExecutable(QString path); * * Returns false if the path logic somehow filed (and normalizedPath in invalid) */ -MULTIMC_LOGIC_EXPORT QString NormalizePath(QString path); +QString NormalizePath(QString path); -MULTIMC_LOGIC_EXPORT QString RemoveInvalidFilenameChars(QString string, QChar replaceWith = '-'); +QString RemoveInvalidFilenameChars(QString string, QChar replaceWith = '-'); -MULTIMC_LOGIC_EXPORT QString DirNameFromString(QString string, QString inDir = "."); +QString DirNameFromString(QString string, QString inDir = "."); /// Checks if the a given Path contains "!" -MULTIMC_LOGIC_EXPORT bool checkProblemticPathJava(QDir folder); +bool checkProblemticPathJava(QDir folder); // Get the Directory representing the User's Desktop -MULTIMC_LOGIC_EXPORT QString getDesktopDir(); +QString getDesktopDir(); // Create a shortcut at *location*, pointing to *dest* called with the arguments *args* // call it *name* and assign it the icon *icon* // return true if operation succeeded -MULTIMC_LOGIC_EXPORT bool createShortCut(QString location, QString dest, QStringList args, QString name, QString iconLocation); +bool createShortCut(QString location, QString dest, QStringList args, QString name, QString iconLocation); } diff --git a/api/logic/FileSystem_test.cpp b/launcher/FileSystem_test.cpp similarity index 100% rename from api/logic/FileSystem_test.cpp rename to launcher/FileSystem_test.cpp diff --git a/api/logic/Filter.cpp b/launcher/Filter.cpp similarity index 100% rename from api/logic/Filter.cpp rename to launcher/Filter.cpp diff --git a/api/logic/Filter.h b/launcher/Filter.h similarity index 74% rename from api/logic/Filter.h rename to launcher/Filter.h index 1ba48e482..b55067acb 100644 --- a/api/logic/Filter.h +++ b/launcher/Filter.h @@ -3,16 +3,14 @@ #include #include -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT Filter +class Filter { public: virtual ~Filter(); virtual bool accepts(const QString & value) = 0; }; -class MULTIMC_LOGIC_EXPORT ContainsFilter: public Filter +class ContainsFilter: public Filter { public: ContainsFilter(const QString &pattern); @@ -22,7 +20,7 @@ private: QString pattern; }; -class MULTIMC_LOGIC_EXPORT ExactFilter: public Filter +class ExactFilter: public Filter { public: ExactFilter(const QString &pattern); @@ -32,7 +30,7 @@ private: QString pattern; }; -class MULTIMC_LOGIC_EXPORT RegexpFilter: public Filter +class RegexpFilter: public Filter { public: RegexpFilter(const QString ®exp, bool invert); diff --git a/api/logic/GZip.cpp b/launcher/GZip.cpp similarity index 100% rename from api/logic/GZip.cpp rename to launcher/GZip.cpp diff --git a/api/logic/GZip.h b/launcher/GZip.h similarity index 77% rename from api/logic/GZip.h rename to launcher/GZip.h index c7eddbb30..7d4b1c332 100644 --- a/api/logic/GZip.h +++ b/launcher/GZip.h @@ -1,9 +1,7 @@ #pragma once #include -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT GZip +class GZip { public: static bool unzip(const QByteArray &compressedBytes, QByteArray &uncompressedBytes); diff --git a/api/logic/GZip_test.cpp b/launcher/GZip_test.cpp similarity index 100% rename from api/logic/GZip_test.cpp rename to launcher/GZip_test.cpp diff --git a/application/GuiUtil.cpp b/launcher/GuiUtil.cpp similarity index 100% rename from application/GuiUtil.cpp rename to launcher/GuiUtil.cpp diff --git a/application/GuiUtil.h b/launcher/GuiUtil.h similarity index 100% rename from application/GuiUtil.h rename to launcher/GuiUtil.h diff --git a/application/HoeDown.h b/launcher/HoeDown.h similarity index 100% rename from application/HoeDown.h rename to launcher/HoeDown.h diff --git a/api/logic/InstanceCopyTask.cpp b/launcher/InstanceCopyTask.cpp similarity index 100% rename from api/logic/InstanceCopyTask.cpp rename to launcher/InstanceCopyTask.cpp diff --git a/api/logic/InstanceCopyTask.h b/launcher/InstanceCopyTask.h similarity index 87% rename from api/logic/InstanceCopyTask.h rename to launcher/InstanceCopyTask.h index 6465e92d8..829017326 100644 --- a/api/logic/InstanceCopyTask.h +++ b/launcher/InstanceCopyTask.h @@ -1,7 +1,6 @@ #pragma once #include "tasks/Task.h" -#include "multimc_logic_export.h" #include "net/NetJob.h" #include #include @@ -11,7 +10,7 @@ #include "BaseInstance.h" #include "InstanceTask.h" -class MULTIMC_LOGIC_EXPORT InstanceCopyTask : public InstanceTask +class InstanceCopyTask : public InstanceTask { Q_OBJECT public: diff --git a/api/logic/InstanceCreationTask.cpp b/launcher/InstanceCreationTask.cpp similarity index 100% rename from api/logic/InstanceCreationTask.cpp rename to launcher/InstanceCreationTask.cpp diff --git a/api/logic/InstanceCreationTask.h b/launcher/InstanceCreationTask.h similarity index 78% rename from api/logic/InstanceCreationTask.h rename to launcher/InstanceCreationTask.h index 154a854f8..549971164 100644 --- a/api/logic/InstanceCreationTask.h +++ b/launcher/InstanceCreationTask.h @@ -1,14 +1,13 @@ #pragma once #include "tasks/Task.h" -#include "multimc_logic_export.h" #include "net/NetJob.h" #include #include "settings/SettingsObject.h" #include "BaseVersion.h" #include "InstanceTask.h" -class MULTIMC_LOGIC_EXPORT InstanceCreationTask : public InstanceTask +class InstanceCreationTask : public InstanceTask { Q_OBJECT public: diff --git a/api/logic/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp similarity index 100% rename from api/logic/InstanceImportTask.cpp rename to launcher/InstanceImportTask.cpp diff --git a/api/logic/InstanceImportTask.h b/launcher/InstanceImportTask.h similarity index 94% rename from api/logic/InstanceImportTask.h rename to launcher/InstanceImportTask.h index 7291324d3..72ae6851a 100644 --- a/api/logic/InstanceImportTask.h +++ b/launcher/InstanceImportTask.h @@ -16,7 +16,6 @@ #pragma once #include "InstanceTask.h" -#include "multimc_logic_export.h" #include "net/NetJob.h" #include #include @@ -32,7 +31,7 @@ namespace Flame class FileResolvingTask; } -class MULTIMC_LOGIC_EXPORT InstanceImportTask : public InstanceTask +class InstanceImportTask : public InstanceTask { Q_OBJECT public: diff --git a/api/logic/InstanceList.cpp b/launcher/InstanceList.cpp similarity index 100% rename from api/logic/InstanceList.cpp rename to launcher/InstanceList.cpp diff --git a/api/logic/InstanceList.h b/launcher/InstanceList.h similarity index 97% rename from api/logic/InstanceList.h rename to launcher/InstanceList.h index 56ee3be44..4d2dc1f60 100644 --- a/api/logic/InstanceList.h +++ b/launcher/InstanceList.h @@ -22,8 +22,6 @@ #include "BaseInstance.h" -#include "multimc_logic_export.h" - #include "QObjectPtr.h" class QFileSystemWatcher; @@ -49,7 +47,7 @@ enum class GroupsState }; -class MULTIMC_LOGIC_EXPORT InstanceList : public QAbstractListModel +class InstanceList : public QAbstractListModel { Q_OBJECT diff --git a/application/InstancePageProvider.h b/launcher/InstancePageProvider.h similarity index 100% rename from application/InstancePageProvider.h rename to launcher/InstancePageProvider.h diff --git a/application/InstanceProxyModel.cpp b/launcher/InstanceProxyModel.cpp similarity index 100% rename from application/InstanceProxyModel.cpp rename to launcher/InstanceProxyModel.cpp diff --git a/application/InstanceProxyModel.h b/launcher/InstanceProxyModel.h similarity index 100% rename from application/InstanceProxyModel.h rename to launcher/InstanceProxyModel.h diff --git a/api/logic/InstanceTask.cpp b/launcher/InstanceTask.cpp similarity index 100% rename from api/logic/InstanceTask.cpp rename to launcher/InstanceTask.cpp diff --git a/api/logic/InstanceTask.h b/launcher/InstanceTask.h similarity index 91% rename from api/logic/InstanceTask.h rename to launcher/InstanceTask.h index c5f6c7fd3..82e23f111 100644 --- a/api/logic/InstanceTask.h +++ b/launcher/InstanceTask.h @@ -1,10 +1,9 @@ #pragma once #include "tasks/Task.h" -#include "multimc_logic_export.h" #include "settings/SettingsObject.h" -class MULTIMC_LOGIC_EXPORT InstanceTask : public Task +class InstanceTask : public Task { Q_OBJECT public: diff --git a/application/InstanceWindow.cpp b/launcher/InstanceWindow.cpp similarity index 100% rename from application/InstanceWindow.cpp rename to launcher/InstanceWindow.cpp diff --git a/application/InstanceWindow.h b/launcher/InstanceWindow.h similarity index 100% rename from application/InstanceWindow.h rename to launcher/InstanceWindow.h diff --git a/application/JavaCommon.cpp b/launcher/JavaCommon.cpp similarity index 100% rename from application/JavaCommon.cpp rename to launcher/JavaCommon.cpp diff --git a/application/JavaCommon.h b/launcher/JavaCommon.h similarity index 100% rename from application/JavaCommon.h rename to launcher/JavaCommon.h diff --git a/api/logic/Json.cpp b/launcher/Json.cpp similarity index 100% rename from api/logic/Json.cpp rename to launcher/Json.cpp diff --git a/api/logic/Json.h b/launcher/Json.h similarity index 72% rename from api/logic/Json.h rename to launcher/Json.h index 34ff6fe2b..f2e68f0c2 100644 --- a/api/logic/Json.h +++ b/launcher/Json.h @@ -16,32 +16,32 @@ namespace Json { -class MULTIMC_LOGIC_EXPORT JsonException : public ::Exception +class JsonException : public ::Exception { public: JsonException(const QString &message) : Exception(message) {} }; /// @throw FileSystemException -MULTIMC_LOGIC_EXPORT void write(const QJsonDocument &doc, const QString &filename); +void write(const QJsonDocument &doc, const QString &filename); /// @throw FileSystemException -MULTIMC_LOGIC_EXPORT void write(const QJsonObject &object, const QString &filename); +void write(const QJsonObject &object, const QString &filename); /// @throw FileSystemException -MULTIMC_LOGIC_EXPORT void write(const QJsonArray &array, const QString &filename); +void write(const QJsonArray &array, const QString &filename); -MULTIMC_LOGIC_EXPORT QByteArray toBinary(const QJsonObject &obj); -MULTIMC_LOGIC_EXPORT QByteArray toBinary(const QJsonArray &array); -MULTIMC_LOGIC_EXPORT QByteArray toText(const QJsonObject &obj); -MULTIMC_LOGIC_EXPORT QByteArray toText(const QJsonArray &array); +QByteArray toBinary(const QJsonObject &obj); +QByteArray toBinary(const QJsonArray &array); +QByteArray toText(const QJsonObject &obj); +QByteArray toText(const QJsonArray &array); /// @throw JsonException -MULTIMC_LOGIC_EXPORT QJsonDocument requireDocument(const QByteArray &data, const QString &what = "Document"); +QJsonDocument requireDocument(const QByteArray &data, const QString &what = "Document"); /// @throw JsonException -MULTIMC_LOGIC_EXPORT QJsonDocument requireDocument(const QString &filename, const QString &what = "Document"); +QJsonDocument requireDocument(const QString &filename, const QString &what = "Document"); /// @throw JsonException -MULTIMC_LOGIC_EXPORT QJsonObject requireObject(const QJsonDocument &doc, const QString &what = "Document"); +QJsonObject requireObject(const QJsonDocument &doc, const QString &what = "Document"); /// @throw JsonException -MULTIMC_LOGIC_EXPORT QJsonArray requireArray(const QJsonDocument &doc, const QString &what = "Document"); +QJsonArray requireArray(const QJsonDocument &doc, const QString &what = "Document"); /////////////////// WRITING //////////////////// @@ -84,31 +84,31 @@ template T requireIsType(const QJsonValue &value, const QString &what = "Value"); /// @throw JsonException -template<> MULTIMC_LOGIC_EXPORT double requireIsType(const QJsonValue &value, const QString &what); +template<> double requireIsType(const QJsonValue &value, const QString &what); /// @throw JsonException -template<> MULTIMC_LOGIC_EXPORT bool requireIsType(const QJsonValue &value, const QString &what); +template<> bool requireIsType(const QJsonValue &value, const QString &what); /// @throw JsonException -template<> MULTIMC_LOGIC_EXPORT int requireIsType(const QJsonValue &value, const QString &what); +template<> int requireIsType(const QJsonValue &value, const QString &what); /// @throw JsonException -template<> MULTIMC_LOGIC_EXPORT QJsonObject requireIsType(const QJsonValue &value, const QString &what); +template<> QJsonObject requireIsType(const QJsonValue &value, const QString &what); /// @throw JsonException -template<> MULTIMC_LOGIC_EXPORT QJsonArray requireIsType(const QJsonValue &value, const QString &what); +template<> QJsonArray requireIsType(const QJsonValue &value, const QString &what); /// @throw JsonException -template<> MULTIMC_LOGIC_EXPORT QJsonValue requireIsType(const QJsonValue &value, const QString &what); +template<> QJsonValue requireIsType(const QJsonValue &value, const QString &what); /// @throw JsonException -template<> MULTIMC_LOGIC_EXPORT QByteArray requireIsType(const QJsonValue &value, const QString &what); +template<> QByteArray requireIsType(const QJsonValue &value, const QString &what); /// @throw JsonException -template<> MULTIMC_LOGIC_EXPORT QDateTime requireIsType(const QJsonValue &value, const QString &what); +template<> QDateTime requireIsType(const QJsonValue &value, const QString &what); /// @throw JsonException -template<> MULTIMC_LOGIC_EXPORT QVariant requireIsType(const QJsonValue &value, const QString &what); +template<> QVariant requireIsType(const QJsonValue &value, const QString &what); /// @throw JsonException -template<> MULTIMC_LOGIC_EXPORT QString requireIsType(const QJsonValue &value, const QString &what); +template<> QString requireIsType(const QJsonValue &value, const QString &what); /// @throw JsonException -template<> MULTIMC_LOGIC_EXPORT QUuid requireIsType(const QJsonValue &value, const QString &what); +template<> QUuid requireIsType(const QJsonValue &value, const QString &what); /// @throw JsonException -template<> MULTIMC_LOGIC_EXPORT QDir requireIsType(const QJsonValue &value, const QString &what); +template<> QDir requireIsType(const QJsonValue &value, const QString &what); /// @throw JsonException -template<> MULTIMC_LOGIC_EXPORT QUrl requireIsType(const QJsonValue &value, const QString &what); +template<> QUrl requireIsType(const QJsonValue &value, const QString &what); // the following functions are higher level functions, that make use of the above functions for // type conversion diff --git a/application/KonamiCode.cpp b/launcher/KonamiCode.cpp similarity index 100% rename from application/KonamiCode.cpp rename to launcher/KonamiCode.cpp diff --git a/application/KonamiCode.h b/launcher/KonamiCode.h similarity index 100% rename from application/KonamiCode.h rename to launcher/KonamiCode.h diff --git a/application/LaunchController.cpp b/launcher/LaunchController.cpp similarity index 100% rename from application/LaunchController.cpp rename to launcher/LaunchController.cpp diff --git a/application/LaunchController.h b/launcher/LaunchController.h similarity index 100% rename from application/LaunchController.h rename to launcher/LaunchController.h diff --git a/api/logic/LoggedProcess.cpp b/launcher/LoggedProcess.cpp similarity index 100% rename from api/logic/LoggedProcess.cpp rename to launcher/LoggedProcess.cpp diff --git a/api/logic/LoggedProcess.h b/launcher/LoggedProcess.h similarity index 95% rename from api/logic/LoggedProcess.h rename to launcher/LoggedProcess.h index 327cdc6ac..e52b8a7ba 100644 --- a/api/logic/LoggedProcess.h +++ b/launcher/LoggedProcess.h @@ -17,13 +17,12 @@ #include #include "MessageLevel.h" -#include "multimc_logic_export.h" /* * This is a basic process. * It has line-based logging support and hides some of the nasty bits. */ -class MULTIMC_LOGIC_EXPORT LoggedProcess : public QProcess +class LoggedProcess : public QProcess { Q_OBJECT public: diff --git a/api/logic/MMCStrings.cpp b/launcher/MMCStrings.cpp similarity index 100% rename from api/logic/MMCStrings.cpp rename to launcher/MMCStrings.cpp diff --git a/launcher/MMCStrings.h b/launcher/MMCStrings.h new file mode 100644 index 000000000..48052a00e --- /dev/null +++ b/launcher/MMCStrings.h @@ -0,0 +1,8 @@ +#pragma once + +#include + +namespace Strings +{ + int naturalCompare(const QString &s1, const QString &s2, Qt::CaseSensitivity cs); +} diff --git a/api/logic/MMCZip.cpp b/launcher/MMCZip.cpp similarity index 100% rename from api/logic/MMCZip.cpp rename to launcher/MMCZip.cpp diff --git a/api/logic/MMCZip.h b/launcher/MMCZip.h similarity index 69% rename from api/logic/MMCZip.h rename to launcher/MMCZip.h index 98d9cd5bd..9c47fa11f 100644 --- a/api/logic/MMCZip.h +++ b/launcher/MMCZip.h @@ -21,8 +21,6 @@ #include "minecraft/mod/Mod.h" #include -#include "multimc_logic_export.h" - #include #include @@ -32,20 +30,20 @@ namespace MMCZip /** * Merge two zip files, using a filter function */ - bool MULTIMC_LOGIC_EXPORT mergeZipFiles(QuaZip *into, QFileInfo from, QSet &contained, + bool mergeZipFiles(QuaZip *into, QFileInfo from, QSet &contained, const JlCompress::FilterFunction filter = nullptr); /** * take a source jar, add mods to it, resulting in target jar */ - bool MULTIMC_LOGIC_EXPORT createModdedJar(QString sourceJarPath, QString targetJarPath, const QList& mods); + bool createModdedJar(QString sourceJarPath, QString targetJarPath, const QList& mods); /** * Find a single file in archive by file name (not path) * * \return the path prefix where the file is */ - QString MULTIMC_LOGIC_EXPORT findFolderOfFileInZip(QuaZip * zip, const QString & what, const QString &root = QString("")); + QString findFolderOfFileInZip(QuaZip * zip, const QString & what, const QString &root = QString("")); /** * Find a multiple files of the same name in archive by file name @@ -53,14 +51,14 @@ namespace MMCZip * * \return true if anything was found */ - bool MULTIMC_LOGIC_EXPORT findFilesInZip(QuaZip * zip, const QString & what, QStringList & result, const QString &root = QString()); + bool findFilesInZip(QuaZip * zip, const QString & what, QStringList & result, const QString &root = QString()); /** * Extract a subdirectory from an archive */ - nonstd::optional MULTIMC_LOGIC_EXPORT extractSubDir(QuaZip *zip, const QString & subdir, const QString &target); + nonstd::optional extractSubDir(QuaZip *zip, const QString & subdir, const QString &target); - bool MULTIMC_LOGIC_EXPORT extractRelFile(QuaZip *zip, const QString & file, const QString &target); + bool extractRelFile(QuaZip *zip, const QString & file, const QString &target); /** * Extract a whole archive. @@ -69,7 +67,7 @@ namespace MMCZip * \param dir The directory to extract to, the current directory if left empty. * \return The list of the full paths of the files extracted, empty on failure. */ - nonstd::optional MULTIMC_LOGIC_EXPORT extractDir(QString fileCompressed, QString dir); + nonstd::optional extractDir(QString fileCompressed, QString dir); /** * Extract a subdirectory from an archive @@ -79,7 +77,7 @@ namespace MMCZip * \param dir The directory to extract to, the current directory if left empty. * \return The list of the full paths of the files extracted, empty on failure. */ - nonstd::optional MULTIMC_LOGIC_EXPORT extractDir(QString fileCompressed, QString subdir, QString dir); + nonstd::optional extractDir(QString fileCompressed, QString subdir, QString dir); /** * Extract a single file from an archive into a directory @@ -89,6 +87,6 @@ namespace MMCZip * \param dir The directory to extract to, the current directory if left empty. * \return true for success or false for failure */ - bool MULTIMC_LOGIC_EXPORT extractFile(QString fileCompressed, QString file, QString dir); + bool extractFile(QString fileCompressed, QString file, QString dir); } diff --git a/application/MainWindow.cpp b/launcher/MainWindow.cpp similarity index 100% rename from application/MainWindow.cpp rename to launcher/MainWindow.cpp diff --git a/application/MainWindow.h b/launcher/MainWindow.h similarity index 100% rename from application/MainWindow.h rename to launcher/MainWindow.h diff --git a/api/logic/MessageLevel.cpp b/launcher/MessageLevel.cpp similarity index 100% rename from api/logic/MessageLevel.cpp rename to launcher/MessageLevel.cpp diff --git a/api/logic/MessageLevel.h b/launcher/MessageLevel.h similarity index 100% rename from api/logic/MessageLevel.h rename to launcher/MessageLevel.h diff --git a/application/MultiMC.cpp b/launcher/MultiMC.cpp similarity index 100% rename from application/MultiMC.cpp rename to launcher/MultiMC.cpp diff --git a/application/MultiMC.h b/launcher/MultiMC.h similarity index 100% rename from application/MultiMC.h rename to launcher/MultiMC.h diff --git a/api/logic/NullInstance.h b/launcher/NullInstance.h similarity index 100% rename from api/logic/NullInstance.h rename to launcher/NullInstance.h diff --git a/api/logic/ProblemProvider.h b/launcher/ProblemProvider.h similarity index 86% rename from api/logic/ProblemProvider.h rename to launcher/ProblemProvider.h index 33c9d3649..cd4745fa1 100644 --- a/api/logic/ProblemProvider.h +++ b/launcher/ProblemProvider.h @@ -1,7 +1,5 @@ #pragma once -#include "multimc_logic_export.h" - enum class ProblemSeverity { None, @@ -15,7 +13,7 @@ struct PatchProblem QString m_description; }; -class MULTIMC_LOGIC_EXPORT ProblemProvider +class ProblemProvider { public: virtual ~ProblemProvider() {}; @@ -23,7 +21,7 @@ public: virtual ProblemSeverity getProblemSeverity() const = 0; }; -class MULTIMC_LOGIC_EXPORT ProblemContainer : public ProblemProvider +class ProblemContainer : public ProblemProvider { public: const QList getProblems() const override diff --git a/api/logic/QObjectPtr.h b/launcher/QObjectPtr.h similarity index 100% rename from api/logic/QObjectPtr.h rename to launcher/QObjectPtr.h diff --git a/api/logic/RWStorage.h b/launcher/RWStorage.h similarity index 100% rename from api/logic/RWStorage.h rename to launcher/RWStorage.h diff --git a/api/logic/RecursiveFileSystemWatcher.cpp b/launcher/RecursiveFileSystemWatcher.cpp similarity index 100% rename from api/logic/RecursiveFileSystemWatcher.cpp rename to launcher/RecursiveFileSystemWatcher.cpp diff --git a/api/logic/RecursiveFileSystemWatcher.h b/launcher/RecursiveFileSystemWatcher.h similarity index 91% rename from api/logic/RecursiveFileSystemWatcher.h rename to launcher/RecursiveFileSystemWatcher.h index c9c39f49c..cc837d603 100644 --- a/api/logic/RecursiveFileSystemWatcher.h +++ b/launcher/RecursiveFileSystemWatcher.h @@ -4,9 +4,7 @@ #include #include "pathmatcher/IPathMatcher.h" -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT RecursiveFileSystemWatcher : public QObject +class RecursiveFileSystemWatcher : public QObject { Q_OBJECT public: diff --git a/api/logic/SeparatorPrefixTree.h b/launcher/SeparatorPrefixTree.h similarity index 100% rename from api/logic/SeparatorPrefixTree.h rename to launcher/SeparatorPrefixTree.h diff --git a/api/gui/SkinUtils.cpp b/launcher/SkinUtils.cpp similarity index 100% rename from api/gui/SkinUtils.cpp rename to launcher/SkinUtils.cpp diff --git a/api/gui/SkinUtils.h b/launcher/SkinUtils.h similarity index 84% rename from api/gui/SkinUtils.h rename to launcher/SkinUtils.h index b44f42283..c1f437ab0 100644 --- a/api/gui/SkinUtils.h +++ b/launcher/SkinUtils.h @@ -17,9 +17,7 @@ #include -#include "multimc_gui_export.h" - namespace SkinUtils { -QPixmap MULTIMC_GUI_EXPORT getFaceFromCache(QString id, int height = 64, int width = 64); +QPixmap getFaceFromCache(QString id, int height = 64, int width = 64); } diff --git a/application/UpdateController.cpp b/launcher/UpdateController.cpp similarity index 100% rename from application/UpdateController.cpp rename to launcher/UpdateController.cpp diff --git a/application/UpdateController.h b/launcher/UpdateController.h similarity index 100% rename from application/UpdateController.h rename to launcher/UpdateController.h diff --git a/api/logic/Usable.h b/launcher/Usable.h similarity index 100% rename from api/logic/Usable.h rename to launcher/Usable.h diff --git a/api/logic/Version.cpp b/launcher/Version.cpp similarity index 100% rename from api/logic/Version.cpp rename to launcher/Version.cpp diff --git a/api/logic/Version.h b/launcher/Version.h similarity index 97% rename from api/logic/Version.h rename to launcher/Version.h index c5d930815..9fe12d6da 100644 --- a/api/logic/Version.h +++ b/launcher/Version.h @@ -3,11 +3,9 @@ #include #include -#include "multimc_logic_export.h" - class QUrl; -class MULTIMC_LOGIC_EXPORT Version +class Version { public: Version(const QString &str); diff --git a/application/VersionProxyModel.cpp b/launcher/VersionProxyModel.cpp similarity index 100% rename from application/VersionProxyModel.cpp rename to launcher/VersionProxyModel.cpp diff --git a/application/VersionProxyModel.h b/launcher/VersionProxyModel.h similarity index 100% rename from application/VersionProxyModel.h rename to launcher/VersionProxyModel.h diff --git a/api/logic/Version_test.cpp b/launcher/Version_test.cpp similarity index 100% rename from api/logic/Version_test.cpp rename to launcher/Version_test.cpp diff --git a/api/logic/WatchLock.h b/launcher/WatchLock.h similarity index 100% rename from api/logic/WatchLock.h rename to launcher/WatchLock.h diff --git a/application/dialogs/AboutDialog.cpp b/launcher/dialogs/AboutDialog.cpp similarity index 100% rename from application/dialogs/AboutDialog.cpp rename to launcher/dialogs/AboutDialog.cpp diff --git a/application/dialogs/AboutDialog.h b/launcher/dialogs/AboutDialog.h similarity index 100% rename from application/dialogs/AboutDialog.h rename to launcher/dialogs/AboutDialog.h diff --git a/application/dialogs/AboutDialog.ui b/launcher/dialogs/AboutDialog.ui similarity index 100% rename from application/dialogs/AboutDialog.ui rename to launcher/dialogs/AboutDialog.ui diff --git a/application/dialogs/CopyInstanceDialog.cpp b/launcher/dialogs/CopyInstanceDialog.cpp similarity index 100% rename from application/dialogs/CopyInstanceDialog.cpp rename to launcher/dialogs/CopyInstanceDialog.cpp diff --git a/application/dialogs/CopyInstanceDialog.h b/launcher/dialogs/CopyInstanceDialog.h similarity index 100% rename from application/dialogs/CopyInstanceDialog.h rename to launcher/dialogs/CopyInstanceDialog.h diff --git a/application/dialogs/CopyInstanceDialog.ui b/launcher/dialogs/CopyInstanceDialog.ui similarity index 100% rename from application/dialogs/CopyInstanceDialog.ui rename to launcher/dialogs/CopyInstanceDialog.ui diff --git a/application/dialogs/CustomMessageBox.cpp b/launcher/dialogs/CustomMessageBox.cpp similarity index 100% rename from application/dialogs/CustomMessageBox.cpp rename to launcher/dialogs/CustomMessageBox.cpp diff --git a/application/dialogs/CustomMessageBox.h b/launcher/dialogs/CustomMessageBox.h similarity index 100% rename from application/dialogs/CustomMessageBox.h rename to launcher/dialogs/CustomMessageBox.h diff --git a/application/dialogs/EditAccountDialog.cpp b/launcher/dialogs/EditAccountDialog.cpp similarity index 100% rename from application/dialogs/EditAccountDialog.cpp rename to launcher/dialogs/EditAccountDialog.cpp diff --git a/application/dialogs/EditAccountDialog.h b/launcher/dialogs/EditAccountDialog.h similarity index 100% rename from application/dialogs/EditAccountDialog.h rename to launcher/dialogs/EditAccountDialog.h diff --git a/application/dialogs/EditAccountDialog.ui b/launcher/dialogs/EditAccountDialog.ui similarity index 100% rename from application/dialogs/EditAccountDialog.ui rename to launcher/dialogs/EditAccountDialog.ui diff --git a/application/dialogs/ExportInstanceDialog.cpp b/launcher/dialogs/ExportInstanceDialog.cpp similarity index 100% rename from application/dialogs/ExportInstanceDialog.cpp rename to launcher/dialogs/ExportInstanceDialog.cpp diff --git a/application/dialogs/ExportInstanceDialog.h b/launcher/dialogs/ExportInstanceDialog.h similarity index 100% rename from application/dialogs/ExportInstanceDialog.h rename to launcher/dialogs/ExportInstanceDialog.h diff --git a/application/dialogs/ExportInstanceDialog.ui b/launcher/dialogs/ExportInstanceDialog.ui similarity index 100% rename from application/dialogs/ExportInstanceDialog.ui rename to launcher/dialogs/ExportInstanceDialog.ui diff --git a/application/dialogs/IconPickerDialog.cpp b/launcher/dialogs/IconPickerDialog.cpp similarity index 100% rename from application/dialogs/IconPickerDialog.cpp rename to launcher/dialogs/IconPickerDialog.cpp diff --git a/application/dialogs/IconPickerDialog.h b/launcher/dialogs/IconPickerDialog.h similarity index 100% rename from application/dialogs/IconPickerDialog.h rename to launcher/dialogs/IconPickerDialog.h diff --git a/application/dialogs/IconPickerDialog.ui b/launcher/dialogs/IconPickerDialog.ui similarity index 100% rename from application/dialogs/IconPickerDialog.ui rename to launcher/dialogs/IconPickerDialog.ui diff --git a/application/dialogs/LoginDialog.cpp b/launcher/dialogs/LoginDialog.cpp similarity index 100% rename from application/dialogs/LoginDialog.cpp rename to launcher/dialogs/LoginDialog.cpp diff --git a/application/dialogs/LoginDialog.h b/launcher/dialogs/LoginDialog.h similarity index 100% rename from application/dialogs/LoginDialog.h rename to launcher/dialogs/LoginDialog.h diff --git a/application/dialogs/LoginDialog.ui b/launcher/dialogs/LoginDialog.ui similarity index 100% rename from application/dialogs/LoginDialog.ui rename to launcher/dialogs/LoginDialog.ui diff --git a/application/dialogs/NewComponentDialog.cpp b/launcher/dialogs/NewComponentDialog.cpp similarity index 100% rename from application/dialogs/NewComponentDialog.cpp rename to launcher/dialogs/NewComponentDialog.cpp diff --git a/application/dialogs/NewComponentDialog.h b/launcher/dialogs/NewComponentDialog.h similarity index 100% rename from application/dialogs/NewComponentDialog.h rename to launcher/dialogs/NewComponentDialog.h diff --git a/application/dialogs/NewComponentDialog.ui b/launcher/dialogs/NewComponentDialog.ui similarity index 100% rename from application/dialogs/NewComponentDialog.ui rename to launcher/dialogs/NewComponentDialog.ui diff --git a/application/dialogs/NewInstanceDialog.cpp b/launcher/dialogs/NewInstanceDialog.cpp similarity index 100% rename from application/dialogs/NewInstanceDialog.cpp rename to launcher/dialogs/NewInstanceDialog.cpp diff --git a/application/dialogs/NewInstanceDialog.h b/launcher/dialogs/NewInstanceDialog.h similarity index 100% rename from application/dialogs/NewInstanceDialog.h rename to launcher/dialogs/NewInstanceDialog.h diff --git a/application/dialogs/NewInstanceDialog.ui b/launcher/dialogs/NewInstanceDialog.ui similarity index 100% rename from application/dialogs/NewInstanceDialog.ui rename to launcher/dialogs/NewInstanceDialog.ui diff --git a/application/dialogs/NotificationDialog.cpp b/launcher/dialogs/NotificationDialog.cpp similarity index 100% rename from application/dialogs/NotificationDialog.cpp rename to launcher/dialogs/NotificationDialog.cpp diff --git a/application/dialogs/NotificationDialog.h b/launcher/dialogs/NotificationDialog.h similarity index 100% rename from application/dialogs/NotificationDialog.h rename to launcher/dialogs/NotificationDialog.h diff --git a/application/dialogs/NotificationDialog.ui b/launcher/dialogs/NotificationDialog.ui similarity index 100% rename from application/dialogs/NotificationDialog.ui rename to launcher/dialogs/NotificationDialog.ui diff --git a/application/dialogs/ProfileSelectDialog.cpp b/launcher/dialogs/ProfileSelectDialog.cpp similarity index 100% rename from application/dialogs/ProfileSelectDialog.cpp rename to launcher/dialogs/ProfileSelectDialog.cpp diff --git a/application/dialogs/ProfileSelectDialog.h b/launcher/dialogs/ProfileSelectDialog.h similarity index 100% rename from application/dialogs/ProfileSelectDialog.h rename to launcher/dialogs/ProfileSelectDialog.h diff --git a/application/dialogs/ProfileSelectDialog.ui b/launcher/dialogs/ProfileSelectDialog.ui similarity index 100% rename from application/dialogs/ProfileSelectDialog.ui rename to launcher/dialogs/ProfileSelectDialog.ui diff --git a/application/dialogs/ProgressDialog.cpp b/launcher/dialogs/ProgressDialog.cpp similarity index 100% rename from application/dialogs/ProgressDialog.cpp rename to launcher/dialogs/ProgressDialog.cpp diff --git a/application/dialogs/ProgressDialog.h b/launcher/dialogs/ProgressDialog.h similarity index 100% rename from application/dialogs/ProgressDialog.h rename to launcher/dialogs/ProgressDialog.h diff --git a/application/dialogs/ProgressDialog.ui b/launcher/dialogs/ProgressDialog.ui similarity index 100% rename from application/dialogs/ProgressDialog.ui rename to launcher/dialogs/ProgressDialog.ui diff --git a/application/dialogs/SkinUploadDialog.cpp b/launcher/dialogs/SkinUploadDialog.cpp similarity index 100% rename from application/dialogs/SkinUploadDialog.cpp rename to launcher/dialogs/SkinUploadDialog.cpp diff --git a/application/dialogs/SkinUploadDialog.h b/launcher/dialogs/SkinUploadDialog.h similarity index 100% rename from application/dialogs/SkinUploadDialog.h rename to launcher/dialogs/SkinUploadDialog.h diff --git a/application/dialogs/SkinUploadDialog.ui b/launcher/dialogs/SkinUploadDialog.ui similarity index 100% rename from application/dialogs/SkinUploadDialog.ui rename to launcher/dialogs/SkinUploadDialog.ui diff --git a/application/dialogs/UpdateDialog.cpp b/launcher/dialogs/UpdateDialog.cpp similarity index 100% rename from application/dialogs/UpdateDialog.cpp rename to launcher/dialogs/UpdateDialog.cpp diff --git a/application/dialogs/UpdateDialog.h b/launcher/dialogs/UpdateDialog.h similarity index 100% rename from application/dialogs/UpdateDialog.h rename to launcher/dialogs/UpdateDialog.h diff --git a/application/dialogs/UpdateDialog.ui b/launcher/dialogs/UpdateDialog.ui similarity index 100% rename from application/dialogs/UpdateDialog.ui rename to launcher/dialogs/UpdateDialog.ui diff --git a/application/dialogs/VersionSelectDialog.cpp b/launcher/dialogs/VersionSelectDialog.cpp similarity index 100% rename from application/dialogs/VersionSelectDialog.cpp rename to launcher/dialogs/VersionSelectDialog.cpp diff --git a/application/dialogs/VersionSelectDialog.h b/launcher/dialogs/VersionSelectDialog.h similarity index 100% rename from application/dialogs/VersionSelectDialog.h rename to launcher/dialogs/VersionSelectDialog.h diff --git a/application/groupview/AccessibleGroupView.cpp b/launcher/groupview/AccessibleGroupView.cpp similarity index 100% rename from application/groupview/AccessibleGroupView.cpp rename to launcher/groupview/AccessibleGroupView.cpp diff --git a/application/groupview/AccessibleGroupView.h b/launcher/groupview/AccessibleGroupView.h similarity index 100% rename from application/groupview/AccessibleGroupView.h rename to launcher/groupview/AccessibleGroupView.h diff --git a/application/groupview/AccessibleGroupView_p.h b/launcher/groupview/AccessibleGroupView_p.h similarity index 100% rename from application/groupview/AccessibleGroupView_p.h rename to launcher/groupview/AccessibleGroupView_p.h diff --git a/application/groupview/GroupView.cpp b/launcher/groupview/GroupView.cpp similarity index 100% rename from application/groupview/GroupView.cpp rename to launcher/groupview/GroupView.cpp diff --git a/application/groupview/GroupView.h b/launcher/groupview/GroupView.h similarity index 100% rename from application/groupview/GroupView.h rename to launcher/groupview/GroupView.h diff --git a/application/groupview/GroupedProxyModel.cpp b/launcher/groupview/GroupedProxyModel.cpp similarity index 100% rename from application/groupview/GroupedProxyModel.cpp rename to launcher/groupview/GroupedProxyModel.cpp diff --git a/application/groupview/GroupedProxyModel.h b/launcher/groupview/GroupedProxyModel.h similarity index 100% rename from application/groupview/GroupedProxyModel.h rename to launcher/groupview/GroupedProxyModel.h diff --git a/application/groupview/InstanceDelegate.cpp b/launcher/groupview/InstanceDelegate.cpp similarity index 100% rename from application/groupview/InstanceDelegate.cpp rename to launcher/groupview/InstanceDelegate.cpp diff --git a/application/groupview/InstanceDelegate.h b/launcher/groupview/InstanceDelegate.h similarity index 100% rename from application/groupview/InstanceDelegate.h rename to launcher/groupview/InstanceDelegate.h diff --git a/application/groupview/VisualGroup.cpp b/launcher/groupview/VisualGroup.cpp similarity index 100% rename from application/groupview/VisualGroup.cpp rename to launcher/groupview/VisualGroup.cpp diff --git a/application/groupview/VisualGroup.h b/launcher/groupview/VisualGroup.h similarity index 100% rename from application/groupview/VisualGroup.h rename to launcher/groupview/VisualGroup.h diff --git a/api/logic/icons/IIconList.cpp b/launcher/icons/IIconList.cpp similarity index 100% rename from api/logic/icons/IIconList.cpp rename to launcher/icons/IIconList.cpp diff --git a/api/logic/icons/IIconList.h b/launcher/icons/IIconList.h similarity index 90% rename from api/logic/icons/IIconList.h rename to launcher/icons/IIconList.h index 9a3fe022d..15d7dd152 100644 --- a/api/logic/icons/IIconList.h +++ b/launcher/icons/IIconList.h @@ -2,7 +2,6 @@ #include #include -#include "multimc_logic_export.h" enum IconType : unsigned { @@ -13,7 +12,7 @@ enum IconType : unsigned ToBeDeleted }; -class MULTIMC_LOGIC_EXPORT IIconList +class IIconList { public: virtual ~IIconList(); diff --git a/api/gui/icons/IconList.cpp b/launcher/icons/IconList.cpp similarity index 100% rename from api/gui/icons/IconList.cpp rename to launcher/icons/IconList.cpp diff --git a/api/gui/icons/IconList.h b/launcher/icons/IconList.h similarity index 96% rename from api/gui/icons/IconList.h rename to launcher/icons/IconList.h index f07415fa6..70266ebb1 100644 --- a/api/gui/icons/IconList.h +++ b/launcher/icons/IconList.h @@ -26,11 +26,9 @@ #include "Env.h" // there is a global icon list inside Env. #include -#include "multimc_gui_export.h" - class QFileSystemWatcher; -class MULTIMC_GUI_EXPORT IconList : public QAbstractListModel, public IIconList +class IconList : public QAbstractListModel, public IIconList { Q_OBJECT public: diff --git a/api/logic/icons/IconUtils.cpp b/launcher/icons/IconUtils.cpp similarity index 100% rename from api/logic/icons/IconUtils.cpp rename to launcher/icons/IconUtils.cpp diff --git a/api/logic/icons/IconUtils.h b/launcher/icons/IconUtils.h similarity index 56% rename from api/logic/icons/IconUtils.h rename to launcher/icons/IconUtils.h index ce236946c..be93d9143 100644 --- a/api/logic/icons/IconUtils.h +++ b/launcher/icons/IconUtils.h @@ -1,14 +1,13 @@ #pragma once #include -#include "multimc_logic_export.h" namespace IconUtils { // Given a folder and an icon key, find 'best' of the icons with the given key in there and return its path -MULTIMC_LOGIC_EXPORT QString findBestIconIn(const QString &folder, const QString & iconKey); +QString findBestIconIn(const QString &folder, const QString & iconKey); // Get icon file type filter for file browser dialogs -MULTIMC_LOGIC_EXPORT QString getIconFilter(); +QString getIconFilter(); } diff --git a/api/gui/icons/MMCIcon.cpp b/launcher/icons/MMCIcon.cpp similarity index 100% rename from api/gui/icons/MMCIcon.cpp rename to launcher/icons/MMCIcon.cpp diff --git a/api/gui/icons/MMCIcon.h b/launcher/icons/MMCIcon.h similarity index 92% rename from api/gui/icons/MMCIcon.h rename to launcher/icons/MMCIcon.h index fd14b5b76..1f05f28e5 100644 --- a/api/gui/icons/MMCIcon.h +++ b/launcher/icons/MMCIcon.h @@ -19,9 +19,7 @@ #include #include -#include "multimc_gui_export.h" - -struct MULTIMC_GUI_EXPORT MMCImage +struct MMCImage { QIcon icon; QString key; @@ -32,7 +30,7 @@ struct MULTIMC_GUI_EXPORT MMCImage } }; -struct MULTIMC_GUI_EXPORT MMCIcon +struct MMCIcon { QString m_key; QString m_name; diff --git a/application/install_prereqs.cmake.in b/launcher/install_prereqs.cmake.in similarity index 100% rename from application/install_prereqs.cmake.in rename to launcher/install_prereqs.cmake.in diff --git a/api/logic/java/JavaChecker.cpp b/launcher/java/JavaChecker.cpp similarity index 100% rename from api/logic/java/JavaChecker.cpp rename to launcher/java/JavaChecker.cpp diff --git a/api/logic/java/JavaChecker.h b/launcher/java/JavaChecker.h similarity index 89% rename from api/logic/java/JavaChecker.h rename to launcher/java/JavaChecker.h index 0a96249a7..122861cf7 100644 --- a/api/logic/java/JavaChecker.h +++ b/launcher/java/JavaChecker.h @@ -5,13 +5,11 @@ #include "QObjectPtr.h" -#include "multimc_logic_export.h" - #include "JavaVersion.h" class JavaChecker; -struct MULTIMC_LOGIC_EXPORT JavaCheckResult +struct JavaCheckResult { QString path; QString mojangPlatform; @@ -32,7 +30,7 @@ struct MULTIMC_LOGIC_EXPORT JavaCheckResult typedef shared_qobject_ptr QProcessPtr; typedef shared_qobject_ptr JavaCheckerPtr; -class MULTIMC_LOGIC_EXPORT JavaChecker : public QObject +class JavaChecker : public QObject { Q_OBJECT public: diff --git a/api/logic/java/JavaCheckerJob.cpp b/launcher/java/JavaCheckerJob.cpp similarity index 100% rename from api/logic/java/JavaCheckerJob.cpp rename to launcher/java/JavaCheckerJob.cpp diff --git a/api/logic/java/JavaCheckerJob.h b/launcher/java/JavaCheckerJob.h similarity index 100% rename from api/logic/java/JavaCheckerJob.h rename to launcher/java/JavaCheckerJob.h diff --git a/api/logic/java/JavaInstall.cpp b/launcher/java/JavaInstall.cpp similarity index 100% rename from api/logic/java/JavaInstall.cpp rename to launcher/java/JavaInstall.cpp diff --git a/api/logic/java/JavaInstall.h b/launcher/java/JavaInstall.h similarity index 100% rename from api/logic/java/JavaInstall.h rename to launcher/java/JavaInstall.h diff --git a/api/logic/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp similarity index 100% rename from api/logic/java/JavaInstallList.cpp rename to launcher/java/JavaInstallList.cpp diff --git a/api/logic/java/JavaInstallList.h b/launcher/java/JavaInstallList.h similarity index 95% rename from api/logic/java/JavaInstallList.h rename to launcher/java/JavaInstallList.h index 1785a7b6e..e5c72b174 100644 --- a/api/logic/java/JavaInstallList.h +++ b/launcher/java/JavaInstallList.h @@ -26,11 +26,9 @@ #include "QObjectPtr.h" -#include "multimc_logic_export.h" - class JavaListLoadTask; -class MULTIMC_LOGIC_EXPORT JavaInstallList : public BaseVersionList +class JavaInstallList : public BaseVersionList { Q_OBJECT enum class Status diff --git a/api/logic/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp similarity index 100% rename from api/logic/java/JavaUtils.cpp rename to launcher/java/JavaUtils.cpp diff --git a/api/logic/java/JavaUtils.h b/launcher/java/JavaUtils.h similarity index 92% rename from api/logic/java/JavaUtils.h rename to launcher/java/JavaUtils.h index 206acf891..3152d143c 100644 --- a/api/logic/java/JavaUtils.h +++ b/launcher/java/JavaUtils.h @@ -24,11 +24,9 @@ #include #endif -#include "multimc_logic_export.h" - QProcessEnvironment CleanEnviroment(); -class MULTIMC_LOGIC_EXPORT JavaUtils : public QObject +class JavaUtils : public QObject { Q_OBJECT public: diff --git a/api/logic/java/JavaVersion.cpp b/launcher/java/JavaVersion.cpp similarity index 100% rename from api/logic/java/JavaVersion.cpp rename to launcher/java/JavaVersion.cpp diff --git a/api/logic/java/JavaVersion.h b/launcher/java/JavaVersion.h similarity index 92% rename from api/logic/java/JavaVersion.h rename to launcher/java/JavaVersion.h index 8589c21a4..9bbf06425 100644 --- a/api/logic/java/JavaVersion.h +++ b/launcher/java/JavaVersion.h @@ -1,6 +1,5 @@ #pragma once -#include "multimc_logic_export.h" #include // NOTE: apparently the GNU C library pollutes the global namespace with these... undef them. @@ -11,7 +10,7 @@ #undef minor #endif -class MULTIMC_LOGIC_EXPORT JavaVersion +class JavaVersion { friend class JavaVersionTest; public: diff --git a/api/logic/java/JavaVersion_test.cpp b/launcher/java/JavaVersion_test.cpp similarity index 100% rename from api/logic/java/JavaVersion_test.cpp rename to launcher/java/JavaVersion_test.cpp diff --git a/api/logic/java/launch/CheckJava.cpp b/launcher/java/launch/CheckJava.cpp similarity index 100% rename from api/logic/java/launch/CheckJava.cpp rename to launcher/java/launch/CheckJava.cpp diff --git a/api/logic/java/launch/CheckJava.h b/launcher/java/launch/CheckJava.h similarity index 100% rename from api/logic/java/launch/CheckJava.h rename to launcher/java/launch/CheckJava.h diff --git a/api/logic/launch/LaunchStep.cpp b/launcher/launch/LaunchStep.cpp similarity index 100% rename from api/logic/launch/LaunchStep.cpp rename to launcher/launch/LaunchStep.cpp diff --git a/api/logic/launch/LaunchStep.h b/launcher/launch/LaunchStep.h similarity index 100% rename from api/logic/launch/LaunchStep.h rename to launcher/launch/LaunchStep.h diff --git a/api/logic/launch/LaunchTask.cpp b/launcher/launch/LaunchTask.cpp similarity index 100% rename from api/logic/launch/LaunchTask.cpp rename to launcher/launch/LaunchTask.cpp diff --git a/api/logic/launch/LaunchTask.h b/launcher/launch/LaunchTask.h similarity index 97% rename from api/logic/launch/LaunchTask.h rename to launcher/launch/LaunchTask.h index 2be59c836..ae81462ff 100644 --- a/api/logic/launch/LaunchTask.h +++ b/launcher/launch/LaunchTask.h @@ -24,9 +24,7 @@ #include "LoggedProcess.h" #include "LaunchStep.h" -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT LaunchTask: public Task +class LaunchTask: public Task { Q_OBJECT protected: diff --git a/api/logic/launch/LogModel.cpp b/launcher/launch/LogModel.cpp similarity index 100% rename from api/logic/launch/LogModel.cpp rename to launcher/launch/LogModel.cpp diff --git a/api/logic/launch/LogModel.h b/launcher/launch/LogModel.h similarity index 92% rename from api/logic/launch/LogModel.h rename to launcher/launch/LogModel.h index bccceaeff..6aabc8236 100644 --- a/api/logic/launch/LogModel.h +++ b/launcher/launch/LogModel.h @@ -4,9 +4,7 @@ #include #include "MessageLevel.h" -#include - -class MULTIMC_LOGIC_EXPORT LogModel : public QAbstractListModel +class LogModel : public QAbstractListModel { Q_OBJECT public: diff --git a/api/logic/launch/steps/LookupServerAddress.cpp b/launcher/launch/steps/LookupServerAddress.cpp similarity index 100% rename from api/logic/launch/steps/LookupServerAddress.cpp rename to launcher/launch/steps/LookupServerAddress.cpp diff --git a/api/logic/launch/steps/LookupServerAddress.h b/launcher/launch/steps/LookupServerAddress.h similarity index 100% rename from api/logic/launch/steps/LookupServerAddress.h rename to launcher/launch/steps/LookupServerAddress.h diff --git a/api/logic/launch/steps/PostLaunchCommand.cpp b/launcher/launch/steps/PostLaunchCommand.cpp similarity index 100% rename from api/logic/launch/steps/PostLaunchCommand.cpp rename to launcher/launch/steps/PostLaunchCommand.cpp diff --git a/api/logic/launch/steps/PostLaunchCommand.h b/launcher/launch/steps/PostLaunchCommand.h similarity index 100% rename from api/logic/launch/steps/PostLaunchCommand.h rename to launcher/launch/steps/PostLaunchCommand.h diff --git a/api/logic/launch/steps/PreLaunchCommand.cpp b/launcher/launch/steps/PreLaunchCommand.cpp similarity index 100% rename from api/logic/launch/steps/PreLaunchCommand.cpp rename to launcher/launch/steps/PreLaunchCommand.cpp diff --git a/api/logic/launch/steps/PreLaunchCommand.h b/launcher/launch/steps/PreLaunchCommand.h similarity index 100% rename from api/logic/launch/steps/PreLaunchCommand.h rename to launcher/launch/steps/PreLaunchCommand.h diff --git a/api/logic/launch/steps/TextPrint.cpp b/launcher/launch/steps/TextPrint.cpp similarity index 100% rename from api/logic/launch/steps/TextPrint.cpp rename to launcher/launch/steps/TextPrint.cpp diff --git a/api/logic/launch/steps/TextPrint.h b/launcher/launch/steps/TextPrint.h similarity index 92% rename from api/logic/launch/steps/TextPrint.h rename to launcher/launch/steps/TextPrint.h index 2937c64ac..36fa7f9a9 100644 --- a/api/logic/launch/steps/TextPrint.h +++ b/launcher/launch/steps/TextPrint.h @@ -19,13 +19,11 @@ #include #include -#include "multimc_logic_export.h" - /* * FIXME: maybe do not export */ -class MULTIMC_LOGIC_EXPORT TextPrint: public LaunchStep +class TextPrint: public LaunchStep { Q_OBJECT public: diff --git a/api/logic/launch/steps/Update.cpp b/launcher/launch/steps/Update.cpp similarity index 100% rename from api/logic/launch/steps/Update.cpp rename to launcher/launch/steps/Update.cpp diff --git a/api/logic/launch/steps/Update.h b/launcher/launch/steps/Update.h similarity index 100% rename from api/logic/launch/steps/Update.h rename to launcher/launch/steps/Update.h diff --git a/application/main.cpp b/launcher/main.cpp similarity index 100% rename from application/main.cpp rename to launcher/main.cpp diff --git a/api/logic/meta/BaseEntity.cpp b/launcher/meta/BaseEntity.cpp similarity index 100% rename from api/logic/meta/BaseEntity.cpp rename to launcher/meta/BaseEntity.cpp diff --git a/api/logic/meta/BaseEntity.h b/launcher/meta/BaseEntity.h similarity index 95% rename from api/logic/meta/BaseEntity.h rename to launcher/meta/BaseEntity.h index 04a374208..eff438799 100644 --- a/api/logic/meta/BaseEntity.h +++ b/launcher/meta/BaseEntity.h @@ -19,13 +19,12 @@ #include #include "QObjectPtr.h" -#include "multimc_logic_export.h" #include "net/Mode.h" class Task; namespace Meta { -class MULTIMC_LOGIC_EXPORT BaseEntity +class BaseEntity { public: /* types */ using Ptr = std::shared_ptr; diff --git a/api/logic/meta/Index.cpp b/launcher/meta/Index.cpp similarity index 100% rename from api/logic/meta/Index.cpp rename to launcher/meta/Index.cpp diff --git a/api/logic/meta/Index.h b/launcher/meta/Index.h similarity index 94% rename from api/logic/meta/Index.h rename to launcher/meta/Index.h index e9412e707..d33ab0c89 100644 --- a/api/logic/meta/Index.h +++ b/launcher/meta/Index.h @@ -20,8 +20,6 @@ #include "BaseEntity.h" -#include "multimc_logic_export.h" - class Task; namespace Meta @@ -29,7 +27,7 @@ namespace Meta using VersionListPtr = std::shared_ptr; using VersionPtr = std::shared_ptr; -class MULTIMC_LOGIC_EXPORT Index : public QAbstractListModel, public BaseEntity +class Index : public QAbstractListModel, public BaseEntity { Q_OBJECT public: diff --git a/api/logic/meta/Index_test.cpp b/launcher/meta/Index_test.cpp similarity index 100% rename from api/logic/meta/Index_test.cpp rename to launcher/meta/Index_test.cpp diff --git a/api/logic/meta/JsonFormat.cpp b/launcher/meta/JsonFormat.cpp similarity index 100% rename from api/logic/meta/JsonFormat.cpp rename to launcher/meta/JsonFormat.cpp diff --git a/api/logic/meta/JsonFormat.h b/launcher/meta/JsonFormat.h similarity index 100% rename from api/logic/meta/JsonFormat.h rename to launcher/meta/JsonFormat.h diff --git a/api/logic/meta/Version.cpp b/launcher/meta/Version.cpp similarity index 100% rename from api/logic/meta/Version.cpp rename to launcher/meta/Version.cpp diff --git a/api/logic/meta/Version.h b/launcher/meta/Version.h similarity index 95% rename from api/logic/meta/Version.h rename to launcher/meta/Version.h index a38d7bcd7..dea8dc8a3 100644 --- a/api/logic/meta/Version.h +++ b/launcher/meta/Version.h @@ -26,15 +26,13 @@ #include "BaseEntity.h" -#include "multimc_logic_export.h" - #include "JsonFormat.h" namespace Meta { using VersionPtr = std::shared_ptr; -class MULTIMC_LOGIC_EXPORT Version : public QObject, public BaseVersion, public BaseEntity +class Version : public QObject, public BaseVersion, public BaseEntity { Q_OBJECT diff --git a/api/logic/meta/VersionList.cpp b/launcher/meta/VersionList.cpp similarity index 100% rename from api/logic/meta/VersionList.cpp rename to launcher/meta/VersionList.cpp diff --git a/api/logic/meta/VersionList.h b/launcher/meta/VersionList.h similarity index 96% rename from api/logic/meta/VersionList.h rename to launcher/meta/VersionList.h index bba32ca37..58cdafe78 100644 --- a/api/logic/meta/VersionList.h +++ b/launcher/meta/VersionList.h @@ -25,7 +25,7 @@ namespace Meta using VersionPtr = std::shared_ptr; using VersionListPtr = std::shared_ptr; -class MULTIMC_LOGIC_EXPORT VersionList : public BaseVersionList, public BaseEntity +class VersionList : public BaseVersionList, public BaseEntity { Q_OBJECT Q_PROPERTY(QString uid READ uid CONSTANT) diff --git a/api/logic/minecraft/AssetsUtils.cpp b/launcher/minecraft/AssetsUtils.cpp similarity index 100% rename from api/logic/minecraft/AssetsUtils.cpp rename to launcher/minecraft/AssetsUtils.cpp diff --git a/api/logic/minecraft/AssetsUtils.h b/launcher/minecraft/AssetsUtils.h similarity index 100% rename from api/logic/minecraft/AssetsUtils.h rename to launcher/minecraft/AssetsUtils.h diff --git a/api/logic/minecraft/Component.cpp b/launcher/minecraft/Component.cpp similarity index 100% rename from api/logic/minecraft/Component.cpp rename to launcher/minecraft/Component.cpp diff --git a/api/logic/minecraft/Component.h b/launcher/minecraft/Component.h similarity index 96% rename from api/logic/minecraft/Component.h rename to launcher/minecraft/Component.h index cb202f7f1..ef7c99470 100644 --- a/api/logic/minecraft/Component.h +++ b/launcher/minecraft/Component.h @@ -7,7 +7,6 @@ #include "meta/JsonFormat.h" #include "ProblemProvider.h" #include "QObjectPtr.h" -#include "multimc_logic_export.h" class PackProfile; class LaunchProfile; @@ -18,7 +17,7 @@ namespace Meta } class VersionFile; -class MULTIMC_LOGIC_EXPORT Component : public QObject, public ProblemProvider +class Component : public QObject, public ProblemProvider { Q_OBJECT public: diff --git a/api/logic/minecraft/ComponentUpdateTask.cpp b/launcher/minecraft/ComponentUpdateTask.cpp similarity index 100% rename from api/logic/minecraft/ComponentUpdateTask.cpp rename to launcher/minecraft/ComponentUpdateTask.cpp diff --git a/api/logic/minecraft/ComponentUpdateTask.h b/launcher/minecraft/ComponentUpdateTask.h similarity index 100% rename from api/logic/minecraft/ComponentUpdateTask.h rename to launcher/minecraft/ComponentUpdateTask.h diff --git a/api/logic/minecraft/ComponentUpdateTask_p.h b/launcher/minecraft/ComponentUpdateTask_p.h similarity index 100% rename from api/logic/minecraft/ComponentUpdateTask_p.h rename to launcher/minecraft/ComponentUpdateTask_p.h diff --git a/api/logic/minecraft/GradleSpecifier.h b/launcher/minecraft/GradleSpecifier.h similarity index 100% rename from api/logic/minecraft/GradleSpecifier.h rename to launcher/minecraft/GradleSpecifier.h diff --git a/api/logic/minecraft/GradleSpecifier_test.cpp b/launcher/minecraft/GradleSpecifier_test.cpp similarity index 100% rename from api/logic/minecraft/GradleSpecifier_test.cpp rename to launcher/minecraft/GradleSpecifier_test.cpp diff --git a/api/logic/minecraft/LaunchProfile.cpp b/launcher/minecraft/LaunchProfile.cpp similarity index 100% rename from api/logic/minecraft/LaunchProfile.cpp rename to launcher/minecraft/LaunchProfile.cpp diff --git a/api/logic/minecraft/LaunchProfile.h b/launcher/minecraft/LaunchProfile.h similarity index 100% rename from api/logic/minecraft/LaunchProfile.h rename to launcher/minecraft/LaunchProfile.h diff --git a/api/logic/minecraft/Library.cpp b/launcher/minecraft/Library.cpp similarity index 100% rename from api/logic/minecraft/Library.cpp rename to launcher/minecraft/Library.cpp diff --git a/api/logic/minecraft/Library.h b/launcher/minecraft/Library.h similarity index 98% rename from api/logic/minecraft/Library.h rename to launcher/minecraft/Library.h index acdd6c9c6..119b4a86a 100644 --- a/api/logic/minecraft/Library.h +++ b/launcher/minecraft/Library.h @@ -14,14 +14,12 @@ #include "GradleSpecifier.h" #include "MojangDownloadInfo.h" -#include "multimc_logic_export.h" - class Library; class MinecraftInstance; typedef std::shared_ptr LibraryPtr; -class MULTIMC_LOGIC_EXPORT Library +class Library { friend class OneSixVersionFormat; friend class MojangVersionFormat; diff --git a/api/logic/minecraft/Library_test.cpp b/launcher/minecraft/Library_test.cpp similarity index 100% rename from api/logic/minecraft/Library_test.cpp rename to launcher/minecraft/Library_test.cpp diff --git a/api/logic/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp similarity index 100% rename from api/logic/minecraft/MinecraftInstance.cpp rename to launcher/minecraft/MinecraftInstance.cpp diff --git a/api/logic/minecraft/MinecraftInstance.h b/launcher/minecraft/MinecraftInstance.h similarity index 97% rename from api/logic/minecraft/MinecraftInstance.h rename to launcher/minecraft/MinecraftInstance.h index 05600797c..b55a27762 100644 --- a/api/logic/minecraft/MinecraftInstance.h +++ b/launcher/minecraft/MinecraftInstance.h @@ -4,7 +4,6 @@ #include "minecraft/mod/Mod.h" #include #include -#include "multimc_logic_export.h" #include "minecraft/launch/MinecraftServerTarget.h" class ModFolderModel; @@ -13,7 +12,7 @@ class GameOptions; class LaunchStep; class PackProfile; -class MULTIMC_LOGIC_EXPORT MinecraftInstance: public BaseInstance +class MinecraftInstance: public BaseInstance { Q_OBJECT public: diff --git a/api/logic/minecraft/MinecraftLoadAndCheck.cpp b/launcher/minecraft/MinecraftLoadAndCheck.cpp similarity index 100% rename from api/logic/minecraft/MinecraftLoadAndCheck.cpp rename to launcher/minecraft/MinecraftLoadAndCheck.cpp diff --git a/api/logic/minecraft/MinecraftLoadAndCheck.h b/launcher/minecraft/MinecraftLoadAndCheck.h similarity index 100% rename from api/logic/minecraft/MinecraftLoadAndCheck.h rename to launcher/minecraft/MinecraftLoadAndCheck.h diff --git a/api/logic/minecraft/MinecraftUpdate.cpp b/launcher/minecraft/MinecraftUpdate.cpp similarity index 100% rename from api/logic/minecraft/MinecraftUpdate.cpp rename to launcher/minecraft/MinecraftUpdate.cpp diff --git a/api/logic/minecraft/MinecraftUpdate.h b/launcher/minecraft/MinecraftUpdate.h similarity index 100% rename from api/logic/minecraft/MinecraftUpdate.h rename to launcher/minecraft/MinecraftUpdate.h diff --git a/api/logic/minecraft/MojangDownloadInfo.h b/launcher/minecraft/MojangDownloadInfo.h similarity index 100% rename from api/logic/minecraft/MojangDownloadInfo.h rename to launcher/minecraft/MojangDownloadInfo.h diff --git a/api/logic/minecraft/MojangVersionFormat.cpp b/launcher/minecraft/MojangVersionFormat.cpp similarity index 100% rename from api/logic/minecraft/MojangVersionFormat.cpp rename to launcher/minecraft/MojangVersionFormat.cpp diff --git a/api/logic/minecraft/MojangVersionFormat.h b/launcher/minecraft/MojangVersionFormat.h similarity index 90% rename from api/logic/minecraft/MojangVersionFormat.h rename to launcher/minecraft/MojangVersionFormat.h index 2871dae43..d38f0a2ff 100644 --- a/api/logic/minecraft/MojangVersionFormat.h +++ b/launcher/minecraft/MojangVersionFormat.h @@ -5,9 +5,7 @@ #include #include -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT MojangVersionFormat +class MojangVersionFormat { friend class OneSixVersionFormat; protected: diff --git a/api/logic/minecraft/MojangVersionFormat_test.cpp b/launcher/minecraft/MojangVersionFormat_test.cpp similarity index 100% rename from api/logic/minecraft/MojangVersionFormat_test.cpp rename to launcher/minecraft/MojangVersionFormat_test.cpp diff --git a/api/logic/minecraft/OneSixVersionFormat.cpp b/launcher/minecraft/OneSixVersionFormat.cpp similarity index 100% rename from api/logic/minecraft/OneSixVersionFormat.cpp rename to launcher/minecraft/OneSixVersionFormat.cpp diff --git a/api/logic/minecraft/OneSixVersionFormat.h b/launcher/minecraft/OneSixVersionFormat.h similarity index 100% rename from api/logic/minecraft/OneSixVersionFormat.h rename to launcher/minecraft/OneSixVersionFormat.h diff --git a/api/logic/minecraft/OpSys.cpp b/launcher/minecraft/OpSys.cpp similarity index 100% rename from api/logic/minecraft/OpSys.cpp rename to launcher/minecraft/OpSys.cpp diff --git a/api/logic/minecraft/OpSys.h b/launcher/minecraft/OpSys.h similarity index 100% rename from api/logic/minecraft/OpSys.h rename to launcher/minecraft/OpSys.h diff --git a/api/logic/minecraft/PackProfile.cpp b/launcher/minecraft/PackProfile.cpp similarity index 100% rename from api/logic/minecraft/PackProfile.cpp rename to launcher/minecraft/PackProfile.cpp diff --git a/api/logic/minecraft/PackProfile.h b/launcher/minecraft/PackProfile.h similarity index 97% rename from api/logic/minecraft/PackProfile.h rename to launcher/minecraft/PackProfile.h index e55e6a580..3d6cc6c33 100644 --- a/api/logic/minecraft/PackProfile.h +++ b/launcher/minecraft/PackProfile.h @@ -27,14 +27,13 @@ #include "ProfileUtils.h" #include "BaseVersion.h" #include "MojangDownloadInfo.h" -#include "multimc_logic_export.h" #include "net/Mode.h" class MinecraftInstance; struct PackProfileData; class ComponentUpdateTask; -class MULTIMC_LOGIC_EXPORT PackProfile : public QAbstractListModel +class PackProfile : public QAbstractListModel { Q_OBJECT friend ComponentUpdateTask; diff --git a/api/logic/minecraft/PackProfile_p.h b/launcher/minecraft/PackProfile_p.h similarity index 100% rename from api/logic/minecraft/PackProfile_p.h rename to launcher/minecraft/PackProfile_p.h diff --git a/api/logic/minecraft/ParseUtils.cpp b/launcher/minecraft/ParseUtils.cpp similarity index 100% rename from api/logic/minecraft/ParseUtils.cpp rename to launcher/minecraft/ParseUtils.cpp diff --git a/api/logic/minecraft/ParseUtils.h b/launcher/minecraft/ParseUtils.h similarity index 53% rename from api/logic/minecraft/ParseUtils.h rename to launcher/minecraft/ParseUtils.h index 2b367a10a..aad82748d 100644 --- a/api/logic/minecraft/ParseUtils.h +++ b/launcher/minecraft/ParseUtils.h @@ -2,10 +2,8 @@ #include #include -#include "multimc_logic_export.h" - /// take the timestamp used by S3 and turn it into QDateTime -MULTIMC_LOGIC_EXPORT QDateTime timeFromS3Time(QString str); +QDateTime timeFromS3Time(QString str); /// take a timestamp and convert it into an S3 timestamp -MULTIMC_LOGIC_EXPORT QString timeToS3Time(QDateTime); +QString timeToS3Time(QDateTime); diff --git a/api/logic/minecraft/ParseUtils_test.cpp b/launcher/minecraft/ParseUtils_test.cpp similarity index 100% rename from api/logic/minecraft/ParseUtils_test.cpp rename to launcher/minecraft/ParseUtils_test.cpp diff --git a/api/logic/minecraft/ProfileUtils.cpp b/launcher/minecraft/ProfileUtils.cpp similarity index 100% rename from api/logic/minecraft/ProfileUtils.cpp rename to launcher/minecraft/ProfileUtils.cpp diff --git a/api/logic/minecraft/ProfileUtils.h b/launcher/minecraft/ProfileUtils.h similarity index 100% rename from api/logic/minecraft/ProfileUtils.h rename to launcher/minecraft/ProfileUtils.h diff --git a/api/logic/minecraft/Rule.cpp b/launcher/minecraft/Rule.cpp similarity index 100% rename from api/logic/minecraft/Rule.cpp rename to launcher/minecraft/Rule.cpp diff --git a/api/logic/minecraft/Rule.h b/launcher/minecraft/Rule.h similarity index 100% rename from api/logic/minecraft/Rule.h rename to launcher/minecraft/Rule.h diff --git a/api/logic/minecraft/VersionFile.cpp b/launcher/minecraft/VersionFile.cpp similarity index 100% rename from api/logic/minecraft/VersionFile.cpp rename to launcher/minecraft/VersionFile.cpp diff --git a/api/logic/minecraft/VersionFile.h b/launcher/minecraft/VersionFile.h similarity index 100% rename from api/logic/minecraft/VersionFile.h rename to launcher/minecraft/VersionFile.h diff --git a/api/logic/minecraft/VersionFilterData.cpp b/launcher/minecraft/VersionFilterData.cpp similarity index 100% rename from api/logic/minecraft/VersionFilterData.cpp rename to launcher/minecraft/VersionFilterData.cpp diff --git a/api/logic/minecraft/VersionFilterData.h b/launcher/minecraft/VersionFilterData.h similarity index 88% rename from api/logic/minecraft/VersionFilterData.h rename to launcher/minecraft/VersionFilterData.h index d100acc3d..79756c3ff 100644 --- a/api/logic/minecraft/VersionFilterData.h +++ b/launcher/minecraft/VersionFilterData.h @@ -4,8 +4,6 @@ #include #include -#include "multimc_logic_export.h" - struct FMLlib { QString filename; @@ -28,4 +26,4 @@ struct VersionFilterData // release data of first version to require Java 16 (21w19a) QDateTime java16BeginsDate; }; -extern VersionFilterData MULTIMC_LOGIC_EXPORT g_VersionFilterData; +extern VersionFilterData g_VersionFilterData; diff --git a/api/logic/minecraft/World.cpp b/launcher/minecraft/World.cpp similarity index 100% rename from api/logic/minecraft/World.cpp rename to launcher/minecraft/World.cpp diff --git a/api/logic/minecraft/World.h b/launcher/minecraft/World.h similarity index 96% rename from api/logic/minecraft/World.h rename to launcher/minecraft/World.h index 1d94d54de..35e327880 100644 --- a/api/logic/minecraft/World.h +++ b/launcher/minecraft/World.h @@ -18,9 +18,7 @@ #include #include -#include "multimc_logic_export.h" - -struct MULTIMC_LOGIC_EXPORT GameType { +struct GameType { GameType() = default; GameType (nonstd::optional original); @@ -38,7 +36,7 @@ struct MULTIMC_LOGIC_EXPORT GameType { nonstd::optional original; }; -class MULTIMC_LOGIC_EXPORT World +class World { public: World(const QFileInfo &file); diff --git a/api/logic/minecraft/WorldList.cpp b/launcher/minecraft/WorldList.cpp similarity index 100% rename from api/logic/minecraft/WorldList.cpp rename to launcher/minecraft/WorldList.cpp diff --git a/api/logic/minecraft/WorldList.h b/launcher/minecraft/WorldList.h similarity index 97% rename from api/logic/minecraft/WorldList.h rename to launcher/minecraft/WorldList.h index 740b1461d..8e238ee36 100644 --- a/api/logic/minecraft/WorldList.h +++ b/launcher/minecraft/WorldList.h @@ -22,11 +22,9 @@ #include #include "minecraft/World.h" -#include "multimc_logic_export.h" - class QFileSystemWatcher; -class MULTIMC_LOGIC_EXPORT WorldList : public QAbstractListModel +class WorldList : public QAbstractListModel { Q_OBJECT public: diff --git a/api/logic/minecraft/auth-msa/BuildConfig.cpp.in b/launcher/minecraft/auth-msa/BuildConfig.cpp.in similarity index 100% rename from api/logic/minecraft/auth-msa/BuildConfig.cpp.in rename to launcher/minecraft/auth-msa/BuildConfig.cpp.in diff --git a/api/logic/minecraft/auth-msa/BuildConfig.h b/launcher/minecraft/auth-msa/BuildConfig.h similarity index 100% rename from api/logic/minecraft/auth-msa/BuildConfig.h rename to launcher/minecraft/auth-msa/BuildConfig.h diff --git a/api/logic/minecraft/auth-msa/CMakeLists.txt b/launcher/minecraft/auth-msa/CMakeLists.txt similarity index 100% rename from api/logic/minecraft/auth-msa/CMakeLists.txt rename to launcher/minecraft/auth-msa/CMakeLists.txt diff --git a/api/logic/minecraft/auth-msa/context.cpp b/launcher/minecraft/auth-msa/context.cpp similarity index 100% rename from api/logic/minecraft/auth-msa/context.cpp rename to launcher/minecraft/auth-msa/context.cpp diff --git a/api/logic/minecraft/auth-msa/context.h b/launcher/minecraft/auth-msa/context.h similarity index 100% rename from api/logic/minecraft/auth-msa/context.h rename to launcher/minecraft/auth-msa/context.h diff --git a/api/logic/minecraft/auth-msa/main.cpp b/launcher/minecraft/auth-msa/main.cpp similarity index 100% rename from api/logic/minecraft/auth-msa/main.cpp rename to launcher/minecraft/auth-msa/main.cpp diff --git a/api/logic/minecraft/auth-msa/mainwindow.cpp b/launcher/minecraft/auth-msa/mainwindow.cpp similarity index 100% rename from api/logic/minecraft/auth-msa/mainwindow.cpp rename to launcher/minecraft/auth-msa/mainwindow.cpp diff --git a/api/logic/minecraft/auth-msa/mainwindow.h b/launcher/minecraft/auth-msa/mainwindow.h similarity index 100% rename from api/logic/minecraft/auth-msa/mainwindow.h rename to launcher/minecraft/auth-msa/mainwindow.h diff --git a/api/logic/minecraft/auth-msa/mainwindow.ui b/launcher/minecraft/auth-msa/mainwindow.ui similarity index 100% rename from api/logic/minecraft/auth-msa/mainwindow.ui rename to launcher/minecraft/auth-msa/mainwindow.ui diff --git a/api/logic/minecraft/auth/AuthSession.cpp b/launcher/minecraft/auth/AuthSession.cpp similarity index 100% rename from api/logic/minecraft/auth/AuthSession.cpp rename to launcher/minecraft/auth/AuthSession.cpp diff --git a/api/logic/minecraft/auth/AuthSession.h b/launcher/minecraft/auth/AuthSession.h similarity index 93% rename from api/logic/minecraft/auth/AuthSession.h rename to launcher/minecraft/auth/AuthSession.h index b397d9a11..299585970 100644 --- a/api/logic/minecraft/auth/AuthSession.h +++ b/launcher/minecraft/auth/AuthSession.h @@ -4,8 +4,6 @@ #include #include -#include "multimc_logic_export.h" - class MojangAccount; struct User @@ -14,7 +12,7 @@ struct User QMultiMap properties; }; -struct MULTIMC_LOGIC_EXPORT AuthSession +struct AuthSession { bool MakeOffline(QString offline_playername); diff --git a/api/logic/minecraft/auth/MojangAccount.cpp b/launcher/minecraft/auth/MojangAccount.cpp similarity index 100% rename from api/logic/minecraft/auth/MojangAccount.cpp rename to launcher/minecraft/auth/MojangAccount.cpp diff --git a/api/logic/minecraft/auth/MojangAccount.h b/launcher/minecraft/auth/MojangAccount.h similarity index 98% rename from api/logic/minecraft/auth/MojangAccount.h rename to launcher/minecraft/auth/MojangAccount.h index 30a5f2ffb..3f6cbedd8 100644 --- a/api/logic/minecraft/auth/MojangAccount.h +++ b/launcher/minecraft/auth/MojangAccount.h @@ -26,8 +26,6 @@ #include "AuthSession.h" #include "Usable.h" -#include "multimc_logic_export.h" - class Task; class YggdrasilTask; class MojangAccount; @@ -61,7 +59,7 @@ enum AccountStatus * Said information may include things such as that account's username, client token, and access * token if the user chose to stay logged in. */ -class MULTIMC_LOGIC_EXPORT MojangAccount : +class MojangAccount : public QObject, public Usable, public std::enable_shared_from_this diff --git a/api/logic/minecraft/auth/MojangAccountList.cpp b/launcher/minecraft/auth/MojangAccountList.cpp similarity index 100% rename from api/logic/minecraft/auth/MojangAccountList.cpp rename to launcher/minecraft/auth/MojangAccountList.cpp diff --git a/api/logic/minecraft/auth/MojangAccountList.h b/launcher/minecraft/auth/MojangAccountList.h similarity index 98% rename from api/logic/minecraft/auth/MojangAccountList.h rename to launcher/minecraft/auth/MojangAccountList.h index cc3a61a27..99d2988eb 100644 --- a/api/logic/minecraft/auth/MojangAccountList.h +++ b/launcher/minecraft/auth/MojangAccountList.h @@ -22,8 +22,6 @@ #include #include -#include "multimc_logic_export.h" - /*! * \brief List of available Mojang accounts. * This should be loaded in the background by MultiMC on startup. @@ -33,7 +31,7 @@ * all have a default implementation, but they can be overridden by subclasses to * change the behavior of the list. */ -class MULTIMC_LOGIC_EXPORT MojangAccountList : public QAbstractListModel +class MojangAccountList : public QAbstractListModel { Q_OBJECT public: diff --git a/api/logic/minecraft/auth/YggdrasilTask.cpp b/launcher/minecraft/auth/YggdrasilTask.cpp similarity index 100% rename from api/logic/minecraft/auth/YggdrasilTask.cpp rename to launcher/minecraft/auth/YggdrasilTask.cpp diff --git a/api/logic/minecraft/auth/YggdrasilTask.h b/launcher/minecraft/auth/YggdrasilTask.h similarity index 100% rename from api/logic/minecraft/auth/YggdrasilTask.h rename to launcher/minecraft/auth/YggdrasilTask.h diff --git a/api/logic/minecraft/auth/flows/AuthenticateTask.cpp b/launcher/minecraft/auth/flows/AuthenticateTask.cpp similarity index 100% rename from api/logic/minecraft/auth/flows/AuthenticateTask.cpp rename to launcher/minecraft/auth/flows/AuthenticateTask.cpp diff --git a/api/logic/minecraft/auth/flows/AuthenticateTask.h b/launcher/minecraft/auth/flows/AuthenticateTask.h similarity index 100% rename from api/logic/minecraft/auth/flows/AuthenticateTask.h rename to launcher/minecraft/auth/flows/AuthenticateTask.h diff --git a/api/logic/minecraft/auth/flows/RefreshTask.cpp b/launcher/minecraft/auth/flows/RefreshTask.cpp similarity index 100% rename from api/logic/minecraft/auth/flows/RefreshTask.cpp rename to launcher/minecraft/auth/flows/RefreshTask.cpp diff --git a/api/logic/minecraft/auth/flows/RefreshTask.h b/launcher/minecraft/auth/flows/RefreshTask.h similarity index 100% rename from api/logic/minecraft/auth/flows/RefreshTask.h rename to launcher/minecraft/auth/flows/RefreshTask.h diff --git a/api/logic/minecraft/auth/flows/ValidateTask.cpp b/launcher/minecraft/auth/flows/ValidateTask.cpp similarity index 100% rename from api/logic/minecraft/auth/flows/ValidateTask.cpp rename to launcher/minecraft/auth/flows/ValidateTask.cpp diff --git a/api/logic/minecraft/auth/flows/ValidateTask.h b/launcher/minecraft/auth/flows/ValidateTask.h similarity index 100% rename from api/logic/minecraft/auth/flows/ValidateTask.h rename to launcher/minecraft/auth/flows/ValidateTask.h diff --git a/api/logic/minecraft/gameoptions/GameOptions.cpp b/launcher/minecraft/gameoptions/GameOptions.cpp similarity index 100% rename from api/logic/minecraft/gameoptions/GameOptions.cpp rename to launcher/minecraft/gameoptions/GameOptions.cpp diff --git a/api/logic/minecraft/gameoptions/GameOptions.h b/launcher/minecraft/gameoptions/GameOptions.h similarity index 100% rename from api/logic/minecraft/gameoptions/GameOptions.h rename to launcher/minecraft/gameoptions/GameOptions.h diff --git a/api/logic/minecraft/launch/ClaimAccount.cpp b/launcher/minecraft/launch/ClaimAccount.cpp similarity index 100% rename from api/logic/minecraft/launch/ClaimAccount.cpp rename to launcher/minecraft/launch/ClaimAccount.cpp diff --git a/api/logic/minecraft/launch/ClaimAccount.h b/launcher/minecraft/launch/ClaimAccount.h similarity index 100% rename from api/logic/minecraft/launch/ClaimAccount.h rename to launcher/minecraft/launch/ClaimAccount.h diff --git a/api/logic/minecraft/launch/CreateGameFolders.cpp b/launcher/minecraft/launch/CreateGameFolders.cpp similarity index 100% rename from api/logic/minecraft/launch/CreateGameFolders.cpp rename to launcher/minecraft/launch/CreateGameFolders.cpp diff --git a/api/logic/minecraft/launch/CreateGameFolders.h b/launcher/minecraft/launch/CreateGameFolders.h similarity index 100% rename from api/logic/minecraft/launch/CreateGameFolders.h rename to launcher/minecraft/launch/CreateGameFolders.h diff --git a/api/logic/minecraft/launch/DirectJavaLaunch.cpp b/launcher/minecraft/launch/DirectJavaLaunch.cpp similarity index 100% rename from api/logic/minecraft/launch/DirectJavaLaunch.cpp rename to launcher/minecraft/launch/DirectJavaLaunch.cpp diff --git a/api/logic/minecraft/launch/DirectJavaLaunch.h b/launcher/minecraft/launch/DirectJavaLaunch.h similarity index 100% rename from api/logic/minecraft/launch/DirectJavaLaunch.h rename to launcher/minecraft/launch/DirectJavaLaunch.h diff --git a/api/logic/minecraft/launch/ExtractNatives.cpp b/launcher/minecraft/launch/ExtractNatives.cpp similarity index 100% rename from api/logic/minecraft/launch/ExtractNatives.cpp rename to launcher/minecraft/launch/ExtractNatives.cpp diff --git a/api/logic/minecraft/launch/ExtractNatives.h b/launcher/minecraft/launch/ExtractNatives.h similarity index 100% rename from api/logic/minecraft/launch/ExtractNatives.h rename to launcher/minecraft/launch/ExtractNatives.h diff --git a/api/logic/minecraft/launch/LauncherPartLaunch.cpp b/launcher/minecraft/launch/LauncherPartLaunch.cpp similarity index 100% rename from api/logic/minecraft/launch/LauncherPartLaunch.cpp rename to launcher/minecraft/launch/LauncherPartLaunch.cpp diff --git a/api/logic/minecraft/launch/LauncherPartLaunch.h b/launcher/minecraft/launch/LauncherPartLaunch.h similarity index 100% rename from api/logic/minecraft/launch/LauncherPartLaunch.h rename to launcher/minecraft/launch/LauncherPartLaunch.h diff --git a/api/logic/minecraft/launch/MinecraftServerTarget.cpp b/launcher/minecraft/launch/MinecraftServerTarget.cpp similarity index 100% rename from api/logic/minecraft/launch/MinecraftServerTarget.cpp rename to launcher/minecraft/launch/MinecraftServerTarget.cpp diff --git a/api/logic/minecraft/launch/MinecraftServerTarget.h b/launcher/minecraft/launch/MinecraftServerTarget.h similarity index 86% rename from api/logic/minecraft/launch/MinecraftServerTarget.h rename to launcher/minecraft/launch/MinecraftServerTarget.h index 3c5786f4f..a402421af 100644 --- a/api/logic/minecraft/launch/MinecraftServerTarget.h +++ b/launcher/minecraft/launch/MinecraftServerTarget.h @@ -18,13 +18,12 @@ #include #include -#include struct MinecraftServerTarget { QString address; quint16 port; - static MULTIMC_LOGIC_EXPORT MinecraftServerTarget parse(const QString &fullAddress); + static MinecraftServerTarget parse(const QString &fullAddress); }; typedef std::shared_ptr MinecraftServerTargetPtr; diff --git a/api/logic/minecraft/launch/ModMinecraftJar.cpp b/launcher/minecraft/launch/ModMinecraftJar.cpp similarity index 100% rename from api/logic/minecraft/launch/ModMinecraftJar.cpp rename to launcher/minecraft/launch/ModMinecraftJar.cpp diff --git a/api/logic/minecraft/launch/ModMinecraftJar.h b/launcher/minecraft/launch/ModMinecraftJar.h similarity index 100% rename from api/logic/minecraft/launch/ModMinecraftJar.h rename to launcher/minecraft/launch/ModMinecraftJar.h diff --git a/api/logic/minecraft/launch/PrintInstanceInfo.cpp b/launcher/minecraft/launch/PrintInstanceInfo.cpp similarity index 100% rename from api/logic/minecraft/launch/PrintInstanceInfo.cpp rename to launcher/minecraft/launch/PrintInstanceInfo.cpp diff --git a/api/logic/minecraft/launch/PrintInstanceInfo.h b/launcher/minecraft/launch/PrintInstanceInfo.h similarity index 100% rename from api/logic/minecraft/launch/PrintInstanceInfo.h rename to launcher/minecraft/launch/PrintInstanceInfo.h diff --git a/api/logic/minecraft/launch/ReconstructAssets.cpp b/launcher/minecraft/launch/ReconstructAssets.cpp similarity index 100% rename from api/logic/minecraft/launch/ReconstructAssets.cpp rename to launcher/minecraft/launch/ReconstructAssets.cpp diff --git a/api/logic/minecraft/launch/ReconstructAssets.h b/launcher/minecraft/launch/ReconstructAssets.h similarity index 100% rename from api/logic/minecraft/launch/ReconstructAssets.h rename to launcher/minecraft/launch/ReconstructAssets.h diff --git a/api/logic/minecraft/launch/ScanModFolders.cpp b/launcher/minecraft/launch/ScanModFolders.cpp similarity index 100% rename from api/logic/minecraft/launch/ScanModFolders.cpp rename to launcher/minecraft/launch/ScanModFolders.cpp diff --git a/api/logic/minecraft/launch/ScanModFolders.h b/launcher/minecraft/launch/ScanModFolders.h similarity index 100% rename from api/logic/minecraft/launch/ScanModFolders.h rename to launcher/minecraft/launch/ScanModFolders.h diff --git a/api/logic/minecraft/launch/VerifyJavaInstall.cpp b/launcher/minecraft/launch/VerifyJavaInstall.cpp similarity index 100% rename from api/logic/minecraft/launch/VerifyJavaInstall.cpp rename to launcher/minecraft/launch/VerifyJavaInstall.cpp diff --git a/api/logic/minecraft/launch/VerifyJavaInstall.h b/launcher/minecraft/launch/VerifyJavaInstall.h similarity index 100% rename from api/logic/minecraft/launch/VerifyJavaInstall.h rename to launcher/minecraft/launch/VerifyJavaInstall.h diff --git a/api/logic/minecraft/legacy/LegacyInstance.cpp b/launcher/minecraft/legacy/LegacyInstance.cpp similarity index 100% rename from api/logic/minecraft/legacy/LegacyInstance.cpp rename to launcher/minecraft/legacy/LegacyInstance.cpp diff --git a/api/logic/minecraft/legacy/LegacyInstance.h b/launcher/minecraft/legacy/LegacyInstance.h similarity index 97% rename from api/logic/minecraft/legacy/LegacyInstance.h rename to launcher/minecraft/legacy/LegacyInstance.h index 325bac7a5..ac2a8543f 100644 --- a/api/logic/minecraft/legacy/LegacyInstance.h +++ b/launcher/minecraft/legacy/LegacyInstance.h @@ -18,8 +18,6 @@ #include "BaseInstance.h" #include "launch/LaunchTask.h" -#include "multimc_logic_export.h" - class ModFolderModel; class LegacyModList; class WorldList; @@ -27,7 +25,7 @@ class Task; /* * WHY: Legacy instances - from MultiMC 3 and 4 - are here only to provide a way to upgrade them to the current format. */ -class MULTIMC_LOGIC_EXPORT LegacyInstance : public BaseInstance +class LegacyInstance : public BaseInstance { Q_OBJECT public: diff --git a/api/logic/minecraft/legacy/LegacyModList.cpp b/launcher/minecraft/legacy/LegacyModList.cpp similarity index 100% rename from api/logic/minecraft/legacy/LegacyModList.cpp rename to launcher/minecraft/legacy/LegacyModList.cpp diff --git a/api/logic/minecraft/legacy/LegacyModList.h b/launcher/minecraft/legacy/LegacyModList.h similarity index 93% rename from api/logic/minecraft/legacy/LegacyModList.h rename to launcher/minecraft/legacy/LegacyModList.h index 8881d471f..fade736ed 100644 --- a/api/logic/minecraft/legacy/LegacyModList.h +++ b/launcher/minecraft/legacy/LegacyModList.h @@ -19,9 +19,7 @@ #include #include -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT LegacyModList +class LegacyModList { public: diff --git a/api/logic/minecraft/legacy/LegacyUpgradeTask.cpp b/launcher/minecraft/legacy/LegacyUpgradeTask.cpp similarity index 100% rename from api/logic/minecraft/legacy/LegacyUpgradeTask.cpp rename to launcher/minecraft/legacy/LegacyUpgradeTask.cpp diff --git a/api/logic/minecraft/legacy/LegacyUpgradeTask.h b/launcher/minecraft/legacy/LegacyUpgradeTask.h similarity index 84% rename from api/logic/minecraft/legacy/LegacyUpgradeTask.h rename to launcher/minecraft/legacy/LegacyUpgradeTask.h index e35e43b7d..542e17b8d 100644 --- a/api/logic/minecraft/legacy/LegacyUpgradeTask.h +++ b/launcher/minecraft/legacy/LegacyUpgradeTask.h @@ -1,7 +1,6 @@ #pragma once #include "InstanceTask.h" -#include "multimc_logic_export.h" #include "net/NetJob.h" #include #include @@ -11,7 +10,7 @@ #include "BaseInstance.h" -class MULTIMC_LOGIC_EXPORT LegacyUpgradeTask : public InstanceTask +class LegacyUpgradeTask : public InstanceTask { Q_OBJECT public: diff --git a/api/logic/minecraft/mod/LocalModParseTask.cpp b/launcher/minecraft/mod/LocalModParseTask.cpp similarity index 100% rename from api/logic/minecraft/mod/LocalModParseTask.cpp rename to launcher/minecraft/mod/LocalModParseTask.cpp diff --git a/api/logic/minecraft/mod/LocalModParseTask.h b/launcher/minecraft/mod/LocalModParseTask.h similarity index 100% rename from api/logic/minecraft/mod/LocalModParseTask.h rename to launcher/minecraft/mod/LocalModParseTask.h diff --git a/api/logic/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp similarity index 100% rename from api/logic/minecraft/mod/Mod.cpp rename to launcher/minecraft/mod/Mod.cpp diff --git a/api/logic/minecraft/mod/Mod.h b/launcher/minecraft/mod/Mod.h similarity index 97% rename from api/logic/minecraft/mod/Mod.h rename to launcher/minecraft/mod/Mod.h index f77ffd410..921faeb15 100644 --- a/api/logic/minecraft/mod/Mod.h +++ b/launcher/minecraft/mod/Mod.h @@ -19,13 +19,11 @@ #include #include -#include "multimc_logic_export.h" - #include "ModDetails.h" -class MULTIMC_LOGIC_EXPORT Mod +class Mod { public: enum ModType diff --git a/api/logic/minecraft/mod/ModDetails.h b/launcher/minecraft/mod/ModDetails.h similarity index 100% rename from api/logic/minecraft/mod/ModDetails.h rename to launcher/minecraft/mod/ModDetails.h diff --git a/api/logic/minecraft/mod/ModFolderLoadTask.cpp b/launcher/minecraft/mod/ModFolderLoadTask.cpp similarity index 100% rename from api/logic/minecraft/mod/ModFolderLoadTask.cpp rename to launcher/minecraft/mod/ModFolderLoadTask.cpp diff --git a/api/logic/minecraft/mod/ModFolderLoadTask.h b/launcher/minecraft/mod/ModFolderLoadTask.h similarity index 100% rename from api/logic/minecraft/mod/ModFolderLoadTask.h rename to launcher/minecraft/mod/ModFolderLoadTask.h diff --git a/api/logic/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp similarity index 100% rename from api/logic/minecraft/mod/ModFolderModel.cpp rename to launcher/minecraft/mod/ModFolderModel.cpp diff --git a/api/logic/minecraft/mod/ModFolderModel.h b/launcher/minecraft/mod/ModFolderModel.h similarity index 97% rename from api/logic/minecraft/mod/ModFolderModel.h rename to launcher/minecraft/mod/ModFolderModel.h index b0a761217..62c504dfc 100644 --- a/api/logic/minecraft/mod/ModFolderModel.h +++ b/launcher/minecraft/mod/ModFolderModel.h @@ -24,7 +24,6 @@ #include "Mod.h" -#include "multimc_logic_export.h" #include "ModFolderLoadTask.h" #include "LocalModParseTask.h" @@ -36,7 +35,7 @@ class QFileSystemWatcher; * A legacy mod list. * Backed by a folder. */ -class MULTIMC_LOGIC_EXPORT ModFolderModel : public QAbstractListModel +class ModFolderModel : public QAbstractListModel { Q_OBJECT public: diff --git a/api/logic/minecraft/mod/ModFolderModel_test.cpp b/launcher/minecraft/mod/ModFolderModel_test.cpp similarity index 100% rename from api/logic/minecraft/mod/ModFolderModel_test.cpp rename to launcher/minecraft/mod/ModFolderModel_test.cpp diff --git a/api/logic/minecraft/mod/ResourcePackFolderModel.cpp b/launcher/minecraft/mod/ResourcePackFolderModel.cpp similarity index 100% rename from api/logic/minecraft/mod/ResourcePackFolderModel.cpp rename to launcher/minecraft/mod/ResourcePackFolderModel.cpp diff --git a/api/logic/minecraft/mod/ResourcePackFolderModel.h b/launcher/minecraft/mod/ResourcePackFolderModel.h similarity index 74% rename from api/logic/minecraft/mod/ResourcePackFolderModel.h rename to launcher/minecraft/mod/ResourcePackFolderModel.h index 47eb4bb2d..0cd6214bf 100644 --- a/api/logic/minecraft/mod/ResourcePackFolderModel.h +++ b/launcher/minecraft/mod/ResourcePackFolderModel.h @@ -2,7 +2,7 @@ #include "ModFolderModel.h" -class MULTIMC_LOGIC_EXPORT ResourcePackFolderModel : public ModFolderModel +class ResourcePackFolderModel : public ModFolderModel { Q_OBJECT diff --git a/api/logic/minecraft/mod/TexturePackFolderModel.cpp b/launcher/minecraft/mod/TexturePackFolderModel.cpp similarity index 100% rename from api/logic/minecraft/mod/TexturePackFolderModel.cpp rename to launcher/minecraft/mod/TexturePackFolderModel.cpp diff --git a/api/logic/minecraft/mod/TexturePackFolderModel.h b/launcher/minecraft/mod/TexturePackFolderModel.h similarity index 74% rename from api/logic/minecraft/mod/TexturePackFolderModel.h rename to launcher/minecraft/mod/TexturePackFolderModel.h index d773b17b4..a59d51192 100644 --- a/api/logic/minecraft/mod/TexturePackFolderModel.h +++ b/launcher/minecraft/mod/TexturePackFolderModel.h @@ -2,7 +2,7 @@ #include "ModFolderModel.h" -class MULTIMC_LOGIC_EXPORT TexturePackFolderModel : public ModFolderModel +class TexturePackFolderModel : public ModFolderModel { Q_OBJECT diff --git a/api/logic/minecraft/services/SkinDelete.cpp b/launcher/minecraft/services/SkinDelete.cpp similarity index 100% rename from api/logic/minecraft/services/SkinDelete.cpp rename to launcher/minecraft/services/SkinDelete.cpp diff --git a/api/logic/minecraft/services/SkinDelete.h b/launcher/minecraft/services/SkinDelete.h similarity index 86% rename from api/logic/minecraft/services/SkinDelete.h rename to launcher/minecraft/services/SkinDelete.h index 705ce8ef7..839bf9bc7 100644 --- a/api/logic/minecraft/services/SkinDelete.h +++ b/launcher/minecraft/services/SkinDelete.h @@ -5,11 +5,10 @@ #include #include #include "tasks/Task.h" -#include "multimc_logic_export.h" typedef std::shared_ptr SkinDeletePtr; -class MULTIMC_LOGIC_EXPORT SkinDelete : public Task +class SkinDelete : public Task { Q_OBJECT public: diff --git a/api/logic/minecraft/services/SkinUpload.cpp b/launcher/minecraft/services/SkinUpload.cpp similarity index 100% rename from api/logic/minecraft/services/SkinUpload.cpp rename to launcher/minecraft/services/SkinUpload.cpp diff --git a/api/logic/minecraft/services/SkinUpload.h b/launcher/minecraft/services/SkinUpload.h similarity index 89% rename from api/logic/minecraft/services/SkinUpload.h rename to launcher/minecraft/services/SkinUpload.h index c77abb034..ec859699e 100644 --- a/api/logic/minecraft/services/SkinUpload.h +++ b/launcher/minecraft/services/SkinUpload.h @@ -5,11 +5,10 @@ #include #include #include "tasks/Task.h" -#include "multimc_logic_export.h" typedef std::shared_ptr SkinUploadPtr; -class MULTIMC_LOGIC_EXPORT SkinUpload : public Task +class SkinUpload : public Task { Q_OBJECT public: diff --git a/api/logic/minecraft/testdata/1.9-simple.json b/launcher/minecraft/testdata/1.9-simple.json similarity index 100% rename from api/logic/minecraft/testdata/1.9-simple.json rename to launcher/minecraft/testdata/1.9-simple.json diff --git a/api/logic/minecraft/testdata/1.9.json b/launcher/minecraft/testdata/1.9.json similarity index 100% rename from api/logic/minecraft/testdata/1.9.json rename to launcher/minecraft/testdata/1.9.json diff --git a/api/logic/minecraft/testdata/codecwav-20101023.jar b/launcher/minecraft/testdata/codecwav-20101023.jar similarity index 100% rename from api/logic/minecraft/testdata/codecwav-20101023.jar rename to launcher/minecraft/testdata/codecwav-20101023.jar diff --git a/api/logic/minecraft/testdata/lib-native-arch.json b/launcher/minecraft/testdata/lib-native-arch.json similarity index 100% rename from api/logic/minecraft/testdata/lib-native-arch.json rename to launcher/minecraft/testdata/lib-native-arch.json diff --git a/api/logic/minecraft/testdata/lib-native.json b/launcher/minecraft/testdata/lib-native.json similarity index 100% rename from api/logic/minecraft/testdata/lib-native.json rename to launcher/minecraft/testdata/lib-native.json diff --git a/api/logic/minecraft/testdata/lib-simple.json b/launcher/minecraft/testdata/lib-simple.json similarity index 100% rename from api/logic/minecraft/testdata/lib-simple.json rename to launcher/minecraft/testdata/lib-simple.json diff --git a/api/logic/minecraft/testdata/testname-testversion-linux-32.jar b/launcher/minecraft/testdata/testname-testversion-linux-32.jar similarity index 100% rename from api/logic/minecraft/testdata/testname-testversion-linux-32.jar rename to launcher/minecraft/testdata/testname-testversion-linux-32.jar diff --git a/api/logic/minecraft/update/AssetUpdateTask.cpp b/launcher/minecraft/update/AssetUpdateTask.cpp similarity index 100% rename from api/logic/minecraft/update/AssetUpdateTask.cpp rename to launcher/minecraft/update/AssetUpdateTask.cpp diff --git a/api/logic/minecraft/update/AssetUpdateTask.h b/launcher/minecraft/update/AssetUpdateTask.h similarity index 100% rename from api/logic/minecraft/update/AssetUpdateTask.h rename to launcher/minecraft/update/AssetUpdateTask.h diff --git a/api/logic/minecraft/update/FMLLibrariesTask.cpp b/launcher/minecraft/update/FMLLibrariesTask.cpp similarity index 100% rename from api/logic/minecraft/update/FMLLibrariesTask.cpp rename to launcher/minecraft/update/FMLLibrariesTask.cpp diff --git a/api/logic/minecraft/update/FMLLibrariesTask.h b/launcher/minecraft/update/FMLLibrariesTask.h similarity index 100% rename from api/logic/minecraft/update/FMLLibrariesTask.h rename to launcher/minecraft/update/FMLLibrariesTask.h diff --git a/api/logic/minecraft/update/FoldersTask.cpp b/launcher/minecraft/update/FoldersTask.cpp similarity index 100% rename from api/logic/minecraft/update/FoldersTask.cpp rename to launcher/minecraft/update/FoldersTask.cpp diff --git a/api/logic/minecraft/update/FoldersTask.h b/launcher/minecraft/update/FoldersTask.h similarity index 100% rename from api/logic/minecraft/update/FoldersTask.h rename to launcher/minecraft/update/FoldersTask.h diff --git a/api/logic/minecraft/update/LibrariesTask.cpp b/launcher/minecraft/update/LibrariesTask.cpp similarity index 100% rename from api/logic/minecraft/update/LibrariesTask.cpp rename to launcher/minecraft/update/LibrariesTask.cpp diff --git a/api/logic/minecraft/update/LibrariesTask.h b/launcher/minecraft/update/LibrariesTask.h similarity index 100% rename from api/logic/minecraft/update/LibrariesTask.h rename to launcher/minecraft/update/LibrariesTask.h diff --git a/api/logic/modplatform/atlauncher/ATLPackIndex.cpp b/launcher/modplatform/atlauncher/ATLPackIndex.cpp similarity index 100% rename from api/logic/modplatform/atlauncher/ATLPackIndex.cpp rename to launcher/modplatform/atlauncher/ATLPackIndex.cpp diff --git a/api/logic/modplatform/atlauncher/ATLPackIndex.h b/launcher/modplatform/atlauncher/ATLPackIndex.h similarity index 79% rename from api/logic/modplatform/atlauncher/ATLPackIndex.h rename to launcher/modplatform/atlauncher/ATLPackIndex.h index 5e2e6487c..405a34483 100644 --- a/api/logic/modplatform/atlauncher/ATLPackIndex.h +++ b/launcher/modplatform/atlauncher/ATLPackIndex.h @@ -6,8 +6,6 @@ #include #include -#include "multimc_logic_export.h" - namespace ATLauncher { @@ -30,7 +28,7 @@ struct IndexedPack QString safeName; }; -MULTIMC_LOGIC_EXPORT void loadIndexedPack(IndexedPack & m, QJsonObject & obj); +void loadIndexedPack(IndexedPack & m, QJsonObject & obj); } Q_DECLARE_METATYPE(ATLauncher::IndexedPack) diff --git a/api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp similarity index 100% rename from api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp rename to launcher/modplatform/atlauncher/ATLPackInstallTask.cpp diff --git a/api/logic/modplatform/atlauncher/ATLPackInstallTask.h b/launcher/modplatform/atlauncher/ATLPackInstallTask.h similarity index 94% rename from api/logic/modplatform/atlauncher/ATLPackInstallTask.h rename to launcher/modplatform/atlauncher/ATLPackInstallTask.h index 15fd9b328..39e2b0135 100644 --- a/api/logic/modplatform/atlauncher/ATLPackInstallTask.h +++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.h @@ -4,7 +4,6 @@ #include "ATLPackManifest.h" #include "InstanceTask.h" -#include "multimc_logic_export.h" #include "net/NetJob.h" #include "settings/INISettingsObject.h" #include "minecraft/MinecraftInstance.h" @@ -15,7 +14,7 @@ namespace ATLauncher { -class MULTIMC_LOGIC_EXPORT UserInteractionSupport { +class UserInteractionSupport { public: /** @@ -31,7 +30,7 @@ public: }; -class MULTIMC_LOGIC_EXPORT PackInstallTask : public InstanceTask +class PackInstallTask : public InstanceTask { Q_OBJECT diff --git a/api/logic/modplatform/atlauncher/ATLPackManifest.cpp b/launcher/modplatform/atlauncher/ATLPackManifest.cpp similarity index 100% rename from api/logic/modplatform/atlauncher/ATLPackManifest.cpp rename to launcher/modplatform/atlauncher/ATLPackManifest.cpp diff --git a/api/logic/modplatform/atlauncher/ATLPackManifest.h b/launcher/modplatform/atlauncher/ATLPackManifest.h similarity index 94% rename from api/logic/modplatform/atlauncher/ATLPackManifest.h rename to launcher/modplatform/atlauncher/ATLPackManifest.h index 17821e4ce..ead216a5c 100644 --- a/api/logic/modplatform/atlauncher/ATLPackManifest.h +++ b/launcher/modplatform/atlauncher/ATLPackManifest.h @@ -3,7 +3,6 @@ #include #include #include -#include namespace ATLauncher { @@ -121,6 +120,6 @@ struct PackVersion VersionConfigs configs; }; -MULTIMC_LOGIC_EXPORT void loadVersion(PackVersion & v, QJsonObject & obj); +void loadVersion(PackVersion & v, QJsonObject & obj); } diff --git a/api/logic/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp similarity index 100% rename from api/logic/modplatform/flame/FileResolvingTask.cpp rename to launcher/modplatform/flame/FileResolvingTask.cpp diff --git a/api/logic/modplatform/flame/FileResolvingTask.h b/launcher/modplatform/flame/FileResolvingTask.h similarity index 84% rename from api/logic/modplatform/flame/FileResolvingTask.h rename to launcher/modplatform/flame/FileResolvingTask.h index 5679b9072..78a38fcb4 100644 --- a/api/logic/modplatform/flame/FileResolvingTask.h +++ b/launcher/modplatform/flame/FileResolvingTask.h @@ -4,11 +4,9 @@ #include "net/NetJob.h" #include "PackManifest.h" -#include "multimc_logic_export.h" - namespace Flame { -class MULTIMC_LOGIC_EXPORT FileResolvingTask : public Task +class FileResolvingTask : public Task { Q_OBJECT public: diff --git a/api/logic/modplatform/flame/FlamePackIndex.cpp b/launcher/modplatform/flame/FlamePackIndex.cpp similarity index 100% rename from api/logic/modplatform/flame/FlamePackIndex.cpp rename to launcher/modplatform/flame/FlamePackIndex.cpp diff --git a/api/logic/modplatform/flame/FlamePackIndex.h b/launcher/modplatform/flame/FlamePackIndex.h similarity index 75% rename from api/logic/modplatform/flame/FlamePackIndex.h rename to launcher/modplatform/flame/FlamePackIndex.h index cdeb2c138..7ffa29c3d 100644 --- a/api/logic/modplatform/flame/FlamePackIndex.h +++ b/launcher/modplatform/flame/FlamePackIndex.h @@ -5,8 +5,6 @@ #include #include -#include "multimc_logic_export.h" - namespace Flame { struct ModpackAuthor { @@ -36,8 +34,8 @@ struct IndexedPack QVector versions; }; -MULTIMC_LOGIC_EXPORT void loadIndexedPack(IndexedPack & m, QJsonObject & obj); -MULTIMC_LOGIC_EXPORT void loadIndexedPackVersions(IndexedPack & m, QJsonArray & arr); +void loadIndexedPack(IndexedPack & m, QJsonObject & obj); +void loadIndexedPackVersions(IndexedPack & m, QJsonArray & arr); } Q_DECLARE_METATYPE(Flame::IndexedPack) diff --git a/api/logic/modplatform/flame/PackManifest.cpp b/launcher/modplatform/flame/PackManifest.cpp similarity index 100% rename from api/logic/modplatform/flame/PackManifest.cpp rename to launcher/modplatform/flame/PackManifest.cpp diff --git a/api/logic/modplatform/flame/PackManifest.h b/launcher/modplatform/flame/PackManifest.h similarity index 100% rename from api/logic/modplatform/flame/PackManifest.h rename to launcher/modplatform/flame/PackManifest.h diff --git a/api/logic/modplatform/legacy_ftb/PackFetchTask.cpp b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp similarity index 100% rename from api/logic/modplatform/legacy_ftb/PackFetchTask.cpp rename to launcher/modplatform/legacy_ftb/PackFetchTask.cpp diff --git a/api/logic/modplatform/legacy_ftb/PackFetchTask.h b/launcher/modplatform/legacy_ftb/PackFetchTask.h similarity index 93% rename from api/logic/modplatform/legacy_ftb/PackFetchTask.h rename to launcher/modplatform/legacy_ftb/PackFetchTask.h index 4a8469b11..3ab32fab2 100644 --- a/api/logic/modplatform/legacy_ftb/PackFetchTask.h +++ b/launcher/modplatform/legacy_ftb/PackFetchTask.h @@ -8,7 +8,7 @@ namespace LegacyFTB { -class MULTIMC_LOGIC_EXPORT PackFetchTask : public QObject { +class PackFetchTask : public QObject { Q_OBJECT diff --git a/api/logic/modplatform/legacy_ftb/PackHelpers.h b/launcher/modplatform/legacy_ftb/PackHelpers.h similarity index 100% rename from api/logic/modplatform/legacy_ftb/PackHelpers.h rename to launcher/modplatform/legacy_ftb/PackHelpers.h diff --git a/api/logic/modplatform/legacy_ftb/PackInstallTask.cpp b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp similarity index 100% rename from api/logic/modplatform/legacy_ftb/PackInstallTask.cpp rename to launcher/modplatform/legacy_ftb/PackInstallTask.cpp diff --git a/api/logic/modplatform/legacy_ftb/PackInstallTask.h b/launcher/modplatform/legacy_ftb/PackInstallTask.h similarity index 94% rename from api/logic/modplatform/legacy_ftb/PackInstallTask.h rename to launcher/modplatform/legacy_ftb/PackInstallTask.h index f3515781c..600f72e7c 100644 --- a/api/logic/modplatform/legacy_ftb/PackInstallTask.h +++ b/launcher/modplatform/legacy_ftb/PackInstallTask.h @@ -12,7 +12,7 @@ namespace LegacyFTB { -class MULTIMC_LOGIC_EXPORT PackInstallTask : public InstanceTask +class PackInstallTask : public InstanceTask { Q_OBJECT diff --git a/api/logic/modplatform/legacy_ftb/PrivatePackManager.cpp b/launcher/modplatform/legacy_ftb/PrivatePackManager.cpp similarity index 100% rename from api/logic/modplatform/legacy_ftb/PrivatePackManager.cpp rename to launcher/modplatform/legacy_ftb/PrivatePackManager.cpp diff --git a/api/logic/modplatform/legacy_ftb/PrivatePackManager.h b/launcher/modplatform/legacy_ftb/PrivatePackManager.h similarity index 89% rename from api/logic/modplatform/legacy_ftb/PrivatePackManager.h rename to launcher/modplatform/legacy_ftb/PrivatePackManager.h index 0232bac72..0e8146462 100644 --- a/api/logic/modplatform/legacy_ftb/PrivatePackManager.h +++ b/launcher/modplatform/legacy_ftb/PrivatePackManager.h @@ -3,11 +3,10 @@ #include #include #include -#include "multimc_logic_export.h" namespace LegacyFTB { -class MULTIMC_LOGIC_EXPORT PrivatePackManager +class PrivatePackManager { public: ~PrivatePackManager() diff --git a/api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp similarity index 100% rename from api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp rename to launcher/modplatform/modpacksch/FTBPackInstallTask.cpp diff --git a/api/logic/modplatform/modpacksch/FTBPackInstallTask.h b/launcher/modplatform/modpacksch/FTBPackInstallTask.h similarity index 87% rename from api/logic/modplatform/modpacksch/FTBPackInstallTask.h rename to launcher/modplatform/modpacksch/FTBPackInstallTask.h index 55db3d3cc..fdd84c4ed 100644 --- a/api/logic/modplatform/modpacksch/FTBPackInstallTask.h +++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.h @@ -3,12 +3,11 @@ #include "FTBPackManifest.h" #include "InstanceTask.h" -#include "multimc_logic_export.h" #include "net/NetJob.h" namespace ModpacksCH { -class MULTIMC_LOGIC_EXPORT PackInstallTask : public InstanceTask +class PackInstallTask : public InstanceTask { Q_OBJECT diff --git a/api/logic/modplatform/modpacksch/FTBPackManifest.cpp b/launcher/modplatform/modpacksch/FTBPackManifest.cpp similarity index 100% rename from api/logic/modplatform/modpacksch/FTBPackManifest.cpp rename to launcher/modplatform/modpacksch/FTBPackManifest.cpp diff --git a/api/logic/modplatform/modpacksch/FTBPackManifest.h b/launcher/modplatform/modpacksch/FTBPackManifest.h similarity index 90% rename from api/logic/modplatform/modpacksch/FTBPackManifest.h rename to launcher/modplatform/modpacksch/FTBPackManifest.h index 518fffbf8..7818b36d4 100644 --- a/api/logic/modplatform/modpacksch/FTBPackManifest.h +++ b/launcher/modplatform/modpacksch/FTBPackManifest.h @@ -6,8 +6,6 @@ #include #include -#include "multimc_logic_export.h" - namespace ModpacksCH { @@ -119,9 +117,9 @@ struct VersionChangelog int64_t updated; }; -MULTIMC_LOGIC_EXPORT void loadModpack(Modpack & m, QJsonObject & obj); +void loadModpack(Modpack & m, QJsonObject & obj); -MULTIMC_LOGIC_EXPORT void loadVersion(Version & m, QJsonObject & obj); +void loadVersion(Version & m, QJsonObject & obj); } Q_DECLARE_METATYPE(ModpacksCH::Modpack) diff --git a/api/logic/modplatform/technic/SingleZipPackInstallTask.cpp b/launcher/modplatform/technic/SingleZipPackInstallTask.cpp similarity index 100% rename from api/logic/modplatform/technic/SingleZipPackInstallTask.cpp rename to launcher/modplatform/technic/SingleZipPackInstallTask.cpp diff --git a/api/logic/modplatform/technic/SingleZipPackInstallTask.h b/launcher/modplatform/technic/SingleZipPackInstallTask.h similarity index 93% rename from api/logic/modplatform/technic/SingleZipPackInstallTask.h rename to launcher/modplatform/technic/SingleZipPackInstallTask.h index ec2ff605d..80f10a985 100644 --- a/api/logic/modplatform/technic/SingleZipPackInstallTask.h +++ b/launcher/modplatform/technic/SingleZipPackInstallTask.h @@ -17,7 +17,6 @@ #include "InstanceTask.h" #include "net/NetJob.h" -#include "multimc_logic_export.h" #include "quazip.h" @@ -29,7 +28,7 @@ namespace Technic { -class MULTIMC_LOGIC_EXPORT SingleZipPackInstallTask : public InstanceTask +class SingleZipPackInstallTask : public InstanceTask { Q_OBJECT diff --git a/api/logic/modplatform/technic/SolderPackInstallTask.cpp b/launcher/modplatform/technic/SolderPackInstallTask.cpp similarity index 100% rename from api/logic/modplatform/technic/SolderPackInstallTask.cpp rename to launcher/modplatform/technic/SolderPackInstallTask.cpp diff --git a/api/logic/modplatform/technic/SolderPackInstallTask.h b/launcher/modplatform/technic/SolderPackInstallTask.h similarity index 95% rename from api/logic/modplatform/technic/SolderPackInstallTask.h rename to launcher/modplatform/technic/SolderPackInstallTask.h index 9f0f20a99..6e1057ebb 100644 --- a/api/logic/modplatform/technic/SolderPackInstallTask.h +++ b/launcher/modplatform/technic/SolderPackInstallTask.h @@ -23,7 +23,7 @@ namespace Technic { - class MULTIMC_LOGIC_EXPORT SolderPackInstallTask : public InstanceTask + class SolderPackInstallTask : public InstanceTask { Q_OBJECT public: diff --git a/api/logic/modplatform/technic/TechnicPackProcessor.cpp b/launcher/modplatform/technic/TechnicPackProcessor.cpp similarity index 100% rename from api/logic/modplatform/technic/TechnicPackProcessor.cpp rename to launcher/modplatform/technic/TechnicPackProcessor.cpp diff --git a/api/logic/modplatform/technic/TechnicPackProcessor.h b/launcher/modplatform/technic/TechnicPackProcessor.h similarity index 100% rename from api/logic/modplatform/technic/TechnicPackProcessor.h rename to launcher/modplatform/technic/TechnicPackProcessor.h diff --git a/api/logic/mojang/PackageManifest.cpp b/launcher/mojang/PackageManifest.cpp similarity index 100% rename from api/logic/mojang/PackageManifest.cpp rename to launcher/mojang/PackageManifest.cpp diff --git a/api/logic/mojang/PackageManifest.h b/launcher/mojang/PackageManifest.h similarity index 92% rename from api/logic/mojang/PackageManifest.h rename to launcher/mojang/PackageManifest.h index d01a05543..fd7ab0ad4 100644 --- a/api/logic/mojang/PackageManifest.h +++ b/launcher/mojang/PackageManifest.h @@ -6,15 +6,13 @@ #include #include "tasks/Task.h" -#include "multimc_logic_export.h" - namespace mojang_files { using Hash = QString; extern const Hash empty_hash; // simple-ish path implementation. assumes always relative and does not allow '..' entries -class MULTIMC_LOGIC_EXPORT Path +class Path { public: using parts_type = QStringList; @@ -106,7 +104,7 @@ enum class Compression { }; -struct MULTIMC_LOGIC_EXPORT FileSource +struct FileSource { Compression compression = Compression::Unknown; Hash hash; @@ -122,14 +120,14 @@ struct MULTIMC_LOGIC_EXPORT FileSource } }; -struct MULTIMC_LOGIC_EXPORT File +struct File { Hash hash; bool executable; std::uint64_t size = 0; }; -struct MULTIMC_LOGIC_EXPORT Package { +struct Package { static Package fromInspectedFolder(const QString &folderPath); static Package fromManifestFile(const QString &path); static Package fromManifestContents(const QByteArray& contents); @@ -150,7 +148,7 @@ struct MULTIMC_LOGIC_EXPORT Package { std::map symlinks; }; -struct MULTIMC_LOGIC_EXPORT FileDownload : FileSource +struct FileDownload : FileSource { FileDownload(const FileSource& source, bool executable) { static_cast (*this) = source; @@ -159,7 +157,7 @@ struct MULTIMC_LOGIC_EXPORT FileDownload : FileSource bool executable = false; }; -struct MULTIMC_LOGIC_EXPORT UpdateOperations { +struct UpdateOperations { static UpdateOperations resolve(const Package & from, const Package & to); bool valid = false; std::vector deletes; diff --git a/api/logic/mojang/PackageManifest_test.cpp b/launcher/mojang/PackageManifest_test.cpp similarity index 100% rename from api/logic/mojang/PackageManifest_test.cpp rename to launcher/mojang/PackageManifest_test.cpp diff --git a/api/logic/mojang/testdata/1.8.0_202-x64.json b/launcher/mojang/testdata/1.8.0_202-x64.json similarity index 100% rename from api/logic/mojang/testdata/1.8.0_202-x64.json rename to launcher/mojang/testdata/1.8.0_202-x64.json diff --git a/api/logic/mojang/testdata/inspect/a/b.txt b/launcher/mojang/testdata/inspect/a/b.txt similarity index 100% rename from api/logic/mojang/testdata/inspect/a/b.txt rename to launcher/mojang/testdata/inspect/a/b.txt diff --git a/api/logic/mojang/testdata/inspect/a/b/b.txt b/launcher/mojang/testdata/inspect/a/b/b.txt similarity index 100% rename from api/logic/mojang/testdata/inspect/a/b/b.txt rename to launcher/mojang/testdata/inspect/a/b/b.txt diff --git a/api/logic/mojang/testdata/inspect_win/a/b.txt b/launcher/mojang/testdata/inspect_win/a/b.txt similarity index 100% rename from api/logic/mojang/testdata/inspect_win/a/b.txt rename to launcher/mojang/testdata/inspect_win/a/b.txt diff --git a/api/logic/mojang/testdata/inspect_win/a/b/b.txt b/launcher/mojang/testdata/inspect_win/a/b/b.txt similarity index 100% rename from api/logic/mojang/testdata/inspect_win/a/b/b.txt rename to launcher/mojang/testdata/inspect_win/a/b/b.txt diff --git a/api/logic/net/ByteArraySink.h b/launcher/net/ByteArraySink.h similarity index 100% rename from api/logic/net/ByteArraySink.h rename to launcher/net/ByteArraySink.h diff --git a/api/logic/net/ChecksumValidator.h b/launcher/net/ChecksumValidator.h similarity index 100% rename from api/logic/net/ChecksumValidator.h rename to launcher/net/ChecksumValidator.h diff --git a/api/logic/net/Download.cpp b/launcher/net/Download.cpp similarity index 100% rename from api/logic/net/Download.cpp rename to launcher/net/Download.cpp diff --git a/api/logic/net/Download.h b/launcher/net/Download.h similarity index 95% rename from api/logic/net/Download.h rename to launcher/net/Download.h index 2c4360329..a224bb86f 100644 --- a/api/logic/net/Download.h +++ b/launcher/net/Download.h @@ -20,9 +20,8 @@ #include "Validator.h" #include "Sink.h" -#include "multimc_logic_export.h" namespace Net { -class MULTIMC_LOGIC_EXPORT Download : public NetAction +class Download : public NetAction { Q_OBJECT diff --git a/api/logic/net/FileSink.cpp b/launcher/net/FileSink.cpp similarity index 100% rename from api/logic/net/FileSink.cpp rename to launcher/net/FileSink.cpp diff --git a/api/logic/net/FileSink.h b/launcher/net/FileSink.h similarity index 100% rename from api/logic/net/FileSink.h rename to launcher/net/FileSink.h diff --git a/api/logic/net/HttpMetaCache.cpp b/launcher/net/HttpMetaCache.cpp similarity index 100% rename from api/logic/net/HttpMetaCache.cpp rename to launcher/net/HttpMetaCache.cpp diff --git a/api/logic/net/HttpMetaCache.h b/launcher/net/HttpMetaCache.h similarity index 96% rename from api/logic/net/HttpMetaCache.h rename to launcher/net/HttpMetaCache.h index c32487930..1c10e8c79 100644 --- a/api/logic/net/HttpMetaCache.h +++ b/launcher/net/HttpMetaCache.h @@ -19,11 +19,9 @@ #include #include -#include "multimc_logic_export.h" - class HttpMetaCache; -class MULTIMC_LOGIC_EXPORT MetaEntry +class MetaEntry { friend class HttpMetaCache; protected: @@ -79,7 +77,7 @@ protected: typedef std::shared_ptr MetaEntryPtr; -class MULTIMC_LOGIC_EXPORT HttpMetaCache : public QObject +class HttpMetaCache : public QObject { Q_OBJECT public: diff --git a/api/logic/net/MetaCacheSink.cpp b/launcher/net/MetaCacheSink.cpp similarity index 100% rename from api/logic/net/MetaCacheSink.cpp rename to launcher/net/MetaCacheSink.cpp diff --git a/api/logic/net/MetaCacheSink.h b/launcher/net/MetaCacheSink.h similarity index 100% rename from api/logic/net/MetaCacheSink.h rename to launcher/net/MetaCacheSink.h diff --git a/api/logic/net/Mode.h b/launcher/net/Mode.h similarity index 100% rename from api/logic/net/Mode.h rename to launcher/net/Mode.h diff --git a/api/logic/net/NetAction.h b/launcher/net/NetAction.h similarity index 96% rename from api/logic/net/NetAction.h rename to launcher/net/NetAction.h index 02b249a3e..c13c187fc 100644 --- a/api/logic/net/NetAction.h +++ b/launcher/net/NetAction.h @@ -21,8 +21,6 @@ #include #include -#include "multimc_logic_export.h" - enum JobStatus { Job_NotStarted, @@ -38,7 +36,7 @@ enum JobStatus }; typedef std::shared_ptr NetActionPtr; -class MULTIMC_LOGIC_EXPORT NetAction : public QObject +class NetAction : public QObject { Q_OBJECT protected: diff --git a/api/logic/net/NetJob.cpp b/launcher/net/NetJob.cpp similarity index 100% rename from api/logic/net/NetJob.cpp rename to launcher/net/NetJob.cpp diff --git a/api/logic/net/NetJob.h b/launcher/net/NetJob.h similarity index 96% rename from api/logic/net/NetJob.h rename to launcher/net/NetJob.h index 480d80375..338f8e712 100644 --- a/api/logic/net/NetJob.h +++ b/launcher/net/NetJob.h @@ -21,12 +21,10 @@ #include "tasks/Task.h" #include "QObjectPtr.h" -#include "multimc_logic_export.h" - class NetJob; typedef shared_qobject_ptr NetJobPtr; -class MULTIMC_LOGIC_EXPORT NetJob : public Task +class NetJob : public Task { Q_OBJECT public: diff --git a/api/logic/net/PasteUpload.cpp b/launcher/net/PasteUpload.cpp similarity index 100% rename from api/logic/net/PasteUpload.cpp rename to launcher/net/PasteUpload.cpp diff --git a/api/logic/net/PasteUpload.h b/launcher/net/PasteUpload.h similarity index 91% rename from api/logic/net/PasteUpload.h rename to launcher/net/PasteUpload.h index 11e05c2e4..5514e058c 100644 --- a/api/logic/net/PasteUpload.h +++ b/launcher/net/PasteUpload.h @@ -4,9 +4,7 @@ #include #include -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT PasteUpload : public Task +class PasteUpload : public Task { Q_OBJECT public: diff --git a/api/logic/net/Sink.h b/launcher/net/Sink.h similarity index 95% rename from api/logic/net/Sink.h rename to launcher/net/Sink.h index d526895c2..d367fb15c 100644 --- a/api/logic/net/Sink.h +++ b/launcher/net/Sink.h @@ -2,11 +2,10 @@ #include "net/NetAction.h" -#include "multimc_logic_export.h" #include "Validator.h" namespace Net { -class MULTIMC_LOGIC_EXPORT Sink +class Sink { public: /* con/des */ Sink() {}; diff --git a/api/logic/net/Validator.h b/launcher/net/Validator.h similarity index 82% rename from api/logic/net/Validator.h rename to launcher/net/Validator.h index 955412cee..59b72a0b0 100644 --- a/api/logic/net/Validator.h +++ b/launcher/net/Validator.h @@ -2,10 +2,8 @@ #include "net/NetAction.h" -#include "multimc_logic_export.h" - namespace Net { -class MULTIMC_LOGIC_EXPORT Validator +class Validator { public: /* con/des */ Validator() {}; @@ -17,4 +15,4 @@ public: /* methods */ virtual bool abort() = 0; virtual bool validate(QNetworkReply & reply) = 0; }; -} \ No newline at end of file +} diff --git a/api/logic/news/NewsChecker.cpp b/launcher/news/NewsChecker.cpp similarity index 100% rename from api/logic/news/NewsChecker.cpp rename to launcher/news/NewsChecker.cpp diff --git a/api/logic/news/NewsChecker.h b/launcher/news/NewsChecker.h similarity index 96% rename from api/logic/news/NewsChecker.h rename to launcher/news/NewsChecker.h index c473ecab0..84b1f5526 100644 --- a/api/logic/news/NewsChecker.h +++ b/launcher/news/NewsChecker.h @@ -23,9 +23,7 @@ #include "NewsEntry.h" -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT NewsChecker : public QObject +class NewsChecker : public QObject { Q_OBJECT public: diff --git a/api/logic/news/NewsEntry.cpp b/launcher/news/NewsEntry.cpp similarity index 100% rename from api/logic/news/NewsEntry.cpp rename to launcher/news/NewsEntry.cpp diff --git a/api/logic/news/NewsEntry.h b/launcher/news/NewsEntry.h similarity index 100% rename from api/logic/news/NewsEntry.h rename to launcher/news/NewsEntry.h diff --git a/api/logic/notifications/NotificationChecker.cpp b/launcher/notifications/NotificationChecker.cpp similarity index 100% rename from api/logic/notifications/NotificationChecker.cpp rename to launcher/notifications/NotificationChecker.cpp diff --git a/api/logic/notifications/NotificationChecker.h b/launcher/notifications/NotificationChecker.h similarity index 92% rename from api/logic/notifications/NotificationChecker.h rename to launcher/notifications/NotificationChecker.h index 4b1b893d1..eb2b32a2a 100644 --- a/api/logic/notifications/NotificationChecker.h +++ b/launcher/notifications/NotificationChecker.h @@ -5,9 +5,7 @@ #include "net/NetJob.h" #include "net/Download.h" -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT NotificationChecker : public QObject +class NotificationChecker : public QObject { Q_OBJECT diff --git a/application/package/linux/MultiMC b/launcher/package/linux/MultiMC similarity index 100% rename from application/package/linux/MultiMC rename to launcher/package/linux/MultiMC diff --git a/application/package/linux/multimc.desktop b/launcher/package/linux/multimc.desktop similarity index 100% rename from application/package/linux/multimc.desktop rename to launcher/package/linux/multimc.desktop diff --git a/application/package/rpm/MultiMC5.spec b/launcher/package/rpm/MultiMC5.spec similarity index 100% rename from application/package/rpm/MultiMC5.spec rename to launcher/package/rpm/MultiMC5.spec diff --git a/application/package/rpm/README.md b/launcher/package/rpm/README.md similarity index 100% rename from application/package/rpm/README.md rename to launcher/package/rpm/README.md diff --git a/application/package/ubuntu/README.md b/launcher/package/ubuntu/README.md similarity index 100% rename from application/package/ubuntu/README.md rename to launcher/package/ubuntu/README.md diff --git a/application/package/ubuntu/multimc/DEBIAN/control b/launcher/package/ubuntu/multimc/DEBIAN/control similarity index 100% rename from application/package/ubuntu/multimc/DEBIAN/control rename to launcher/package/ubuntu/multimc/DEBIAN/control diff --git a/application/package/ubuntu/multimc/DEBIAN/postrm b/launcher/package/ubuntu/multimc/DEBIAN/postrm similarity index 100% rename from application/package/ubuntu/multimc/DEBIAN/postrm rename to launcher/package/ubuntu/multimc/DEBIAN/postrm diff --git a/application/package/ubuntu/multimc/opt/multimc/icon.svg b/launcher/package/ubuntu/multimc/opt/multimc/icon.svg similarity index 100% rename from application/package/ubuntu/multimc/opt/multimc/icon.svg rename to launcher/package/ubuntu/multimc/opt/multimc/icon.svg diff --git a/application/package/ubuntu/multimc/opt/multimc/run.sh b/launcher/package/ubuntu/multimc/opt/multimc/run.sh similarity index 100% rename from application/package/ubuntu/multimc/opt/multimc/run.sh rename to launcher/package/ubuntu/multimc/opt/multimc/run.sh diff --git a/application/package/ubuntu/multimc/usr/share/applications/multimc.desktop b/launcher/package/ubuntu/multimc/usr/share/applications/multimc.desktop similarity index 100% rename from application/package/ubuntu/multimc/usr/share/applications/multimc.desktop rename to launcher/package/ubuntu/multimc/usr/share/applications/multimc.desktop diff --git a/application/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml b/launcher/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml similarity index 100% rename from application/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml rename to launcher/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml diff --git a/application/pagedialog/PageDialog.cpp b/launcher/pagedialog/PageDialog.cpp similarity index 100% rename from application/pagedialog/PageDialog.cpp rename to launcher/pagedialog/PageDialog.cpp diff --git a/application/pagedialog/PageDialog.h b/launcher/pagedialog/PageDialog.h similarity index 100% rename from application/pagedialog/PageDialog.h rename to launcher/pagedialog/PageDialog.h diff --git a/application/pages/BasePage.h b/launcher/pages/BasePage.h similarity index 100% rename from application/pages/BasePage.h rename to launcher/pages/BasePage.h diff --git a/application/pages/BasePageContainer.h b/launcher/pages/BasePageContainer.h similarity index 100% rename from application/pages/BasePageContainer.h rename to launcher/pages/BasePageContainer.h diff --git a/application/pages/BasePageProvider.h b/launcher/pages/BasePageProvider.h similarity index 100% rename from application/pages/BasePageProvider.h rename to launcher/pages/BasePageProvider.h diff --git a/application/pages/global/AccountListPage.cpp b/launcher/pages/global/AccountListPage.cpp similarity index 100% rename from application/pages/global/AccountListPage.cpp rename to launcher/pages/global/AccountListPage.cpp diff --git a/application/pages/global/AccountListPage.h b/launcher/pages/global/AccountListPage.h similarity index 100% rename from application/pages/global/AccountListPage.h rename to launcher/pages/global/AccountListPage.h diff --git a/application/pages/global/AccountListPage.ui b/launcher/pages/global/AccountListPage.ui similarity index 100% rename from application/pages/global/AccountListPage.ui rename to launcher/pages/global/AccountListPage.ui diff --git a/application/pages/global/CustomCommandsPage.cpp b/launcher/pages/global/CustomCommandsPage.cpp similarity index 100% rename from application/pages/global/CustomCommandsPage.cpp rename to launcher/pages/global/CustomCommandsPage.cpp diff --git a/application/pages/global/CustomCommandsPage.h b/launcher/pages/global/CustomCommandsPage.h similarity index 100% rename from application/pages/global/CustomCommandsPage.h rename to launcher/pages/global/CustomCommandsPage.h diff --git a/application/pages/global/ExternalToolsPage.cpp b/launcher/pages/global/ExternalToolsPage.cpp similarity index 100% rename from application/pages/global/ExternalToolsPage.cpp rename to launcher/pages/global/ExternalToolsPage.cpp diff --git a/application/pages/global/ExternalToolsPage.h b/launcher/pages/global/ExternalToolsPage.h similarity index 100% rename from application/pages/global/ExternalToolsPage.h rename to launcher/pages/global/ExternalToolsPage.h diff --git a/application/pages/global/ExternalToolsPage.ui b/launcher/pages/global/ExternalToolsPage.ui similarity index 100% rename from application/pages/global/ExternalToolsPage.ui rename to launcher/pages/global/ExternalToolsPage.ui diff --git a/application/pages/global/JavaPage.cpp b/launcher/pages/global/JavaPage.cpp similarity index 100% rename from application/pages/global/JavaPage.cpp rename to launcher/pages/global/JavaPage.cpp diff --git a/application/pages/global/JavaPage.h b/launcher/pages/global/JavaPage.h similarity index 100% rename from application/pages/global/JavaPage.h rename to launcher/pages/global/JavaPage.h diff --git a/application/pages/global/JavaPage.ui b/launcher/pages/global/JavaPage.ui similarity index 100% rename from application/pages/global/JavaPage.ui rename to launcher/pages/global/JavaPage.ui diff --git a/application/pages/global/LanguagePage.cpp b/launcher/pages/global/LanguagePage.cpp similarity index 100% rename from application/pages/global/LanguagePage.cpp rename to launcher/pages/global/LanguagePage.cpp diff --git a/application/pages/global/LanguagePage.h b/launcher/pages/global/LanguagePage.h similarity index 100% rename from application/pages/global/LanguagePage.h rename to launcher/pages/global/LanguagePage.h diff --git a/application/pages/global/MinecraftPage.cpp b/launcher/pages/global/MinecraftPage.cpp similarity index 100% rename from application/pages/global/MinecraftPage.cpp rename to launcher/pages/global/MinecraftPage.cpp diff --git a/application/pages/global/MinecraftPage.h b/launcher/pages/global/MinecraftPage.h similarity index 100% rename from application/pages/global/MinecraftPage.h rename to launcher/pages/global/MinecraftPage.h diff --git a/application/pages/global/MinecraftPage.ui b/launcher/pages/global/MinecraftPage.ui similarity index 100% rename from application/pages/global/MinecraftPage.ui rename to launcher/pages/global/MinecraftPage.ui diff --git a/application/pages/global/MultiMCPage.cpp b/launcher/pages/global/MultiMCPage.cpp similarity index 100% rename from application/pages/global/MultiMCPage.cpp rename to launcher/pages/global/MultiMCPage.cpp diff --git a/application/pages/global/MultiMCPage.h b/launcher/pages/global/MultiMCPage.h similarity index 100% rename from application/pages/global/MultiMCPage.h rename to launcher/pages/global/MultiMCPage.h diff --git a/application/pages/global/MultiMCPage.ui b/launcher/pages/global/MultiMCPage.ui similarity index 100% rename from application/pages/global/MultiMCPage.ui rename to launcher/pages/global/MultiMCPage.ui diff --git a/application/pages/global/PasteEEPage.cpp b/launcher/pages/global/PasteEEPage.cpp similarity index 100% rename from application/pages/global/PasteEEPage.cpp rename to launcher/pages/global/PasteEEPage.cpp diff --git a/application/pages/global/PasteEEPage.h b/launcher/pages/global/PasteEEPage.h similarity index 100% rename from application/pages/global/PasteEEPage.h rename to launcher/pages/global/PasteEEPage.h diff --git a/application/pages/global/PasteEEPage.ui b/launcher/pages/global/PasteEEPage.ui similarity index 100% rename from application/pages/global/PasteEEPage.ui rename to launcher/pages/global/PasteEEPage.ui diff --git a/application/pages/global/ProxyPage.cpp b/launcher/pages/global/ProxyPage.cpp similarity index 100% rename from application/pages/global/ProxyPage.cpp rename to launcher/pages/global/ProxyPage.cpp diff --git a/application/pages/global/ProxyPage.h b/launcher/pages/global/ProxyPage.h similarity index 100% rename from application/pages/global/ProxyPage.h rename to launcher/pages/global/ProxyPage.h diff --git a/application/pages/global/ProxyPage.ui b/launcher/pages/global/ProxyPage.ui similarity index 100% rename from application/pages/global/ProxyPage.ui rename to launcher/pages/global/ProxyPage.ui diff --git a/application/pages/instance/GameOptionsPage.cpp b/launcher/pages/instance/GameOptionsPage.cpp similarity index 100% rename from application/pages/instance/GameOptionsPage.cpp rename to launcher/pages/instance/GameOptionsPage.cpp diff --git a/application/pages/instance/GameOptionsPage.h b/launcher/pages/instance/GameOptionsPage.h similarity index 100% rename from application/pages/instance/GameOptionsPage.h rename to launcher/pages/instance/GameOptionsPage.h diff --git a/application/pages/instance/GameOptionsPage.ui b/launcher/pages/instance/GameOptionsPage.ui similarity index 100% rename from application/pages/instance/GameOptionsPage.ui rename to launcher/pages/instance/GameOptionsPage.ui diff --git a/application/pages/instance/InstanceSettingsPage.cpp b/launcher/pages/instance/InstanceSettingsPage.cpp similarity index 100% rename from application/pages/instance/InstanceSettingsPage.cpp rename to launcher/pages/instance/InstanceSettingsPage.cpp diff --git a/application/pages/instance/InstanceSettingsPage.h b/launcher/pages/instance/InstanceSettingsPage.h similarity index 100% rename from application/pages/instance/InstanceSettingsPage.h rename to launcher/pages/instance/InstanceSettingsPage.h diff --git a/application/pages/instance/InstanceSettingsPage.ui b/launcher/pages/instance/InstanceSettingsPage.ui similarity index 100% rename from application/pages/instance/InstanceSettingsPage.ui rename to launcher/pages/instance/InstanceSettingsPage.ui diff --git a/application/pages/instance/LegacyUpgradePage.cpp b/launcher/pages/instance/LegacyUpgradePage.cpp similarity index 100% rename from application/pages/instance/LegacyUpgradePage.cpp rename to launcher/pages/instance/LegacyUpgradePage.cpp diff --git a/application/pages/instance/LegacyUpgradePage.h b/launcher/pages/instance/LegacyUpgradePage.h similarity index 100% rename from application/pages/instance/LegacyUpgradePage.h rename to launcher/pages/instance/LegacyUpgradePage.h diff --git a/application/pages/instance/LegacyUpgradePage.ui b/launcher/pages/instance/LegacyUpgradePage.ui similarity index 100% rename from application/pages/instance/LegacyUpgradePage.ui rename to launcher/pages/instance/LegacyUpgradePage.ui diff --git a/application/pages/instance/LogPage.cpp b/launcher/pages/instance/LogPage.cpp similarity index 100% rename from application/pages/instance/LogPage.cpp rename to launcher/pages/instance/LogPage.cpp diff --git a/application/pages/instance/LogPage.h b/launcher/pages/instance/LogPage.h similarity index 100% rename from application/pages/instance/LogPage.h rename to launcher/pages/instance/LogPage.h diff --git a/application/pages/instance/LogPage.ui b/launcher/pages/instance/LogPage.ui similarity index 100% rename from application/pages/instance/LogPage.ui rename to launcher/pages/instance/LogPage.ui diff --git a/application/pages/instance/ModFolderPage.cpp b/launcher/pages/instance/ModFolderPage.cpp similarity index 100% rename from application/pages/instance/ModFolderPage.cpp rename to launcher/pages/instance/ModFolderPage.cpp diff --git a/application/pages/instance/ModFolderPage.h b/launcher/pages/instance/ModFolderPage.h similarity index 100% rename from application/pages/instance/ModFolderPage.h rename to launcher/pages/instance/ModFolderPage.h diff --git a/application/pages/instance/ModFolderPage.ui b/launcher/pages/instance/ModFolderPage.ui similarity index 100% rename from application/pages/instance/ModFolderPage.ui rename to launcher/pages/instance/ModFolderPage.ui diff --git a/application/pages/instance/NotesPage.cpp b/launcher/pages/instance/NotesPage.cpp similarity index 100% rename from application/pages/instance/NotesPage.cpp rename to launcher/pages/instance/NotesPage.cpp diff --git a/application/pages/instance/NotesPage.h b/launcher/pages/instance/NotesPage.h similarity index 100% rename from application/pages/instance/NotesPage.h rename to launcher/pages/instance/NotesPage.h diff --git a/application/pages/instance/NotesPage.ui b/launcher/pages/instance/NotesPage.ui similarity index 100% rename from application/pages/instance/NotesPage.ui rename to launcher/pages/instance/NotesPage.ui diff --git a/application/pages/instance/OtherLogsPage.cpp b/launcher/pages/instance/OtherLogsPage.cpp similarity index 100% rename from application/pages/instance/OtherLogsPage.cpp rename to launcher/pages/instance/OtherLogsPage.cpp diff --git a/application/pages/instance/OtherLogsPage.h b/launcher/pages/instance/OtherLogsPage.h similarity index 100% rename from application/pages/instance/OtherLogsPage.h rename to launcher/pages/instance/OtherLogsPage.h diff --git a/application/pages/instance/OtherLogsPage.ui b/launcher/pages/instance/OtherLogsPage.ui similarity index 100% rename from application/pages/instance/OtherLogsPage.ui rename to launcher/pages/instance/OtherLogsPage.ui diff --git a/application/pages/instance/ResourcePackPage.h b/launcher/pages/instance/ResourcePackPage.h similarity index 100% rename from application/pages/instance/ResourcePackPage.h rename to launcher/pages/instance/ResourcePackPage.h diff --git a/application/pages/instance/ScreenshotsPage.cpp b/launcher/pages/instance/ScreenshotsPage.cpp similarity index 100% rename from application/pages/instance/ScreenshotsPage.cpp rename to launcher/pages/instance/ScreenshotsPage.cpp diff --git a/application/pages/instance/ScreenshotsPage.h b/launcher/pages/instance/ScreenshotsPage.h similarity index 100% rename from application/pages/instance/ScreenshotsPage.h rename to launcher/pages/instance/ScreenshotsPage.h diff --git a/application/pages/instance/ScreenshotsPage.ui b/launcher/pages/instance/ScreenshotsPage.ui similarity index 100% rename from application/pages/instance/ScreenshotsPage.ui rename to launcher/pages/instance/ScreenshotsPage.ui diff --git a/application/pages/instance/ServersPage.cpp b/launcher/pages/instance/ServersPage.cpp similarity index 100% rename from application/pages/instance/ServersPage.cpp rename to launcher/pages/instance/ServersPage.cpp diff --git a/application/pages/instance/ServersPage.h b/launcher/pages/instance/ServersPage.h similarity index 100% rename from application/pages/instance/ServersPage.h rename to launcher/pages/instance/ServersPage.h diff --git a/application/pages/instance/ServersPage.ui b/launcher/pages/instance/ServersPage.ui similarity index 100% rename from application/pages/instance/ServersPage.ui rename to launcher/pages/instance/ServersPage.ui diff --git a/application/pages/instance/TexturePackPage.h b/launcher/pages/instance/TexturePackPage.h similarity index 100% rename from application/pages/instance/TexturePackPage.h rename to launcher/pages/instance/TexturePackPage.h diff --git a/application/pages/instance/VersionPage.cpp b/launcher/pages/instance/VersionPage.cpp similarity index 100% rename from application/pages/instance/VersionPage.cpp rename to launcher/pages/instance/VersionPage.cpp diff --git a/application/pages/instance/VersionPage.h b/launcher/pages/instance/VersionPage.h similarity index 100% rename from application/pages/instance/VersionPage.h rename to launcher/pages/instance/VersionPage.h diff --git a/application/pages/instance/VersionPage.ui b/launcher/pages/instance/VersionPage.ui similarity index 100% rename from application/pages/instance/VersionPage.ui rename to launcher/pages/instance/VersionPage.ui diff --git a/application/pages/instance/WorldListPage.cpp b/launcher/pages/instance/WorldListPage.cpp similarity index 100% rename from application/pages/instance/WorldListPage.cpp rename to launcher/pages/instance/WorldListPage.cpp diff --git a/application/pages/instance/WorldListPage.h b/launcher/pages/instance/WorldListPage.h similarity index 100% rename from application/pages/instance/WorldListPage.h rename to launcher/pages/instance/WorldListPage.h diff --git a/application/pages/instance/WorldListPage.ui b/launcher/pages/instance/WorldListPage.ui similarity index 100% rename from application/pages/instance/WorldListPage.ui rename to launcher/pages/instance/WorldListPage.ui diff --git a/application/pages/modplatform/ImportPage.cpp b/launcher/pages/modplatform/ImportPage.cpp similarity index 100% rename from application/pages/modplatform/ImportPage.cpp rename to launcher/pages/modplatform/ImportPage.cpp diff --git a/application/pages/modplatform/ImportPage.h b/launcher/pages/modplatform/ImportPage.h similarity index 100% rename from application/pages/modplatform/ImportPage.h rename to launcher/pages/modplatform/ImportPage.h diff --git a/application/pages/modplatform/ImportPage.ui b/launcher/pages/modplatform/ImportPage.ui similarity index 100% rename from application/pages/modplatform/ImportPage.ui rename to launcher/pages/modplatform/ImportPage.ui diff --git a/application/pages/modplatform/VanillaPage.cpp b/launcher/pages/modplatform/VanillaPage.cpp similarity index 100% rename from application/pages/modplatform/VanillaPage.cpp rename to launcher/pages/modplatform/VanillaPage.cpp diff --git a/application/pages/modplatform/VanillaPage.h b/launcher/pages/modplatform/VanillaPage.h similarity index 100% rename from application/pages/modplatform/VanillaPage.h rename to launcher/pages/modplatform/VanillaPage.h diff --git a/application/pages/modplatform/VanillaPage.ui b/launcher/pages/modplatform/VanillaPage.ui similarity index 100% rename from application/pages/modplatform/VanillaPage.ui rename to launcher/pages/modplatform/VanillaPage.ui diff --git a/application/pages/modplatform/atlauncher/AtlFilterModel.cpp b/launcher/pages/modplatform/atlauncher/AtlFilterModel.cpp similarity index 100% rename from application/pages/modplatform/atlauncher/AtlFilterModel.cpp rename to launcher/pages/modplatform/atlauncher/AtlFilterModel.cpp diff --git a/application/pages/modplatform/atlauncher/AtlFilterModel.h b/launcher/pages/modplatform/atlauncher/AtlFilterModel.h similarity index 100% rename from application/pages/modplatform/atlauncher/AtlFilterModel.h rename to launcher/pages/modplatform/atlauncher/AtlFilterModel.h diff --git a/application/pages/modplatform/atlauncher/AtlListModel.cpp b/launcher/pages/modplatform/atlauncher/AtlListModel.cpp similarity index 100% rename from application/pages/modplatform/atlauncher/AtlListModel.cpp rename to launcher/pages/modplatform/atlauncher/AtlListModel.cpp diff --git a/application/pages/modplatform/atlauncher/AtlListModel.h b/launcher/pages/modplatform/atlauncher/AtlListModel.h similarity index 100% rename from application/pages/modplatform/atlauncher/AtlListModel.h rename to launcher/pages/modplatform/atlauncher/AtlListModel.h diff --git a/application/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp b/launcher/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp similarity index 100% rename from application/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp rename to launcher/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp diff --git a/application/pages/modplatform/atlauncher/AtlOptionalModDialog.h b/launcher/pages/modplatform/atlauncher/AtlOptionalModDialog.h similarity index 100% rename from application/pages/modplatform/atlauncher/AtlOptionalModDialog.h rename to launcher/pages/modplatform/atlauncher/AtlOptionalModDialog.h diff --git a/application/pages/modplatform/atlauncher/AtlOptionalModDialog.ui b/launcher/pages/modplatform/atlauncher/AtlOptionalModDialog.ui similarity index 100% rename from application/pages/modplatform/atlauncher/AtlOptionalModDialog.ui rename to launcher/pages/modplatform/atlauncher/AtlOptionalModDialog.ui diff --git a/application/pages/modplatform/atlauncher/AtlPage.cpp b/launcher/pages/modplatform/atlauncher/AtlPage.cpp similarity index 100% rename from application/pages/modplatform/atlauncher/AtlPage.cpp rename to launcher/pages/modplatform/atlauncher/AtlPage.cpp diff --git a/application/pages/modplatform/atlauncher/AtlPage.h b/launcher/pages/modplatform/atlauncher/AtlPage.h similarity index 100% rename from application/pages/modplatform/atlauncher/AtlPage.h rename to launcher/pages/modplatform/atlauncher/AtlPage.h diff --git a/application/pages/modplatform/atlauncher/AtlPage.ui b/launcher/pages/modplatform/atlauncher/AtlPage.ui similarity index 100% rename from application/pages/modplatform/atlauncher/AtlPage.ui rename to launcher/pages/modplatform/atlauncher/AtlPage.ui diff --git a/application/pages/modplatform/flame/FlameModel.cpp b/launcher/pages/modplatform/flame/FlameModel.cpp similarity index 100% rename from application/pages/modplatform/flame/FlameModel.cpp rename to launcher/pages/modplatform/flame/FlameModel.cpp diff --git a/application/pages/modplatform/flame/FlameModel.h b/launcher/pages/modplatform/flame/FlameModel.h similarity index 100% rename from application/pages/modplatform/flame/FlameModel.h rename to launcher/pages/modplatform/flame/FlameModel.h diff --git a/application/pages/modplatform/flame/FlamePage.cpp b/launcher/pages/modplatform/flame/FlamePage.cpp similarity index 100% rename from application/pages/modplatform/flame/FlamePage.cpp rename to launcher/pages/modplatform/flame/FlamePage.cpp diff --git a/application/pages/modplatform/flame/FlamePage.h b/launcher/pages/modplatform/flame/FlamePage.h similarity index 100% rename from application/pages/modplatform/flame/FlamePage.h rename to launcher/pages/modplatform/flame/FlamePage.h diff --git a/application/pages/modplatform/flame/FlamePage.ui b/launcher/pages/modplatform/flame/FlamePage.ui similarity index 100% rename from application/pages/modplatform/flame/FlamePage.ui rename to launcher/pages/modplatform/flame/FlamePage.ui diff --git a/application/pages/modplatform/ftb/FtbFilterModel.cpp b/launcher/pages/modplatform/ftb/FtbFilterModel.cpp similarity index 100% rename from application/pages/modplatform/ftb/FtbFilterModel.cpp rename to launcher/pages/modplatform/ftb/FtbFilterModel.cpp diff --git a/application/pages/modplatform/ftb/FtbFilterModel.h b/launcher/pages/modplatform/ftb/FtbFilterModel.h similarity index 100% rename from application/pages/modplatform/ftb/FtbFilterModel.h rename to launcher/pages/modplatform/ftb/FtbFilterModel.h diff --git a/application/pages/modplatform/ftb/FtbListModel.cpp b/launcher/pages/modplatform/ftb/FtbListModel.cpp similarity index 100% rename from application/pages/modplatform/ftb/FtbListModel.cpp rename to launcher/pages/modplatform/ftb/FtbListModel.cpp diff --git a/application/pages/modplatform/ftb/FtbListModel.h b/launcher/pages/modplatform/ftb/FtbListModel.h similarity index 100% rename from application/pages/modplatform/ftb/FtbListModel.h rename to launcher/pages/modplatform/ftb/FtbListModel.h diff --git a/application/pages/modplatform/ftb/FtbPage.cpp b/launcher/pages/modplatform/ftb/FtbPage.cpp similarity index 100% rename from application/pages/modplatform/ftb/FtbPage.cpp rename to launcher/pages/modplatform/ftb/FtbPage.cpp diff --git a/application/pages/modplatform/ftb/FtbPage.h b/launcher/pages/modplatform/ftb/FtbPage.h similarity index 100% rename from application/pages/modplatform/ftb/FtbPage.h rename to launcher/pages/modplatform/ftb/FtbPage.h diff --git a/application/pages/modplatform/ftb/FtbPage.ui b/launcher/pages/modplatform/ftb/FtbPage.ui similarity index 100% rename from application/pages/modplatform/ftb/FtbPage.ui rename to launcher/pages/modplatform/ftb/FtbPage.ui diff --git a/application/pages/modplatform/legacy_ftb/ListModel.cpp b/launcher/pages/modplatform/legacy_ftb/ListModel.cpp similarity index 100% rename from application/pages/modplatform/legacy_ftb/ListModel.cpp rename to launcher/pages/modplatform/legacy_ftb/ListModel.cpp diff --git a/application/pages/modplatform/legacy_ftb/ListModel.h b/launcher/pages/modplatform/legacy_ftb/ListModel.h similarity index 100% rename from application/pages/modplatform/legacy_ftb/ListModel.h rename to launcher/pages/modplatform/legacy_ftb/ListModel.h diff --git a/application/pages/modplatform/legacy_ftb/Page.cpp b/launcher/pages/modplatform/legacy_ftb/Page.cpp similarity index 100% rename from application/pages/modplatform/legacy_ftb/Page.cpp rename to launcher/pages/modplatform/legacy_ftb/Page.cpp diff --git a/application/pages/modplatform/legacy_ftb/Page.h b/launcher/pages/modplatform/legacy_ftb/Page.h similarity index 100% rename from application/pages/modplatform/legacy_ftb/Page.h rename to launcher/pages/modplatform/legacy_ftb/Page.h diff --git a/application/pages/modplatform/legacy_ftb/Page.ui b/launcher/pages/modplatform/legacy_ftb/Page.ui similarity index 100% rename from application/pages/modplatform/legacy_ftb/Page.ui rename to launcher/pages/modplatform/legacy_ftb/Page.ui diff --git a/application/pages/modplatform/technic/TechnicData.h b/launcher/pages/modplatform/technic/TechnicData.h similarity index 100% rename from application/pages/modplatform/technic/TechnicData.h rename to launcher/pages/modplatform/technic/TechnicData.h diff --git a/application/pages/modplatform/technic/TechnicModel.cpp b/launcher/pages/modplatform/technic/TechnicModel.cpp similarity index 100% rename from application/pages/modplatform/technic/TechnicModel.cpp rename to launcher/pages/modplatform/technic/TechnicModel.cpp diff --git a/application/pages/modplatform/technic/TechnicModel.h b/launcher/pages/modplatform/technic/TechnicModel.h similarity index 100% rename from application/pages/modplatform/technic/TechnicModel.h rename to launcher/pages/modplatform/technic/TechnicModel.h diff --git a/application/pages/modplatform/technic/TechnicPage.cpp b/launcher/pages/modplatform/technic/TechnicPage.cpp similarity index 100% rename from application/pages/modplatform/technic/TechnicPage.cpp rename to launcher/pages/modplatform/technic/TechnicPage.cpp diff --git a/application/pages/modplatform/technic/TechnicPage.h b/launcher/pages/modplatform/technic/TechnicPage.h similarity index 100% rename from application/pages/modplatform/technic/TechnicPage.h rename to launcher/pages/modplatform/technic/TechnicPage.h diff --git a/application/pages/modplatform/technic/TechnicPage.ui b/launcher/pages/modplatform/technic/TechnicPage.ui similarity index 100% rename from application/pages/modplatform/technic/TechnicPage.ui rename to launcher/pages/modplatform/technic/TechnicPage.ui diff --git a/api/logic/pathmatcher/FSTreeMatcher.h b/launcher/pathmatcher/FSTreeMatcher.h similarity index 100% rename from api/logic/pathmatcher/FSTreeMatcher.h rename to launcher/pathmatcher/FSTreeMatcher.h diff --git a/api/logic/pathmatcher/IPathMatcher.h b/launcher/pathmatcher/IPathMatcher.h similarity index 100% rename from api/logic/pathmatcher/IPathMatcher.h rename to launcher/pathmatcher/IPathMatcher.h diff --git a/api/logic/pathmatcher/MultiMatcher.h b/launcher/pathmatcher/MultiMatcher.h similarity index 100% rename from api/logic/pathmatcher/MultiMatcher.h rename to launcher/pathmatcher/MultiMatcher.h diff --git a/api/logic/pathmatcher/RegexpMatcher.h b/launcher/pathmatcher/RegexpMatcher.h similarity index 100% rename from api/logic/pathmatcher/RegexpMatcher.h rename to launcher/pathmatcher/RegexpMatcher.h diff --git a/application/resources/MultiMC.icns b/launcher/resources/MultiMC.icns similarity index 100% rename from application/resources/MultiMC.icns rename to launcher/resources/MultiMC.icns diff --git a/application/resources/MultiMC.ico b/launcher/resources/MultiMC.ico similarity index 100% rename from application/resources/MultiMC.ico rename to launcher/resources/MultiMC.ico diff --git a/application/resources/MultiMC.manifest b/launcher/resources/MultiMC.manifest similarity index 100% rename from application/resources/MultiMC.manifest rename to launcher/resources/MultiMC.manifest diff --git a/application/resources/OSX/OSX.qrc b/launcher/resources/OSX/OSX.qrc similarity index 100% rename from application/resources/OSX/OSX.qrc rename to launcher/resources/OSX/OSX.qrc diff --git a/application/resources/OSX/index.theme b/launcher/resources/OSX/index.theme similarity index 100% rename from application/resources/OSX/index.theme rename to launcher/resources/OSX/index.theme diff --git a/application/resources/OSX/scalable/about.svg b/launcher/resources/OSX/scalable/about.svg similarity index 100% rename from application/resources/OSX/scalable/about.svg rename to launcher/resources/OSX/scalable/about.svg diff --git a/application/resources/OSX/scalable/accounts.svg b/launcher/resources/OSX/scalable/accounts.svg similarity index 100% rename from application/resources/OSX/scalable/accounts.svg rename to launcher/resources/OSX/scalable/accounts.svg diff --git a/application/resources/OSX/scalable/bug.svg b/launcher/resources/OSX/scalable/bug.svg similarity index 100% rename from application/resources/OSX/scalable/bug.svg rename to launcher/resources/OSX/scalable/bug.svg diff --git a/application/resources/OSX/scalable/centralmods.svg b/launcher/resources/OSX/scalable/centralmods.svg similarity index 100% rename from application/resources/OSX/scalable/centralmods.svg rename to launcher/resources/OSX/scalable/centralmods.svg diff --git a/application/resources/OSX/scalable/checkupdate.svg b/launcher/resources/OSX/scalable/checkupdate.svg similarity index 100% rename from application/resources/OSX/scalable/checkupdate.svg rename to launcher/resources/OSX/scalable/checkupdate.svg diff --git a/application/resources/OSX/scalable/copy.svg b/launcher/resources/OSX/scalable/copy.svg similarity index 100% rename from application/resources/OSX/scalable/copy.svg rename to launcher/resources/OSX/scalable/copy.svg diff --git a/application/resources/OSX/scalable/coremods.svg b/launcher/resources/OSX/scalable/coremods.svg similarity index 100% rename from application/resources/OSX/scalable/coremods.svg rename to launcher/resources/OSX/scalable/coremods.svg diff --git a/application/resources/OSX/scalable/externaltools.svg b/launcher/resources/OSX/scalable/externaltools.svg similarity index 100% rename from application/resources/OSX/scalable/externaltools.svg rename to launcher/resources/OSX/scalable/externaltools.svg diff --git a/application/resources/OSX/scalable/help.svg b/launcher/resources/OSX/scalable/help.svg similarity index 100% rename from application/resources/OSX/scalable/help.svg rename to launcher/resources/OSX/scalable/help.svg diff --git a/application/resources/OSX/scalable/instance-settings.svg b/launcher/resources/OSX/scalable/instance-settings.svg similarity index 100% rename from application/resources/OSX/scalable/instance-settings.svg rename to launcher/resources/OSX/scalable/instance-settings.svg diff --git a/application/resources/OSX/scalable/jarmods.svg b/launcher/resources/OSX/scalable/jarmods.svg similarity index 100% rename from application/resources/OSX/scalable/jarmods.svg rename to launcher/resources/OSX/scalable/jarmods.svg diff --git a/application/resources/OSX/scalable/java.svg b/launcher/resources/OSX/scalable/java.svg similarity index 100% rename from application/resources/OSX/scalable/java.svg rename to launcher/resources/OSX/scalable/java.svg diff --git a/application/resources/OSX/scalable/language.svg b/launcher/resources/OSX/scalable/language.svg similarity index 100% rename from application/resources/OSX/scalable/language.svg rename to launcher/resources/OSX/scalable/language.svg diff --git a/application/resources/OSX/scalable/loadermods.svg b/launcher/resources/OSX/scalable/loadermods.svg similarity index 100% rename from application/resources/OSX/scalable/loadermods.svg rename to launcher/resources/OSX/scalable/loadermods.svg diff --git a/application/resources/OSX/scalable/log.svg b/launcher/resources/OSX/scalable/log.svg similarity index 100% rename from application/resources/OSX/scalable/log.svg rename to launcher/resources/OSX/scalable/log.svg diff --git a/application/resources/OSX/scalable/minecraft.svg b/launcher/resources/OSX/scalable/minecraft.svg similarity index 100% rename from application/resources/OSX/scalable/minecraft.svg rename to launcher/resources/OSX/scalable/minecraft.svg diff --git a/application/resources/OSX/scalable/multimc.svg b/launcher/resources/OSX/scalable/multimc.svg similarity index 100% rename from application/resources/OSX/scalable/multimc.svg rename to launcher/resources/OSX/scalable/multimc.svg diff --git a/application/resources/OSX/scalable/new.svg b/launcher/resources/OSX/scalable/new.svg similarity index 100% rename from application/resources/OSX/scalable/new.svg rename to launcher/resources/OSX/scalable/new.svg diff --git a/application/resources/OSX/scalable/news.svg b/launcher/resources/OSX/scalable/news.svg similarity index 100% rename from application/resources/OSX/scalable/news.svg rename to launcher/resources/OSX/scalable/news.svg diff --git a/application/resources/OSX/scalable/notes.svg b/launcher/resources/OSX/scalable/notes.svg similarity index 100% rename from application/resources/OSX/scalable/notes.svg rename to launcher/resources/OSX/scalable/notes.svg diff --git a/application/resources/OSX/scalable/patreon.svg b/launcher/resources/OSX/scalable/patreon.svg similarity index 100% rename from application/resources/OSX/scalable/patreon.svg rename to launcher/resources/OSX/scalable/patreon.svg diff --git a/application/resources/OSX/scalable/proxy.svg b/launcher/resources/OSX/scalable/proxy.svg similarity index 100% rename from application/resources/OSX/scalable/proxy.svg rename to launcher/resources/OSX/scalable/proxy.svg diff --git a/application/resources/OSX/scalable/quickmods.svg b/launcher/resources/OSX/scalable/quickmods.svg similarity index 100% rename from application/resources/OSX/scalable/quickmods.svg rename to launcher/resources/OSX/scalable/quickmods.svg diff --git a/application/resources/OSX/scalable/refresh.svg b/launcher/resources/OSX/scalable/refresh.svg similarity index 100% rename from application/resources/OSX/scalable/refresh.svg rename to launcher/resources/OSX/scalable/refresh.svg diff --git a/application/resources/OSX/scalable/resourcepacks.svg b/launcher/resources/OSX/scalable/resourcepacks.svg similarity index 100% rename from application/resources/OSX/scalable/resourcepacks.svg rename to launcher/resources/OSX/scalable/resourcepacks.svg diff --git a/application/resources/OSX/scalable/screenshots.svg b/launcher/resources/OSX/scalable/screenshots.svg similarity index 100% rename from application/resources/OSX/scalable/screenshots.svg rename to launcher/resources/OSX/scalable/screenshots.svg diff --git a/application/resources/OSX/scalable/settings.svg b/launcher/resources/OSX/scalable/settings.svg similarity index 100% rename from application/resources/OSX/scalable/settings.svg rename to launcher/resources/OSX/scalable/settings.svg diff --git a/application/resources/OSX/scalable/status-bad.svg b/launcher/resources/OSX/scalable/status-bad.svg similarity index 100% rename from application/resources/OSX/scalable/status-bad.svg rename to launcher/resources/OSX/scalable/status-bad.svg diff --git a/application/resources/OSX/scalable/status-good.svg b/launcher/resources/OSX/scalable/status-good.svg similarity index 100% rename from application/resources/OSX/scalable/status-good.svg rename to launcher/resources/OSX/scalable/status-good.svg diff --git a/application/resources/OSX/scalable/status-yellow.svg b/launcher/resources/OSX/scalable/status-yellow.svg similarity index 100% rename from application/resources/OSX/scalable/status-yellow.svg rename to launcher/resources/OSX/scalable/status-yellow.svg diff --git a/application/resources/OSX/scalable/viewfolder.svg b/launcher/resources/OSX/scalable/viewfolder.svg similarity index 100% rename from application/resources/OSX/scalable/viewfolder.svg rename to launcher/resources/OSX/scalable/viewfolder.svg diff --git a/application/resources/OSX/scalable/worlds.svg b/launcher/resources/OSX/scalable/worlds.svg similarity index 100% rename from application/resources/OSX/scalable/worlds.svg rename to launcher/resources/OSX/scalable/worlds.svg diff --git a/application/resources/assets/underconstruction.png b/launcher/resources/assets/underconstruction.png similarity index 100% rename from application/resources/assets/underconstruction.png rename to launcher/resources/assets/underconstruction.png diff --git a/application/resources/backgrounds/backgrounds.qrc b/launcher/resources/backgrounds/backgrounds.qrc similarity index 100% rename from application/resources/backgrounds/backgrounds.qrc rename to launcher/resources/backgrounds/backgrounds.qrc diff --git a/application/resources/backgrounds/catbgrnd2.png b/launcher/resources/backgrounds/catbgrnd2.png similarity index 100% rename from application/resources/backgrounds/catbgrnd2.png rename to launcher/resources/backgrounds/catbgrnd2.png diff --git a/application/resources/backgrounds/catmas.png b/launcher/resources/backgrounds/catmas.png similarity index 100% rename from application/resources/backgrounds/catmas.png rename to launcher/resources/backgrounds/catmas.png diff --git a/application/resources/documents/documents.qrc b/launcher/resources/documents/documents.qrc similarity index 100% rename from application/resources/documents/documents.qrc rename to launcher/resources/documents/documents.qrc diff --git a/application/resources/flat/flat.qrc b/launcher/resources/flat/flat.qrc similarity index 100% rename from application/resources/flat/flat.qrc rename to launcher/resources/flat/flat.qrc diff --git a/application/resources/flat/index.theme b/launcher/resources/flat/index.theme similarity index 100% rename from application/resources/flat/index.theme rename to launcher/resources/flat/index.theme diff --git a/application/resources/flat/scalable/about.svg b/launcher/resources/flat/scalable/about.svg similarity index 100% rename from application/resources/flat/scalable/about.svg rename to launcher/resources/flat/scalable/about.svg diff --git a/application/resources/flat/scalable/accounts.svg b/launcher/resources/flat/scalable/accounts.svg similarity index 100% rename from application/resources/flat/scalable/accounts.svg rename to launcher/resources/flat/scalable/accounts.svg diff --git a/application/resources/flat/scalable/bug.svg b/launcher/resources/flat/scalable/bug.svg similarity index 100% rename from application/resources/flat/scalable/bug.svg rename to launcher/resources/flat/scalable/bug.svg diff --git a/application/resources/flat/scalable/cat.svg b/launcher/resources/flat/scalable/cat.svg similarity index 100% rename from application/resources/flat/scalable/cat.svg rename to launcher/resources/flat/scalable/cat.svg diff --git a/application/resources/flat/scalable/centralmods.svg b/launcher/resources/flat/scalable/centralmods.svg similarity index 100% rename from application/resources/flat/scalable/centralmods.svg rename to launcher/resources/flat/scalable/centralmods.svg diff --git a/application/resources/flat/scalable/checkupdate.svg b/launcher/resources/flat/scalable/checkupdate.svg similarity index 100% rename from application/resources/flat/scalable/checkupdate.svg rename to launcher/resources/flat/scalable/checkupdate.svg diff --git a/application/resources/flat/scalable/copy.svg b/launcher/resources/flat/scalable/copy.svg similarity index 100% rename from application/resources/flat/scalable/copy.svg rename to launcher/resources/flat/scalable/copy.svg diff --git a/application/resources/flat/scalable/coremods.svg b/launcher/resources/flat/scalable/coremods.svg similarity index 100% rename from application/resources/flat/scalable/coremods.svg rename to launcher/resources/flat/scalable/coremods.svg diff --git a/application/resources/flat/scalable/discord.svg b/launcher/resources/flat/scalable/discord.svg similarity index 100% rename from application/resources/flat/scalable/discord.svg rename to launcher/resources/flat/scalable/discord.svg diff --git a/application/resources/flat/scalable/externaltools.svg b/launcher/resources/flat/scalable/externaltools.svg similarity index 100% rename from application/resources/flat/scalable/externaltools.svg rename to launcher/resources/flat/scalable/externaltools.svg diff --git a/application/resources/flat/scalable/help.svg b/launcher/resources/flat/scalable/help.svg similarity index 100% rename from application/resources/flat/scalable/help.svg rename to launcher/resources/flat/scalable/help.svg diff --git a/application/resources/flat/scalable/instance-settings.svg b/launcher/resources/flat/scalable/instance-settings.svg similarity index 100% rename from application/resources/flat/scalable/instance-settings.svg rename to launcher/resources/flat/scalable/instance-settings.svg diff --git a/application/resources/flat/scalable/jarmods.svg b/launcher/resources/flat/scalable/jarmods.svg similarity index 100% rename from application/resources/flat/scalable/jarmods.svg rename to launcher/resources/flat/scalable/jarmods.svg diff --git a/application/resources/flat/scalable/java.svg b/launcher/resources/flat/scalable/java.svg similarity index 100% rename from application/resources/flat/scalable/java.svg rename to launcher/resources/flat/scalable/java.svg diff --git a/application/resources/flat/scalable/language.svg b/launcher/resources/flat/scalable/language.svg similarity index 100% rename from application/resources/flat/scalable/language.svg rename to launcher/resources/flat/scalable/language.svg diff --git a/application/resources/flat/scalable/loadermods.svg b/launcher/resources/flat/scalable/loadermods.svg similarity index 100% rename from application/resources/flat/scalable/loadermods.svg rename to launcher/resources/flat/scalable/loadermods.svg diff --git a/application/resources/flat/scalable/log.svg b/launcher/resources/flat/scalable/log.svg similarity index 100% rename from application/resources/flat/scalable/log.svg rename to launcher/resources/flat/scalable/log.svg diff --git a/application/resources/flat/scalable/minecraft.svg b/launcher/resources/flat/scalable/minecraft.svg similarity index 100% rename from application/resources/flat/scalable/minecraft.svg rename to launcher/resources/flat/scalable/minecraft.svg diff --git a/application/resources/flat/scalable/multimc.svg b/launcher/resources/flat/scalable/multimc.svg similarity index 100% rename from application/resources/flat/scalable/multimc.svg rename to launcher/resources/flat/scalable/multimc.svg diff --git a/application/resources/flat/scalable/new.svg b/launcher/resources/flat/scalable/new.svg similarity index 100% rename from application/resources/flat/scalable/new.svg rename to launcher/resources/flat/scalable/new.svg diff --git a/application/resources/flat/scalable/news.svg b/launcher/resources/flat/scalable/news.svg similarity index 100% rename from application/resources/flat/scalable/news.svg rename to launcher/resources/flat/scalable/news.svg diff --git a/application/resources/flat/scalable/notes.svg b/launcher/resources/flat/scalable/notes.svg similarity index 100% rename from application/resources/flat/scalable/notes.svg rename to launcher/resources/flat/scalable/notes.svg diff --git a/application/resources/flat/scalable/packages.svg b/launcher/resources/flat/scalable/packages.svg similarity index 100% rename from application/resources/flat/scalable/packages.svg rename to launcher/resources/flat/scalable/packages.svg diff --git a/application/resources/flat/scalable/patreon.svg b/launcher/resources/flat/scalable/patreon.svg similarity index 100% rename from application/resources/flat/scalable/patreon.svg rename to launcher/resources/flat/scalable/patreon.svg diff --git a/application/resources/flat/scalable/proxy.svg b/launcher/resources/flat/scalable/proxy.svg similarity index 100% rename from application/resources/flat/scalable/proxy.svg rename to launcher/resources/flat/scalable/proxy.svg diff --git a/application/resources/flat/scalable/quickmods.svg b/launcher/resources/flat/scalable/quickmods.svg similarity index 100% rename from application/resources/flat/scalable/quickmods.svg rename to launcher/resources/flat/scalable/quickmods.svg diff --git a/application/resources/flat/scalable/reddit-alien.svg b/launcher/resources/flat/scalable/reddit-alien.svg similarity index 100% rename from application/resources/flat/scalable/reddit-alien.svg rename to launcher/resources/flat/scalable/reddit-alien.svg diff --git a/application/resources/flat/scalable/refresh.svg b/launcher/resources/flat/scalable/refresh.svg similarity index 100% rename from application/resources/flat/scalable/refresh.svg rename to launcher/resources/flat/scalable/refresh.svg diff --git a/application/resources/flat/scalable/resourcepacks.svg b/launcher/resources/flat/scalable/resourcepacks.svg similarity index 100% rename from application/resources/flat/scalable/resourcepacks.svg rename to launcher/resources/flat/scalable/resourcepacks.svg diff --git a/application/resources/flat/scalable/screenshot-placeholder.svg b/launcher/resources/flat/scalable/screenshot-placeholder.svg similarity index 100% rename from application/resources/flat/scalable/screenshot-placeholder.svg rename to launcher/resources/flat/scalable/screenshot-placeholder.svg diff --git a/application/resources/flat/scalable/screenshots.svg b/launcher/resources/flat/scalable/screenshots.svg similarity index 100% rename from application/resources/flat/scalable/screenshots.svg rename to launcher/resources/flat/scalable/screenshots.svg diff --git a/application/resources/flat/scalable/settings.svg b/launcher/resources/flat/scalable/settings.svg similarity index 100% rename from application/resources/flat/scalable/settings.svg rename to launcher/resources/flat/scalable/settings.svg diff --git a/application/resources/flat/scalable/star.svg b/launcher/resources/flat/scalable/star.svg similarity index 100% rename from application/resources/flat/scalable/star.svg rename to launcher/resources/flat/scalable/star.svg diff --git a/application/resources/flat/scalable/status-bad.svg b/launcher/resources/flat/scalable/status-bad.svg similarity index 100% rename from application/resources/flat/scalable/status-bad.svg rename to launcher/resources/flat/scalable/status-bad.svg diff --git a/application/resources/flat/scalable/status-good.svg b/launcher/resources/flat/scalable/status-good.svg similarity index 100% rename from application/resources/flat/scalable/status-good.svg rename to launcher/resources/flat/scalable/status-good.svg diff --git a/application/resources/flat/scalable/status-running.svg b/launcher/resources/flat/scalable/status-running.svg similarity index 100% rename from application/resources/flat/scalable/status-running.svg rename to launcher/resources/flat/scalable/status-running.svg diff --git a/application/resources/flat/scalable/status-yellow.svg b/launcher/resources/flat/scalable/status-yellow.svg similarity index 100% rename from application/resources/flat/scalable/status-yellow.svg rename to launcher/resources/flat/scalable/status-yellow.svg diff --git a/application/resources/flat/scalable/viewfolder.svg b/launcher/resources/flat/scalable/viewfolder.svg similarity index 100% rename from application/resources/flat/scalable/viewfolder.svg rename to launcher/resources/flat/scalable/viewfolder.svg diff --git a/application/resources/flat/scalable/worlds.svg b/launcher/resources/flat/scalable/worlds.svg similarity index 100% rename from application/resources/flat/scalable/worlds.svg rename to launcher/resources/flat/scalable/worlds.svg diff --git a/application/resources/iOS/iOS.qrc b/launcher/resources/iOS/iOS.qrc similarity index 100% rename from application/resources/iOS/iOS.qrc rename to launcher/resources/iOS/iOS.qrc diff --git a/application/resources/iOS/index.theme b/launcher/resources/iOS/index.theme similarity index 100% rename from application/resources/iOS/index.theme rename to launcher/resources/iOS/index.theme diff --git a/application/resources/iOS/scalable/about.svg b/launcher/resources/iOS/scalable/about.svg similarity index 100% rename from application/resources/iOS/scalable/about.svg rename to launcher/resources/iOS/scalable/about.svg diff --git a/application/resources/iOS/scalable/accounts.svg b/launcher/resources/iOS/scalable/accounts.svg similarity index 100% rename from application/resources/iOS/scalable/accounts.svg rename to launcher/resources/iOS/scalable/accounts.svg diff --git a/application/resources/iOS/scalable/bug.svg b/launcher/resources/iOS/scalable/bug.svg similarity index 100% rename from application/resources/iOS/scalable/bug.svg rename to launcher/resources/iOS/scalable/bug.svg diff --git a/application/resources/iOS/scalable/centralmods.svg b/launcher/resources/iOS/scalable/centralmods.svg similarity index 100% rename from application/resources/iOS/scalable/centralmods.svg rename to launcher/resources/iOS/scalable/centralmods.svg diff --git a/application/resources/iOS/scalable/checkupdate.svg b/launcher/resources/iOS/scalable/checkupdate.svg similarity index 100% rename from application/resources/iOS/scalable/checkupdate.svg rename to launcher/resources/iOS/scalable/checkupdate.svg diff --git a/application/resources/iOS/scalable/copy.svg b/launcher/resources/iOS/scalable/copy.svg similarity index 100% rename from application/resources/iOS/scalable/copy.svg rename to launcher/resources/iOS/scalable/copy.svg diff --git a/application/resources/iOS/scalable/coremods.svg b/launcher/resources/iOS/scalable/coremods.svg similarity index 100% rename from application/resources/iOS/scalable/coremods.svg rename to launcher/resources/iOS/scalable/coremods.svg diff --git a/application/resources/iOS/scalable/externaltools.svg b/launcher/resources/iOS/scalable/externaltools.svg similarity index 100% rename from application/resources/iOS/scalable/externaltools.svg rename to launcher/resources/iOS/scalable/externaltools.svg diff --git a/application/resources/iOS/scalable/help.svg b/launcher/resources/iOS/scalable/help.svg similarity index 100% rename from application/resources/iOS/scalable/help.svg rename to launcher/resources/iOS/scalable/help.svg diff --git a/application/resources/iOS/scalable/instance-settings.svg b/launcher/resources/iOS/scalable/instance-settings.svg similarity index 100% rename from application/resources/iOS/scalable/instance-settings.svg rename to launcher/resources/iOS/scalable/instance-settings.svg diff --git a/application/resources/iOS/scalable/jarmods.svg b/launcher/resources/iOS/scalable/jarmods.svg similarity index 100% rename from application/resources/iOS/scalable/jarmods.svg rename to launcher/resources/iOS/scalable/jarmods.svg diff --git a/application/resources/iOS/scalable/java.svg b/launcher/resources/iOS/scalable/java.svg similarity index 100% rename from application/resources/iOS/scalable/java.svg rename to launcher/resources/iOS/scalable/java.svg diff --git a/application/resources/iOS/scalable/language.svg b/launcher/resources/iOS/scalable/language.svg similarity index 100% rename from application/resources/iOS/scalable/language.svg rename to launcher/resources/iOS/scalable/language.svg diff --git a/application/resources/iOS/scalable/loadermods.svg b/launcher/resources/iOS/scalable/loadermods.svg similarity index 100% rename from application/resources/iOS/scalable/loadermods.svg rename to launcher/resources/iOS/scalable/loadermods.svg diff --git a/application/resources/iOS/scalable/log.svg b/launcher/resources/iOS/scalable/log.svg similarity index 100% rename from application/resources/iOS/scalable/log.svg rename to launcher/resources/iOS/scalable/log.svg diff --git a/application/resources/iOS/scalable/minecraft.svg b/launcher/resources/iOS/scalable/minecraft.svg similarity index 100% rename from application/resources/iOS/scalable/minecraft.svg rename to launcher/resources/iOS/scalable/minecraft.svg diff --git a/application/resources/iOS/scalable/multimc.svg b/launcher/resources/iOS/scalable/multimc.svg similarity index 100% rename from application/resources/iOS/scalable/multimc.svg rename to launcher/resources/iOS/scalable/multimc.svg diff --git a/application/resources/iOS/scalable/new.svg b/launcher/resources/iOS/scalable/new.svg similarity index 100% rename from application/resources/iOS/scalable/new.svg rename to launcher/resources/iOS/scalable/new.svg diff --git a/application/resources/iOS/scalable/news.svg b/launcher/resources/iOS/scalable/news.svg similarity index 100% rename from application/resources/iOS/scalable/news.svg rename to launcher/resources/iOS/scalable/news.svg diff --git a/application/resources/iOS/scalable/notes.svg b/launcher/resources/iOS/scalable/notes.svg similarity index 100% rename from application/resources/iOS/scalable/notes.svg rename to launcher/resources/iOS/scalable/notes.svg diff --git a/application/resources/iOS/scalable/patreon.svg b/launcher/resources/iOS/scalable/patreon.svg similarity index 100% rename from application/resources/iOS/scalable/patreon.svg rename to launcher/resources/iOS/scalable/patreon.svg diff --git a/application/resources/iOS/scalable/proxy.svg b/launcher/resources/iOS/scalable/proxy.svg similarity index 100% rename from application/resources/iOS/scalable/proxy.svg rename to launcher/resources/iOS/scalable/proxy.svg diff --git a/application/resources/iOS/scalable/quickmods.svg b/launcher/resources/iOS/scalable/quickmods.svg similarity index 100% rename from application/resources/iOS/scalable/quickmods.svg rename to launcher/resources/iOS/scalable/quickmods.svg diff --git a/application/resources/iOS/scalable/refresh.svg b/launcher/resources/iOS/scalable/refresh.svg similarity index 100% rename from application/resources/iOS/scalable/refresh.svg rename to launcher/resources/iOS/scalable/refresh.svg diff --git a/application/resources/iOS/scalable/resourcepacks.svg b/launcher/resources/iOS/scalable/resourcepacks.svg similarity index 100% rename from application/resources/iOS/scalable/resourcepacks.svg rename to launcher/resources/iOS/scalable/resourcepacks.svg diff --git a/application/resources/iOS/scalable/screenshots.svg b/launcher/resources/iOS/scalable/screenshots.svg similarity index 100% rename from application/resources/iOS/scalable/screenshots.svg rename to launcher/resources/iOS/scalable/screenshots.svg diff --git a/application/resources/iOS/scalable/settings.svg b/launcher/resources/iOS/scalable/settings.svg similarity index 100% rename from application/resources/iOS/scalable/settings.svg rename to launcher/resources/iOS/scalable/settings.svg diff --git a/application/resources/iOS/scalable/status-bad.svg b/launcher/resources/iOS/scalable/status-bad.svg similarity index 100% rename from application/resources/iOS/scalable/status-bad.svg rename to launcher/resources/iOS/scalable/status-bad.svg diff --git a/application/resources/iOS/scalable/status-good.svg b/launcher/resources/iOS/scalable/status-good.svg similarity index 100% rename from application/resources/iOS/scalable/status-good.svg rename to launcher/resources/iOS/scalable/status-good.svg diff --git a/application/resources/iOS/scalable/status-yellow.svg b/launcher/resources/iOS/scalable/status-yellow.svg similarity index 100% rename from application/resources/iOS/scalable/status-yellow.svg rename to launcher/resources/iOS/scalable/status-yellow.svg diff --git a/application/resources/iOS/scalable/viewfolder.svg b/launcher/resources/iOS/scalable/viewfolder.svg similarity index 100% rename from application/resources/iOS/scalable/viewfolder.svg rename to launcher/resources/iOS/scalable/viewfolder.svg diff --git a/application/resources/iOS/scalable/worlds.svg b/launcher/resources/iOS/scalable/worlds.svg similarity index 100% rename from application/resources/iOS/scalable/worlds.svg rename to launcher/resources/iOS/scalable/worlds.svg diff --git a/application/resources/multimc.rc b/launcher/resources/multimc.rc similarity index 100% rename from application/resources/multimc.rc rename to launcher/resources/multimc.rc diff --git a/application/resources/multimc/128x128/instances/chicken.png b/launcher/resources/multimc/128x128/instances/chicken.png similarity index 100% rename from application/resources/multimc/128x128/instances/chicken.png rename to launcher/resources/multimc/128x128/instances/chicken.png diff --git a/application/resources/multimc/128x128/instances/creeper.png b/launcher/resources/multimc/128x128/instances/creeper.png similarity index 100% rename from application/resources/multimc/128x128/instances/creeper.png rename to launcher/resources/multimc/128x128/instances/creeper.png diff --git a/application/resources/multimc/128x128/instances/enderpearl.png b/launcher/resources/multimc/128x128/instances/enderpearl.png similarity index 100% rename from application/resources/multimc/128x128/instances/enderpearl.png rename to launcher/resources/multimc/128x128/instances/enderpearl.png diff --git a/application/resources/multimc/128x128/instances/flame.png b/launcher/resources/multimc/128x128/instances/flame.png similarity index 100% rename from application/resources/multimc/128x128/instances/flame.png rename to launcher/resources/multimc/128x128/instances/flame.png diff --git a/application/resources/multimc/128x128/instances/ftb_glow.png b/launcher/resources/multimc/128x128/instances/ftb_glow.png similarity index 100% rename from application/resources/multimc/128x128/instances/ftb_glow.png rename to launcher/resources/multimc/128x128/instances/ftb_glow.png diff --git a/application/resources/multimc/128x128/instances/ftb_logo.png b/launcher/resources/multimc/128x128/instances/ftb_logo.png similarity index 100% rename from application/resources/multimc/128x128/instances/ftb_logo.png rename to launcher/resources/multimc/128x128/instances/ftb_logo.png diff --git a/application/resources/multimc/128x128/instances/gear.png b/launcher/resources/multimc/128x128/instances/gear.png similarity index 100% rename from application/resources/multimc/128x128/instances/gear.png rename to launcher/resources/multimc/128x128/instances/gear.png diff --git a/application/resources/multimc/128x128/instances/herobrine.png b/launcher/resources/multimc/128x128/instances/herobrine.png similarity index 100% rename from application/resources/multimc/128x128/instances/herobrine.png rename to launcher/resources/multimc/128x128/instances/herobrine.png diff --git a/application/resources/multimc/128x128/instances/infinity.png b/launcher/resources/multimc/128x128/instances/infinity.png similarity index 100% rename from application/resources/multimc/128x128/instances/infinity.png rename to launcher/resources/multimc/128x128/instances/infinity.png diff --git a/application/resources/multimc/128x128/instances/magitech.png b/launcher/resources/multimc/128x128/instances/magitech.png similarity index 100% rename from application/resources/multimc/128x128/instances/magitech.png rename to launcher/resources/multimc/128x128/instances/magitech.png diff --git a/application/resources/multimc/128x128/instances/meat.png b/launcher/resources/multimc/128x128/instances/meat.png similarity index 100% rename from application/resources/multimc/128x128/instances/meat.png rename to launcher/resources/multimc/128x128/instances/meat.png diff --git a/application/resources/multimc/128x128/instances/netherstar.png b/launcher/resources/multimc/128x128/instances/netherstar.png similarity index 100% rename from application/resources/multimc/128x128/instances/netherstar.png rename to launcher/resources/multimc/128x128/instances/netherstar.png diff --git a/application/resources/multimc/128x128/instances/skeleton.png b/launcher/resources/multimc/128x128/instances/skeleton.png similarity index 100% rename from application/resources/multimc/128x128/instances/skeleton.png rename to launcher/resources/multimc/128x128/instances/skeleton.png diff --git a/application/resources/multimc/128x128/instances/squarecreeper.png b/launcher/resources/multimc/128x128/instances/squarecreeper.png similarity index 100% rename from application/resources/multimc/128x128/instances/squarecreeper.png rename to launcher/resources/multimc/128x128/instances/squarecreeper.png diff --git a/application/resources/multimc/128x128/instances/steve.png b/launcher/resources/multimc/128x128/instances/steve.png similarity index 100% rename from application/resources/multimc/128x128/instances/steve.png rename to launcher/resources/multimc/128x128/instances/steve.png diff --git a/application/resources/multimc/128x128/unknown_server.png b/launcher/resources/multimc/128x128/unknown_server.png similarity index 100% rename from application/resources/multimc/128x128/unknown_server.png rename to launcher/resources/multimc/128x128/unknown_server.png diff --git a/application/resources/multimc/16x16/about.png b/launcher/resources/multimc/16x16/about.png similarity index 100% rename from application/resources/multimc/16x16/about.png rename to launcher/resources/multimc/16x16/about.png diff --git a/application/resources/multimc/16x16/bug.png b/launcher/resources/multimc/16x16/bug.png similarity index 100% rename from application/resources/multimc/16x16/bug.png rename to launcher/resources/multimc/16x16/bug.png diff --git a/application/resources/multimc/16x16/cat.png b/launcher/resources/multimc/16x16/cat.png similarity index 100% rename from application/resources/multimc/16x16/cat.png rename to launcher/resources/multimc/16x16/cat.png diff --git a/application/resources/multimc/16x16/centralmods.png b/launcher/resources/multimc/16x16/centralmods.png similarity index 100% rename from application/resources/multimc/16x16/centralmods.png rename to launcher/resources/multimc/16x16/centralmods.png diff --git a/application/resources/multimc/16x16/checkupdate.png b/launcher/resources/multimc/16x16/checkupdate.png similarity index 100% rename from application/resources/multimc/16x16/checkupdate.png rename to launcher/resources/multimc/16x16/checkupdate.png diff --git a/application/resources/multimc/16x16/copy.png b/launcher/resources/multimc/16x16/copy.png similarity index 100% rename from application/resources/multimc/16x16/copy.png rename to launcher/resources/multimc/16x16/copy.png diff --git a/application/resources/multimc/16x16/coremods.png b/launcher/resources/multimc/16x16/coremods.png similarity index 100% rename from application/resources/multimc/16x16/coremods.png rename to launcher/resources/multimc/16x16/coremods.png diff --git a/application/resources/multimc/16x16/help.png b/launcher/resources/multimc/16x16/help.png similarity index 100% rename from application/resources/multimc/16x16/help.png rename to launcher/resources/multimc/16x16/help.png diff --git a/application/resources/multimc/16x16/instance-settings.png b/launcher/resources/multimc/16x16/instance-settings.png similarity index 100% rename from application/resources/multimc/16x16/instance-settings.png rename to launcher/resources/multimc/16x16/instance-settings.png diff --git a/application/resources/multimc/16x16/jarmods.png b/launcher/resources/multimc/16x16/jarmods.png similarity index 100% rename from application/resources/multimc/16x16/jarmods.png rename to launcher/resources/multimc/16x16/jarmods.png diff --git a/application/resources/multimc/16x16/loadermods.png b/launcher/resources/multimc/16x16/loadermods.png similarity index 100% rename from application/resources/multimc/16x16/loadermods.png rename to launcher/resources/multimc/16x16/loadermods.png diff --git a/application/resources/multimc/16x16/log.png b/launcher/resources/multimc/16x16/log.png similarity index 100% rename from application/resources/multimc/16x16/log.png rename to launcher/resources/multimc/16x16/log.png diff --git a/application/resources/multimc/16x16/minecraft.png b/launcher/resources/multimc/16x16/minecraft.png similarity index 100% rename from application/resources/multimc/16x16/minecraft.png rename to launcher/resources/multimc/16x16/minecraft.png diff --git a/application/resources/multimc/16x16/new.png b/launcher/resources/multimc/16x16/new.png similarity index 100% rename from application/resources/multimc/16x16/new.png rename to launcher/resources/multimc/16x16/new.png diff --git a/application/resources/multimc/16x16/news.png b/launcher/resources/multimc/16x16/news.png similarity index 100% rename from application/resources/multimc/16x16/news.png rename to launcher/resources/multimc/16x16/news.png diff --git a/application/resources/multimc/16x16/noaccount.png b/launcher/resources/multimc/16x16/noaccount.png similarity index 100% rename from application/resources/multimc/16x16/noaccount.png rename to launcher/resources/multimc/16x16/noaccount.png diff --git a/application/resources/multimc/16x16/patreon.png b/launcher/resources/multimc/16x16/patreon.png similarity index 100% rename from application/resources/multimc/16x16/patreon.png rename to launcher/resources/multimc/16x16/patreon.png diff --git a/application/resources/multimc/16x16/refresh.png b/launcher/resources/multimc/16x16/refresh.png similarity index 100% rename from application/resources/multimc/16x16/refresh.png rename to launcher/resources/multimc/16x16/refresh.png diff --git a/application/resources/multimc/16x16/resourcepacks.png b/launcher/resources/multimc/16x16/resourcepacks.png similarity index 100% rename from application/resources/multimc/16x16/resourcepacks.png rename to launcher/resources/multimc/16x16/resourcepacks.png diff --git a/application/resources/multimc/16x16/screenshots.png b/launcher/resources/multimc/16x16/screenshots.png similarity index 100% rename from application/resources/multimc/16x16/screenshots.png rename to launcher/resources/multimc/16x16/screenshots.png diff --git a/application/resources/multimc/16x16/settings.png b/launcher/resources/multimc/16x16/settings.png similarity index 100% rename from application/resources/multimc/16x16/settings.png rename to launcher/resources/multimc/16x16/settings.png diff --git a/application/resources/multimc/16x16/star.png b/launcher/resources/multimc/16x16/star.png similarity index 100% rename from application/resources/multimc/16x16/star.png rename to launcher/resources/multimc/16x16/star.png diff --git a/application/resources/multimc/16x16/status-bad.png b/launcher/resources/multimc/16x16/status-bad.png similarity index 100% rename from application/resources/multimc/16x16/status-bad.png rename to launcher/resources/multimc/16x16/status-bad.png diff --git a/application/resources/multimc/16x16/status-good.png b/launcher/resources/multimc/16x16/status-good.png similarity index 100% rename from application/resources/multimc/16x16/status-good.png rename to launcher/resources/multimc/16x16/status-good.png diff --git a/application/resources/multimc/16x16/status-running.png b/launcher/resources/multimc/16x16/status-running.png similarity index 100% rename from application/resources/multimc/16x16/status-running.png rename to launcher/resources/multimc/16x16/status-running.png diff --git a/application/resources/multimc/16x16/status-yellow.png b/launcher/resources/multimc/16x16/status-yellow.png similarity index 100% rename from application/resources/multimc/16x16/status-yellow.png rename to launcher/resources/multimc/16x16/status-yellow.png diff --git a/application/resources/multimc/16x16/viewfolder.png b/launcher/resources/multimc/16x16/viewfolder.png similarity index 100% rename from application/resources/multimc/16x16/viewfolder.png rename to launcher/resources/multimc/16x16/viewfolder.png diff --git a/application/resources/multimc/16x16/worlds.png b/launcher/resources/multimc/16x16/worlds.png similarity index 100% rename from application/resources/multimc/16x16/worlds.png rename to launcher/resources/multimc/16x16/worlds.png diff --git a/application/resources/multimc/22x22/about.png b/launcher/resources/multimc/22x22/about.png similarity index 100% rename from application/resources/multimc/22x22/about.png rename to launcher/resources/multimc/22x22/about.png diff --git a/application/resources/multimc/22x22/bug.png b/launcher/resources/multimc/22x22/bug.png similarity index 100% rename from application/resources/multimc/22x22/bug.png rename to launcher/resources/multimc/22x22/bug.png diff --git a/application/resources/multimc/22x22/cat.png b/launcher/resources/multimc/22x22/cat.png similarity index 100% rename from application/resources/multimc/22x22/cat.png rename to launcher/resources/multimc/22x22/cat.png diff --git a/application/resources/multimc/22x22/centralmods.png b/launcher/resources/multimc/22x22/centralmods.png similarity index 100% rename from application/resources/multimc/22x22/centralmods.png rename to launcher/resources/multimc/22x22/centralmods.png diff --git a/application/resources/multimc/22x22/checkupdate.png b/launcher/resources/multimc/22x22/checkupdate.png similarity index 100% rename from application/resources/multimc/22x22/checkupdate.png rename to launcher/resources/multimc/22x22/checkupdate.png diff --git a/application/resources/multimc/22x22/copy.png b/launcher/resources/multimc/22x22/copy.png similarity index 100% rename from application/resources/multimc/22x22/copy.png rename to launcher/resources/multimc/22x22/copy.png diff --git a/application/resources/multimc/22x22/help.png b/launcher/resources/multimc/22x22/help.png similarity index 100% rename from application/resources/multimc/22x22/help.png rename to launcher/resources/multimc/22x22/help.png diff --git a/application/resources/multimc/22x22/instance-settings.png b/launcher/resources/multimc/22x22/instance-settings.png similarity index 100% rename from application/resources/multimc/22x22/instance-settings.png rename to launcher/resources/multimc/22x22/instance-settings.png diff --git a/application/resources/multimc/22x22/new.png b/launcher/resources/multimc/22x22/new.png similarity index 100% rename from application/resources/multimc/22x22/new.png rename to launcher/resources/multimc/22x22/new.png diff --git a/application/resources/multimc/22x22/news.png b/launcher/resources/multimc/22x22/news.png similarity index 100% rename from application/resources/multimc/22x22/news.png rename to launcher/resources/multimc/22x22/news.png diff --git a/application/resources/multimc/22x22/patreon.png b/launcher/resources/multimc/22x22/patreon.png similarity index 100% rename from application/resources/multimc/22x22/patreon.png rename to launcher/resources/multimc/22x22/patreon.png diff --git a/application/resources/multimc/22x22/refresh.png b/launcher/resources/multimc/22x22/refresh.png similarity index 100% rename from application/resources/multimc/22x22/refresh.png rename to launcher/resources/multimc/22x22/refresh.png diff --git a/application/resources/multimc/22x22/screenshots.png b/launcher/resources/multimc/22x22/screenshots.png similarity index 100% rename from application/resources/multimc/22x22/screenshots.png rename to launcher/resources/multimc/22x22/screenshots.png diff --git a/application/resources/multimc/22x22/settings.png b/launcher/resources/multimc/22x22/settings.png similarity index 100% rename from application/resources/multimc/22x22/settings.png rename to launcher/resources/multimc/22x22/settings.png diff --git a/application/resources/multimc/22x22/status-bad.png b/launcher/resources/multimc/22x22/status-bad.png similarity index 100% rename from application/resources/multimc/22x22/status-bad.png rename to launcher/resources/multimc/22x22/status-bad.png diff --git a/application/resources/multimc/22x22/status-good.png b/launcher/resources/multimc/22x22/status-good.png similarity index 100% rename from application/resources/multimc/22x22/status-good.png rename to launcher/resources/multimc/22x22/status-good.png diff --git a/application/resources/multimc/22x22/status-running.png b/launcher/resources/multimc/22x22/status-running.png similarity index 100% rename from application/resources/multimc/22x22/status-running.png rename to launcher/resources/multimc/22x22/status-running.png diff --git a/application/resources/multimc/22x22/status-yellow.png b/launcher/resources/multimc/22x22/status-yellow.png similarity index 100% rename from application/resources/multimc/22x22/status-yellow.png rename to launcher/resources/multimc/22x22/status-yellow.png diff --git a/application/resources/multimc/22x22/viewfolder.png b/launcher/resources/multimc/22x22/viewfolder.png similarity index 100% rename from application/resources/multimc/22x22/viewfolder.png rename to launcher/resources/multimc/22x22/viewfolder.png diff --git a/application/resources/multimc/22x22/worlds.png b/launcher/resources/multimc/22x22/worlds.png similarity index 100% rename from application/resources/multimc/22x22/worlds.png rename to launcher/resources/multimc/22x22/worlds.png diff --git a/application/resources/multimc/24x24/cat.png b/launcher/resources/multimc/24x24/cat.png similarity index 100% rename from application/resources/multimc/24x24/cat.png rename to launcher/resources/multimc/24x24/cat.png diff --git a/application/resources/multimc/24x24/coremods.png b/launcher/resources/multimc/24x24/coremods.png similarity index 100% rename from application/resources/multimc/24x24/coremods.png rename to launcher/resources/multimc/24x24/coremods.png diff --git a/application/resources/multimc/24x24/jarmods.png b/launcher/resources/multimc/24x24/jarmods.png similarity index 100% rename from application/resources/multimc/24x24/jarmods.png rename to launcher/resources/multimc/24x24/jarmods.png diff --git a/application/resources/multimc/24x24/loadermods.png b/launcher/resources/multimc/24x24/loadermods.png similarity index 100% rename from application/resources/multimc/24x24/loadermods.png rename to launcher/resources/multimc/24x24/loadermods.png diff --git a/application/resources/multimc/24x24/log.png b/launcher/resources/multimc/24x24/log.png similarity index 100% rename from application/resources/multimc/24x24/log.png rename to launcher/resources/multimc/24x24/log.png diff --git a/application/resources/multimc/24x24/minecraft.png b/launcher/resources/multimc/24x24/minecraft.png similarity index 100% rename from application/resources/multimc/24x24/minecraft.png rename to launcher/resources/multimc/24x24/minecraft.png diff --git a/application/resources/multimc/24x24/noaccount.png b/launcher/resources/multimc/24x24/noaccount.png similarity index 100% rename from application/resources/multimc/24x24/noaccount.png rename to launcher/resources/multimc/24x24/noaccount.png diff --git a/application/resources/multimc/24x24/patreon.png b/launcher/resources/multimc/24x24/patreon.png similarity index 100% rename from application/resources/multimc/24x24/patreon.png rename to launcher/resources/multimc/24x24/patreon.png diff --git a/application/resources/multimc/24x24/resourcepacks.png b/launcher/resources/multimc/24x24/resourcepacks.png similarity index 100% rename from application/resources/multimc/24x24/resourcepacks.png rename to launcher/resources/multimc/24x24/resourcepacks.png diff --git a/application/resources/multimc/24x24/star.png b/launcher/resources/multimc/24x24/star.png similarity index 100% rename from application/resources/multimc/24x24/star.png rename to launcher/resources/multimc/24x24/star.png diff --git a/application/resources/multimc/24x24/status-bad.png b/launcher/resources/multimc/24x24/status-bad.png similarity index 100% rename from application/resources/multimc/24x24/status-bad.png rename to launcher/resources/multimc/24x24/status-bad.png diff --git a/application/resources/multimc/24x24/status-good.png b/launcher/resources/multimc/24x24/status-good.png similarity index 100% rename from application/resources/multimc/24x24/status-good.png rename to launcher/resources/multimc/24x24/status-good.png diff --git a/application/resources/multimc/24x24/status-running.png b/launcher/resources/multimc/24x24/status-running.png similarity index 100% rename from application/resources/multimc/24x24/status-running.png rename to launcher/resources/multimc/24x24/status-running.png diff --git a/application/resources/multimc/24x24/status-yellow.png b/launcher/resources/multimc/24x24/status-yellow.png similarity index 100% rename from application/resources/multimc/24x24/status-yellow.png rename to launcher/resources/multimc/24x24/status-yellow.png diff --git a/application/resources/multimc/256x256/minecraft.png b/launcher/resources/multimc/256x256/minecraft.png similarity index 100% rename from application/resources/multimc/256x256/minecraft.png rename to launcher/resources/multimc/256x256/minecraft.png diff --git a/application/resources/multimc/32x32/about.png b/launcher/resources/multimc/32x32/about.png similarity index 100% rename from application/resources/multimc/32x32/about.png rename to launcher/resources/multimc/32x32/about.png diff --git a/application/resources/multimc/32x32/bug.png b/launcher/resources/multimc/32x32/bug.png similarity index 100% rename from application/resources/multimc/32x32/bug.png rename to launcher/resources/multimc/32x32/bug.png diff --git a/application/resources/multimc/32x32/cat.png b/launcher/resources/multimc/32x32/cat.png similarity index 100% rename from application/resources/multimc/32x32/cat.png rename to launcher/resources/multimc/32x32/cat.png diff --git a/application/resources/multimc/32x32/centralmods.png b/launcher/resources/multimc/32x32/centralmods.png similarity index 100% rename from application/resources/multimc/32x32/centralmods.png rename to launcher/resources/multimc/32x32/centralmods.png diff --git a/application/resources/multimc/32x32/checkupdate.png b/launcher/resources/multimc/32x32/checkupdate.png similarity index 100% rename from application/resources/multimc/32x32/checkupdate.png rename to launcher/resources/multimc/32x32/checkupdate.png diff --git a/application/resources/multimc/32x32/copy.png b/launcher/resources/multimc/32x32/copy.png similarity index 100% rename from application/resources/multimc/32x32/copy.png rename to launcher/resources/multimc/32x32/copy.png diff --git a/application/resources/multimc/32x32/coremods.png b/launcher/resources/multimc/32x32/coremods.png similarity index 100% rename from application/resources/multimc/32x32/coremods.png rename to launcher/resources/multimc/32x32/coremods.png diff --git a/application/resources/multimc/32x32/help.png b/launcher/resources/multimc/32x32/help.png similarity index 100% rename from application/resources/multimc/32x32/help.png rename to launcher/resources/multimc/32x32/help.png diff --git a/application/resources/multimc/32x32/instance-settings.png b/launcher/resources/multimc/32x32/instance-settings.png similarity index 100% rename from application/resources/multimc/32x32/instance-settings.png rename to launcher/resources/multimc/32x32/instance-settings.png diff --git a/application/resources/multimc/32x32/instances/brick.png b/launcher/resources/multimc/32x32/instances/brick.png similarity index 100% rename from application/resources/multimc/32x32/instances/brick.png rename to launcher/resources/multimc/32x32/instances/brick.png diff --git a/application/resources/multimc/32x32/instances/chicken.png b/launcher/resources/multimc/32x32/instances/chicken.png similarity index 100% rename from application/resources/multimc/32x32/instances/chicken.png rename to launcher/resources/multimc/32x32/instances/chicken.png diff --git a/application/resources/multimc/32x32/instances/creeper.png b/launcher/resources/multimc/32x32/instances/creeper.png similarity index 100% rename from application/resources/multimc/32x32/instances/creeper.png rename to launcher/resources/multimc/32x32/instances/creeper.png diff --git a/application/resources/multimc/32x32/instances/diamond.png b/launcher/resources/multimc/32x32/instances/diamond.png similarity index 100% rename from application/resources/multimc/32x32/instances/diamond.png rename to launcher/resources/multimc/32x32/instances/diamond.png diff --git a/application/resources/multimc/32x32/instances/dirt.png b/launcher/resources/multimc/32x32/instances/dirt.png similarity index 100% rename from application/resources/multimc/32x32/instances/dirt.png rename to launcher/resources/multimc/32x32/instances/dirt.png diff --git a/application/resources/multimc/32x32/instances/enderpearl.png b/launcher/resources/multimc/32x32/instances/enderpearl.png similarity index 100% rename from application/resources/multimc/32x32/instances/enderpearl.png rename to launcher/resources/multimc/32x32/instances/enderpearl.png diff --git a/application/resources/multimc/32x32/instances/flame.png b/launcher/resources/multimc/32x32/instances/flame.png similarity index 100% rename from application/resources/multimc/32x32/instances/flame.png rename to launcher/resources/multimc/32x32/instances/flame.png diff --git a/application/resources/multimc/32x32/instances/ftb_glow.png b/launcher/resources/multimc/32x32/instances/ftb_glow.png similarity index 100% rename from application/resources/multimc/32x32/instances/ftb_glow.png rename to launcher/resources/multimc/32x32/instances/ftb_glow.png diff --git a/application/resources/multimc/32x32/instances/ftb_logo.png b/launcher/resources/multimc/32x32/instances/ftb_logo.png similarity index 100% rename from application/resources/multimc/32x32/instances/ftb_logo.png rename to launcher/resources/multimc/32x32/instances/ftb_logo.png diff --git a/application/resources/multimc/32x32/instances/gear.png b/launcher/resources/multimc/32x32/instances/gear.png similarity index 100% rename from application/resources/multimc/32x32/instances/gear.png rename to launcher/resources/multimc/32x32/instances/gear.png diff --git a/application/resources/multimc/32x32/instances/gold.png b/launcher/resources/multimc/32x32/instances/gold.png similarity index 100% rename from application/resources/multimc/32x32/instances/gold.png rename to launcher/resources/multimc/32x32/instances/gold.png diff --git a/application/resources/multimc/32x32/instances/grass.png b/launcher/resources/multimc/32x32/instances/grass.png similarity index 100% rename from application/resources/multimc/32x32/instances/grass.png rename to launcher/resources/multimc/32x32/instances/grass.png diff --git a/application/resources/multimc/32x32/instances/herobrine.png b/launcher/resources/multimc/32x32/instances/herobrine.png similarity index 100% rename from application/resources/multimc/32x32/instances/herobrine.png rename to launcher/resources/multimc/32x32/instances/herobrine.png diff --git a/application/resources/multimc/32x32/instances/infinity.png b/launcher/resources/multimc/32x32/instances/infinity.png similarity index 100% rename from application/resources/multimc/32x32/instances/infinity.png rename to launcher/resources/multimc/32x32/instances/infinity.png diff --git a/application/resources/multimc/32x32/instances/iron.png b/launcher/resources/multimc/32x32/instances/iron.png similarity index 100% rename from application/resources/multimc/32x32/instances/iron.png rename to launcher/resources/multimc/32x32/instances/iron.png diff --git a/application/resources/multimc/32x32/instances/magitech.png b/launcher/resources/multimc/32x32/instances/magitech.png similarity index 100% rename from application/resources/multimc/32x32/instances/magitech.png rename to launcher/resources/multimc/32x32/instances/magitech.png diff --git a/application/resources/multimc/32x32/instances/meat.png b/launcher/resources/multimc/32x32/instances/meat.png similarity index 100% rename from application/resources/multimc/32x32/instances/meat.png rename to launcher/resources/multimc/32x32/instances/meat.png diff --git a/application/resources/multimc/32x32/instances/netherstar.png b/launcher/resources/multimc/32x32/instances/netherstar.png similarity index 100% rename from application/resources/multimc/32x32/instances/netherstar.png rename to launcher/resources/multimc/32x32/instances/netherstar.png diff --git a/application/resources/multimc/32x32/instances/planks.png b/launcher/resources/multimc/32x32/instances/planks.png similarity index 100% rename from application/resources/multimc/32x32/instances/planks.png rename to launcher/resources/multimc/32x32/instances/planks.png diff --git a/application/resources/multimc/32x32/instances/skeleton.png b/launcher/resources/multimc/32x32/instances/skeleton.png similarity index 100% rename from application/resources/multimc/32x32/instances/skeleton.png rename to launcher/resources/multimc/32x32/instances/skeleton.png diff --git a/application/resources/multimc/32x32/instances/squarecreeper.png b/launcher/resources/multimc/32x32/instances/squarecreeper.png similarity index 100% rename from application/resources/multimc/32x32/instances/squarecreeper.png rename to launcher/resources/multimc/32x32/instances/squarecreeper.png diff --git a/application/resources/multimc/32x32/instances/steve.png b/launcher/resources/multimc/32x32/instances/steve.png similarity index 100% rename from application/resources/multimc/32x32/instances/steve.png rename to launcher/resources/multimc/32x32/instances/steve.png diff --git a/application/resources/multimc/32x32/instances/stone.png b/launcher/resources/multimc/32x32/instances/stone.png similarity index 100% rename from application/resources/multimc/32x32/instances/stone.png rename to launcher/resources/multimc/32x32/instances/stone.png diff --git a/application/resources/multimc/32x32/instances/tnt.png b/launcher/resources/multimc/32x32/instances/tnt.png similarity index 100% rename from application/resources/multimc/32x32/instances/tnt.png rename to launcher/resources/multimc/32x32/instances/tnt.png diff --git a/application/resources/multimc/32x32/jarmods.png b/launcher/resources/multimc/32x32/jarmods.png similarity index 100% rename from application/resources/multimc/32x32/jarmods.png rename to launcher/resources/multimc/32x32/jarmods.png diff --git a/application/resources/multimc/32x32/loadermods.png b/launcher/resources/multimc/32x32/loadermods.png similarity index 100% rename from application/resources/multimc/32x32/loadermods.png rename to launcher/resources/multimc/32x32/loadermods.png diff --git a/application/resources/multimc/32x32/log.png b/launcher/resources/multimc/32x32/log.png similarity index 100% rename from application/resources/multimc/32x32/log.png rename to launcher/resources/multimc/32x32/log.png diff --git a/application/resources/multimc/32x32/minecraft.png b/launcher/resources/multimc/32x32/minecraft.png similarity index 100% rename from application/resources/multimc/32x32/minecraft.png rename to launcher/resources/multimc/32x32/minecraft.png diff --git a/application/resources/multimc/32x32/new.png b/launcher/resources/multimc/32x32/new.png similarity index 100% rename from application/resources/multimc/32x32/new.png rename to launcher/resources/multimc/32x32/new.png diff --git a/application/resources/multimc/32x32/news.png b/launcher/resources/multimc/32x32/news.png similarity index 100% rename from application/resources/multimc/32x32/news.png rename to launcher/resources/multimc/32x32/news.png diff --git a/application/resources/multimc/32x32/noaccount.png b/launcher/resources/multimc/32x32/noaccount.png similarity index 100% rename from application/resources/multimc/32x32/noaccount.png rename to launcher/resources/multimc/32x32/noaccount.png diff --git a/application/resources/multimc/32x32/patreon.png b/launcher/resources/multimc/32x32/patreon.png similarity index 100% rename from application/resources/multimc/32x32/patreon.png rename to launcher/resources/multimc/32x32/patreon.png diff --git a/application/resources/multimc/32x32/refresh.png b/launcher/resources/multimc/32x32/refresh.png similarity index 100% rename from application/resources/multimc/32x32/refresh.png rename to launcher/resources/multimc/32x32/refresh.png diff --git a/application/resources/multimc/32x32/resourcepacks.png b/launcher/resources/multimc/32x32/resourcepacks.png similarity index 100% rename from application/resources/multimc/32x32/resourcepacks.png rename to launcher/resources/multimc/32x32/resourcepacks.png diff --git a/application/resources/multimc/32x32/screenshots.png b/launcher/resources/multimc/32x32/screenshots.png similarity index 100% rename from application/resources/multimc/32x32/screenshots.png rename to launcher/resources/multimc/32x32/screenshots.png diff --git a/application/resources/multimc/32x32/settings.png b/launcher/resources/multimc/32x32/settings.png similarity index 100% rename from application/resources/multimc/32x32/settings.png rename to launcher/resources/multimc/32x32/settings.png diff --git a/application/resources/multimc/32x32/star.png b/launcher/resources/multimc/32x32/star.png similarity index 100% rename from application/resources/multimc/32x32/star.png rename to launcher/resources/multimc/32x32/star.png diff --git a/application/resources/multimc/32x32/status-bad.png b/launcher/resources/multimc/32x32/status-bad.png similarity index 100% rename from application/resources/multimc/32x32/status-bad.png rename to launcher/resources/multimc/32x32/status-bad.png diff --git a/application/resources/multimc/32x32/status-good.png b/launcher/resources/multimc/32x32/status-good.png similarity index 100% rename from application/resources/multimc/32x32/status-good.png rename to launcher/resources/multimc/32x32/status-good.png diff --git a/application/resources/multimc/32x32/status-running.png b/launcher/resources/multimc/32x32/status-running.png similarity index 100% rename from application/resources/multimc/32x32/status-running.png rename to launcher/resources/multimc/32x32/status-running.png diff --git a/application/resources/multimc/32x32/status-yellow.png b/launcher/resources/multimc/32x32/status-yellow.png similarity index 100% rename from application/resources/multimc/32x32/status-yellow.png rename to launcher/resources/multimc/32x32/status-yellow.png diff --git a/application/resources/multimc/32x32/viewfolder.png b/launcher/resources/multimc/32x32/viewfolder.png similarity index 100% rename from application/resources/multimc/32x32/viewfolder.png rename to launcher/resources/multimc/32x32/viewfolder.png diff --git a/application/resources/multimc/32x32/worlds.png b/launcher/resources/multimc/32x32/worlds.png similarity index 100% rename from application/resources/multimc/32x32/worlds.png rename to launcher/resources/multimc/32x32/worlds.png diff --git a/application/resources/multimc/48x48/about.png b/launcher/resources/multimc/48x48/about.png similarity index 100% rename from application/resources/multimc/48x48/about.png rename to launcher/resources/multimc/48x48/about.png diff --git a/application/resources/multimc/48x48/bug.png b/launcher/resources/multimc/48x48/bug.png similarity index 100% rename from application/resources/multimc/48x48/bug.png rename to launcher/resources/multimc/48x48/bug.png diff --git a/application/resources/multimc/48x48/cat.png b/launcher/resources/multimc/48x48/cat.png similarity index 100% rename from application/resources/multimc/48x48/cat.png rename to launcher/resources/multimc/48x48/cat.png diff --git a/application/resources/multimc/48x48/centralmods.png b/launcher/resources/multimc/48x48/centralmods.png similarity index 100% rename from application/resources/multimc/48x48/centralmods.png rename to launcher/resources/multimc/48x48/centralmods.png diff --git a/application/resources/multimc/48x48/checkupdate.png b/launcher/resources/multimc/48x48/checkupdate.png similarity index 100% rename from application/resources/multimc/48x48/checkupdate.png rename to launcher/resources/multimc/48x48/checkupdate.png diff --git a/application/resources/multimc/48x48/copy.png b/launcher/resources/multimc/48x48/copy.png similarity index 100% rename from application/resources/multimc/48x48/copy.png rename to launcher/resources/multimc/48x48/copy.png diff --git a/application/resources/multimc/48x48/help.png b/launcher/resources/multimc/48x48/help.png similarity index 100% rename from application/resources/multimc/48x48/help.png rename to launcher/resources/multimc/48x48/help.png diff --git a/application/resources/multimc/48x48/instance-settings.png b/launcher/resources/multimc/48x48/instance-settings.png similarity index 100% rename from application/resources/multimc/48x48/instance-settings.png rename to launcher/resources/multimc/48x48/instance-settings.png diff --git a/application/resources/multimc/48x48/log.png b/launcher/resources/multimc/48x48/log.png similarity index 100% rename from application/resources/multimc/48x48/log.png rename to launcher/resources/multimc/48x48/log.png diff --git a/application/resources/multimc/48x48/minecraft.png b/launcher/resources/multimc/48x48/minecraft.png similarity index 100% rename from application/resources/multimc/48x48/minecraft.png rename to launcher/resources/multimc/48x48/minecraft.png diff --git a/application/resources/multimc/48x48/new.png b/launcher/resources/multimc/48x48/new.png similarity index 100% rename from application/resources/multimc/48x48/new.png rename to launcher/resources/multimc/48x48/new.png diff --git a/application/resources/multimc/48x48/news.png b/launcher/resources/multimc/48x48/news.png similarity index 100% rename from application/resources/multimc/48x48/news.png rename to launcher/resources/multimc/48x48/news.png diff --git a/application/resources/multimc/48x48/noaccount.png b/launcher/resources/multimc/48x48/noaccount.png similarity index 100% rename from application/resources/multimc/48x48/noaccount.png rename to launcher/resources/multimc/48x48/noaccount.png diff --git a/application/resources/multimc/48x48/patreon.png b/launcher/resources/multimc/48x48/patreon.png similarity index 100% rename from application/resources/multimc/48x48/patreon.png rename to launcher/resources/multimc/48x48/patreon.png diff --git a/application/resources/multimc/48x48/refresh.png b/launcher/resources/multimc/48x48/refresh.png similarity index 100% rename from application/resources/multimc/48x48/refresh.png rename to launcher/resources/multimc/48x48/refresh.png diff --git a/application/resources/multimc/48x48/screenshots.png b/launcher/resources/multimc/48x48/screenshots.png similarity index 100% rename from application/resources/multimc/48x48/screenshots.png rename to launcher/resources/multimc/48x48/screenshots.png diff --git a/application/resources/multimc/48x48/settings.png b/launcher/resources/multimc/48x48/settings.png similarity index 100% rename from application/resources/multimc/48x48/settings.png rename to launcher/resources/multimc/48x48/settings.png diff --git a/application/resources/multimc/48x48/star.png b/launcher/resources/multimc/48x48/star.png similarity index 100% rename from application/resources/multimc/48x48/star.png rename to launcher/resources/multimc/48x48/star.png diff --git a/application/resources/multimc/48x48/status-bad.png b/launcher/resources/multimc/48x48/status-bad.png similarity index 100% rename from application/resources/multimc/48x48/status-bad.png rename to launcher/resources/multimc/48x48/status-bad.png diff --git a/application/resources/multimc/48x48/status-good.png b/launcher/resources/multimc/48x48/status-good.png similarity index 100% rename from application/resources/multimc/48x48/status-good.png rename to launcher/resources/multimc/48x48/status-good.png diff --git a/application/resources/multimc/48x48/status-running.png b/launcher/resources/multimc/48x48/status-running.png similarity index 100% rename from application/resources/multimc/48x48/status-running.png rename to launcher/resources/multimc/48x48/status-running.png diff --git a/application/resources/multimc/48x48/status-yellow.png b/launcher/resources/multimc/48x48/status-yellow.png similarity index 100% rename from application/resources/multimc/48x48/status-yellow.png rename to launcher/resources/multimc/48x48/status-yellow.png diff --git a/application/resources/multimc/48x48/viewfolder.png b/launcher/resources/multimc/48x48/viewfolder.png similarity index 100% rename from application/resources/multimc/48x48/viewfolder.png rename to launcher/resources/multimc/48x48/viewfolder.png diff --git a/application/resources/multimc/48x48/worlds.png b/launcher/resources/multimc/48x48/worlds.png similarity index 100% rename from application/resources/multimc/48x48/worlds.png rename to launcher/resources/multimc/48x48/worlds.png diff --git a/application/resources/multimc/50x50/instances/enderman.png b/launcher/resources/multimc/50x50/instances/enderman.png similarity index 100% rename from application/resources/multimc/50x50/instances/enderman.png rename to launcher/resources/multimc/50x50/instances/enderman.png diff --git a/application/resources/multimc/64x64/about.png b/launcher/resources/multimc/64x64/about.png similarity index 100% rename from application/resources/multimc/64x64/about.png rename to launcher/resources/multimc/64x64/about.png diff --git a/application/resources/multimc/64x64/bug.png b/launcher/resources/multimc/64x64/bug.png similarity index 100% rename from application/resources/multimc/64x64/bug.png rename to launcher/resources/multimc/64x64/bug.png diff --git a/application/resources/multimc/64x64/cat.png b/launcher/resources/multimc/64x64/cat.png similarity index 100% rename from application/resources/multimc/64x64/cat.png rename to launcher/resources/multimc/64x64/cat.png diff --git a/application/resources/multimc/64x64/centralmods.png b/launcher/resources/multimc/64x64/centralmods.png similarity index 100% rename from application/resources/multimc/64x64/centralmods.png rename to launcher/resources/multimc/64x64/centralmods.png diff --git a/application/resources/multimc/64x64/checkupdate.png b/launcher/resources/multimc/64x64/checkupdate.png similarity index 100% rename from application/resources/multimc/64x64/checkupdate.png rename to launcher/resources/multimc/64x64/checkupdate.png diff --git a/application/resources/multimc/64x64/copy.png b/launcher/resources/multimc/64x64/copy.png similarity index 100% rename from application/resources/multimc/64x64/copy.png rename to launcher/resources/multimc/64x64/copy.png diff --git a/application/resources/multimc/64x64/coremods.png b/launcher/resources/multimc/64x64/coremods.png similarity index 100% rename from application/resources/multimc/64x64/coremods.png rename to launcher/resources/multimc/64x64/coremods.png diff --git a/application/resources/multimc/64x64/help.png b/launcher/resources/multimc/64x64/help.png similarity index 100% rename from application/resources/multimc/64x64/help.png rename to launcher/resources/multimc/64x64/help.png diff --git a/application/resources/multimc/64x64/instance-settings.png b/launcher/resources/multimc/64x64/instance-settings.png similarity index 100% rename from application/resources/multimc/64x64/instance-settings.png rename to launcher/resources/multimc/64x64/instance-settings.png diff --git a/application/resources/multimc/64x64/jarmods.png b/launcher/resources/multimc/64x64/jarmods.png similarity index 100% rename from application/resources/multimc/64x64/jarmods.png rename to launcher/resources/multimc/64x64/jarmods.png diff --git a/application/resources/multimc/64x64/loadermods.png b/launcher/resources/multimc/64x64/loadermods.png similarity index 100% rename from application/resources/multimc/64x64/loadermods.png rename to launcher/resources/multimc/64x64/loadermods.png diff --git a/application/resources/multimc/64x64/log.png b/launcher/resources/multimc/64x64/log.png similarity index 100% rename from application/resources/multimc/64x64/log.png rename to launcher/resources/multimc/64x64/log.png diff --git a/application/resources/multimc/64x64/new.png b/launcher/resources/multimc/64x64/new.png similarity index 100% rename from application/resources/multimc/64x64/new.png rename to launcher/resources/multimc/64x64/new.png diff --git a/application/resources/multimc/64x64/news.png b/launcher/resources/multimc/64x64/news.png similarity index 100% rename from application/resources/multimc/64x64/news.png rename to launcher/resources/multimc/64x64/news.png diff --git a/application/resources/multimc/64x64/patreon.png b/launcher/resources/multimc/64x64/patreon.png similarity index 100% rename from application/resources/multimc/64x64/patreon.png rename to launcher/resources/multimc/64x64/patreon.png diff --git a/application/resources/multimc/64x64/refresh.png b/launcher/resources/multimc/64x64/refresh.png similarity index 100% rename from application/resources/multimc/64x64/refresh.png rename to launcher/resources/multimc/64x64/refresh.png diff --git a/application/resources/multimc/64x64/resourcepacks.png b/launcher/resources/multimc/64x64/resourcepacks.png similarity index 100% rename from application/resources/multimc/64x64/resourcepacks.png rename to launcher/resources/multimc/64x64/resourcepacks.png diff --git a/application/resources/multimc/64x64/screenshots.png b/launcher/resources/multimc/64x64/screenshots.png similarity index 100% rename from application/resources/multimc/64x64/screenshots.png rename to launcher/resources/multimc/64x64/screenshots.png diff --git a/application/resources/multimc/64x64/settings.png b/launcher/resources/multimc/64x64/settings.png similarity index 100% rename from application/resources/multimc/64x64/settings.png rename to launcher/resources/multimc/64x64/settings.png diff --git a/application/resources/multimc/64x64/star.png b/launcher/resources/multimc/64x64/star.png similarity index 100% rename from application/resources/multimc/64x64/star.png rename to launcher/resources/multimc/64x64/star.png diff --git a/application/resources/multimc/64x64/status-bad.png b/launcher/resources/multimc/64x64/status-bad.png similarity index 100% rename from application/resources/multimc/64x64/status-bad.png rename to launcher/resources/multimc/64x64/status-bad.png diff --git a/application/resources/multimc/64x64/status-good.png b/launcher/resources/multimc/64x64/status-good.png similarity index 100% rename from application/resources/multimc/64x64/status-good.png rename to launcher/resources/multimc/64x64/status-good.png diff --git a/application/resources/multimc/64x64/status-running.png b/launcher/resources/multimc/64x64/status-running.png similarity index 100% rename from application/resources/multimc/64x64/status-running.png rename to launcher/resources/multimc/64x64/status-running.png diff --git a/application/resources/multimc/64x64/status-yellow.png b/launcher/resources/multimc/64x64/status-yellow.png similarity index 100% rename from application/resources/multimc/64x64/status-yellow.png rename to launcher/resources/multimc/64x64/status-yellow.png diff --git a/application/resources/multimc/64x64/viewfolder.png b/launcher/resources/multimc/64x64/viewfolder.png similarity index 100% rename from application/resources/multimc/64x64/viewfolder.png rename to launcher/resources/multimc/64x64/viewfolder.png diff --git a/application/resources/multimc/64x64/worlds.png b/launcher/resources/multimc/64x64/worlds.png similarity index 100% rename from application/resources/multimc/64x64/worlds.png rename to launcher/resources/multimc/64x64/worlds.png diff --git a/application/resources/multimc/8x8/noaccount.png b/launcher/resources/multimc/8x8/noaccount.png similarity index 100% rename from application/resources/multimc/8x8/noaccount.png rename to launcher/resources/multimc/8x8/noaccount.png diff --git a/application/resources/multimc/index.theme b/launcher/resources/multimc/index.theme similarity index 100% rename from application/resources/multimc/index.theme rename to launcher/resources/multimc/index.theme diff --git a/application/resources/multimc/multimc.qrc b/launcher/resources/multimc/multimc.qrc similarity index 100% rename from application/resources/multimc/multimc.qrc rename to launcher/resources/multimc/multimc.qrc diff --git a/application/resources/multimc/scalable/atlauncher-placeholder.png b/launcher/resources/multimc/scalable/atlauncher-placeholder.png similarity index 100% rename from application/resources/multimc/scalable/atlauncher-placeholder.png rename to launcher/resources/multimc/scalable/atlauncher-placeholder.png diff --git a/application/resources/multimc/scalable/atlauncher.svg b/launcher/resources/multimc/scalable/atlauncher.svg similarity index 100% rename from application/resources/multimc/scalable/atlauncher.svg rename to launcher/resources/multimc/scalable/atlauncher.svg diff --git a/application/resources/multimc/scalable/bug.svg b/launcher/resources/multimc/scalable/bug.svg similarity index 100% rename from application/resources/multimc/scalable/bug.svg rename to launcher/resources/multimc/scalable/bug.svg diff --git a/application/resources/multimc/scalable/centralmods.svg b/launcher/resources/multimc/scalable/centralmods.svg similarity index 100% rename from application/resources/multimc/scalable/centralmods.svg rename to launcher/resources/multimc/scalable/centralmods.svg diff --git a/application/resources/multimc/scalable/checkupdate.svg b/launcher/resources/multimc/scalable/checkupdate.svg similarity index 100% rename from application/resources/multimc/scalable/checkupdate.svg rename to launcher/resources/multimc/scalable/checkupdate.svg diff --git a/application/resources/multimc/scalable/custom-commands.svg b/launcher/resources/multimc/scalable/custom-commands.svg similarity index 100% rename from application/resources/multimc/scalable/custom-commands.svg rename to launcher/resources/multimc/scalable/custom-commands.svg diff --git a/application/resources/multimc/scalable/discord.svg b/launcher/resources/multimc/scalable/discord.svg similarity index 100% rename from application/resources/multimc/scalable/discord.svg rename to launcher/resources/multimc/scalable/discord.svg diff --git a/application/resources/multimc/scalable/instances/bee.svg b/launcher/resources/multimc/scalable/instances/bee.svg similarity index 100% rename from application/resources/multimc/scalable/instances/bee.svg rename to launcher/resources/multimc/scalable/instances/bee.svg diff --git a/application/resources/multimc/scalable/instances/fox.svg b/launcher/resources/multimc/scalable/instances/fox.svg similarity index 100% rename from application/resources/multimc/scalable/instances/fox.svg rename to launcher/resources/multimc/scalable/instances/fox.svg diff --git a/application/resources/multimc/scalable/java.svg b/launcher/resources/multimc/scalable/java.svg similarity index 100% rename from application/resources/multimc/scalable/java.svg rename to launcher/resources/multimc/scalable/java.svg diff --git a/application/resources/multimc/scalable/language.svg b/launcher/resources/multimc/scalable/language.svg similarity index 100% rename from application/resources/multimc/scalable/language.svg rename to launcher/resources/multimc/scalable/language.svg diff --git a/application/resources/multimc/scalable/logo.svg b/launcher/resources/multimc/scalable/logo.svg similarity index 100% rename from application/resources/multimc/scalable/logo.svg rename to launcher/resources/multimc/scalable/logo.svg diff --git a/application/resources/multimc/scalable/multimc.svg b/launcher/resources/multimc/scalable/multimc.svg similarity index 100% rename from application/resources/multimc/scalable/multimc.svg rename to launcher/resources/multimc/scalable/multimc.svg diff --git a/application/resources/multimc/scalable/new.svg b/launcher/resources/multimc/scalable/new.svg similarity index 100% rename from application/resources/multimc/scalable/new.svg rename to launcher/resources/multimc/scalable/new.svg diff --git a/application/resources/multimc/scalable/news.svg b/launcher/resources/multimc/scalable/news.svg similarity index 100% rename from application/resources/multimc/scalable/news.svg rename to launcher/resources/multimc/scalable/news.svg diff --git a/application/resources/multimc/scalable/proxy.svg b/launcher/resources/multimc/scalable/proxy.svg similarity index 100% rename from application/resources/multimc/scalable/proxy.svg rename to launcher/resources/multimc/scalable/proxy.svg diff --git a/application/resources/multimc/scalable/reddit-alien.svg b/launcher/resources/multimc/scalable/reddit-alien.svg similarity index 100% rename from application/resources/multimc/scalable/reddit-alien.svg rename to launcher/resources/multimc/scalable/reddit-alien.svg diff --git a/application/resources/multimc/scalable/screenshot-placeholder.svg b/launcher/resources/multimc/scalable/screenshot-placeholder.svg similarity index 100% rename from application/resources/multimc/scalable/screenshot-placeholder.svg rename to launcher/resources/multimc/scalable/screenshot-placeholder.svg diff --git a/application/resources/multimc/scalable/screenshots.svg b/launcher/resources/multimc/scalable/screenshots.svg similarity index 100% rename from application/resources/multimc/scalable/screenshots.svg rename to launcher/resources/multimc/scalable/screenshots.svg diff --git a/application/resources/multimc/scalable/status-bad.svg b/launcher/resources/multimc/scalable/status-bad.svg similarity index 100% rename from application/resources/multimc/scalable/status-bad.svg rename to launcher/resources/multimc/scalable/status-bad.svg diff --git a/application/resources/multimc/scalable/status-good.svg b/launcher/resources/multimc/scalable/status-good.svg similarity index 100% rename from application/resources/multimc/scalable/status-good.svg rename to launcher/resources/multimc/scalable/status-good.svg diff --git a/application/resources/multimc/scalable/status-running.svg b/launcher/resources/multimc/scalable/status-running.svg similarity index 100% rename from application/resources/multimc/scalable/status-running.svg rename to launcher/resources/multimc/scalable/status-running.svg diff --git a/application/resources/multimc/scalable/status-yellow.svg b/launcher/resources/multimc/scalable/status-yellow.svg similarity index 100% rename from application/resources/multimc/scalable/status-yellow.svg rename to launcher/resources/multimc/scalable/status-yellow.svg diff --git a/application/resources/multimc/scalable/technic.svg b/launcher/resources/multimc/scalable/technic.svg similarity index 100% rename from application/resources/multimc/scalable/technic.svg rename to launcher/resources/multimc/scalable/technic.svg diff --git a/application/resources/multimc/scalable/viewfolder.svg b/launcher/resources/multimc/scalable/viewfolder.svg similarity index 100% rename from application/resources/multimc/scalable/viewfolder.svg rename to launcher/resources/multimc/scalable/viewfolder.svg diff --git a/application/resources/pe_blue/index.theme b/launcher/resources/pe_blue/index.theme similarity index 100% rename from application/resources/pe_blue/index.theme rename to launcher/resources/pe_blue/index.theme diff --git a/application/resources/pe_blue/pe_blue.qrc b/launcher/resources/pe_blue/pe_blue.qrc similarity index 100% rename from application/resources/pe_blue/pe_blue.qrc rename to launcher/resources/pe_blue/pe_blue.qrc diff --git a/application/resources/pe_blue/scalable/about.svg b/launcher/resources/pe_blue/scalable/about.svg similarity index 100% rename from application/resources/pe_blue/scalable/about.svg rename to launcher/resources/pe_blue/scalable/about.svg diff --git a/application/resources/pe_blue/scalable/accounts.svg b/launcher/resources/pe_blue/scalable/accounts.svg similarity index 100% rename from application/resources/pe_blue/scalable/accounts.svg rename to launcher/resources/pe_blue/scalable/accounts.svg diff --git a/application/resources/pe_blue/scalable/bug.svg b/launcher/resources/pe_blue/scalable/bug.svg similarity index 100% rename from application/resources/pe_blue/scalable/bug.svg rename to launcher/resources/pe_blue/scalable/bug.svg diff --git a/application/resources/pe_blue/scalable/centralmods.svg b/launcher/resources/pe_blue/scalable/centralmods.svg similarity index 100% rename from application/resources/pe_blue/scalable/centralmods.svg rename to launcher/resources/pe_blue/scalable/centralmods.svg diff --git a/application/resources/pe_blue/scalable/checkupdate.svg b/launcher/resources/pe_blue/scalable/checkupdate.svg similarity index 100% rename from application/resources/pe_blue/scalable/checkupdate.svg rename to launcher/resources/pe_blue/scalable/checkupdate.svg diff --git a/application/resources/pe_blue/scalable/copy.svg b/launcher/resources/pe_blue/scalable/copy.svg similarity index 100% rename from application/resources/pe_blue/scalable/copy.svg rename to launcher/resources/pe_blue/scalable/copy.svg diff --git a/application/resources/pe_blue/scalable/coremods.svg b/launcher/resources/pe_blue/scalable/coremods.svg similarity index 100% rename from application/resources/pe_blue/scalable/coremods.svg rename to launcher/resources/pe_blue/scalable/coremods.svg diff --git a/application/resources/pe_blue/scalable/externaltools.svg b/launcher/resources/pe_blue/scalable/externaltools.svg similarity index 100% rename from application/resources/pe_blue/scalable/externaltools.svg rename to launcher/resources/pe_blue/scalable/externaltools.svg diff --git a/application/resources/pe_blue/scalable/help.svg b/launcher/resources/pe_blue/scalable/help.svg similarity index 100% rename from application/resources/pe_blue/scalable/help.svg rename to launcher/resources/pe_blue/scalable/help.svg diff --git a/application/resources/pe_blue/scalable/instance-settings.svg b/launcher/resources/pe_blue/scalable/instance-settings.svg similarity index 100% rename from application/resources/pe_blue/scalable/instance-settings.svg rename to launcher/resources/pe_blue/scalable/instance-settings.svg diff --git a/application/resources/pe_blue/scalable/jarmods.svg b/launcher/resources/pe_blue/scalable/jarmods.svg similarity index 100% rename from application/resources/pe_blue/scalable/jarmods.svg rename to launcher/resources/pe_blue/scalable/jarmods.svg diff --git a/application/resources/pe_blue/scalable/java.svg b/launcher/resources/pe_blue/scalable/java.svg similarity index 100% rename from application/resources/pe_blue/scalable/java.svg rename to launcher/resources/pe_blue/scalable/java.svg diff --git a/application/resources/pe_blue/scalable/language.svg b/launcher/resources/pe_blue/scalable/language.svg similarity index 100% rename from application/resources/pe_blue/scalable/language.svg rename to launcher/resources/pe_blue/scalable/language.svg diff --git a/application/resources/pe_blue/scalable/loadermods.svg b/launcher/resources/pe_blue/scalable/loadermods.svg similarity index 100% rename from application/resources/pe_blue/scalable/loadermods.svg rename to launcher/resources/pe_blue/scalable/loadermods.svg diff --git a/application/resources/pe_blue/scalable/log.svg b/launcher/resources/pe_blue/scalable/log.svg similarity index 100% rename from application/resources/pe_blue/scalable/log.svg rename to launcher/resources/pe_blue/scalable/log.svg diff --git a/application/resources/pe_blue/scalable/minecraft.svg b/launcher/resources/pe_blue/scalable/minecraft.svg similarity index 100% rename from application/resources/pe_blue/scalable/minecraft.svg rename to launcher/resources/pe_blue/scalable/minecraft.svg diff --git a/application/resources/pe_blue/scalable/multimc.svg b/launcher/resources/pe_blue/scalable/multimc.svg similarity index 100% rename from application/resources/pe_blue/scalable/multimc.svg rename to launcher/resources/pe_blue/scalable/multimc.svg diff --git a/application/resources/pe_blue/scalable/new.svg b/launcher/resources/pe_blue/scalable/new.svg similarity index 100% rename from application/resources/pe_blue/scalable/new.svg rename to launcher/resources/pe_blue/scalable/new.svg diff --git a/application/resources/pe_blue/scalable/news.svg b/launcher/resources/pe_blue/scalable/news.svg similarity index 100% rename from application/resources/pe_blue/scalable/news.svg rename to launcher/resources/pe_blue/scalable/news.svg diff --git a/application/resources/pe_blue/scalable/notes.svg b/launcher/resources/pe_blue/scalable/notes.svg similarity index 100% rename from application/resources/pe_blue/scalable/notes.svg rename to launcher/resources/pe_blue/scalable/notes.svg diff --git a/application/resources/pe_blue/scalable/patreon.svg b/launcher/resources/pe_blue/scalable/patreon.svg similarity index 100% rename from application/resources/pe_blue/scalable/patreon.svg rename to launcher/resources/pe_blue/scalable/patreon.svg diff --git a/application/resources/pe_blue/scalable/proxy.svg b/launcher/resources/pe_blue/scalable/proxy.svg similarity index 100% rename from application/resources/pe_blue/scalable/proxy.svg rename to launcher/resources/pe_blue/scalable/proxy.svg diff --git a/application/resources/pe_blue/scalable/quickmods.svg b/launcher/resources/pe_blue/scalable/quickmods.svg similarity index 100% rename from application/resources/pe_blue/scalable/quickmods.svg rename to launcher/resources/pe_blue/scalable/quickmods.svg diff --git a/application/resources/pe_blue/scalable/refresh.svg b/launcher/resources/pe_blue/scalable/refresh.svg similarity index 100% rename from application/resources/pe_blue/scalable/refresh.svg rename to launcher/resources/pe_blue/scalable/refresh.svg diff --git a/application/resources/pe_blue/scalable/resourcepacks.svg b/launcher/resources/pe_blue/scalable/resourcepacks.svg similarity index 100% rename from application/resources/pe_blue/scalable/resourcepacks.svg rename to launcher/resources/pe_blue/scalable/resourcepacks.svg diff --git a/application/resources/pe_blue/scalable/screenshots.svg b/launcher/resources/pe_blue/scalable/screenshots.svg similarity index 100% rename from application/resources/pe_blue/scalable/screenshots.svg rename to launcher/resources/pe_blue/scalable/screenshots.svg diff --git a/application/resources/pe_blue/scalable/settings.svg b/launcher/resources/pe_blue/scalable/settings.svg similarity index 100% rename from application/resources/pe_blue/scalable/settings.svg rename to launcher/resources/pe_blue/scalable/settings.svg diff --git a/application/resources/pe_blue/scalable/status-bad.svg b/launcher/resources/pe_blue/scalable/status-bad.svg similarity index 100% rename from application/resources/pe_blue/scalable/status-bad.svg rename to launcher/resources/pe_blue/scalable/status-bad.svg diff --git a/application/resources/pe_blue/scalable/status-good.svg b/launcher/resources/pe_blue/scalable/status-good.svg similarity index 100% rename from application/resources/pe_blue/scalable/status-good.svg rename to launcher/resources/pe_blue/scalable/status-good.svg diff --git a/application/resources/pe_blue/scalable/status-yellow.svg b/launcher/resources/pe_blue/scalable/status-yellow.svg similarity index 100% rename from application/resources/pe_blue/scalable/status-yellow.svg rename to launcher/resources/pe_blue/scalable/status-yellow.svg diff --git a/application/resources/pe_blue/scalable/viewfolder.svg b/launcher/resources/pe_blue/scalable/viewfolder.svg similarity index 100% rename from application/resources/pe_blue/scalable/viewfolder.svg rename to launcher/resources/pe_blue/scalable/viewfolder.svg diff --git a/application/resources/pe_blue/scalable/worlds.svg b/launcher/resources/pe_blue/scalable/worlds.svg similarity index 100% rename from application/resources/pe_blue/scalable/worlds.svg rename to launcher/resources/pe_blue/scalable/worlds.svg diff --git a/application/resources/pe_colored/index.theme b/launcher/resources/pe_colored/index.theme similarity index 100% rename from application/resources/pe_colored/index.theme rename to launcher/resources/pe_colored/index.theme diff --git a/application/resources/pe_colored/pe_colored.qrc b/launcher/resources/pe_colored/pe_colored.qrc similarity index 100% rename from application/resources/pe_colored/pe_colored.qrc rename to launcher/resources/pe_colored/pe_colored.qrc diff --git a/application/resources/pe_colored/scalable/about.svg b/launcher/resources/pe_colored/scalable/about.svg similarity index 100% rename from application/resources/pe_colored/scalable/about.svg rename to launcher/resources/pe_colored/scalable/about.svg diff --git a/application/resources/pe_colored/scalable/accounts.svg b/launcher/resources/pe_colored/scalable/accounts.svg similarity index 100% rename from application/resources/pe_colored/scalable/accounts.svg rename to launcher/resources/pe_colored/scalable/accounts.svg diff --git a/application/resources/pe_colored/scalable/bug.svg b/launcher/resources/pe_colored/scalable/bug.svg similarity index 100% rename from application/resources/pe_colored/scalable/bug.svg rename to launcher/resources/pe_colored/scalable/bug.svg diff --git a/application/resources/pe_colored/scalable/centralmods.svg b/launcher/resources/pe_colored/scalable/centralmods.svg similarity index 100% rename from application/resources/pe_colored/scalable/centralmods.svg rename to launcher/resources/pe_colored/scalable/centralmods.svg diff --git a/application/resources/pe_colored/scalable/checkupdate.svg b/launcher/resources/pe_colored/scalable/checkupdate.svg similarity index 100% rename from application/resources/pe_colored/scalable/checkupdate.svg rename to launcher/resources/pe_colored/scalable/checkupdate.svg diff --git a/application/resources/pe_colored/scalable/copy.svg b/launcher/resources/pe_colored/scalable/copy.svg similarity index 100% rename from application/resources/pe_colored/scalable/copy.svg rename to launcher/resources/pe_colored/scalable/copy.svg diff --git a/application/resources/pe_colored/scalable/coremods.svg b/launcher/resources/pe_colored/scalable/coremods.svg similarity index 100% rename from application/resources/pe_colored/scalable/coremods.svg rename to launcher/resources/pe_colored/scalable/coremods.svg diff --git a/application/resources/pe_colored/scalable/externaltools.svg b/launcher/resources/pe_colored/scalable/externaltools.svg similarity index 100% rename from application/resources/pe_colored/scalable/externaltools.svg rename to launcher/resources/pe_colored/scalable/externaltools.svg diff --git a/application/resources/pe_colored/scalable/help.svg b/launcher/resources/pe_colored/scalable/help.svg similarity index 100% rename from application/resources/pe_colored/scalable/help.svg rename to launcher/resources/pe_colored/scalable/help.svg diff --git a/application/resources/pe_colored/scalable/instance-settings.svg b/launcher/resources/pe_colored/scalable/instance-settings.svg similarity index 100% rename from application/resources/pe_colored/scalable/instance-settings.svg rename to launcher/resources/pe_colored/scalable/instance-settings.svg diff --git a/application/resources/pe_colored/scalable/jarmods.svg b/launcher/resources/pe_colored/scalable/jarmods.svg similarity index 100% rename from application/resources/pe_colored/scalable/jarmods.svg rename to launcher/resources/pe_colored/scalable/jarmods.svg diff --git a/application/resources/pe_colored/scalable/java.svg b/launcher/resources/pe_colored/scalable/java.svg similarity index 100% rename from application/resources/pe_colored/scalable/java.svg rename to launcher/resources/pe_colored/scalable/java.svg diff --git a/application/resources/pe_colored/scalable/language.svg b/launcher/resources/pe_colored/scalable/language.svg similarity index 100% rename from application/resources/pe_colored/scalable/language.svg rename to launcher/resources/pe_colored/scalable/language.svg diff --git a/application/resources/pe_colored/scalable/loadermods.svg b/launcher/resources/pe_colored/scalable/loadermods.svg similarity index 100% rename from application/resources/pe_colored/scalable/loadermods.svg rename to launcher/resources/pe_colored/scalable/loadermods.svg diff --git a/application/resources/pe_colored/scalable/log.svg b/launcher/resources/pe_colored/scalable/log.svg similarity index 100% rename from application/resources/pe_colored/scalable/log.svg rename to launcher/resources/pe_colored/scalable/log.svg diff --git a/application/resources/pe_colored/scalable/minecraft.svg b/launcher/resources/pe_colored/scalable/minecraft.svg similarity index 100% rename from application/resources/pe_colored/scalable/minecraft.svg rename to launcher/resources/pe_colored/scalable/minecraft.svg diff --git a/application/resources/pe_colored/scalable/multimc.svg b/launcher/resources/pe_colored/scalable/multimc.svg similarity index 100% rename from application/resources/pe_colored/scalable/multimc.svg rename to launcher/resources/pe_colored/scalable/multimc.svg diff --git a/application/resources/pe_colored/scalable/new.svg b/launcher/resources/pe_colored/scalable/new.svg similarity index 100% rename from application/resources/pe_colored/scalable/new.svg rename to launcher/resources/pe_colored/scalable/new.svg diff --git a/application/resources/pe_colored/scalable/news.svg b/launcher/resources/pe_colored/scalable/news.svg similarity index 100% rename from application/resources/pe_colored/scalable/news.svg rename to launcher/resources/pe_colored/scalable/news.svg diff --git a/application/resources/pe_colored/scalable/notes.svg b/launcher/resources/pe_colored/scalable/notes.svg similarity index 100% rename from application/resources/pe_colored/scalable/notes.svg rename to launcher/resources/pe_colored/scalable/notes.svg diff --git a/application/resources/pe_colored/scalable/patreon.svg b/launcher/resources/pe_colored/scalable/patreon.svg similarity index 100% rename from application/resources/pe_colored/scalable/patreon.svg rename to launcher/resources/pe_colored/scalable/patreon.svg diff --git a/application/resources/pe_colored/scalable/proxy.svg b/launcher/resources/pe_colored/scalable/proxy.svg similarity index 100% rename from application/resources/pe_colored/scalable/proxy.svg rename to launcher/resources/pe_colored/scalable/proxy.svg diff --git a/application/resources/pe_colored/scalable/quickmods.svg b/launcher/resources/pe_colored/scalable/quickmods.svg similarity index 100% rename from application/resources/pe_colored/scalable/quickmods.svg rename to launcher/resources/pe_colored/scalable/quickmods.svg diff --git a/application/resources/pe_colored/scalable/refresh.svg b/launcher/resources/pe_colored/scalable/refresh.svg similarity index 100% rename from application/resources/pe_colored/scalable/refresh.svg rename to launcher/resources/pe_colored/scalable/refresh.svg diff --git a/application/resources/pe_colored/scalable/resourcepacks.svg b/launcher/resources/pe_colored/scalable/resourcepacks.svg similarity index 100% rename from application/resources/pe_colored/scalable/resourcepacks.svg rename to launcher/resources/pe_colored/scalable/resourcepacks.svg diff --git a/application/resources/pe_colored/scalable/screenshots.svg b/launcher/resources/pe_colored/scalable/screenshots.svg similarity index 100% rename from application/resources/pe_colored/scalable/screenshots.svg rename to launcher/resources/pe_colored/scalable/screenshots.svg diff --git a/application/resources/pe_colored/scalable/settings.svg b/launcher/resources/pe_colored/scalable/settings.svg similarity index 100% rename from application/resources/pe_colored/scalable/settings.svg rename to launcher/resources/pe_colored/scalable/settings.svg diff --git a/application/resources/pe_colored/scalable/status-bad.svg b/launcher/resources/pe_colored/scalable/status-bad.svg similarity index 100% rename from application/resources/pe_colored/scalable/status-bad.svg rename to launcher/resources/pe_colored/scalable/status-bad.svg diff --git a/application/resources/pe_colored/scalable/status-good.svg b/launcher/resources/pe_colored/scalable/status-good.svg similarity index 100% rename from application/resources/pe_colored/scalable/status-good.svg rename to launcher/resources/pe_colored/scalable/status-good.svg diff --git a/application/resources/pe_colored/scalable/status-yellow.svg b/launcher/resources/pe_colored/scalable/status-yellow.svg similarity index 100% rename from application/resources/pe_colored/scalable/status-yellow.svg rename to launcher/resources/pe_colored/scalable/status-yellow.svg diff --git a/application/resources/pe_colored/scalable/viewfolder.svg b/launcher/resources/pe_colored/scalable/viewfolder.svg similarity index 100% rename from application/resources/pe_colored/scalable/viewfolder.svg rename to launcher/resources/pe_colored/scalable/viewfolder.svg diff --git a/application/resources/pe_colored/scalable/worlds.svg b/launcher/resources/pe_colored/scalable/worlds.svg similarity index 100% rename from application/resources/pe_colored/scalable/worlds.svg rename to launcher/resources/pe_colored/scalable/worlds.svg diff --git a/application/resources/pe_dark/index.theme b/launcher/resources/pe_dark/index.theme similarity index 100% rename from application/resources/pe_dark/index.theme rename to launcher/resources/pe_dark/index.theme diff --git a/application/resources/pe_dark/pe_dark.qrc b/launcher/resources/pe_dark/pe_dark.qrc similarity index 100% rename from application/resources/pe_dark/pe_dark.qrc rename to launcher/resources/pe_dark/pe_dark.qrc diff --git a/application/resources/pe_dark/scalable/about.svg b/launcher/resources/pe_dark/scalable/about.svg similarity index 100% rename from application/resources/pe_dark/scalable/about.svg rename to launcher/resources/pe_dark/scalable/about.svg diff --git a/application/resources/pe_dark/scalable/accounts.svg b/launcher/resources/pe_dark/scalable/accounts.svg similarity index 100% rename from application/resources/pe_dark/scalable/accounts.svg rename to launcher/resources/pe_dark/scalable/accounts.svg diff --git a/application/resources/pe_dark/scalable/bug.svg b/launcher/resources/pe_dark/scalable/bug.svg similarity index 100% rename from application/resources/pe_dark/scalable/bug.svg rename to launcher/resources/pe_dark/scalable/bug.svg diff --git a/application/resources/pe_dark/scalable/centralmods.svg b/launcher/resources/pe_dark/scalable/centralmods.svg similarity index 100% rename from application/resources/pe_dark/scalable/centralmods.svg rename to launcher/resources/pe_dark/scalable/centralmods.svg diff --git a/application/resources/pe_dark/scalable/checkupdate.svg b/launcher/resources/pe_dark/scalable/checkupdate.svg similarity index 100% rename from application/resources/pe_dark/scalable/checkupdate.svg rename to launcher/resources/pe_dark/scalable/checkupdate.svg diff --git a/application/resources/pe_dark/scalable/copy.svg b/launcher/resources/pe_dark/scalable/copy.svg similarity index 100% rename from application/resources/pe_dark/scalable/copy.svg rename to launcher/resources/pe_dark/scalable/copy.svg diff --git a/application/resources/pe_dark/scalable/coremods.svg b/launcher/resources/pe_dark/scalable/coremods.svg similarity index 100% rename from application/resources/pe_dark/scalable/coremods.svg rename to launcher/resources/pe_dark/scalable/coremods.svg diff --git a/application/resources/pe_dark/scalable/externaltools.svg b/launcher/resources/pe_dark/scalable/externaltools.svg similarity index 100% rename from application/resources/pe_dark/scalable/externaltools.svg rename to launcher/resources/pe_dark/scalable/externaltools.svg diff --git a/application/resources/pe_dark/scalable/help.svg b/launcher/resources/pe_dark/scalable/help.svg similarity index 100% rename from application/resources/pe_dark/scalable/help.svg rename to launcher/resources/pe_dark/scalable/help.svg diff --git a/application/resources/pe_dark/scalable/instance-settings.svg b/launcher/resources/pe_dark/scalable/instance-settings.svg similarity index 100% rename from application/resources/pe_dark/scalable/instance-settings.svg rename to launcher/resources/pe_dark/scalable/instance-settings.svg diff --git a/application/resources/pe_dark/scalable/jarmods.svg b/launcher/resources/pe_dark/scalable/jarmods.svg similarity index 100% rename from application/resources/pe_dark/scalable/jarmods.svg rename to launcher/resources/pe_dark/scalable/jarmods.svg diff --git a/application/resources/pe_dark/scalable/java.svg b/launcher/resources/pe_dark/scalable/java.svg similarity index 100% rename from application/resources/pe_dark/scalable/java.svg rename to launcher/resources/pe_dark/scalable/java.svg diff --git a/application/resources/pe_dark/scalable/language.svg b/launcher/resources/pe_dark/scalable/language.svg similarity index 100% rename from application/resources/pe_dark/scalable/language.svg rename to launcher/resources/pe_dark/scalable/language.svg diff --git a/application/resources/pe_dark/scalable/loadermods.svg b/launcher/resources/pe_dark/scalable/loadermods.svg similarity index 100% rename from application/resources/pe_dark/scalable/loadermods.svg rename to launcher/resources/pe_dark/scalable/loadermods.svg diff --git a/application/resources/pe_dark/scalable/log.svg b/launcher/resources/pe_dark/scalable/log.svg similarity index 100% rename from application/resources/pe_dark/scalable/log.svg rename to launcher/resources/pe_dark/scalable/log.svg diff --git a/application/resources/pe_dark/scalable/minecraft.svg b/launcher/resources/pe_dark/scalable/minecraft.svg similarity index 100% rename from application/resources/pe_dark/scalable/minecraft.svg rename to launcher/resources/pe_dark/scalable/minecraft.svg diff --git a/application/resources/pe_dark/scalable/multimc.svg b/launcher/resources/pe_dark/scalable/multimc.svg similarity index 100% rename from application/resources/pe_dark/scalable/multimc.svg rename to launcher/resources/pe_dark/scalable/multimc.svg diff --git a/application/resources/pe_dark/scalable/new.svg b/launcher/resources/pe_dark/scalable/new.svg similarity index 100% rename from application/resources/pe_dark/scalable/new.svg rename to launcher/resources/pe_dark/scalable/new.svg diff --git a/application/resources/pe_dark/scalable/news.svg b/launcher/resources/pe_dark/scalable/news.svg similarity index 100% rename from application/resources/pe_dark/scalable/news.svg rename to launcher/resources/pe_dark/scalable/news.svg diff --git a/application/resources/pe_dark/scalable/notes.svg b/launcher/resources/pe_dark/scalable/notes.svg similarity index 100% rename from application/resources/pe_dark/scalable/notes.svg rename to launcher/resources/pe_dark/scalable/notes.svg diff --git a/application/resources/pe_dark/scalable/patreon.svg b/launcher/resources/pe_dark/scalable/patreon.svg similarity index 100% rename from application/resources/pe_dark/scalable/patreon.svg rename to launcher/resources/pe_dark/scalable/patreon.svg diff --git a/application/resources/pe_dark/scalable/proxy.svg b/launcher/resources/pe_dark/scalable/proxy.svg similarity index 100% rename from application/resources/pe_dark/scalable/proxy.svg rename to launcher/resources/pe_dark/scalable/proxy.svg diff --git a/application/resources/pe_dark/scalable/quickmods.svg b/launcher/resources/pe_dark/scalable/quickmods.svg similarity index 100% rename from application/resources/pe_dark/scalable/quickmods.svg rename to launcher/resources/pe_dark/scalable/quickmods.svg diff --git a/application/resources/pe_dark/scalable/refresh.svg b/launcher/resources/pe_dark/scalable/refresh.svg similarity index 100% rename from application/resources/pe_dark/scalable/refresh.svg rename to launcher/resources/pe_dark/scalable/refresh.svg diff --git a/application/resources/pe_dark/scalable/resourcepacks.svg b/launcher/resources/pe_dark/scalable/resourcepacks.svg similarity index 100% rename from application/resources/pe_dark/scalable/resourcepacks.svg rename to launcher/resources/pe_dark/scalable/resourcepacks.svg diff --git a/application/resources/pe_dark/scalable/screenshots.svg b/launcher/resources/pe_dark/scalable/screenshots.svg similarity index 100% rename from application/resources/pe_dark/scalable/screenshots.svg rename to launcher/resources/pe_dark/scalable/screenshots.svg diff --git a/application/resources/pe_dark/scalable/settings.svg b/launcher/resources/pe_dark/scalable/settings.svg similarity index 100% rename from application/resources/pe_dark/scalable/settings.svg rename to launcher/resources/pe_dark/scalable/settings.svg diff --git a/application/resources/pe_dark/scalable/status-bad.svg b/launcher/resources/pe_dark/scalable/status-bad.svg similarity index 100% rename from application/resources/pe_dark/scalable/status-bad.svg rename to launcher/resources/pe_dark/scalable/status-bad.svg diff --git a/application/resources/pe_dark/scalable/status-good.svg b/launcher/resources/pe_dark/scalable/status-good.svg similarity index 100% rename from application/resources/pe_dark/scalable/status-good.svg rename to launcher/resources/pe_dark/scalable/status-good.svg diff --git a/application/resources/pe_dark/scalable/status-yellow.svg b/launcher/resources/pe_dark/scalable/status-yellow.svg similarity index 100% rename from application/resources/pe_dark/scalable/status-yellow.svg rename to launcher/resources/pe_dark/scalable/status-yellow.svg diff --git a/application/resources/pe_dark/scalable/viewfolder.svg b/launcher/resources/pe_dark/scalable/viewfolder.svg similarity index 100% rename from application/resources/pe_dark/scalable/viewfolder.svg rename to launcher/resources/pe_dark/scalable/viewfolder.svg diff --git a/application/resources/pe_dark/scalable/worlds.svg b/launcher/resources/pe_dark/scalable/worlds.svg similarity index 100% rename from application/resources/pe_dark/scalable/worlds.svg rename to launcher/resources/pe_dark/scalable/worlds.svg diff --git a/application/resources/pe_light/index.theme b/launcher/resources/pe_light/index.theme similarity index 100% rename from application/resources/pe_light/index.theme rename to launcher/resources/pe_light/index.theme diff --git a/application/resources/pe_light/pe_light.qrc b/launcher/resources/pe_light/pe_light.qrc similarity index 100% rename from application/resources/pe_light/pe_light.qrc rename to launcher/resources/pe_light/pe_light.qrc diff --git a/application/resources/pe_light/scalable/about.svg b/launcher/resources/pe_light/scalable/about.svg similarity index 100% rename from application/resources/pe_light/scalable/about.svg rename to launcher/resources/pe_light/scalable/about.svg diff --git a/application/resources/pe_light/scalable/accounts.svg b/launcher/resources/pe_light/scalable/accounts.svg similarity index 100% rename from application/resources/pe_light/scalable/accounts.svg rename to launcher/resources/pe_light/scalable/accounts.svg diff --git a/application/resources/pe_light/scalable/bug.svg b/launcher/resources/pe_light/scalable/bug.svg similarity index 100% rename from application/resources/pe_light/scalable/bug.svg rename to launcher/resources/pe_light/scalable/bug.svg diff --git a/application/resources/pe_light/scalable/centralmods.svg b/launcher/resources/pe_light/scalable/centralmods.svg similarity index 100% rename from application/resources/pe_light/scalable/centralmods.svg rename to launcher/resources/pe_light/scalable/centralmods.svg diff --git a/application/resources/pe_light/scalable/checkupdate.svg b/launcher/resources/pe_light/scalable/checkupdate.svg similarity index 100% rename from application/resources/pe_light/scalable/checkupdate.svg rename to launcher/resources/pe_light/scalable/checkupdate.svg diff --git a/application/resources/pe_light/scalable/copy.svg b/launcher/resources/pe_light/scalable/copy.svg similarity index 100% rename from application/resources/pe_light/scalable/copy.svg rename to launcher/resources/pe_light/scalable/copy.svg diff --git a/application/resources/pe_light/scalable/coremods.svg b/launcher/resources/pe_light/scalable/coremods.svg similarity index 100% rename from application/resources/pe_light/scalable/coremods.svg rename to launcher/resources/pe_light/scalable/coremods.svg diff --git a/application/resources/pe_light/scalable/externaltools.svg b/launcher/resources/pe_light/scalable/externaltools.svg similarity index 100% rename from application/resources/pe_light/scalable/externaltools.svg rename to launcher/resources/pe_light/scalable/externaltools.svg diff --git a/application/resources/pe_light/scalable/help.svg b/launcher/resources/pe_light/scalable/help.svg similarity index 100% rename from application/resources/pe_light/scalable/help.svg rename to launcher/resources/pe_light/scalable/help.svg diff --git a/application/resources/pe_light/scalable/instance-settings.svg b/launcher/resources/pe_light/scalable/instance-settings.svg similarity index 100% rename from application/resources/pe_light/scalable/instance-settings.svg rename to launcher/resources/pe_light/scalable/instance-settings.svg diff --git a/application/resources/pe_light/scalable/jarmods.svg b/launcher/resources/pe_light/scalable/jarmods.svg similarity index 100% rename from application/resources/pe_light/scalable/jarmods.svg rename to launcher/resources/pe_light/scalable/jarmods.svg diff --git a/application/resources/pe_light/scalable/java.svg b/launcher/resources/pe_light/scalable/java.svg similarity index 100% rename from application/resources/pe_light/scalable/java.svg rename to launcher/resources/pe_light/scalable/java.svg diff --git a/application/resources/pe_light/scalable/language.svg b/launcher/resources/pe_light/scalable/language.svg similarity index 100% rename from application/resources/pe_light/scalable/language.svg rename to launcher/resources/pe_light/scalable/language.svg diff --git a/application/resources/pe_light/scalable/loadermods.svg b/launcher/resources/pe_light/scalable/loadermods.svg similarity index 100% rename from application/resources/pe_light/scalable/loadermods.svg rename to launcher/resources/pe_light/scalable/loadermods.svg diff --git a/application/resources/pe_light/scalable/log.svg b/launcher/resources/pe_light/scalable/log.svg similarity index 100% rename from application/resources/pe_light/scalable/log.svg rename to launcher/resources/pe_light/scalable/log.svg diff --git a/application/resources/pe_light/scalable/minecraft.svg b/launcher/resources/pe_light/scalable/minecraft.svg similarity index 100% rename from application/resources/pe_light/scalable/minecraft.svg rename to launcher/resources/pe_light/scalable/minecraft.svg diff --git a/application/resources/pe_light/scalable/multimc.svg b/launcher/resources/pe_light/scalable/multimc.svg similarity index 100% rename from application/resources/pe_light/scalable/multimc.svg rename to launcher/resources/pe_light/scalable/multimc.svg diff --git a/application/resources/pe_light/scalable/new.svg b/launcher/resources/pe_light/scalable/new.svg similarity index 100% rename from application/resources/pe_light/scalable/new.svg rename to launcher/resources/pe_light/scalable/new.svg diff --git a/application/resources/pe_light/scalable/news.svg b/launcher/resources/pe_light/scalable/news.svg similarity index 100% rename from application/resources/pe_light/scalable/news.svg rename to launcher/resources/pe_light/scalable/news.svg diff --git a/application/resources/pe_light/scalable/notes.svg b/launcher/resources/pe_light/scalable/notes.svg similarity index 100% rename from application/resources/pe_light/scalable/notes.svg rename to launcher/resources/pe_light/scalable/notes.svg diff --git a/application/resources/pe_light/scalable/patreon.svg b/launcher/resources/pe_light/scalable/patreon.svg similarity index 100% rename from application/resources/pe_light/scalable/patreon.svg rename to launcher/resources/pe_light/scalable/patreon.svg diff --git a/application/resources/pe_light/scalable/proxy.svg b/launcher/resources/pe_light/scalable/proxy.svg similarity index 100% rename from application/resources/pe_light/scalable/proxy.svg rename to launcher/resources/pe_light/scalable/proxy.svg diff --git a/application/resources/pe_light/scalable/quickmods.svg b/launcher/resources/pe_light/scalable/quickmods.svg similarity index 100% rename from application/resources/pe_light/scalable/quickmods.svg rename to launcher/resources/pe_light/scalable/quickmods.svg diff --git a/application/resources/pe_light/scalable/refresh.svg b/launcher/resources/pe_light/scalable/refresh.svg similarity index 100% rename from application/resources/pe_light/scalable/refresh.svg rename to launcher/resources/pe_light/scalable/refresh.svg diff --git a/application/resources/pe_light/scalable/resourcepacks.svg b/launcher/resources/pe_light/scalable/resourcepacks.svg similarity index 100% rename from application/resources/pe_light/scalable/resourcepacks.svg rename to launcher/resources/pe_light/scalable/resourcepacks.svg diff --git a/application/resources/pe_light/scalable/screenshots.svg b/launcher/resources/pe_light/scalable/screenshots.svg similarity index 100% rename from application/resources/pe_light/scalable/screenshots.svg rename to launcher/resources/pe_light/scalable/screenshots.svg diff --git a/application/resources/pe_light/scalable/settings.svg b/launcher/resources/pe_light/scalable/settings.svg similarity index 100% rename from application/resources/pe_light/scalable/settings.svg rename to launcher/resources/pe_light/scalable/settings.svg diff --git a/application/resources/pe_light/scalable/status-bad.svg b/launcher/resources/pe_light/scalable/status-bad.svg similarity index 100% rename from application/resources/pe_light/scalable/status-bad.svg rename to launcher/resources/pe_light/scalable/status-bad.svg diff --git a/application/resources/pe_light/scalable/status-good.svg b/launcher/resources/pe_light/scalable/status-good.svg similarity index 100% rename from application/resources/pe_light/scalable/status-good.svg rename to launcher/resources/pe_light/scalable/status-good.svg diff --git a/application/resources/pe_light/scalable/status-yellow.svg b/launcher/resources/pe_light/scalable/status-yellow.svg similarity index 100% rename from application/resources/pe_light/scalable/status-yellow.svg rename to launcher/resources/pe_light/scalable/status-yellow.svg diff --git a/application/resources/pe_light/scalable/viewfolder.svg b/launcher/resources/pe_light/scalable/viewfolder.svg similarity index 100% rename from application/resources/pe_light/scalable/viewfolder.svg rename to launcher/resources/pe_light/scalable/viewfolder.svg diff --git a/application/resources/pe_light/scalable/worlds.svg b/launcher/resources/pe_light/scalable/worlds.svg similarity index 100% rename from application/resources/pe_light/scalable/worlds.svg rename to launcher/resources/pe_light/scalable/worlds.svg diff --git a/application/resources/sources/clucker.svg b/launcher/resources/sources/clucker.svg similarity index 100% rename from application/resources/sources/clucker.svg rename to launcher/resources/sources/clucker.svg diff --git a/application/resources/sources/creeper.svg b/launcher/resources/sources/creeper.svg similarity index 100% rename from application/resources/sources/creeper.svg rename to launcher/resources/sources/creeper.svg diff --git a/application/resources/sources/enderpearl.svg b/launcher/resources/sources/enderpearl.svg similarity index 100% rename from application/resources/sources/enderpearl.svg rename to launcher/resources/sources/enderpearl.svg diff --git a/application/resources/sources/flame.svg b/launcher/resources/sources/flame.svg similarity index 100% rename from application/resources/sources/flame.svg rename to launcher/resources/sources/flame.svg diff --git a/application/resources/sources/ftb-glow.svg b/launcher/resources/sources/ftb-glow.svg similarity index 100% rename from application/resources/sources/ftb-glow.svg rename to launcher/resources/sources/ftb-glow.svg diff --git a/application/resources/sources/ftb-logo.svg b/launcher/resources/sources/ftb-logo.svg similarity index 100% rename from application/resources/sources/ftb-logo.svg rename to launcher/resources/sources/ftb-logo.svg diff --git a/application/resources/sources/gear.svg b/launcher/resources/sources/gear.svg similarity index 100% rename from application/resources/sources/gear.svg rename to launcher/resources/sources/gear.svg diff --git a/application/resources/sources/herobrine.svg b/launcher/resources/sources/herobrine.svg similarity index 100% rename from application/resources/sources/herobrine.svg rename to launcher/resources/sources/herobrine.svg diff --git a/application/resources/sources/magitech.svg b/launcher/resources/sources/magitech.svg similarity index 100% rename from application/resources/sources/magitech.svg rename to launcher/resources/sources/magitech.svg diff --git a/application/resources/sources/meat.svg b/launcher/resources/sources/meat.svg similarity index 100% rename from application/resources/sources/meat.svg rename to launcher/resources/sources/meat.svg diff --git a/application/resources/sources/multimc-discord.svg b/launcher/resources/sources/multimc-discord.svg similarity index 100% rename from application/resources/sources/multimc-discord.svg rename to launcher/resources/sources/multimc-discord.svg diff --git a/application/resources/sources/netherstar.svg b/launcher/resources/sources/netherstar.svg similarity index 100% rename from application/resources/sources/netherstar.svg rename to launcher/resources/sources/netherstar.svg diff --git a/application/resources/sources/pskeleton.svg b/launcher/resources/sources/pskeleton.svg similarity index 100% rename from application/resources/sources/pskeleton.svg rename to launcher/resources/sources/pskeleton.svg diff --git a/application/resources/sources/skeleton.svg b/launcher/resources/sources/skeleton.svg similarity index 100% rename from application/resources/sources/skeleton.svg rename to launcher/resources/sources/skeleton.svg diff --git a/application/resources/sources/squarecreeper.svg b/launcher/resources/sources/squarecreeper.svg similarity index 100% rename from application/resources/sources/squarecreeper.svg rename to launcher/resources/sources/squarecreeper.svg diff --git a/application/resources/sources/steve.svg b/launcher/resources/sources/steve.svg similarity index 100% rename from application/resources/sources/steve.svg rename to launcher/resources/sources/steve.svg diff --git a/api/logic/screenshots/ImgurAlbumCreation.cpp b/launcher/screenshots/ImgurAlbumCreation.cpp similarity index 100% rename from api/logic/screenshots/ImgurAlbumCreation.cpp rename to launcher/screenshots/ImgurAlbumCreation.cpp diff --git a/api/logic/screenshots/ImgurAlbumCreation.h b/launcher/screenshots/ImgurAlbumCreation.h similarity index 89% rename from api/logic/screenshots/ImgurAlbumCreation.h rename to launcher/screenshots/ImgurAlbumCreation.h index 554780218..954637e68 100644 --- a/api/logic/screenshots/ImgurAlbumCreation.h +++ b/launcher/screenshots/ImgurAlbumCreation.h @@ -2,10 +2,8 @@ #include "net/NetAction.h" #include "Screenshot.h" -#include "multimc_logic_export.h" - typedef std::shared_ptr ImgurAlbumCreationPtr; -class MULTIMC_LOGIC_EXPORT ImgurAlbumCreation : public NetAction +class ImgurAlbumCreation : public NetAction { public: explicit ImgurAlbumCreation(QList screenshots); diff --git a/api/logic/screenshots/ImgurUpload.cpp b/launcher/screenshots/ImgurUpload.cpp similarity index 100% rename from api/logic/screenshots/ImgurUpload.cpp rename to launcher/screenshots/ImgurUpload.cpp diff --git a/api/logic/screenshots/ImgurUpload.h b/launcher/screenshots/ImgurUpload.h similarity index 87% rename from api/logic/screenshots/ImgurUpload.h rename to launcher/screenshots/ImgurUpload.h index d79807f22..0507d4992 100644 --- a/api/logic/screenshots/ImgurUpload.h +++ b/launcher/screenshots/ImgurUpload.h @@ -2,10 +2,8 @@ #include "net/NetAction.h" #include "Screenshot.h" -#include "multimc_logic_export.h" - typedef std::shared_ptr ImgurUploadPtr; -class MULTIMC_LOGIC_EXPORT ImgurUpload : public NetAction +class ImgurUpload : public NetAction { public: explicit ImgurUpload(ScreenshotPtr shot); diff --git a/api/logic/screenshots/Screenshot.h b/launcher/screenshots/Screenshot.h similarity index 100% rename from api/logic/screenshots/Screenshot.h rename to launcher/screenshots/Screenshot.h diff --git a/api/logic/settings/INIFile.cpp b/launcher/settings/INIFile.cpp similarity index 100% rename from api/logic/settings/INIFile.cpp rename to launcher/settings/INIFile.cpp diff --git a/api/logic/settings/INIFile.h b/launcher/settings/INIFile.h similarity index 91% rename from api/logic/settings/INIFile.h rename to launcher/settings/INIFile.h index 9e8c68eaf..4313e8293 100644 --- a/api/logic/settings/INIFile.h +++ b/launcher/settings/INIFile.h @@ -19,10 +19,8 @@ #include #include -#include "multimc_logic_export.h" - // Sectionless INI parser (for instance config files) -class MULTIMC_LOGIC_EXPORT INIFile : public QMap +class INIFile : public QMap { public: explicit INIFile(); diff --git a/api/logic/settings/INIFile_test.cpp b/launcher/settings/INIFile_test.cpp similarity index 100% rename from api/logic/settings/INIFile_test.cpp rename to launcher/settings/INIFile_test.cpp diff --git a/api/logic/settings/INISettingsObject.cpp b/launcher/settings/INISettingsObject.cpp similarity index 100% rename from api/logic/settings/INISettingsObject.cpp rename to launcher/settings/INISettingsObject.cpp diff --git a/api/logic/settings/INISettingsObject.h b/launcher/settings/INISettingsObject.h similarity index 94% rename from api/logic/settings/INISettingsObject.h rename to launcher/settings/INISettingsObject.h index 313f15122..26cc32e51 100644 --- a/api/logic/settings/INISettingsObject.h +++ b/launcher/settings/INISettingsObject.h @@ -21,12 +21,10 @@ #include "settings/SettingsObject.h" -#include "multimc_logic_export.h" - /*! * \brief A settings object that stores its settings in an INIFile. */ -class MULTIMC_LOGIC_EXPORT INISettingsObject : public SettingsObject +class INISettingsObject : public SettingsObject { Q_OBJECT public: diff --git a/api/logic/settings/OverrideSetting.cpp b/launcher/settings/OverrideSetting.cpp similarity index 100% rename from api/logic/settings/OverrideSetting.cpp rename to launcher/settings/OverrideSetting.cpp diff --git a/api/logic/settings/OverrideSetting.h b/launcher/settings/OverrideSetting.h similarity index 100% rename from api/logic/settings/OverrideSetting.h rename to launcher/settings/OverrideSetting.h diff --git a/api/logic/settings/PassthroughSetting.cpp b/launcher/settings/PassthroughSetting.cpp similarity index 100% rename from api/logic/settings/PassthroughSetting.cpp rename to launcher/settings/PassthroughSetting.cpp diff --git a/api/logic/settings/PassthroughSetting.h b/launcher/settings/PassthroughSetting.h similarity index 100% rename from api/logic/settings/PassthroughSetting.h rename to launcher/settings/PassthroughSetting.h diff --git a/api/logic/settings/Setting.cpp b/launcher/settings/Setting.cpp similarity index 100% rename from api/logic/settings/Setting.cpp rename to launcher/settings/Setting.cpp diff --git a/api/logic/settings/Setting.h b/launcher/settings/Setting.h similarity index 97% rename from api/logic/settings/Setting.h rename to launcher/settings/Setting.h index a31193ac0..9beeb35e0 100644 --- a/api/logic/settings/Setting.h +++ b/launcher/settings/Setting.h @@ -20,14 +20,12 @@ #include #include -#include "multimc_logic_export.h" - class SettingsObject; /*! * */ -class MULTIMC_LOGIC_EXPORT Setting : public QObject +class Setting : public QObject { Q_OBJECT public: diff --git a/api/logic/settings/SettingsObject.cpp b/launcher/settings/SettingsObject.cpp similarity index 100% rename from api/logic/settings/SettingsObject.cpp rename to launcher/settings/SettingsObject.cpp diff --git a/api/logic/settings/SettingsObject.h b/launcher/settings/SettingsObject.h similarity index 98% rename from api/logic/settings/SettingsObject.h rename to launcher/settings/SettingsObject.h index 3ebdebdfd..3d61e707c 100644 --- a/api/logic/settings/SettingsObject.h +++ b/launcher/settings/SettingsObject.h @@ -21,8 +21,6 @@ #include #include -#include "multimc_logic_export.h" - class Setting; class SettingsObject; @@ -40,7 +38,7 @@ typedef std::shared_ptr SettingsObjectPtr; * * \sa Setting */ -class MULTIMC_LOGIC_EXPORT SettingsObject : public QObject +class SettingsObject : public QObject { Q_OBJECT public: diff --git a/application/setupwizard/AnalyticsWizardPage.cpp b/launcher/setupwizard/AnalyticsWizardPage.cpp similarity index 100% rename from application/setupwizard/AnalyticsWizardPage.cpp rename to launcher/setupwizard/AnalyticsWizardPage.cpp diff --git a/application/setupwizard/AnalyticsWizardPage.h b/launcher/setupwizard/AnalyticsWizardPage.h similarity index 100% rename from application/setupwizard/AnalyticsWizardPage.h rename to launcher/setupwizard/AnalyticsWizardPage.h diff --git a/application/setupwizard/BaseWizardPage.h b/launcher/setupwizard/BaseWizardPage.h similarity index 100% rename from application/setupwizard/BaseWizardPage.h rename to launcher/setupwizard/BaseWizardPage.h diff --git a/application/setupwizard/JavaWizardPage.cpp b/launcher/setupwizard/JavaWizardPage.cpp similarity index 100% rename from application/setupwizard/JavaWizardPage.cpp rename to launcher/setupwizard/JavaWizardPage.cpp diff --git a/application/setupwizard/JavaWizardPage.h b/launcher/setupwizard/JavaWizardPage.h similarity index 100% rename from application/setupwizard/JavaWizardPage.h rename to launcher/setupwizard/JavaWizardPage.h diff --git a/application/setupwizard/LanguageWizardPage.cpp b/launcher/setupwizard/LanguageWizardPage.cpp similarity index 100% rename from application/setupwizard/LanguageWizardPage.cpp rename to launcher/setupwizard/LanguageWizardPage.cpp diff --git a/application/setupwizard/LanguageWizardPage.h b/launcher/setupwizard/LanguageWizardPage.h similarity index 100% rename from application/setupwizard/LanguageWizardPage.h rename to launcher/setupwizard/LanguageWizardPage.h diff --git a/application/setupwizard/SetupWizard.cpp b/launcher/setupwizard/SetupWizard.cpp similarity index 100% rename from application/setupwizard/SetupWizard.cpp rename to launcher/setupwizard/SetupWizard.cpp diff --git a/application/setupwizard/SetupWizard.h b/launcher/setupwizard/SetupWizard.h similarity index 100% rename from application/setupwizard/SetupWizard.h rename to launcher/setupwizard/SetupWizard.h diff --git a/api/logic/status/StatusChecker.cpp b/launcher/status/StatusChecker.cpp similarity index 100% rename from api/logic/status/StatusChecker.cpp rename to launcher/status/StatusChecker.cpp diff --git a/api/logic/status/StatusChecker.h b/launcher/status/StatusChecker.h similarity index 94% rename from api/logic/status/StatusChecker.h rename to launcher/status/StatusChecker.h index e9961affa..06b3f576f 100644 --- a/api/logic/status/StatusChecker.h +++ b/launcher/status/StatusChecker.h @@ -21,9 +21,7 @@ #include -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT StatusChecker : public QObject +class StatusChecker : public QObject { Q_OBJECT public: /* con/des */ diff --git a/api/logic/tasks/SequentialTask.cpp b/launcher/tasks/SequentialTask.cpp similarity index 100% rename from api/logic/tasks/SequentialTask.cpp rename to launcher/tasks/SequentialTask.cpp diff --git a/api/logic/tasks/SequentialTask.h b/launcher/tasks/SequentialTask.h similarity index 85% rename from api/logic/tasks/SequentialTask.h rename to launcher/tasks/SequentialTask.h index 2ca77c008..6898c8a67 100644 --- a/api/logic/tasks/SequentialTask.h +++ b/launcher/tasks/SequentialTask.h @@ -5,9 +5,7 @@ #include #include -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT SequentialTask : public Task +class SequentialTask : public Task { Q_OBJECT public: diff --git a/api/logic/tasks/Task.cpp b/launcher/tasks/Task.cpp similarity index 100% rename from api/logic/tasks/Task.cpp rename to launcher/tasks/Task.cpp diff --git a/api/logic/tasks/Task.h b/launcher/tasks/Task.h similarity index 96% rename from api/logic/tasks/Task.h rename to launcher/tasks/Task.h index 7ed7086c5..2367f1ec2 100644 --- a/api/logic/tasks/Task.h +++ b/launcher/tasks/Task.h @@ -19,9 +19,7 @@ #include #include -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT Task : public QObject +class Task : public QObject { Q_OBJECT public: diff --git a/api/logic/testdata/FileSystem-test_createShortcut-unix b/launcher/testdata/FileSystem-test_createShortcut-unix similarity index 100% rename from api/logic/testdata/FileSystem-test_createShortcut-unix rename to launcher/testdata/FileSystem-test_createShortcut-unix diff --git a/api/logic/testdata/test_folder/assets/minecraft/textures/blah.txt b/launcher/testdata/test_folder/assets/minecraft/textures/blah.txt similarity index 100% rename from api/logic/testdata/test_folder/assets/minecraft/textures/blah.txt rename to launcher/testdata/test_folder/assets/minecraft/textures/blah.txt diff --git a/api/logic/testdata/test_folder/pack.mcmeta b/launcher/testdata/test_folder/pack.mcmeta similarity index 100% rename from api/logic/testdata/test_folder/pack.mcmeta rename to launcher/testdata/test_folder/pack.mcmeta diff --git a/api/logic/testdata/test_folder/pack.nfo b/launcher/testdata/test_folder/pack.nfo similarity index 100% rename from api/logic/testdata/test_folder/pack.nfo rename to launcher/testdata/test_folder/pack.nfo diff --git a/application/themes/BrightTheme.cpp b/launcher/themes/BrightTheme.cpp similarity index 100% rename from application/themes/BrightTheme.cpp rename to launcher/themes/BrightTheme.cpp diff --git a/application/themes/BrightTheme.h b/launcher/themes/BrightTheme.h similarity index 100% rename from application/themes/BrightTheme.h rename to launcher/themes/BrightTheme.h diff --git a/application/themes/CustomTheme.cpp b/launcher/themes/CustomTheme.cpp similarity index 100% rename from application/themes/CustomTheme.cpp rename to launcher/themes/CustomTheme.cpp diff --git a/application/themes/CustomTheme.h b/launcher/themes/CustomTheme.h similarity index 100% rename from application/themes/CustomTheme.h rename to launcher/themes/CustomTheme.h diff --git a/application/themes/DarkTheme.cpp b/launcher/themes/DarkTheme.cpp similarity index 100% rename from application/themes/DarkTheme.cpp rename to launcher/themes/DarkTheme.cpp diff --git a/application/themes/DarkTheme.h b/launcher/themes/DarkTheme.h similarity index 100% rename from application/themes/DarkTheme.h rename to launcher/themes/DarkTheme.h diff --git a/application/themes/FusionTheme.cpp b/launcher/themes/FusionTheme.cpp similarity index 100% rename from application/themes/FusionTheme.cpp rename to launcher/themes/FusionTheme.cpp diff --git a/application/themes/FusionTheme.h b/launcher/themes/FusionTheme.h similarity index 100% rename from application/themes/FusionTheme.h rename to launcher/themes/FusionTheme.h diff --git a/application/themes/ITheme.cpp b/launcher/themes/ITheme.cpp similarity index 100% rename from application/themes/ITheme.cpp rename to launcher/themes/ITheme.cpp diff --git a/application/themes/ITheme.h b/launcher/themes/ITheme.h similarity index 100% rename from application/themes/ITheme.h rename to launcher/themes/ITheme.h diff --git a/application/themes/SystemTheme.cpp b/launcher/themes/SystemTheme.cpp similarity index 100% rename from application/themes/SystemTheme.cpp rename to launcher/themes/SystemTheme.cpp diff --git a/application/themes/SystemTheme.h b/launcher/themes/SystemTheme.h similarity index 100% rename from application/themes/SystemTheme.h rename to launcher/themes/SystemTheme.h diff --git a/api/logic/tools/BaseExternalTool.cpp b/launcher/tools/BaseExternalTool.cpp similarity index 100% rename from api/logic/tools/BaseExternalTool.cpp rename to launcher/tools/BaseExternalTool.cpp diff --git a/api/logic/tools/BaseExternalTool.h b/launcher/tools/BaseExternalTool.h similarity index 78% rename from api/logic/tools/BaseExternalTool.h rename to launcher/tools/BaseExternalTool.h index b393b9ef5..1ebed6ae2 100644 --- a/api/logic/tools/BaseExternalTool.h +++ b/launcher/tools/BaseExternalTool.h @@ -3,13 +3,11 @@ #include #include -#include "multimc_logic_export.h" - class BaseInstance; class SettingsObject; class QProcess; -class MULTIMC_LOGIC_EXPORT BaseExternalTool : public QObject +class BaseExternalTool : public QObject { Q_OBJECT public: @@ -21,7 +19,7 @@ protected: SettingsObjectPtr globalSettings; }; -class MULTIMC_LOGIC_EXPORT BaseDetachedTool : public BaseExternalTool +class BaseDetachedTool : public BaseExternalTool { Q_OBJECT public: @@ -35,7 +33,7 @@ protected: virtual void runImpl() = 0; }; -class MULTIMC_LOGIC_EXPORT BaseExternalToolFactory +class BaseExternalToolFactory { public: virtual ~BaseExternalToolFactory(); @@ -53,7 +51,7 @@ protected: SettingsObjectPtr globalSettings; }; -class MULTIMC_LOGIC_EXPORT BaseDetachedToolFactory : public BaseExternalToolFactory +class BaseDetachedToolFactory : public BaseExternalToolFactory { public: virtual BaseDetachedTool *createDetachedTool(InstancePtr instance, QObject *parent = 0); diff --git a/api/logic/tools/BaseProfiler.cpp b/launcher/tools/BaseProfiler.cpp similarity index 100% rename from api/logic/tools/BaseProfiler.cpp rename to launcher/tools/BaseProfiler.cpp diff --git a/api/logic/tools/BaseProfiler.h b/launcher/tools/BaseProfiler.h similarity index 80% rename from api/logic/tools/BaseProfiler.h rename to launcher/tools/BaseProfiler.h index da817f523..1c934aa35 100644 --- a/api/logic/tools/BaseProfiler.h +++ b/launcher/tools/BaseProfiler.h @@ -3,14 +3,12 @@ #include "BaseExternalTool.h" #include "QObjectPtr.h" -#include "multimc_logic_export.h" - class BaseInstance; class SettingsObject; class LaunchTask; class QProcess; -class MULTIMC_LOGIC_EXPORT BaseProfiler : public BaseExternalTool +class BaseProfiler : public BaseExternalTool { Q_OBJECT public: @@ -32,7 +30,7 @@ signals: void abortLaunch(const QString &message); }; -class MULTIMC_LOGIC_EXPORT BaseProfilerFactory : public BaseExternalToolFactory +class BaseProfilerFactory : public BaseExternalToolFactory { public: virtual BaseProfiler *createProfiler(InstancePtr instance, QObject *parent = 0); diff --git a/api/logic/tools/JProfiler.cpp b/launcher/tools/JProfiler.cpp similarity index 100% rename from api/logic/tools/JProfiler.cpp rename to launcher/tools/JProfiler.cpp diff --git a/api/logic/tools/JProfiler.h b/launcher/tools/JProfiler.h similarity index 77% rename from api/logic/tools/JProfiler.h rename to launcher/tools/JProfiler.h index f211ddbf1..0e9a3a85a 100644 --- a/api/logic/tools/JProfiler.h +++ b/launcher/tools/JProfiler.h @@ -2,9 +2,7 @@ #include "BaseProfiler.h" -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT JProfilerFactory : public BaseProfilerFactory +class JProfilerFactory : public BaseProfilerFactory { public: QString name() const override { return "JProfiler"; } diff --git a/api/logic/tools/JVisualVM.cpp b/launcher/tools/JVisualVM.cpp similarity index 100% rename from api/logic/tools/JVisualVM.cpp rename to launcher/tools/JVisualVM.cpp diff --git a/api/logic/tools/JVisualVM.h b/launcher/tools/JVisualVM.h similarity index 77% rename from api/logic/tools/JVisualVM.h rename to launcher/tools/JVisualVM.h index 91d48d94d..ebdea9f33 100644 --- a/api/logic/tools/JVisualVM.h +++ b/launcher/tools/JVisualVM.h @@ -2,9 +2,7 @@ #include "BaseProfiler.h" -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT JVisualVMFactory : public BaseProfilerFactory +class JVisualVMFactory : public BaseProfilerFactory { public: QString name() const override { return "JVisualVM"; } diff --git a/api/logic/tools/MCEditTool.cpp b/launcher/tools/MCEditTool.cpp similarity index 100% rename from api/logic/tools/MCEditTool.cpp rename to launcher/tools/MCEditTool.cpp diff --git a/api/logic/tools/MCEditTool.h b/launcher/tools/MCEditTool.h similarity index 81% rename from api/logic/tools/MCEditTool.h rename to launcher/tools/MCEditTool.h index 1465494e0..733dff866 100644 --- a/api/logic/tools/MCEditTool.h +++ b/launcher/tools/MCEditTool.h @@ -2,9 +2,8 @@ #include #include "settings/SettingsObject.h" -#include "multimc_logic_export.h" -class MULTIMC_LOGIC_EXPORT MCEditTool +class MCEditTool { public: MCEditTool(SettingsObjectPtr settings); diff --git a/api/logic/translations/POTranslator.cpp b/launcher/translations/POTranslator.cpp similarity index 100% rename from api/logic/translations/POTranslator.cpp rename to launcher/translations/POTranslator.cpp diff --git a/api/logic/translations/POTranslator.h b/launcher/translations/POTranslator.h similarity index 100% rename from api/logic/translations/POTranslator.h rename to launcher/translations/POTranslator.h diff --git a/api/logic/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp similarity index 100% rename from api/logic/translations/TranslationsModel.cpp rename to launcher/translations/TranslationsModel.cpp diff --git a/api/logic/translations/TranslationsModel.h b/launcher/translations/TranslationsModel.h similarity index 94% rename from api/logic/translations/TranslationsModel.h rename to launcher/translations/TranslationsModel.h index 17e5b1241..3abf84e6e 100644 --- a/api/logic/translations/TranslationsModel.h +++ b/launcher/translations/TranslationsModel.h @@ -17,11 +17,10 @@ #include #include -#include "multimc_logic_export.h" struct Language; -class MULTIMC_LOGIC_EXPORT TranslationsModel : public QAbstractListModel +class TranslationsModel : public QAbstractListModel { Q_OBJECT public: diff --git a/api/logic/updater/DownloadTask.cpp b/launcher/updater/DownloadTask.cpp similarity index 100% rename from api/logic/updater/DownloadTask.cpp rename to launcher/updater/DownloadTask.cpp diff --git a/api/logic/updater/DownloadTask.h b/launcher/updater/DownloadTask.h similarity index 97% rename from api/logic/updater/DownloadTask.h rename to launcher/updater/DownloadTask.h index 88e608659..fc5030b42 100644 --- a/api/logic/updater/DownloadTask.h +++ b/launcher/updater/DownloadTask.h @@ -19,15 +19,13 @@ #include "net/NetJob.h" #include "GoUpdate.h" -#include "multimc_logic_export.h" - namespace GoUpdate { /*! * The DownloadTask is a task that takes a given version ID and repository URL, * downloads that version's files from the repository, and prepares to install them. */ -class MULTIMC_LOGIC_EXPORT DownloadTask : public Task +class DownloadTask : public Task { Q_OBJECT @@ -95,4 +93,4 @@ protected slots: void fileDownloadProgressChanged(qint64 current, qint64 total); }; -} \ No newline at end of file +} diff --git a/api/logic/updater/DownloadTask_test.cpp b/launcher/updater/DownloadTask_test.cpp similarity index 100% rename from api/logic/updater/DownloadTask_test.cpp rename to launcher/updater/DownloadTask_test.cpp diff --git a/api/logic/updater/GoUpdate.cpp b/launcher/updater/GoUpdate.cpp similarity index 100% rename from api/logic/updater/GoUpdate.cpp rename to launcher/updater/GoUpdate.cpp diff --git a/api/logic/updater/GoUpdate.h b/launcher/updater/GoUpdate.h similarity index 89% rename from api/logic/updater/GoUpdate.h rename to launcher/updater/GoUpdate.h index 8f92bb996..8058e5437 100644 --- a/api/logic/updater/GoUpdate.h +++ b/launcher/updater/GoUpdate.h @@ -2,15 +2,13 @@ #include #include -#include "multimc_logic_export.h" - namespace GoUpdate { /** * A temporary object exchanged between updated checker and the actual update task */ -struct MULTIMC_LOGIC_EXPORT Status +struct Status { bool updateAvailable = false; @@ -27,7 +25,7 @@ struct MULTIMC_LOGIC_EXPORT Status /** * Struct that describes an entry in a VersionFileEntry's `Sources` list. */ -struct MULTIMC_LOGIC_EXPORT FileSource +struct FileSource { FileSource(QString type, QString url, QString compression="") { @@ -50,7 +48,7 @@ typedef QList FileSourceList; /** * Structure that describes an entry in a GoUpdate version's `Files` list. */ -struct MULTIMC_LOGIC_EXPORT VersionFileEntry +struct VersionFileEntry { QString path; int mode; @@ -66,7 +64,7 @@ typedef QList VersionFileList; /** * Structure that describes an operation to perform when installing updates. */ -struct MULTIMC_LOGIC_EXPORT Operation +struct Operation { static Operation CopyOp(QString from, QString to, int fmode=0644) { @@ -107,13 +105,13 @@ typedef QList OperationList; /** * Loads the file list from the given version info JSON object into the given list. */ -bool MULTIMC_LOGIC_EXPORT parseVersionInfo(const QByteArray &data, VersionFileList& list, QString &error); +bool parseVersionInfo(const QByteArray &data, VersionFileList& list, QString &error); /*! * Takes a list of file entries for the current version's files and the new version's files * and populates the downloadList and operationList with information about how to download and install the update. */ -bool MULTIMC_LOGIC_EXPORT processFileLists +bool processFileLists ( const VersionFileList ¤tVersion, const VersionFileList &newVersion, diff --git a/api/logic/updater/UpdateChecker.cpp b/launcher/updater/UpdateChecker.cpp similarity index 100% rename from api/logic/updater/UpdateChecker.cpp rename to launcher/updater/UpdateChecker.cpp diff --git a/api/logic/updater/UpdateChecker.h b/launcher/updater/UpdateChecker.h similarity index 97% rename from api/logic/updater/UpdateChecker.h rename to launcher/updater/UpdateChecker.h index 20906207a..91b6e26e6 100644 --- a/api/logic/updater/UpdateChecker.h +++ b/launcher/updater/UpdateChecker.h @@ -18,9 +18,7 @@ #include "net/NetJob.h" #include "GoUpdate.h" -#include "multimc_logic_export.h" - -class MULTIMC_LOGIC_EXPORT UpdateChecker : public QObject +class UpdateChecker : public QObject { Q_OBJECT diff --git a/api/logic/updater/UpdateChecker_test.cpp b/launcher/updater/UpdateChecker_test.cpp similarity index 100% rename from api/logic/updater/UpdateChecker_test.cpp rename to launcher/updater/UpdateChecker_test.cpp diff --git a/api/logic/updater/testdata/1.json b/launcher/updater/testdata/1.json similarity index 100% rename from api/logic/updater/testdata/1.json rename to launcher/updater/testdata/1.json diff --git a/api/logic/updater/testdata/2.json b/launcher/updater/testdata/2.json similarity index 100% rename from api/logic/updater/testdata/2.json rename to launcher/updater/testdata/2.json diff --git a/api/logic/updater/testdata/channels.json b/launcher/updater/testdata/channels.json similarity index 100% rename from api/logic/updater/testdata/channels.json rename to launcher/updater/testdata/channels.json diff --git a/api/logic/updater/testdata/errorChannels.json b/launcher/updater/testdata/errorChannels.json similarity index 100% rename from api/logic/updater/testdata/errorChannels.json rename to launcher/updater/testdata/errorChannels.json diff --git a/api/logic/updater/testdata/fileOneA b/launcher/updater/testdata/fileOneA similarity index 100% rename from api/logic/updater/testdata/fileOneA rename to launcher/updater/testdata/fileOneA diff --git a/api/logic/updater/testdata/fileOneB b/launcher/updater/testdata/fileOneB similarity index 100% rename from api/logic/updater/testdata/fileOneB rename to launcher/updater/testdata/fileOneB diff --git a/api/logic/updater/testdata/fileThree b/launcher/updater/testdata/fileThree similarity index 100% rename from api/logic/updater/testdata/fileThree rename to launcher/updater/testdata/fileThree diff --git a/api/logic/updater/testdata/fileTwo b/launcher/updater/testdata/fileTwo similarity index 100% rename from api/logic/updater/testdata/fileTwo rename to launcher/updater/testdata/fileTwo diff --git a/api/logic/updater/testdata/garbageChannels.json b/launcher/updater/testdata/garbageChannels.json similarity index 100% rename from api/logic/updater/testdata/garbageChannels.json rename to launcher/updater/testdata/garbageChannels.json diff --git a/api/logic/updater/testdata/index.json b/launcher/updater/testdata/index.json similarity index 100% rename from api/logic/updater/testdata/index.json rename to launcher/updater/testdata/index.json diff --git a/api/logic/updater/testdata/noChannels.json b/launcher/updater/testdata/noChannels.json similarity index 100% rename from api/logic/updater/testdata/noChannels.json rename to launcher/updater/testdata/noChannels.json diff --git a/api/logic/updater/testdata/oneChannel.json b/launcher/updater/testdata/oneChannel.json similarity index 100% rename from api/logic/updater/testdata/oneChannel.json rename to launcher/updater/testdata/oneChannel.json diff --git a/api/logic/updater/testdata/tst_DownloadTask-test_writeInstallScript.xml b/launcher/updater/testdata/tst_DownloadTask-test_writeInstallScript.xml similarity index 100% rename from api/logic/updater/testdata/tst_DownloadTask-test_writeInstallScript.xml rename to launcher/updater/testdata/tst_DownloadTask-test_writeInstallScript.xml diff --git a/application/widgets/Common.cpp b/launcher/widgets/Common.cpp similarity index 100% rename from application/widgets/Common.cpp rename to launcher/widgets/Common.cpp diff --git a/application/widgets/Common.h b/launcher/widgets/Common.h similarity index 100% rename from application/widgets/Common.h rename to launcher/widgets/Common.h diff --git a/application/widgets/CustomCommands.cpp b/launcher/widgets/CustomCommands.cpp similarity index 100% rename from application/widgets/CustomCommands.cpp rename to launcher/widgets/CustomCommands.cpp diff --git a/application/widgets/CustomCommands.h b/launcher/widgets/CustomCommands.h similarity index 100% rename from application/widgets/CustomCommands.h rename to launcher/widgets/CustomCommands.h diff --git a/application/widgets/CustomCommands.ui b/launcher/widgets/CustomCommands.ui similarity index 100% rename from application/widgets/CustomCommands.ui rename to launcher/widgets/CustomCommands.ui diff --git a/application/widgets/DropLabel.cpp b/launcher/widgets/DropLabel.cpp similarity index 100% rename from application/widgets/DropLabel.cpp rename to launcher/widgets/DropLabel.cpp diff --git a/application/widgets/DropLabel.h b/launcher/widgets/DropLabel.h similarity index 100% rename from application/widgets/DropLabel.h rename to launcher/widgets/DropLabel.h diff --git a/application/widgets/FocusLineEdit.cpp b/launcher/widgets/FocusLineEdit.cpp similarity index 100% rename from application/widgets/FocusLineEdit.cpp rename to launcher/widgets/FocusLineEdit.cpp diff --git a/application/widgets/FocusLineEdit.h b/launcher/widgets/FocusLineEdit.h similarity index 100% rename from application/widgets/FocusLineEdit.h rename to launcher/widgets/FocusLineEdit.h diff --git a/application/widgets/IconLabel.cpp b/launcher/widgets/IconLabel.cpp similarity index 100% rename from application/widgets/IconLabel.cpp rename to launcher/widgets/IconLabel.cpp diff --git a/application/widgets/IconLabel.h b/launcher/widgets/IconLabel.h similarity index 100% rename from application/widgets/IconLabel.h rename to launcher/widgets/IconLabel.h diff --git a/application/widgets/InstanceCardWidget.ui b/launcher/widgets/InstanceCardWidget.ui similarity index 100% rename from application/widgets/InstanceCardWidget.ui rename to launcher/widgets/InstanceCardWidget.ui diff --git a/application/widgets/JavaSettingsWidget.cpp b/launcher/widgets/JavaSettingsWidget.cpp similarity index 100% rename from application/widgets/JavaSettingsWidget.cpp rename to launcher/widgets/JavaSettingsWidget.cpp diff --git a/application/widgets/JavaSettingsWidget.h b/launcher/widgets/JavaSettingsWidget.h similarity index 100% rename from application/widgets/JavaSettingsWidget.h rename to launcher/widgets/JavaSettingsWidget.h diff --git a/application/widgets/LabeledToolButton.cpp b/launcher/widgets/LabeledToolButton.cpp similarity index 100% rename from application/widgets/LabeledToolButton.cpp rename to launcher/widgets/LabeledToolButton.cpp diff --git a/application/widgets/LabeledToolButton.h b/launcher/widgets/LabeledToolButton.h similarity index 100% rename from application/widgets/LabeledToolButton.h rename to launcher/widgets/LabeledToolButton.h diff --git a/application/widgets/LanguageSelectionWidget.cpp b/launcher/widgets/LanguageSelectionWidget.cpp similarity index 100% rename from application/widgets/LanguageSelectionWidget.cpp rename to launcher/widgets/LanguageSelectionWidget.cpp diff --git a/application/widgets/LanguageSelectionWidget.h b/launcher/widgets/LanguageSelectionWidget.h similarity index 100% rename from application/widgets/LanguageSelectionWidget.h rename to launcher/widgets/LanguageSelectionWidget.h diff --git a/application/widgets/LineSeparator.cpp b/launcher/widgets/LineSeparator.cpp similarity index 100% rename from application/widgets/LineSeparator.cpp rename to launcher/widgets/LineSeparator.cpp diff --git a/application/widgets/LineSeparator.h b/launcher/widgets/LineSeparator.h similarity index 100% rename from application/widgets/LineSeparator.h rename to launcher/widgets/LineSeparator.h diff --git a/application/widgets/LogView.cpp b/launcher/widgets/LogView.cpp similarity index 100% rename from application/widgets/LogView.cpp rename to launcher/widgets/LogView.cpp diff --git a/application/widgets/LogView.h b/launcher/widgets/LogView.h similarity index 100% rename from application/widgets/LogView.h rename to launcher/widgets/LogView.h diff --git a/application/widgets/MCModInfoFrame.cpp b/launcher/widgets/MCModInfoFrame.cpp similarity index 100% rename from application/widgets/MCModInfoFrame.cpp rename to launcher/widgets/MCModInfoFrame.cpp diff --git a/application/widgets/MCModInfoFrame.h b/launcher/widgets/MCModInfoFrame.h similarity index 100% rename from application/widgets/MCModInfoFrame.h rename to launcher/widgets/MCModInfoFrame.h diff --git a/application/widgets/MCModInfoFrame.ui b/launcher/widgets/MCModInfoFrame.ui similarity index 100% rename from application/widgets/MCModInfoFrame.ui rename to launcher/widgets/MCModInfoFrame.ui diff --git a/application/widgets/ModListView.cpp b/launcher/widgets/ModListView.cpp similarity index 100% rename from application/widgets/ModListView.cpp rename to launcher/widgets/ModListView.cpp diff --git a/application/widgets/ModListView.h b/launcher/widgets/ModListView.h similarity index 100% rename from application/widgets/ModListView.h rename to launcher/widgets/ModListView.h diff --git a/application/widgets/PageContainer.cpp b/launcher/widgets/PageContainer.cpp similarity index 100% rename from application/widgets/PageContainer.cpp rename to launcher/widgets/PageContainer.cpp diff --git a/application/widgets/PageContainer.h b/launcher/widgets/PageContainer.h similarity index 100% rename from application/widgets/PageContainer.h rename to launcher/widgets/PageContainer.h diff --git a/application/widgets/PageContainer_p.h b/launcher/widgets/PageContainer_p.h similarity index 100% rename from application/widgets/PageContainer_p.h rename to launcher/widgets/PageContainer_p.h diff --git a/application/widgets/ProgressWidget.cpp b/launcher/widgets/ProgressWidget.cpp similarity index 100% rename from application/widgets/ProgressWidget.cpp rename to launcher/widgets/ProgressWidget.cpp diff --git a/application/widgets/ProgressWidget.h b/launcher/widgets/ProgressWidget.h similarity index 100% rename from application/widgets/ProgressWidget.h rename to launcher/widgets/ProgressWidget.h diff --git a/application/widgets/ServerStatus.cpp b/launcher/widgets/ServerStatus.cpp similarity index 100% rename from application/widgets/ServerStatus.cpp rename to launcher/widgets/ServerStatus.cpp diff --git a/application/widgets/ServerStatus.h b/launcher/widgets/ServerStatus.h similarity index 100% rename from application/widgets/ServerStatus.h rename to launcher/widgets/ServerStatus.h diff --git a/application/widgets/VersionListView.cpp b/launcher/widgets/VersionListView.cpp similarity index 100% rename from application/widgets/VersionListView.cpp rename to launcher/widgets/VersionListView.cpp diff --git a/application/widgets/VersionListView.h b/launcher/widgets/VersionListView.h similarity index 100% rename from application/widgets/VersionListView.h rename to launcher/widgets/VersionListView.h diff --git a/application/widgets/VersionSelectWidget.cpp b/launcher/widgets/VersionSelectWidget.cpp similarity index 100% rename from application/widgets/VersionSelectWidget.cpp rename to launcher/widgets/VersionSelectWidget.cpp diff --git a/application/widgets/VersionSelectWidget.h b/launcher/widgets/VersionSelectWidget.h similarity index 100% rename from application/widgets/VersionSelectWidget.h rename to launcher/widgets/VersionSelectWidget.h diff --git a/application/widgets/WideBar.cpp b/launcher/widgets/WideBar.cpp similarity index 100% rename from application/widgets/WideBar.cpp rename to launcher/widgets/WideBar.cpp diff --git a/application/widgets/WideBar.h b/launcher/widgets/WideBar.h similarity index 100% rename from application/widgets/WideBar.h rename to launcher/widgets/WideBar.h