restored 'java' achievement

This commit is contained in:
Zasus 2026-03-02 13:22:14 +00:00
parent f9b266e02c
commit 7f6364ac44
4 changed files with 9 additions and 7 deletions

View file

@ -88,6 +88,7 @@ void AchievementPopup::render()
glDepthMask(true); glDepthMask(true);
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
} }
#endif
if (ach == NULL || startTime == 0) return; if (ach == NULL || startTime == 0) return;
double time = (System::currentTimeMillis() - startTime) / 3000.0; double time = (System::currentTimeMillis() - startTime) / 3000.0;
@ -115,7 +116,7 @@ void AchievementPopup::render()
int xx = width - 160; int xx = width - 160;
int yy = 0 - (int) (yo * 36); 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); glColor4f(1, 1, 1, 1);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, tex); glBindTexture(GL_TEXTURE_2D, tex);
@ -125,7 +126,8 @@ void AchievementPopup::render()
if (isHelper) 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 else
{ {
@ -147,5 +149,4 @@ void AchievementPopup::render()
glDepthMask(true); glDepthMask(true);
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
#endif
} }

View file

@ -783,8 +783,9 @@ void LocalPlayer::awardStat(Stat *stat, byteArray param)
// so let the award manager figure it out // so let the award manager figure it out
//if (!minecraft->stats[m_iPad]->hasTaken(ach)) //if (!minecraft->stats[m_iPad]->hasTaken(ach))
{ {
// 4J-PB - Don't display the java popup #ifdef _WINDOWS64
//minecraft->achievementPopup->popup(ach); minecraft->achievementPopup->popup(ach);
#endif // _WINDOWS64
// 4J Stu - Added this function in the libraries as some achievements don't get awarded to all players // 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 // e.g. Splitscreen players cannot get theme/avatar/gamerpic and Trial players cannot get any

View file

@ -26,7 +26,7 @@ wchar_t *Textures::preLoaded[TN_COUNT] =
L"%blur%misc/pumpkinblur", L"%blur%misc/pumpkinblur",
// L"%blur%/misc/vignette", // Not currently used // L"%blur%/misc/vignette", // Not currently used
L"%clamp%misc/shadow", L"%clamp%misc/shadow",
// L"/achievement/bg", // Not currently used L"/achievement/bg", // Not currently used
L"art/kz", L"art/kz",
L"environment/clouds", L"environment/clouds",
L"environment/rain", L"environment/rain",

View file

@ -19,7 +19,7 @@ typedef enum _TEXTURE_NAME
TN__BLUR__MISC_PUMPKINBLUR, TN__BLUR__MISC_PUMPKINBLUR,
// TN__BLUR__MISC_VIGNETTE, // Not currently used // TN__BLUR__MISC_VIGNETTE, // Not currently used
TN__CLAMP__MISC_SHADOW, TN__CLAMP__MISC_SHADOW,
// TN_ACHIEVEMENT_BG, // Not currently used TN_ACHIEVEMENT_BG, // Not currently used
TN_ART_KZ, TN_ART_KZ,
TN_ENVIRONMENT_CLOUDS, TN_ENVIRONMENT_CLOUDS,
TN_ENVIRONMENT_RAIN, TN_ENVIRONMENT_RAIN,