From 60aba187a7cca40b9cc31078dee66efe7a393219 Mon Sep 17 00:00:00 2001 From: DrPerkyLegit <116128211+DrPerkyLegit@users.noreply.github.com> Date: Thu, 28 May 2026 10:20:24 -0400 Subject: [PATCH 1/3] fix custom recipe names not working (#129) --- Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp index c43a1433..76ed5596 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp @@ -916,7 +916,7 @@ void IUIScene_CraftingMenu::UpdateHighlight() // special case for the torch coal/charcoal int id=pTempItemInstAdditional->getDescriptionId(); - LPCWSTR itemstring; + wstring itemstring; switch(id) { @@ -945,11 +945,15 @@ void IUIScene_CraftingMenu::UpdateHighlight() } break; default: - itemstring=app.GetString(id ); + if (pTempItemInstAdditional->hasCustomHoverName()) { + itemstring = pTempItemInstAdditional->getHoverName(); + } else { + itemstring = app.GetString(id); + } break; } - setItemText(itemstring); + setItemText(itemstring.c_str()); } else { From 77018413814ceb32088faba31a0f526a0a6160f7 Mon Sep 17 00:00:00 2001 From: Lord_Cambion Date: Thu, 28 May 2026 20:09:18 +0200 Subject: [PATCH 2/3] fix: ocelot couldnt be tamed --- Minecraft.World/Ocelot.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Minecraft.World/Ocelot.cpp b/Minecraft.World/Ocelot.cpp index 0e367e90..02ef07c1 100644 --- a/Minecraft.World/Ocelot.cpp +++ b/Minecraft.World/Ocelot.cpp @@ -199,7 +199,7 @@ bool Ocelot::mobInteract(shared_ptr player) } else { - if (temptGoal->isRunning() && item != nullptr && item->id == Item::fish_raw_Id && player->distanceToSqr(shared_from_this()) < 3 * 3) + if (/*temptGoal->isRunning() &&*/ item != nullptr && item->id == Item::fish_raw_Id && player->distanceToSqr(shared_from_this()) < 3 * 3) { // 4J-PB - don't lose the fish in creative mode if (!player->abilities.instabuild) item->count--; From b7393ab153a8c2c6c5a02c95dd4ee825af6ae3fb Mon Sep 17 00:00:00 2001 From: Lord Cambion Date: Thu, 28 May 2026 21:31:49 +0200 Subject: [PATCH 3/3] feat: dye recipes using flowers (#131) --- Minecraft.World/ClothDyeRecipes.cpp | 43 +++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/Minecraft.World/ClothDyeRecipes.cpp b/Minecraft.World/ClothDyeRecipes.cpp index a779b177..084cf5e6 100644 --- a/Minecraft.World/ClothDyeRecipes.cpp +++ b/Minecraft.World/ClothDyeRecipes.cpp @@ -38,6 +38,8 @@ void ClothDyeRecipes::addRecipes(Recipes *r) } // some dye recipes + + //flowers r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::YELLOW), L"tg", Tile::flower,L'D'); @@ -46,6 +48,44 @@ void ClothDyeRecipes::addRecipes(Recipes *r) L"tg", Tile::rose,L'D'); + r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::LIGHT_BLUE), + L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::BLUE_ORCHID), L'D'); + + r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::MAGENTA), + L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::ALLIUM), L'D'); + + r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::SILVER), + L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::AZURE_BLUET), L'D'); + + r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), + L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::RED_TULIP), L'D'); + + r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::PINK), + L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::PINK_TULIP), L'D'); + + r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::SILVER), + L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::WHITE_TULIP), L'D'); + + r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::ORANGE), + L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::ORANGE_TULIP), L'D'); + + r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 1, DyePowderItem::SILVER), + L"zg", new ItemInstance(Item::items[Tile::rose_Id], 1, Rose::OXEYE_DAISY), L'D'); + + // Tall flowers + r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::YELLOW), + L"zg", new ItemInstance(Item::items[Tile::tallgrass2_Id], 1, TallGrass2::SUNFLOWER), L'D'); + + r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::MAGENTA), + L"zg", new ItemInstance(Item::items[Tile::tallgrass2_Id], 1, TallGrass2::LILAC), L'D'); + + r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::RED), + L"zg", new ItemInstance(Item::items[Tile::tallgrass2_Id], 1, TallGrass2::ROSE_BUSH), L'D'); + + r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::MAGENTA), + L"zg", new ItemInstance(Item::items[Tile::tallgrass2_Id], 1, TallGrass2::PEONY), L'D'); + + r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 3, DyePowderItem::WHITE), L"ig", Item::bone,L'D'); @@ -114,6 +154,9 @@ void ClothDyeRecipes::addRecipes(Recipes *r) new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED), new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D'); + + + for (int i = 0; i < 16; i++) { r->addShapedRecipy(new ItemInstance(Tile::woolCarpet, 3, i),