cleanup: flatten dead branches in world io level network and stats

This commit is contained in:
MatthewBeshay
2026-03-26 20:53:52 +11:00
parent 12ff12a263
commit 8d3c504ee6
93 changed files with 274 additions and 3246 deletions

View File

@@ -83,7 +83,7 @@ Stat* CommonStats::get_totalBlocksMined() { return Stats::totalBlocksMined; }
Stat* CommonStats::get_timePlayed() { return Stats::timePlayed; }
Stat* CommonStats::get_blocksPlaced(int blockId) {
#if (defined _EXTENDED_ACHIEVEMENTS) && (!0)
#if defined(_EXTENDED_ACHIEVEMENTS)
return Stats::blocksPlaced[blockId];
#else
return NULL;
@@ -98,7 +98,7 @@ Stat* CommonStats::get_itemsCollected(int itemId, int itemAux) {
// 4J-JEV: We don't need itemsCollected(emerald) so I'm using it to
// stor itemsBought(emerald) so I don't have to make yet another massive
// StatArray for Items Bought.
#if (defined _EXTENDED_ACHIEVEMENTS) && (!0)
#if defined(_EXTENDED_ACHIEVEMENTS)
if (itemId == Tile::wool_Id) return Stats::rainbowCollection[itemAux];
#endif
@@ -117,7 +117,7 @@ Stat* CommonStats::get_itemsSmelted(int itemId) {
}
Stat* CommonStats::get_itemsUsed(int itemId) {
#if (defined _EXTENDED_ACHIEVEMENTS) && (!0)
#if defined(_EXTENDED_ACHIEVEMENTS)
// 4J-JEV: I've done the same thing here, we can't place these items anyway.
if (itemId == Item::porkChop_cooked_Id) return Stats::blocksPlaced[itemId];
#endif
@@ -141,7 +141,7 @@ Stat* CommonStats::get_killsEnderdragon() { return Stats::killsEnderdragon; }
Stat* CommonStats::get_completeTheEnd() { return Stats::completeTheEnd; }
Stat* CommonStats::get_enteredBiome(int biomeId) {
#if (defined _EXTENDED_ACHIEVEMENTS) && (!0)
#if defined(_EXTENDED_ACHIEVEMENTS)
return Stats::biomesVisisted[biomeId];
#else
return NULL;
@@ -203,7 +203,6 @@ Stat* CommonStats::get_achievement(eAward achievementId) {
case eAward_socialPost:
return (Stat*)Achievements::socialPost;
#if 1
case eAward_snipeSkeleton:
return (Stat*)Achievements::snipeSkeleton;
case eAward_diamonds:
@@ -222,9 +221,8 @@ Stat* CommonStats::get_achievement(eAward achievementId) {
return (Stat*)Achievements::winGame;
case eAward_enchantments:
return (Stat*)Achievements::enchantments;
#endif
#ifdef _EXTENDED_ACHIEVEMENTS
#if defined(_EXTENDED_ACHIEVEMENTS)
case eAward_overkill:
return (Stat*)Achievements::overkill; // Restored old ach.
case eAward_bookcase: