-Fixed stats counter using stats IDs instead of UUIDs from the AchievementMap

Author: Wilyicaro

source/client/app/Minecraft.cpp

@@ -686,7 +686,8 @@ void Minecraft::tick()
 
 	tickInput();
 
-	m_pStatsCounter->tick();
+	if (m_pStatsCounter)
+		m_pStatsCounter->tick();
 	m_gui.tick();
 
 	if (m_async.empty())
@@ -834,7 +835,6 @@ void Minecraft::init()
 	m_pGameRenderer = new GameRenderer(this);
 	m_pParticleEngine = new ParticleEngine(m_pLevel, m_pTextures);
 	m_pUser = new User(getOptions()->m_playerName.get(), "");
-	m_pStatsCounter = new StatsCounter(m_pUser, m_externalStorageDir);
 
 	setScreen(new IntroScreen);
 	m_async.emplace_back(std::bind(&Minecraft::initAssets, this));
@@ -848,6 +848,8 @@ void Minecraft::initAssets()
 	FoliageColor::init(m_pPlatform->loadTexture("misc/foliagecolor.png", true));
 	Language::getInstance()->init(getOptions());
 	AchievementMap::getInstance()->init();
+	SAFE_DELETE(m_pStatsCounter);
+	m_pStatsCounter = new StatsCounter(m_pUser, m_externalStorageDir);
 }
 
 Minecraft::~Minecraft()

source/stats/AchievementMap.cpp

@@ -6,9 +6,12 @@ AchievementMap::AchievementMap()
 {
 }
 
+//@NOTE: This will make sure that stats/achievements without a mapping won't crash the game and will have the same behavior as the original, which used StringBuilder.append and allowed null String values
+//Certainly every stat should have a mapping in the original (tall grass mine block stat doesn't have one tho), so that isn't really an intentional behavior
 const std::string& AchievementMap::get(int id) const
 {
-	return m_map.at(id);
+    auto it = m_map.find(id);
+    return it == m_map.end() ? NULL_UUID : it->second;
 }
 
 void AchievementMap::init()
@@ -47,6 +50,8 @@ void AchievementMap::init()
 
 AchievementMap* AchievementMap::instance = new AchievementMap();
 
+std::string AchievementMap::NULL_UUID = "null";
+
 AchievementMap* AchievementMap::getInstance()
 {
 	return instance;

source/stats/AchievementMap.hpp

@@ -18,4 +18,6 @@ class AchievementMap
 	std::unordered_map<int, std::string> m_map;
 
 	static AchievementMap* instance;
+
+	static std::string NULL_UUID;
 };

source/stats/StatsCounter.cpp

@@ -134,7 +134,7 @@ std::unordered_map<Stat*, int> StatsCounter::parseStatsJson(const std::string& j
                 continue;
 
 
-            checksumBuilder += std::to_string(statId) + "," + std::to_string(amount) + ",";
+            checksumBuilder += stat->getUUID() + "," + std::to_string(amount) + ",";
 
             result[stat] = amount;
         }
@@ -177,7 +177,7 @@ std::string StatsCounter::generateStatsJson(const std::string& username, const s
         entry[std::to_string(stat->m_id)] = std::to_string(value);
         statsChange.push_back(entry);
 
-        checksumBuilder += std::to_string(stat->m_id) + "," + std::to_string(value) + ",";
+        checksumBuilder += stat->getUUID() + "," + std::to_string(value) + ",";
     }
 
     json["stats-change"] = statsChange;