diff --git a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.h b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.h index 4b482f63..7dd112b5 100644 --- a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.h +++ b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.h @@ -13,7 +13,7 @@ // Ingredients etc should go here #define CRAFTING_INGREDIENTS_DESCRIPTION_START CRAFTING_HOTBAR_SLOT_END -#define CRAFTING_INGREDEINTS_DESCRIPTION_END (CRAFTING_INGREDIENTS_DESCRIPTION_START + 4) +#define CRAFTING_INGREDEINTS_DESCRIPTION_END (CRAFTING_INGREDIENTS_DESCRIPTION_START + 9) #define CRAFTING_OUTPUT_SLOT_START CRAFTING_INGREDEINTS_DESCRIPTION_END #define CRAFTING_OUTPUT_SLOT_END (CRAFTING_OUTPUT_SLOT_START + 1) diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h index fc1bf48e..f015daeb 100644 --- a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h +++ b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h @@ -38,7 +38,7 @@ public: CXuiControl m_pHSlotsCraftingTableCursors[m_iMaxHSlotC]; CXuiControl *m_pCursors; CXuiControl m_hCraftIngredientA[m_iIngredients3x3SlotC]; - CXuiControl m_hCraftIngredientDescA[4]; // Max ingredients is 4 for bread + CXuiControl m_hCraftIngredientDescA[9]; // Max ingredients is 9 CXuiControl m_hCraftOutput; CXuiControl m_sceneGroup; @@ -173,7 +173,7 @@ private: CXuiCtrlCraftIngredientSlot *m_pCraftingOutput; CXuiCtrlCraftIngredientSlot *m_pCraftingIngredientA[m_iIngredients3x3SlotC]; - CXuiCtrlCraftIngredientSlot *m_pCraftIngredientDescA[4]; + CXuiCtrlCraftIngredientSlot *m_pCraftIngredientDescA[9]; CXuiCtrlMinecraftSlot *m_pHSlotsBrushImageControl[m_iMaxHSlotC]; CXuiCtrlMinecraftSlot *m_pVSlotsBrushImageControl[m_iMaxDisplayedVSlotC]; CXuiControl *GroupTypeIconA[Recipy::eGroupType_Max]; diff --git a/Minecraft.Client/PreStitchedTextureMap.cpp b/Minecraft.Client/PreStitchedTextureMap.cpp index 44e11920..96edaf3b 100644 --- a/Minecraft.Client/PreStitchedTextureMap.cpp +++ b/Minecraft.Client/PreStitchedTextureMap.cpp @@ -557,7 +557,7 @@ void PreStitchedTextureMap::loadUVs() ADD_ICON(13, 2, L"doorDark") ADD_ICON(13, 3, L"doorJungle") ADD_ICON(13, 4, L"doorSpruce") - ADD_ICON(13, 5, L"rabbitStew") + ADD_ICON(13, 5, L"rabbitStew") ADD_ICON(13, 6, L"salmonCooked") diff --git a/Minecraft.World/FoodRecipies.cpp b/Minecraft.World/FoodRecipies.cpp index 9c212a53..0aeccc59 100644 --- a/Minecraft.World/FoodRecipies.cpp +++ b/Minecraft.World/FoodRecipies.cpp @@ -51,6 +51,18 @@ void FoodRecipies::addRecipes(Recipes *r) L'4', Item::bowl, // ci L'F'); + r->addShapedRecipy(new ItemInstance(Item::rabbitStew), + L"ssscicictcicig", + L" 1 ",//s + L"2X3",//s + L" 4 ",//s + L'1', Item::rabbit_cooked, // ci + L'2', Item::carrots, // ci + L'3', Tile::mushroom_red, // ct + L'X', Item::potato, // ci + L'4', Item::bowl, // ci + L'F'); + r->addShapedRecipy(new ItemInstance(Item::cookie, 8), // diff --git a/Minecraft.World/Item.h b/Minecraft.World/Item.h index e241af4c..ccfb0e4e 100644 --- a/Minecraft.World/Item.h +++ b/Minecraft.World/Item.h @@ -657,10 +657,11 @@ public: static const int mutton_cooked_Id = 424; static const int rabbit_raw_Id = 411; static const int rabbit_cooked_Id = 412; + static const int rabbitStew_Id = 413; static const int rabbits_foot_Id = 414; static const int rabbit_hide_Id = 415; static const int armor_stand_Id = 416; - static const int rabbitStew_Id = 413; + static const int prismarine_cystal_Id = 432; static const int prismarine_shard_Id = 433; diff --git a/Minecraft.World/Recipes.cpp b/Minecraft.World/Recipes.cpp index da02cb55..541e68d1 100644 --- a/Minecraft.World/Recipes.cpp +++ b/Minecraft.World/Recipes.cpp @@ -1500,7 +1500,7 @@ shared_ptr Recipes::getItemForRecipe(Recipy *r) void Recipes::buildRecipeIngredientsArray(void) { //RecipyList *recipes = ((Recipes *)Recipes::getInstance())->getRecipies(); - + int iRecipeC=static_cast(recipies->size()); m_pRecipeIngredientsRequired= new Recipy::INGREDIENTS_REQUIRED [iRecipeC];