diff --git a/Minecraft.Client/ClientConnection.cpp b/Minecraft.Client/ClientConnection.cpp index 86fad3ac..86c842b6 100644 --- a/Minecraft.Client/ClientConnection.cpp +++ b/Minecraft.Client/ClientConnection.cpp @@ -4202,7 +4202,8 @@ int ClientConnection::HostDisconnectReturned(void *pParam,int iPad,C4JStorage::E if(!pDLCPack->hasPurchasedFile( DLCManager::e_DLCType_Texture, L"" )) { // no upsell, we're about to quit - MinecraftServer::getInstance()->setSaveOnExit( false ); + auto serverInstance = MinecraftServer::getInstance(); + if (serverInstance != nullptr) serverInstance->setSaveOnExit(false); // flag a app action of exit game app.SetAction(iPad,eAppAction_ExitWorld); } @@ -4230,7 +4231,8 @@ int ClientConnection::HostDisconnectReturned(void *pParam,int iPad,C4JStorage::E { StorageManager.SetSaveDisabled(false); } - MinecraftServer::getInstance()->setSaveOnExit( true ); + auto serverInstance = MinecraftServer::getInstance(); + if (serverInstance != nullptr) serverInstance->setSaveOnExit(true); // flag a app action of exit game app.SetAction(iPad,eAppAction_ExitWorld); } @@ -4249,11 +4251,13 @@ int ClientConnection::ExitGameAndSaveReturned(void *pParam,int iPad,C4JStorage:: #if defined(_XBOX_ONE) || defined(__ORBIS__) StorageManager.SetSaveDisabled(false); #endif - MinecraftServer::getInstance()->setSaveOnExit( true ); + auto serverInstance = MinecraftServer::getInstance(); + if (serverInstance != nullptr) serverInstance->setSaveOnExit(true); } else { - MinecraftServer::getInstance()->setSaveOnExit( false ); + auto serverInstance = MinecraftServer::getInstance(); + if (serverInstance != nullptr) serverInstance->setSaveOnExit(false); } // flag a app action of exit game app.SetAction(iPad,eAppAction_ExitWorld); diff --git a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp index dde5ae3a..5293f7d1 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp @@ -261,7 +261,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat) if (m_bannerPreviewData.size() > 0) { shared_ptr pTempItemInst = ItemInstance::clone(m_selectedBannerEdit); for (PreviewBannerData& data : m_bannerPreviewData) { - BannerPatternRecipe::addBannerPattern(m_bannerPreviewHolder, BannerPatternRecipe::PATTERNS[data.id].id, data.color); + BannerPatternRecipe::addBannerPattern(pTempItemInst, BannerPatternRecipe::PATTERNS[data.id].id, data.color); } if (pMinecraft->localgameModes[iPad] != nullptr) { @@ -272,6 +272,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat) } pMinecraft->localgameModes[iPad]->handleCraftBanner(m_selectedBannerEdit, m_bannerPreviewData, m_pPlayer); + m_pPlayer->inventory->removeResources(m_selectedBannerEdit); if (m_pPlayer->inventory->add(pTempItemInst) == false) { @@ -281,7 +282,112 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat) ui.PlayUISFX(eSFX_Craft); } } else if (m_bannerPreviewData.size() > 0) { + bool canCraft = true; + int requiredDyes[16] = {}; + std::vector> requiredSpecialItems; + for (const PreviewBannerData& data : m_bannerPreviewData) { + const BannerPatternRecipe::PatternInfo& pattern = BannerPatternRecipe::PATTERNS[data.id]; + + if (pattern.specialItemId != 0) { + bool found = false; + + for (auto& ingredient : requiredSpecialItems) { + if (ingredient.first == pattern.specialItemId && ingredient.second == pattern.specialItemAux) { + found = true; + break; + } + } + + if (!found) requiredSpecialItems.emplace_back(pattern.specialItemId, pattern.specialItemAux); + } else { + if (pattern.rows == nullptr) continue; + + for (int row = 0; row < 3; ++row) { + for (int col = 0; col < 3; ++col) { + if (pattern.rows[row][col] != ' ') + ++requiredDyes[data.color & 15]; + } + } + } + } + + for (const PreviewBannerData& data : m_bannerPreviewData) { + const BannerPatternRecipe::PatternInfo& pattern = BannerPatternRecipe::PATTERNS[data.id]; + + if (pattern.specialItemId == 0) continue; + int requiredCount = 0; + + for (const PreviewBannerData& other : m_bannerPreviewData) { + const BannerPatternRecipe::PatternInfo& otherPattern = + BannerPatternRecipe::PATTERNS[other.id]; + + if (otherPattern.specialItemId == pattern.specialItemId && otherPattern.specialItemAux == pattern.specialItemAux) { + ++requiredCount; + } + } + + if (!hasItem(pattern.specialItemId, requiredCount, pattern.specialItemAux)) { + canCraft = false; + break; + } + } + + if (canCraft) { + for (int color = 0; color < 16; ++color) { + if (requiredDyes[color] > 0 && + !hasItem(Item::dye_Id, requiredDyes[color], color)) { + canCraft = false; + break; + } + } + } + + if (canCraft) { + shared_ptr pTempItemInst = ItemInstance::clone(m_selectedBannerEdit); + + for (const PreviewBannerData& data : m_bannerPreviewData) { + const BannerPatternRecipe::PatternInfo& pattern = BannerPatternRecipe::PATTERNS[data.id]; + BannerPatternRecipe::addBannerPattern(pTempItemInst, pattern.id, data.color); + } + + if (pMinecraft->localgameModes[iPad] != nullptr) { + Tutorial* tutorial = pMinecraft->localgameModes[iPad]->getTutorial(); + + if (tutorial != nullptr) tutorial->onCrafted(pTempItemInst); + } + + for (int color = 0; color < 16; ++color) { + for (int i = 0; i < requiredDyes[color]; ++i) { + m_pPlayer->inventory->removeResource(Item::dye_Id, color); + } + } + + for (const PreviewBannerData& data : m_bannerPreviewData) { + const BannerPatternRecipe::PatternInfo& pattern = BannerPatternRecipe::PATTERNS[data.id]; + + if (pattern.specialItemId != 0) { + m_pPlayer->inventory->removeResource(pattern.specialItemId, pattern.specialItemAux); + } + } + + pMinecraft->localgameModes[iPad]->handleCraftBanner(m_selectedBannerEdit, m_bannerPreviewData, m_pPlayer); + m_pPlayer->inventory->removeResources(m_selectedBannerEdit); + + if (!m_pPlayer->inventory->add(pTempItemInst)) m_pPlayer->drop(pTempItemInst); + + ui.PlayUISFX(eSFX_Craft); + + m_bannerPreviewData.clear(); + setSelectedBannerEdit(nullptr); + + CheckRecipesAvailable(); + UpdateVerticalSlots(); + UpdateHighlight(); + DisplayIngredients(); + } else { + ui.PlayUISFX(eSFX_CraftFail); + } } } else { //RecipyList *recipes = ((Recipes *)Recipes::getInstance())->getRecipies(); diff --git a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp index 3489792a..ab8b3046 100644 --- a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp @@ -115,7 +115,8 @@ int IUIScene_PauseMenu::ExitGameSaveDialogReturned(void *pParam,int iPad,C4JStor #if defined(_XBOX_ONE) || defined(__ORBIS__) StorageManager.SetSaveDisabled(false); #endif - MinecraftServer::getInstance()->setSaveOnExit( true ); + auto serverInstance = MinecraftServer::getInstance(); + if (serverInstance != nullptr) serverInstance->setSaveOnExit(true); } } else @@ -155,7 +156,8 @@ int IUIScene_PauseMenu::ExitGameAndSaveReturned(void *pParam,int iPad,C4JStorage StorageManager.SetSaveDisabled(false); #endif if(pScene) pScene->SetIgnoreInput(true); - MinecraftServer::getInstance()->setSaveOnExit( true ); + auto serverInstance = MinecraftServer::getInstance(); + if (serverInstance != nullptr) serverInstance->setSaveOnExit(true); // flag a app action of exit game app.SetAction(iPad,eAppAction_ExitWorld); } @@ -201,7 +203,8 @@ int IUIScene_PauseMenu::ExitGameDeclineSaveReturned(void *pParam,int iPad,C4JSto //StorageManager.SetSaveDisabled(false); #endif if(pScene) pScene->SetIgnoreInput(true); - MinecraftServer::getInstance()->setSaveOnExit( false ); + auto serverInstance = MinecraftServer::getInstance(); + if (serverInstance != nullptr) serverInstance->setSaveOnExit(false); // flag a app action of exit game app.SetAction(iPad,eAppAction_ExitWorld); } diff --git a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp index b88b0ab6..c4b3951d 100644 --- a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp @@ -148,8 +148,9 @@ void UIScene_DeathMenu::handlePress(F64 controlId, F64 childId) // 4J Added: Hardcore mode — skip save dialog, exit without saving, delete world if (pMinecraft->level != nullptr && pMinecraft->level->getLevelData()->isHardcore() && g_NetworkManager.IsHost()) { - MinecraftServer::getInstance()->setSaveOnExit(false); - MinecraftServer::getInstance()->setDeleteWorldOnExit(true); + auto serverInstance = MinecraftServer::getInstance(); + if (serverInstance != nullptr) serverInstance->setSaveOnExit(false); + if (serverInstance != nullptr) serverInstance->setDeleteWorldOnExit(true); app.SetAction(m_iPad, eAppAction_ExitWorld); break; } diff --git a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp index 34d6f407..42be5bb2 100644 --- a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp @@ -1435,7 +1435,8 @@ int UIScene_PauseMenu::ExitGameSaveDialogReturned(void *pParam,int iPad,C4JStora #if defined(_XBOX_ONE) || defined(__ORBIS__) StorageManager.SetSaveDisabled(false); #endif - MinecraftServer::getInstance()->setSaveOnExit( true ); + auto serverInstance = MinecraftServer::getInstance(); + if (serverInstance != nullptr) serverInstance->setSaveOnExit(false); } } else diff --git a/Minecraft.Client/PlayerConnection.cpp b/Minecraft.Client/PlayerConnection.cpp index f4b37170..e7ed9ca1 100644 --- a/Minecraft.Client/PlayerConnection.cpp +++ b/Minecraft.Client/PlayerConnection.cpp @@ -3568,6 +3568,8 @@ void PlayerConnection::handleDebugOptions(shared_ptr packet) #endif } + + void PlayerConnection::handleCraftItem(shared_ptr packet) { if (packet->isBanner) { @@ -3575,23 +3577,23 @@ void PlayerConnection::handleCraftItem(shared_ptr packet) server->warn(L"Player " + player->getName() + L" tried to craft a 3x3 banner recipe without a crafting bench"); return; } + + if (packet->patternColors.size() != packet->patternIndexs.size() || packet->patternIndexs.empty() || packet->patternIndexs.size() > 6) return; + shared_ptr foundBannerItem = nullptr; - - if (packet->patternColors.size() == packet->patternIndexs.size()) return; - for (int i = 0; i < player->inventory->items.length && foundBannerItem == nullptr; i++) { shared_ptr& item = player->inventory->items[i]; - if (item->id != Tile::standing_banner_Id) continue; + if (item == nullptr || item->id != Tile::standing_banner_Id) continue; if (item->getAuxValue() != packet->findBannerAux) continue; std::vector bannerPatternIndexs = BannerPatternRecipe::getBannerPatternIndexs(item); if (bannerPatternIndexs.size() != packet->findPatternIndexs.size()) continue; bool failedPatternMatches = false; - for (int j = 0; j < bannerPatternIndexs.size(); j++) { if (packet->findPatternIndexs[j] != bannerPatternIndexs[j]) { failedPatternMatches = true; + break; } } if (failedPatternMatches) continue; @@ -3602,6 +3604,7 @@ void PlayerConnection::handleCraftItem(shared_ptr packet) for (int j = 0; j < bannerPatternColors.size(); j++) { if (packet->findPatternColors[j] != bannerPatternColors[j]) { failedPatternMatches = true; + break; } } if (failedPatternMatches) continue; @@ -3609,23 +3612,86 @@ void PlayerConnection::handleCraftItem(shared_ptr packet) foundBannerItem = item; } - if (foundBannerItem != nullptr) { - auto newBanner = ItemInstance::clone(foundBannerItem); + if (foundBannerItem == nullptr) return; + bool craftAnything = app.DebugSettingsOn() && (player->GetDebugOptions() & (1L << eDebugSetting_CraftAnything)); + bool canCraft = true; + + //forward wrappers from IUIScene_CraftingMenu + auto hasItem = [&](int id, int requiredCount = 1, int aux = -1) { + int count = 0; + for (int i = 0; i < player->inventory->items.length; i++) { + const shared_ptr& item = player->inventory->items[i]; + if (item == nullptr || item->id != id) continue; + if (aux != -1 && item->getAuxValue() != aux) continue; + count += item->count; + if (count >= requiredCount) return true; + } + return false; + }; + + auto hasItemCounts = [&](int id, int aux = -1) { + int count = 0; + for (int i = 0; i < player->inventory->items.length; i++) { + const shared_ptr& item = player->inventory->items[i]; + if (item == nullptr || item->id != id) continue; + if (aux != -1 && item->getAuxValue() != aux) continue; + count += item->count; + } + return count; + }; + + if (canCraft && !craftAnything) { + int requiredDyes[16] = {}; for (int i = 0; i < packet->patternIndexs.size(); i++) { - char patternIndex = packet->patternIndexs[i]; - - BannerPatternRecipe::addBannerPattern(newBanner, BannerPatternRecipe::PATTERNS[patternIndex].id, packet->patternColors[i]); + const BannerPatternRecipe::PatternInfo& pattern = BannerPatternRecipe::PATTERNS[static_cast(packet->patternIndexs[i])]; + if (pattern.specialItemId != 0) continue; + + int color = static_cast(packet->patternColors[i]) & 15; + for (int row = 0; row < 3; row++) + for (int col = 0; col < 3; col++) + if (pattern.rows[row][col] != ' ') ++requiredDyes[color]; } - if (app.DebugSettingsOn() && (player->GetDebugOptions() & (1L << eDebugSetting_CraftAnything))) { - if (player->inventory->add(foundBannerItem) == false) { - player->drop(foundBannerItem); + for (int color = 0; color < 16; color++) { + if (hasItemCounts(Item::dye_Id, color) < requiredDyes[color]) { + canCraft = false; + break; } - } else { - } } + + if (!canCraft) return; + + shared_ptr newBanner = ItemInstance::clone(foundBannerItem); + for (int i = 0; i < packet->patternIndexs.size(); i++) { + int patternIndex = static_cast(packet->patternIndexs[i]); + BannerPatternRecipe::addBannerPattern(newBanner, BannerPatternRecipe::PATTERNS[patternIndex].id, packet->patternColors[i]); + } + + if (!craftAnything) { + for (int i = 0; i < packet->patternIndexs.size(); i++) { + int patternIndex = static_cast(packet->patternIndexs[i]); + const BannerPatternRecipe::PatternInfo& pattern = BannerPatternRecipe::PATTERNS[patternIndex]; + + if (pattern.specialItemId != 0) { + player->inventory->removeResource(pattern.specialItemId, pattern.specialItemAux); + } else { + int color = static_cast(packet->patternColors[i]) & 15; + int dyeCount = 0; + for (int row = 0; row < 3; row++) + for (int col = 0; col < 3; col++) + if (pattern.rows[row][col] != ' ') ++dyeCount; + + for (int j = 0; j < dyeCount; j++) + player->inventory->removeResource(Item::dye_Id, color); + } + } + + player->inventory->removeResources(foundBannerItem); + } + + if (!player->inventory->add(newBanner)) player->drop(newBanner); } else { int iRecipe = packet->recipe;