From c17408b34d38663662d9eb4493ac45247a63cba7 Mon Sep 17 00:00:00 2001
From: Tropical <42101043+tropicaaal@users.noreply.github.com>
Date: Sun, 22 Mar 2026 13:50:42 -0500
Subject: [PATCH] fix includes, broken UIScene_TradingMenu method

---
 .../Platform/Common/UI/IUIScene_HUD.cpp       |  4 ++--
 .../Common/UI/UIControl_MinecraftHorse.cpp    | 22 ++++++++++---------
 .../Common/UI/UIScene_TradingMenu.cpp         | 10 ++++-----
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Minecraft.Client/Platform/Common/UI/IUIScene_HUD.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_HUD.cpp
index 91d7d3e95..c43c6081f 100644
--- a/Minecraft.Client/Platform/Common/UI/IUIScene_HUD.cpp
+++ b/Minecraft.Client/Platform/Common/UI/IUIScene_HUD.cpp
@@ -1,6 +1,6 @@
 #include "../../stdafx.h"
-#include "../../Minecraft.h"
-#include "../../MultiPlayerLocalPlayer.h"
+#include "../../../../Minecraft.Client/Minecraft.h"
+#include "../../../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"\
 #include "../../../../Minecraft.World/Headers/net.minecraft.world.effect.h"
 #include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
 #include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.ai.attributes.h"
diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_MinecraftHorse.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_MinecraftHorse.cpp
index d27254769..e4604f0b7 100644
--- a/Minecraft.Client/Platform/Common/UI/UIControl_MinecraftHorse.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIControl_MinecraftHorse.cpp
@@ -1,23 +1,25 @@
 #include "../../stdafx.h"
 #include "../../Minecraft.h"
-#include "../../ScreenSizeCalculator.h"
-#include "../../EntityRenderDispatcher.h"
 
-#include "../../PlayerRenderer.h"
-#include "../../HorseRenderer.h"
+#include "../../Minecraft.Client/UI/ScreenSizeCalculator.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.h"
 
-#include "../../HumanoidModel.h"
-#include "../../ModelHorse.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.h"
+#include "../../Minecraft.Client/Rendering/EntityRenderers/HorseRenderer.h"
 
-#include "../../Lighting.h"
-#include "../../ModelPart.h"
-#include "../../Options.h"
+#include "../../Minecraft.Client/Rendering/Models/HumanoidModel.h"
+#include "../../Minecraft.Client/Rendering/Models/ModelHorse.h"
+
+#include "../../Minecraft.Client/Rendering/Lighting.h"
+#include "../../Minecraft.Client/Rendering/Models/ModelPart.h"
+#include "../../Minecraft.Client/GameState/Options.h"
 
 #include "../../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
 // #include
 // "../../../Minecraft.World/net.minecraft.world.entity.animal.EntityHorse.h"
 
-#include "../../MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.Client/Player/MultiPlayerLocalPlayer.h"
+
 #include "UI.h"
 #include "UIControl_MinecraftHorse.h"
 
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp
index 163ba62ed..92ae8fc36 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp
@@ -255,16 +255,16 @@ void UIScene_TradingMenu::setTradeRedBox(int index, bool show) {
     m_slotListTrades.showSlotRedBox(index, show);
 }
 
-void UIScene_TradingMenu::setOfferDescription(
-    const std::wstring& name, std::vector<std::wstring>& unformattedStrings) {
-    const std::u16string convName = convWstringToU16string(name);
+void UIScene_TradingMenu::setOfferDescription(std::vector<HtmlString>* description) {
+	std::wstring descriptionStr = HtmlString::Compose(description);
+    const std::u16string conv = convWstringToU16string(descriptionStr);
 
     IggyDataValue result;
     IggyDataValue value[1];
 
     IggyStringUTF16 stringVal;
-    stringVal.string = convName.c_str();
-    stringVal.length = convName.length();
+    stringVal.string = conv.c_str();
+    stringVal.length = conv.length();
     value[0].type = IGGY_DATATYPE_string_UTF16;
     value[0].string16 = stringVal;