flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

It is time to remove the statistics upgrade map

Browse Source
This commit is contained in:
Tiger Wang 2021-07-28 22:02:05 +01:00
parent 4221e08f3a
commit de329dc5ad
1 changed files with 0 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/WorldStorage/StatisticsSerializer.cpp
View File

@ -52,111 +52,6 @@ namespace StatisticsSerializer
static void LoadLegacyFromJSON(StatisticsManager & 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, CustomStatistic> LegacyMapping
{
{ "achievement.openInventory", CustomStatistic::AchOpenInventory },
{ "achievement.mineWood", CustomStatistic::AchMineWood },
{ "achievement.buildWorkBench", CustomStatistic::AchBuildWorkBench },
{ "achievement.buildPickaxe", CustomStatistic::AchBuildPickaxe },
{ "achievement.buildFurnace", CustomStatistic::AchBuildFurnace },
{ "achievement.acquireIron", CustomStatistic::AchAcquireIron },
{ "achievement.buildHoe", CustomStatistic::AchBuildHoe },
{ "achievement.makeBread", CustomStatistic::AchMakeBread },
{ "achievement.bakeCake", CustomStatistic::AchBakeCake },
{ "achievement.buildBetterPickaxe", CustomStatistic::AchBuildBetterPickaxe },
{ "achievement.cookFish", CustomStatistic::AchCookFish },
{ "achievement.onARail", CustomStatistic::AchOnARail },
{ "achievement.buildSword", CustomStatistic::AchBuildSword },
{ "achievement.killEnemy", CustomStatistic::AchKillEnemy },
{ "achievement.killCow", CustomStatistic::AchKillCow },
{ "achievement.flyPig", CustomStatistic::AchFlyPig },
{ "achievement.snipeSkeleton", CustomStatistic::AchSnipeSkeleton },
{ "achievement.diamonds", CustomStatistic::AchDiamonds },
{ "achievement.portal", CustomStatistic::AchPortal },
{ "achievement.ghast", CustomStatistic::AchGhast },
{ "achievement.blazeRod", CustomStatistic::AchBlazeRod },
{ "achievement.potion", CustomStatistic::AchPotion },
{ "achievement.theEnd", CustomStatistic::AchTheEnd },
{ "achievement.theEnd2", CustomStatistic::AchTheEnd2 },
{ "achievement.enchantments", CustomStatistic::AchEnchantments },
{ "achievement.overkill", CustomStatistic::AchOverkill },
{ "achievement.bookcase", CustomStatistic::AchBookcase },
{ "achievement.exploreAllBiomes", CustomStatistic::AchExploreAllBiomes },
{ "achievement.spawnWither", CustomStatistic::AchSpawnWither },
{ "achievement.killWither", CustomStatistic::AchKillWither },
{ "achievement.fullBeacon", CustomStatistic::AchFullBeacon },
{ "achievement.breedCow", CustomStatistic::AchBreedCow },
{ "achievement.diamondsToYou", CustomStatistic::AchDiamondsToYou },
{ "stat.animalsBred", CustomStatistic::AnimalsBred },
{ "stat.boatOneCm", CustomStatistic::BoatOneCm },
{ "stat.climbOneCm", CustomStatistic::ClimbOneCm },
{ "stat.crouchOneCm", CustomStatistic::CrouchOneCm },
{ "stat.damageDealt", CustomStatistic::DamageDealt },
{ "stat.damageTaken", CustomStatistic::DamageTaken },
{ "stat.deaths", CustomStatistic::Deaths },
{ "stat.drop", CustomStatistic::Drop },
{ "stat.fallOneCm", CustomStatistic::FallOneCm },
{ "stat.fishCaught", CustomStatistic::FishCaught },
{ "stat.flyOneCm", CustomStatistic::FlyOneCm },
{ "stat.horseOneCm", CustomStatistic::HorseOneCm },
{ "stat.jump", CustomStatistic::Jump },
{ "stat.leaveGame", CustomStatistic::LeaveGame },
{ "stat.minecartOneCm", CustomStatistic::MinecartOneCm },
{ "stat.mobKills", CustomStatistic::MobKills },
{ "stat.pigOneCm", CustomStatistic::PigOneCm },
{ "stat.playerKills", CustomStatistic::PlayerKills },
{ "stat.playOneMinute", CustomStatistic::PlayOneMinute },
{ "stat.sprintOneCm", CustomStatistic::SprintOneCm },
{ "stat.swimOneCm", CustomStatistic::SwimOneCm },
{ "stat.talkedToVillager", CustomStatistic::TalkedToVillager },
{ "stat.timeSinceDeath", CustomStatistic::TimeSinceDeath },
{ "stat.tradedWithVillager", CustomStatistic::TradedWithVillager },
{ "stat.walkOneCm", CustomStatistic::WalkOneCm },
{ "stat.diveOneCm", CustomStatistic::WalkUnderWaterOneCm },
{ "stat.armorCleaned", CustomStatistic::CleanArmor },
{ "stat.bannerCleaned", CustomStatistic::CleanBanner },
{ "stat.cakeSlicesEaten", CustomStatistic::EatCakeSlice },
{ "stat.itemEnchanted", CustomStatistic::EnchantItem },
{ "stat.cauldronFilled", CustomStatistic::FillCauldron },
{ "stat.dispenserInspected", CustomStatistic::InspectDispenser },
{ "stat.dropperInspected", CustomStatistic::InspectDropper },
{ "stat.hopperInspected", CustomStatistic::InspectHopper },
{ "stat.beaconInteraction", CustomStatistic::InteractWithBeacon },
{ "stat.brewingstandInteraction", CustomStatistic::InteractWithBrewingstand },
{ "stat.craftingTableInteraction", CustomStatistic::InteractWithCraftingTable },
{ "stat.furnaceInteraction", CustomStatistic::InteractWithFurnace },
{ "stat.chestOpened", CustomStatistic::OpenChest },
{ "stat.enderchestOpened", CustomStatistic::OpenEnderchest },
{ "stat.noteblockPlayed", CustomStatistic::PlayNoteblock },
{ "stat.recordPlayed", CustomStatistic::PlayRecord },
{ "stat.flowerPotted", CustomStatistic::PotFlower },
{ "stat.trappedChestTriggered", CustomStatistic::TriggerTrappedChest },
{ "stat.noteblockTuned", CustomStatistic::TuneNoteblock },
{ "stat.cauldronUsed", CustomStatistic::UseCauldron },
{ "stat.aviateOneCm", CustomStatistic::AviateOneCm },
{ "stat.sleepInBed", CustomStatistic::SleepInBed },
{ "stat.sneakTime", CustomStatistic::SneakTime }
};
for (auto Entry = In.begin(); Entry != In.end(); ++Entry)
{
const auto & Key = Entry.key().asString();
const auto FindResult = LegacyMapping.find(Key);
if ((FindResult != LegacyMapping.end()) && Entry->isInt())
{
Manager.Custom[FindResult->second] = Entry->asUInt();
}
}
}
static void LoadCustomStatFromJSON(StatisticsManager & Manager, const Json::Value & a_In)
{
for (auto it = a_In.begin(); it != a_In.end(); ++it)
@ -194,7 +89,6 @@ namespace StatisticsSerializer
Json::Value Root;
InputFileStream(MakeStatisticsDirectory(WorldPath, std::move(FileName))) >> Root;
LoadLegacyFromJSON(Manager, Root);
LoadCustomStatFromJSON(Manager, Root["stats"]["custom"]);
}