diff --git a/CMakeLists.txt b/CMakeLists.txt index a9a7576d6..818504956 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -628,6 +628,40 @@ else() message(FATAL_ERROR "Platform not supported") endif() +################################ shimgen ################################ + +set(SHIMGEN_BUILD_DIR ${CMAKE_BINARY_DIR}/tools/shimgen-build) + +execute_process( + COMMAND ${CMAKE_COMMAND} -S ${CMAKE_SOURCE_DIR}/launcher/tools/shimgen -B ${SHIMGEN_BUILD_DIR} + RESULT_VARIABLE SHIMGEN_CFG_RC +) +if(NOT SHIMGEN_CFG_RC EQUAL 0) + message(FATAL_ERROR "shimgen configure başarısız") +endif() + +execute_process( + COMMAND ${CMAKE_COMMAND} --build ${SHIMGEN_BUILD_DIR} --config Release + RESULT_VARIABLE SHIMGEN_BUILD_RC +) +if(NOT SHIMGEN_BUILD_RC EQUAL 0) + message(FATAL_ERROR "shimgen compile failed") +endif() + +find_program(SHIMGEN_EXE shimgen + PATHS ${SHIMGEN_BUILD_DIR} ${SHIMGEN_BUILD_DIR}/Release + NO_DEFAULT_PATH +) + +execute_process( + COMMAND ${SHIMGEN_EXE} ${CMAKE_SOURCE_DIR}/launcher ${CMAKE_SOURCE_DIR}/launcher/headers + RESULT_VARIABLE SHIMGEN_RUN_RC +) + +if(NOT SHIMGEN_RUN_RC EQUAL 0) + message(FATAL_ERROR "Shim generation has been failed") +endif() + ################################ Included Libs ################################ include(ExternalProject) @@ -692,8 +726,6 @@ install(FILES "${NEWLAUNCH_JAR}" DESTINATION "${JARS_DEST_DIR}" RENAME "NewLaunc ############################### Built Artifacts ############################### -add_subdirectory(buildconfig) - add_subdirectory(launcher/crashreporter) # NOTE: this must always be last to appease the CMake deity of quirky install command evaluation order. diff --git a/README.md b/README.md index 581f9fa80..8ec65b546 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ In general, in order of importance: ## License Copyright © 2012-2022 MultiMC Contributors -Copyright © 2026 Project Tick +
Copyright © 2026 Project Tick Licensed under the Apache License, Version 2.0 (the "License"); you may not use this program except in compliance with the License. You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0). diff --git a/buildconfig/CMakeLists.txt b/buildconfig/CMakeLists.txt deleted file mode 100644 index cd09bdcfe..000000000 --- a/buildconfig/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -######## Configure the file with build properties ######## - -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/BuildConfig.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/BuildConfig.cpp") - -add_library(BuildConfig STATIC - BuildConfig.h - ${CMAKE_CURRENT_BINARY_DIR}/BuildConfig.cpp -) - -target_link_libraries(BuildConfig Qt${QT_VERSION_MAJOR}::Core) -target_include_directories(BuildConfig PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 916cba8c1..94107cf08 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -17,9 +17,9 @@ * limitations under the License. */ -#include "Application.h" -#include "BuildConfig.h" -#include "plugin/PluginManager.h" +#include +#include +#include #include "ui/MainWindow.h" #include "ui/InstanceWindow.h" @@ -52,7 +52,7 @@ #include "ui/pagedialog/PageDialog.h" -#include "ApplicationMessage.h" +#include #include @@ -72,7 +72,7 @@ #include #include -#include "InstanceList.h" +#include #include #include "icons/IconList.h" @@ -102,9 +102,9 @@ #include "translations/TranslationsModel.h" #include "meta/Index.h" -#include -#include -#include +#include +#include +#include #include #include "MMCZip.h" @@ -113,7 +113,7 @@ #include "minecraft/Component.h" #include "Sys.h" -#include "Logging.h" +#include #include "MMCStrings.h" #if defined Q_OS_WIN32 diff --git a/launcher/Application.h b/launcher/Application.h index 57d9b4e06..e60bd6694 100644 --- a/launcher/Application.h +++ b/launcher/Application.h @@ -1,3 +1,5 @@ +// launcher/Application.h +// @meshmc-public: MeshMC/Core/Application /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 @@ -29,9 +31,9 @@ #include #include -#include +#include -#include "Logging.h" +#include #include "minecraft/launch/MinecraftServerTarget.h" diff --git a/launcher/ApplicationMessage.cpp b/launcher/ApplicationMessage.cpp index f98b11c27..8e4678960 100644 --- a/launcher/ApplicationMessage.cpp +++ b/launcher/ApplicationMessage.cpp @@ -17,7 +17,7 @@ * limitations under the License. */ -#include "ApplicationMessage.h" +#include #include #include diff --git a/launcher/ApplicationMessage.h b/launcher/ApplicationMessage.h index f95a2dd3b..c138bf826 100644 --- a/launcher/ApplicationMessage.h +++ b/launcher/ApplicationMessage.h @@ -1,3 +1,5 @@ +// launcher/ApplicationMessage.h +// @meshmc-public: MeshMC/Core/ApplicationMessage /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/ArchiveOpen.h b/launcher/ArchiveOpen.h index bee7bb8a8..0ee625e40 100644 --- a/launcher/ArchiveOpen.h +++ b/launcher/ArchiveOpen.h @@ -1,3 +1,5 @@ +// launcher/ArchiveOpen.h +// @meshmc-public: MeshMC/Core/ArchiveOpen /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/BaseInstaller.cpp b/launcher/BaseInstaller.cpp index 8b1579b63..7fc2ed0d1 100644 --- a/launcher/BaseInstaller.cpp +++ b/launcher/BaseInstaller.cpp @@ -20,7 +20,7 @@ #include -#include "BaseInstaller.h" +#include #include "minecraft/MinecraftInstance.h" BaseInstaller::BaseInstaller() {} diff --git a/launcher/BaseInstaller.h b/launcher/BaseInstaller.h index fec8bd9b3..2e0d71a5a 100644 --- a/launcher/BaseInstaller.h +++ b/launcher/BaseInstaller.h @@ -1,3 +1,5 @@ +// launcher/BaseInstaller.h +// @meshmc-public: MeshMC/Core/BaseInstaller /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/BaseInstance.cpp b/launcher/BaseInstance.cpp index 6fe317c9f..968c47552 100644 --- a/launcher/BaseInstance.cpp +++ b/launcher/BaseInstance.cpp @@ -18,7 +18,7 @@ * limitations under the License. */ -#include "BaseInstance.h" +#include #include #include @@ -34,9 +34,9 @@ #include "settings/Setting.h" #include "settings/OverrideSetting.h" -#include "FileSystem.h" -#include "Commandline.h" -#include "BuildConfig.h" +#include +#include +#include BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString& rootDir) diff --git a/launcher/BaseInstance.h b/launcher/BaseInstance.h index 47a7bea75..8670c63c8 100644 --- a/launcher/BaseInstance.h +++ b/launcher/BaseInstance.h @@ -1,3 +1,5 @@ +// launcher/BaseInstance.h +// @meshmc-public: MeshMC/Core/BaseInstance /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 @@ -30,7 +32,7 @@ #include "settings/SettingsObject.h" #include "settings/INIFile.h" -#include "BaseVersionList.h" +#include #include "minecraft/auth/MinecraftAccount.h" #include "MessageLevel.h" #include "pathmatcher/IPathMatcher.h" diff --git a/launcher/BaseVersion.h b/launcher/BaseVersion.h index 49e68121e..6fbc9428c 100644 --- a/launcher/BaseVersion.h +++ b/launcher/BaseVersion.h @@ -1,3 +1,5 @@ +// launcher/BaseVersion.h +// @meshmc-public: MeshMC/Core/BaseVersion /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/BaseVersionList.cpp b/launcher/BaseVersionList.cpp index 05466df20..c1fc925c2 100644 --- a/launcher/BaseVersionList.cpp +++ b/launcher/BaseVersionList.cpp @@ -18,8 +18,8 @@ * limitations under the License. */ -#include "BaseVersionList.h" -#include "BaseVersion.h" +#include +#include BaseVersionList::BaseVersionList(QObject* parent) : QAbstractListModel(parent) { diff --git a/launcher/BaseVersionList.h b/launcher/BaseVersionList.h index fec158eda..53ed656b4 100644 --- a/launcher/BaseVersionList.h +++ b/launcher/BaseVersionList.h @@ -1,3 +1,5 @@ +// launcher/BaseVersionList.h +// @meshmc-public: MeshMC/Core/BaseVersionList /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 @@ -24,7 +26,7 @@ #include #include -#include "BaseVersion.h" +#include #include "tasks/Task.h" #include "QObjectPtr.h" diff --git a/buildconfig/BuildConfig.h b/launcher/BuildConfig.h similarity index 98% rename from buildconfig/BuildConfig.h rename to launcher/BuildConfig.h index 4a0945c5c..4bd6f1cd0 100644 --- a/buildconfig/BuildConfig.h +++ b/launcher/BuildConfig.h @@ -1,3 +1,5 @@ +// launcher/buildconfig/BuildConfig.h +// @meshmc-public: MeshMC/Core/BuildConfig /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/buildconfig/BuildConfig.cpp.in b/launcher/BuildConfig.in.cpp similarity index 99% rename from buildconfig/BuildConfig.cpp.in rename to launcher/BuildConfig.in.cpp index 66d191010..40fd1245f 100644 --- a/buildconfig/BuildConfig.cpp.in +++ b/launcher/BuildConfig.in.cpp @@ -17,7 +17,7 @@ * limitations under the License. */ -#include "BuildConfig.h" +#include #include const Config BuildConfig; diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 4894de93a..9efa1cdf2 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -6,8 +6,12 @@ project(application) include (UnitTest) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/BuildConfig.in.cpp" "${CMAKE_CURRENT_BINARY_DIR}/BuildConfig.cpp") + set(CORE_SOURCES # LOGIC - Base classes and infrastructure + BuildConfig.h + ${CMAKE_CURRENT_BINARY_DIR}/BuildConfig.cpp BaseInstaller.h BaseInstaller.cpp BaseVersionList.h @@ -1209,6 +1213,7 @@ endif() # Add executable add_library(MeshMC_logic STATIC ${LOGIC_SOURCES} ${MESHMC_SOURCES} ${MESHMC_UI} ${MESHMC_SHARED_UI} ${MESHMC_RESOURCES}) +target_include_directories(MeshMC_logic PUBLIC ${CMAKE_SOURCE_DIR}/launcher/headers) # Declared after MeshMC_logic because it links against it. add_unit_test(CustomTheme @@ -1233,7 +1238,6 @@ target_link_libraries(MeshMC_logic nbt++ ZLIB::ZLIB tomlplusplus::tomlplusplus - BuildConfig Katabasis ) @@ -1444,7 +1448,7 @@ if(NOT APPLE) DesktopServices.h DesktopServices.cpp QObjectPtr.h - + ${CMAKE_CURRENT_BINARY_DIR}/BuildConfig.cpp tasks/Task.h tasks/Task.cpp @@ -1457,7 +1461,7 @@ if(NOT APPLE) ) add_library(meshmc_updater_logic STATIC ${MESHUPDATER_SOURCES} ${MESHUPDATER_UI} ${MESHMC_SHARED_UI}) - target_include_directories(meshmc_updater_logic PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + target_include_directories(meshmc_updater_logic PUBLIC ${CMAKE_SOURCE_DIR}/launcher/headers) target_compile_definitions(meshmc_updater_logic PUBLIC QT_MESSAGELOGCONTEXT) target_link_libraries(meshmc_updater_logic Qt${QT_VERSION_MAJOR}::Core @@ -1466,7 +1470,6 @@ if(NOT APPLE) Qt${QT_VERSION_MAJOR}::Network LibArchive::LibArchive cmark::cmark - BuildConfig ) # WIN32: no console window while updating. Diagnostics go to the log file, diff --git a/launcher/Commandline.cpp b/launcher/Commandline.cpp index 7f00b882c..ccf654cb8 100644 --- a/launcher/Commandline.cpp +++ b/launcher/Commandline.cpp @@ -18,7 +18,7 @@ * limitations under the License. */ -#include "Commandline.h" +#include /** * @file libutil/src/cmdutils.cpp diff --git a/launcher/Commandline.h b/launcher/Commandline.h index 57bf987d2..679ef63c6 100644 --- a/launcher/Commandline.h +++ b/launcher/Commandline.h @@ -1,3 +1,5 @@ +// launcher/Commandline.h +// @meshmc-public: MeshMC/Core/Commandline /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/DefaultVariable.h b/launcher/DefaultVariable.h index f3ac457e1..46222a1f8 100644 --- a/launcher/DefaultVariable.h +++ b/launcher/DefaultVariable.h @@ -1,3 +1,5 @@ +// launcher/DefaultVariable.h +// @meshmc-public: MeshMC/Core/DefaultVariable /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/DesktopServices.cpp b/launcher/DesktopServices.cpp index d79395ef6..7a40043cf 100644 --- a/launcher/DesktopServices.cpp +++ b/launcher/DesktopServices.cpp @@ -17,7 +17,7 @@ * limitations under the License. */ -#include "DesktopServices.h" +#include #include #include #include diff --git a/launcher/DesktopServices.h b/launcher/DesktopServices.h index 7ef140b64..652ce4292 100644 --- a/launcher/DesktopServices.h +++ b/launcher/DesktopServices.h @@ -1,3 +1,5 @@ +// launcher/DesktopServices.h +// @meshmc-public: MeshMC/Core/DesktopServices /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/Exception.h b/launcher/Exception.h index e52a3c893..fc8a277a6 100644 --- a/launcher/Exception.h +++ b/launcher/Exception.h @@ -1,3 +1,5 @@ +// launcher/Exception.h +// @meshmc-public: MeshMC/Core/Exception /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/ExponentialSeries.h b/launcher/ExponentialSeries.h index e786bf83e..fe1ff5143 100644 --- a/launcher/ExponentialSeries.h +++ b/launcher/ExponentialSeries.h @@ -1,3 +1,5 @@ +// launcher/ExponentialSeries.h +// @meshmc-public: MeshMC/Core/ExponentialSeries /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/FastFileIconProvider.cpp b/launcher/FastFileIconProvider.cpp index b956383f2..fd0879236 100644 --- a/launcher/FastFileIconProvider.cpp +++ b/launcher/FastFileIconProvider.cpp @@ -17,7 +17,7 @@ * limitations under the License. */ -#include "FastFileIconProvider.h" +#include #include #include diff --git a/launcher/FastFileIconProvider.h b/launcher/FastFileIconProvider.h index 78ce45576..62486703e 100644 --- a/launcher/FastFileIconProvider.h +++ b/launcher/FastFileIconProvider.h @@ -1,3 +1,5 @@ +// launcher/FastFileIconProvider.h +// @meshmc-public: MeshMC/Core/FastFileIconProvider /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/FileIgnoreProxy.cpp b/launcher/FileIgnoreProxy.cpp index 2f2d3903a..12cb96fc4 100644 --- a/launcher/FileIgnoreProxy.cpp +++ b/launcher/FileIgnoreProxy.cpp @@ -18,15 +18,15 @@ * limitations under the License. */ -#include "FileIgnoreProxy.h" +#include #include #include #include #include -#include "Exception.h" -#include "FileSystem.h" +#include +#include #include "MMCStrings.h" FileIgnoreProxy::FileIgnoreProxy(QString root, QObject* parent) diff --git a/launcher/FileIgnoreProxy.h b/launcher/FileIgnoreProxy.h index 052e4d264..d16b8bb2f 100644 --- a/launcher/FileIgnoreProxy.h +++ b/launcher/FileIgnoreProxy.h @@ -1,3 +1,5 @@ +// launcher/FileIgnoreProxy.h +// @meshmc-public: MeshMC/Core/FileIgnoreProxy /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/FileSystem.cpp b/launcher/FileSystem.cpp index 8d84a8f89..1660f3bac 100644 --- a/launcher/FileSystem.cpp +++ b/launcher/FileSystem.cpp @@ -18,7 +18,7 @@ * limitations under the License. */ -#include "FileSystem.h" +#include #include #include @@ -44,7 +44,7 @@ #include #endif -#include "DesktopServices.h" +#include namespace FS { diff --git a/launcher/FileSystem.h b/launcher/FileSystem.h index e652cd96f..f5cd70825 100644 --- a/launcher/FileSystem.h +++ b/launcher/FileSystem.h @@ -1,3 +1,5 @@ +// launcher/FileSystem.h +// @meshmc-public: MeshMC/Core/FS /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 @@ -20,7 +22,7 @@ #pragma once -#include "Exception.h" +#include #include "pathmatcher/IPathMatcher.h" #include diff --git a/launcher/FileSystem_test.cpp b/launcher/FileSystem_test.cpp index 61a2ccfd8..566f1a97e 100644 --- a/launcher/FileSystem_test.cpp +++ b/launcher/FileSystem_test.cpp @@ -22,7 +22,7 @@ #include #include "TestUtil.h" -#include "FileSystem.h" +#include class FileSystemTest : public QObject { diff --git a/launcher/Filter.cpp b/launcher/Filter.cpp index 65b5e86ce..3c75d998e 100644 --- a/launcher/Filter.cpp +++ b/launcher/Filter.cpp @@ -17,7 +17,7 @@ * limitations under the License. */ -#include "Filter.h" +#include Filter::~Filter() {} diff --git a/launcher/Filter.h b/launcher/Filter.h index 28b45f6c6..30ad6ef32 100644 --- a/launcher/Filter.h +++ b/launcher/Filter.h @@ -1,3 +1,5 @@ +// launcher/Filter.h +// @meshmc-public: MeshMC/Core/Filter /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/GZip.cpp b/launcher/GZip.cpp index d157bbf04..0c4568e50 100644 --- a/launcher/GZip.cpp +++ b/launcher/GZip.cpp @@ -17,7 +17,7 @@ * limitations under the License. */ -#include "GZip.h" +#include #include #include diff --git a/launcher/GZip.h b/launcher/GZip.h index 1fe25a79b..218f2a0d2 100644 --- a/launcher/GZip.h +++ b/launcher/GZip.h @@ -1,3 +1,5 @@ +// launcher/GZip.h +// @meshmc-public: MeshMC/Core/GZip /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/GZip_test.cpp b/launcher/GZip_test.cpp index dce8aae45..4ea669557 100644 --- a/launcher/GZip_test.cpp +++ b/launcher/GZip_test.cpp @@ -20,7 +20,7 @@ #include #include "TestUtil.h" -#include "GZip.h" +#include #include void fib(int& prev, int& cur) diff --git a/launcher/HoeDown.h b/launcher/HoeDown.h index a5431d857..cb0b44411 100644 --- a/launcher/HoeDown.h +++ b/launcher/HoeDown.h @@ -1,3 +1,5 @@ +// launcher/HoeDown.h +// @meshmc-public: MeshMC/Core/HoeDown /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/InstanceCopyTask.cpp b/launcher/InstanceCopyTask.cpp index 89e41ade0..e58501d51 100644 --- a/launcher/InstanceCopyTask.cpp +++ b/launcher/InstanceCopyTask.cpp @@ -17,9 +17,9 @@ * limitations under the License. */ -#include "InstanceCopyTask.h" +#include #include "settings/INISettingsObject.h" -#include "FileSystem.h" +#include #include "NullInstance.h" #include "pathmatcher/RegexpMatcher.h" #include diff --git a/launcher/InstanceCopyTask.h b/launcher/InstanceCopyTask.h index 552cb4e39..0c5707603 100644 --- a/launcher/InstanceCopyTask.h +++ b/launcher/InstanceCopyTask.h @@ -1,3 +1,5 @@ +// launcher/InstanceCopyTask.h +// @meshmc-public: MeshMC/Core/InstanceCopyTask /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 @@ -25,9 +27,9 @@ #include #include #include "settings/SettingsObject.h" -#include "BaseVersion.h" -#include "BaseInstance.h" -#include "InstanceTask.h" +#include +#include +#include class InstanceCopyTask : public InstanceTask { diff --git a/launcher/InstanceCreationTask.cpp b/launcher/InstanceCreationTask.cpp index ceb39932f..a98da372c 100644 --- a/launcher/InstanceCreationTask.cpp +++ b/launcher/InstanceCreationTask.cpp @@ -17,9 +17,9 @@ * limitations under the License. */ -#include "InstanceCreationTask.h" +#include #include "settings/INISettingsObject.h" -#include "FileSystem.h" +#include // FIXME: remove this #include "minecraft/MinecraftInstance.h" diff --git a/launcher/InstanceCreationTask.h b/launcher/InstanceCreationTask.h index 41ad42472..a340c3b44 100644 --- a/launcher/InstanceCreationTask.h +++ b/launcher/InstanceCreationTask.h @@ -1,3 +1,5 @@ +// launcher/InstanceCreationTask.h +// @meshmc-public: MeshMC/Core/InstanceCreationTask /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 @@ -23,8 +25,8 @@ #include "net/NetJob.h" #include #include "settings/SettingsObject.h" -#include "BaseVersion.h" -#include "InstanceTask.h" +#include +#include class InstanceCreationTask : public InstanceTask { diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp index ccb9ecd44..6756bdf7c 100644 --- a/launcher/InstanceImportTask.cpp +++ b/launcher/InstanceImportTask.cpp @@ -18,11 +18,11 @@ * limitations under the License. */ -#include "InstanceImportTask.h" -#include "BaseInstance.h" -#include "FileSystem.h" -#include "Application.h" -#include "InstanceList.h" +#include +#include +#include +#include +#include #include "MMCZip.h" #include "archive/ExtractZipTask.h" #include "NullInstance.h" @@ -39,11 +39,11 @@ #include "modplatform/flame/PackManifest.h" #include "modplatform/modrinth/ModrinthPackManifest.h" #include "modplatform/PackContents.h" -#include "Json.h" +#include #include "modplatform/technic/TechnicPackProcessor.h" #include "icons/IconList.h" -#include "Application.h" +#include #include "modplatform/flame/FlameApi.h" #include "modplatform/modrinth/ModrinthApi.h" #include "ui/dialogs/BlockedModsDialog.h" diff --git a/launcher/InstanceImportTask.h b/launcher/InstanceImportTask.h index 13936e90c..befc0b438 100644 --- a/launcher/InstanceImportTask.h +++ b/launcher/InstanceImportTask.h @@ -1,3 +1,5 @@ +// launcher/InstanceImportTask.h +// @meshmc-public: MeshMC/Core/InstanceImportTask /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 @@ -20,7 +22,7 @@ #pragma once -#include "InstanceTask.h" +#include #include "net/HttpMetaCache.h" #include "net/NetJob.h" #include diff --git a/launcher/InstanceList.cpp b/launcher/InstanceList.cpp index e110d781b..a1c0606a4 100644 --- a/launcher/InstanceList.cpp +++ b/launcher/InstanceList.cpp @@ -36,15 +36,15 @@ #include #include -#include "InstanceList.h" -#include "BaseInstance.h" -#include "InstanceTask.h" +#include +#include +#include #include "settings/INISettingsObject.h" #include "minecraft/legacy/LegacyInstance.h" #include "NullInstance.h" #include "minecraft/MinecraftInstance.h" -#include "FileSystem.h" -#include "ExponentialSeries.h" +#include +#include #include "WatchLock.h" const static int GROUP_FILE_FORMAT_VERSION = 1; diff --git a/launcher/InstanceList.h b/launcher/InstanceList.h index 2df1e611c..449d0d833 100644 --- a/launcher/InstanceList.h +++ b/launcher/InstanceList.h @@ -1,3 +1,5 @@ +// launcher/InstanceList.h +// @meshmc-public: MeshMC/Core/InstanceList /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 @@ -27,7 +29,7 @@ #include #include -#include "BaseInstance.h" +#include #include "QObjectPtr.h" diff --git a/launcher/InstancePageProvider.h b/launcher/InstancePageProvider.h index ae5ebefc6..171e18b82 100644 --- a/launcher/InstancePageProvider.h +++ b/launcher/InstancePageProvider.h @@ -1,3 +1,5 @@ +// launcher/InstancePageProvider.h +// @meshmc-public: MeshMC/Core/InstancePageProvider /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 @@ -20,7 +22,7 @@ #pragma once #include "minecraft/MinecraftInstance.h" #include "minecraft/legacy/LegacyInstance.h" -#include +#include #include "ui/pages/BasePage.h" #include "ui/pages/BasePageProvider.h" #include "ui/pages/instance/LogPage.h" @@ -40,8 +42,8 @@ #include "ui/pages/instance/ServersPage.h" #include "ui/pages/instance/GameOptionsPage.h" #include "ui/pages/instance/BackupPage.h" -#include "Application.h" -#include "plugin/PluginManager.h" +#include +#include #include "plugin/PluginHooks.h" class InstancePageProvider : public QObject, public BasePageProvider diff --git a/launcher/InstanceTask.cpp b/launcher/InstanceTask.cpp index 6fdc3ae80..7e087c7d9 100644 --- a/launcher/InstanceTask.cpp +++ b/launcher/InstanceTask.cpp @@ -17,7 +17,7 @@ * limitations under the License. */ -#include "InstanceTask.h" +#include #include "minecraft/MinecraftInstance.h" #include "net/Mode.h" diff --git a/launcher/InstanceTask.h b/launcher/InstanceTask.h index 01a8316ae..d28c9fc96 100644 --- a/launcher/InstanceTask.h +++ b/launcher/InstanceTask.h @@ -1,3 +1,5 @@ +// launcher/InstanceTask.h +// @meshmc-public: MeshMC/Core/InstanceTask /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/JavaCommon.cpp b/launcher/JavaCommon.cpp index 0eee0efb9..bbbf48fac 100644 --- a/launcher/JavaCommon.cpp +++ b/launcher/JavaCommon.cpp @@ -17,7 +17,7 @@ * limitations under the License. */ -#include "JavaCommon.h" +#include #include "ui/dialogs/CustomMessageBox.h" #include #include diff --git a/launcher/JavaCommon.h b/launcher/JavaCommon.h index 7232ce3b3..2be9c31ad 100644 --- a/launcher/JavaCommon.h +++ b/launcher/JavaCommon.h @@ -1,3 +1,5 @@ +// launcher/JavaCommon.h +// @meshmc-public: MeshMC/Core/JavaCommon /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/Json.cpp b/launcher/Json.cpp index 733108aa8..a9b9858ca 100644 --- a/launcher/Json.cpp +++ b/launcher/Json.cpp @@ -18,11 +18,11 @@ * limitations under the License. */ -#include "Json.h" +#include #include -#include "FileSystem.h" +#include #include namespace Json diff --git a/launcher/Json.h b/launcher/Json.h index d33710015..44082d6b2 100644 --- a/launcher/Json.h +++ b/launcher/Json.h @@ -1,3 +1,5 @@ +// launcher/Json.h +// @meshmc-public: MeshMC/Core/Json /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 @@ -30,7 +32,7 @@ #include #include -#include "Exception.h" +#include namespace Json { diff --git a/launcher/KonamiCode.cpp b/launcher/KonamiCode.cpp index 54b8d1c13..cf2d7dcad 100644 --- a/launcher/KonamiCode.cpp +++ b/launcher/KonamiCode.cpp @@ -17,7 +17,7 @@ * limitations under the License. */ -#include "KonamiCode.h" +#include #include #include diff --git a/launcher/KonamiCode.h b/launcher/KonamiCode.h index 1cdeebe87..7754fe729 100644 --- a/launcher/KonamiCode.h +++ b/launcher/KonamiCode.h @@ -1,3 +1,5 @@ +// launcher/KonamiCode.h +// @meshmc-public: MeshMC/Core/KonamiCode /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/LaunchController.cpp b/launcher/LaunchController.cpp index 3f3d5fcd9..137b2c847 100644 --- a/launcher/LaunchController.cpp +++ b/launcher/LaunchController.cpp @@ -17,10 +17,10 @@ * limitations under the License. */ -#include "LaunchController.h" +#include #include "minecraft/auth/AccountList.h" -#include "Application.h" -#include "plugin/PluginManager.h" +#include +#include #include "plugin/PluginHooks.h" #include "ui/MainWindow.h" @@ -39,8 +39,8 @@ #include #include -#include "BuildConfig.h" -#include "JavaCommon.h" +#include +#include #include "tasks/Task.h" #include "minecraft/auth/AccountTask.h" #include "launch/steps/CreateBackup.h" diff --git a/launcher/LaunchController.h b/launcher/LaunchController.h index d2340a20f..da104dcdb 100644 --- a/launcher/LaunchController.h +++ b/launcher/LaunchController.h @@ -1,3 +1,5 @@ +// launcher/LaunchController.h +// @meshmc-public: MeshMC/Core/LaunchController /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 @@ -19,7 +21,7 @@ #pragma once #include -#include +#include #include #include "minecraft/launch/MinecraftServerTarget.h" diff --git a/launcher/LoggedProcess.cpp b/launcher/LoggedProcess.cpp index 20aa54eaa..68984af0e 100644 --- a/launcher/LoggedProcess.cpp +++ b/launcher/LoggedProcess.cpp @@ -17,7 +17,7 @@ * limitations under the License. */ -#include "LoggedProcess.h" +#include #include "MessageLevel.h" #include diff --git a/launcher/LoggedProcess.h b/launcher/LoggedProcess.h index 1ee4c8513..ebed208a3 100644 --- a/launcher/LoggedProcess.h +++ b/launcher/LoggedProcess.h @@ -1,3 +1,5 @@ +// launcher/LoggedProcess.h +// @meshmc-public: MeshMC/Core/LoggedProcess /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/Logging.cpp b/launcher/Logging.cpp index 7a5f65e7b..3f7bd5a1a 100644 --- a/launcher/Logging.cpp +++ b/launcher/Logging.cpp @@ -17,7 +17,7 @@ * limitations under the License. */ -#include "Logging.h" +#include #include "MMCStrings.h" diff --git a/launcher/Logging.h b/launcher/Logging.h index 2a9518369..feeb88b67 100644 --- a/launcher/Logging.h +++ b/launcher/Logging.h @@ -1,3 +1,5 @@ +// launcher/Logging.h +// @meshmc-public: MeshMC/Core/Logging /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/MMCZip.cpp b/launcher/MMCZip.cpp index 5df77bdbf..d36b3c742 100644 --- a/launcher/MMCZip.cpp +++ b/launcher/MMCZip.cpp @@ -19,8 +19,8 @@ */ #include "MMCZip.h" -#include "ArchiveOpen.h" -#include "FileSystem.h" +#include +#include #include #include diff --git a/launcher/NullInstance.h b/launcher/NullInstance.h index bc1b9322f..b7bc133ac 100644 --- a/launcher/NullInstance.h +++ b/launcher/NullInstance.h @@ -19,7 +19,7 @@ #pragma once -#include "BaseInstance.h" +#include #include "launch/LaunchTask.h" class NullInstance : public BaseInstance diff --git a/launcher/SkinUtils.cpp b/launcher/SkinUtils.cpp index 8f76bf4c4..ea80e517f 100644 --- a/launcher/SkinUtils.cpp +++ b/launcher/SkinUtils.cpp @@ -20,7 +20,7 @@ #include "SkinUtils.h" #include "net/HttpMetaCache.h" -#include "Application.h" +#include #include #include diff --git a/launcher/VersionProxyModel.cpp b/launcher/VersionProxyModel.cpp index c5dc07d3c..9be4740e1 100644 --- a/launcher/VersionProxyModel.cpp +++ b/launcher/VersionProxyModel.cpp @@ -18,7 +18,7 @@ */ #include "VersionProxyModel.h" -#include "Application.h" +#include #include #include #include diff --git a/launcher/VersionProxyModel.h b/launcher/VersionProxyModel.h index 116522e57..0bccecea0 100644 --- a/launcher/VersionProxyModel.h +++ b/launcher/VersionProxyModel.h @@ -19,9 +19,9 @@ #pragma once #include -#include "BaseVersionList.h" +#include -#include +#include class VersionFilterModel; diff --git a/launcher/archive/ExportToZipTask.cpp b/launcher/archive/ExportToZipTask.cpp index 7791f18b7..fae30dfeb 100644 --- a/launcher/archive/ExportToZipTask.cpp +++ b/launcher/archive/ExportToZipTask.cpp @@ -24,7 +24,7 @@ #include #include -#include "FileSystem.h" +#include #include "MMCZip.h" namespace MMCZip diff --git a/launcher/backup/BackupManager.cpp b/launcher/backup/BackupManager.cpp index 891524b1e..369275c19 100644 --- a/launcher/backup/BackupManager.cpp +++ b/launcher/backup/BackupManager.cpp @@ -18,7 +18,7 @@ */ #include "backup/BackupManager.h" -#include "Logging.h" +#include #include #include @@ -28,7 +28,7 @@ #include #include -#include "FileSystem.h" +#include #include "MMCZip.h" namespace diff --git a/launcher/headers/MMCO/C.h b/launcher/headers/MMCO/C.h new file mode 100644 index 000000000..ecf8c0d84 --- /dev/null +++ b/launcher/headers/MMCO/C.h @@ -0,0 +1,2 @@ +#pragma once +#include "../../plugin/sdk/mmco_c_sdk.h" diff --git a/launcher/headers/MMCO/CXX b/launcher/headers/MMCO/CXX new file mode 100644 index 000000000..1fe5dce11 --- /dev/null +++ b/launcher/headers/MMCO/CXX @@ -0,0 +1,2 @@ +#pragma once +#include "../../plugin/sdk/mmco_cxx_sdk.hpp" diff --git a/launcher/headers/MeshMC/Core/Application b/launcher/headers/MeshMC/Core/Application new file mode 100644 index 000000000..e62cecb41 --- /dev/null +++ b/launcher/headers/MeshMC/Core/Application @@ -0,0 +1,2 @@ +#pragma once +#include "../../../Application.h" diff --git a/launcher/headers/MeshMC/Core/ApplicationMessage b/launcher/headers/MeshMC/Core/ApplicationMessage new file mode 100644 index 000000000..c60bd4b01 --- /dev/null +++ b/launcher/headers/MeshMC/Core/ApplicationMessage @@ -0,0 +1,2 @@ +#pragma once +#include "../../../ApplicationMessage.h" diff --git a/launcher/headers/MeshMC/Core/ArchiveOpen b/launcher/headers/MeshMC/Core/ArchiveOpen new file mode 100644 index 000000000..a451c1238 --- /dev/null +++ b/launcher/headers/MeshMC/Core/ArchiveOpen @@ -0,0 +1,2 @@ +#pragma once +#include "../../../ArchiveOpen.h" diff --git a/launcher/headers/MeshMC/Core/BaseInstaller b/launcher/headers/MeshMC/Core/BaseInstaller new file mode 100644 index 000000000..292b52460 --- /dev/null +++ b/launcher/headers/MeshMC/Core/BaseInstaller @@ -0,0 +1,2 @@ +#pragma once +#include "../../../BaseInstaller.h" diff --git a/launcher/headers/MeshMC/Core/BaseInstance b/launcher/headers/MeshMC/Core/BaseInstance new file mode 100644 index 000000000..4c3c12eb4 --- /dev/null +++ b/launcher/headers/MeshMC/Core/BaseInstance @@ -0,0 +1,2 @@ +#pragma once +#include "../../../BaseInstance.h" diff --git a/launcher/headers/MeshMC/Core/BaseVersion b/launcher/headers/MeshMC/Core/BaseVersion new file mode 100644 index 000000000..dea8abec7 --- /dev/null +++ b/launcher/headers/MeshMC/Core/BaseVersion @@ -0,0 +1,2 @@ +#pragma once +#include "../../../BaseVersion.h" diff --git a/launcher/headers/MeshMC/Core/BaseVersionList b/launcher/headers/MeshMC/Core/BaseVersionList new file mode 100644 index 000000000..de438e11d --- /dev/null +++ b/launcher/headers/MeshMC/Core/BaseVersionList @@ -0,0 +1,2 @@ +#pragma once +#include "../../../BaseVersionList.h" diff --git a/launcher/headers/MeshMC/Core/BuildConfig b/launcher/headers/MeshMC/Core/BuildConfig new file mode 100644 index 000000000..2903ee7ac --- /dev/null +++ b/launcher/headers/MeshMC/Core/BuildConfig @@ -0,0 +1,2 @@ +#pragma once +#include "../../../BuildConfig.h" diff --git a/launcher/headers/MeshMC/Core/Commandline b/launcher/headers/MeshMC/Core/Commandline new file mode 100644 index 000000000..b1a67a2e2 --- /dev/null +++ b/launcher/headers/MeshMC/Core/Commandline @@ -0,0 +1,2 @@ +#pragma once +#include "../../../Commandline.h" diff --git a/launcher/headers/MeshMC/Core/DefaultVariable b/launcher/headers/MeshMC/Core/DefaultVariable new file mode 100644 index 000000000..16c969b44 --- /dev/null +++ b/launcher/headers/MeshMC/Core/DefaultVariable @@ -0,0 +1,2 @@ +#pragma once +#include "../../../DefaultVariable.h" diff --git a/launcher/headers/MeshMC/Core/DesktopServices b/launcher/headers/MeshMC/Core/DesktopServices new file mode 100644 index 000000000..c185c30f1 --- /dev/null +++ b/launcher/headers/MeshMC/Core/DesktopServices @@ -0,0 +1,2 @@ +#pragma once +#include "../../../DesktopServices.h" diff --git a/launcher/headers/MeshMC/Core/Exception b/launcher/headers/MeshMC/Core/Exception new file mode 100644 index 000000000..8aba387fb --- /dev/null +++ b/launcher/headers/MeshMC/Core/Exception @@ -0,0 +1,2 @@ +#pragma once +#include "../../../Exception.h" diff --git a/launcher/headers/MeshMC/Core/ExponentialSeries b/launcher/headers/MeshMC/Core/ExponentialSeries new file mode 100644 index 000000000..8342e5f01 --- /dev/null +++ b/launcher/headers/MeshMC/Core/ExponentialSeries @@ -0,0 +1,2 @@ +#pragma once +#include "../../../ExponentialSeries.h" diff --git a/launcher/headers/MeshMC/Core/FS b/launcher/headers/MeshMC/Core/FS new file mode 100644 index 000000000..82f8da8ee --- /dev/null +++ b/launcher/headers/MeshMC/Core/FS @@ -0,0 +1,2 @@ +#pragma once +#include "../../../FileSystem.h" diff --git a/launcher/headers/MeshMC/Core/FastFileIconProvider b/launcher/headers/MeshMC/Core/FastFileIconProvider new file mode 100644 index 000000000..c74e2b173 --- /dev/null +++ b/launcher/headers/MeshMC/Core/FastFileIconProvider @@ -0,0 +1,2 @@ +#pragma once +#include "../../../FastFileIconProvider.h" diff --git a/launcher/headers/MeshMC/Core/FileIgnoreProxy b/launcher/headers/MeshMC/Core/FileIgnoreProxy new file mode 100644 index 000000000..29dbcedf5 --- /dev/null +++ b/launcher/headers/MeshMC/Core/FileIgnoreProxy @@ -0,0 +1,2 @@ +#pragma once +#include "../../../FileIgnoreProxy.h" diff --git a/launcher/headers/MeshMC/Core/Filter b/launcher/headers/MeshMC/Core/Filter new file mode 100644 index 000000000..982936e5f --- /dev/null +++ b/launcher/headers/MeshMC/Core/Filter @@ -0,0 +1,2 @@ +#pragma once +#include "../../../Filter.h" diff --git a/launcher/headers/MeshMC/Core/GZip b/launcher/headers/MeshMC/Core/GZip new file mode 100644 index 000000000..9038fa2b3 --- /dev/null +++ b/launcher/headers/MeshMC/Core/GZip @@ -0,0 +1,2 @@ +#pragma once +#include "../../../GZip.h" diff --git a/launcher/headers/MeshMC/Core/HoeDown b/launcher/headers/MeshMC/Core/HoeDown new file mode 100644 index 000000000..bd29e22e1 --- /dev/null +++ b/launcher/headers/MeshMC/Core/HoeDown @@ -0,0 +1,2 @@ +#pragma once +#include "../../../HoeDown.h" diff --git a/launcher/headers/MeshMC/Core/InstanceCopyTask b/launcher/headers/MeshMC/Core/InstanceCopyTask new file mode 100644 index 000000000..c3a190883 --- /dev/null +++ b/launcher/headers/MeshMC/Core/InstanceCopyTask @@ -0,0 +1,2 @@ +#pragma once +#include "../../../InstanceCopyTask.h" diff --git a/launcher/headers/MeshMC/Core/InstanceCreationTask b/launcher/headers/MeshMC/Core/InstanceCreationTask new file mode 100644 index 000000000..819e337d0 --- /dev/null +++ b/launcher/headers/MeshMC/Core/InstanceCreationTask @@ -0,0 +1,2 @@ +#pragma once +#include "../../../InstanceCreationTask.h" diff --git a/launcher/headers/MeshMC/Core/InstanceImportTask b/launcher/headers/MeshMC/Core/InstanceImportTask new file mode 100644 index 000000000..3e0332a42 --- /dev/null +++ b/launcher/headers/MeshMC/Core/InstanceImportTask @@ -0,0 +1,2 @@ +#pragma once +#include "../../../InstanceImportTask.h" diff --git a/launcher/headers/MeshMC/Core/InstanceList b/launcher/headers/MeshMC/Core/InstanceList new file mode 100644 index 000000000..81489e437 --- /dev/null +++ b/launcher/headers/MeshMC/Core/InstanceList @@ -0,0 +1,2 @@ +#pragma once +#include "../../../InstanceList.h" diff --git a/launcher/headers/MeshMC/Core/InstancePageProvider b/launcher/headers/MeshMC/Core/InstancePageProvider new file mode 100644 index 000000000..586a05dad --- /dev/null +++ b/launcher/headers/MeshMC/Core/InstancePageProvider @@ -0,0 +1,2 @@ +#pragma once +#include "../../../InstancePageProvider.h" diff --git a/launcher/headers/MeshMC/Core/InstanceTask b/launcher/headers/MeshMC/Core/InstanceTask new file mode 100644 index 000000000..83c611b5c --- /dev/null +++ b/launcher/headers/MeshMC/Core/InstanceTask @@ -0,0 +1,2 @@ +#pragma once +#include "../../../InstanceTask.h" diff --git a/launcher/headers/MeshMC/Core/JavaCommon b/launcher/headers/MeshMC/Core/JavaCommon new file mode 100644 index 000000000..b44889b54 --- /dev/null +++ b/launcher/headers/MeshMC/Core/JavaCommon @@ -0,0 +1,2 @@ +#pragma once +#include "../../../JavaCommon.h" diff --git a/launcher/headers/MeshMC/Core/Json b/launcher/headers/MeshMC/Core/Json new file mode 100644 index 000000000..1c58ec324 --- /dev/null +++ b/launcher/headers/MeshMC/Core/Json @@ -0,0 +1,2 @@ +#pragma once +#include "../../../Json.h" diff --git a/launcher/headers/MeshMC/Core/KonamiCode b/launcher/headers/MeshMC/Core/KonamiCode new file mode 100644 index 000000000..471e48fa7 --- /dev/null +++ b/launcher/headers/MeshMC/Core/KonamiCode @@ -0,0 +1,2 @@ +#pragma once +#include "../../../KonamiCode.h" diff --git a/launcher/headers/MeshMC/Core/LaunchController b/launcher/headers/MeshMC/Core/LaunchController new file mode 100644 index 000000000..9147a20c0 --- /dev/null +++ b/launcher/headers/MeshMC/Core/LaunchController @@ -0,0 +1,2 @@ +#pragma once +#include "../../../LaunchController.h" diff --git a/launcher/headers/MeshMC/Core/LoggedProcess b/launcher/headers/MeshMC/Core/LoggedProcess new file mode 100644 index 000000000..22db2374a --- /dev/null +++ b/launcher/headers/MeshMC/Core/LoggedProcess @@ -0,0 +1,2 @@ +#pragma once +#include "../../../LoggedProcess.h" diff --git a/launcher/headers/MeshMC/Core/Logging b/launcher/headers/MeshMC/Core/Logging new file mode 100644 index 000000000..04d8ccea5 --- /dev/null +++ b/launcher/headers/MeshMC/Core/Logging @@ -0,0 +1,2 @@ +#pragma once +#include "../../../Logging.h" diff --git a/launcher/headers/MeshMC/Plugin/Loader b/launcher/headers/MeshMC/Plugin/Loader new file mode 100644 index 000000000..bd479a691 --- /dev/null +++ b/launcher/headers/MeshMC/Plugin/Loader @@ -0,0 +1,2 @@ +#pragma once +#include "../../../plugin/PluginLoader.h" diff --git a/launcher/headers/MeshMC/Plugin/MMCOFormat b/launcher/headers/MeshMC/Plugin/MMCOFormat new file mode 100644 index 000000000..60a2c51c8 --- /dev/null +++ b/launcher/headers/MeshMC/Plugin/MMCOFormat @@ -0,0 +1,2 @@ +#pragma once +#include "../../../plugin/MMCOFormat.h" diff --git a/launcher/headers/MeshMC/Plugin/Manager b/launcher/headers/MeshMC/Plugin/Manager new file mode 100644 index 000000000..1377f8146 --- /dev/null +++ b/launcher/headers/MeshMC/Plugin/Manager @@ -0,0 +1,2 @@ +#pragma once +#include "../../../plugin/PluginManager.h" diff --git a/launcher/headers/MeshMC/Plugin/Signature b/launcher/headers/MeshMC/Plugin/Signature new file mode 100644 index 000000000..d08db2b5f --- /dev/null +++ b/launcher/headers/MeshMC/Plugin/Signature @@ -0,0 +1,2 @@ +#pragma once +#include "../../../plugin/PluginSignature.h" diff --git a/launcher/icons/IconList.cpp b/launcher/icons/IconList.cpp index d62afd269..0b4582a91 100644 --- a/launcher/icons/IconList.cpp +++ b/launcher/icons/IconList.cpp @@ -19,8 +19,8 @@ */ #include "IconList.h" -#include "Logging.h" -#include +#include +#include #include #include #include diff --git a/launcher/icons/IconUtils.cpp b/launcher/icons/IconUtils.cpp index 9b3794c8f..e0f026e79 100644 --- a/launcher/icons/IconUtils.cpp +++ b/launcher/icons/IconUtils.cpp @@ -18,9 +18,9 @@ */ #include "IconUtils.h" -#include "Logging.h" +#include -#include "FileSystem.h" +#include #include #include diff --git a/launcher/java/JavaChecker.cpp b/launcher/java/JavaChecker.cpp index bf8f0443a..9cf43ce41 100644 --- a/launcher/java/JavaChecker.cpp +++ b/launcher/java/JavaChecker.cpp @@ -18,7 +18,7 @@ */ #include "JavaChecker.h" -#include "Logging.h" +#include #include #include @@ -26,9 +26,9 @@ #include #include "JavaUtils.h" -#include "FileSystem.h" -#include "Commandline.h" -#include "Application.h" +#include +#include +#include JavaChecker::JavaChecker(QObject* parent) : QObject(parent) {} diff --git a/launcher/java/JavaCheckerJob.cpp b/launcher/java/JavaCheckerJob.cpp index 03c3933b9..a929edd90 100644 --- a/launcher/java/JavaCheckerJob.cpp +++ b/launcher/java/JavaCheckerJob.cpp @@ -19,7 +19,7 @@ */ #include "JavaCheckerJob.h" -#include "Logging.h" +#include #include diff --git a/launcher/java/JavaInstall.h b/launcher/java/JavaInstall.h index c198a8e40..bed867110 100644 --- a/launcher/java/JavaInstall.h +++ b/launcher/java/JavaInstall.h @@ -19,7 +19,7 @@ #pragma once -#include "BaseVersion.h" +#include #include "JavaVersion.h" struct JavaInstall : public BaseVersion { diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp index 8aa0e03ad..fe4dffc3a 100644 --- a/launcher/java/JavaInstallList.cpp +++ b/launcher/java/JavaInstallList.cpp @@ -23,7 +23,7 @@ #include -#include "Logging.h" +#include #include "java/JavaInstallList.h" #include "java/JavaCheckerJob.h" #include "java/JavaUtils.h" diff --git a/launcher/java/JavaInstallList.h b/launcher/java/JavaInstallList.h index ee786a725..1dfd9d132 100644 --- a/launcher/java/JavaInstallList.h +++ b/launcher/java/JavaInstallList.h @@ -23,7 +23,7 @@ #include #include -#include "BaseVersionList.h" +#include #include "tasks/Task.h" #include "JavaCheckerJob.h" diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index f1062b9b9..2ec000b42 100644 --- a/launcher/java/JavaUtils.cpp +++ b/launcher/java/JavaUtils.cpp @@ -29,10 +29,10 @@ #include #include -#include "Logging.h" +#include #include "java/JavaUtils.h" #include "java/JavaInstallList.h" -#include "FileSystem.h" +#include #define IBUS "@im=ibus" diff --git a/launcher/java/download/JavaDownloadTask.cpp b/launcher/java/download/JavaDownloadTask.cpp index 1730c1ba8..630ffb77b 100644 --- a/launcher/java/download/JavaDownloadTask.cpp +++ b/launcher/java/download/JavaDownloadTask.cpp @@ -18,7 +18,7 @@ */ #include "JavaDownloadTask.h" -#include "Logging.h" +#include #include #include @@ -26,9 +26,9 @@ #include #include -#include "Application.h" -#include "FileSystem.h" -#include "Json.h" +#include +#include +#include #include "net/Download.h" #include "net/ChecksumValidator.h" #include "MMCZip.h" diff --git a/launcher/launch/LaunchTask.h b/launcher/launch/LaunchTask.h index aef02eb4f..54d6a9e12 100644 --- a/launcher/launch/LaunchTask.h +++ b/launcher/launch/LaunchTask.h @@ -22,9 +22,9 @@ #include #include #include "LogModel.h" -#include "BaseInstance.h" +#include #include "MessageLevel.h" -#include "LoggedProcess.h" +#include #include "LaunchStep.h" class LaunchTask : public Task diff --git a/launcher/launch/steps/CheckJava.cpp b/launcher/launch/steps/CheckJava.cpp index 1496e69eb..c0a8d2367 100644 --- a/launcher/launch/steps/CheckJava.cpp +++ b/launcher/launch/steps/CheckJava.cpp @@ -20,7 +20,7 @@ #include "CheckJava.h" #include -#include +#include #include #include #include "Sys.h" diff --git a/launcher/launch/steps/CheckJava.h b/launcher/launch/steps/CheckJava.h index 946c7d7c4..c506c52c0 100644 --- a/launcher/launch/steps/CheckJava.h +++ b/launcher/launch/steps/CheckJava.h @@ -21,7 +21,7 @@ #pragma once #include -#include +#include #include class CheckJava : public LaunchStep diff --git a/launcher/launch/steps/CreateBackup.cpp b/launcher/launch/steps/CreateBackup.cpp index fe707fdcc..b2d3074b5 100644 --- a/launcher/launch/steps/CreateBackup.cpp +++ b/launcher/launch/steps/CreateBackup.cpp @@ -19,7 +19,7 @@ #include "CreateBackup.h" -#include "BaseInstance.h" +#include #include "launch/LaunchTask.h" void CreateBackup::executeTask() diff --git a/launcher/launch/steps/PostLaunchCommand.h b/launcher/launch/steps/PostLaunchCommand.h index 8b5073cfe..bf701401f 100644 --- a/launcher/launch/steps/PostLaunchCommand.h +++ b/launcher/launch/steps/PostLaunchCommand.h @@ -21,7 +21,7 @@ #pragma once #include -#include +#include class PostLaunchCommand : public LaunchStep { diff --git a/launcher/launch/steps/PreLaunchCommand.h b/launcher/launch/steps/PreLaunchCommand.h index 9488e2a82..7428070c7 100644 --- a/launcher/launch/steps/PreLaunchCommand.h +++ b/launcher/launch/steps/PreLaunchCommand.h @@ -21,7 +21,7 @@ #pragma once #include "launch/LaunchStep.h" -#include "LoggedProcess.h" +#include class PreLaunchCommand : public LaunchStep { diff --git a/launcher/launch/steps/TextPrint.h b/launcher/launch/steps/TextPrint.h index b2efcd654..68c53be06 100644 --- a/launcher/launch/steps/TextPrint.h +++ b/launcher/launch/steps/TextPrint.h @@ -21,7 +21,7 @@ #pragma once #include -#include +#include #include /* diff --git a/launcher/launch/steps/Update.h b/launcher/launch/steps/Update.h index 30f761053..2fd4ef90a 100644 --- a/launcher/launch/steps/Update.h +++ b/launcher/launch/steps/Update.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/launcher/main.cpp b/launcher/main.cpp index f47395404..ff7f741cd 100644 --- a/launcher/main.cpp +++ b/launcher/main.cpp @@ -17,9 +17,9 @@ * limitations under the License. */ -#include "Application.h" -#include "BuildConfig.h" -#include "FileSystem.h" +#include +#include +#include #include #include diff --git a/launcher/meta/BaseEntity.cpp b/launcher/meta/BaseEntity.cpp index 644cd31a6..4d27b9f78 100644 --- a/launcher/meta/BaseEntity.cpp +++ b/launcher/meta/BaseEntity.cpp @@ -19,15 +19,15 @@ */ #include "BaseEntity.h" -#include "Logging.h" +#include #include "net/Download.h" #include "net/HttpMetaCache.h" #include "net/NetJob.h" -#include "Json.h" +#include -#include "BuildConfig.h" -#include "Application.h" +#include +#include class ParsingValidator : public Net::Validator { diff --git a/launcher/meta/JsonFormat.cpp b/launcher/meta/JsonFormat.cpp index 880aa220f..4418c6cbc 100644 --- a/launcher/meta/JsonFormat.cpp +++ b/launcher/meta/JsonFormat.cpp @@ -22,7 +22,7 @@ // FIXME: remove this from here... somehow #include "minecraft/OneSixVersionFormat.h" -#include "Json.h" +#include #include "Index.h" #include "Version.h" diff --git a/launcher/meta/JsonFormat.h b/launcher/meta/JsonFormat.h index bb6833770..9dc62d253 100644 --- a/launcher/meta/JsonFormat.h +++ b/launcher/meta/JsonFormat.h @@ -23,7 +23,7 @@ #include #include -#include "Exception.h" +#include #include "meta/BaseEntity.h" #include diff --git a/launcher/meta/Version.h b/launcher/meta/Version.h index f62f21a67..281d6926b 100644 --- a/launcher/meta/Version.h +++ b/launcher/meta/Version.h @@ -20,7 +20,7 @@ #pragma once -#include "BaseVersion.h" +#include #include #include diff --git a/launcher/meta/VersionList.h b/launcher/meta/VersionList.h index 9d3a91883..428d7cc2c 100644 --- a/launcher/meta/VersionList.h +++ b/launcher/meta/VersionList.h @@ -21,7 +21,7 @@ #pragma once #include "BaseEntity.h" -#include "BaseVersionList.h" +#include #include #include diff --git a/launcher/minecraft/AssetsUtils.cpp b/launcher/minecraft/AssetsUtils.cpp index cb21deebc..ef387315c 100644 --- a/launcher/minecraft/AssetsUtils.cpp +++ b/launcher/minecraft/AssetsUtils.cpp @@ -29,12 +29,12 @@ #include #include "AssetsUtils.h" -#include "FileSystem.h" +#include #include "net/Download.h" #include "net/ChecksumValidator.h" -#include "BuildConfig.h" +#include -#include "Application.h" +#include namespace { diff --git a/launcher/minecraft/Component.cpp b/launcher/minecraft/Component.cpp index 424e81ebd..dfe258b55 100644 --- a/launcher/minecraft/Component.cpp +++ b/launcher/minecraft/Component.cpp @@ -26,9 +26,9 @@ #include "meta/Version.h" #include "VersionFile.h" #include "minecraft/PackProfile.h" -#include "FileSystem.h" +#include #include "OneSixVersionFormat.h" -#include "Application.h" +#include #include diff --git a/launcher/minecraft/ComponentUpdateTask.cpp b/launcher/minecraft/ComponentUpdateTask.cpp index c1da1d087..9b3072785 100644 --- a/launcher/minecraft/ComponentUpdateTask.cpp +++ b/launcher/minecraft/ComponentUpdateTask.cpp @@ -31,7 +31,7 @@ #include "net/Mode.h" #include "OneSixVersionFormat.h" -#include "Application.h" +#include /* * This is responsible for loading the components of a component list AND diff --git a/launcher/minecraft/GradleSpecifier.h b/launcher/minecraft/GradleSpecifier.h index e55b5da71..1f1304f50 100644 --- a/launcher/minecraft/GradleSpecifier.h +++ b/launcher/minecraft/GradleSpecifier.h @@ -22,7 +22,7 @@ #include #include #include -#include "DefaultVariable.h" +#include struct GradleSpecifier { GradleSpecifier() diff --git a/launcher/minecraft/Library.cpp b/launcher/minecraft/Library.cpp index d542a6cae..36991af57 100644 --- a/launcher/minecraft/Library.cpp +++ b/launcher/minecraft/Library.cpp @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include void Library::getApplicableFiles(OpSys system, QStringList& jar, QStringList& native, QStringList& native32, diff --git a/launcher/minecraft/Library_test.cpp b/launcher/minecraft/Library_test.cpp index 264204eb6..8cf95c285 100644 --- a/launcher/minecraft/Library_test.cpp +++ b/launcher/minecraft/Library_test.cpp @@ -24,7 +24,7 @@ #include "minecraft/OneSixVersionFormat.h" #include "minecraft/Library.h" #include "net/HttpMetaCache.h" -#include "FileSystem.h" +#include class LibraryTest : public QObject { diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index f4317e22e..45828e893 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -23,13 +23,13 @@ #include "minecraft/launch/PrintInstanceInfo.h" #include "settings/Setting.h" #include "settings/SettingsObject.h" -#include "Application.h" +#include #include #include "MMCStrings.h" #include "pathmatcher/RegexpMatcher.h" #include "pathmatcher/MultiMatcher.h" -#include "FileSystem.h" +#include #include "java/JavaVersion.h" #include "MMCTime.h" diff --git a/launcher/minecraft/MinecraftInstance.h b/launcher/minecraft/MinecraftInstance.h index 2f2f80931..791c4fdb3 100644 --- a/launcher/minecraft/MinecraftInstance.h +++ b/launcher/minecraft/MinecraftInstance.h @@ -18,7 +18,7 @@ */ #pragma once -#include "BaseInstance.h" +#include #include #include "minecraft/mod/Mod.h" #include diff --git a/launcher/minecraft/MinecraftUpdate.cpp b/launcher/minecraft/MinecraftUpdate.cpp index 36315c8ae..a4491ed0e 100644 --- a/launcher/minecraft/MinecraftUpdate.cpp +++ b/launcher/minecraft/MinecraftUpdate.cpp @@ -26,10 +26,10 @@ #include #include -#include "BaseInstance.h" +#include #include "minecraft/PackProfile.h" #include "minecraft/Library.h" -#include +#include #include "update/FoldersTask.h" #include "update/LibrariesTask.h" diff --git a/launcher/minecraft/MojangVersionFormat.cpp b/launcher/minecraft/MojangVersionFormat.cpp index 35bacf1a7..15e4c7bca 100644 --- a/launcher/minecraft/MojangVersionFormat.cpp +++ b/launcher/minecraft/MojangVersionFormat.cpp @@ -21,10 +21,10 @@ #include "OneSixVersionFormat.h" #include "MojangDownloadInfo.h" -#include "Json.h" +#include using namespace Json; #include "ParseUtils.h" -#include +#include static const int CURRENT_MINIMUM_MESHMC_VERSION = 18; diff --git a/launcher/minecraft/OneSixVersionFormat.cpp b/launcher/minecraft/OneSixVersionFormat.cpp index 4e907a345..fc3413b9d 100644 --- a/launcher/minecraft/OneSixVersionFormat.cpp +++ b/launcher/minecraft/OneSixVersionFormat.cpp @@ -18,7 +18,7 @@ */ #include "OneSixVersionFormat.h" -#include +#include #include "minecraft/ParseUtils.h" #include diff --git a/launcher/minecraft/PackProfile.cpp b/launcher/minecraft/PackProfile.cpp index 98bcfe4ba..a81f73185 100644 --- a/launcher/minecraft/PackProfile.cpp +++ b/launcher/minecraft/PackProfile.cpp @@ -29,18 +29,18 @@ #include #include -#include "Exception.h" +#include #include "minecraft/OneSixVersionFormat.h" -#include "FileSystem.h" +#include #include "meta/Index.h" #include "minecraft/MinecraftInstance.h" -#include "Json.h" +#include #include "PackProfile.h" #include "PackProfile_p.h" #include "ComponentUpdateTask.h" -#include "Application.h" +#include PackProfile::PackProfile(MinecraftInstance* instance) : QAbstractListModel() { diff --git a/launcher/minecraft/PackProfile.h b/launcher/minecraft/PackProfile.h index 7505d12ba..40e74f128 100644 --- a/launcher/minecraft/PackProfile.h +++ b/launcher/minecraft/PackProfile.h @@ -30,7 +30,7 @@ #include "LaunchProfile.h" #include "Component.h" #include "ProfileUtils.h" -#include "BaseVersion.h" +#include #include "MojangDownloadInfo.h" #include "net/Mode.h" diff --git a/launcher/minecraft/ProfileUtils.cpp b/launcher/minecraft/ProfileUtils.cpp index e26a0e078..0fb56454c 100644 --- a/launcher/minecraft/ProfileUtils.cpp +++ b/launcher/minecraft/ProfileUtils.cpp @@ -20,7 +20,7 @@ #include "ProfileUtils.h" #include "minecraft/VersionFilterData.h" #include "minecraft/OneSixVersionFormat.h" -#include "Json.h" +#include #include #include diff --git a/launcher/minecraft/ShortcutUtils.cpp b/launcher/minecraft/ShortcutUtils.cpp index fee9470df..1e0c8400a 100644 --- a/launcher/minecraft/ShortcutUtils.cpp +++ b/launcher/minecraft/ShortcutUtils.cpp @@ -28,11 +28,11 @@ #include #include -#include "Application.h" -#include "BaseInstance.h" -#include "BuildConfig.h" -#include "DesktopServices.h" -#include "FileSystem.h" +#include +#include +#include +#include +#include #include "icons/IconList.h" namespace ShortcutUtils diff --git a/launcher/minecraft/ShortcutUtils.h b/launcher/minecraft/ShortcutUtils.h index d87f7b419..3db60dec0 100644 --- a/launcher/minecraft/ShortcutUtils.h +++ b/launcher/minecraft/ShortcutUtils.h @@ -24,7 +24,7 @@ // For ShortcutTarget, which the instance stores alongside the path so // that it can clean its own shortcuts up. -#include "BaseInstance.h" +#include class QWidget; diff --git a/launcher/minecraft/World.cpp b/launcher/minecraft/World.cpp index 028cf5f0b..512474458 100644 --- a/launcher/minecraft/World.cpp +++ b/launcher/minecraft/World.cpp @@ -24,9 +24,9 @@ #include #include "World.h" -#include "GZip.h" +#include #include -#include +#include #include #include #include diff --git a/launcher/minecraft/WorldList.cpp b/launcher/minecraft/WorldList.cpp index 51446fa08..0be4a7473 100644 --- a/launcher/minecraft/WorldList.cpp +++ b/launcher/minecraft/WorldList.cpp @@ -19,7 +19,7 @@ */ #include "WorldList.h" -#include +#include #include #include #include diff --git a/launcher/minecraft/World_test.cpp b/launcher/minecraft/World_test.cpp index 16a9fe59b..5352cc7d7 100644 --- a/launcher/minecraft/World_test.cpp +++ b/launcher/minecraft/World_test.cpp @@ -23,7 +23,7 @@ #include #include -#include "GZip.h" +#include #include "minecraft/World.h" /* diff --git a/launcher/minecraft/auth/AccountList.cpp b/launcher/minecraft/auth/AccountList.cpp index 57649463b..75824339c 100644 --- a/launcher/minecraft/auth/AccountList.cpp +++ b/launcher/minecraft/auth/AccountList.cpp @@ -34,12 +34,12 @@ #include -#include +#include #include #include -#include "Logging.h" +#include enum AccountListVersion { MojangOnly = 2, MojangMSA = 3 }; diff --git a/launcher/minecraft/auth/AuthRequest.cpp b/launcher/minecraft/auth/AuthRequest.cpp index 3d2d9e3a8..a480a56d4 100644 --- a/launcher/minecraft/auth/AuthRequest.cpp +++ b/launcher/minecraft/auth/AuthRequest.cpp @@ -24,10 +24,10 @@ #include #include -#include "Application.h" +#include #include "AuthRequest.h" #include "plugin/PluginHooks.h" -#include "plugin/PluginManager.h" +#include #include "katabasis/Globals.h" namespace diff --git a/launcher/minecraft/auth/Parsers.cpp b/launcher/minecraft/auth/Parsers.cpp index 6dbe98ea8..738c5d530 100644 --- a/launcher/minecraft/auth/Parsers.cpp +++ b/launcher/minecraft/auth/Parsers.cpp @@ -23,7 +23,7 @@ #include #include -#include "Logging.h" +#include namespace Parsers { diff --git a/launcher/minecraft/auth/flows/AuthFlow.cpp b/launcher/minecraft/auth/flows/AuthFlow.cpp index aa493cf5c..e78524966 100644 --- a/launcher/minecraft/auth/flows/AuthFlow.cpp +++ b/launcher/minecraft/auth/flows/AuthFlow.cpp @@ -21,7 +21,7 @@ #include #include #include -#include "Logging.h" +#include #include "AuthFlow.h" #include "katabasis/Globals.h" diff --git a/launcher/minecraft/auth/steps/EntitlementsStep.cpp b/launcher/minecraft/auth/steps/EntitlementsStep.cpp index 277927e12..963daf2c6 100644 --- a/launcher/minecraft/auth/steps/EntitlementsStep.cpp +++ b/launcher/minecraft/auth/steps/EntitlementsStep.cpp @@ -22,7 +22,7 @@ #include #include -#include "Logging.h" +#include #include "minecraft/auth/AuthRequest.h" #include "minecraft/auth/Parsers.h" diff --git a/launcher/minecraft/auth/steps/MSAStep.cpp b/launcher/minecraft/auth/steps/MSAStep.cpp index 4eb4640f5..9c81a127d 100644 --- a/launcher/minecraft/auth/steps/MSAStep.cpp +++ b/launcher/minecraft/auth/steps/MSAStep.cpp @@ -25,7 +25,7 @@ #include "minecraft/auth/AuthRequest.h" #include "minecraft/auth/Parsers.h" -#include "Application.h" +#include MSAStep::MSAStep(AccountData* data, Action action) : AuthStep(data), m_action(action) diff --git a/launcher/minecraft/auth/steps/MeshMCLoginStep.cpp b/launcher/minecraft/auth/steps/MeshMCLoginStep.cpp index 73e730959..d4a0c86c7 100644 --- a/launcher/minecraft/auth/steps/MeshMCLoginStep.cpp +++ b/launcher/minecraft/auth/steps/MeshMCLoginStep.cpp @@ -21,7 +21,7 @@ #include -#include "Logging.h" +#include #include "minecraft/auth/AuthRequest.h" #include "minecraft/auth/Parsers.h" diff --git a/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp b/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp index 79e7993d9..fc3bd951c 100644 --- a/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp +++ b/launcher/minecraft/auth/steps/MinecraftProfileStep.cpp @@ -21,7 +21,7 @@ #include -#include "Logging.h" +#include #include "minecraft/auth/AuthRequest.h" #include "minecraft/auth/Parsers.h" diff --git a/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp b/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp index fe1ac8386..45ca4f00b 100644 --- a/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp +++ b/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp @@ -23,7 +23,7 @@ #include #include -#include "Logging.h" +#include #include "minecraft/auth/AuthRequest.h" #include "minecraft/auth/Parsers.h" diff --git a/launcher/minecraft/auth/steps/XboxProfileStep.cpp b/launcher/minecraft/auth/steps/XboxProfileStep.cpp index 7528c602c..20614aadb 100644 --- a/launcher/minecraft/auth/steps/XboxProfileStep.cpp +++ b/launcher/minecraft/auth/steps/XboxProfileStep.cpp @@ -22,7 +22,7 @@ #include #include -#include "Logging.h" +#include #include "minecraft/auth/AuthRequest.h" #include "minecraft/auth/Parsers.h" diff --git a/launcher/minecraft/auth/steps/XboxUserStep.cpp b/launcher/minecraft/auth/steps/XboxUserStep.cpp index 65b3769bd..8b3c1e97e 100644 --- a/launcher/minecraft/auth/steps/XboxUserStep.cpp +++ b/launcher/minecraft/auth/steps/XboxUserStep.cpp @@ -21,7 +21,7 @@ #include -#include "Logging.h" +#include #include "minecraft/auth/AuthRequest.h" #include "minecraft/auth/Parsers.h" diff --git a/launcher/minecraft/gameoptions/GameOptions.cpp b/launcher/minecraft/gameoptions/GameOptions.cpp index 2d30aa25c..4be234947 100644 --- a/launcher/minecraft/gameoptions/GameOptions.cpp +++ b/launcher/minecraft/gameoptions/GameOptions.cpp @@ -18,8 +18,8 @@ */ #include "GameOptions.h" -#include "FileSystem.h" -#include "Logging.h" +#include +#include #include #include diff --git a/launcher/minecraft/launch/ClaimAccount.cpp b/launcher/minecraft/launch/ClaimAccount.cpp index 47945ed9f..8691f1e46 100644 --- a/launcher/minecraft/launch/ClaimAccount.cpp +++ b/launcher/minecraft/launch/ClaimAccount.cpp @@ -20,7 +20,7 @@ #include "ClaimAccount.h" #include -#include "Application.h" +#include #include "minecraft/auth/AccountList.h" ClaimAccount::ClaimAccount(LaunchTask* parent, AuthSessionPtr session) diff --git a/launcher/minecraft/launch/CreateGameFolders.cpp b/launcher/minecraft/launch/CreateGameFolders.cpp index 51e4c566a..5ad063fb3 100644 --- a/launcher/minecraft/launch/CreateGameFolders.cpp +++ b/launcher/minecraft/launch/CreateGameFolders.cpp @@ -20,7 +20,7 @@ #include "CreateGameFolders.h" #include "minecraft/MinecraftInstance.h" #include "launch/LaunchTask.h" -#include "FileSystem.h" +#include CreateGameFolders::CreateGameFolders(LaunchTask* parent) : LaunchStep(parent) {} diff --git a/launcher/minecraft/launch/CreateGameFolders.h b/launcher/minecraft/launch/CreateGameFolders.h index 4a2318407..b7437e8cf 100644 --- a/launcher/minecraft/launch/CreateGameFolders.h +++ b/launcher/minecraft/launch/CreateGameFolders.h @@ -21,7 +21,7 @@ #pragma once #include -#include +#include #include // Create the main .minecraft for the instance and any other necessary folders diff --git a/launcher/minecraft/launch/DirectJavaLaunch.cpp b/launcher/minecraft/launch/DirectJavaLaunch.cpp index 042ce1367..1ed3ba6aa 100644 --- a/launcher/minecraft/launch/DirectJavaLaunch.cpp +++ b/launcher/minecraft/launch/DirectJavaLaunch.cpp @@ -21,8 +21,8 @@ #include "DirectJavaLaunch.h" #include #include -#include -#include +#include +#include #include DirectJavaLaunch::DirectJavaLaunch(LaunchTask* parent) : LaunchStep(parent) diff --git a/launcher/minecraft/launch/DirectJavaLaunch.h b/launcher/minecraft/launch/DirectJavaLaunch.h index e2963176b..b4e3c07ba 100644 --- a/launcher/minecraft/launch/DirectJavaLaunch.h +++ b/launcher/minecraft/launch/DirectJavaLaunch.h @@ -21,7 +21,7 @@ #pragma once #include -#include +#include #include #include "MinecraftServerTarget.h" diff --git a/launcher/minecraft/launch/ExtractNatives.cpp b/launcher/minecraft/launch/ExtractNatives.cpp index 67a9712f5..d5db8f17c 100644 --- a/launcher/minecraft/launch/ExtractNatives.cpp +++ b/launcher/minecraft/launch/ExtractNatives.cpp @@ -23,7 +23,7 @@ #include #include "MMCZip.h" -#include "FileSystem.h" +#include #include #ifdef major diff --git a/launcher/minecraft/launch/MeshMCPartLaunch.cpp b/launcher/minecraft/launch/MeshMCPartLaunch.cpp index b73e44d44..82d79a9ca 100644 --- a/launcher/minecraft/launch/MeshMCPartLaunch.cpp +++ b/launcher/minecraft/launch/MeshMCPartLaunch.cpp @@ -25,9 +25,9 @@ #include "launch/LaunchTask.h" #include "minecraft/MinecraftInstance.h" -#include "FileSystem.h" -#include "Commandline.h" -#include "Application.h" +#include +#include +#include MeshMCPartLaunch::MeshMCPartLaunch(LaunchTask* parent) : LaunchStep(parent) { diff --git a/launcher/minecraft/launch/MeshMCPartLaunch.h b/launcher/minecraft/launch/MeshMCPartLaunch.h index c68f2e6e0..8326df6bd 100644 --- a/launcher/minecraft/launch/MeshMCPartLaunch.h +++ b/launcher/minecraft/launch/MeshMCPartLaunch.h @@ -21,7 +21,7 @@ #pragma once #include -#include +#include #include #include "MinecraftServerTarget.h" diff --git a/launcher/minecraft/launch/ModMinecraftJar.cpp b/launcher/minecraft/launch/ModMinecraftJar.cpp index 9ebb82deb..5e2353d23 100644 --- a/launcher/minecraft/launch/ModMinecraftJar.cpp +++ b/launcher/minecraft/launch/ModMinecraftJar.cpp @@ -22,7 +22,7 @@ #include "launch/LaunchTask.h" #include "MMCZip.h" #include "minecraft/OpSys.h" -#include "FileSystem.h" +#include #include "minecraft/MinecraftInstance.h" #include "minecraft/PackProfile.h" diff --git a/launcher/minecraft/launch/ScanModFolders.cpp b/launcher/minecraft/launch/ScanModFolders.cpp index 9ca212ca0..80f547252 100644 --- a/launcher/minecraft/launch/ScanModFolders.cpp +++ b/launcher/minecraft/launch/ScanModFolders.cpp @@ -22,7 +22,7 @@ #include "launch/LaunchTask.h" #include "MMCZip.h" #include "minecraft/OpSys.h" -#include "FileSystem.h" +#include #include "minecraft/MinecraftInstance.h" #include "minecraft/mod/ModFolderModel.h" diff --git a/launcher/minecraft/launch/VerifyJavaInstall.cpp b/launcher/minecraft/launch/VerifyJavaInstall.cpp index fefa49850..444a724cd 100644 --- a/launcher/minecraft/launch/VerifyJavaInstall.cpp +++ b/launcher/minecraft/launch/VerifyJavaInstall.cpp @@ -33,13 +33,13 @@ #include #include -#include "Application.h" -#include "FileSystem.h" -#include "Json.h" +#include +#include +#include #include "java/JavaUtils.h" #ifndef MeshMC_DISABLE_JAVA_DOWNLOADER -#include "BuildConfig.h" +#include #include #include "net/Download.h" #endif diff --git a/launcher/minecraft/legacy/LegacyInstance.cpp b/launcher/minecraft/legacy/LegacyInstance.cpp index f08575ad7..2b633da6a 100644 --- a/launcher/minecraft/legacy/LegacyInstance.cpp +++ b/launcher/minecraft/legacy/LegacyInstance.cpp @@ -28,7 +28,7 @@ #include "minecraft/legacy/LegacyModList.h" #include "minecraft/WorldList.h" #include -#include +#include LegacyInstance::LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, diff --git a/launcher/minecraft/legacy/LegacyInstance.h b/launcher/minecraft/legacy/LegacyInstance.h index b51bb54ee..0007d0257 100644 --- a/launcher/minecraft/legacy/LegacyInstance.h +++ b/launcher/minecraft/legacy/LegacyInstance.h @@ -20,7 +20,7 @@ #pragma once -#include "BaseInstance.h" +#include #include "launch/LaunchTask.h" class ModFolderModel; diff --git a/launcher/minecraft/legacy/LegacyModList.cpp b/launcher/minecraft/legacy/LegacyModList.cpp index c2c2a8283..7275b5447 100644 --- a/launcher/minecraft/legacy/LegacyModList.cpp +++ b/launcher/minecraft/legacy/LegacyModList.cpp @@ -19,7 +19,7 @@ */ #include "LegacyModList.h" -#include +#include #include #include diff --git a/launcher/minecraft/legacy/LegacyUpgradeTask.cpp b/launcher/minecraft/legacy/LegacyUpgradeTask.cpp index 40676c2fa..94366d274 100644 --- a/launcher/minecraft/legacy/LegacyUpgradeTask.cpp +++ b/launcher/minecraft/legacy/LegacyUpgradeTask.cpp @@ -19,7 +19,7 @@ #include "LegacyUpgradeTask.h" #include "settings/INISettingsObject.h" -#include "FileSystem.h" +#include #include "NullInstance.h" #include "pathmatcher/RegexpMatcher.h" #include diff --git a/launcher/minecraft/legacy/LegacyUpgradeTask.h b/launcher/minecraft/legacy/LegacyUpgradeTask.h index be12b9d9d..74f9f7264 100644 --- a/launcher/minecraft/legacy/LegacyUpgradeTask.h +++ b/launcher/minecraft/legacy/LegacyUpgradeTask.h @@ -19,14 +19,14 @@ #pragma once -#include "InstanceTask.h" +#include #include "net/NetJob.h" #include #include #include #include "settings/SettingsObject.h" -#include "BaseVersion.h" -#include "BaseInstance.h" +#include +#include class LegacyUpgradeTask : public InstanceTask { diff --git a/launcher/minecraft/mod/LocalModParseTask.cpp b/launcher/minecraft/mod/LocalModParseTask.cpp index c0b2bf007..d32e7971e 100644 --- a/launcher/minecraft/mod/LocalModParseTask.cpp +++ b/launcher/minecraft/mod/LocalModParseTask.cpp @@ -28,7 +28,7 @@ #include "MMCZip.h" #include "settings/INIFile.h" -#include "FileSystem.h" +#include namespace { diff --git a/launcher/minecraft/mod/Mod.cpp b/launcher/minecraft/mod/Mod.cpp index a8394bd5f..c89758c2e 100644 --- a/launcher/minecraft/mod/Mod.cpp +++ b/launcher/minecraft/mod/Mod.cpp @@ -23,7 +23,7 @@ #include "Mod.h" #include -#include +#include namespace { diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp index 162d1ad56..30b6e1f5f 100644 --- a/launcher/minecraft/mod/ModFolderModel.cpp +++ b/launcher/minecraft/mod/ModFolderModel.cpp @@ -19,7 +19,7 @@ */ #include "ModFolderModel.h" -#include +#include #include #include #include diff --git a/launcher/minecraft/mod/ModFolderModel_test.cpp b/launcher/minecraft/mod/ModFolderModel_test.cpp index 7a41525e0..b9d77e344 100644 --- a/launcher/minecraft/mod/ModFolderModel_test.cpp +++ b/launcher/minecraft/mod/ModFolderModel_test.cpp @@ -21,7 +21,7 @@ #include #include "TestUtil.h" -#include "FileSystem.h" +#include #include "minecraft/mod/ModFolderModel.h" class ModFolderModelTest : public QObject diff --git a/launcher/minecraft/mod/ModMetadataIndex.cpp b/launcher/minecraft/mod/ModMetadataIndex.cpp index 74b921f53..d68c40f00 100644 --- a/launcher/minecraft/mod/ModMetadataIndex.cpp +++ b/launcher/minecraft/mod/ModMetadataIndex.cpp @@ -28,7 +28,7 @@ #include #include -#include "FileSystem.h" +#include #include "PackwizSidecar.h" ModMetadataIndex::ModMetadataIndex(const QDir& folder) diff --git a/launcher/minecraft/mod/PackLayout.cpp b/launcher/minecraft/mod/PackLayout.cpp index 4312cef28..43b4ccbae 100644 --- a/launcher/minecraft/mod/PackLayout.cpp +++ b/launcher/minecraft/mod/PackLayout.cpp @@ -24,7 +24,7 @@ #include #include -#include "FileSystem.h" +#include #include "MMCZip.h" namespace diff --git a/launcher/minecraft/services/CapeChange.cpp b/launcher/minecraft/services/CapeChange.cpp index 650190470..57d32366f 100644 --- a/launcher/minecraft/services/CapeChange.cpp +++ b/launcher/minecraft/services/CapeChange.cpp @@ -22,7 +22,7 @@ #include #include -#include "Application.h" +#include CapeChange::CapeChange(QObject* parent, QString token, QString cape) : Task(parent), m_capeId(cape), m_token(token) diff --git a/launcher/minecraft/services/SkinDelete.cpp b/launcher/minecraft/services/SkinDelete.cpp index 7c5a4c561..99da1e351 100644 --- a/launcher/minecraft/services/SkinDelete.cpp +++ b/launcher/minecraft/services/SkinDelete.cpp @@ -22,7 +22,7 @@ #include #include -#include "Application.h" +#include SkinDelete::SkinDelete(QObject* parent, QString token) : Task(parent), m_token(token) diff --git a/launcher/minecraft/services/SkinUpload.cpp b/launcher/minecraft/services/SkinUpload.cpp index af52e0e73..92a4cc814 100644 --- a/launcher/minecraft/services/SkinUpload.cpp +++ b/launcher/minecraft/services/SkinUpload.cpp @@ -22,7 +22,7 @@ #include #include -#include "Application.h" +#include QByteArray getVariant(SkinUpload::Model model) { diff --git a/launcher/minecraft/skins/ProfileSkinImport.cpp b/launcher/minecraft/skins/ProfileSkinImport.cpp index 755bedc6b..783e5cde6 100644 --- a/launcher/minecraft/skins/ProfileSkinImport.cpp +++ b/launcher/minecraft/skins/ProfileSkinImport.cpp @@ -25,7 +25,7 @@ #include #include -#include "Application.h" +#include #include "minecraft/auth/AccountData.h" #include "minecraft/auth/Parsers.h" #include "net/Download.h" diff --git a/launcher/minecraft/skins/SkinLibrary.cpp b/launcher/minecraft/skins/SkinLibrary.cpp index 27d74be6d..c6e494f44 100644 --- a/launcher/minecraft/skins/SkinLibrary.cpp +++ b/launcher/minecraft/skins/SkinLibrary.cpp @@ -31,8 +31,8 @@ #include -#include "FileSystem.h" -#include "Json.h" +#include +#include namespace { diff --git a/launcher/minecraft/update/AssetUpdateTask.cpp b/launcher/minecraft/update/AssetUpdateTask.cpp index 7ee01873f..d85cdc881 100644 --- a/launcher/minecraft/update/AssetUpdateTask.cpp +++ b/launcher/minecraft/update/AssetUpdateTask.cpp @@ -24,7 +24,7 @@ #include "net/ChecksumValidator.h" #include "minecraft/AssetsUtils.h" -#include "Application.h" +#include AssetUpdateTask::AssetUpdateTask(MinecraftInstance* inst) { diff --git a/launcher/minecraft/update/FMLLibrariesTask.cpp b/launcher/minecraft/update/FMLLibrariesTask.cpp index 144a4546a..a4b980b2d 100644 --- a/launcher/minecraft/update/FMLLibrariesTask.cpp +++ b/launcher/minecraft/update/FMLLibrariesTask.cpp @@ -19,13 +19,13 @@ #include "FMLLibrariesTask.h" -#include "FileSystem.h" +#include #include "minecraft/VersionFilterData.h" #include "minecraft/MinecraftInstance.h" #include "minecraft/PackProfile.h" -#include "BuildConfig.h" -#include "Application.h" +#include +#include FMLLibrariesTask::FMLLibrariesTask(MinecraftInstance* inst) { diff --git a/launcher/minecraft/update/LibrariesTask.cpp b/launcher/minecraft/update/LibrariesTask.cpp index d8ec28521..bc7585fc2 100644 --- a/launcher/minecraft/update/LibrariesTask.cpp +++ b/launcher/minecraft/update/LibrariesTask.cpp @@ -22,7 +22,7 @@ #include "minecraft/MinecraftInstance.h" #include "minecraft/PackProfile.h" -#include "Application.h" +#include LibrariesTask::LibrariesTask(MinecraftInstance* inst) { diff --git a/launcher/modplatform/ContentDownloadTask.cpp b/launcher/modplatform/ContentDownloadTask.cpp index 119257cf7..e5a58b64a 100644 --- a/launcher/modplatform/ContentDownloadTask.cpp +++ b/launcher/modplatform/ContentDownloadTask.cpp @@ -18,7 +18,7 @@ */ #include "ContentDownloadTask.h" -#include "Application.h" +#include #include "minecraft/mod/ModMetadataIndex.h" #include "net/Download.h" #include "net/ChecksumValidator.h" diff --git a/launcher/modplatform/ContentProviderModel.cpp b/launcher/modplatform/ContentProviderModel.cpp index dd2740c6e..d0283673b 100644 --- a/launcher/modplatform/ContentProviderModel.cpp +++ b/launcher/modplatform/ContentProviderModel.cpp @@ -24,7 +24,7 @@ #include #include -#include "Application.h" +#include #include "minecraft/mod/ModMetadataIndex.h" #include "net/Download.h" #include "net/HttpMetaCache.h" diff --git a/launcher/modplatform/DependencyResolver.cpp b/launcher/modplatform/DependencyResolver.cpp index 6bca13325..07b96836a 100644 --- a/launcher/modplatform/DependencyResolver.cpp +++ b/launcher/modplatform/DependencyResolver.cpp @@ -18,8 +18,8 @@ */ #include "DependencyResolver.h" -#include "Application.h" -#include "Json.h" +#include +#include #include "minecraft/mod/ModMetadataIndex.h" #include "modplatform/ContentType.h" #include "modplatform/VersionPicker.h" diff --git a/launcher/modplatform/ManagedPackVersions.cpp b/launcher/modplatform/ManagedPackVersions.cpp index 9f45a7b48..e80b35fcf 100644 --- a/launcher/modplatform/ManagedPackVersions.cpp +++ b/launcher/modplatform/ManagedPackVersions.cpp @@ -25,7 +25,7 @@ #include #include -#include "Json.h" +#include namespace ManagedPack { diff --git a/launcher/modplatform/ModUpdateCheckTask.cpp b/launcher/modplatform/ModUpdateCheckTask.cpp index d23660a8e..7b93cd685 100644 --- a/launcher/modplatform/ModUpdateCheckTask.cpp +++ b/launcher/modplatform/ModUpdateCheckTask.cpp @@ -25,8 +25,8 @@ #include #include -#include "Application.h" -#include "Json.h" +#include +#include #include "minecraft/mod/ModMetadataIndex.h" #include "modplatform/ContentType.h" #include "modplatform/VersionPicker.h" diff --git a/launcher/modplatform/PackContents.cpp b/launcher/modplatform/PackContents.cpp index a470534e9..a0f024169 100644 --- a/launcher/modplatform/PackContents.cpp +++ b/launcher/modplatform/PackContents.cpp @@ -28,7 +28,7 @@ #include #include -#include "FileSystem.h" +#include namespace PackContents { diff --git a/launcher/modplatform/atlauncher/ATLPackIndex.cpp b/launcher/modplatform/atlauncher/ATLPackIndex.cpp index 4dded4e26..f91763c5f 100644 --- a/launcher/modplatform/atlauncher/ATLPackIndex.cpp +++ b/launcher/modplatform/atlauncher/ATLPackIndex.cpp @@ -23,7 +23,7 @@ #include -#include "Json.h" +#include static void loadIndexedVersion(ATLauncher::IndexedVersion& v, QJsonObject& obj) { diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp index 8e9878700..833f35938 100644 --- a/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp +++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.cpp @@ -29,8 +29,8 @@ #include "minecraft/OneSixVersionFormat.h" #include "Version.h" #include "net/ChecksumValidator.h" -#include "FileSystem.h" -#include "Json.h" +#include +#include #include "minecraft/MinecraftInstance.h" #include "minecraft/PackProfile.h" #include "settings/INISettingsObject.h" @@ -38,8 +38,8 @@ #include "meta/Version.h" #include "meta/VersionList.h" -#include "BuildConfig.h" -#include "Application.h" +#include +#include namespace ATLauncher { diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.h b/launcher/modplatform/atlauncher/ATLPackInstallTask.h index 1d2145b71..023130b84 100644 --- a/launcher/modplatform/atlauncher/ATLPackInstallTask.h +++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.h @@ -24,7 +24,7 @@ #include #include "ATLPackManifest.h" -#include "InstanceTask.h" +#include #include "net/NetJob.h" #include "settings/INISettingsObject.h" #include "minecraft/MinecraftInstance.h" diff --git a/launcher/modplatform/atlauncher/ATLPackManifest.cpp b/launcher/modplatform/atlauncher/ATLPackManifest.cpp index 13182191b..42694d4c2 100644 --- a/launcher/modplatform/atlauncher/ATLPackManifest.cpp +++ b/launcher/modplatform/atlauncher/ATLPackManifest.cpp @@ -21,7 +21,7 @@ #include "ATLPackManifest.h" -#include "Json.h" +#include static ATLauncher::DownloadType parseDownloadType(QString rawType) { diff --git a/launcher/modplatform/flame/FileResolvingTask.cpp b/launcher/modplatform/flame/FileResolvingTask.cpp index 5b0bdf1fd..6ec5ba36c 100644 --- a/launcher/modplatform/flame/FileResolvingTask.cpp +++ b/launcher/modplatform/flame/FileResolvingTask.cpp @@ -18,7 +18,7 @@ */ #include "FileResolvingTask.h" -#include "Json.h" +#include #include "modplatform/flame/FlameApi.h" Flame::FileResolvingTask::FileResolvingTask( diff --git a/launcher/modplatform/flame/FlameContentModel.cpp b/launcher/modplatform/flame/FlameContentModel.cpp index 1a5f06c52..34823d0bd 100644 --- a/launcher/modplatform/flame/FlameContentModel.cpp +++ b/launcher/modplatform/flame/FlameContentModel.cpp @@ -25,7 +25,7 @@ #include #include -#include "Json.h" +#include #include "modplatform/ModDownloadTypes.h" #include "modplatform/flame/FlameApi.h" diff --git a/launcher/modplatform/flame/FlamePackIndex.cpp b/launcher/modplatform/flame/FlamePackIndex.cpp index 8a9aac9c1..3572ac00f 100644 --- a/launcher/modplatform/flame/FlamePackIndex.cpp +++ b/launcher/modplatform/flame/FlamePackIndex.cpp @@ -19,7 +19,7 @@ #include "FlamePackIndex.h" -#include "Json.h" +#include void Flame::loadIndexedPack(Flame::IndexedPack& pack, QJsonObject& obj) { diff --git a/launcher/modplatform/flame/PackManifest.cpp b/launcher/modplatform/flame/PackManifest.cpp index 790e1dab4..a0e9f596e 100644 --- a/launcher/modplatform/flame/PackManifest.cpp +++ b/launcher/modplatform/flame/PackManifest.cpp @@ -18,7 +18,7 @@ */ #include "PackManifest.h" -#include "Json.h" +#include static void loadFileV1(Flame::File& f, QJsonObject& file) { diff --git a/launcher/modplatform/legacy_ftb/PackFetchTask.cpp b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp index d3335e6a6..5287e6139 100644 --- a/launcher/modplatform/legacy_ftb/PackFetchTask.cpp +++ b/launcher/modplatform/legacy_ftb/PackFetchTask.cpp @@ -21,8 +21,8 @@ #include "PrivatePackManager.h" #include -#include "BuildConfig.h" -#include "Application.h" +#include +#include namespace LegacyFTB { diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp index efbe883c3..9fab2d317 100644 --- a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp +++ b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp @@ -22,15 +22,15 @@ #include #include "MMCZip.h" -#include "BaseInstance.h" -#include "FileSystem.h" +#include +#include #include "settings/INISettingsObject.h" #include "minecraft/MinecraftInstance.h" #include "minecraft/PackProfile.h" #include "minecraft/GradleSpecifier.h" -#include "BuildConfig.h" -#include "Application.h" +#include +#include namespace LegacyFTB { diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.h b/launcher/modplatform/legacy_ftb/PackInstallTask.h index 613c64c16..4954a38d6 100644 --- a/launcher/modplatform/legacy_ftb/PackInstallTask.h +++ b/launcher/modplatform/legacy_ftb/PackInstallTask.h @@ -20,7 +20,7 @@ #pragma once #include -#include "InstanceTask.h" +#include #include "net/NetJob.h" #include "meta/Index.h" #include "meta/Version.h" diff --git a/launcher/modplatform/legacy_ftb/PrivatePackManager.cpp b/launcher/modplatform/legacy_ftb/PrivatePackManager.cpp index 68193725d..1f73cb0e6 100644 --- a/launcher/modplatform/legacy_ftb/PrivatePackManager.cpp +++ b/launcher/modplatform/legacy_ftb/PrivatePackManager.cpp @@ -21,7 +21,7 @@ #include -#include "FileSystem.h" +#include namespace LegacyFTB { diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp index f5c85e1af..aab3b424d 100644 --- a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp +++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp @@ -21,15 +21,15 @@ #include "FTBPackInstallTask.h" -#include "FileSystem.h" -#include "Json.h" +#include +#include #include "minecraft/MinecraftInstance.h" #include "minecraft/PackProfile.h" #include "net/ChecksumValidator.h" #include "settings/INISettingsObject.h" -#include "BuildConfig.h" -#include "Application.h" +#include +#include #include diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.h b/launcher/modplatform/modpacksch/FTBPackInstallTask.h index 69ff624a4..0edec099c 100644 --- a/launcher/modplatform/modpacksch/FTBPackInstallTask.h +++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.h @@ -23,7 +23,7 @@ #include "FTBPackManifest.h" -#include "InstanceTask.h" +#include #include "net/NetJob.h" namespace ModpacksCH diff --git a/launcher/modplatform/modpacksch/FTBPackManifest.cpp b/launcher/modplatform/modpacksch/FTBPackManifest.cpp index bb44efa78..0ffa0b89e 100644 --- a/launcher/modplatform/modpacksch/FTBPackManifest.cpp +++ b/launcher/modplatform/modpacksch/FTBPackManifest.cpp @@ -21,7 +21,7 @@ #include "FTBPackManifest.h" -#include "Json.h" +#include static void loadSpecs(ModpacksCH::Specs& s, QJsonObject& obj) { diff --git a/launcher/modplatform/modrinth/ModrinthContentModel.cpp b/launcher/modplatform/modrinth/ModrinthContentModel.cpp index f2c2a3e53..2eda9fadb 100644 --- a/launcher/modplatform/modrinth/ModrinthContentModel.cpp +++ b/launcher/modplatform/modrinth/ModrinthContentModel.cpp @@ -25,8 +25,8 @@ #include #include -#include "HoeDown.h" -#include "Json.h" +#include +#include #include "modplatform/modrinth/ModrinthApi.h" namespace diff --git a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp index 84e7df2a6..865ec595d 100644 --- a/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp +++ b/launcher/modplatform/modrinth/ModrinthPackExportTask.cpp @@ -35,7 +35,7 @@ #include #include -#include "Application.h" +#include #include "archive/ExportToZipTask.h" #include "minecraft/MinecraftInstance.h" #include "minecraft/PackProfile.h" diff --git a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp index 364d1c33e..624b0584e 100644 --- a/launcher/modplatform/modrinth/ModrinthPackIndex.cpp +++ b/launcher/modplatform/modrinth/ModrinthPackIndex.cpp @@ -19,7 +19,7 @@ #include "ModrinthPackIndex.h" -#include "Json.h" +#include void Modrinth::loadIndexedPack(Modrinth::IndexedPack& pack, QJsonObject& obj) { diff --git a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp index a6b6d8850..3e6522342 100644 --- a/launcher/modplatform/modrinth/ModrinthPackManifest.cpp +++ b/launcher/modplatform/modrinth/ModrinthPackManifest.cpp @@ -19,7 +19,7 @@ #include "ModrinthPackManifest.h" -#include "Json.h" +#include static void loadFile(Modrinth::File& f, QJsonObject& fileObj) { diff --git a/launcher/modplatform/technic/SingleZipPackInstallTask.cpp b/launcher/modplatform/technic/SingleZipPackInstallTask.cpp index 1b1b564b4..e21e76e7a 100644 --- a/launcher/modplatform/technic/SingleZipPackInstallTask.cpp +++ b/launcher/modplatform/technic/SingleZipPackInstallTask.cpp @@ -24,9 +24,9 @@ #include "MMCZip.h" #include "TechnicPackProcessor.h" -#include "FileSystem.h" +#include -#include "Application.h" +#include Technic::SingleZipPackInstallTask::SingleZipPackInstallTask( const QUrl& sourceUrl, const QString& minecraftVersion) diff --git a/launcher/modplatform/technic/SingleZipPackInstallTask.h b/launcher/modplatform/technic/SingleZipPackInstallTask.h index ebc68d3ef..fadbff111 100644 --- a/launcher/modplatform/technic/SingleZipPackInstallTask.h +++ b/launcher/modplatform/technic/SingleZipPackInstallTask.h @@ -20,7 +20,7 @@ #pragma once -#include "InstanceTask.h" +#include #include "net/HttpMetaCache.h" #include "net/NetJob.h" diff --git a/launcher/modplatform/technic/SolderPackInstallTask.cpp b/launcher/modplatform/technic/SolderPackInstallTask.cpp index c0feef66f..db977d9c3 100644 --- a/launcher/modplatform/technic/SolderPackInstallTask.cpp +++ b/launcher/modplatform/technic/SolderPackInstallTask.cpp @@ -20,8 +20,8 @@ #include "SolderPackInstallTask.h" -#include -#include +#include +#include #include #include #include "TechnicPackProcessor.h" diff --git a/launcher/modplatform/technic/SolderPackInstallTask.h b/launcher/modplatform/technic/SolderPackInstallTask.h index 93ddcc1dc..cac8735d0 100644 --- a/launcher/modplatform/technic/SolderPackInstallTask.h +++ b/launcher/modplatform/technic/SolderPackInstallTask.h @@ -20,7 +20,7 @@ #pragma once -#include +#include #include #include diff --git a/launcher/modplatform/technic/TechnicPackProcessor.cpp b/launcher/modplatform/technic/TechnicPackProcessor.cpp index d11033f33..72a2d09a1 100644 --- a/launcher/modplatform/technic/TechnicPackProcessor.cpp +++ b/launcher/modplatform/technic/TechnicPackProcessor.cpp @@ -20,8 +20,8 @@ #include "TechnicPackProcessor.h" -#include -#include +#include +#include #include #include #include diff --git a/launcher/mojang/PackageManifest.cpp b/launcher/mojang/PackageManifest.cpp index 85e2ecaa9..3af70e9fe 100644 --- a/launcher/mojang/PackageManifest.cpp +++ b/launcher/mojang/PackageManifest.cpp @@ -18,8 +18,8 @@ */ #include "PackageManifest.h" -#include "Logging.h" -#include +#include +#include #include #include #include diff --git a/launcher/net/Download.cpp b/launcher/net/Download.cpp index b903265d9..12653a57a 100644 --- a/launcher/net/Download.cpp +++ b/launcher/net/Download.cpp @@ -24,13 +24,13 @@ #include #include -#include "FileSystem.h" -#include "Logging.h" +#include +#include #include "ChecksumValidator.h" #include "MetaCacheSink.h" #include "ByteArraySink.h" -#include "BuildConfig.h" +#include #include "modplatform/flame/FlameApi.h" #include "modplatform/modrinth/ModrinthApi.h" diff --git a/launcher/net/FileSink.cpp b/launcher/net/FileSink.cpp index 262ffd45f..66f0335c3 100644 --- a/launcher/net/FileSink.cpp +++ b/launcher/net/FileSink.cpp @@ -20,7 +20,7 @@ #include "FileSink.h" #include #include -#include "FileSystem.h" +#include namespace Net { diff --git a/launcher/net/HttpMetaCache.cpp b/launcher/net/HttpMetaCache.cpp index 6f0192930..658b97521 100644 --- a/launcher/net/HttpMetaCache.cpp +++ b/launcher/net/HttpMetaCache.cpp @@ -19,7 +19,7 @@ */ #include "HttpMetaCache.h" -#include "FileSystem.h" +#include #include #include diff --git a/launcher/net/JsonPost.cpp b/launcher/net/JsonPost.cpp index 8326aa8ad..5be5ef238 100644 --- a/launcher/net/JsonPost.cpp +++ b/launcher/net/JsonPost.cpp @@ -24,8 +24,8 @@ #include -#include "Application.h" -#include "BuildConfig.h" +#include +#include #include "modplatform/flame/FlameApi.h" namespace Net diff --git a/launcher/net/MetaCacheSink.cpp b/launcher/net/MetaCacheSink.cpp index 2c9594694..53e6b7da2 100644 --- a/launcher/net/MetaCacheSink.cpp +++ b/launcher/net/MetaCacheSink.cpp @@ -20,8 +20,8 @@ #include "MetaCacheSink.h" #include #include -#include "FileSystem.h" -#include "Application.h" +#include +#include namespace Net { diff --git a/launcher/net/PasteUpload.cpp b/launcher/net/PasteUpload.cpp index 2c9581c7d..7280baf9d 100644 --- a/launcher/net/PasteUpload.cpp +++ b/launcher/net/PasteUpload.cpp @@ -18,9 +18,9 @@ */ #include "PasteUpload.h" -#include "BuildConfig.h" -#include "Application.h" -#include "Logging.h" +#include +#include +#include #include #include diff --git a/launcher/news/NewsChecker.cpp b/launcher/news/NewsChecker.cpp index 6d0793548..70fd0d260 100644 --- a/launcher/news/NewsChecker.cpp +++ b/launcher/news/NewsChecker.cpp @@ -19,7 +19,7 @@ */ #include "NewsChecker.h" -#include "Logging.h" +#include #include #include diff --git a/launcher/notifications/NotificationChecker.cpp b/launcher/notifications/NotificationChecker.cpp index 0b2062eee..449318f29 100644 --- a/launcher/notifications/NotificationChecker.cpp +++ b/launcher/notifications/NotificationChecker.cpp @@ -26,7 +26,7 @@ #include "net/Download.h" -#include "Application.h" +#include NotificationChecker::NotificationChecker(QObject* parent) : QObject(parent) {} diff --git a/launcher/plugin/MMCOFormat.h b/launcher/plugin/MMCOFormat.h index a600a173d..74b4dfa52 100644 --- a/launcher/plugin/MMCOFormat.h +++ b/launcher/plugin/MMCOFormat.h @@ -1,3 +1,5 @@ +// launcher/plugin/MMCOFormat.h +// @meshmc-public: MeshMC/Plugin/MMCOFormat /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/plugin/PluginAPI.h b/launcher/plugin/PluginAPI.h index 8dc459a23..55f7aaeed 100644 --- a/launcher/plugin/PluginAPI.h +++ b/launcher/plugin/PluginAPI.h @@ -751,7 +751,7 @@ struct MMCOContext { * S11's `http_get` only ever sets User-Agent. Plugins that talk * to APIs gated by auth headers (CurseForge's `x-api-key` is * the canonical case) use this variant instead. Keys come from - * the plugin's own `#include "BuildConfig.h"` — the launcher + * the plugin's own `#include ` — the launcher * does NOT pass keys through this surface; that's deliberate so * a key doesn't have to traverse a generic plugin API. * diff --git a/launcher/plugin/PluginLoader.cpp b/launcher/plugin/PluginLoader.cpp index 651c7f812..44dc3abbb 100644 --- a/launcher/plugin/PluginLoader.cpp +++ b/launcher/plugin/PluginLoader.cpp @@ -17,14 +17,14 @@ * limitations under the License. */ -#include "FileSystem.h" -#include "BuildConfig.h" +#include +#include -#include "plugin/PluginLoader.h" -#include "plugin/PluginSignature.h" +#include +#include #include "plugin/CoreSupersededPlugins.h" -#include "Logging.h" +#include #include #include diff --git a/launcher/plugin/PluginLoader.h b/launcher/plugin/PluginLoader.h index 9f41c75d2..f62ca4c9a 100644 --- a/launcher/plugin/PluginLoader.h +++ b/launcher/plugin/PluginLoader.h @@ -1,3 +1,5 @@ +// launcher/plugin/PluginLoader.h +// @meshmc-public: MeshMC/Plugin/Loader /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/plugin/PluginManager.cpp b/launcher/plugin/PluginManager.cpp index 2534d2d53..3d262b79e 100644 --- a/launcher/plugin/PluginManager.cpp +++ b/launcher/plugin/PluginManager.cpp @@ -17,13 +17,13 @@ * limitations under the License. */ -#include "plugin/PluginManager.h" +#include #include "plugin/PluginDependencyResolver.h" -#include "plugin/PluginSignature.h" -#include "Application.h" -#include "BuildConfig.h" -#include "InstanceList.h" -#include "BaseInstance.h" +#include +#include +#include +#include +#include #include "MMCZip.h" #include "minecraft/MinecraftInstance.h" #include "minecraft/PackProfile.h" @@ -47,7 +47,7 @@ #include "java/JavaInstallList.h" #include "java/JavaInstall.h" #include "settings/SettingsObject.h" -#include "Logging.h" +#include #include #include #include diff --git a/launcher/plugin/PluginManager.h b/launcher/plugin/PluginManager.h index 6d9c56b3b..744a639b0 100644 --- a/launcher/plugin/PluginManager.h +++ b/launcher/plugin/PluginManager.h @@ -1,3 +1,5 @@ +// launcher/plugin/PluginManager.h +// @meshmc-public: MeshMC/Plugin/Manager /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 @@ -19,7 +21,7 @@ #pragma once -#include "plugin/PluginLoader.h" +#include #include "plugin/PluginMetadata.h" #include "plugin/PluginHooks.h" #include "plugin/PluginAPI.h" diff --git a/launcher/plugin/PluginMetadata.h b/launcher/plugin/PluginMetadata.h index cec51fbcd..94221973a 100644 --- a/launcher/plugin/PluginMetadata.h +++ b/launcher/plugin/PluginMetadata.h @@ -19,7 +19,7 @@ #pragma once -#include "plugin/MMCOFormat.h" +#include #include "plugin/PluginAPI.h" #include diff --git a/launcher/plugin/PluginSignature.cpp b/launcher/plugin/PluginSignature.cpp index 065909477..f55b21d76 100644 --- a/launcher/plugin/PluginSignature.cpp +++ b/launcher/plugin/PluginSignature.cpp @@ -17,9 +17,9 @@ * limitations under the License. */ -#include "plugin/PluginSignature.h" -#include "plugin/MMCOFormat.h" -#include "Logging.h" +#include +#include +#include #include #include #include diff --git a/launcher/plugin/PluginSignature.h b/launcher/plugin/PluginSignature.h index be68d720a..2bac29a1b 100644 --- a/launcher/plugin/PluginSignature.h +++ b/launcher/plugin/PluginSignature.h @@ -1,3 +1,5 @@ +// launcher/plugin/PluginSignature.h +// @meshmc-public: MeshMC/Plugin/Signature /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/plugin/plugins/DesktopNotifier/DesktopNotifierPlugin.cpp b/launcher/plugin/plugins/DesktopNotifier/DesktopNotifierPlugin.cpp index 2f17b5f86..141ee23da 100644 --- a/launcher/plugin/plugins/DesktopNotifier/DesktopNotifierPlugin.cpp +++ b/launcher/plugin/plugins/DesktopNotifier/DesktopNotifierPlugin.cpp @@ -25,7 +25,7 @@ * timeout_ms — notification timeout (default 5000) */ -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include #include MMCO_DEFINE_MODULE("DesktopNotifier", "1.0.0", "Project Tick", diff --git a/launcher/plugin/plugins/DiscordRPC/DiscordRPCPlugin.cpp b/launcher/plugin/plugins/DiscordRPC/DiscordRPCPlugin.cpp index 949829607..094fd05ab 100644 --- a/launcher/plugin/plugins/DiscordRPC/DiscordRPCPlugin.cpp +++ b/launcher/plugin/plugins/DiscordRPC/DiscordRPCPlugin.cpp @@ -25,7 +25,7 @@ * custom_details — override the "details" line (default "") */ -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include #include "discord_ipc/discord_ipc.h" #include diff --git a/launcher/plugin/plugins/GitVersioning/GitRepo.h b/launcher/plugin/plugins/GitVersioning/GitRepo.h index 17ec0447a..f3cca2b2f 100644 --- a/launcher/plugin/plugins/GitVersioning/GitRepo.h +++ b/launcher/plugin/plugins/GitVersioning/GitRepo.h @@ -19,7 +19,7 @@ #pragma once -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include #include #include diff --git a/launcher/plugin/plugins/GitVersioning/GitVersioningPage.h b/launcher/plugin/plugins/GitVersioning/GitVersioningPage.h index c8ba3af33..45a935bfe 100644 --- a/launcher/plugin/plugins/GitVersioning/GitVersioningPage.h +++ b/launcher/plugin/plugins/GitVersioning/GitVersioningPage.h @@ -7,7 +7,7 @@ #pragma once -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include #include "GitRepo.h" class GitVersioningPage : public QWidget, public BasePage diff --git a/launcher/plugin/plugins/GitVersioning/GitVersioningPlugin.cpp b/launcher/plugin/plugins/GitVersioning/GitVersioningPlugin.cpp index 3ea1f442d..f534e39a1 100644 --- a/launcher/plugin/plugins/GitVersioning/GitVersioningPlugin.cpp +++ b/launcher/plugin/plugins/GitVersioning/GitVersioningPlugin.cpp @@ -24,7 +24,7 @@ * host resolves from the override gate + global fallback. */ -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include #include "GitRepo.h" #include "GitVersioningPage.h" #include diff --git a/launcher/plugin/plugins/LinuxPerf/LinuxPerfPlugin.cpp b/launcher/plugin/plugins/LinuxPerf/LinuxPerfPlugin.cpp index c9af1acb2..de9e0aee6 100644 --- a/launcher/plugin/plugins/LinuxPerf/LinuxPerfPlugin.cpp +++ b/launcher/plugin/plugins/LinuxPerf/LinuxPerfPlugin.cpp @@ -2,7 +2,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include #include "vendor/gamemode_client.h" #include #include diff --git a/launcher/plugin/plugins/NVIDIAPrime/NVIDIAPrimePlugin.cpp b/launcher/plugin/plugins/NVIDIAPrime/NVIDIAPrimePlugin.cpp index c6de1ac03..37104eae5 100644 --- a/launcher/plugin/plugins/NVIDIAPrime/NVIDIAPrimePlugin.cpp +++ b/launcher/plugin/plugins/NVIDIAPrime/NVIDIAPrimePlugin.cpp @@ -16,7 +16,7 @@ * at runtime. The setting is stored as plugin.nvidia_prime.enabled. */ -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include MMCO_DEFINE_MODULE("NVIDIA Prime Module", "1.0.0", "Project Tick", "Discrete GPU offload via NVIDIA Prime Render Offload", diff --git a/launcher/plugin/plugins/OfflineWiki/OfflineWikiPlugin.cpp b/launcher/plugin/plugins/OfflineWiki/OfflineWikiPlugin.cpp index 46eddad9d..f747ddbaa 100644 --- a/launcher/plugin/plugins/OfflineWiki/OfflineWikiPlugin.cpp +++ b/launcher/plugin/plugins/OfflineWiki/OfflineWikiPlugin.cpp @@ -7,7 +7,7 @@ * there is no bundle management and no ZIM support. */ -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include #include "WikiRepoBundle.h" #include "WikiPage.h" diff --git a/launcher/plugin/plugins/OfflineWiki/WikiPage.h b/launcher/plugin/plugins/OfflineWiki/WikiPage.h index 5bad05c24..1f7cd5d89 100644 --- a/launcher/plugin/plugins/OfflineWiki/WikiPage.h +++ b/launcher/plugin/plugins/OfflineWiki/WikiPage.h @@ -13,7 +13,7 @@ #pragma once -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include class QTextBrowser; class QListWidget; diff --git a/launcher/plugin/plugins/OfflineWiki/WikiRepoBundle.h b/launcher/plugin/plugins/OfflineWiki/WikiRepoBundle.h index e02155d90..9d2d8008b 100644 --- a/launcher/plugin/plugins/OfflineWiki/WikiRepoBundle.h +++ b/launcher/plugin/plugins/OfflineWiki/WikiRepoBundle.h @@ -26,7 +26,7 @@ #pragma once -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include class WikiRepoBundle { diff --git a/launcher/plugin/plugins/SystemTray/SystemTrayPlugin.cpp b/launcher/plugin/plugins/SystemTray/SystemTrayPlugin.cpp index 613366c45..22559e6ef 100644 --- a/launcher/plugin/plugins/SystemTray/SystemTrayPlugin.cpp +++ b/launcher/plugin/plugins/SystemTray/SystemTrayPlugin.cpp @@ -19,7 +19,7 @@ * show_notifications — show a transient hint on first hide (default 1) */ -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include /* ── dependencies ─────────────────────────────────────────────────── * * diff --git a/launcher/plugin/plugins/staging/ErrorOracle/AnalysisPage.h b/launcher/plugin/plugins/staging/ErrorOracle/AnalysisPage.h index 9bc7e54a4..36e36073b 100644 --- a/launcher/plugin/plugins/staging/ErrorOracle/AnalysisPage.h +++ b/launcher/plugin/plugins/staging/ErrorOracle/AnalysisPage.h @@ -9,7 +9,7 @@ #pragma once -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include #include "RuleEngine.h" class QTextEdit; diff --git a/launcher/plugin/plugins/staging/ErrorOracle/ErrorOraclePlugin.cpp b/launcher/plugin/plugins/staging/ErrorOracle/ErrorOraclePlugin.cpp index e52552f46..974e96557 100644 --- a/launcher/plugin/plugins/staging/ErrorOracle/ErrorOraclePlugin.cpp +++ b/launcher/plugin/plugins/staging/ErrorOracle/ErrorOraclePlugin.cpp @@ -8,7 +8,7 @@ * %d suggestion(s) for the last crash." */ -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include #include "RuleEngine.h" #include "LearningStore.h" #include "LogIngester.h" diff --git a/launcher/plugin/plugins/staging/ErrorOracle/LearningStore.h b/launcher/plugin/plugins/staging/ErrorOracle/LearningStore.h index bb9527697..f9fa1ab49 100644 --- a/launcher/plugin/plugins/staging/ErrorOracle/LearningStore.h +++ b/launcher/plugin/plugins/staging/ErrorOracle/LearningStore.h @@ -22,7 +22,7 @@ #pragma once -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include struct OutcomeStats { int helped = 0; diff --git a/launcher/plugin/plugins/staging/ErrorOracle/LogIngester.h b/launcher/plugin/plugins/staging/ErrorOracle/LogIngester.h index f8bbf174d..6dde10dc6 100644 --- a/launcher/plugin/plugins/staging/ErrorOracle/LogIngester.h +++ b/launcher/plugin/plugins/staging/ErrorOracle/LogIngester.h @@ -7,7 +7,7 @@ #pragma once -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include class LogIngester { diff --git a/launcher/plugin/plugins/staging/ErrorOracle/RuleEngine.h b/launcher/plugin/plugins/staging/ErrorOracle/RuleEngine.h index c6d6c0d0c..8fbe7c8d8 100644 --- a/launcher/plugin/plugins/staging/ErrorOracle/RuleEngine.h +++ b/launcher/plugin/plugins/staging/ErrorOracle/RuleEngine.h @@ -20,7 +20,7 @@ #pragma once -#include "plugin/sdk/mmco_cxx_sdk.hpp" +#include #include enum class Severity { Low, Medium, High }; diff --git a/launcher/plugin/plugins/staging/MercurialVersioning/MercurialVersioningPlugin.c b/launcher/plugin/plugins/staging/MercurialVersioning/MercurialVersioningPlugin.c index 722237b0b..c43b5b259 100644 --- a/launcher/plugin/plugins/staging/MercurialVersioning/MercurialVersioningPlugin.c +++ b/launcher/plugin/plugins/staging/MercurialVersioning/MercurialVersioningPlugin.c @@ -26,7 +26,7 @@ * the feature is enabled via the plugin setting. */ -#include "plugin/sdk/mmco_c_sdk.h" +#include #include #include diff --git a/launcher/plugin/sdk/CMakeLists.txt b/launcher/plugin/sdk/CMakeLists.txt index 05e31ca6d..d5bbacd15 100644 --- a/launcher/plugin/sdk/CMakeLists.txt +++ b/launcher/plugin/sdk/CMakeLists.txt @@ -32,10 +32,8 @@ add_library(MeshMC::SDK_C ALIAS MeshMC_sdk_c) set_target_properties(MeshMC_sdk_c PROPERTIES EXPORT_NAME SDK_C) target_include_directories(MeshMC_sdk_c INTERFACE - $ - $ - $ - $ + $ + $ ) # Note: no target_link_libraries here — the C ABI surface is Qt-free. @@ -46,112 +44,14 @@ target_link_libraries(MeshMC_sdk INTERFACE MeshMC_sdk_c) # Resolve include directories from imported targets (these are installed externally) get_target_property(_KATABASIS_INCLUDE_DIRS Katabasis INTERFACE_INCLUDE_DIRECTORIES) -target_include_directories(MeshMC_sdk INTERFACE - # Build-tree consumers (in-tree plugins) - $ - $ - $ - # Install-tree consumers (out-of-tree plugins) - $ - $ -) - target_link_libraries(MeshMC_sdk INTERFACE + MeshMC_sdk_c Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Network ) -# --------------------------------------------------------------------------- -# Collect SDK headers — preserving directory structure -# --------------------------------------------------------------------------- - -# SDK's own headers (plugin/sdk/) -# mmco_c_sdk.h — canonical, language-neutral C ABI (Qt-free) -# mmco_cxx_sdk.hpp — C++ convenience header (includes the C ABI + Qt) -set(SDK_OWN_HEADERS - mmco_c_sdk.h - mmco_cxx_sdk.hpp -) - -# Plugin API headers (plugin/) -set(SDK_PLUGIN_HEADERS - ${CMAKE_SOURCE_DIR}/launcher/plugin/PluginAPI.h - ${CMAKE_SOURCE_DIR}/launcher/plugin/PluginHooks.h - ${CMAKE_SOURCE_DIR}/launcher/plugin/MMCOFormat.h -) - -# MeshMC launcher headers needed transitively by mmco_sdk.h -# This list is auto-generated by tracing #include dependencies. -set(SDK_LAUNCHER_HEADERS - ${CMAKE_SOURCE_DIR}/launcher/Application.h - ${CMAKE_SOURCE_DIR}/launcher/BaseInstance.h - ${CMAKE_SOURCE_DIR}/launcher/BaseVersion.h - ${CMAKE_SOURCE_DIR}/launcher/BaseVersionList.h - ${CMAKE_SOURCE_DIR}/launcher/DefaultVariable.h - ${CMAKE_SOURCE_DIR}/launcher/Exception.h - ${CMAKE_SOURCE_DIR}/launcher/InstanceList.h - ${CMAKE_SOURCE_DIR}/launcher/JavaCommon.h - ${CMAKE_SOURCE_DIR}/launcher/MMCZip.h - ${CMAKE_SOURCE_DIR}/launcher/MessageLevel.h - ${CMAKE_SOURCE_DIR}/launcher/ProblemProvider.h - ${CMAKE_SOURCE_DIR}/launcher/QObjectPtr.h - ${CMAKE_SOURCE_DIR}/launcher/Usable.h -) - -set(SDK_MINECRAFT_HEADERS - ${CMAKE_SOURCE_DIR}/launcher/minecraft/AssetsUtils.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/Component.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/GradleSpecifier.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/LaunchProfile.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/Library.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/MinecraftInstance.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/MojangDownloadInfo.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/OpSys.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/PackProfile.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/ProfileUtils.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/Rule.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/VersionFile.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/World.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/WorldList.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/auth/AccountData.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/auth/AuthSession.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/auth/MinecraftAccount.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/auth/AccountList.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/launch/MinecraftServerTarget.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/mod/Mod.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/mod/ModDetails.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/services/CapeChange.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/services/SkinUpload.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/services/SkinDelete.h -) - -set(SDK_NET_HEADERS - ${CMAKE_SOURCE_DIR}/launcher/net/Download.h - ${CMAKE_SOURCE_DIR}/launcher/net/HttpMetaCache.h - ${CMAKE_SOURCE_DIR}/launcher/net/Mode.h - ${CMAKE_SOURCE_DIR}/launcher/net/NetAction.h - ${CMAKE_SOURCE_DIR}/launcher/net/NetJob.h - ${CMAKE_SOURCE_DIR}/launcher/net/Sink.h - ${CMAKE_SOURCE_DIR}/launcher/net/Validator.h -) - -set(SDK_MISC_HEADERS - ${CMAKE_SOURCE_DIR}/launcher/icons/IconList.h - ${CMAKE_SOURCE_DIR}/launcher/java/JavaVersion.h - ${CMAKE_SOURCE_DIR}/launcher/pathmatcher/IPathMatcher.h - ${CMAKE_SOURCE_DIR}/launcher/settings/INIFile.h - ${CMAKE_SOURCE_DIR}/launcher/settings/SettingsObject.h - ${CMAKE_SOURCE_DIR}/launcher/tasks/Task.h - ${CMAKE_SOURCE_DIR}/launcher/ui/pages/BasePage.h - ${CMAKE_SOURCE_DIR}/launcher/ui/pages/BasePageContainer.h - ${CMAKE_SOURCE_DIR}/launcher/updater/ExternalUpdater.h -) - -set(SDK_LIBRARY_HEADERS -) - # --------------------------------------------------------------------------- # Install rules # --------------------------------------------------------------------------- @@ -165,144 +65,19 @@ include(GNUInstallDirs) set(SDK_INSTALL_DIR "include/meshmc-sdk") -# SDK own headers → include/meshmc-sdk/plugin/sdk/ -install(FILES ${SDK_OWN_HEADERS} - DESTINATION "${SDK_INSTALL_DIR}/plugin/sdk" -) - -# Plugin API headers → include/meshmc-sdk/plugin/ -install(FILES ${SDK_PLUGIN_HEADERS} - DESTINATION "${SDK_INSTALL_DIR}/plugin" -) - -# Launcher root headers → include/meshmc-sdk/ -install(FILES ${SDK_LAUNCHER_HEADERS} - DESTINATION "${SDK_INSTALL_DIR}" -) -install(FILES - ${CMAKE_SOURCE_DIR}/buildconfig/BuildConfig.h +install( + DIRECTORY "${CMAKE_SOURCE_DIR}/launcher/" DESTINATION "${SDK_INSTALL_DIR}" + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hpp" + PATTERN "*.hh" + PATTERN "*.hxx" ) -# minecraft/ subtree -install(FILES - ${CMAKE_SOURCE_DIR}/launcher/minecraft/AssetsUtils.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/Component.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/GradleSpecifier.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/LaunchProfile.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/Library.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/MinecraftInstance.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/MojangDownloadInfo.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/OpSys.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/PackProfile.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/ProfileUtils.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/Rule.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/VersionFile.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/World.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/WorldList.h - DESTINATION "${SDK_INSTALL_DIR}/minecraft" -) -install(FILES - ${CMAKE_SOURCE_DIR}/launcher/minecraft/auth/AccountData.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/auth/AuthSession.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/auth/MinecraftAccount.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/auth/AccountList.h - DESTINATION "${SDK_INSTALL_DIR}/minecraft/auth" -) -install(FILES - ${CMAKE_SOURCE_DIR}/launcher/minecraft/launch/MinecraftServerTarget.h - DESTINATION "${SDK_INSTALL_DIR}/minecraft/launch" -) -install(FILES - ${CMAKE_SOURCE_DIR}/launcher/minecraft/mod/Mod.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/mod/ModDetails.h - DESTINATION "${SDK_INSTALL_DIR}/minecraft/mod" -) -install(FILES - ${CMAKE_SOURCE_DIR}/launcher/minecraft/services/CapeChange.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/services/SkinUpload.h - ${CMAKE_SOURCE_DIR}/launcher/minecraft/services/SkinDelete.h - DESTINATION "${SDK_INSTALL_DIR}/minecraft/services" -) - -# net/ subtree -install(FILES ${SDK_NET_HEADERS} - DESTINATION "${SDK_INSTALL_DIR}/net" -) - -# meta/ -install(FILES - ${CMAKE_SOURCE_DIR}/launcher/meta/BaseEntity.h - ${CMAKE_SOURCE_DIR}/launcher/meta/Index.h - ${CMAKE_SOURCE_DIR}/launcher/meta/JsonFormat.h - ${CMAKE_SOURCE_DIR}/launcher/meta/Version.h - ${CMAKE_SOURCE_DIR}/launcher/meta/VersionList.h - DESTINATION "${SDK_INSTALL_DIR}/meta" -) - -# icons/ -install(FILES - ${CMAKE_SOURCE_DIR}/launcher/icons/IconList.h - ${CMAKE_SOURCE_DIR}/launcher/icons/IconUtils.h - ${CMAKE_SOURCE_DIR}/launcher/icons/MMCIcon.h - DESTINATION "${SDK_INSTALL_DIR}/icons" -) - -# java/ -install(FILES - ${CMAKE_SOURCE_DIR}/launcher/java/JavaChecker.h - ${CMAKE_SOURCE_DIR}/launcher/java/JavaCheckerJob.h - ${CMAKE_SOURCE_DIR}/launcher/java/JavaInstall.h - ${CMAKE_SOURCE_DIR}/launcher/java/JavaInstallList.h - ${CMAKE_SOURCE_DIR}/launcher/java/JavaUtils.h - ${CMAKE_SOURCE_DIR}/launcher/java/JavaVersion.h - DESTINATION "${SDK_INSTALL_DIR}/java" -) - -# pathmatcher/ -install(FILES - ${CMAKE_SOURCE_DIR}/launcher/pathmatcher/IPathMatcher.h - DESTINATION "${SDK_INSTALL_DIR}/pathmatcher" -) - -# settings/ -install(FILES - ${CMAKE_SOURCE_DIR}/launcher/settings/INIFile.h - ${CMAKE_SOURCE_DIR}/launcher/settings/INISettingsObject.h - ${CMAKE_SOURCE_DIR}/launcher/settings/OverrideSetting.h - ${CMAKE_SOURCE_DIR}/launcher/settings/PassthroughSetting.h - ${CMAKE_SOURCE_DIR}/launcher/settings/Setting.h - ${CMAKE_SOURCE_DIR}/launcher/settings/SettingsObject.h - DESTINATION "${SDK_INSTALL_DIR}/settings" -) - -# tasks/ -install(FILES - ${CMAKE_SOURCE_DIR}/launcher/tasks/SequentialTask.h - ${CMAKE_SOURCE_DIR}/launcher/tasks/Task.h - DESTINATION "${SDK_INSTALL_DIR}/tasks" -) - -# ui/pages/ -install(FILES - ${CMAKE_SOURCE_DIR}/launcher/ui/pages/BasePage.h - ${CMAKE_SOURCE_DIR}/launcher/ui/pages/BasePageContainer.h - DESTINATION "${SDK_INSTALL_DIR}/ui/pages" -) -install(FILES - ${CMAKE_SOURCE_DIR}/launcher/ui/pages/instance/InstanceSettingsPage.h - DESTINATION "${SDK_INSTALL_DIR}/ui/pages/instance" -) -install(FILES - ${CMAKE_SOURCE_DIR}/launcher/ui/dialogs/CustomMessageBox.h - ${CMAKE_SOURCE_DIR}/launcher/ui/dialogs/ProgressDialog.h - DESTINATION "${SDK_INSTALL_DIR}/ui/dialogs" -) - -# updater/ -install(FILES - ${CMAKE_SOURCE_DIR}/launcher/updater/ExternalUpdater.h - DESTINATION "${SDK_INSTALL_DIR}/updater" +install( + DIRECTORY "${CMAKE_SOURCE_DIR}/launcher/headers/" + DESTINATION "${SDK_INSTALL_DIR}/headers" ) # Library headers — resolve from installed package include directories diff --git a/launcher/plugin/sdk/MeshMC_SDKConfig.cmake.in b/launcher/plugin/sdk/MeshMC_SDKConfig.cmake.in index fe958bbb6..a744610fa 100644 --- a/launcher/plugin/sdk/MeshMC_SDKConfig.cmake.in +++ b/launcher/plugin/sdk/MeshMC_SDKConfig.cmake.in @@ -12,32 +12,23 @@ include(CMakeFindDependencyMacro) # Use this for plain-C plugins, or as the binding # surface for other languages (Rust/Zig/…). # -# C++ usage in an out-of-tree plugin CMakeLists.txt: +# C++ usage: # -# find_package(Qt@QT_VERSION_MAJOR@ REQUIRED COMPONENTS Core Widgets Gui) +# find_package(Qt@QT_VERSION_MAJOR@ REQUIRED COMPONENTS Core Widgets Gui Network) # find_package(MeshMC_SDK REQUIRED) # add_library(MyPlugin MODULE src/MyPlugin.cpp) # target_link_libraries(MyPlugin PRIVATE MeshMC::SDK) -# set_target_properties(MyPlugin PROPERTIES PREFIX "" SUFFIX ".mmco") # -# C usage (no Qt needed): +# C usage: # # find_package(MeshMC_SDK REQUIRED) # add_library(MyPlugin MODULE src/MyPlugin.c) # target_link_libraries(MyPlugin PRIVATE MeshMC::SDK_C) -# set_target_properties(MyPlugin PROPERTIES PREFIX "" SUFFIX ".mmco") -# The Qt / Katabasis dependencies are only needed by the -# C++ MeshMC::SDK target. Resolve them quietly so that a plain-C consumer -# which only links MeshMC::SDK_C does not require a Qt toolchain. The C++ -# target's INTERFACE_LINK_LIBRARIES still references the imported Qt -# targets, so a C++ consumer that has Qt installed gets them transitively. -# The Qt major version is baked in at configure time: the exported -# MeshMC::SDK target names Qt@QT_VERSION_MAJOR@::* imported targets concretely, so a -# consumer has to resolve the same major version the SDK was built against. +# Qt is required by MeshMC::SDK. +# The Qt major version is baked into the SDK at configure time. set(MeshMC_SDK_QT_VERSION_MAJOR @QT_VERSION_MAJOR@) find_dependency(Qt@QT_VERSION_MAJOR@ QUIET COMPONENTS Core Widgets Gui Network) -find_dependency(Katabasis QUIET) include("${CMAKE_CURRENT_LIST_DIR}/MeshMC_SDKTargets.cmake") check_required_components(MeshMC_SDK) diff --git a/launcher/plugin/sdk/examples/hello_world_c/hello_world.c b/launcher/plugin/sdk/examples/hello_world_c/hello_world.c index 1e779a4e6..78142cf02 100644 --- a/launcher/plugin/sdk/examples/hello_world_c/hello_world.c +++ b/launcher/plugin/sdk/examples/hello_world_c/hello_world.c @@ -12,7 +12,7 @@ * only meaningful from C++. */ -#include "plugin/sdk/mmco_c_sdk.h" +#include #include /* Module declaration. Note the trailing ';' — MMCO_DEFINE_MODULE diff --git a/launcher/plugin/sdk/mmco_c_sdk.h b/launcher/plugin/sdk/mmco_c_sdk.h index c40b3a6a7..1ad8f4db1 100644 --- a/launcher/plugin/sdk/mmco_c_sdk.h +++ b/launcher/plugin/sdk/mmco_c_sdk.h @@ -1,3 +1,5 @@ +// launcher/plugin/sdk/mmco_c_sdk.h +// @meshmc-public: MMCO/C.h /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 @@ -771,7 +773,7 @@ typedef struct MMCOContext { * is always set by the launcher; do not bother passing one. * Use for endpoints gated by auth headers (e.g. CurseForge's * `x-api-key`); pull the secret from your plugin's - * `#include "BuildConfig.h"`. + * `#include `. * * Returns 0 on queue, -1 on argument errors. Callback body * lifetime matches `http_get`. diff --git a/launcher/plugin/sdk/mmco_cxx_sdk.hpp b/launcher/plugin/sdk/mmco_cxx_sdk.hpp index b6bb1f1ca..b46e8574f 100644 --- a/launcher/plugin/sdk/mmco_cxx_sdk.hpp +++ b/launcher/plugin/sdk/mmco_cxx_sdk.hpp @@ -1,3 +1,5 @@ +// launcher/plugin/sdk/mmco_cxx_sdk.hpp +// @meshmc-public: MMCO/CXX /* SPDX-FileCopyrightText: 2026 Project Tick * SPDX-FileContributor: Project Tick * SPDX-License-Identifier: Apache-2.0 diff --git a/launcher/screenshots/ImgurAlbumCreation.cpp b/launcher/screenshots/ImgurAlbumCreation.cpp index 7154c4ed2..8010c48e3 100644 --- a/launcher/screenshots/ImgurAlbumCreation.cpp +++ b/launcher/screenshots/ImgurAlbumCreation.cpp @@ -26,8 +26,8 @@ #include #include -#include "BuildConfig.h" -#include "Application.h" +#include +#include ImgurAlbumCreation::ImgurAlbumCreation(QList screenshots) : NetAction(), m_screenshots(screenshots) diff --git a/launcher/screenshots/ImgurUpload.cpp b/launcher/screenshots/ImgurUpload.cpp index 60f5c50df..1cb6afc1e 100644 --- a/launcher/screenshots/ImgurUpload.cpp +++ b/launcher/screenshots/ImgurUpload.cpp @@ -18,7 +18,7 @@ */ #include "ImgurUpload.h" -#include "BuildConfig.h" +#include #include #include diff --git a/launcher/scripts/check-plugin-independence.sh b/launcher/scripts/check-plugin-independence.sh index 8c8260d70..e32520a2f 100755 --- a/launcher/scripts/check-plugin-independence.sh +++ b/launcher/scripts/check-plugin-independence.sh @@ -11,7 +11,7 @@ # # 1. Source-level grep over plugins/ — forbids re-introducing the # back-doors that ABI 3 closed (APPLICATION->, Application::*, -# direct #include "Application.h" / "BaseInstance.h" / …, BasePage +# direct #include / "BaseInstance.h" / …, BasePage # subclassing through the launcher tree, etc.). # # 2. Link-command grep over the build directory — confirms that the diff --git a/launcher/settings/INIFile.cpp b/launcher/settings/INIFile.cpp index d8a3f2350..7bb832f40 100644 --- a/launcher/settings/INIFile.cpp +++ b/launcher/settings/INIFile.cpp @@ -19,7 +19,7 @@ */ #include "settings/INIFile.h" -#include +#include #include #include diff --git a/launcher/tools/BaseExternalTool.cpp b/launcher/tools/BaseExternalTool.cpp index 00fc1eac7..4fcd0c05b 100644 --- a/launcher/tools/BaseExternalTool.cpp +++ b/launcher/tools/BaseExternalTool.cpp @@ -26,7 +26,7 @@ #include #endif -#include "BaseInstance.h" +#include BaseExternalTool::BaseExternalTool(SettingsObjectPtr settings, InstancePtr instance, QObject* parent) diff --git a/launcher/tools/BaseExternalTool.h b/launcher/tools/BaseExternalTool.h index b98bb5f87..3f0f8432a 100644 --- a/launcher/tools/BaseExternalTool.h +++ b/launcher/tools/BaseExternalTool.h @@ -20,7 +20,7 @@ #pragma once #include -#include +#include class BaseInstance; class SettingsObject; diff --git a/launcher/tools/JProfiler.cpp b/launcher/tools/JProfiler.cpp index bd26cabde..45da25649 100644 --- a/launcher/tools/JProfiler.cpp +++ b/launcher/tools/JProfiler.cpp @@ -23,7 +23,7 @@ #include "settings/SettingsObject.h" #include "launch/LaunchTask.h" -#include "BaseInstance.h" +#include class JProfiler : public BaseProfiler { diff --git a/launcher/tools/JVisualVM.cpp b/launcher/tools/JVisualVM.cpp index 81a3c5cc8..e3b649bf3 100644 --- a/launcher/tools/JVisualVM.cpp +++ b/launcher/tools/JVisualVM.cpp @@ -24,7 +24,7 @@ #include "settings/SettingsObject.h" #include "launch/LaunchTask.h" -#include "BaseInstance.h" +#include class JVisualVM : public BaseProfiler { diff --git a/launcher/tools/MCEditTool.cpp b/launcher/tools/MCEditTool.cpp index 314e4ac0b..5be644552 100644 --- a/launcher/tools/MCEditTool.cpp +++ b/launcher/tools/MCEditTool.cpp @@ -24,7 +24,7 @@ #include #include "settings/SettingsObject.h" -#include "BaseInstance.h" +#include #include "minecraft/MinecraftInstance.h" MCEditTool::MCEditTool(SettingsObjectPtr settings) diff --git a/launcher/tools/shimgen/CMakeLists.txt b/launcher/tools/shimgen/CMakeLists.txt new file mode 100644 index 000000000..ec5afd983 --- /dev/null +++ b/launcher/tools/shimgen/CMakeLists.txt @@ -0,0 +1,4 @@ +cmake_minimum_required(VERSION 3.24) +project(shimgen) +set(CMAKE_CXX_STANDARD 17) +add_executable(shimgen shimgen.cc) diff --git a/launcher/tools/shimgen/shimgen.cc b/launcher/tools/shimgen/shimgen.cc new file mode 100644 index 000000000..aeb9047b1 --- /dev/null +++ b/launcher/tools/shimgen/shimgen.cc @@ -0,0 +1,38 @@ +// Public domain. It is too generic to meet the threshold of originality defined in the +// 5846 Sayılı Fikir ve Sanat Eserleri Kanunu Madde 1/B (a) bendi. + +#include +#include +#include +#include + +int main(int argc, char** argv) { + if (argc != 3) { + std::cerr << "usage: shimgen \n"; + return 1; + } + std::filesystem::path srcRoot = argv[1]; + std::filesystem::path includeRoot = argv[2]; + + std::regex marker(R"(@meshmc-public:\s*([\w./-]+))"); + + for (auto& entry : std::filesystem::recursive_directory_iterator(srcRoot)) { + if (entry.path().extension() != ".h" && entry.path().extension() != ".hpp") continue; + + std::ifstream in(entry.path()); + std::string line; + std::smatch m; + while (std::getline(in, line)) { + if (std::regex_search(line, m, marker)) { + std::filesystem::path publicPath = includeRoot / m[1].str(); + std::filesystem::create_directories(publicPath.parent_path()); + + std::filesystem::path rel = std::filesystem::relative(entry.path(), publicPath.parent_path()); + + std::ofstream out(publicPath); + out << "#pragma once\n#include \"" << rel.generic_string() << "\"\n"; + break; + } + } + } +} diff --git a/launcher/translations/POTranslator.cpp b/launcher/translations/POTranslator.cpp index 629f0dd9c..62b5a80c8 100644 --- a/launcher/translations/POTranslator.cpp +++ b/launcher/translations/POTranslator.cpp @@ -20,7 +20,7 @@ #include "POTranslator.h" #include -#include "FileSystem.h" +#include struct POEntry { QString text; diff --git a/launcher/translations/TranslationsModel.cpp b/launcher/translations/TranslationsModel.cpp index ad631a9cb..363ca3d55 100644 --- a/launcher/translations/TranslationsModel.cpp +++ b/launcher/translations/TranslationsModel.cpp @@ -26,15 +26,15 @@ #include #include -#include "FileSystem.h" +#include #include "net/NetJob.h" #include "net/ChecksumValidator.h" -#include "BuildConfig.h" -#include "Json.h" +#include +#include #include "POTranslator.h" -#include "Application.h" +#include const static QLatin1String defaultLangCode("en_US"); diff --git a/launcher/ui/GuiUtil.cpp b/launcher/ui/GuiUtil.cpp index b1b52b3c1..1eb3bdb5a 100644 --- a/launcher/ui/GuiUtil.cpp +++ b/launcher/ui/GuiUtil.cpp @@ -28,10 +28,10 @@ #include "ui/dialogs/CustomMessageBox.h" #include "net/PasteUpload.h" -#include "Application.h" +#include #include -#include -#include +#include +#include QString GuiUtil::uploadPaste(const QString& text, QWidget* parentWidget) { diff --git a/launcher/ui/InstanceWindow.cpp b/launcher/ui/InstanceWindow.cpp index f2e81ea5f..9a92f039f 100644 --- a/launcher/ui/InstanceWindow.cpp +++ b/launcher/ui/InstanceWindow.cpp @@ -19,7 +19,7 @@ */ #include "InstanceWindow.h" -#include "Application.h" +#include #include #include @@ -32,7 +32,7 @@ #include "ui/dialogs/ProgressDialog.h" #include "ui/widgets/PageContainer.h" -#include "InstancePageProvider.h" +#include #include "icons/IconList.h" diff --git a/launcher/ui/InstanceWindow.h b/launcher/ui/InstanceWindow.h index 2fb7c38ff..f2070dda9 100644 --- a/launcher/ui/InstanceWindow.h +++ b/launcher/ui/InstanceWindow.h @@ -23,7 +23,7 @@ #include #include -#include "LaunchController.h" +#include #include "launch/LaunchTask.h" #include "ui/pages/BasePageContainer.h" diff --git a/launcher/ui/MacMenuBar.cpp b/launcher/ui/MacMenuBar.cpp index fd5d3c921..b0b18f3c2 100644 --- a/launcher/ui/MacMenuBar.cpp +++ b/launcher/ui/MacMenuBar.cpp @@ -30,7 +30,7 @@ #include #include -#include "Application.h" +#include #include "settings/Setting.h" #include "settings/SettingsObject.h" diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp index e72538b7c..815b76fff 100644 --- a/launcher/ui/MainWindow.cpp +++ b/launcher/ui/MainWindow.cpp @@ -20,9 +20,9 @@ #include "ui_MainWindow.h" -#include "Application.h" -#include "BuildConfig.h" -#include "plugin/PluginManager.h" +#include +#include +#include #include "plugin/PluginHooks.h" #include "MainWindow.h" @@ -57,7 +57,7 @@ #include #include -#include +#include #include #include #include @@ -69,7 +69,7 @@ #include #include #include -#include +#include #include #include #include @@ -77,12 +77,12 @@ #include #include -#include -#include +#include +#include #include "InstanceWindow.h" -#include "InstancePageProvider.h" -#include "JavaCommon.h" -#include "LaunchController.h" +#include +#include +#include #include "ui/instanceview/InstanceProxyModel.h" #include "ui/instanceview/InstanceView.h" @@ -105,10 +105,10 @@ #include "ui/dialogs/CreateShortcutDialog.h" #include "ui/dialogs/skins/SkinManageDialog.h" -#include "KonamiCode.h" +#include -#include "InstanceImportTask.h" -#include "InstanceCopyTask.h" +#include +#include #include "MMCTime.h" diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h index 7747e9d61..ebc501728 100644 --- a/launcher/ui/MainWindow.h +++ b/launcher/ui/MainWindow.h @@ -27,7 +27,7 @@ #include #include -#include "BaseInstance.h" +#include #include "minecraft/auth/MinecraftAccount.h" #include "net/NetJob.h" diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp index 238e8e10e..032406291 100644 --- a/launcher/ui/dialogs/AboutDialog.cpp +++ b/launcher/ui/dialogs/AboutDialog.cpp @@ -21,12 +21,12 @@ #include "AboutDialog.h" #include "ui_AboutDialog.h" #include -#include "Application.h" -#include "BuildConfig.h" +#include +#include #include -#include "HoeDown.h" +#include #include "MMCStrings.h" namespace diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp index 76221d89c..ef9856858 100644 --- a/launcher/ui/dialogs/BlockedModsDialog.cpp +++ b/launcher/ui/dialogs/BlockedModsDialog.cpp @@ -19,7 +19,7 @@ #include "BlockedModsDialog.h" -#include +#include #include #include #include diff --git a/launcher/ui/dialogs/CopyInstanceDialog.cpp b/launcher/ui/dialogs/CopyInstanceDialog.cpp index 9328d68c1..86322d691 100644 --- a/launcher/ui/dialogs/CopyInstanceDialog.cpp +++ b/launcher/ui/dialogs/CopyInstanceDialog.cpp @@ -21,17 +21,17 @@ #include #include -#include "Application.h" +#include #include "CopyInstanceDialog.h" #include "ui_CopyInstanceDialog.h" #include "ui/dialogs/IconPickerDialog.h" -#include "BaseVersion.h" +#include #include "icons/IconList.h" #include "tasks/Task.h" -#include "BaseInstance.h" -#include "InstanceList.h" +#include +#include CopyInstanceDialog::CopyInstanceDialog(InstancePtr original, QWidget* parent) : QDialog(parent), ui(new Ui::CopyInstanceDialog), m_original(original) diff --git a/launcher/ui/dialogs/CopyInstanceDialog.h b/launcher/ui/dialogs/CopyInstanceDialog.h index 622be7492..fa38c8a54 100644 --- a/launcher/ui/dialogs/CopyInstanceDialog.h +++ b/launcher/ui/dialogs/CopyInstanceDialog.h @@ -21,8 +21,8 @@ #pragma once #include -#include "BaseVersion.h" -#include +#include +#include class BaseInstance; diff --git a/launcher/ui/dialogs/CreateShortcutDialog.cpp b/launcher/ui/dialogs/CreateShortcutDialog.cpp index aa82133bb..6815e2d6c 100644 --- a/launcher/ui/dialogs/CreateShortcutDialog.cpp +++ b/launcher/ui/dialogs/CreateShortcutDialog.cpp @@ -22,9 +22,9 @@ #include -#include "Application.h" -#include "DesktopServices.h" -#include "FileSystem.h" +#include +#include +#include #include "icons/IconList.h" #include "minecraft/MinecraftInstance.h" #include "minecraft/ShortcutUtils.h" diff --git a/launcher/ui/dialogs/DownloadContentDialog.cpp b/launcher/ui/dialogs/DownloadContentDialog.cpp index d337d608b..efb4be3f8 100644 --- a/launcher/ui/dialogs/DownloadContentDialog.cpp +++ b/launcher/ui/dialogs/DownloadContentDialog.cpp @@ -25,7 +25,7 @@ #include #include -#include "Application.h" +#include #include "minecraft/PackProfile.h" #include "minecraft/mod/ModMetadataIndex.h" #include "modplatform/flame/FlameContentModel.h" diff --git a/launcher/ui/dialogs/EditAccountDialog.cpp b/launcher/ui/dialogs/EditAccountDialog.cpp index 89096f1cb..9c3ac4c67 100644 --- a/launcher/ui/dialogs/EditAccountDialog.cpp +++ b/launcher/ui/dialogs/EditAccountDialog.cpp @@ -20,7 +20,7 @@ #include "EditAccountDialog.h" #include "ui_EditAccountDialog.h" -#include +#include #include EditAccountDialog::EditAccountDialog(const QString& text, QWidget* parent, diff --git a/launcher/ui/dialogs/ExportInstanceDialog.cpp b/launcher/ui/dialogs/ExportInstanceDialog.cpp index 8ad974098..1739e96c5 100644 --- a/launcher/ui/dialogs/ExportInstanceDialog.cpp +++ b/launcher/ui/dialogs/ExportInstanceDialog.cpp @@ -21,8 +21,8 @@ #include "ExportInstanceDialog.h" #include "ui_ExportInstanceDialog.h" -#include -#include +#include +#include #include #include @@ -38,8 +38,8 @@ #include #include -#include "Application.h" -#include "FileIgnoreProxy.h" +#include +#include #include "archive/ExportToZipTask.h" #include "ui/dialogs/CustomMessageBox.h" #include "ui/dialogs/ProgressDialog.h" diff --git a/launcher/ui/dialogs/ExportInstanceDialog.h b/launcher/ui/dialogs/ExportInstanceDialog.h index 2cba72950..d7e36c138 100644 --- a/launcher/ui/dialogs/ExportInstanceDialog.h +++ b/launcher/ui/dialogs/ExportInstanceDialog.h @@ -24,7 +24,7 @@ #include #include -#include "FastFileIconProvider.h" +#include class BaseInstance; class FileIgnoreProxy; diff --git a/launcher/ui/dialogs/ExportListDialog.cpp b/launcher/ui/dialogs/ExportListDialog.cpp index 2f48f51e3..12268497d 100644 --- a/launcher/ui/dialogs/ExportListDialog.cpp +++ b/launcher/ui/dialogs/ExportListDialog.cpp @@ -39,8 +39,8 @@ #include -#include "FileSystem.h" -#include "HoeDown.h" +#include +#include namespace { diff --git a/launcher/ui/dialogs/ExportPackDialog.cpp b/launcher/ui/dialogs/ExportPackDialog.cpp index 3bcd4e837..2c81ead41 100644 --- a/launcher/ui/dialogs/ExportPackDialog.cpp +++ b/launcher/ui/dialogs/ExportPackDialog.cpp @@ -34,8 +34,8 @@ #include #include -#include "FileIgnoreProxy.h" -#include "FileSystem.h" +#include +#include #include "minecraft/MinecraftInstance.h" #include "modplatform/flame/FlamePackExportTask.h" #include "modplatform/modrinth/ModrinthPackExportTask.h" diff --git a/launcher/ui/dialogs/ExportPackDialog.h b/launcher/ui/dialogs/ExportPackDialog.h index 399c7ac81..083d368a4 100644 --- a/launcher/ui/dialogs/ExportPackDialog.h +++ b/launcher/ui/dialogs/ExportPackDialog.h @@ -24,7 +24,7 @@ #include -#include "FastFileIconProvider.h" +#include #include "tasks/Task.h" class FileIgnoreProxy; diff --git a/launcher/ui/dialogs/IconPickerDialog.cpp b/launcher/ui/dialogs/IconPickerDialog.cpp index 6ba0759b3..30f90cf12 100644 --- a/launcher/ui/dialogs/IconPickerDialog.cpp +++ b/launcher/ui/dialogs/IconPickerDialog.cpp @@ -22,7 +22,7 @@ #include #include -#include "Application.h" +#include #include "IconPickerDialog.h" #include "ui_IconPickerDialog.h" @@ -31,7 +31,7 @@ #include "icons/IconList.h" #include "icons/IconUtils.h" -#include +#include IconPickerDialog::IconPickerDialog(QWidget* parent) : QDialog(parent), ui(new Ui::IconPickerDialog) diff --git a/launcher/ui/dialogs/InstallLoaderDialog.cpp b/launcher/ui/dialogs/InstallLoaderDialog.cpp index c82d8f5e6..c0aa62689 100644 --- a/launcher/ui/dialogs/InstallLoaderDialog.cpp +++ b/launcher/ui/dialogs/InstallLoaderDialog.cpp @@ -6,7 +6,7 @@ #include #include -#include "Application.h" +#include #include "Version.h" #include "meta/Index.h" #include "meta/VersionList.h" diff --git a/launcher/ui/dialogs/JavaDownloadDialog.cpp b/launcher/ui/dialogs/JavaDownloadDialog.cpp index 6d0447a79..9e6461c7a 100644 --- a/launcher/ui/dialogs/JavaDownloadDialog.cpp +++ b/launcher/ui/dialogs/JavaDownloadDialog.cpp @@ -31,10 +31,10 @@ #include #include -#include "Application.h" -#include "BuildConfig.h" -#include "FileSystem.h" -#include "Json.h" +#include +#include +#include +#include #include "java/JavaUtils.h" #include "net/Download.h" diff --git a/launcher/ui/dialogs/MeshMCLogsDialog.cpp b/launcher/ui/dialogs/MeshMCLogsDialog.cpp index 72f58fd24..3c77a4ff6 100644 --- a/launcher/ui/dialogs/MeshMCLogsDialog.cpp +++ b/launcher/ui/dialogs/MeshMCLogsDialog.cpp @@ -27,8 +27,8 @@ #include #include -#include "Application.h" -#include "BuildConfig.h" +#include +#include #include "ui/GuiUtil.h" MeshMCLogsDialog::MeshMCLogsDialog(QWidget* parent) diff --git a/launcher/ui/dialogs/NewComponentDialog.cpp b/launcher/ui/dialogs/NewComponentDialog.cpp index ccb522405..1bbf069f5 100644 --- a/launcher/ui/dialogs/NewComponentDialog.cpp +++ b/launcher/ui/dialogs/NewComponentDialog.cpp @@ -18,7 +18,7 @@ * limitations under the License. */ -#include "Application.h" +#include #include "NewComponentDialog.h" #include "ui_NewComponentDialog.h" diff --git a/launcher/ui/dialogs/NewInstanceDialog.cpp b/launcher/ui/dialogs/NewInstanceDialog.cpp index 99cb4a1fa..bbacb9a4b 100644 --- a/launcher/ui/dialogs/NewInstanceDialog.cpp +++ b/launcher/ui/dialogs/NewInstanceDialog.cpp @@ -18,7 +18,7 @@ * limitations under the License. */ -#include "Application.h" +#include #include "NewInstanceDialog.h" #include "ui_NewInstanceDialog.h" diff --git a/launcher/ui/dialogs/NewInstanceDialog.h b/launcher/ui/dialogs/NewInstanceDialog.h index 908b5264a..a39d5c618 100644 --- a/launcher/ui/dialogs/NewInstanceDialog.h +++ b/launcher/ui/dialogs/NewInstanceDialog.h @@ -22,9 +22,9 @@ #include -#include "BaseVersion.h" +#include #include "ui/pages/BasePageProvider.h" -#include "InstanceTask.h" +#include namespace Ui { diff --git a/launcher/ui/dialogs/PluginsDialog.cpp b/launcher/ui/dialogs/PluginsDialog.cpp index 82eabb3d0..e83277469 100644 --- a/launcher/ui/dialogs/PluginsDialog.cpp +++ b/launcher/ui/dialogs/PluginsDialog.cpp @@ -25,10 +25,10 @@ #include #include -#include "Application.h" -#include "BuildConfig.h" -#include "plugin/PluginManager.h" -#include "plugin/PluginSignature.h" +#include +#include +#include +#include namespace { diff --git a/launcher/ui/dialogs/ProfileSelectDialog.cpp b/launcher/ui/dialogs/ProfileSelectDialog.cpp index f9964a9f6..0da5dad60 100644 --- a/launcher/ui/dialogs/ProfileSelectDialog.cpp +++ b/launcher/ui/dialogs/ProfileSelectDialog.cpp @@ -25,7 +25,7 @@ #include #include "SkinUtils.h" -#include "Application.h" +#include #include "ui/dialogs/ProgressDialog.h" diff --git a/launcher/ui/dialogs/UpdateAvailableDialog.cpp b/launcher/ui/dialogs/UpdateAvailableDialog.cpp index 159597eca..8c60c9f3d 100644 --- a/launcher/ui/dialogs/UpdateAvailableDialog.cpp +++ b/launcher/ui/dialogs/UpdateAvailableDialog.cpp @@ -23,8 +23,8 @@ #include #include -#include "BuildConfig.h" -#include "HoeDown.h" +#include +#include #include "MMCStrings.h" UpdateAvailableDialog::UpdateAvailableDialog(const QString& currentVersion, diff --git a/launcher/ui/dialogs/VersionSelectDialog.cpp b/launcher/ui/dialogs/VersionSelectDialog.cpp index 1dc44050d..7b3de2a41 100644 --- a/launcher/ui/dialogs/VersionSelectDialog.cpp +++ b/launcher/ui/dialogs/VersionSelectDialog.cpp @@ -31,10 +31,10 @@ #include "ui/widgets/VersionSelectWidget.h" #include "ui/dialogs/CustomMessageBox.h" -#include "BaseVersion.h" -#include "BaseVersionList.h" +#include +#include #include "tasks/Task.h" -#include "Application.h" +#include #include "VersionProxyModel.h" VersionSelectDialog::VersionSelectDialog(BaseVersionList* vlist, QString title, diff --git a/launcher/ui/dialogs/VersionSelectDialog.h b/launcher/ui/dialogs/VersionSelectDialog.h index 6e39ac5b3..92100a7a3 100644 --- a/launcher/ui/dialogs/VersionSelectDialog.h +++ b/launcher/ui/dialogs/VersionSelectDialog.h @@ -23,7 +23,7 @@ #include #include -#include "BaseVersionList.h" +#include class QVBoxLayout; class QHBoxLayout; diff --git a/launcher/ui/dialogs/skins/SkinManageDialog.cpp b/launcher/ui/dialogs/skins/SkinManageDialog.cpp index 3ae7b0f5f..fcf9965c9 100644 --- a/launcher/ui/dialogs/skins/SkinManageDialog.cpp +++ b/launcher/ui/dialogs/skins/SkinManageDialog.cpp @@ -40,9 +40,9 @@ #include #include -#include "Application.h" -#include "DesktopServices.h" -#include "FileSystem.h" +#include +#include +#include #include "QObjectPtr.h" #include "settings/SettingsObject.h" diff --git a/launcher/ui/dialogs/skins/render/SkinPreviewSurface.cpp b/launcher/ui/dialogs/skins/render/SkinPreviewSurface.cpp index f19d5f5d8..c554f633e 100644 --- a/launcher/ui/dialogs/skins/render/SkinPreviewSurface.cpp +++ b/launcher/ui/dialogs/skins/render/SkinPreviewSurface.cpp @@ -32,7 +32,7 @@ #include -#include "BuildConfig.h" +#include #include "minecraft/skins/SkinEntry.h" #include "rainbow.h" #include "ui/dialogs/skins/render/CubeMesh.h" diff --git a/launcher/ui/instanceview/InstanceDelegate.cpp b/launcher/ui/instanceview/InstanceDelegate.cpp index dfd5f0010..27a019539 100644 --- a/launcher/ui/instanceview/InstanceDelegate.cpp +++ b/launcher/ui/instanceview/InstanceDelegate.cpp @@ -27,8 +27,8 @@ #include #include "InstanceView.h" -#include "BaseInstance.h" -#include "InstanceList.h" +#include +#include #include #include diff --git a/launcher/ui/instanceview/InstanceProxyModel.cpp b/launcher/ui/instanceview/InstanceProxyModel.cpp index 5a918656c..2ad793eaa 100644 --- a/launcher/ui/instanceview/InstanceProxyModel.cpp +++ b/launcher/ui/instanceview/InstanceProxyModel.cpp @@ -21,8 +21,8 @@ #include "InstanceProxyModel.h" #include "InstanceView.h" -#include "Application.h" -#include +#include +#include #include #include diff --git a/launcher/ui/pagedialog/PageDialog.cpp b/launcher/ui/pagedialog/PageDialog.cpp index b1646fe88..d45dc3f02 100644 --- a/launcher/ui/pagedialog/PageDialog.cpp +++ b/launcher/ui/pagedialog/PageDialog.cpp @@ -25,7 +25,7 @@ #include #include -#include "Application.h" +#include #include "settings/SettingsObject.h" #include "ui/widgets/IconLabel.h" diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp index 8510db16c..c58c2179f 100644 --- a/launcher/ui/pages/global/AccountListPage.cpp +++ b/launcher/ui/pages/global/AccountListPage.cpp @@ -39,9 +39,9 @@ #include "minecraft/auth/AccountTask.h" #include "minecraft/services/SkinDelete.h" -#include "Application.h" +#include -#include "BuildConfig.h" +#include AccountListPage::AccountListPage(QWidget* parent) : QMainWindow(parent), ui(new Ui::AccountListPage) diff --git a/launcher/ui/pages/global/AccountListPage.h b/launcher/ui/pages/global/AccountListPage.h index 3f3382dc0..1b373e803 100644 --- a/launcher/ui/pages/global/AccountListPage.h +++ b/launcher/ui/pages/global/AccountListPage.h @@ -26,7 +26,7 @@ #include "ui/pages/BasePage.h" #include "minecraft/auth/AccountList.h" -#include "Application.h" +#include namespace Ui { diff --git a/launcher/ui/pages/global/AppearancePage.cpp b/launcher/ui/pages/global/AppearancePage.cpp index b6cabe6ae..b8332f27b 100644 --- a/launcher/ui/pages/global/AppearancePage.cpp +++ b/launcher/ui/pages/global/AppearancePage.cpp @@ -20,8 +20,8 @@ #include "AppearancePage.h" #include "ui_AppearancePage.h" -#include "Application.h" -#include "DesktopServices.h" +#include +#include #include "ui/themes/ITheme.h" #include "ui/themes/ThemeManager.h" #include "ui/themes/CatPack.h" diff --git a/launcher/ui/pages/global/ExternalToolsPage.cpp b/launcher/ui/pages/global/ExternalToolsPage.cpp index 5a3d8da40..490c469a6 100644 --- a/launcher/ui/pages/global/ExternalToolsPage.cpp +++ b/launcher/ui/pages/global/ExternalToolsPage.cpp @@ -28,8 +28,8 @@ #include "settings/SettingsObject.h" #include "tools/BaseProfiler.h" -#include -#include "Application.h" +#include +#include #include ExternalToolsPage::ExternalToolsPage(QWidget* parent) diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp index a0e428712..df87cadca 100644 --- a/launcher/ui/pages/global/JavaPage.cpp +++ b/launcher/ui/pages/global/JavaPage.cpp @@ -19,7 +19,7 @@ */ #include "JavaPage.h" -#include "JavaCommon.h" +#include #include "ui_JavaPage.h" #include @@ -39,8 +39,8 @@ #include "java/download/JavaRuntime.h" #include "settings/SettingsObject.h" -#include -#include "Application.h" +#include +#include #include "Sys.h" JavaPage::JavaPage(QWidget* parent) : QWidget(parent), ui(new Ui::JavaPage) diff --git a/launcher/ui/pages/global/JavaPage.h b/launcher/ui/pages/global/JavaPage.h index 80104e1ce..4c02f53ff 100644 --- a/launcher/ui/pages/global/JavaPage.h +++ b/launcher/ui/pages/global/JavaPage.h @@ -23,7 +23,7 @@ #include #include #include "ui/pages/BasePage.h" -#include "JavaCommon.h" +#include #include #include diff --git a/launcher/ui/pages/global/MeshMCPage.cpp b/launcher/ui/pages/global/MeshMCPage.cpp index 1286b3876..3573f0d3a 100644 --- a/launcher/ui/pages/global/MeshMCPage.cpp +++ b/launcher/ui/pages/global/MeshMCPage.cpp @@ -29,11 +29,11 @@ #include "updater/ExternalUpdater.h" #include "settings/SettingsObject.h" -#include -#include "InstanceList.h" -#include "DesktopServices.h" -#include "Application.h" -#include "BuildConfig.h" +#include +#include +#include +#include +#include #include #include diff --git a/launcher/ui/pages/global/MinecraftPage.cpp b/launcher/ui/pages/global/MinecraftPage.cpp index 1718b4920..d457e4005 100644 --- a/launcher/ui/pages/global/MinecraftPage.cpp +++ b/launcher/ui/pages/global/MinecraftPage.cpp @@ -26,7 +26,7 @@ #include #include "settings/SettingsObject.h" -#include "Application.h" +#include MinecraftPage::MinecraftPage(QWidget* parent) : QWidget(parent), ui(new Ui::MinecraftPage) diff --git a/launcher/ui/pages/global/PasteEEPage.cpp b/launcher/ui/pages/global/PasteEEPage.cpp index 15f29d1cc..4b6ae087d 100644 --- a/launcher/ui/pages/global/PasteEEPage.cpp +++ b/launcher/ui/pages/global/PasteEEPage.cpp @@ -28,7 +28,7 @@ #include "settings/SettingsObject.h" #include "tools/BaseProfiler.h" -#include "Application.h" +#include PasteEEPage::PasteEEPage(QWidget* parent) : QWidget(parent), ui(new Ui::PasteEEPage) diff --git a/launcher/ui/pages/global/ProxyPage.cpp b/launcher/ui/pages/global/ProxyPage.cpp index 5bff88b24..de0d6a46d 100644 --- a/launcher/ui/pages/global/ProxyPage.cpp +++ b/launcher/ui/pages/global/ProxyPage.cpp @@ -24,8 +24,8 @@ #include #include "settings/SettingsObject.h" -#include "Application.h" -#include "Application.h" +#include +#include ProxyPage::ProxyPage(QWidget* parent) : QWidget(parent), ui(new Ui::ProxyPage) { diff --git a/launcher/ui/pages/instance/BackupPage.h b/launcher/ui/pages/instance/BackupPage.h index c962b45a5..70c0e12f7 100644 --- a/launcher/ui/pages/instance/BackupPage.h +++ b/launcher/ui/pages/instance/BackupPage.h @@ -22,7 +22,7 @@ #include #include -#include "BaseInstance.h" +#include #include "backup/BackupManager.h" #include "ui/pages/BasePage.h" #include diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp index 8ccd5c52b..a18851c62 100644 --- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp +++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp @@ -29,12 +29,12 @@ #include "ui/dialogs/VersionSelectDialog.h" #include "ui/widgets/CustomCommands.h" -#include "JavaCommon.h" -#include "Application.h" +#include +#include #include "java/JavaInstallList.h" #include "java/download/JavaRuntime.h" -#include "FileSystem.h" +#include InstanceSettingsPage::InstanceSettingsPage(BaseInstance* inst, QWidget* parent) : QWidget(parent), ui(new Ui::InstanceSettingsPage), m_instance(inst) diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.h b/launcher/ui/pages/instance/InstanceSettingsPage.h index 78f893730..015f46121 100644 --- a/launcher/ui/pages/instance/InstanceSettingsPage.h +++ b/launcher/ui/pages/instance/InstanceSettingsPage.h @@ -23,11 +23,11 @@ #include #include "java/JavaChecker.h" -#include "BaseInstance.h" +#include #include #include "ui/pages/BasePage.h" -#include "JavaCommon.h" -#include "Application.h" +#include +#include class JavaChecker; namespace Ui diff --git a/launcher/ui/pages/instance/LegacyUpgradePage.cpp b/launcher/ui/pages/instance/LegacyUpgradePage.cpp index 8117581b2..a724b3481 100644 --- a/launcher/ui/pages/instance/LegacyUpgradePage.cpp +++ b/launcher/ui/pages/instance/LegacyUpgradePage.cpp @@ -20,10 +20,10 @@ #include "LegacyUpgradePage.h" #include "ui_LegacyUpgradePage.h" -#include "InstanceList.h" +#include #include "minecraft/legacy/LegacyInstance.h" #include "minecraft/legacy/LegacyUpgradeTask.h" -#include "Application.h" +#include #include "ui/dialogs/CustomMessageBox.h" #include "ui/dialogs/ProgressDialog.h" diff --git a/launcher/ui/pages/instance/LogPage.cpp b/launcher/ui/pages/instance/LogPage.cpp index 1ca801bc9..4f9a66ae4 100644 --- a/launcher/ui/pages/instance/LogPage.cpp +++ b/launcher/ui/pages/instance/LogPage.cpp @@ -20,7 +20,7 @@ #include "LogPage.h" #include "ui_LogPage.h" -#include "Application.h" +#include #include #include @@ -33,7 +33,7 @@ #include "ui/GuiUtil.h" #include "ui/ColorCache.h" -#include +#include class LogFormatProxyModel : public QIdentityProxyModel { diff --git a/launcher/ui/pages/instance/LogPage.h b/launcher/ui/pages/instance/LogPage.h index 5196fd55b..ceb582cc1 100644 --- a/launcher/ui/pages/instance/LogPage.h +++ b/launcher/ui/pages/instance/LogPage.h @@ -22,7 +22,7 @@ #include -#include "BaseInstance.h" +#include #include "launch/LaunchTask.h" #include "ui/pages/BasePage.h" #include diff --git a/launcher/ui/pages/instance/ManagedPackPage.cpp b/launcher/ui/pages/instance/ManagedPackPage.cpp index 1b067118d..1df49c3f0 100644 --- a/launcher/ui/pages/instance/ManagedPackPage.cpp +++ b/launcher/ui/pages/instance/ManagedPackPage.cpp @@ -33,11 +33,11 @@ #include #include -#include "Application.h" -#include "HoeDown.h" -#include "InstanceImportTask.h" -#include "InstanceList.h" -#include "InstanceTask.h" +#include +#include +#include +#include +#include #include "MMCStrings.h" #include "QObjectPtr.h" #include "modplatform/flame/FlameApi.h" diff --git a/launcher/ui/pages/instance/ManagedPackPage.h b/launcher/ui/pages/instance/ManagedPackPage.h index ab0ad8a75..ad80c94c5 100644 --- a/launcher/ui/pages/instance/ManagedPackPage.h +++ b/launcher/ui/pages/instance/ManagedPackPage.h @@ -23,7 +23,7 @@ #include #include -#include "BaseInstance.h" +#include #include "modplatform/ManagedPackVersions.h" #include "net/NetJob.h" #include "ui/pages/BasePage.h" diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp index a01bfb656..03a275309 100644 --- a/launcher/ui/pages/instance/ModFolderPage.cpp +++ b/launcher/ui/pages/instance/ModFolderPage.cpp @@ -32,8 +32,8 @@ #include #include -#include "Application.h" -#include "FileSystem.h" +#include +#include #include "minecraft/mod/ModMetadataIndex.h" #include "ui/dialogs/BlockedModsDialog.h" @@ -44,7 +44,7 @@ #include "ui/dialogs/ProgressDialog.h" #include "ui/GuiUtil.h" -#include "DesktopServices.h" +#include #include "minecraft/mod/ModFolderModel.h" #include "minecraft/mod/Mod.h" diff --git a/launcher/ui/pages/instance/NotesPage.h b/launcher/ui/pages/instance/NotesPage.h index 498f8b3c6..f934b3fce 100644 --- a/launcher/ui/pages/instance/NotesPage.h +++ b/launcher/ui/pages/instance/NotesPage.h @@ -22,7 +22,7 @@ #include -#include "BaseInstance.h" +#include #include "ui/pages/BasePage.h" #include diff --git a/launcher/ui/pages/instance/OtherLogsPage.cpp b/launcher/ui/pages/instance/OtherLogsPage.cpp index f8fcb91fb..d6a0a9c0e 100644 --- a/launcher/ui/pages/instance/OtherLogsPage.cpp +++ b/launcher/ui/pages/instance/OtherLogsPage.cpp @@ -27,7 +27,7 @@ #include "RecursiveFileSystemWatcher.h" #include -#include +#include #include OtherLogsPage::OtherLogsPage(QString path, IPathMatcher::Ptr fileFilter, diff --git a/launcher/ui/pages/instance/ScreenshotsPage.cpp b/launcher/ui/pages/instance/ScreenshotsPage.cpp index 84cd368d3..d4e80f626 100644 --- a/launcher/ui/pages/instance/ScreenshotsPage.cpp +++ b/launcher/ui/pages/instance/ScreenshotsPage.cpp @@ -46,8 +46,8 @@ #include "tasks/SequentialTask.h" #include "RWStorage.h" -#include -#include +#include +#include typedef RWStorage SharedIconCache; typedef std::shared_ptr SharedIconCachePtr; diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp index c4ee32790..daf5a130c 100644 --- a/launcher/ui/pages/instance/ServersPage.cpp +++ b/launcher/ui/pages/instance/ServersPage.cpp @@ -20,7 +20,7 @@ #include "ServersPage.h" #include "ui_ServersPage.h" -#include +#include #include #include #include diff --git a/launcher/ui/pages/instance/VersionPage.cpp b/launcher/ui/pages/instance/VersionPage.cpp index a87a49cbd..39a2499b0 100644 --- a/launcher/ui/pages/instance/VersionPage.cpp +++ b/launcher/ui/pages/instance/VersionPage.cpp @@ -18,7 +18,7 @@ * limitations under the License. */ -#include "Application.h" +#include #include #include @@ -46,9 +46,9 @@ #include "minecraft/auth/AccountList.h" #include "minecraft/mod/Mod.h" #include "icons/IconList.h" -#include "Exception.h" +#include #include "Version.h" -#include "DesktopServices.h" +#include #include "meta/Index.h" #include "meta/VersionList.h" diff --git a/launcher/ui/pages/instance/WorldListPage.cpp b/launcher/ui/pages/instance/WorldListPage.cpp index 06a70b9f3..e1d09994e 100644 --- a/launcher/ui/pages/instance/WorldListPage.cpp +++ b/launcher/ui/pages/instance/WorldListPage.cpp @@ -38,16 +38,16 @@ #include #include "tools/MCEditTool.h" -#include "FileSystem.h" +#include #include "minecraft/mod/DataPackFolderModel.h" #include "ui/GuiUtil.h" #include "ui/pages/BasePageProvider.h" #include "ui/pages/instance/DataPackPage.h" #include "ui/widgets/PageContainer.h" -#include "DesktopServices.h" +#include -#include "Application.h" +#include class WorldListProxyModel : public QSortFilterProxyModel { diff --git a/launcher/ui/pages/instance/WorldListPage.h b/launcher/ui/pages/instance/WorldListPage.h index bfbc94e42..51f936213 100644 --- a/launcher/ui/pages/instance/WorldListPage.h +++ b/launcher/ui/pages/instance/WorldListPage.h @@ -25,7 +25,7 @@ #include "minecraft/MinecraftInstance.h" #include "ui/pages/BasePage.h" #include -#include +#include class WorldList; class ModFolderModel; diff --git a/launcher/ui/pages/modplatform/ContentProviderPage.cpp b/launcher/ui/pages/modplatform/ContentProviderPage.cpp index b1ffdf043..5be9ca049 100644 --- a/launcher/ui/pages/modplatform/ContentProviderPage.cpp +++ b/launcher/ui/pages/modplatform/ContentProviderPage.cpp @@ -32,7 +32,7 @@ #include #include -#include "DesktopServices.h" +#include #include "modplatform/ModDownloadTypes.h" #include "ui/dialogs/DownloadContentDialog.h" #include "ui/widgets/ContentFilterWidget.h" diff --git a/launcher/ui/pages/modplatform/ImportPage.cpp b/launcher/ui/pages/modplatform/ImportPage.cpp index adaf240ff..4b049cec5 100644 --- a/launcher/ui/pages/modplatform/ImportPage.cpp +++ b/launcher/ui/pages/modplatform/ImportPage.cpp @@ -25,7 +25,7 @@ #include "ui/dialogs/NewInstanceDialog.h" -#include "InstanceImportTask.h" +#include class UrlValidator : public QValidator { diff --git a/launcher/ui/pages/modplatform/VanillaPage.cpp b/launcher/ui/pages/modplatform/VanillaPage.cpp index d606051b1..c9709dec6 100644 --- a/launcher/ui/pages/modplatform/VanillaPage.cpp +++ b/launcher/ui/pages/modplatform/VanillaPage.cpp @@ -22,12 +22,12 @@ #include -#include "Application.h" +#include #include "meta/Index.h" #include "meta/VersionList.h" #include "ui/dialogs/NewInstanceDialog.h" -#include "Filter.h" -#include "InstanceCreationTask.h" +#include +#include VanillaPage::VanillaPage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), dialog(dialog), ui(new Ui::VanillaPage) diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp index c565b7800..0fb6f994d 100644 --- a/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp +++ b/launcher/ui/pages/modplatform/atlauncher/AtlListModel.cpp @@ -20,9 +20,9 @@ #include "AtlListModel.h" -#include +#include #include -#include +#include namespace Atl { diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp index 59bc6e095..a15d9af88 100644 --- a/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp +++ b/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp @@ -28,7 +28,7 @@ #include "ui/dialogs/NewInstanceDialog.h" #include "ui/dialogs/VersionSelectDialog.h" -#include +#include AtlPage::AtlPage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), ui(new Ui::AtlPage), dialog(dialog) diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlPage.h b/launcher/ui/pages/modplatform/atlauncher/AtlPage.h index 568f473ae..c2530ba41 100644 --- a/launcher/ui/pages/modplatform/atlauncher/AtlPage.h +++ b/launcher/ui/pages/modplatform/atlauncher/AtlPage.h @@ -26,7 +26,7 @@ #include #include -#include "Application.h" +#include #include "ui/pages/BasePage.h" #include "tasks/Task.h" diff --git a/launcher/ui/pages/modplatform/flame/FlameModel.cpp b/launcher/ui/pages/modplatform/flame/FlameModel.cpp index a9b159f1d..9eb7a7c20 100644 --- a/launcher/ui/pages/modplatform/flame/FlameModel.cpp +++ b/launcher/ui/pages/modplatform/flame/FlameModel.cpp @@ -18,9 +18,9 @@ */ #include "FlameModel.h" -#include "Application.h" +#include #include "modplatform/flame/FlameApi.h" -#include +#include #include #include diff --git a/launcher/ui/pages/modplatform/flame/FlamePage.cpp b/launcher/ui/pages/modplatform/flame/FlamePage.cpp index 4691a3459..5af570367 100644 --- a/launcher/ui/pages/modplatform/flame/FlamePage.cpp +++ b/launcher/ui/pages/modplatform/flame/FlamePage.cpp @@ -22,10 +22,10 @@ #include -#include "Application.h" -#include "Json.h" +#include +#include #include "ui/dialogs/NewInstanceDialog.h" -#include "InstanceImportTask.h" +#include #include "FlameModel.h" #include "modplatform/flame/FlameApi.h" diff --git a/launcher/ui/pages/modplatform/ftb/FtbListModel.cpp b/launcher/ui/pages/modplatform/ftb/FtbListModel.cpp index c9165de3c..200945b56 100644 --- a/launcher/ui/pages/modplatform/ftb/FtbListModel.cpp +++ b/launcher/ui/pages/modplatform/ftb/FtbListModel.cpp @@ -20,9 +20,9 @@ #include "FtbListModel.h" -#include "BuildConfig.h" -#include "Application.h" -#include "Json.h" +#include +#include +#include #include diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp index 8b593fac9..6d0fc8522 100644 --- a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp +++ b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp @@ -27,7 +27,7 @@ #include "ui/dialogs/NewInstanceDialog.h" #include "modplatform/modpacksch/FTBPackInstallTask.h" -#include "HoeDown.h" +#include FtbPage::FtbPage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), ui(new Ui::FtbPage), dialog(dialog) diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.h b/launcher/ui/pages/modplatform/ftb/FtbPage.h index 432ee059e..f0d9580d2 100644 --- a/launcher/ui/pages/modplatform/ftb/FtbPage.h +++ b/launcher/ui/pages/modplatform/ftb/FtbPage.h @@ -25,7 +25,7 @@ #include -#include "Application.h" +#include #include "ui/pages/BasePage.h" #include "tasks/Task.h" diff --git a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp index b38c46034..9b5b8c6fe 100644 --- a/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp +++ b/launcher/ui/pages/modplatform/legacy_ftb/ListModel.cpp @@ -18,7 +18,7 @@ */ #include "ListModel.h" -#include "Application.h" +#include #include "net/HttpMetaCache.h" #include "net/NetJob.h" @@ -31,7 +31,7 @@ #include -#include +#include namespace LegacyFTB { diff --git a/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp b/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp index 85f09da80..a77b72de5 100644 --- a/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp +++ b/launcher/ui/pages/modplatform/legacy_ftb/Page.cpp @@ -22,7 +22,7 @@ #include -#include "Application.h" +#include #include "ui/dialogs/CustomMessageBox.h" #include "ui/dialogs/NewInstanceDialog.h" diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp index 9b8bed13d..9ae958ecd 100644 --- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp +++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp @@ -19,8 +19,8 @@ #include "ModrinthModel.h" -#include "Application.h" -#include "Json.h" +#include +#include #include "modplatform/modrinth/ModrinthApi.h" #include diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp index fb8ac69c0..457779291 100644 --- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp +++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp @@ -22,10 +22,10 @@ #include -#include "Application.h" -#include "Json.h" +#include +#include #include "ui/dialogs/NewInstanceDialog.h" -#include "InstanceImportTask.h" +#include #include "ModrinthModel.h" #include "modplatform/modrinth/ModrinthApi.h" diff --git a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp index 51799a47a..73cd5ce30 100644 --- a/launcher/ui/pages/modplatform/technic/TechnicModel.cpp +++ b/launcher/ui/pages/modplatform/technic/TechnicModel.cpp @@ -19,9 +19,9 @@ */ #include "TechnicModel.h" -#include "Application.h" -#include "BuildConfig.h" -#include "Json.h" +#include +#include +#include #include diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp index b225a0824..37580a9a5 100644 --- a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp +++ b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp @@ -28,10 +28,10 @@ #include "TechnicModel.h" #include "modplatform/technic/SingleZipPackInstallTask.h" #include "modplatform/technic/SolderPackInstallTask.h" -#include "Json.h" +#include -#include "Application.h" -#include "BuildConfig.h" +#include +#include TechnicPage::TechnicPage(NewInstanceDialog* dialog, QWidget* parent) : QWidget(parent), ui(new Ui::TechnicPage), dialog(dialog) diff --git a/launcher/ui/setupwizard/JavaWizardPage.cpp b/launcher/ui/setupwizard/JavaWizardPage.cpp index 65be82112..60ef47ff2 100644 --- a/launcher/ui/setupwizard/JavaWizardPage.cpp +++ b/launcher/ui/setupwizard/JavaWizardPage.cpp @@ -18,7 +18,7 @@ */ #include "JavaWizardPage.h" -#include "Application.h" +#include #include #include @@ -32,10 +32,10 @@ #include "Sys.h" -#include "FileSystem.h" +#include #include "java/JavaInstall.h" #include "java/JavaUtils.h" -#include "JavaCommon.h" +#include #include "java/download/JavaRuntime.h" #include "ui/widgets/VersionSelectWidget.h" diff --git a/launcher/ui/setupwizard/LanguageWizardPage.cpp b/launcher/ui/setupwizard/LanguageWizardPage.cpp index c836229e9..4fdff6272 100644 --- a/launcher/ui/setupwizard/LanguageWizardPage.cpp +++ b/launcher/ui/setupwizard/LanguageWizardPage.cpp @@ -23,7 +23,7 @@ #include "ui/widgets/LanguageSelectionWidget.h" #include -#include +#include LanguageWizardPage::LanguageWizardPage(QWidget* parent) : BaseWizardPage(parent) { diff --git a/launcher/ui/setupwizard/SetupWizard.cpp b/launcher/ui/setupwizard/SetupWizard.cpp index 97538640a..a63892772 100644 --- a/launcher/ui/setupwizard/SetupWizard.cpp +++ b/launcher/ui/setupwizard/SetupWizard.cpp @@ -24,10 +24,10 @@ #include "translations/TranslationsModel.h" #include -#include +#include #include -#include +#include SetupWizard::SetupWizard(QWidget* parent) : QWizard(parent) { diff --git a/launcher/ui/themes/CatPack.cpp b/launcher/ui/themes/CatPack.cpp index 85c617da1..5b70b46a9 100644 --- a/launcher/ui/themes/CatPack.cpp +++ b/launcher/ui/themes/CatPack.cpp @@ -18,7 +18,7 @@ */ #include "CatPack.h" -#include "Exception.h" +#include #include #include diff --git a/launcher/ui/themes/CustomTheme.cpp b/launcher/ui/themes/CustomTheme.cpp index e73f3d346..de46040af 100644 --- a/launcher/ui/themes/CustomTheme.cpp +++ b/launcher/ui/themes/CustomTheme.cpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include const QString CustomTheme::manifestFileName = QStringLiteral("theme.json"); const QString CustomTheme::defaultStyleSheetName = diff --git a/launcher/ui/themes/ITheme.cpp b/launcher/ui/themes/ITheme.cpp index 1cab6d37f..26b0cf655 100644 --- a/launcher/ui/themes/ITheme.cpp +++ b/launcher/ui/themes/ITheme.cpp @@ -21,7 +21,7 @@ #include "rainbow.h" #include #include -#include "Application.h" +#include void ITheme::apply(bool) { diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp index 8109626f7..875b646e8 100644 --- a/launcher/ui/themes/ThemeManager.cpp +++ b/launcher/ui/themes/ThemeManager.cpp @@ -26,8 +26,8 @@ #include "GreenLightTheme.h" #include "CustomTheme.h" -#include "Application.h" -#include "Exception.h" +#include +#include #include #include #include diff --git a/launcher/ui/widgets/ContentFilterWidget.cpp b/launcher/ui/widgets/ContentFilterWidget.cpp index c4209daa4..78e310495 100644 --- a/launcher/ui/widgets/ContentFilterWidget.cpp +++ b/launcher/ui/widgets/ContentFilterWidget.cpp @@ -27,7 +27,7 @@ #include #include -#include "Application.h" +#include #include "meta/Index.h" #include "meta/Version.h" #include "meta/VersionList.h" diff --git a/launcher/ui/widgets/JavaSettingsWidget.cpp b/launcher/ui/widgets/JavaSettingsWidget.cpp index fefd9cdbc..6b63aadff 100644 --- a/launcher/ui/widgets/JavaSettingsWidget.cpp +++ b/launcher/ui/widgets/JavaSettingsWidget.cpp @@ -32,13 +32,13 @@ #include "java/JavaInstall.h" #include "java/JavaUtils.h" -#include "FileSystem.h" +#include #include "ui/dialogs/CustomMessageBox.h" #include "ui/widgets/VersionSelectWidget.h" -#include "Application.h" -#include "BuildConfig.h" +#include +#include JavaSettingsWidget::JavaSettingsWidget(QWidget* parent) : QWidget(parent) { diff --git a/launcher/ui/widgets/LanguageSelectionWidget.cpp b/launcher/ui/widgets/LanguageSelectionWidget.cpp index 55f34191a..862fcabd8 100644 --- a/launcher/ui/widgets/LanguageSelectionWidget.cpp +++ b/launcher/ui/widgets/LanguageSelectionWidget.cpp @@ -23,7 +23,7 @@ #include #include #include -#include "Application.h" +#include #include "translations/TranslationsModel.h" LanguageSelectionWidget::LanguageSelectionWidget(QWidget* parent) diff --git a/launcher/ui/widgets/PageContainer.cpp b/launcher/ui/widgets/PageContainer.cpp index 3dcc86647..7c08ede7c 100644 --- a/launcher/ui/widgets/PageContainer.cpp +++ b/launcher/ui/widgets/PageContainer.cpp @@ -36,8 +36,8 @@ #include "ui/widgets/IconLabel.h" -#include "DesktopServices.h" -#include "Application.h" +#include +#include class PageEntryFilterModel : public QSortFilterProxyModel { diff --git a/launcher/ui/widgets/ProjectDescriptionPage.cpp b/launcher/ui/widgets/ProjectDescriptionPage.cpp index 42def2274..f14c931b3 100644 --- a/launcher/ui/widgets/ProjectDescriptionPage.cpp +++ b/launcher/ui/widgets/ProjectDescriptionPage.cpp @@ -25,7 +25,7 @@ #include #include -#include "Application.h" +#include #include "net/Download.h" #include "net/HttpMetaCache.h" #include "net/NetJob.h" diff --git a/launcher/ui/widgets/VersionSelectWidget.h b/launcher/ui/widgets/VersionSelectWidget.h index 3eec73c73..de348d0ed 100644 --- a/launcher/ui/widgets/VersionSelectWidget.h +++ b/launcher/ui/widgets/VersionSelectWidget.h @@ -22,7 +22,7 @@ #include #include -#include "BaseVersionList.h" +#include class VersionProxyModel; class VersionListView; diff --git a/launcher/updater/MeshMCExternalUpdater.cpp b/launcher/updater/MeshMCExternalUpdater.cpp index aafee074c..576764ce0 100644 --- a/launcher/updater/MeshMCExternalUpdater.cpp +++ b/launcher/updater/MeshMCExternalUpdater.cpp @@ -30,7 +30,7 @@ #include #include -#include "BuildConfig.h" +#include #include "ui/dialogs/UpdateAvailableDialog.h" namespace diff --git a/launcher/updater/meshupdater/MeshUpdaterApp.cpp b/launcher/updater/meshupdater/MeshUpdaterApp.cpp index 4165b231f..54190226b 100644 --- a/launcher/updater/meshupdater/MeshUpdaterApp.cpp +++ b/launcher/updater/meshupdater/MeshUpdaterApp.cpp @@ -46,8 +46,8 @@ #include #include "AssetMatcher.h" -#include "BuildConfig.h" -#include "DesktopServices.h" +#include +#include #include "ReleaseArchive.h" #include "ReleaseDownload.h" #include "UpdaterDialogs.h" diff --git a/launcher/updater/meshupdater/ReleaseArchive.cpp b/launcher/updater/meshupdater/ReleaseArchive.cpp index 6e21b80be..c525f2ff6 100644 --- a/launcher/updater/meshupdater/ReleaseArchive.cpp +++ b/launcher/updater/meshupdater/ReleaseArchive.cpp @@ -19,7 +19,7 @@ #include "ReleaseArchive.h" -#include "ArchiveOpen.h" +#include #include #include diff --git a/launcher/updater/meshupdater/ReleaseArchive_test.cpp b/launcher/updater/meshupdater/ReleaseArchive_test.cpp index 954fbb306..4b5d34a72 100644 --- a/launcher/updater/meshupdater/ReleaseArchive_test.cpp +++ b/launcher/updater/meshupdater/ReleaseArchive_test.cpp @@ -24,7 +24,7 @@ #include #include -#include "ArchiveOpen.h" +#include #include "updater/meshupdater/ReleaseArchive.h" /*! diff --git a/launcher/updater/meshupdater/ReleaseDownload.cpp b/launcher/updater/meshupdater/ReleaseDownload.cpp index 076afb72c..f0c0fec30 100644 --- a/launcher/updater/meshupdater/ReleaseDownload.cpp +++ b/launcher/updater/meshupdater/ReleaseDownload.cpp @@ -28,7 +28,7 @@ #include #include -#include "BuildConfig.h" +#include ReleaseDownload::ReleaseDownload(QNetworkAccessManager* network, const QUrl& url, const QString& path, diff --git a/launcher/updater/meshupdater/UpdaterDialogs.cpp b/launcher/updater/meshupdater/UpdaterDialogs.cpp index a14aeec8e..fd1684476 100644 --- a/launcher/updater/meshupdater/UpdaterDialogs.cpp +++ b/launcher/updater/meshupdater/UpdaterDialogs.cpp @@ -25,7 +25,7 @@ #include #include -#include "HoeDown.h" +#include #include "MMCStrings.h" namespace