From a175854dab1b66194890517f8fe68b71fe70e4d5 Mon Sep 17 00:00:00 2001 From: "George V." Date: Sat, 11 Apr 2026 03:05:03 +0300 Subject: [PATCH] fix: Resolve missing Guardian files in server build causing CI failure Add missing GuardianModel.cpp and GuardianRenderer.cpp to the Minecraft.Server build configuration to fix compilation errors in the debug GitHub PR workflow. Also fix inconsistent indentation in Minecraft.Client's Common.cmake for the GuardianModel.cpp and GuardianRenderer.cpp entries (styling only). --- Minecraft.Client/cmake/sources/Common.cmake | 5 +++-- Minecraft.Server/cmake/sources/Common.cmake | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Minecraft.Client/cmake/sources/Common.cmake b/Minecraft.Client/cmake/sources/Common.cmake index 1c45883e..ba5260f2 100644 --- a/Minecraft.Client/cmake/sources/Common.cmake +++ b/Minecraft.Client/cmake/sources/Common.cmake @@ -624,7 +624,7 @@ set(_MINECRAFT_CLIENT_COMMON_NET_MINECRAFT_CLIENT_MODEL "${CMAKE_CURRENT_SOURCE_DIR}/ArmorStandModel.h" "${CMAKE_CURRENT_SOURCE_DIR}/EndermiteModel.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/EndermiteModel.h" - "${CMAKE_CURRENT_SOURCE_DIR}/GuardianModel.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/GuardianModel.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/GuardianModel.h" ) @@ -903,7 +903,8 @@ set(_MINECRAFT_CLIENT_COMMON_NET_MINECRAFT_CLIENT_RENDERER_ENTITY "${CMAKE_CURRENT_SOURCE_DIR}/RabbitRenderer.h" "${CMAKE_CURRENT_SOURCE_DIR}/ArmorStandRenderer.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/EndermiteRenderer.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/GuardianRenderer.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/EndermiteRenderer.h" + "${CMAKE_CURRENT_SOURCE_DIR}/GuardianRenderer.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/GuardianRenderer.h" ) source_group("net/minecraft/client/renderer/entity" FILES ${_MINECRAFT_CLIENT_COMMON_NET_MINECRAFT_CLIENT_RENDERER_ENTITY}) diff --git a/Minecraft.Server/cmake/sources/Common.cmake b/Minecraft.Server/cmake/sources/Common.cmake index f114821d..63453a5e 100644 --- a/Minecraft.Server/cmake/sources/Common.cmake +++ b/Minecraft.Server/cmake/sources/Common.cmake @@ -507,6 +507,8 @@ set(_MINECRAFT_SERVER_COMMON_ROOT "${_MS_SRC}/../Minecraft.Client/Xbox/Network/NetworkPlayerXbox.cpp" "${_MS_SRC}/../Minecraft.Client/ZombieModel.cpp" "${_MS_SRC}/../Minecraft.Client/ZombieRenderer.cpp" + "${_MS_SRC}/../Minecraft.Client/GuardianModel.cpp" + "${_MS_SRC}/../Minecraft.Client/GuardianRenderer.cpp" "${_MS_SRC}/../Minecraft.Client/compat_shims.cpp" "${_MS_SRC}/../Minecraft.Client/glWrapper.cpp" "${_MS_SRC}/../Minecraft.Client/iob_shim.asm"