backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-06-03 23:02:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix includes, broken UIScene_TradingMenu method

Browse source
This commit is contained in:
Tropical 2026-03-22 13:50:42 -05:00
parent 4191d04455
commit c17408b34d
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Minecraft.Client/Platform/Common/UI/IUIScene_HUD.cpp
View file

@ -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"

22
Minecraft.Client/Platform/Common/UI/UIControl_MinecraftHorse.cpp
View file

@ -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"

10
Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp
View file

@ -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;