LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-31 19:54:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: format Minecraft.World

Browse Source
This commit is contained in:
Tropical
2026-03-13 17:06:56 -05:00
parent bd6284025d
commit 33d0737d1d
1511 changed files with 108661 additions and 115521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
Minecraft.World/Stats/Stat.cpp
View File

@@ -5,111 +5,90 @@
#include "Stats.h"
#include "Stat.h"
Stat::DefaultFormat *Stat::defaultFormatter = new DefaultFormat();
Stat::TimeFormatter *Stat::timeFormatter = new TimeFormatter();
Stat::DistanceFormatter *Stat::distanceFormatter = new DistanceFormatter();
Stat::DefaultFormat* Stat::defaultFormatter = new DefaultFormat();
Stat::TimeFormatter* Stat::timeFormatter = new TimeFormatter();
Stat::DistanceFormatter* Stat::distanceFormatter = new DistanceFormatter();
// 4J Stu - Changed this to take in a printf format string instead
DecimalFormat *Stat::decimalFormat = new DecimalFormat(L"%0(3).2f");
DecimalFormat* Stat::decimalFormat = new DecimalFormat(L"%0(3).2f");
void Stat::_init()
{
awardLocallyOnly = false;
}
void Stat::_init() { awardLocallyOnly = false; }
Stat::Stat(int id, const std::wstring& name, StatFormatter *formatter) : id(id), name(name), formatter(formatter)
{
_init();
}
Stat::Stat(int id, const std::wstring& name) : id(id), name(name), formatter(defaultFormatter)
{
Stat::Stat(int id, const std::wstring& name, StatFormatter* formatter)
: id(id), name(name), formatter(formatter) {
_init();
}
Stat *Stat::setAwardLocallyOnly()
{
Stat::Stat(int id, const std::wstring& name)
: id(id), name(name), formatter(defaultFormatter) {
_init();
}
Stat* Stat::setAwardLocallyOnly() {
awardLocallyOnly = true;
return this;
}
Stat *Stat::postConstruct()
{
//if (Stats::statsById->containsKey(id))
//{
//throw new RuntimeException("Duplicate stat id: \"" + Stats::statsById->get(id)->name + "\" and \"" + name + "\" at id " + id); 4J - TODO
Stat* Stat::postConstruct() {
// if (Stats::statsById->containsKey(id))
//{
// throw new RuntimeException("Duplicate stat id: \"" +
// Stats::statsById->get(id)->name + "\" and \"" + name + "\" at id " + id);
// 4J - TODO
//}
Stats::all->push_back(this);
std::pair<int, Stat *> id1(id,this);
std::pair<int, Stat*> id1(id, this);
#ifdef __PS3__
Stats::statsById->emplace(id1 );// assert(0); // MGH - TODO - FIX - find out where this move function comes from
Stats::statsById->emplace(id1); // assert(0); // MGH - TODO - FIX - find
//out where this move function comes from
#else
Stats::statsById->emplace(std::move(id1));
#endif // __PS3__
Stats::statsById->emplace(std::move(id1));
#endif // __PS3__
return this;
}
bool Stat::isAchievement()
{
return false;
bool Stat::isAchievement() { return false; }
std::wstring Stat::format(int value) {
return ((StatFormatter*)formatter)->format(value);
}
std::wstring Stat::format(int value)
{
return ((StatFormatter *)formatter)->format(value);
}
std::wstring Stat::toString() { return name; }
std::wstring Stat::toString()
{
return name;
}
std::wstring Stat::TimeFormatter::format(int value)
{
std::wstring Stat::TimeFormatter::format(int value) {
double seconds = value / 20.0;
double minutes = seconds / 60.0;
double hours = minutes / 60.0;
double days = hours / 24.0;
double years = days / 365.0;
if (years > 0.5)
{
if (years > 0.5) {
return decimalFormat->format(years) + L" y";
}
else if (days > 0.5)
{
} else if (days > 0.5) {
return decimalFormat->format(days) + L" d";
}
else if (hours > 0.5)
{
} else if (hours > 0.5) {
return decimalFormat->format(hours) + L" h";
}
else if (minutes > 0.5)
{
} else if (minutes > 0.5) {
return decimalFormat->format(minutes) + L" m";
}
return _toString<double>(seconds) + L" s";
}
std::wstring Stat::DefaultFormat::format(int value)
{
return NumberFormat::format( value ); //numberFormat->format(value);
std::wstring Stat::DefaultFormat::format(int value) {
return NumberFormat::format(value); // numberFormat->format(value);
}
std::wstring Stat::DistanceFormatter::format(int cm)
{
std::wstring Stat::DistanceFormatter::format(int cm) {
double meters = cm / 100.0;
double kilometers = meters / 1000.0;
if (kilometers > 0.5)
{
if (kilometers > 0.5) {
return decimalFormat->format(kilometers) + L" km";
} else if (meters > 0.5)
{
} else if (meters > 0.5) {
return decimalFormat->format(meters) + L" m";
}
return _toString<int>(cm) + L" cm";