backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: off-by-one in enchantment buttons

Browse source
This commit is contained in:
Tropical 2026-03-24 15:45:59 -05:00
parent 69530dcccf
commit e473825c76
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Minecraft.Client/Platform/Common/UI/UIScene_EnchantingMenu.cpp
View file

@ -258,8 +258,8 @@ void UIScene_EnchantingMenu::customDraw(IggyCustomDrawCallbackRegion* region) {
int slotId = -1; int slotId = -1;
if (region->name != nullptr && if (region->name != nullptr &&
std::char_traits<char16_t>::length(region->name) > 11 && std::char_traits<char16_t>::length(region->name) > 11 &&
std::char_traits<char16_t>::compare(region->name, u"slot_Button", 11) == std::char_traits<char16_t>::compare(region->name, u"slot_Button",
0) { 11) == 0) {
int i = 11; int i = 11;
slotId = 0; slotId = 0;
@ -270,15 +270,19 @@ void UIScene_EnchantingMenu::customDraw(IggyCustomDrawCallbackRegion* region) {
} }
if (slotId >= 0) { if (slotId >= 0) {
// 4jcraft: sanity check because this code is utter trash garbage
assert(slotId != 0 &&
"4J shitcode - attempted to access m_enchantButton with "
"slot_Button0. this shouldn't happen; if you're reading "
"this then go bug someone on GitHub or something");
// Setup GDraw, normal game render states and matrices // Setup GDraw, normal game render states and matrices
CustomDrawData* customDrawRegion = ui.setupCustomDraw(this, region); CustomDrawData* customDrawRegion = ui.setupCustomDraw(this, region);
delete customDrawRegion; delete customDrawRegion;
const char* namews = wstringtofilename(u16string_to_wstring(region->name)); // 4jcraft: NOTE: if slotId == 0 this is UB, but it never is in
// practice, plus added the assertion above as a sanity check
std::println("render slot {} {}", namews, slotId); m_enchantButton[slotId - 1].render(region);
m_enchantButton[slotId].render(region);
// Finish GDraw and anything else that needs to be finalised // Finish GDraw and anything else that needs to be finalised
ui.endCustomDraw(region); ui.endCustomDraw(region);