summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage/StatSerializer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/WorldStorage/StatSerializer.cpp')
-rw-r--r--src/WorldStorage/StatSerializer.cpp207
1 files changed, 108 insertions, 99 deletions
diff --git a/src/WorldStorage/StatSerializer.cpp b/src/WorldStorage/StatSerializer.cpp
index 95652a8d7..11b5ffbf9 100644
--- a/src/WorldStorage/StatSerializer.cpp
+++ b/src/WorldStorage/StatSerializer.cpp
@@ -4,6 +4,7 @@
#include "Globals.h"
#include "../Statistics.h"
+#include "StatSerializer.h"
#include "NamespaceSerializer.h"
#include <json/json.h>
@@ -12,100 +13,9 @@
-// Upgrade mapping from pre-1.13 names. TODO: remove on 2020-09-18
-static const std::unordered_map<std::string_view, Statistic> LegacyMapping
-{
- { "achievement.openInventory", Statistic::AchOpenInventory },
- { "achievement.mineWood", Statistic::AchMineWood },
- { "achievement.buildWorkBench", Statistic::AchBuildWorkBench },
- { "achievement.buildPickaxe", Statistic::AchBuildPickaxe },
- { "achievement.buildFurnace", Statistic::AchBuildFurnace },
- { "achievement.acquireIron", Statistic::AchAcquireIron },
- { "achievement.buildHoe", Statistic::AchBuildHoe },
- { "achievement.makeBread", Statistic::AchMakeBread },
- { "achievement.bakeCake", Statistic::AchBakeCake },
- { "achievement.buildBetterPickaxe", Statistic::AchBuildBetterPickaxe },
- { "achievement.cookFish", Statistic::AchCookFish },
- { "achievement.onARail", Statistic::AchOnARail },
- { "achievement.buildSword", Statistic::AchBuildSword },
- { "achievement.killEnemy", Statistic::AchKillEnemy },
- { "achievement.killCow", Statistic::AchKillCow },
- { "achievement.flyPig", Statistic::AchFlyPig },
- { "achievement.snipeSkeleton", Statistic::AchSnipeSkeleton },
- { "achievement.diamonds", Statistic::AchDiamonds },
- { "achievement.portal", Statistic::AchPortal },
- { "achievement.ghast", Statistic::AchGhast },
- { "achievement.blazeRod", Statistic::AchBlazeRod },
- { "achievement.potion", Statistic::AchPotion },
- { "achievement.theEnd", Statistic::AchTheEnd },
- { "achievement.theEnd2", Statistic::AchTheEnd2 },
- { "achievement.enchantments", Statistic::AchEnchantments },
- { "achievement.overkill", Statistic::AchOverkill },
- { "achievement.bookcase", Statistic::AchBookcase },
- { "achievement.exploreAllBiomes", Statistic::AchExploreAllBiomes },
- { "achievement.spawnWither", Statistic::AchSpawnWither },
- { "achievement.killWither", Statistic::AchKillWither },
- { "achievement.fullBeacon", Statistic::AchFullBeacon },
- { "achievement.breedCow", Statistic::AchBreedCow },
- { "achievement.diamondsToYou", Statistic::AchDiamondsToYou },
- { "stat.animalsBred", Statistic::AnimalsBred },
- { "stat.boatOneCm", Statistic::BoatOneCm },
- { "stat.climbOneCm", Statistic::ClimbOneCm },
- { "stat.crouchOneCm", Statistic::CrouchOneCm },
- { "stat.damageDealt", Statistic::DamageDealt },
- { "stat.damageTaken", Statistic::DamageTaken },
- { "stat.deaths", Statistic::Deaths },
- { "stat.drop", Statistic::Drop },
- { "stat.fallOneCm", Statistic::FallOneCm },
- { "stat.fishCaught", Statistic::FishCaught },
- { "stat.flyOneCm", Statistic::FlyOneCm },
- { "stat.horseOneCm", Statistic::HorseOneCm },
- { "stat.jump", Statistic::Jump },
- { "stat.leaveGame", Statistic::LeaveGame },
- { "stat.minecartOneCm", Statistic::MinecartOneCm },
- { "stat.mobKills", Statistic::MobKills },
- { "stat.pigOneCm", Statistic::PigOneCm },
- { "stat.playerKills", Statistic::PlayerKills },
- { "stat.playOneMinute", Statistic::PlayOneMinute },
- { "stat.sprintOneCm", Statistic::SprintOneCm },
- { "stat.swimOneCm", Statistic::SwimOneCm },
- { "stat.talkedToVillager", Statistic::TalkedToVillager },
- { "stat.timeSinceDeath", Statistic::TimeSinceDeath },
- { "stat.tradedWithVillager", Statistic::TradedWithVillager },
- { "stat.walkOneCm", Statistic::WalkOneCm },
- { "stat.diveOneCm", Statistic::WalkUnderWaterOneCm },
- { "stat.armorCleaned", Statistic::CleanArmor },
- { "stat.bannerCleaned", Statistic::CleanBanner },
- { "stat.cakeSlicesEaten", Statistic::EatCakeSlice },
- { "stat.itemEnchanted", Statistic::EnchantItem },
- { "stat.cauldronFilled", Statistic::FillCauldron },
- { "stat.dispenserInspected", Statistic::InspectDispenser },
- { "stat.dropperInspected", Statistic::InspectDropper },
- { "stat.hopperInspected", Statistic::InspectHopper },
- { "stat.beaconInteraction", Statistic::InteractWithBeacon },
- { "stat.brewingstandInteraction", Statistic::InteractWithBrewingstand },
- { "stat.craftingTableInteraction", Statistic::InteractWithCraftingTable },
- { "stat.furnaceInteraction", Statistic::InteractWithFurnace },
- { "stat.chestOpened", Statistic::OpenChest },
- { "stat.enderchestOpened", Statistic::OpenEnderchest },
- { "stat.noteblockPlayed", Statistic::PlayNoteblock },
- { "stat.recordPlayed", Statistic::PlayRecord },
- { "stat.flowerPotted", Statistic::PotFlower },
- { "stat.trappedChestTriggered", Statistic::TriggerTrappedChest },
- { "stat.noteblockTuned", Statistic::TuneNoteblock },
- { "stat.cauldronUsed", Statistic::UseCauldron },
- { "stat.aviateOneCm", Statistic::AviateOneCm },
- { "stat.sleepInBed", Statistic::SleepInBed },
- { "stat.sneakTime", Statistic::SneakTime }
-};
-
-
-
-
-
namespace StatSerializer
{
- auto MakeStatisticsDirectory(const std::string & WorldPath, std::string && FileName)
+ static auto MakeStatisticsDirectory(const std::string & WorldPath, std::string && FileName)
{
// Even though stats are shared between worlds, they are (usually) saved
// inside the folder of the default world.
@@ -123,7 +33,7 @@ namespace StatSerializer
- void SaveStatToJSON(const cStatManager & Manager, Json::Value & a_Out)
+ static void SaveStatToJSON(const cStatManager & Manager, Json::Value & a_Out)
{
Manager.ForEachStatisticType([&a_Out](const cStatManager::CustomStore & Store)
{
@@ -145,8 +55,95 @@ namespace StatSerializer
- void LoadLegacyFromJSON(cStatManager & Manager, const Json::Value & In)
+ static void LoadLegacyFromJSON(cStatManager & Manager, const Json::Value & In)
{
+ // Upgrade mapping from pre-1.13 names. TODO: remove on 2020-09-18
+ static const std::unordered_map<std::string_view, Statistic> LegacyMapping
+ {
+ { "achievement.openInventory", Statistic::AchOpenInventory },
+ { "achievement.mineWood", Statistic::AchMineWood },
+ { "achievement.buildWorkBench", Statistic::AchBuildWorkBench },
+ { "achievement.buildPickaxe", Statistic::AchBuildPickaxe },
+ { "achievement.buildFurnace", Statistic::AchBuildFurnace },
+ { "achievement.acquireIron", Statistic::AchAcquireIron },
+ { "achievement.buildHoe", Statistic::AchBuildHoe },
+ { "achievement.makeBread", Statistic::AchMakeBread },
+ { "achievement.bakeCake", Statistic::AchBakeCake },
+ { "achievement.buildBetterPickaxe", Statistic::AchBuildBetterPickaxe },
+ { "achievement.cookFish", Statistic::AchCookFish },
+ { "achievement.onARail", Statistic::AchOnARail },
+ { "achievement.buildSword", Statistic::AchBuildSword },
+ { "achievement.killEnemy", Statistic::AchKillEnemy },
+ { "achievement.killCow", Statistic::AchKillCow },
+ { "achievement.flyPig", Statistic::AchFlyPig },
+ { "achievement.snipeSkeleton", Statistic::AchSnipeSkeleton },
+ { "achievement.diamonds", Statistic::AchDiamonds },
+ { "achievement.portal", Statistic::AchPortal },
+ { "achievement.ghast", Statistic::AchGhast },
+ { "achievement.blazeRod", Statistic::AchBlazeRod },
+ { "achievement.potion", Statistic::AchPotion },
+ { "achievement.theEnd", Statistic::AchTheEnd },
+ { "achievement.theEnd2", Statistic::AchTheEnd2 },
+ { "achievement.enchantments", Statistic::AchEnchantments },
+ { "achievement.overkill", Statistic::AchOverkill },
+ { "achievement.bookcase", Statistic::AchBookcase },
+ { "achievement.exploreAllBiomes", Statistic::AchExploreAllBiomes },
+ { "achievement.spawnWither", Statistic::AchSpawnWither },
+ { "achievement.killWither", Statistic::AchKillWither },
+ { "achievement.fullBeacon", Statistic::AchFullBeacon },
+ { "achievement.breedCow", Statistic::AchBreedCow },
+ { "achievement.diamondsToYou", Statistic::AchDiamondsToYou },
+ { "stat.animalsBred", Statistic::AnimalsBred },
+ { "stat.boatOneCm", Statistic::BoatOneCm },
+ { "stat.climbOneCm", Statistic::ClimbOneCm },
+ { "stat.crouchOneCm", Statistic::CrouchOneCm },
+ { "stat.damageDealt", Statistic::DamageDealt },
+ { "stat.damageTaken", Statistic::DamageTaken },
+ { "stat.deaths", Statistic::Deaths },
+ { "stat.drop", Statistic::Drop },
+ { "stat.fallOneCm", Statistic::FallOneCm },
+ { "stat.fishCaught", Statistic::FishCaught },
+ { "stat.flyOneCm", Statistic::FlyOneCm },
+ { "stat.horseOneCm", Statistic::HorseOneCm },
+ { "stat.jump", Statistic::Jump },
+ { "stat.leaveGame", Statistic::LeaveGame },
+ { "stat.minecartOneCm", Statistic::MinecartOneCm },
+ { "stat.mobKills", Statistic::MobKills },
+ { "stat.pigOneCm", Statistic::PigOneCm },
+ { "stat.playerKills", Statistic::PlayerKills },
+ { "stat.playOneMinute", Statistic::PlayOneMinute },
+ { "stat.sprintOneCm", Statistic::SprintOneCm },
+ { "stat.swimOneCm", Statistic::SwimOneCm },
+ { "stat.talkedToVillager", Statistic::TalkedToVillager },
+ { "stat.timeSinceDeath", Statistic::TimeSinceDeath },
+ { "stat.tradedWithVillager", Statistic::TradedWithVillager },
+ { "stat.walkOneCm", Statistic::WalkOneCm },
+ { "stat.diveOneCm", Statistic::WalkUnderWaterOneCm },
+ { "stat.armorCleaned", Statistic::CleanArmor },
+ { "stat.bannerCleaned", Statistic::CleanBanner },
+ { "stat.cakeSlicesEaten", Statistic::EatCakeSlice },
+ { "stat.itemEnchanted", Statistic::EnchantItem },
+ { "stat.cauldronFilled", Statistic::FillCauldron },
+ { "stat.dispenserInspected", Statistic::InspectDispenser },
+ { "stat.dropperInspected", Statistic::InspectDropper },
+ { "stat.hopperInspected", Statistic::InspectHopper },
+ { "stat.beaconInteraction", Statistic::InteractWithBeacon },
+ { "stat.brewingstandInteraction", Statistic::InteractWithBrewingstand },
+ { "stat.craftingTableInteraction", Statistic::InteractWithCraftingTable },
+ { "stat.furnaceInteraction", Statistic::InteractWithFurnace },
+ { "stat.chestOpened", Statistic::OpenChest },
+ { "stat.enderchestOpened", Statistic::OpenEnderchest },
+ { "stat.noteblockPlayed", Statistic::PlayNoteblock },
+ { "stat.recordPlayed", Statistic::PlayRecord },
+ { "stat.flowerPotted", Statistic::PotFlower },
+ { "stat.trappedChestTriggered", Statistic::TriggerTrappedChest },
+ { "stat.noteblockTuned", Statistic::TuneNoteblock },
+ { "stat.cauldronUsed", Statistic::UseCauldron },
+ { "stat.aviateOneCm", Statistic::AviateOneCm },
+ { "stat.sleepInBed", Statistic::SleepInBed },
+ { "stat.sneakTime", Statistic::SneakTime }
+ };
+
for (auto Entry = In.begin(); Entry != In.end(); ++Entry)
{
const auto & Key = Entry.key().asString();
@@ -154,7 +151,13 @@ namespace StatSerializer
if ((FindResult != LegacyMapping.end()) && Entry->isInt())
{
- Manager.SetValue(FindResult->second, Entry->asInt());
+ auto Value = Entry->asInt();
+ if (Value < 0)
+ {
+ FLOGWARNING("Invalid stat value: {0} = {1}", Key, Value);
+ continue;
+ }
+ Manager.SetValue(FindResult->second, ToUnsigned(Value));
}
}
}
@@ -163,7 +166,7 @@ namespace StatSerializer
- void LoadCustomStatFromJSON(cStatManager & Manager, const Json::Value & a_In)
+ static void LoadCustomStatFromJSON(cStatManager & Manager, const Json::Value & a_In)
{
for (auto it = a_In.begin(); it != a_In.end(); ++it)
{
@@ -178,13 +181,19 @@ namespace StatSerializer
const auto & StatName = StatInfo.second;
try
{
- Manager.SetValue(NamespaceSerializer::ToCustomStatistic(StatName), it->asInt());
+ auto Value = it->asInt();
+ if (Value < 0)
+ {
+ FLOGWARNING("Invalid statistic value: {0} = {1}", Key, Value);
+ continue;
+ }
+ Manager.SetValue(NamespaceSerializer::ToCustomStatistic(StatName), ToUnsigned(Value));
}
- catch (const std::out_of_range & Oops)
+ catch (const std::out_of_range &)
{
FLOGWARNING("Invalid statistic type \"{}\"", StatName);
}
- catch (const Json::LogicError & Oops)
+ catch (const Json::LogicError &)
{
FLOGWARNING("Invalid statistic value for type \"{}\"", StatName);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 23:15:45 +0200