From f0a868411aae809de8742e2427ad0daeb0509e88 Mon Sep 17 00:00:00 2001
From: Fireblade <3+fireblade@noreply.neolegacy.dev>
Date: Sat, 11 Jul 2026 21:48:52 -0400
Subject: [PATCH] fix: build failures

---
 Minecraft.Client/Logger.cpp                 | 11 ++++++++---
 Minecraft.Server/cmake/sources/Common.cmake |  2 ++
 Minecraft.World/IglooFeature.cpp            | 17 +++++------------
 cmake/ServerTarget.cmake                    |  2 ++
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Minecraft.Client/Logger.cpp b/Minecraft.Client/Logger.cpp
index fff8e1ff..d1a123c9 100644
--- a/Minecraft.Client/Logger.cpp
+++ b/Minecraft.Client/Logger.cpp
@@ -9,6 +9,11 @@
 #include <time.h>
 #include <intrin.h>
 
+// stop clang from overwriting cpuid
+#if defined(__cpuid)
+#undef __cpuid
+#endif
+
 static FILE            *s_logFile = nullptr;
 static CRITICAL_SECTION s_cs;
 static bool             s_csInit  = false;
@@ -76,9 +81,9 @@ static void getCpuName(char *buf, size_t size)
 {
     int regs[4] = {};
     char name[49] = {};
-    __cpuid(regs, 0x80000002); memcpy(name,      regs, 16);
-    __cpuid(regs, 0x80000003); memcpy(name + 16, regs, 16);
-    __cpuid(regs, 0x80000004); memcpy(name + 32, regs, 16);
+    __cpuidex(regs, 0x80000002, 0); memcpy(name,      regs, 16);
+    __cpuidex(regs, 0x80000003, 0); memcpy(name + 16, regs, 16);
+    __cpuidex(regs, 0x80000004, 0); memcpy(name + 32, regs, 16);
     name[48] = '\0';
     const char *p = name;
     while (*p == ' ') p++;
diff --git a/Minecraft.Server/cmake/sources/Common.cmake b/Minecraft.Server/cmake/sources/Common.cmake
index 52b0e9a9..375aad5e 100644
--- a/Minecraft.Server/cmake/sources/Common.cmake
+++ b/Minecraft.Server/cmake/sources/Common.cmake
@@ -32,6 +32,8 @@ set(_MINECRAFT_SERVER_COMMON_ROOT
   "${_MS_SRC}/../Minecraft.Client/CaveSpiderRenderer.cpp"
   "${_MS_SRC}/../Minecraft.Client/ChatScreen.cpp"
   "${_MS_SRC}/../Minecraft.Client/ChestModel.cpp"
+  "${_MS_SRC}/../Minecraft.Client/Logger.cpp"
+  "${_MS_SRC}/../Minecraft.Client/Logger.h"
   "${_MS_SRC}/../Minecraft.Client/ChestRenderer.cpp"
   "${_MS_SRC}/../Minecraft.Client/ChickenModel.cpp"
   "${_MS_SRC}/../Minecraft.Client/ChickenRenderer.cpp"
diff --git a/Minecraft.World/IglooFeature.cpp b/Minecraft.World/IglooFeature.cpp
index 99422f2d..f8430da0 100644
--- a/Minecraft.World/IglooFeature.cpp
+++ b/Minecraft.World/IglooFeature.cpp
@@ -5,6 +5,7 @@
 #include "Biome.h"
 #include "Item.h"
 #include "ItemInstance.h"
+#include "LootTableManager.h"
 #include "WeighedTreasure.h"
 #include "Villager.h"
 #include "Zombie.h"
@@ -144,18 +145,10 @@ void IglooFeature::placeBasement(Level *level, Random *random, int x, int y, int
 	auto chestEntity = dynamic_pointer_cast<ChestTileEntity>(level->getTileEntity(x + 2, by + 1, rz - 2));
 	if (chestEntity)
 	{
-		static WeighedTreasure *iglooTreasure[] = {
-			new WeighedTreasure(Item::coal_Id,        0, 1, 4, 15),
-			new WeighedTreasure(Item::apple_Id,       0, 1, 3, 15),
-			new WeighedTreasure(Item::wheat_Id,       0, 2, 3, 10),
-			new WeighedTreasure(Item::gold_nugget_Id, 0, 1, 3, 10),
-			new WeighedTreasure(Item::rotten_flesh_Id,0, 1, 1, 10),
-			new WeighedTreasure(Item::stone_axe_Id,   0, 1, 1,  2),
-			new WeighedTreasure(Item::emerald_Id,     0, 1, 1,  1),
-		};
-		WeighedTreasureArray treasureArray(iglooTreasure, 7);
-		int rolls = 2 + random->nextInt(7);
-		WeighedTreasure::addChestItems(random, treasureArray, chestEntity, rolls);
+		std::vector<LootTableDropResult> drops = LootTableManager::Get().ResolveDrops(
+			"chests/igloo_chest", false, 0,
+			[random](int bound) { return random->nextInt(bound); });
+		WeighedTreasure::addChestItems(random, drops, chestEntity);
 		chestEntity->setItem(0, make_shared<ItemInstance>(Item::golden_apple_Id, 1, 0));
 	}
 
diff --git a/cmake/ServerTarget.cmake b/cmake/ServerTarget.cmake
index cadf0903..8fb7d283 100644
--- a/cmake/ServerTarget.cmake
+++ b/cmake/ServerTarget.cmake
@@ -83,6 +83,7 @@ function(configure_lce_server_target target)
       d3dcompiler
       XInput9_1_0
       wsock32
+      dbghelp
       legacy_stdio_definitions
       4JLibs.${PLATFORM_NAME}.Input
       4JLibs.${PLATFORM_NAME}.Profile
@@ -97,6 +98,7 @@ function(configure_lce_server_target target)
       d3dcompiler
       XInput9_1_0
       wsock32
+      dbghelp
       legacy_stdio_definitions
       "${CMAKE_SOURCE_DIR}/Minecraft.Client/${PLATFORM_NAME}/4JLibs/libs/4J_Input.lib"
       "${CMAKE_SOURCE_DIR}/Minecraft.Client/${PLATFORM_NAME}/4JLibs/libs/4J_Storage.lib"