diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/MagicValues.java b/src/main/java/com/github/steveice10/mc/protocol/data/MagicValues.java index 51b032897..a653d60f0 100644 --- a/src/main/java/com/github/steveice10/mc/protocol/data/MagicValues.java +++ b/src/main/java/com/github/steveice10/mc/protocol/data/MagicValues.java @@ -676,74 +676,80 @@ public class MagicValues { register(RespawnScreenValue.IMMEDIATE_RESPAWN, 1); register(GenericStatistic.LEAVE_GAME, 0); - register(GenericStatistic.PLAY_ONE_MINUTE, 1); - register(GenericStatistic.TIME_SINCE_DEATH, 2); - register(GenericStatistic.TIME_SINCE_REST, 3); - register(GenericStatistic.SNEAK_TIME, 4); - register(GenericStatistic.WALK_ONE_CM, 5); - register(GenericStatistic.CROUCH_ONE_CM, 6); - register(GenericStatistic.SPRINT_ONE_CM, 7); - register(GenericStatistic.WALK_ON_WATER_ONE_CM, 8); - register(GenericStatistic.FALL_ONE_CM, 9); - register(GenericStatistic.CLIMB_ONE_CM, 10); - register(GenericStatistic.FLY_ONE_CM, 11); - register(GenericStatistic.WALK_UNDER_WATER_ONE_CM, 12); - register(GenericStatistic.MINECART_ONE_CM, 13); - register(GenericStatistic.BOAT_ONE_CM, 14); - register(GenericStatistic.PIG_ONE_CM, 15); - register(GenericStatistic.HORSE_ONE_CM, 16); - register(GenericStatistic.AVIATE_ONE_CM, 17); - register(GenericStatistic.SWIM_ONE_CM, 18); - register(GenericStatistic.JUMP, 19); - register(GenericStatistic.DROP, 20); - register(GenericStatistic.DAMAGE_DEALT, 21); - register(GenericStatistic.DAMAGE_DEALT_ABSORBED, 22); - register(GenericStatistic.DAMAGE_DEALT_RESISTED, 23); - register(GenericStatistic.DAMAGE_TAKEN, 24); - register(GenericStatistic.DAMAGE_BLOCKED_BY_SHIELD, 25); - register(GenericStatistic.DAMAGE_ABSORBED, 26); - register(GenericStatistic.DAMAGE_RESISTED, 27); - register(GenericStatistic.DEATHS, 28); - register(GenericStatistic.MOB_KILLS, 29); - register(GenericStatistic.ANIMALS_BRED, 30); - register(GenericStatistic.PLAYER_KILLS, 31); - register(GenericStatistic.FISH_CAUGHT, 32); - register(GenericStatistic.TALKED_TO_VILLAGER, 33); - register(GenericStatistic.TRADED_WITH_VILLAGER, 34); - register(GenericStatistic.EAT_CAKE_SLICE, 35); - register(GenericStatistic.FILL_CAULDRON, 36); - register(GenericStatistic.USE_CAULDRON, 37); - register(GenericStatistic.CLEAN_ARMOR, 38); - register(GenericStatistic.CLEAN_BANNER, 39); - register(GenericStatistic.CLEAN_SHULKER_BOX, 40); - register(GenericStatistic.INTERACT_WITH_BREWINGSTAND, 41); - register(GenericStatistic.INTERACT_WITH_BEACON, 42); - register(GenericStatistic.INSPECT_DROPPER, 43); - register(GenericStatistic.INSPECT_HOPPER, 44); - register(GenericStatistic.INSPECT_DISPENSER, 45); - register(GenericStatistic.PLAY_NOTEBLOCK, 46); - register(GenericStatistic.TUNE_NOTEBLOCK, 47); - register(GenericStatistic.POT_FLOWER, 48); - register(GenericStatistic.TRIGGER_TRAPPED_CHEST, 49); - register(GenericStatistic.OPEN_ENDERCHEST, 50); - register(GenericStatistic.ENCHANT_ITEM, 51); - register(GenericStatistic.PLAY_RECORD, 52); - register(GenericStatistic.INTERACT_WITH_FURNACE, 53); - register(GenericStatistic.INTERACT_WITH_CRAFTING_TABLE, 54); - register(GenericStatistic.OPEN_CHEST, 55); - register(GenericStatistic.SLEEP_IN_BED, 56); - register(GenericStatistic.OPEN_SHULKER_BOX, 57); - register(GenericStatistic.OPEN_BARREL, 58); - register(GenericStatistic.INTERACT_WITH_BLAST_FURNACE, 59); - register(GenericStatistic.INTERACT_WITH_SMOKER, 60); - register(GenericStatistic.INTERACT_WITH_LECTERN, 61); - register(GenericStatistic.INTERACT_WITH_CAMPFIRE, 62); - register(GenericStatistic.INTERACT_WITH_CARTOGRAPHY_TABLE, 63); - register(GenericStatistic.INTERACT_WITH_LOOM, 64); - register(GenericStatistic.INTERACT_WITH_STONECUTTER, 65); - register(GenericStatistic.BELL_RING, 66); - register(GenericStatistic.RAID_TRIGGER, 67); - register(GenericStatistic.RAID_WIN, 68); + register(GenericStatistic.PLAY_TIME, 1); + register(GenericStatistic.TOTAL_WORLD_TIME, 2); + register(GenericStatistic.TIME_SINCE_DEATH, 3); + register(GenericStatistic.TIME_SINCE_REST, 4); + register(GenericStatistic.SNEAK_TIME, 5); + register(GenericStatistic.WALK_ONE_CM, 6); + register(GenericStatistic.CROUCH_ONE_CM, 7); + register(GenericStatistic.SPRINT_ONE_CM, 8); + register(GenericStatistic.WALK_ON_WATER_ONE_CM, 9); + register(GenericStatistic.FALL_ONE_CM, 10); + register(GenericStatistic.CLIMB_ONE_CM, 11); + register(GenericStatistic.FLY_ONE_CM, 12); + register(GenericStatistic.WALK_UNDER_WATER_ONE_CM, 13); + register(GenericStatistic.MINECART_ONE_CM, 14); + register(GenericStatistic.BOAT_ONE_CM, 15); + register(GenericStatistic.PIG_ONE_CM, 16); + register(GenericStatistic.HORSE_ONE_CM, 17); + register(GenericStatistic.AVIATE_ONE_CM, 18); + register(GenericStatistic.SWIM_ONE_CM, 19); + register(GenericStatistic.STRIDER_ONE_CM, 20); + register(GenericStatistic.JUMP, 21); + register(GenericStatistic.DROP, 22); + register(GenericStatistic.DAMAGE_DEALT, 23); + register(GenericStatistic.DAMAGE_DEALT_ABSORBED, 24); + register(GenericStatistic.DAMAGE_DEALT_RESISTED, 25); + register(GenericStatistic.DAMAGE_TAKEN, 26); + register(GenericStatistic.DAMAGE_BLOCKED_BY_SHIELD, 27); + register(GenericStatistic.DAMAGE_ABSORBED, 28); + register(GenericStatistic.DAMAGE_RESISTED, 29); + register(GenericStatistic.DEATHS, 30); + register(GenericStatistic.MOB_KILLS, 31); + register(GenericStatistic.ANIMALS_BRED, 32); + register(GenericStatistic.PLAYER_KILLS, 33); + register(GenericStatistic.FISH_CAUGHT, 34); + register(GenericStatistic.TALKED_TO_VILLAGER, 35); + register(GenericStatistic.TRADED_WITH_VILLAGER, 36); + register(GenericStatistic.EAT_CAKE_SLICE, 37); + register(GenericStatistic.FILL_CAULDRON, 38); + register(GenericStatistic.USE_CAULDRON, 39); + register(GenericStatistic.CLEAN_ARMOR, 40); + register(GenericStatistic.CLEAN_BANNER, 41); + register(GenericStatistic.CLEAN_SHULKER_BOX, 42); + register(GenericStatistic.INTERACT_WITH_BREWINGSTAND, 43); + register(GenericStatistic.INTERACT_WITH_BEACON, 44); + register(GenericStatistic.INSPECT_DROPPER, 45); + register(GenericStatistic.INSPECT_HOPPER, 46); + register(GenericStatistic.INSPECT_DISPENSER, 47); + register(GenericStatistic.PLAY_NOTEBLOCK, 48); + register(GenericStatistic.TUNE_NOTEBLOCK, 49); + register(GenericStatistic.POT_FLOWER, 50); + register(GenericStatistic.TRIGGER_TRAPPED_CHEST, 51); + register(GenericStatistic.OPEN_ENDERCHEST, 52); + register(GenericStatistic.ENCHANT_ITEM, 53); + register(GenericStatistic.PLAY_RECORD, 54); + register(GenericStatistic.INTERACT_WITH_FURNACE, 55); + register(GenericStatistic.INTERACT_WITH_CRAFTING_TABLE, 56); + register(GenericStatistic.OPEN_CHEST, 57); + register(GenericStatistic.SLEEP_IN_BED, 58); + register(GenericStatistic.OPEN_SHULKER_BOX, 59); + register(GenericStatistic.OPEN_BARREL, 60); + register(GenericStatistic.INTERACT_WITH_BLAST_FURNACE, 61); + register(GenericStatistic.INTERACT_WITH_SMOKER, 62); + register(GenericStatistic.INTERACT_WITH_LECTERN, 63); + register(GenericStatistic.INTERACT_WITH_CAMPFIRE, 64); + register(GenericStatistic.INTERACT_WITH_CARTOGRAPHY_TABLE, 65); + register(GenericStatistic.INTERACT_WITH_LOOM, 66); + register(GenericStatistic.INTERACT_WITH_STONECUTTER, 67); + register(GenericStatistic.BELL_RING, 68); + register(GenericStatistic.RAID_TRIGGER, 69); + register(GenericStatistic.RAID_WIN, 70); + register(GenericStatistic.INTERACT_WITH_ANVIL, 71); + register(GenericStatistic.INTERACT_WITH_GRINDSTONE, 72); + register(GenericStatistic.TARGET_HIT, 73); + register(GenericStatistic.INTERACT_WITH_SMITHING_TABLE, 74); register(StatisticCategory.BREAK_BLOCK, 0); register(StatisticCategory.CRAFT_ITEM, 1); diff --git a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/GenericStatistic.java b/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/GenericStatistic.java index 079343376..fbf7deb1f 100644 --- a/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/GenericStatistic.java +++ b/src/main/java/com/github/steveice10/mc/protocol/data/game/statistic/GenericStatistic.java @@ -2,7 +2,8 @@ public enum GenericStatistic implements Statistic { LEAVE_GAME, - PLAY_ONE_MINUTE, + PLAY_TIME, + TOTAL_WORLD_TIME, TIME_SINCE_DEATH, TIME_SINCE_REST, SNEAK_TIME, @@ -20,6 +21,7 @@ public enum GenericStatistic implements Statistic { HORSE_ONE_CM, AVIATE_ONE_CM, SWIM_ONE_CM, + STRIDER_ONE_CM, JUMP, DROP, DAMAGE_DEALT, @@ -69,5 +71,9 @@ public enum GenericStatistic implements Statistic { INTERACT_WITH_STONECUTTER, BELL_RING, RAID_TRIGGER, - RAID_WIN; + RAID_WIN, + INTERACT_WITH_ANVIL, + INTERACT_WITH_GRINDSTONE, + TARGET_HIT, + INTERACT_WITH_SMITHING_TABLE }