Merge remote-tracking branch 'upstream/develop' into data-packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad
commit
6ab4fef0c5
686 changed files with 15261 additions and 9719 deletions
|
|
@ -24,10 +24,13 @@ set(CORE_SOURCES
|
|||
NullInstance.h
|
||||
MMCZip.h
|
||||
MMCZip.cpp
|
||||
Untar.h
|
||||
Untar.cpp
|
||||
StringUtils.h
|
||||
StringUtils.cpp
|
||||
QVariantUtils.h
|
||||
RuntimeContext.h
|
||||
PSaveFile.h
|
||||
|
||||
# Basic instance manipulation tasks (derived from InstanceTask)
|
||||
InstanceCreationTask.h
|
||||
|
|
@ -158,8 +161,6 @@ set(LAUNCH_SOURCES
|
|||
launch/steps/PreLaunchCommand.h
|
||||
launch/steps/TextPrint.cpp
|
||||
launch/steps/TextPrint.h
|
||||
launch/steps/Update.cpp
|
||||
launch/steps/Update.h
|
||||
launch/steps/QuitAfterGameStop.cpp
|
||||
launch/steps/QuitAfterGameStop.h
|
||||
launch/steps/PrintServers.cpp
|
||||
|
|
@ -170,6 +171,8 @@ set(LAUNCH_SOURCES
|
|||
launch/LaunchTask.h
|
||||
launch/LogModel.cpp
|
||||
launch/LogModel.h
|
||||
launch/TaskStepWrapper.cpp
|
||||
launch/TaskStepWrapper.h
|
||||
)
|
||||
|
||||
# Old update system
|
||||
|
|
@ -205,6 +208,11 @@ set(ICONS_SOURCES
|
|||
|
||||
# Support for Minecraft instances and launch
|
||||
set(MINECRAFT_SOURCES
|
||||
|
||||
# Logging
|
||||
minecraft/Logging.h
|
||||
minecraft/Logging.cpp
|
||||
|
||||
# Minecraft support
|
||||
minecraft/auth/AccountData.cpp
|
||||
minecraft/auth/AccountData.h
|
||||
|
|
@ -272,6 +280,8 @@ set(MINECRAFT_SOURCES
|
|||
minecraft/launch/ScanModFolders.h
|
||||
minecraft/launch/VerifyJavaInstall.cpp
|
||||
minecraft/launch/VerifyJavaInstall.h
|
||||
minecraft/launch/AutoInstallJava.cpp
|
||||
minecraft/launch/AutoInstallJava.h
|
||||
|
||||
minecraft/GradleSpecifier.h
|
||||
minecraft/MinecraftInstance.cpp
|
||||
|
|
@ -286,8 +296,6 @@ set(MINECRAFT_SOURCES
|
|||
minecraft/ComponentUpdateTask.h
|
||||
minecraft/MinecraftLoadAndCheck.h
|
||||
minecraft/MinecraftLoadAndCheck.cpp
|
||||
minecraft/MinecraftUpdate.h
|
||||
minecraft/MinecraftUpdate.cpp
|
||||
minecraft/MojangVersionFormat.cpp
|
||||
minecraft/MojangVersionFormat.h
|
||||
minecraft/Rule.cpp
|
||||
|
|
@ -339,17 +347,14 @@ set(MINECRAFT_SOURCES
|
|||
minecraft/mod/TexturePackFolderModel.h
|
||||
minecraft/mod/TexturePackFolderModel.cpp
|
||||
minecraft/mod/ShaderPackFolderModel.h
|
||||
minecraft/mod/tasks/BasicFolderLoadTask.h
|
||||
minecraft/mod/tasks/ModFolderLoadTask.h
|
||||
minecraft/mod/tasks/ModFolderLoadTask.cpp
|
||||
minecraft/mod/tasks/ResourceFolderLoadTask.h
|
||||
minecraft/mod/tasks/ResourceFolderLoadTask.cpp
|
||||
minecraft/mod/tasks/LocalModParseTask.h
|
||||
minecraft/mod/tasks/LocalModParseTask.cpp
|
||||
minecraft/mod/tasks/LocalModUpdateTask.h
|
||||
minecraft/mod/tasks/LocalModUpdateTask.cpp
|
||||
minecraft/mod/tasks/LocalResourceUpdateTask.h
|
||||
minecraft/mod/tasks/LocalResourceUpdateTask.cpp
|
||||
minecraft/mod/tasks/LocalDataPackParseTask.h
|
||||
minecraft/mod/tasks/LocalDataPackParseTask.cpp
|
||||
minecraft/mod/tasks/LocalResourcePackParseTask.h
|
||||
minecraft/mod/tasks/LocalResourcePackParseTask.cpp
|
||||
minecraft/mod/tasks/LocalTexturePackParseTask.h
|
||||
minecraft/mod/tasks/LocalTexturePackParseTask.cpp
|
||||
minecraft/mod/tasks/LocalShaderPackParseTask.h
|
||||
|
|
@ -419,8 +424,6 @@ set(SETTINGS_SOURCES
|
|||
set(JAVA_SOURCES
|
||||
java/JavaChecker.h
|
||||
java/JavaChecker.cpp
|
||||
java/JavaCheckerJob.h
|
||||
java/JavaCheckerJob.cpp
|
||||
java/JavaInstall.h
|
||||
java/JavaInstall.cpp
|
||||
java/JavaInstallList.h
|
||||
|
|
@ -429,6 +432,20 @@ set(JAVA_SOURCES
|
|||
java/JavaUtils.cpp
|
||||
java/JavaVersion.h
|
||||
java/JavaVersion.cpp
|
||||
|
||||
java/JavaMetadata.h
|
||||
java/JavaMetadata.cpp
|
||||
java/download/ArchiveDownloadTask.cpp
|
||||
java/download/ArchiveDownloadTask.h
|
||||
java/download/ManifestDownloadTask.cpp
|
||||
java/download/ManifestDownloadTask.h
|
||||
java/download/SymlinkTask.cpp
|
||||
java/download/SymlinkTask.h
|
||||
|
||||
ui/java/InstallJavaDialog.h
|
||||
ui/java/InstallJavaDialog.cpp
|
||||
ui/java/VersionList.h
|
||||
ui/java/VersionList.cpp
|
||||
)
|
||||
|
||||
set(TRANSLATIONS_SOURCES
|
||||
|
|
@ -591,7 +608,7 @@ set(PRISMUPDATER_SOURCES
|
|||
updater/prismupdater/UpdaterDialogs.cpp
|
||||
updater/prismupdater/GitHubRelease.h
|
||||
updater/prismupdater/GitHubRelease.cpp
|
||||
|
||||
|
||||
Json.h
|
||||
Json.cpp
|
||||
FileSystem.h
|
||||
|
|
@ -608,7 +625,7 @@ set(PRISMUPDATER_SOURCES
|
|||
# Zip
|
||||
MMCZip.h
|
||||
MMCZip.cpp
|
||||
|
||||
|
||||
# Time
|
||||
MMCTime.h
|
||||
MMCTime.cpp
|
||||
|
|
@ -651,6 +668,22 @@ ecm_qt_declare_logging_category(CORE_SOURCES
|
|||
EXPORT "${Launcher_Name}"
|
||||
)
|
||||
|
||||
ecm_qt_export_logging_category(
|
||||
IDENTIFIER instanceProfileC
|
||||
CATEGORY_NAME "launcher.instance.profile"
|
||||
DEFAULT_SEVERITY Debug
|
||||
DESCRIPTION "Profile actions"
|
||||
EXPORT "${Launcher_Name}"
|
||||
)
|
||||
|
||||
ecm_qt_export_logging_category(
|
||||
IDENTIFIER instanceProfileResolveC
|
||||
CATEGORY_NAME "launcher.instance.profile.resolve"
|
||||
DEFAULT_SEVERITY Debug
|
||||
DESCRIPTION "Profile component resolusion actions"
|
||||
EXPORT "${Launcher_Name}"
|
||||
)
|
||||
|
||||
ecm_qt_export_logging_category(
|
||||
IDENTIFIER taskLogC
|
||||
CATEGORY_NAME "launcher.task"
|
||||
|
|
@ -663,7 +696,7 @@ ecm_qt_export_logging_category(
|
|||
IDENTIFIER taskNetLogC
|
||||
CATEGORY_NAME "launcher.task.net"
|
||||
DEFAULT_SEVERITY Debug
|
||||
DESCRIPTION "task network action"
|
||||
DESCRIPTION "Task network action"
|
||||
EXPORT "${Launcher_Name}"
|
||||
)
|
||||
|
||||
|
|
@ -671,14 +704,14 @@ ecm_qt_export_logging_category(
|
|||
IDENTIFIER taskDownloadLogC
|
||||
CATEGORY_NAME "launcher.task.net.download"
|
||||
DEFAULT_SEVERITY Debug
|
||||
DESCRIPTION "task network download actions"
|
||||
DESCRIPTION "Task network download actions"
|
||||
EXPORT "${Launcher_Name}"
|
||||
)
|
||||
ecm_qt_export_logging_category(
|
||||
IDENTIFIER taskUploadLogC
|
||||
CATEGORY_NAME "launcher.task.net.upload"
|
||||
DEFAULT_SEVERITY Debug
|
||||
DESCRIPTION "task network upload actions"
|
||||
DESCRIPTION "Task network upload actions"
|
||||
EXPORT "${Launcher_Name}"
|
||||
)
|
||||
|
||||
|
|
@ -748,6 +781,8 @@ SET(LAUNCHER_SOURCES
|
|||
DataMigrationTask.cpp
|
||||
ApplicationMessage.h
|
||||
ApplicationMessage.cpp
|
||||
SysInfo.h
|
||||
SysInfo.cpp
|
||||
|
||||
# GUI - general utilities
|
||||
DesktopServices.h
|
||||
|
|
@ -775,7 +810,8 @@ SET(LAUNCHER_SOURCES
|
|||
resources/flat/flat.qrc
|
||||
resources/flat_white/flat_white.qrc
|
||||
resources/documents/documents.qrc
|
||||
../${Launcher_Branding_LogoQRC}
|
||||
resources/shaders/shaders.qrc
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/../${Launcher_Branding_LogoQRC}"
|
||||
|
||||
# Icons
|
||||
icons/MMCIcon.h
|
||||
|
|
@ -786,8 +822,6 @@ SET(LAUNCHER_SOURCES
|
|||
# GUI - windows
|
||||
ui/GuiUtil.h
|
||||
ui/GuiUtil.cpp
|
||||
ui/ColorCache.h
|
||||
ui/ColorCache.cpp
|
||||
ui/MainWindow.h
|
||||
ui/MainWindow.cpp
|
||||
ui/InstanceWindow.h
|
||||
|
|
@ -811,6 +845,10 @@ SET(LAUNCHER_SOURCES
|
|||
ui/setupwizard/PasteWizardPage.h
|
||||
ui/setupwizard/ThemeWizardPage.cpp
|
||||
ui/setupwizard/ThemeWizardPage.h
|
||||
ui/setupwizard/AutoJavaWizardPage.cpp
|
||||
ui/setupwizard/AutoJavaWizardPage.h
|
||||
ui/setupwizard/LoginWizardPage.cpp
|
||||
ui/setupwizard/LoginWizardPage.h
|
||||
|
||||
# GUI - themes
|
||||
ui/themes/FusionTheme.cpp
|
||||
|
|
@ -873,7 +911,6 @@ SET(LAUNCHER_SOURCES
|
|||
ui/pages/instance/NotesPage.h
|
||||
ui/pages/instance/LogPage.cpp
|
||||
ui/pages/instance/LogPage.h
|
||||
ui/pages/instance/InstanceSettingsPage.cpp
|
||||
ui/pages/instance/InstanceSettingsPage.h
|
||||
ui/pages/instance/ScreenshotsPage.cpp
|
||||
ui/pages/instance/ScreenshotsPage.h
|
||||
|
|
@ -883,21 +920,22 @@ SET(LAUNCHER_SOURCES
|
|||
ui/pages/instance/ServersPage.h
|
||||
ui/pages/instance/WorldListPage.cpp
|
||||
ui/pages/instance/WorldListPage.h
|
||||
|
||||
ui/pages/instance/McClient.cpp
|
||||
ui/pages/instance/McClient.h
|
||||
ui/pages/instance/McResolver.cpp
|
||||
ui/pages/instance/McResolver.h
|
||||
ui/pages/instance/ServerPingTask.cpp
|
||||
ui/pages/instance/ServerPingTask.h
|
||||
|
||||
# GUI - global settings pages
|
||||
ui/pages/global/AccountListPage.cpp
|
||||
ui/pages/global/AccountListPage.h
|
||||
ui/pages/global/CustomCommandsPage.cpp
|
||||
ui/pages/global/CustomCommandsPage.h
|
||||
ui/pages/global/EnvironmentVariablesPage.cpp
|
||||
ui/pages/global/EnvironmentVariablesPage.h
|
||||
ui/pages/global/ExternalToolsPage.cpp
|
||||
ui/pages/global/ExternalToolsPage.h
|
||||
ui/pages/global/JavaPage.cpp
|
||||
ui/pages/global/JavaPage.h
|
||||
ui/pages/global/LanguagePage.cpp
|
||||
ui/pages/global/LanguagePage.h
|
||||
ui/pages/global/MinecraftPage.cpp
|
||||
ui/pages/global/MinecraftPage.h
|
||||
ui/pages/global/LauncherPage.cpp
|
||||
ui/pages/global/LauncherPage.h
|
||||
|
|
@ -933,6 +971,8 @@ SET(LAUNCHER_SOURCES
|
|||
ui/pages/modplatform/DataPackPage.cpp
|
||||
ui/pages/modplatform/DataPackModel.cpp
|
||||
|
||||
ui/pages/modplatform/ModpackProviderBasePage.h
|
||||
|
||||
ui/pages/modplatform/atlauncher/AtlFilterModel.cpp
|
||||
ui/pages/modplatform/atlauncher/AtlFilterModel.h
|
||||
ui/pages/modplatform/atlauncher/AtlListModel.cpp
|
||||
|
|
@ -995,8 +1035,6 @@ SET(LAUNCHER_SOURCES
|
|||
ui/dialogs/CopyInstanceDialog.h
|
||||
ui/dialogs/CustomMessageBox.cpp
|
||||
ui/dialogs/CustomMessageBox.h
|
||||
ui/dialogs/EditAccountDialog.cpp
|
||||
ui/dialogs/EditAccountDialog.h
|
||||
ui/dialogs/ExportInstanceDialog.cpp
|
||||
ui/dialogs/ExportInstanceDialog.h
|
||||
ui/dialogs/ExportPackDialog.cpp
|
||||
|
|
@ -1033,14 +1071,21 @@ SET(LAUNCHER_SOURCES
|
|||
ui/dialogs/BlockedModsDialog.h
|
||||
ui/dialogs/ChooseProviderDialog.h
|
||||
ui/dialogs/ChooseProviderDialog.cpp
|
||||
ui/dialogs/ModUpdateDialog.cpp
|
||||
ui/dialogs/ModUpdateDialog.h
|
||||
ui/dialogs/ResourceUpdateDialog.cpp
|
||||
ui/dialogs/ResourceUpdateDialog.h
|
||||
ui/dialogs/InstallLoaderDialog.cpp
|
||||
ui/dialogs/InstallLoaderDialog.h
|
||||
|
||||
ui/dialogs/skins/SkinManageDialog.cpp
|
||||
ui/dialogs/skins/SkinManageDialog.h
|
||||
|
||||
ui/dialogs/skins/draw/SkinOpenGLWindow.h
|
||||
ui/dialogs/skins/draw/SkinOpenGLWindow.cpp
|
||||
ui/dialogs/skins/draw/Scene.h
|
||||
ui/dialogs/skins/draw/Scene.cpp
|
||||
ui/dialogs/skins/draw/BoxGeometry.h
|
||||
ui/dialogs/skins/draw/BoxGeometry.cpp
|
||||
|
||||
# GUI - widgets
|
||||
ui/widgets/CheckComboBox.cpp
|
||||
ui/widgets/CheckComboBox.h
|
||||
|
|
@ -1050,14 +1095,12 @@ SET(LAUNCHER_SOURCES
|
|||
ui/widgets/CustomCommands.h
|
||||
ui/widgets/EnvironmentVariables.cpp
|
||||
ui/widgets/EnvironmentVariables.h
|
||||
ui/widgets/DropLabel.cpp
|
||||
ui/widgets/DropLabel.h
|
||||
ui/widgets/FocusLineEdit.cpp
|
||||
ui/widgets/FocusLineEdit.h
|
||||
ui/widgets/IconLabel.cpp
|
||||
ui/widgets/IconLabel.h
|
||||
ui/widgets/JavaSettingsWidget.cpp
|
||||
ui/widgets/JavaSettingsWidget.h
|
||||
ui/widgets/JavaWizardWidget.cpp
|
||||
ui/widgets/JavaWizardWidget.h
|
||||
ui/widgets/LabeledToolButton.cpp
|
||||
ui/widgets/LabeledToolButton.h
|
||||
ui/widgets/LanguageSelectionWidget.cpp
|
||||
|
|
@ -1093,6 +1136,10 @@ SET(LAUNCHER_SOURCES
|
|||
ui/widgets/WideBar.cpp
|
||||
ui/widgets/ThemeCustomizationWidget.h
|
||||
ui/widgets/ThemeCustomizationWidget.cpp
|
||||
ui/widgets/MinecraftSettingsWidget.h
|
||||
ui/widgets/MinecraftSettingsWidget.cpp
|
||||
ui/widgets/JavaSettingsWidget.h
|
||||
ui/widgets/JavaSettingsWidget.cpp
|
||||
|
||||
# GUI - instance group view
|
||||
ui/instanceview/InstanceProxyModel.cpp
|
||||
|
|
@ -1128,13 +1175,14 @@ endif()
|
|||
qt_wrap_ui(LAUNCHER_UI
|
||||
ui/MainWindow.ui
|
||||
ui/setupwizard/PasteWizardPage.ui
|
||||
ui/setupwizard/AutoJavaWizardPage.ui
|
||||
ui/setupwizard/LoginWizardPage.ui
|
||||
ui/setupwizard/ThemeWizardPage.ui
|
||||
ui/pages/global/AccountListPage.ui
|
||||
ui/pages/global/JavaPage.ui
|
||||
ui/pages/global/LauncherPage.ui
|
||||
ui/pages/global/APIPage.ui
|
||||
ui/pages/global/ProxyPage.ui
|
||||
ui/pages/global/MinecraftPage.ui
|
||||
ui/pages/global/ExternalToolsPage.ui
|
||||
ui/pages/instance/ExternalResourcesPage.ui
|
||||
ui/pages/instance/NotesPage.ui
|
||||
|
|
@ -1142,7 +1190,6 @@ qt_wrap_ui(LAUNCHER_UI
|
|||
ui/pages/instance/ServersPage.ui
|
||||
ui/pages/instance/GameOptionsPage.ui
|
||||
ui/pages/instance/OtherLogsPage.ui
|
||||
ui/pages/instance/InstanceSettingsPage.ui
|
||||
ui/pages/instance/VersionPage.ui
|
||||
ui/pages/instance/ManagedPackPage.ui
|
||||
ui/pages/instance/WorldListPage.ui
|
||||
|
|
@ -1165,6 +1212,8 @@ qt_wrap_ui(LAUNCHER_UI
|
|||
ui/widgets/ModFilterWidget.ui
|
||||
ui/widgets/SubTaskProgressBar.ui
|
||||
ui/widgets/ThemeCustomizationWidget.ui
|
||||
ui/widgets/MinecraftSettingsWidget.ui
|
||||
ui/widgets/JavaSettingsWidget.ui
|
||||
ui/dialogs/CopyInstanceDialog.ui
|
||||
ui/dialogs/ProfileSetupDialog.ui
|
||||
ui/dialogs/ProgressDialog.ui
|
||||
|
|
@ -1180,12 +1229,10 @@ qt_wrap_ui(LAUNCHER_UI
|
|||
ui/dialogs/MSALoginDialog.ui
|
||||
ui/dialogs/OfflineLoginDialog.ui
|
||||
ui/dialogs/AboutDialog.ui
|
||||
ui/dialogs/EditAccountDialog.ui
|
||||
ui/dialogs/ReviewMessageBox.ui
|
||||
ui/dialogs/ScrollMessageBox.ui
|
||||
ui/dialogs/BlockedModsDialog.ui
|
||||
ui/dialogs/ChooseProviderDialog.ui
|
||||
|
||||
ui/dialogs/skins/SkinManageDialog.ui
|
||||
)
|
||||
|
||||
|
|
@ -1210,7 +1257,8 @@ qt_add_resources(LAUNCHER_RESOURCES
|
|||
resources/iOS/iOS.qrc
|
||||
resources/flat/flat.qrc
|
||||
resources/documents/documents.qrc
|
||||
../${Launcher_Branding_LogoQRC}
|
||||
resources/shaders/shaders.qrc
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/../${Launcher_Branding_LogoQRC}"
|
||||
)
|
||||
|
||||
qt_wrap_ui(PRISMUPDATER_UI
|
||||
|
|
@ -1228,14 +1276,10 @@ include(CompilerWarnings)
|
|||
|
||||
# Add executable
|
||||
add_library(Launcher_logic STATIC ${LOGIC_SOURCES} ${LAUNCHER_SOURCES} ${LAUNCHER_UI} ${LAUNCHER_RESOURCES})
|
||||
if(BUILD_TESTING)
|
||||
target_compile_definitions(Launcher_logic PUBLIC LAUNCHER_TEST)
|
||||
endif()
|
||||
set_project_warnings(Launcher_logic
|
||||
"${Launcher_MSVC_WARNINGS}"
|
||||
"${Launcher_CLANG_WARNINGS}"
|
||||
"${Launcher_GCC_WARNINGS}")
|
||||
target_compile_definitions(Launcher_logic PUBLIC LAUNCHER_APPLICATION)
|
||||
target_include_directories(Launcher_logic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
target_compile_definitions(Launcher_logic PUBLIC LAUNCHER_APPLICATION)
|
||||
target_link_libraries(Launcher_logic
|
||||
|
|
@ -1264,6 +1308,8 @@ target_link_libraries(Launcher_logic
|
|||
Qt${QT_VERSION_MAJOR}::Gui
|
||||
Qt${QT_VERSION_MAJOR}::Widgets
|
||||
Qt${QT_VERSION_MAJOR}::NetworkAuth
|
||||
Qt${QT_VERSION_MAJOR}::OpenGL
|
||||
${Launcher_QT_DBUS}
|
||||
${Launcher_QT_LIBS}
|
||||
)
|
||||
target_link_libraries(Launcher_logic
|
||||
|
|
@ -1272,6 +1318,10 @@ target_link_libraries(Launcher_logic
|
|||
LocalPeer
|
||||
Launcher_rainbow
|
||||
)
|
||||
if (TARGET ${Launcher_QT_DBUS})
|
||||
add_compile_definitions(WITH_QTDBUS)
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
set(CMAKE_MACOSX_RPATH 1)
|
||||
set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks/")
|
||||
|
|
@ -1339,7 +1389,7 @@ if(Launcher_BUILD_UPDATER)
|
|||
add_executable("${Launcher_Name}_updater" WIN32 updater/prismupdater/updater_main.cpp)
|
||||
target_sources("${Launcher_Name}_updater" PRIVATE updater/prismupdater/updater.exe.manifest)
|
||||
target_link_libraries("${Launcher_Name}_updater" prism_updater_logic)
|
||||
|
||||
|
||||
if(DEFINED Launcher_APP_BINARY_NAME)
|
||||
set_target_properties("${Launcher_Name}_updater" PROPERTIES OUTPUT_NAME "${Launcher_APP_BINARY_NAME}_updater")
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue