neoStudiosLCE/neoLegacy
1
0
Fork 0
mirror of https://git.neolegacy.dev/neoStudiosLCE/neoLegacy.git synced 2026-07-15 18:42:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix: server not generating colours.xml file' (#31) from Fireblade/neoLegacy:main into main

Browse Source 
Reviewed-on: https://git.neolegacy.dev/neoStudiosLCE/neoLegacy/pulls/31
This commit is contained in:
Fireblade
2026-07-07 02:02:35 +01:00
parent ec39196f06 01e860479f
commit 9f818cbc8a
2 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
CMakeLists.txt
View File

@@ -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 "$<TARGET_FILE_DIR:Minecraft.Client>/Common/res/TitleUpdate/res/colours.col"
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_SOURCE_DIR}/Minecraft.Client/Common/res/TitleUpdate/res/colours.xml"
"$<TARGET_FILE_DIR:Minecraft.Client>/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"
"$<TARGET_FILE_DIR:Minecraft.Server>/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"
"$<TARGET_FILE_DIR:Minecraft.Server.FourKit>/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()

12
Minecraft.Client/CMakeLists.txt
View File

@@ -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 "$<TARGET_FILE_DIR:Minecraft.Client>/Common/res/TitleUpdate/res/colours.col"
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_CURRENT_SOURCE_DIR}/Common/res/TitleUpdate/res/colours.xml"
"$<TARGET_FILE_DIR:Minecraft.Client>/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)