From 01e860479feb1d72b2744f69ff43cbea91c4561b Mon Sep 17 00:00:00 2001 From: Fireblade <3+fireblade@noreply.neolegacy.dev> Date: Mon, 6 Jul 2026 21:02:07 -0400 Subject: [PATCH] fix: server not generating colours.xml file --- CMakeLists.txt | 35 +++++++++++++++++++++++++++++++++ Minecraft.Client/CMakeLists.txt | 12 ----------- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c2562f70..fb25a2a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,6 +160,41 @@ if(PLATFORM_NAME STREQUAL "Windows64") # Server is only supported on Windows for add_subdirectory(Minecraft.Server) endif() +if(TARGET Minecraft.Client) + add_custom_target(AssetTitleUpdateColourOverride ALL + COMMAND ${CMAKE_COMMAND} -E remove "$/Common/res/TitleUpdate/res/colours.col" + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_SOURCE_DIR}/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml" + "$/Common/res/TitleUpdate/res/colours.xml" + VERBATIM + ) + add_dependencies(AssetTitleUpdateColourOverride AssetFolderCopy_Minecraft.Client) + add_dependencies(Minecraft.Client AssetTitleUpdateColourOverride) + set_property(TARGET AssetTitleUpdateColourOverride PROPERTY FOLDER "Build") +endif() + +if(TARGET Minecraft.Server) + add_custom_target(AssetTitleUpdateColourOverride_Minecraft.Server ALL + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_SOURCE_DIR}/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml" + "$/Common/res/TitleUpdate/res/colours.xml" + VERBATIM + ) + add_dependencies(Minecraft.Server AssetTitleUpdateColourOverride_Minecraft.Server) + set_property(TARGET AssetTitleUpdateColourOverride_Minecraft.Server PROPERTY FOLDER "Build") +endif() + +if(TARGET Minecraft.Server.FourKit) + add_custom_target(AssetTitleUpdateColourOverride_Minecraft.Server.FourKit ALL + COMMAND ${CMAKE_COMMAND} -E copy_if_different + "${CMAKE_SOURCE_DIR}/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml" + "$/Common/res/TitleUpdate/res/colours.xml" + VERBATIM + ) + add_dependencies(Minecraft.Server.FourKit AssetTitleUpdateColourOverride_Minecraft.Server.FourKit) + set_property(TARGET AssetTitleUpdateColourOverride_Minecraft.Server.FourKit PROPERTY FOLDER "Build") +endif() + if(TARGET GenerateStringsHeader_Minecraft.Client) add_dependencies(Minecraft.World GenerateStringsHeader_Minecraft.Client) endif() diff --git a/Minecraft.Client/CMakeLists.txt b/Minecraft.Client/CMakeLists.txt index fe87cc40..7e435a1d 100644 --- a/Minecraft.Client/CMakeLists.txt +++ b/Minecraft.Client/CMakeLists.txt @@ -148,18 +148,6 @@ endif() # Copy redist files add_copyredist_target(Minecraft.Client) -# replace col file with xml file -add_custom_target(AssetTitleUpdateColourOverride_Minecraft.Client ALL - COMMAND ${CMAKE_COMMAND} -E remove "$/Common/res/TitleUpdate/res/colours.col" - COMMAND ${CMAKE_COMMAND} -E copy_if_different - "${CMAKE_CURRENT_SOURCE_DIR}/Common/res/TitleUpdate/res/colours.xml" - "$/Common/res/TitleUpdate/res/colours.xml" - VERBATIM -) -add_dependencies(AssetTitleUpdateColourOverride_Minecraft.Client AssetFolderCopy_Minecraft.Client) -add_dependencies(Minecraft.Client AssetTitleUpdateColourOverride_Minecraft.Client) -set_property(TARGET AssetTitleUpdateColourOverride_Minecraft.Client PROPERTY FOLDER "Build") - # Make sure GameHDD exists on Windows if(PLATFORM_NAME STREQUAL "Windows64") add_gamehdd_target(Minecraft.Client)