Merge remote-tracking branch 'upstream/main'

# Conflicts: # Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp # Minecraft.Client/Minecraft.Client.vcxproj # Minecraft.Client/Minecraft.Client.vcxproj.filters # Minecraft.Server/Minecraft.Server.vcxproj # Minecraft.World/Minecraft.World.vcxproj # Minecraft.World/Minecraft.World.vcxproj.filters # README.md
2026-03-17 17:26:40 -05:00
parent e786604228 b1eb9a34a4
commit b58f7c8fdd
111 changed files with 8188 additions and 73058 deletions
@@ -1 +0,0 @@
-C:\Users\manea\Documents\MinecraftConsoles\Minecraft.World\ARM64EC_Debug\Minecraft.World.lib
@@ -0,0 +1,30 @@
+include("${CMAKE_CURRENT_LIST_DIR}/cmake/sources/Common.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/cmake/sources/Durango.cmake")
+
+include("${CMAKE_SOURCE_DIR}/cmake/CommonSources.cmake")
+
+# Combine all source files into a single variable for the target
+# We cant use CMAKE_CONFIGURE_PRESET here as VS doesn't set it, so just rely on the folder
+set(MINECRAFT_WORLD_SOURCES
+  ${MINECRAFT_WORLD_COMMON}
+  $<$<STREQUAL:${PLATFORM_NAME},Durango>:${MINECRAFT_WORLD_DURANGO}>
+  ${SOURCES_COMMON}
+)
+
+add_library(Minecraft.World STATIC ${MINECRAFT_WORLD_SOURCES})
+
+target_include_directories(Minecraft.World
+  PRIVATE
+  "${CMAKE_BINARY_DIR}/generated/"
+  "${CMAKE_CURRENT_SOURCE_DIR}"
+  "${CMAKE_SOURCE_DIR}/include/"
+  PUBLIC
+  "${CMAKE_CURRENT_SOURCE_DIR}/x64headers"
+)
+target_compile_definitions(Minecraft.World PRIVATE
+  ${MINECRAFT_SHARED_DEFINES}
+  _LIB
+)
+target_precompile_headers(Minecraft.World PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:stdafx.h>")
+
+configure_compiler_target(Minecraft.World)
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
@@ -1,10 +0,0 @@
-""
-{
-"FILE_VERSION" = "9237"
-"ENLISTMENT_CHOICE" = "NEVER"
-"PROJECT_FILE_RELATIVE_PATH" = ""
-"NUMBER_OF_EXCLUDED_FILES" = "0"
-"ORIGINAL_PROJECT_FILE_PATH" = ""
-"NUMBER_OF_NESTED_PROJECTS" = "0"
-"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
-}
@@ -0,0 +1,9 @@
+set(_MINECRAFT_WORLD_DURANGO_NET_MINECRAFT_STATS
+  "${CMAKE_CURRENT_SOURCE_DIR}/DurangoStats.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/DurangoStats.h"
+)
+source_group("net/minecraft/stats" FILES ${_MINECRAFT_WORLD_DURANGO_NET_MINECRAFT_STATS})
+
+set(MINECRAFT_WORLD_DURANGO
+  ${_MINECRAFT_WORLD_DURANGO_NET_MINECRAFT_STATS}
+)
@@ -1,18 +0,0 @@
-xc++
-m64
-std=c++14
-Wno-unused-includes
-Wno-unsafe-buffer-usage-in-libc-call
-Wno-unsafe-buffer-usage
-Wno-unused-macros
-Wno-c++98-compat
-Wno-c++98-compat-pedantic
-Wno-pre-c++14-compat
-D_LARGE_WORLDS
-D_DEBUG_MENUS_ENABLED
-D_LIB
-D_CRT_NON_CONFORMING_SWPRINTFS
-D_CRT_SECURE_NO_WARNINGS
-D_WINDOWS64
-I
-./x64headers
@@ -192,7 +192,7 @@ void MemSect(int sect);
 #include "..\Minecraft.Client\Common\Minecraft_Macros.h"
 #include "..\Minecraft.Client\Common\Colours\ColourTable.h"

-#include "..\Minecraft.Client\Common\BuildVer.h"
+#include "Common\BuildVer.h"

 #ifdef _XBOX
 #include "..\Minecraft.Client\Xbox\Xbox_App.h"
				`@@ -1 +0,0 @@`
				`C:\Users\manea\Documents\MinecraftConsoles\Minecraft.World\ARM64EC_Debug\Minecraft.World.lib`