Skip to content

WIP Restore Java Achievements #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
DFelipehDEV wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −7
Draft

WIP Restore Java Achievements #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Minecraft.Client/AchievementPopup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ void AchievementPopup::render()
glDepthMask(true);
glEnable(GL_DEPTH_TEST);
}
#endif
if (ach == NULL || startTime == 0) return;

double time = (System::currentTimeMillis() - startTime) / 3000.0;
Expand Down Expand Up @@ -115,7 +116,7 @@ void AchievementPopup::render()

int xx = width - 160;
int yy = 0 - (int) (yo * 36);
int tex = mc->textures->loadTexture(L"/achievement/bg.png");
int tex = mc->textures->loadTexture(TN_ACHIEVEMENT_BG);
glColor4f(1, 1, 1, 1);
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, tex);
Expand All @@ -125,7 +126,8 @@ void AchievementPopup::render()

if (isHelper)
{
mc->font->drawWordWrap(desc, xx + 30, yy + 7, 120, 0xffffffff);
//mc->font->drawWordWrap(desc, xx + 30, yy + 7, 120, 0xffffffff);
mc->font->drawWordWrap(desc, xx + 20, yy + 7, 120, 0xffffffff, 80);
}
else
{
Expand All @@ -147,5 +149,4 @@ void AchievementPopup::render()

glDepthMask(true);
glEnable(GL_DEPTH_TEST);
#endif
}
5 changes: 3 additions & 2 deletions Minecraft.Client/LocalPlayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,8 +783,9 @@ void LocalPlayer::awardStat(Stat *stat, byteArray param)
// so let the award manager figure it out
//if (!minecraft->stats[m_iPad]->hasTaken(ach))
{
// 4J-PB - Don't display the java popup
//minecraft->achievementPopup->popup(ach);
#ifdef _WINDOWS64
minecraft->achievementPopup->popup(ach);
#endif // _WINDOWS64

// 4J Stu - Added this function in the libraries as some achievements don't get awarded to all players
// e.g. Splitscreen players cannot get theme/avatar/gamerpic and Trial players cannot get any
Expand Down
2 changes: 1 addition & 1 deletion Minecraft.Client/Textures.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ wchar_t *Textures::preLoaded[TN_COUNT] =
L"%blur%misc/pumpkinblur",
// L"%blur%/misc/vignette", // Not currently used
L"%clamp%misc/shadow",
// L"/achievement/bg", // Not currently used
L"/achievement/bg", // Not currently used
L"art/kz",
L"environment/clouds",
L"environment/rain",
Expand Down
2 changes: 1 addition & 1 deletion Minecraft.Client/Textures.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ typedef enum _TEXTURE_NAME
TN__BLUR__MISC_PUMPKINBLUR,
// TN__BLUR__MISC_VIGNETTE, // Not currently used
TN__CLAMP__MISC_SHADOW,
// TN_ACHIEVEMENT_BG, // Not currently used
TN_ACHIEVEMENT_BG, // Not currently used
TN_ART_KZ,
TN_ENVIRONMENT_CLOUDS,
TN_ENVIRONMENT_RAIN,
Expand Down