diff --git a/Minecraft.Client/AchievementPopup.cpp b/Minecraft.Client/AchievementPopup.cpp index b99e4748..45603454 100644 --- a/Minecraft.Client/AchievementPopup.cpp +++ b/Minecraft.Client/AchievementPopup.cpp @@ -25,7 +25,12 @@ AchievementPopup::AchievementPopup(Minecraft *mc) void AchievementPopup::popup(Achievement *ach) { title = I18n::get(L"achievement.get"); - desc = ach->name; + if (title == L"achievement.get") + title = L"Achievement Get!"; + + desc = I18n::get(ach->name); + if (desc == ach->name) + desc = ach->getDescription(); startTime = System::currentTimeMillis(); this->ach = ach; isHelper = false; diff --git a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp index d9569cc9..b4fdec10 100644 --- a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp @@ -619,11 +619,11 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId) Windows::Xbox::ApplicationModel::Help::Show(user); } break; -#elif TO_BE_IMPLEMENTED +#endif case BUTTON_PAUSE_ACHIEVEMENTS: // guests can't look at achievements - if(ProfileManager.IsGuest(pNotifyPressData->UserIndex)) + if(ProfileManager.IsGuest(m_iPad)) { UINT uiIDA[1]; uiIDA[0]=IDS_OK; @@ -631,10 +631,10 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId) } else { - XShowAchievementsUI( pNotifyPressData->UserIndex ); + XShowAchievementsUI( m_iPad ); } break; -#endif + case BUTTON_PAUSE_HELPANDOPTIONS: ui.NavigateToScene(m_iPad,eUIScene_HelpAndOptionsMenu); diff --git a/Minecraft.Client/Extrax64Stubs.cpp b/Minecraft.Client/Extrax64Stubs.cpp index acf77074..fe82c873 100644 --- a/Minecraft.Client/Extrax64Stubs.cpp +++ b/Minecraft.Client/Extrax64Stubs.cpp @@ -80,9 +80,14 @@ HRESULT XPartyGetUserList(XPARTY_USER_LIST *pUserList) { return S_OK; } DWORD XContentGetThumbnail(DWORD dwUserIndex, const XCONTENT_DATA *pContentData, PBYTE pbThumbnail, PDWORD pcbThumbnail, PXOVERLAPPED *pOverlapped) { return 0; } void XShowAchievementsUI(int i) { + Minecraft *minecraft = Minecraft::GetInstance(); if (minecraft && i >= 0 && i < 4 && minecraft->stats[i] != NULL) - minecraft->setScreen(new AchievementScreen(minecraft->stats[i])); + { + minecraft->setScreen(NULL); + minecraft->setScreen(new AchievementScreen(minecraft->stats[i])); + } + } DWORD XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE Mode) { return 0; } diff --git a/Minecraft.Client/LocalPlayer.cpp b/Minecraft.Client/LocalPlayer.cpp index 09220033..da4d27f4 100644 --- a/Minecraft.Client/LocalPlayer.cpp +++ b/Minecraft.Client/LocalPlayer.cpp @@ -609,6 +609,7 @@ bool LocalPlayer::startCrafting(int x, int y, int z) bool LocalPlayer::startEnchanting(int x, int y, int z) { + bool success = app.LoadEnchantingMenu(GetXboxPad(), inventory, x, y, z, level ); if( success ) ui.PlayUISFX(eSFX_Press); //minecraft.setScreen(new EnchantmentScreen(inventory, level, x, y, z)); diff --git a/Minecraft.Client/PauseScreen.cpp b/Minecraft.Client/PauseScreen.cpp index 18d066b5..22be1c45 100644 --- a/Minecraft.Client/PauseScreen.cpp +++ b/Minecraft.Client/PauseScreen.cpp @@ -9,6 +9,8 @@ #include "..\Minecraft.World\net.minecraft.world.level.h" #include "..\Minecraft.World\net.minecraft.stats.h" #include "..\Minecraft.Client\LocalPlayer.h" +#include "AchievementScreen.h" +#include "StatsScreen.h" PauseScreen::PauseScreen() { @@ -65,11 +67,11 @@ void PauseScreen::buttonClicked(Button button) if (button.id == 5) { -// minecraft->setScreen(new AchievementScreen(minecraft->stats)); // 4J TODO - put back + minecraft->setScreen(new AchievementScreen(minecraft->stats[button.id])); // 4J TODO - put back } if (button.id == 6) { -// minecraft->setScreen(new StatsScreen(this, minecraft->stats)); // 4J TODO - put back + minecraft->setScreen(new StatsScreen(this, minecraft->stats[button.id])); // 4J TODO - put back } } diff --git a/Minecraft.Client/Windows64/GameHDD/20260302105418/saveData.ms b/Minecraft.Client/Windows64/GameHDD/20260302105418/saveData.ms new file mode 100644 index 00000000..65f3742f Binary files /dev/null and b/Minecraft.Client/Windows64/GameHDD/20260302105418/saveData.ms differ diff --git a/Minecraft.Client/Windows64/GameHDD/20260302105446/saveData.ms b/Minecraft.Client/Windows64/GameHDD/20260302105446/saveData.ms new file mode 100644 index 00000000..b3f9dccc Binary files /dev/null and b/Minecraft.Client/Windows64/GameHDD/20260302105446/saveData.ms differ diff --git a/Minecraft.Client/Windows64/GameHDD/20260302105547/saveData.ms b/Minecraft.Client/Windows64/GameHDD/20260302105547/saveData.ms new file mode 100644 index 00000000..604b18ee Binary files /dev/null and b/Minecraft.Client/Windows64/GameHDD/20260302105547/saveData.ms differ diff --git a/Minecraft.Client/Windows64/GameHDD/20260302110507/saveData.ms b/Minecraft.Client/Windows64/GameHDD/20260302110507/saveData.ms new file mode 100644 index 00000000..30f68847 Binary files /dev/null and b/Minecraft.Client/Windows64/GameHDD/20260302110507/saveData.ms differ diff --git a/Minecraft.Client/Windows64/GameHDD/20260302110946/saveData.ms b/Minecraft.Client/Windows64/GameHDD/20260302110946/saveData.ms new file mode 100644 index 00000000..6ab330e8 Binary files /dev/null and b/Minecraft.Client/Windows64/GameHDD/20260302110946/saveData.ms differ diff --git a/Minecraft.Client/Windows64/GameHDD/20260302111310/saveData.ms b/Minecraft.Client/Windows64/GameHDD/20260302111310/saveData.ms new file mode 100644 index 00000000..2a4cb457 Binary files /dev/null and b/Minecraft.Client/Windows64/GameHDD/20260302111310/saveData.ms differ diff --git a/Minecraft.Client/Windows64/GameHDD/20260302114309/saveData.ms b/Minecraft.Client/Windows64/GameHDD/20260302114309/saveData.ms new file mode 100644 index 00000000..40010faa Binary files /dev/null and b/Minecraft.Client/Windows64/GameHDD/20260302114309/saveData.ms differ diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp index 63be3586..2d201600 100644 --- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp +++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp @@ -844,6 +844,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance, freopen("CONIN$", "r", stdin); std::ios::sync_with_stdio(true); #endif + UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(lpCmdLine); diff --git a/Minecraft.World/Achievement.cpp b/Minecraft.World/Achievement.cpp index a0dfd533..cd374b4c 100644 --- a/Minecraft.World/Achievement.cpp +++ b/Minecraft.World/Achievement.cpp @@ -60,7 +60,7 @@ wstring Achievement::getDescription() { if (descFormatter != NULL) { - return descFormatter->format(desc); + return desc; } return desc; }