summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage
diff options
context:
space:
mode:
Diffstat (limited to 'src/WorldStorage')
-rw-r--r--src/WorldStorage/CMakeLists.txt2
-rw-r--r--src/WorldStorage/NamespaceSerializer.cpp281
-rw-r--r--src/WorldStorage/NamespaceSerializer.h21
-rw-r--r--src/WorldStorage/StatSerializer.cpp112
-rw-r--r--src/WorldStorage/StatSerializer.h31
5 files changed, 350 insertions, 97 deletions
diff --git a/src/WorldStorage/CMakeLists.txt b/src/WorldStorage/CMakeLists.txt
index 68fdd31bc..af363c97f 100644
--- a/src/WorldStorage/CMakeLists.txt
+++ b/src/WorldStorage/CMakeLists.txt
@@ -5,6 +5,7 @@ target_sources(
FastNBT.cpp
FireworksSerializer.cpp
MapSerializer.cpp
+ NamespaceSerializer.cpp
NBTChunkSerializer.cpp
SchematicFileSerializer.cpp
ScoreboardSerializer.cpp
@@ -16,6 +17,7 @@ target_sources(
FastNBT.h
FireworksSerializer.h
MapSerializer.h
+ NamespaceSerializer.h
NBTChunkSerializer.h
SchematicFileSerializer.h
ScoreboardSerializer.h
diff --git a/src/WorldStorage/NamespaceSerializer.cpp b/src/WorldStorage/NamespaceSerializer.cpp
new file mode 100644
index 000000000..ee2f07dfd
--- /dev/null
+++ b/src/WorldStorage/NamespaceSerializer.cpp
@@ -0,0 +1,281 @@
+#include "Globals.h"
+
+#include "NamespaceSerializer.h"
+
+namespace NamespaceSerializer
+{
+ unsigned DataVersion()
+ {
+ return 2566;
+ }
+
+ const char * From(const Statistic ID)
+ {
+ switch (ID)
+ {
+ case Statistic::AnimalsBred: return "animals_bred";
+ case Statistic::AviateOneCm: return "aviate_one_cm";
+ case Statistic::BellRing: return "bell_ring";
+ case Statistic::BoatOneCm: return "boat_one_cm";
+ case Statistic::CleanArmor: return "clean_armor";
+ case Statistic::CleanBanner: return "clean_banner";
+ case Statistic::CleanShulkerBox: return "clean_shulker_box";
+ case Statistic::ClimbOneCm: return "climb_one_cm";
+ case Statistic::CrouchOneCm: return "crouch_one_cm";
+ case Statistic::DamageAbsorbed: return "damage_absorbed";
+ case Statistic::DamageBlockedByShield: return "damage_blocked_by_shield";
+ case Statistic::DamageDealt: return "damage_dealt";
+ case Statistic::DamageDealtAbsorbed: return "damage_dealt_absorbed";
+ case Statistic::DamageDealtResisted: return "damage_dealt_resisted";
+ case Statistic::DamageResisted: return "damage_resisted";
+ case Statistic::DamageTaken: return "damage_taken";
+ case Statistic::Deaths: return "deaths";
+ case Statistic::Drop: return "drop";
+ case Statistic::EatCakeSlice: return "eat_cake_slice";
+ case Statistic::EnchantItem: return "enchant_item";
+ case Statistic::FallOneCm: return "fall_one_cm";
+ case Statistic::FillCauldron: return "fill_cauldron";
+ case Statistic::FishCaught: return "fish_caught";
+ case Statistic::FlyOneCm: return "fly_one_cm";
+ case Statistic::HorseOneCm: return "horse_one_cm";
+ case Statistic::InspectDispenser: return "inspect_dispenser";
+ case Statistic::InspectDropper: return "inspect_dropper";
+ case Statistic::InspectHopper: return "inspect_hopper";
+ case Statistic::InteractWithAnvil: return "interact_with_anvil";
+ case Statistic::InteractWithBeacon: return "interact_with_beacon";
+ case Statistic::InteractWithBlastFurnace: return "interact_with_blast_furnace";
+ case Statistic::InteractWithBrewingstand: return "interact_with_brewingstand";
+ case Statistic::InteractWithCampfire: return "interact_with_campfire";
+ case Statistic::InteractWithCartographyTable: return "interact_with_cartography_table";
+ case Statistic::InteractWithCraftingTable: return "interact_with_crafting_table";
+ case Statistic::InteractWithFurnace: return "interact_with_furnace";
+ case Statistic::InteractWithGrindstone: return "interact_with_grindstone";
+ case Statistic::InteractWithLectern: return "interact_with_lectern";
+ case Statistic::InteractWithLoom: return "interact_with_loom";
+ case Statistic::InteractWithSmithingTable: return "interact_with_smithing_table";
+ case Statistic::InteractWithSmoker: return "interact_with_smoker";
+ case Statistic::InteractWithStonecutter: return "interact_with_stonecutter";
+ case Statistic::Jump: return "jump";
+ case Statistic::LeaveGame: return "leave_game";
+ case Statistic::MinecartOneCm: return "minecart_one_cm";
+ case Statistic::MobKills: return "mob_kills";
+ case Statistic::OpenBarrel: return "open_barrel";
+ case Statistic::OpenChest: return "open_chest";
+ case Statistic::OpenEnderchest: return "open_enderchest";
+ case Statistic::OpenShulkerBox: return "open_shulker_box";
+ case Statistic::PigOneCm: return "pig_one_cm";
+ case Statistic::PlayNoteblock: return "play_noteblock";
+ case Statistic::PlayOneMinute: return "play_one_minute";
+ case Statistic::PlayRecord: return "play_record";
+ case Statistic::PlayerKills: return "player_kills";
+ case Statistic::PotFlower: return "pot_flower";
+ case Statistic::RaidTrigger: return "raid_trigger";
+ case Statistic::RaidWin: return "raid_win";
+ case Statistic::SleepInBed: return "sleep_in_bed";
+ case Statistic::SneakTime: return "sneak_time";
+ case Statistic::SprintOneCm: return "sprint_one_cm";
+ case Statistic::StriderOneCm: return "strider_one_cm";
+ case Statistic::SwimOneCm: return "swim_one_cm";
+ case Statistic::TalkedToVillager: return "talked_to_villager";
+ case Statistic::TargetHit: return "target_hit";
+ case Statistic::TimeSinceDeath: return "time_since_death";
+ case Statistic::TimeSinceRest: return "time_since_rest";
+ case Statistic::TradedWithVillager: return "traded_with_villager";
+ case Statistic::TriggerTrappedChest: return "trigger_trapped_chest";
+ case Statistic::TuneNoteblock: return "tune_noteblock";
+ case Statistic::UseCauldron: return "use_cauldron";
+ case Statistic::WalkOnWaterOneCm: return "walk_on_water_one_cm";
+ case Statistic::WalkOneCm: return "walk_one_cm";
+ case Statistic::WalkUnderWaterOneCm: return "walk_under_water_one_cm";
+
+ // Old ones just for compatibility
+ case Statistic::JunkFished: return "junk_fished";
+ case Statistic::TreasureFished: return "treasure_fished";
+
+ // The old advancements
+ case Statistic::AchOpenInventory: return "cuberite:achievement.openInventory";
+ case Statistic::AchMineWood: return "cuberite:achievement.mineWood";
+ case Statistic::AchBuildWorkBench: return "cuberite:achievement.buildWorkBench";
+ case Statistic::AchBuildPickaxe: return "cuberite:achievement.buildPickaxe";
+ case Statistic::AchBuildFurnace: return "cuberite:achievement.buildFurnace";
+ case Statistic::AchAcquireIron: return "cuberite:achievement.acquireIron";
+ case Statistic::AchBuildHoe: return "cuberite:achievement.buildHoe";
+ case Statistic::AchMakeBread: return "cuberite:achievement.makeBread";
+ case Statistic::AchBakeCake: return "cuberite:achievement.bakeCake";
+ case Statistic::AchBuildBetterPickaxe: return "cuberite:achievement.buildBetterPickaxe";
+ case Statistic::AchCookFish: return "cuberite:achievement.cookFish";
+ case Statistic::AchOnARail: return "cuberite:achievement.onARail";
+ case Statistic::AchBuildSword: return "cuberite:achievement.buildSword";
+ case Statistic::AchKillEnemy: return "cuberite:achievement.killEnemy";
+ case Statistic::AchKillCow: return "cuberite:achievement.killCow";
+ case Statistic::AchFlyPig: return "cuberite:achievement.flyPig";
+ case Statistic::AchSnipeSkeleton: return "cuberite:achievement.snipeSkeleton";
+ case Statistic::AchDiamonds: return "cuberite:achievement.diamonds";
+ case Statistic::AchPortal: return "cuberite:achievement.portal";
+ case Statistic::AchGhast: return "cuberite:achievement.ghast";
+ case Statistic::AchBlazeRod: return "cuberite:achievement.blazeRod";
+ case Statistic::AchPotion: return "cuberite:achievement.potion";
+ case Statistic::AchTheEnd: return "cuberite:achievement.theEnd";
+ case Statistic::AchTheEnd2: return "cuberite:achievement.theEnd2";
+ case Statistic::AchEnchantments: return "cuberite:achievement.enchantments";
+ case Statistic::AchOverkill: return "cuberite:achievement.overkill";
+ case Statistic::AchBookcase: return "cuberite:achievement.bookcase";
+ case Statistic::AchExploreAllBiomes: return "cuberite:achievement.exploreAllBiomes";
+ case Statistic::AchSpawnWither: return "cuberite:achievement.spawnWither";
+ case Statistic::AchKillWither: return "cuberite:achievement.killWither";
+ case Statistic::AchFullBeacon: return "cuberite:achievement.fullBeacon";
+ case Statistic::AchBreedCow: return "cuberite:achievement.breedCow";
+ case Statistic::AchDiamondsToYou: return "cuberite:achievement.diamondsToYou";
+ }
+
+ UNREACHABLE("Tried to save unhandled statistic");
+ }
+
+ static const std::unordered_map<std::string_view, Statistic> CustomStatistics
+ {
+ { "animals_bred", Statistic::AnimalsBred },
+ { "aviate_one_cm", Statistic::AviateOneCm },
+ { "bell_ring", Statistic::BellRing },
+ { "boat_one_cm", Statistic::BoatOneCm },
+ { "clean_armor", Statistic::CleanArmor },
+ { "clean_banner", Statistic::CleanBanner },
+ { "clean_shulker_box", Statistic::CleanShulkerBox },
+ { "climb_one_cm", Statistic::ClimbOneCm },
+ { "crouch_one_cm", Statistic::CrouchOneCm },
+ { "damage_absorbed", Statistic::DamageAbsorbed },
+ { "damage_blocked_by_shield", Statistic::DamageBlockedByShield },
+ { "damage_dealt", Statistic::DamageDealt },
+ { "damage_dealt_absorbed", Statistic::DamageDealtAbsorbed },
+ { "damage_dealt_resisted", Statistic::DamageDealtResisted },
+ { "damage_resisted", Statistic::DamageResisted },
+ { "damage_taken", Statistic::DamageTaken },
+ { "deaths", Statistic::Deaths },
+ { "drop", Statistic::Drop },
+ { "eat_cake_slice", Statistic::EatCakeSlice },
+ { "enchant_item", Statistic::EnchantItem },
+ { "fall_one_cm", Statistic::FallOneCm },
+ { "fill_cauldron", Statistic::FillCauldron },
+ { "fish_caught", Statistic::FishCaught },
+ { "fly_one_cm", Statistic::FlyOneCm },
+ { "horse_one_cm", Statistic::HorseOneCm },
+ { "inspect_dispenser", Statistic::InspectDispenser },
+ { "inspect_dropper", Statistic::InspectDropper },
+ { "inspect_hopper", Statistic::InspectHopper },
+ { "interact_with_anvil", Statistic::InteractWithAnvil },
+ { "interact_with_beacon", Statistic::InteractWithBeacon },
+ { "interact_with_blast_furnace", Statistic::InteractWithBlastFurnace },
+ { "interact_with_brewingstand", Statistic::InteractWithBrewingstand },
+ { "interact_with_campfire", Statistic::InteractWithCampfire },
+ { "interact_with_cartography_table", Statistic::InteractWithCartographyTable },
+ { "interact_with_crafting_table", Statistic::InteractWithCraftingTable },
+ { "interact_with_furnace", Statistic::InteractWithFurnace },
+ { "interact_with_grindstone", Statistic::InteractWithGrindstone },
+ { "interact_with_lectern", Statistic::InteractWithLectern },
+ { "interact_with_loom", Statistic::InteractWithLoom },
+ { "interact_with_smithing_table", Statistic::InteractWithSmithingTable },
+ { "interact_with_smoker", Statistic::InteractWithSmoker },
+ { "interact_with_stonecutter", Statistic::InteractWithStonecutter },
+ { "jump", Statistic::Jump },
+ { "leave_game", Statistic::LeaveGame },
+ { "minecart_one_cm", Statistic::MinecartOneCm },
+ { "mob_kills", Statistic::MobKills },
+ { "open_barrel", Statistic::OpenBarrel },
+ { "open_chest", Statistic::OpenChest },
+ { "open_enderchest", Statistic::OpenEnderchest },
+ { "open_shulker_box", Statistic::OpenShulkerBox },
+ { "pig_one_cm", Statistic::PigOneCm },
+ { "play_noteblock", Statistic::PlayNoteblock },
+ { "play_one_minute", Statistic::PlayOneMinute },
+ { "play_record", Statistic::PlayRecord },
+ { "player_kills", Statistic::PlayerKills },
+ { "pot_flower", Statistic::PotFlower },
+ { "raid_trigger", Statistic::RaidTrigger },
+ { "raid_win", Statistic::RaidWin },
+ { "sleep_in_bed", Statistic::SleepInBed },
+ { "sneak_time", Statistic::SneakTime },
+ { "sprint_one_cm", Statistic::SprintOneCm },
+ { "strider_one_cm", Statistic::StriderOneCm },
+ { "swim_one_cm", Statistic::SwimOneCm },
+ { "talked_to_villager", Statistic::TalkedToVillager },
+ { "target_hit", Statistic::TargetHit },
+ { "time_since_death", Statistic::TimeSinceDeath },
+ { "time_since_rest", Statistic::TimeSinceRest },
+ { "traded_with_villager", Statistic::TradedWithVillager },
+ { "trigger_trapped_chest", Statistic::TriggerTrappedChest },
+ { "tune_noteblock", Statistic::TuneNoteblock },
+ { "use_cauldron", Statistic::UseCauldron },
+ { "walk_on_water_one_cm", Statistic::WalkOnWaterOneCm },
+ { "walk_one_cm", Statistic::WalkOneCm },
+ { "walk_under_water_one_cm", Statistic::WalkUnderWaterOneCm },
+
+ // Old ones just for compatibility
+ { "junk_fished", Statistic::JunkFished },
+ { "treasure_fished", Statistic::TreasureFished },
+
+ // The old advancements
+ { "cuberite:achievement.openInventory", Statistic::AchOpenInventory },
+ { "cuberite:achievement.mineWood", Statistic::AchMineWood },
+ { "cuberite:achievement.buildWorkBench", Statistic::AchBuildWorkBench },
+ { "cuberite:achievement.buildPickaxe", Statistic::AchBuildPickaxe },
+ { "cuberite:achievement.buildFurnace", Statistic::AchBuildFurnace },
+ { "cuberite:achievement.acquireIron", Statistic::AchAcquireIron },
+ { "cuberite:achievement.buildHoe", Statistic::AchBuildHoe },
+ { "cuberite:achievement.makeBread", Statistic::AchMakeBread },
+ { "cuberite:achievement.bakeCake", Statistic::AchBakeCake },
+ { "cuberite:achievement.buildBetterPickaxe", Statistic::AchBuildBetterPickaxe },
+ { "cuberite:achievement.cookFish", Statistic::AchCookFish },
+ { "cuberite:achievement.onARail", Statistic::AchOnARail },
+ { "cuberite:achievement.buildSword", Statistic::AchBuildSword },
+ { "cuberite:achievement.killEnemy", Statistic::AchKillEnemy },
+ { "cuberite:achievement.killCow", Statistic::AchKillCow },
+ { "cuberite:achievement.flyPig", Statistic::AchFlyPig },
+ { "cuberite:achievement.snipeSkeleton", Statistic::AchSnipeSkeleton },
+ { "cuberite:achievement.diamonds", Statistic::AchDiamonds },
+ { "cuberite:achievement.portal", Statistic::AchPortal },
+ { "cuberite:achievement.ghast", Statistic::AchGhast },
+ { "cuberite:achievement.blazeRod", Statistic::AchBlazeRod },
+ { "cuberite:achievement.potion", Statistic::AchPotion },
+ { "cuberite:achievement.theEnd", Statistic::AchTheEnd },
+ { "cuberite:achievement.theEnd2", Statistic::AchTheEnd2 },
+ { "cuberite:achievement.enchantments", Statistic::AchEnchantments },
+ { "cuberite:achievement.overkill", Statistic::AchOverkill },
+ { "cuberite:achievement.bookcase", Statistic::AchBookcase },
+ { "cuberite:achievement.exploreAllBiomes", Statistic::AchExploreAllBiomes },
+ { "cuberite:achievement.spawnWither", Statistic::AchSpawnWither },
+ { "cuberite:achievement.killWither", Statistic::AchKillWither },
+ { "cuberite:achievement.fullBeacon", Statistic::AchFullBeacon },
+ { "cuberite:achievement.breedCow", Statistic::AchBreedCow },
+ { "cuberite:achievement.diamondsToYou", Statistic::AchDiamondsToYou}
+ };
+
+ Statistic ToCustomStatistic(const std::string_view ID)
+ {
+ return CustomStatistics.at(ID);
+ }
+
+ std::pair<Namespace, std::string_view> SplitNamespacedID(const std::string_view ID)
+ {
+ const auto NamespaceIndex = ID.find(':');
+ if (NamespaceIndex == std::string_view::npos)
+ {
+ // No explicit namespace default to the Minecraft namespace:
+ return { Namespace::Minecraft, ID };
+ }
+
+ const auto Namespace = ID.substr(0, NamespaceIndex);
+ if (Namespace == "minecraft")
+ {
+ // An unprefixed ID in the vanilla Minecraft namespace
+ const auto Value = ID.substr(NamespaceIndex + 1);
+
+ return { Namespace::Minecraft, Value };
+ }
+
+ if (Namespace == "cuberite")
+ {
+ return { Namespace::Cuberite, ID };
+ }
+
+ return { Namespace::Unknown, ID };
+ }
+}
diff --git a/src/WorldStorage/NamespaceSerializer.h b/src/WorldStorage/NamespaceSerializer.h
new file mode 100644
index 000000000..d7902409f
--- /dev/null
+++ b/src/WorldStorage/NamespaceSerializer.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "../Registries/Statistics.h"
+
+namespace NamespaceSerializer
+{
+ enum class Namespace
+ {
+ Minecraft,
+ Cuberite,
+ Unknown
+ };
+
+ unsigned DataVersion();
+
+ const char * From(Statistic ID);
+
+ Statistic ToCustomStatistic(std::string_view ID);
+
+ std::pair<Namespace, std::string_view> SplitNamespacedID(std::string_view ID);
+}
diff --git a/src/WorldStorage/StatSerializer.cpp b/src/WorldStorage/StatSerializer.cpp
index b9f188c11..de8a1d277 100644
--- a/src/WorldStorage/StatSerializer.cpp
+++ b/src/WorldStorage/StatSerializer.cpp
@@ -4,15 +4,17 @@
#include "Globals.h"
#include "StatSerializer.h"
-
#include "../Statistics.h"
-#include "../JsonUtils.h"
+#include "NamespaceSerializer.h"
+
+#include <fstream>
+#include <json/json.h>
-cStatSerializer::cStatSerializer(const AString & a_WorldName, const AString & a_PlayerName, const AString & a_FileName, cStatManager * a_Manager)
+cStatSerializer::cStatSerializer(cStatManager & a_Manager, const AString & a_WorldName, const AString & a_FileName)
: m_Manager(a_Manager)
{
// Even though stats are shared between worlds, they are (usually) saved
@@ -21,8 +23,7 @@ cStatSerializer::cStatSerializer(const AString & a_WorldName, const AString & a_
AString StatsPath;
Printf(StatsPath, "%s%cstats", a_WorldName.c_str(), cFile::PathSeparator());
- m_LegacyPath = StatsPath + "/" + a_PlayerName + ".json";
- m_Path = StatsPath + "/" + a_FileName + ".json";
+ m_Path = StatsPath + cFile::PathSeparator() + a_FileName + ".json";
// Ensure that the directory exists.
cFile::CreateFolder(StatsPath);
@@ -32,49 +33,26 @@ cStatSerializer::cStatSerializer(const AString & a_WorldName, const AString & a_
-bool cStatSerializer::Load(void)
+void cStatSerializer::Load(void)
{
- AString Data = cFile::ReadWholeFile(m_Path);
- if (Data.empty())
- {
- Data = cFile::ReadWholeFile(m_LegacyPath);
- if (Data.empty())
- {
- return false;
- }
- }
-
Json::Value Root;
+ std::ifstream(m_Path) >> Root;
- if (JsonUtils::ParseString(Data, Root))
- {
- return LoadStatFromJSON(Root);
- }
-
- return false;
+ LoadCustomStatFromJSON(Root["stats"]["custom"]);
}
-bool cStatSerializer::Save(void)
+void cStatSerializer::Save(void)
{
Json::Value Root;
- SaveStatToJSON(Root);
-
- cFile File;
- if (!File.Open(m_Path, cFile::fmWrite))
- {
- return false;
- }
- AString JsonData = JsonUtils::WriteStyledString(Root);
+ SaveStatToJSON(Root["stats"]);
+ Root["DataVersion"] = NamespaceSerializer::DataVersion();
- File.Write(JsonData.data(), JsonData.size());
- File.Close();
-
- return true;
+ std::ofstream(m_Path) << Root;
}
@@ -83,68 +61,50 @@ bool cStatSerializer::Save(void)
void cStatSerializer::SaveStatToJSON(Json::Value & a_Out)
{
- for (unsigned int i = 0; i < static_cast<unsigned int>(statCount); ++i)
+ m_Manager.ForEachStatisticType([&a_Out](const cStatManager::CustomStore & Store)
{
- StatValue Value = m_Manager->GetValue(static_cast<eStatistic>(i));
-
- if (Value != 0)
+ if (Store.empty())
{
- const AString & StatName = cStatInfo::GetName(static_cast<eStatistic>(i));
-
- a_Out[StatName] = Value;
+ // Avoid saving "custom": null to disk:
+ return;
}
- // TODO 2014-05-11 xdot: Save "progress"
- }
+ auto & Custom = a_Out["custom"];
+ for (const auto & Item : Store)
+ {
+ Custom[NamespaceSerializer::From(Item.first)] = Item.second;
+ }
+ });
}
-bool cStatSerializer::LoadStatFromJSON(const Json::Value & a_In)
+void cStatSerializer::LoadCustomStatFromJSON(const Json::Value & a_In)
{
- m_Manager->Reset();
-
- for (Json::Value::const_iterator it = a_In.begin() ; it != a_In.end() ; ++it)
+ for (auto it = a_In.begin() ; it != a_In.end() ; ++it)
{
- AString StatName = it.key().asString();
-
- eStatistic StatType = cStatInfo::GetType(StatName);
-
- if (StatType == statInvalid)
+ const auto & Key = it.key().asString();
+ const auto StatInfo = NamespaceSerializer::SplitNamespacedID(Key);
+ if (StatInfo.first == NamespaceSerializer::Namespace::Unknown)
{
- LOGWARNING("Invalid statistic type \"%s\"", StatName.c_str());
+ // Ignore non-Vanilla, non-Cuberite namespaces for now:
continue;
}
- const Json::Value & Node = *it;
-
- if (Node.isInt())
+ const auto & StatName = StatInfo.second;
+ try
{
- m_Manager->SetValue(StatType, Node.asInt());
+ m_Manager.SetValue(NamespaceSerializer::ToCustomStatistic(StatName), it->asInt());
}
- else if (Node.isObject())
+ catch (const std::out_of_range & Oops)
{
- StatValue Value = Node.get("value", 0).asInt();
-
- // TODO 2014-05-11 xdot: Load "progress"
-
- m_Manager->SetValue(StatType, Value);
+ FLOGWARNING("Invalid statistic type \"{}\"", StatName);
}
- else
+ catch (const Json::LogicError & Oops)
{
- LOGWARNING("Invalid statistic value for type \"%s\"", StatName.c_str());
+ FLOGWARNING("Invalid statistic value for type \"{}\"", StatName);
}
}
-
- return true;
}
-
-
-
-
-
-
-
-
diff --git a/src/WorldStorage/StatSerializer.h b/src/WorldStorage/StatSerializer.h
index 8e8e4ffdb..e6a5bd325 100644
--- a/src/WorldStorage/StatSerializer.h
+++ b/src/WorldStorage/StatSerializer.h
@@ -9,14 +9,14 @@
#pragma once
-#include "json/json.h"
-
// fwd:
class cStatManager;
+namespace Json { class Value; }
+
@@ -25,32 +25,21 @@ class cStatSerializer
{
public:
- cStatSerializer(const AString & a_WorldName, const AString & a_PlayerName, const AString & a_FileName, cStatManager * a_Manager);
+ cStatSerializer(cStatManager & a_Manager, const AString & a_WorldName, const AString & a_FileName);
- /* Try to load the player statistics. Returns whether the operation was successful or not. */
- bool Load(void);
+ /* Try to load the player statistics. */
+ void Load(void);
- /* Try to save the player statistics. Returns whether the operation was successful or not. */
- bool Save(void);
+ /* Try to save the player statistics. */
+ void Save(void);
-
-protected:
+private:
void SaveStatToJSON(Json::Value & a_Out);
- bool LoadStatFromJSON(const Json::Value & a_In);
-
-
-private:
+ void LoadCustomStatFromJSON(const Json::Value & a_In);
- cStatManager * m_Manager;
+ cStatManager & m_Manager;
- AString m_LegacyPath; // The old <username>.json path to try to read from if the uuid path doesn't exist on load
AString m_Path;
-
-
} ;
-
-
-
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 12:59:40 +0100